From a910301e18a97d8d9d8a90ab63f957bf949d1e33 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Mar 2015 17:00:46 -0500
Subject: [PATCH 0001/1143] make cmake-3.2 the default version

---
 pkgs/development/libraries/jsoncpp/1.6.nix    |  9 +++-
 .../libraries/kde-frameworks-5.7/default.nix  |  3 +-
 .../build-managers/cmake/{3.2.nix => 2.8.nix} | 34 ++++++++------
 .../tools/build-managers/cmake/default.nix    | 44 +++++++++----------
 pkgs/top-level/all-packages.nix               | 14 +++---
 5 files changed, 57 insertions(+), 47 deletions(-)
 rename pkgs/development/tools/build-managers/cmake/{3.2.nix => 2.8.nix} (62%)

diff --git a/pkgs/development/libraries/jsoncpp/1.6.nix b/pkgs/development/libraries/jsoncpp/1.6.nix
index 69dfc2175731..d8b85847975b 100644
--- a/pkgs/development/libraries/jsoncpp/1.6.nix
+++ b/pkgs/development/libraries/jsoncpp/1.6.nix
@@ -11,7 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz";
   };
 
-  nativeBuildInputs = [ cmake python ];
+  nativeBuildInputs =
+    [
+      # cmake can be built with the system jsoncpp, or its own bundled version.
+      # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
+      # we make a bootstrapping build with the bundled version.
+      (cmake.override { jsoncpp = null; })
+      python
+    ];
 
   meta = {
     inherit version;
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
index b2d59246bc25..30e8d5ffe1c3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
@@ -70,8 +70,7 @@ let
     (with pkgs;
       {
         Boost = boost155;
-        cmake = cmake-3_2;
-        inherit epoxy;
+        inherit cmake epoxy;
         GIF = giflib;
         GLIB2 = glib;
         Gpgme = gpgme;
diff --git a/pkgs/development/tools/build-managers/cmake/3.2.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
similarity index 62%
rename from pkgs/development/tools/build-managers/cmake/3.2.nix
rename to pkgs/development/tools/build-managers/cmake/2.8.nix
index dd16b649cd13..60a941a66375 100644
--- a/pkgs/development/tools/build-managers/cmake/3.2.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl
-, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib
-, useNcurses ? false, ncurses, useQt4 ? false, qt4
+{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
+, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
 }:
 
 with stdenv.lib;
 
+assert wantPS -> (ps != null);
+
 let
   os = stdenv.lib.optionalString;
-  majorVersion = "3.2";
-  minorVersion = "1";
+  majorVersion = "2.8";
+  minorVersion = "12.2";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -19,15 +20,20 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0b2hy4p0aa9zshlxyw9nmlh5q8q1lmnwmb594rvh6sx2n7v1r7vm";
+    sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
   };
 
   enableParallelBuilding = true;
 
   patches =
+    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
+      name = "FindFreetype-2.5.patch";
+      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
+      sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
+    })] ++
     # Don't search in non-Nix locations such as /usr, but do search in
-    # Nixpkgs' Glibc.
-    optional (stdenv ? glibc) ./search-path-3.0.patch ++
+    # Nixpkgs' Glibc. 
+    optional (stdenv ? glibc) ./search-path.patch ++
     optional (stdenv ? cross) (fetchurl {
       name = "fix-darwin-cross-compile.patch";
       url = "http://public.kitware.com/Bug/file_download.php?"
@@ -35,13 +41,14 @@ stdenv.mkDerivation rec {
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
     });
 
-  buildInputs =
-    [ bzip2 curl expat jsoncpp libarchive xz zlib ]
+  buildInputs = [ curl expat zlib bzip2 libarchive ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+  propagatedBuildInputs = optional wantPS ps;
 
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+  
   configureFlags =
     "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
     + stdenv.lib.optionalString useQt4 " --qt-gui";
@@ -54,14 +61,13 @@ stdenv.mkDerivation rec {
     ''
       source $setupHook
       fixCmakeFiles .
-      substituteInPlace Modules/Platform/UnixPaths.cmake \
-        --subst-var-by glibc ${stdenv.glibc}
+      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
     '';
 
   meta = {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ];
+    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 60a941a66375..20f6ad57b2b8 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
+{ stdenv, fetchurl
+, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib
+, useNcurses ? false, ncurses, useQt4 ? false, qt4
 }:
 
 with stdenv.lib;
 
-assert wantPS -> (ps != null);
-
 let
   os = stdenv.lib.optionalString;
-  majorVersion = "2.8";
-  minorVersion = "12.2";
+  majorVersion = "3.2";
+  minorVersion = "1";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -20,20 +19,15 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
+    sha256 = "0b2hy4p0aa9zshlxyw9nmlh5q8q1lmnwmb594rvh6sx2n7v1r7vm";
   };
 
   enableParallelBuilding = true;
 
   patches =
-    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
-      name = "FindFreetype-2.5.patch";
-      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
-      sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
-    })] ++
     # Don't search in non-Nix locations such as /usr, but do search in
-    # Nixpkgs' Glibc. 
-    optional (stdenv ? glibc) ./search-path.patch ++
+    # Nixpkgs' Glibc.
+    optional (stdenv ? glibc) ./search-path-3.0.patch ++
     optional (stdenv ? cross) (fetchurl {
       name = "fix-darwin-cross-compile.patch";
       url = "http://public.kitware.com/Bug/file_download.php?"
@@ -41,17 +35,22 @@ stdenv.mkDerivation rec {
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
     });
 
-  buildInputs = [ curl expat zlib bzip2 libarchive ]
+  buildInputs =
+    [ bzip2 curl expat libarchive xz zlib ]
+    ++ optional (jsoncpp != null) jsoncpp
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-  propagatedBuildInputs = optional wantPS ps;
-
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-  
+
   configureFlags =
-    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
-    + stdenv.lib.optionalString useQt4 " --qt-gui";
+    [
+      "--docdir=/share/doc/${name}"
+      "--mandir=/share/man"
+      "--system-libs"
+    ]
+    ++ optional (jsoncpp == null) "--no-system-jsoncpp"
+    ++ optional useQt4 "--qt-gui";
 
   setupHook = ./setup-hook.sh;
 
@@ -61,13 +60,14 @@ stdenv.mkDerivation rec {
     ''
       source $setupHook
       fixCmakeFiles .
-      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
+      substituteInPlace Modules/Platform/UnixPaths.cmake \
+        --subst-var-by glibc ${stdenv.glibc}
     '';
 
   meta = {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
+    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf0f408b73f1..90f0ad80c39e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4910,12 +4910,12 @@ let
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
-  cmake = callPackage ../development/tools/build-managers/cmake {
+  cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
     wantPS = stdenv.isDarwin;
     ps     = if stdenv.isDarwin then darwin.ps else null;
   };
 
-  cmake-3_2 = callPackage ../development/tools/build-managers/cmake/3.2.nix {
+  cmake = callPackage ../development/tools/build-managers/cmake {
     jsoncpp = jsoncpp-1_6;
   };
   cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { };
@@ -5728,7 +5728,7 @@ let
 
   giblib = callPackage ../development/libraries/giblib { };
 
-  libgit2 = callPackage ../development/libraries/git2 { cmake = cmake-3_2; };
+  libgit2 = callPackage ../development/libraries/git2 {};
 
   glew = callPackage ../development/libraries/glew { };
 
@@ -10832,9 +10832,7 @@ let
   kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
     kf5 = kf57;
     qt5 = qt54;
-    pkgs = pkgs // {
-      cmake = cmake-3_2;
-    };
+    inherit pkgs;
     kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
   kdeApps_stable = kdeApps_14_12;
@@ -12830,9 +12828,9 @@ let
     }) ../desktops/kde-4.14;
 
   kdePackagesFor = self: dir:
-    let callPackageOrig = newScope { cmake = cmake-3_2; }; in
+    let callPackageOrig = newScope {}; in
     let
-      callPackage = newScope (self // { cmake = cmake-3_2; });
+      callPackage = newScope self;
       kde4 = callPackageOrig dir {
         inherit callPackage callPackageOrig;
         kdelibs = kdeApps_stable.kdelibs;

From 67199bda4effafecb977a44c623c2115032dc347 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Mar 2015 17:01:45 -0500
Subject: [PATCH 0002/1143] remove cmake-2.8

---
 .../tools/build-managers/cmake/2.8.nix        | 73 --------------
 .../build-managers/cmake/search-path.patch    | 97 -------------------
 pkgs/top-level/all-packages.nix               |  5 -
 3 files changed, 175 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/cmake/2.8.nix
 delete mode 100644 pkgs/development/tools/build-managers/cmake/search-path.patch

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
deleted file mode 100644
index 60a941a66375..000000000000
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
-}:
-
-with stdenv.lib;
-
-assert wantPS -> (ps != null);
-
-let
-  os = stdenv.lib.optionalString;
-  majorVersion = "2.8";
-  minorVersion = "12.2";
-  version = "${majorVersion}.${minorVersion}";
-in
-
-stdenv.mkDerivation rec {
-  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
-
-  inherit majorVersion;
-
-  src = fetchurl {
-    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
-  };
-
-  enableParallelBuilding = true;
-
-  patches =
-    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
-      name = "FindFreetype-2.5.patch";
-      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
-      sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
-    })] ++
-    # Don't search in non-Nix locations such as /usr, but do search in
-    # Nixpkgs' Glibc. 
-    optional (stdenv ? glibc) ./search-path.patch ++
-    optional (stdenv ? cross) (fetchurl {
-      name = "fix-darwin-cross-compile.patch";
-      url = "http://public.kitware.com/Bug/file_download.php?"
-          + "file_id=4981&type=bug";
-      sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    });
-
-  buildInputs = [ curl expat zlib bzip2 libarchive ]
-    ++ optional useNcurses ncurses
-    ++ optional useQt4 qt4;
-
-  propagatedBuildInputs = optional wantPS ps;
-
-  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-  
-  configureFlags =
-    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
-    + stdenv.lib.optionalString useQt4 " --qt-gui";
-
-  setupHook = ./setup-hook.sh;
-
-  dontUseCmakeConfigure = true;
-
-  preConfigure = optionalString (stdenv ? glibc)
-    ''
-      source $setupHook
-      fixCmakeFiles .
-      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
-    '';
-
-  meta = {
-    homepage = http://www.cmake.org/;
-    description = "Cross-Platform Makefile Generator";
-    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
deleted file mode 100644
index 31c85d6f5220..000000000000
--- a/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
-index fe8e003..378512c 100644
---- a/Modules/Platform/Linux.cmake
-+++ b/Modules/Platform/Linux.cmake
-@@ -36,13 +36,13 @@ else()
-   # checking the platform every time.  This option is advanced enough
-   # that only package maintainers should need to adjust it.  They are
-   # capable of providing a setting on the command line.
--  if(EXISTS "/etc/debian_version")
--    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
--      "Install .so files without execute permission.")
--  else()
-+  # if(EXISTS "/etc/debian_version")
-+  #   set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
-+  #     "Install .so files without execute permission.")
-+  # else()
-     set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
-       "Install .so files without execute permission.")
--  endif()
-+  # endif()
- endif()
- 
- # Match multiarch library directory names.
-@@ -52,6 +52,6 @@ include(Platform/UnixPaths)
- 
- # Debian has lib64 paths only for compatibility so they should not be
- # searched.
--if(EXISTS "/etc/debian_version")
--  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--endif()
-+# if(EXISTS "/etc/debian_version")
-+#  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
-+#endif()
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index ccb2663..39834e6 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
--  /usr/local /usr /
--
--  # CMake install location
--  "${_CMAKE_INSTALL_DIR}"
--
--  # Project install destination.
--  "${CMAKE_INSTALL_PREFIX}"
--  )
--
--# List common include file locations not under the common prefixes.
--list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # Windows API on Cygwin
--  /usr/include/w32api
--
--  # X11
--  /usr/X11R6/include /usr/include/X11
--
--  # Other
--  /usr/pkg/include
--  /opt/csw/include /opt/include
--  /usr/openwin/include
--  )
--
--list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # Windows API on Cygwin
--  /usr/lib/w32api
--
--  # X11
--  /usr/X11R6/lib /usr/lib/X11
--
--  # Other
--  /usr/pkg/lib
--  /opt/csw/lib /opt/lib
--  /usr/openwin/lib
--  )
--
--list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
--  /usr/pkg/bin
-+  "@glibc@"
-   )
- 
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
--  /lib /usr/lib /usr/lib32 /usr/lib64
-+  "@glibc@/lib"
-   )
- 
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  "@glibc@/include"
-   )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  "@glibc@/include"
-   )
- 
- # Enable use of lib64 search path variants by default.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90f0ad80c39e..e1648dd90211 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4910,11 +4910,6 @@ let
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
-  cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
-    wantPS = stdenv.isDarwin;
-    ps     = if stdenv.isDarwin then darwin.ps else null;
-  };
-
   cmake = callPackage ../development/tools/build-managers/cmake {
     jsoncpp = jsoncpp-1_6;
   };

From 3628370127fb327d4559cd319360687922d74fc5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Mar 2015 17:02:32 -0500
Subject: [PATCH 0003/1143] remove cmake-2.6.4

---
 .../tools/build-managers/cmake/264.nix        | 59 ------------
 .../cmake/search-path-264.patch               | 93 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 153 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/cmake/264.nix
 delete mode 100644 pkgs/development/tools/build-managers/cmake/search-path-264.patch

diff --git a/pkgs/development/tools/build-managers/cmake/264.nix b/pkgs/development/tools/build-managers/cmake/264.nix
deleted file mode 100644
index b2695c2ec87c..000000000000
--- a/pkgs/development/tools/build-managers/cmake/264.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c
-}:
-
-with stdenv.lib;
-
-let
-  os = stdenv.lib.optionalString;
-  majorVersion = "2.6";
-  minorVersion = "4";
-  version = "${majorVersion}.${minorVersion}";
-in
-
-stdenv.mkDerivation rec {
-  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
-
-  inherit majorVersion;
-
-  src = fetchurl {
-    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw";
-  };
-
-  patches =
-    # Don't search in non-Nix locations such as /usr, but do search in
-    # Nixpkgs' Glibc.
-    optional (stdenv ? glibc) ./search-path-264.patch;
-
-  buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ]
-    ++ optional useNcurses ncurses
-    ++ optional useQt4 qt4;
-
-  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-  
-  configureFlags =
-    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
-    + stdenv.lib.optionalString useQt4 " --qt-gui";
-
-  setupHook = ./setup-hook.sh;
-
-   postPatch =
-    ''
-      dontUseCmakeConfigure=1
-      source $setupHook
-      fixCmakeFiles .
-    '';
-
-  preConfigure = optionalString (stdenv ? glibc)
-    ''
-      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
-    '';
-
-  meta = {
-    homepage = http://www.cmake.org/;
-    description = "Cross-Platform Makefile Generator";
-    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-264.patch b/pkgs/development/tools/build-managers/cmake/search-path-264.patch
deleted file mode 100644
index 97ad6f119d8b..000000000000
--- a/pkgs/development/tools/build-managers/cmake/search-path-264.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
-index 4e4c2cb..9784655 100644
---- a/Modules/Platform/Linux.cmake
-+++ b/Modules/Platform/Linux.cmake
-@@ -43,21 +43,10 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE)
-   # checking the platform every time.  This option is advanced enough
-   # that only package maintainers should need to adjust it.  They are
-   # capable of providing a setting on the command line.
--  IF(EXISTS "/etc/debian_version")
--    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
--      "Install .so files without execute permission.")
--  ELSE(EXISTS "/etc/debian_version")
--    SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
--      "Install .so files without execute permission.")
--  ENDIF(EXISTS "/etc/debian_version")
-+  SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
-+    "Install .so files without execute permission.")
- ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
- 
- INCLUDE(Platform/UnixPaths)
- 
--# Debian has lib64 paths only for compatibility so they should not be
--# searched.
--IF(EXISTS "/etc/debian_version")
--  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--ENDIF(EXISTS "/etc/debian_version")
--# always include the gcc compiler information
- INCLUDE(Platform/gcc)
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 584d334..4fcf951 100755
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -8,56 +8,18 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # List common installation prefixes.  These will be used for all
- # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
--  # Standard
--  / /usr /usr/local
--
--  # CMake install location
--  "${_CMAKE_INSTALL_DIR}"
--
--  # Project install destination.
--  "${CMAKE_INSTALL_PREFIX}"
--  )
--
--# List common include file locations not under the common prefixes.
--LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # Windows API on Cygwin
--  /usr/include/w32api
--
--  # X11
--  /usr/X11R6/include /usr/include/X11
--
--  # Other
--  /opt/local/include /usr/pkg/include
--  /opt/csw/include /opt/include  
--  /usr/openwin/include
--  )
--
--LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # Windows API on Cygwin
--  /usr/lib/w32api
--
--  # X11
--  /usr/X11R6/lib /usr/lib/X11
--
--  # Other
--  /opt/local/lib /usr/pkg/lib
--  /opt/csw/lib /opt/lib 
--  /usr/openwin/lib
--  )
--
--LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
--  /usr/pkg/bin
-+  "@glibc@"
-   )
- 
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
--  /lib /usr/lib /usr/lib32 /usr/lib64
-+  "@glibc@/lib"
-   )
- 
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  "@glibc@/include"
-   )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  "@glibc@/include"
-   )
- 
- # Enable use of lib64 search path variants by default.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1648dd90211..16b673b783c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4914,7 +4914,6 @@ let
     jsoncpp = jsoncpp-1_6;
   };
   cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { };
-  cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
 
   cmakeCurses = cmake.override { useNcurses = true; };
 

From f47af9b2c81d92e60d7eeb14954bfd9d9fefac52 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Mar 2015 17:03:57 -0500
Subject: [PATCH 0004/1143] remove cmake-3.0

---
 .../tools/build-managers/cmake/3.0.nix        | 69 -------------------
 .../build-managers/cmake/762-13887.patch      | 17 -----
 .../tools/build-managers/cmake/default.nix    |  2 +-
 ...h-path-3.0.patch => search-path-3.2.patch} |  0
 pkgs/top-level/all-packages.nix               |  1 -
 5 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/cmake/3.0.nix
 delete mode 100644 pkgs/development/tools/build-managers/cmake/762-13887.patch
 rename pkgs/development/tools/build-managers/cmake/{search-path-3.0.patch => search-path-3.2.patch} (100%)

diff --git a/pkgs/development/tools/build-managers/cmake/3.0.nix b/pkgs/development/tools/build-managers/cmake/3.0.nix
deleted file mode 100644
index f4c368c46647..000000000000
--- a/pkgs/development/tools/build-managers/cmake/3.0.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4
-}:
-
-with stdenv.lib;
-
-let
-  os = stdenv.lib.optionalString;
-  majorVersion = "3.0";
-  minorVersion = "2";
-  version = "${majorVersion}.${minorVersion}";
-in
-
-stdenv.mkDerivation rec {
-  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
-
-  inherit majorVersion;
-
-  src = fetchurl {
-    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0gk90mw7f93sgkrsrxqy2b6fm5j43yfw50xkrk0bxndvmlgackkb";
-  };
-
-  enableParallelBuilding = true;
-
-  patches =
-    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
-      name = "FindFreetype-2.5.patch";
-      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
-      sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
-    })] ++
-    # Don't search in non-Nix locations such as /usr, but do search in
-    # Nixpkgs' Glibc. 
-    optional (stdenv ? glibc) ./search-path-3.0.patch ++
-    optional (stdenv ? cross) (fetchurl {
-      name = "fix-darwin-cross-compile.patch";
-      url = "http://public.kitware.com/Bug/file_download.php?"
-          + "file_id=4981&type=bug";
-      sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    });
-
-  buildInputs = [ curl expat zlib bzip2 libarchive ]
-    ++ optional useNcurses ncurses
-    ++ optional useQt4 qt4;
-
-  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-  
-  configureFlags =
-    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
-    + stdenv.lib.optionalString useQt4 " --qt-gui";
-
-  setupHook = ./setup-hook.sh;
-
-  dontUseCmakeConfigure = true;
-
-  preConfigure = optionalString (stdenv ? glibc)
-    ''
-      source $setupHook
-      fixCmakeFiles .
-      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
-    '';
-
-  meta = {
-    homepage = http://www.cmake.org/;
-    description = "Cross-Platform Makefile Generator";
-    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/cmake/762-13887.patch b/pkgs/development/tools/build-managers/cmake/762-13887.patch
deleted file mode 100644
index 3ef27a09b5c2..000000000000
--- a/pkgs/development/tools/build-managers/cmake/762-13887.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
-index e7491bb..57b4348 100644
---- a/Source/CTest/cmCTestTestHandler.cxx
-+++ b/Source/CTest/cmCTestTestHandler.cxx
-@@ -1303,10 +1303,9 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<cmStdString>& vec)
-   for ( it = vec.begin(); it != vec.end(); ++it )
-     {
-     int retVal = 0;
--    std::string cmd = cmSystemTools::ConvertToOutputPath(it->c_str());
--    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << cmd
-+    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
-       << std::endl);
--    if ( !cmSystemTools::RunSingleCommand(cmd.c_str(), 0, &retVal, 0,
-+    if ( !cmSystemTools::RunSingleCommand((*it).c_str(), 0, &retVal, 0,
-                                           cmSystemTools::OUTPUT_MERGE
-         /*this->Verbose*/) || retVal != 0 )
-       {
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 20f6ad57b2b8..57ccb086d32d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   patches =
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc.
-    optional (stdenv ? glibc) ./search-path-3.0.patch ++
+    optional (stdenv ? glibc) ./search-path-3.2.patch ++
     optional (stdenv ? cross) (fetchurl {
       name = "fix-darwin-cross-compile.patch";
       url = "http://public.kitware.com/Bug/file_download.php?"
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.0.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/cmake/search-path-3.0.patch
rename to pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16b673b783c9..30f787041160 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4913,7 +4913,6 @@ let
   cmake = callPackage ../development/tools/build-managers/cmake {
     jsoncpp = jsoncpp-1_6;
   };
-  cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { };
 
   cmakeCurses = cmake.override { useNcurses = true; };
 

From 143aa5aa17cfb80758951ba79deb5beef455c8f3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Mar 2015 17:04:53 -0500
Subject: [PATCH 0005/1143] remove jsoncpp-0.6.0-rc2

---
 pkgs/development/libraries/jsoncpp/1.6.nix    | 31 ----------------
 .../development/libraries/jsoncpp/default.nix | 37 +++++++++----------
 pkgs/top-level/all-packages.nix               |  5 +--
 3 files changed, 19 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/libraries/jsoncpp/1.6.nix

diff --git a/pkgs/development/libraries/jsoncpp/1.6.nix b/pkgs/development/libraries/jsoncpp/1.6.nix
deleted file mode 100644
index d8b85847975b..000000000000
--- a/pkgs/development/libraries/jsoncpp/1.6.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, cmake, python }:
-
-let
-  basename = "jsoncpp";
-  version = "1.6.0";
-in
-stdenv.mkDerivation rec {
-  name = "${basename}-${version}";
-  src = fetchurl {
-    url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz";
-    sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz";
-  };
-
-  nativeBuildInputs =
-    [
-      # cmake can be built with the system jsoncpp, or its own bundled version.
-      # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
-      # we make a bootstrapping build with the bundled version.
-      (cmake.override { jsoncpp = null; })
-      python
-    ];
-
-  meta = {
-    inherit version;
-    homepage = https://github.com/open-source-parsers/jsoncpp;
-    description = "A simple API to manipulate JSON data in C++";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    license = with stdenv.lib.licenses; [ mit ];
-    branch = "1.6";
-  };
-}
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index b1aa03991bd9..d8b85847975b 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,32 +1,31 @@
-{ stdenv, fetchurl, scons}:
+{ stdenv, fetchurl, cmake, python }:
 
 let
   basename = "jsoncpp";
-  version = "0.6.0-rc2";
-  pkgname = "${basename}-src-${version}.tar.gz";
-in 
+  version = "1.6.0";
+in
 stdenv.mkDerivation rec {
   name = "${basename}-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/${basename}/${pkgname}";
-    sha256 = "10xj15nziqpwc6r3yznpb49wm4jqc5wakjsmj65v087mcg8r7lfl";
+    url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz";
+    sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz";
   };
 
-  buildInputs = [ scons ];
-
-  buildPhase = ''
-    mkdir -p $out
-    scons platform=linux-gcc check
-  '';
-
-  installPhase = ''
-    cp -r include $out
-    cp -r libs/* $out/lib
-  '';
+  nativeBuildInputs =
+    [
+      # cmake can be built with the system jsoncpp, or its own bundled version.
+      # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
+      # we make a bootstrapping build with the bundled version.
+      (cmake.override { jsoncpp = null; })
+      python
+    ];
 
   meta = {
-    homepage = http://jsoncpp.sourceforge.net;
-    repositories.svn = svn://svn.code.sf.net/p/jsoncpp/code;
+    inherit version;
+    homepage = https://github.com/open-source-parsers/jsoncpp;
     description = "A simple API to manipulate JSON data in C++";
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    license = with stdenv.lib.licenses; [ mit ];
+    branch = "1.6";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30f787041160..e23c22f9c57a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4910,9 +4910,7 @@ let
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
-  cmake = callPackage ../development/tools/build-managers/cmake {
-    jsoncpp = jsoncpp-1_6;
-  };
+  cmake = callPackage ../development/tools/build-managers/cmake { };
 
   cmakeCurses = cmake.override { useNcurses = true; };
 
@@ -6072,7 +6070,6 @@ let
   json_c = callPackage ../development/libraries/json-c { };
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
-  jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { };
 
   libjson = callPackage ../development/libraries/libjson { };
 

From a89c14dc3c61844970b7644404f39ae3611f049f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Mar 2015 12:03:01 +0100
Subject: [PATCH 0006/1143] No camelCase in filenames

---
 pkgs/stdenv/darwin/default.nix                                  | 2 +-
 .../stdenv/darwin/{trivialBootstrap.sh => trivial-bootstrap.sh} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/stdenv/darwin/{trivialBootstrap.sh => trivial-bootstrap.sh} (100%)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index c415a297d845..89d5f8df313b 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -12,7 +12,7 @@ rec {
 
     name    = "trivial-bootstrap-tools";
     builder = "/bin/sh";
-    args    = [ ./trivialBootstrap.sh ];
+    args    = [ ./trivial-bootstrap.sh ];
 
     mkdir   = "/bin/mkdir";
     ln      = "/bin/ln";
diff --git a/pkgs/stdenv/darwin/trivialBootstrap.sh b/pkgs/stdenv/darwin/trivial-bootstrap.sh
similarity index 100%
rename from pkgs/stdenv/darwin/trivialBootstrap.sh
rename to pkgs/stdenv/darwin/trivial-bootstrap.sh

From 355e3e90b350edfbc5a50d3a84b1fe752300b023 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 23 Mar 2015 07:22:48 -0500
Subject: [PATCH 0007/1143] clementine: patch for cmake-3.2

---
 .../clementine-dbus-namespace.patch           | 36 +++++++++++++++++++
 .../applications/audio/clementine/default.nix |  6 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/clementine/clementine-dbus-namespace.patch

diff --git a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch
new file mode 100644
index 000000000000..2240debd0e4a
--- /dev/null
+++ b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch
@@ -0,0 +1,36 @@
+From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
+From: Chocobozzz <florian.chocobo@gmail.com>
+Date: Wed, 16 Jul 2014 15:57:25 +0200
+Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
+
+---
+ src/CMakeLists.txt | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 650fa74..775b0a5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
+ if(HAVE_DBUS)
+   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
+ 
+-  # Hack to get it to generate interfaces without namespaces - required
+-  # because otherwise org::freedesktop::UDisks and
+-  # org::freedesktop::UDisks::Device conflict.
+-  list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
+-
+   # MPRIS DBUS interfaces
+   qt4_add_dbus_adaptor(SOURCES
+       dbus/org.freedesktop.MediaPlayer.player.xml
+@@ -964,6 +959,10 @@ if(HAVE_DBUS)
+ 
+   # DeviceKit DBUS interfaces
+   if(HAVE_DEVICEKIT)
++    set_source_files_properties(dbus/org.freedesktop.UDisks.xml
++        PROPERTIES NO_NAMESPACE dbus/udisks)
++    set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
++        PROPERTIES NO_NAMESPACE dbus/udisksdevice)
+     qt4_add_dbus_interface(SOURCES
+         dbus/org.freedesktop.UDisks.xml
+         dbus/udisks)
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 857aa2edaf5e..538f54fbaf81 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -14,7 +14,11 @@ stdenv.mkDerivation {
     sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
   };
 
-  patches = [ ./clementine-1.2.1-include-paths.patch ];
+  patches =
+    [
+      ./clementine-1.2.1-include-paths.patch
+      ./clementine-dbus-namespace.patch
+    ];
 
   buildInputs = [
     boost

From ead7762573176d7f795ea877f600982b40537861 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Mar 2015 15:56:09 +0100
Subject: [PATCH 0008/1143] stdenv-darwin: Use --sdk macosx10.9

Otherwise builds fail on Mac OS X 10.9 with Xcode 6.1. This is because
"xcrun --show-sdk-version" returns 10.10, which doesn't work.
---
 pkgs/stdenv/darwin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 89d5f8df313b..88275aa0e79c 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -50,7 +50,7 @@ rec {
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
     xargsFlags=" "
     export MACOSX_DEPLOYMENT_TARGET=10.7
-    export SDKROOT=$(/usr/bin/xcrun --sdk macosx$(/usr/bin/xcrun --show-sdk-version) --show-sdk-path 2> /dev/null || echo /)
+    export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --show-sdk-path 2> /dev/null || echo /)
     export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
     export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib"
     export CMAKE_OSX_ARCHITECTURES=x86_64

From d3756e162c9dcb988766e3388ebc9165bb7a12b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Mar 2015 16:46:41 +0100
Subject: [PATCH 0009/1143] stdenv-darwin: Auto-detect the "right" SDK version

---
 pkgs/stdenv/darwin/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 88275aa0e79c..c5ad0d7d08fc 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -50,7 +50,11 @@ rec {
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
     xargsFlags=" "
     export MACOSX_DEPLOYMENT_TARGET=10.7
-    export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --show-sdk-path 2> /dev/null || echo /)
+    # Use the 10.9 SDK if we're running on 10.9, and 10.10 if we're
+    # running on 10.10. We need to use the 10.10 headers for functions
+    # like readlinkat() that are dynamically detected by configure
+    # scripts. Very impure, obviously.
+    export SDKROOT=$(/usr/bin/xcrun --sdk macosx"$(/usr/bin/sw_vers -productVersion | /usr/bin/cut -d. -f1,2)" --show-sdk-path 2> /dev/null || echo /)
     export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
     export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib"
     export CMAKE_OSX_ARCHITECTURES=x86_64

From bda440a7b3e473de92533e3693e9c32eb011c7a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Mar 2015 14:12:24 +0100
Subject: [PATCH 0010/1143] substitute: Fix "No such file or directory" message
 on Darwin

On Darwin, "chmod -f" does not suppress an error message if the file
doesn't exist. So just check if the file exists.
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 82ea0863a707..452a80eadc75 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -370,7 +370,7 @@ substitute() {
         content="${content//"$pattern"/$replacement}"
     done
 
-    chmod -f +w "$output" || true
+    if [ -e "$output" ]; then chmod +w "$output".tmp; fi
     printf "%s" "$content" > "$output"
 }
 

From 9c579f691fc9ba06fb6564200349f0bdf08ab069 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Mar 2015 15:59:05 +0100
Subject: [PATCH 0011/1143] fix-darwin-dylib-names: Fix all outputs

This fixes the install names of the Boost dylibs on Darwin.
---
 pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
index 2b64fbf8f093..8fe661026774 100644
--- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
+++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
@@ -10,7 +10,7 @@
 # their absolute path (using "install_name_tool -id").  It also
 # rewrites references in other dylibs to absolute paths.
 
-postFixupHooks+=('fixDarwinDylibNamesIn $prefix')
+fixupOutputHooks+=('fixDarwinDylibNamesIn $prefix')
 
 fixDarwinDylibNames() {
     local flags=()

From 6454b8f9ef71ba6d595d318cc149cb3a63b346e4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 23 Mar 2015 10:13:44 -0500
Subject: [PATCH 0012/1143] cc-wrapper: fix missing attribute

---
 pkgs/build-support/cc-wrapper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index df43da58e3ec..ce11b1ad192a 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -171,7 +171,7 @@ stdenv.mkDerivation {
       export real_cxx=c++
       export default_cxx_stdlib_compile="${
         if stdenv.isLinux && !(cc.isGNU or false)
-          then "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"
+          then "-isystem $(echo -n ${cc}/include/c++/*) -isystem $(echo -n ${cc}/include/c++/*)/$(${cc}/bin/gcc -dumpmachine)"
           else ""
       }"
 

From ad49ea230a6318f4164bc4bd395018acc61cb81a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Mar 2015 17:14:32 -0500
Subject: [PATCH 0013/1143] qt54: update to qt-5.4.1

---
 .../libraries/qt-5/5.4/manifest.nix           | 300 +++++++++---------
 .../libraries/qt-5/5.4/manifest.sh            |   2 +-
 2 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.nix b/pkgs/development/libraries/qt-5/5.4/manifest.nix
index 38e5f8972beb..4647c0eef888 100644
--- a/pkgs/development/libraries/qt-5/5.4/manifest.nix
+++ b/pkgs/development/libraries/qt-5/5.4/manifest.nix
@@ -2,273 +2,273 @@
 { stdenv, fetchurl, mirror }:
 [
   {
-    name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/108ywq0s80nanyrjs95nmfxvxmp1ijv2-qtwebengine-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/32jn5sn8im7andkd6m15s95n48ald7pw-qtwayland-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebengine-opensource-src-5.4.0.tar.xz";
-      sha256 = "0fqmwhl2pxs0w33lqhcwgwdyrj61b8jmd3hc668xwirzsv0ab4db";
-      name = "qtwebengine-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwayland-opensource-src-5.4.1.tar.xz";
+      sha256 = "14npf3lclkb83s8ywla67a1129ia1mbib145s1sk5gqw1dh5wfv5";
+      name = "qtwayland-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/dgy0bd4382cak76d34ins8v1rxvcg2zg-qtwebkit-examples-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/604ifwwrzpm96rffszyl11xjirm0w65j-qtandroidextras-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebkit-examples-opensource-src-5.4.0.tar.xz";
-      sha256 = "1xp9y3q0p5w3gj372hwbzb606akf6ynic94ppwzyhrhy70yjyamh";
-      name = "qtwebkit-examples-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtandroidextras-opensource-src-5.4.1.tar.xz";
+      sha256 = "0s12hmn2lnlbp7y47v344lyli6wh670dwazl3kkzv9vdv52df4wp";
+      name = "qtandroidextras-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/3ddk1slwp3sl11q3vrh14vczz1g3k77c-qtsensors-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/wcwaylvnlrfy6d6pc0ka7mkcam846cqb-qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtsensors-opensource-src-5.4.0.tar.xz";
-      sha256 = "0ng1mbvv2ffhk7rs3djiz2i7j297flnn1jkgqk6zpfbjyp6363wa";
-      name = "qtsensors-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
+      sha256 = "071mz2w25g5svknb97y6yw55sq9171qqd92n3dp4w2qg2blg1qms";
+      name = "qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/h77c86qj0fxr233x0b4n669mfd1kd14k-qtandroidextras-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/k7gayy35qqwbaf2yyr1lfydmsp6p9k3i-qtenginio-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtandroidextras-opensource-src-5.4.0.tar.xz";
-      sha256 = "0j40409x68bj6hbfrz0vqzafkbplzfcnlb7b7m72ddav0jm4ad3w";
-      name = "qtandroidextras-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz";
+      sha256 = "0yjpx43qy6yc6hblcrkp6g9jv2ipg2hdd27q86y7s30q54f17nxf";
+      name = "qtenginio-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/l30dh38cmmhz1laiwawfyx88d2njnf7s-qtxmlpatterns-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/0y1p0ssxbd8wp4vyq5ad2f77inh07p1b-qtwebengine-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtxmlpatterns-opensource-src-5.4.0.tar.xz";
-      sha256 = "09albq9qj82hzphb3y4ivkkly6gjyxmcbghd7m73i9f7kdxnj73r";
-      name = "qtxmlpatterns-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebengine-opensource-src-5.4.1.tar.xz";
+      sha256 = "1c5akxh6wxgc72md6802fbvd601n03assv6i542siwmmnp5anhij";
+      name = "qtwebengine-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/02axrl74rym70hs4ncwbpx520a6y5lfk-qtactiveqt-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/0mdhndcp51g2160559kgd5a93c0c3317-qtmacextras-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtactiveqt-opensource-src-5.4.0.tar.xz";
-      sha256 = "1kvn8dqyr3iw5w55yba9ljldgc15zsa1ibdkhfwj3rk3579mfxba";
-      name = "qtactiveqt-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmacextras-opensource-src-5.4.1.tar.xz";
+      sha256 = "0hivjn3yfidzj4la3rlrqzjawrakxyhc886w2jcf0bjz3vzl9xp2";
+      name = "qtmacextras-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/xqd394dy8j57iwvixy09a8mlklllf817-qtx11extras-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/hhana1500hq2h2l8815wq8rfrp7nizpb-qttranslations-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtx11extras-opensource-src-5.4.0.tar.xz";
-      sha256 = "0k27q46khwf3hzygb145akns37s8cmwbqyzjff810xxqwb4npim3";
-      name = "qtx11extras-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttranslations-opensource-src-5.4.1.tar.xz";
+      sha256 = "0hchmz7hjdjx0wn2v9sbgilvi0pigiriklw5pdvfxjabjxgh8k9w";
+      name = "qttranslations-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/hafxaps23gqkpaq1ryh142jc9fh71kxp-qttranslations-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/qfa1hycl1lh8pm2x65frxlms3waqbsfg-qtwebchannel-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qttranslations-opensource-src-5.4.0.tar.xz";
-      sha256 = "12zrldi5jw6zknwg6p573gvz0f4v22wvwwc5mykj26j8g28qv9xc";
-      name = "qttranslations-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebchannel-opensource-src-5.4.1.tar.xz";
+      sha256 = "0ldjyyp0ym3hndd0bq5mwjry2yilf1cv9iddqb8adz46k3nbkb64";
+      name = "qtwebchannel-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/ffs7rhirwgyqijcwkv2rn9i0f3126qwp-qtwayland-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/hif7dg37sz0yjj09844f0gyqqsf9cpxx-qtdoc-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwayland-opensource-src-5.4.0.tar.xz";
-      sha256 = "0abgsf67whdppg9q35b359wllz2pfzx6vw2gld6hhnhlx7rgf7k0";
-      name = "qtwayland-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdoc-opensource-src-5.4.1.tar.xz";
+      sha256 = "1afg2lxyxgqhq02a58c9yshvkinlk5mw19yff1421fma6j925c8q";
+      name = "qtdoc-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/7ap1klckqnjx03i1024jd1nfw1kbdib3-qtmultimedia-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/shz5132xvpp2hvmsyl1mhps0qanrgw43-qtwebkit-examples-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtmultimedia-opensource-src-5.4.0.tar.xz";
-      sha256 = "0ldgz677apqj8jm6b7cmma18jv97va26hjqjs3r26hg6gaidpfas";
-      name = "qtmultimedia-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz";
+      sha256 = "02kj4rw40s7xhdz1ixfy5fc7n5pr2ipqkpwj1kwng71l3jrpn60r";
+      name = "qtwebkit-examples-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/w526ln2xj4bfqw2xbarhidain51idf3k-qtmacextras-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/nl8rm1q2sqyq5y91h6d9dbks82krykn1-qtbase-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtmacextras-opensource-src-5.4.0.tar.xz";
-      sha256 = "0vq4dhsxwi1csy5qnbbjp3fmgmhqb7ah0nzrsickvv37vyfv85hn";
-      name = "qtmacextras-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz";
+      sha256 = "1dxigzgv6xj5lybs654y57ssfbl38dxff3s3wpvw0n89hf9sax45";
+      name = "qtbase-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/yp6paa7psi4fwaih9mcvfxj9vldlmk5k-qtimageformats-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/f9cbf92nhmfkz1q2n4nidh432s5d3pls-qttools-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtimageformats-opensource-src-5.4.0.tar.xz";
-      sha256 = "0ip0iyn8fz96w5xi8w6dlxx0lhv1glmkdy5myz7zhi0yyy6ng6y8";
-      name = "qtimageformats-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz";
+      sha256 = "0whzcwgzwh1m6fqb7h2gvkx9hi2ijjaz8ap36jqr8cc4ff2hzphi";
+      name = "qttools-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/1x2lvbyc2h25zmjyvawrfzn5yya13fjl-qttools-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/hl5gzwaq43afs2z7ga10161myzz3xrwb-qt5-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qttools-opensource-src-5.4.0.tar.xz";
-      sha256 = "06klc0vdqfnj8dwqq64602x0wl8ackcim1y33mw6616kzyba11as";
-      name = "qttools-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qt5-opensource-src-5.4.1.tar.xz";
+      sha256 = "01xgf3531q60vrkg1pp07q4p0ildj42zgnw63v8fnwjg7c5m59rd";
+      name = "qt5-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/33mxdwaih2ysjzyvjgfgq86ys9bd9s8x-qtconnectivity-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/9y9qhciiqys5sm502bbflqzrjmvxpqh6-qtquick1-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtconnectivity-opensource-src-5.4.0.tar.xz";
-      sha256 = "0f0hkgqr606q4jj8g70xq72lp9q6kdyfw6rdiin8zhnarjxqark3";
-      name = "qtconnectivity-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz";
+      sha256 = "0ba3r89j75vrjgh8h3ik64x84bhgbckc4bvy1wympwgfhk3j8lzb";
+      name = "qtquick1-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/bx82yn9n0srdzlid1blwg196jqyhhgpp-qtwebchannel-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/cmvv503q10qnmmbb8yxvvjlxpqqaswyb-qtwebsockets-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebchannel-opensource-src-5.4.0.tar.xz";
-      sha256 = "0k2r0qrqrxhw2mjyd9f8r36f04yxfkgw1dmbbdczhw4234jh3sr4";
-      name = "qtwebchannel-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz";
+      sha256 = "0i5bcxlwxbzq9k0kq1m90cbslby05x3j3r6js8xjarz2qnc6zxfs";
+      name = "qtwebsockets-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/3q6b9l2cwszm9jz5csx2jsfqk08nz9nh-qtserialport-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/9c4zpbngylc7cqqyai2ysglajapphxp7-qtsensors-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtserialport-opensource-src-5.4.0.tar.xz";
-      sha256 = "1hsqs1dy8x5v3l4z8zk9rjprz14w8nv13j4yy47r4nsgf7pikihg";
-      name = "qtserialport-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz";
+      sha256 = "1y6vbvvcgph466whcc896lkyk2lx8lyyqj1qnm76f3jjywp8wjxc";
+      name = "qtsensors-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/bbqvydxnaw4asp2a9j4pq0d5zi1zaqsf-qtdoc-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/njkpa0ahd4l5307b4qmqlqiv4nw1by7z-qtx11extras-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtdoc-opensource-src-5.4.0.tar.xz";
-      sha256 = "06gx7b3xq3jdprmwfzsy2c1x7klry1wsrfs1iyjgfq9sdja9d1nm";
-      name = "qtdoc-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz";
+      sha256 = "0blcdqccxhdqj4v5zp6m34b74nw5n6pfgldyb6wrlpljkzdir9i0";
+      name = "qtx11extras-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/by4v18v2k0xaz9znh18qfr8fvy8n67qg-qtwinextras-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/q2ji7ilipdvx0p6iyrwhhfczzw1j11ws-qtmultimedia-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwinextras-opensource-src-5.4.0.tar.xz";
-      sha256 = "01p3haicfbsg0nb654s16pxl9hr57dksk2w5h2ijghpivqhlzbh3";
-      name = "qtwinextras-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz";
+      sha256 = "0kjk3q7y2lr8a62rdidhn783jrq1rpj11p1jmfiw8z3j255dsc1q";
+      name = "qtmultimedia-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/01rpn59v04bx5f9mw92v6zq2hl4bigcr-qtbase-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/ikxpk38h1arms4x0qlnd7g5g3fg26fg4-qtactiveqt-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtbase-opensource-src-5.4.0.tar.xz";
-      sha256 = "1lciiq64qzbgg8kvc2fl98ykpn7fcjv2q6n2ivbw4yz7ll5j9sns";
-      name = "qtbase-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtactiveqt-opensource-src-5.4.1.tar.xz";
+      sha256 = "14984cvh9cfnrgls40i28fjdhs015izzlvwck9va4167y3ix4zbx";
+      name = "qtactiveqt-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/mc0dz5hbaqf3sannvg4j7zxwqcsj3g0f-qtdeclarative-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/0a30a874s507fmrsd1jlggbh9j953jb9-qtxmlpatterns-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtdeclarative-opensource-src-5.4.0.tar.xz";
-      sha256 = "1dnpz86asklm3qvm1wyjm3w1kyr319yas8w03ry9m1pnn1sr4z76";
-      name = "qtdeclarative-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz";
+      sha256 = "062kqs8m9js8mlld1lsm01prq57zs88g7p8fad84a5gisgs2y57m";
+      name = "qtxmlpatterns-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/r7hpzw01dxh31px5lm1jv6pz753sawrd-qtgraphicaleffects-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/cbb46kpmk6radk9v8cyngxcxr11g06f6-qtscript-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtgraphicaleffects-opensource-src-5.4.0.tar.xz";
-      sha256 = "06cblcjd6c7nbq1lc8b7mydambf16qmpargc1x0bh3hq6bji0gx4";
-      name = "qtgraphicaleffects-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz";
+      sha256 = "1bybzcp9smasw0syvb7vrz85jq124r7gywz2msgjg1kb6z4aqcpl";
+      name = "qtscript-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/f449vw01acb5jjf74fhfjrjhp8z00dby-qtquick1-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/h5hg9z346lh2w8whf0zgq5kbwffpmnkk-qtquickcontrols-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtquick1-opensource-src-5.4.0.tar.xz";
-      sha256 = "1p1js3ck3310kbgvnzsfd0gfd4p9c3fccfas7hzkhcj83iybga6m";
-      name = "qtquick1-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz";
+      sha256 = "1hpvbjr76q9i2idgmblr80khhjgkn78q0s0d648r3axp232m427y";
+      name = "qtquickcontrols-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/6nh8apj4l1xpqcjq1lkb9g1n50wd6xsz-qt5-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/7vxgal1cag6cakigc7h3rjvvr64b7sd3-qtimageformats-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qt5-opensource-src-5.4.0.tar.xz";
-      sha256 = "0gw782dvmvz6c8lpgvn7fi0d8wydjrrfarhjrbbwmswa37492s5r";
-      name = "qt5-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz";
+      sha256 = "0vw4bg68kwp48v49ds2vxvgjc82i5q5scff4013y5gpbd2smnv1z";
+      name = "qtimageformats-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/zc0k3d4s867p17bas7clvabdsh2xblhh-qtscript-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/pgcv75a5x56s88qclqvbw04dzywcxm73-qtserialport-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtscript-opensource-src-5.4.0.tar.xz";
-      sha256 = "1l0f6g1m5p9zgc4pbx6xm5b31ygcl4dayj43hwblpwinxh15gwzm";
-      name = "qtscript-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz";
+      sha256 = "1zyhlpmh7yisk9qpk8map0myam4bkm4jvp0wcnd4d7pldf19xnbr";
+      name = "qtserialport-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/camx69vrzl5ciwmc7rygax1iphcdk474-qtwebsockets-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/p8jka7s4la8f83xqnl1a4ivdw95dajb8-qtwebkit-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebsockets-opensource-src-5.4.0.tar.xz";
-      sha256 = "1pybyksa8gwm98f65l3pa8dxbplz882r13b7i0idsg4q9952gk9a";
-      name = "qtwebsockets-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz";
+      sha256 = "1gqrf5g07q5bgr3vnfnsw5qwqd0fjyh4pgqphrvxq4x9z0g221v6";
+      name = "qtwebkit-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/y0n7c5safk5174b14a9p6kqw2p2n3vrs-qtquickcontrols-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/ggn5pkvp89qh12vzhhk572s38vg3zn72-qtconnectivity-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtquickcontrols-opensource-src-5.4.0.tar.xz";
-      sha256 = "07p6z9c1cgyx9qx81mpgnh8dim4q9im714lzk8zyghwi68rl77xm";
-      name = "qtquickcontrols-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz";
+      sha256 = "0q13gg7fmfb7cfq403ql8s5qi6s9a4fd86i7v9r6cwgnj2szzi42";
+      name = "qtconnectivity-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/afpm16dyv3bis6xfr4lnhnd0xrflpi86-qtenginio-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/pnblj6ncfvz4id84asjlnrxb2papsn1v-qtlocation-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtenginio-opensource-src-5.4.0.tar.xz";
-      sha256 = "0k4j5nc33ijifjpii074bar105z1mn98qg1vzn8q5lq0y7jm82gs";
-      name = "qtenginio-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtlocation-opensource-src-5.4.1.tar.xz";
+      sha256 = "113rx43349f7yn4crhgg6ciz6lyvfvfnc0vkdaz09a2r461hr7w8";
+      name = "qtlocation-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/v0l3znjnhnnlbvbdb33ns3npz1p7dlzw-qtwebkit-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/0bz5yxqc9yg94jyjkvsgn7h7lph99a5v-qtdeclarative-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebkit-opensource-src-5.4.0.tar.xz";
-      sha256 = "1hc8s6l70ikf7ld2x84p6d2wwyxdfqw2pdqlma42wpaxfq3j4rvc";
-      name = "qtwebkit-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz";
+      sha256 = "05s4imk7whm2qir9byb35dn2ndqb7c5r2cnxpv2qyjla58j4w4hm";
+      name = "qtdeclarative-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/kbgbnl01j85iab7a88x4gi3q2n40n9zr-qtlocation-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/xdbwakyhif8cjwyii7v32zkxlrbrksmc-qtwinextras-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtlocation-opensource-src-5.4.0.tar.xz";
-      sha256 = "0mnlh6z8hq9j32sxqsd8al811p4iv99wd8bsm97w9nyxbwdhqhp8";
-      name = "qtlocation-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwinextras-opensource-src-5.4.1.tar.xz";
+      sha256 = "01ddgvq8wny162njlzqnbphiiw565xsqy6h3s39cipa05c6mxblv";
+      name = "qtwinextras-opensource-src-5.4.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.0.tar.xz" ".tar";
-    store = "/nix/store/h9qfbbj46sc2nhx24354b9cgq9hnssdc-qtsvg-opensource-src-5.4.0.tar.xz";
+    name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.1.tar.xz" ".tar";
+    store = "/nix/store/m3wk5r1ihbrjz9zpi57nllzqzha06c8j-qtsvg-opensource-src-5.4.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtsvg-opensource-src-5.4.0.tar.xz";
-      sha256 = "12dpqb67mm1h1x3f4811zvk4dbnswsg58ipl57m3mdn7mhmpdvk8";
-      name = "qtsvg-opensource-src-5.4.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz";
+      sha256 = "0b71kngnq7c5ry8bkb0rjlr6xx49h1sd25m4i4s3v1rfrv6912my";
+      name = "qtsvg-opensource-src-5.4.1.tar.xz";
     };
   }
 ]
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.sh b/pkgs/development/libraries/qt-5/5.4/manifest.sh
index 333bb89afb1f..0da13f204ba6 100755
--- a/pkgs/development/libraries/qt-5/5.4/manifest.sh
+++ b/pkgs/development/libraries/qt-5/5.4/manifest.sh
@@ -5,7 +5,7 @@ if [ $# -eq 0 ]; then
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../../../.. -A autonix.manifest) \
-    http://download.qt.io/official_releases/qt/5.4/5.4.0/submodules/ \
+    http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/ \
       -A '*.tar.xz'
 
 else

From 5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Mar 2015 10:31:27 -0500
Subject: [PATCH 0014/1143] qt5: make qt-5.4.1 default

---
 pkgs/applications/audio/cantata/default.nix   |  2 +-
 pkgs/applications/audio/keyfinder/default.nix |  2 +-
 pkgs/applications/editors/sigil/default.nix   |  2 +-
 .../graphics/luminance-hdr/default.nix        |  6 ++-
 .../applications/graphics/photoqt/default.nix |  2 +-
 pkgs/applications/graphics/rapcad/default.nix |  2 +-
 .../misc/cool-retro-term/default.nix          |  4 +-
 pkgs/applications/misc/robomongo/default.nix  |  8 ++-
 pkgs/applications/misc/twmn/default.nix       |  2 +-
 .../instant-messengers/qtox/default.nix       |  7 ++-
 .../instant-messengers/teamspeak/client.nix   |  2 +-
 .../science/astronomy/stellarium/default.nix  |  2 +-
 .../science/electronics/fritzing/default.nix  |  3 +-
 pkgs/applications/video/bomi/default.nix      |  3 +-
 pkgs/data/documentation/zeal/default.nix      |  2 +-
 pkgs/desktops/plasma-5.2/startkde/default.nix |  3 +-
 .../haskell-modules/configuration-common.nix  |  2 +-
 .../libraries/libkeyfinder/default.nix        |  2 +-
 pkgs/development/libraries/openbr/default.nix |  2 +-
 .../libraries/phonon/qt4/default.nix          |  9 +---
 .../libraries/qmltermwidget/default.nix       |  4 +-
 .../libraries/qt-5/5.4/qt-submodule.nix       |  2 +
 .../libraries/qt-5/5.4/setup-hook.sh          |  9 ++--
 pkgs/development/libraries/quazip/default.nix |  2 +-
 pkgs/games/flightgear/default.nix             |  2 +-
 pkgs/games/mudlet/default.nix                 |  2 +-
 pkgs/tools/graphics/gnuplot/default.nix       |  2 +-
 pkgs/tools/graphics/kst/default.nix           |  2 +-
 pkgs/tools/networking/cmst/default.nix        |  2 +-
 pkgs/top-level/all-packages.nix               | 53 +++++++------------
 pkgs/top-level/python-packages.nix            |  1 +
 31 files changed, 73 insertions(+), 75 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 773f3dd82bb3..b23384e92935 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ cmake ]
     ++ stdenv.lib.optional withQt4 qt4
-    ++ stdenv.lib.optional withQt5 qt5
+    ++ stdenv.lib.optionals withQt5 (with qt5; [ base svg tools ])
     ++ stdenv.lib.optional withKDE4 kde4.kdelibs
     ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
     ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 08e9a9f35451..33ce627e56ef 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   # TODO: upgrade libav when "Audio sample format conversion failed" is fixed
-  buildInputs = [ libav_0_8 libkeyfinder qt5 taglib ];
+  buildInputs = [ libav_0_8 libkeyfinder qt5.base qt5.xmlpatterns taglib ];
 
   configurePhase = ''
     substituteInPlace is_KeyFinder.pro \
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 516377f0996e..2af662ded7f2 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     unzip cmake pkgconfig
-    hunspell minizip boost xercesc qt5
+    hunspell minizip boost xercesc qt5.base qt5.tools qt5.webkit qt5.xmlpatterns
   ];
 
   # XXX: the compiler seems to treat the .h file inappropriately:
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
index cbde1879d312..5e7835b35499 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -19,7 +19,11 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
-  buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ];
+  buildInputs =
+    [
+      qt5.base qt5.declarative qt5.tools qt5.webkit
+      boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr
+    ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index c16093bfec0e..9e2c3a18a637 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1y59ys1dgjppahs7v7kxwva7ik23s0x7j2f6glv6sn23l9cfq9rp";
   };
 
-  buildInputs = [ cmake qt5 exiv2 graphicsmagick ];
+  buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ];
 
   patches = [ ./graphicsmagick-path.patch ];
 
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index b8a07f01e03a..701ad47985bc 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "15c18jvgbwyrfhv7r35ih0gzx35vjlsbi984h1sckgh2z17hjq8l";
   };
   
-  buildInputs = [qt5 cgal boost gmp mpfr flex bison dxflib readline ];
+  buildInputs = [qt5.base cgal boost gmp mpfr flex bison dxflib readline ];
 
   configurePhase = ''
     qmake;
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index d955e5b76777..bdc13f554b4f 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
-    sed -i -e '/qmltermwidget/d' cool-retro-term.pro 
+    sed -i -e '/qmltermwidget/d' cool-retro-term.pro
   '';
 
-  buildInputs = [ makeWrapper qt5 qmltermwidget ];
+  buildInputs = [ makeWrapper qt5.base qt5.quick1 qmltermwidget ];
 
   configurePhase = "qmake PREFIX=$out";
 
diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index 8b0ba581612e..26c091a7aa96 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -9,10 +9,14 @@ stdenv.mkDerivation {
   };
 
   patches = [ ./robomongo.patch ];
-  
+
+  postPatch = ''
+    rm ./cmake/FindOpenSSL.cmake
+  '';
+
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
-  buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ];
+  buildInputs = [ cmake boost scons qt5.base openssl python pcre bzip2 ];
 
   meta = {
     homepage = "http://robomongo.org/";
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index c8a48eb3f650..e2a21822acd7 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "9c91e9d3d6d7f9d90d34da6f1a4b9f3dee65605c1e43729417d6921c54dded6b";
   };
 
-  buildInputs = [ qt5 pkgconfig boost ];
+  buildInputs = [ qt5.base qt5.x11extras pkgconfig boost ];
 
   configurePhase = ''
     sed -i s/-Werror// twmnd/twmnd.pro
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 97ea7719af93..9771f29c770f 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -28,7 +28,12 @@ in stdenv.mkDerivation rec {
     sha256 = "0a7zkhl4w2r5ifzs7vwws2lpplp6q5c4jllyf4ld64njgiz6jzip";
   };
 
-  buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium filteraudio libXScrnSaver ];
+  buildInputs =
+    [
+      libtoxcore openalSoft opencv libsodium filteraudio
+      qt5.base qt5.tools libXScrnSaver
+    ];
+  nativeBuildInputs = [ pkgconfig ];
 
   configurePhase = "qmake";
 
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 313d2bce1b75..df4f7054ad3b 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -12,7 +12,7 @@ let
   deps =
     [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
       xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
-      xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio
+      xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base pulseaudio
     ];
 
 in
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index d73ebe87b11b..ddcf5ba71523 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1asrq1v6vjzxd2zz92brdfs5f5b1qf8zwd7k2dpg3dl4shl8wwg5";
   };
 
-  buildInputs = [ cmake freetype libpng mesa gettext openssl qt5 perl libiconv ];
+  buildInputs = [ cmake freetype libpng mesa gettext openssl qt5.base qt5.quick1 perl libiconv ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 0ac189c4ef8e..f5a835423bdd 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -14,10 +14,11 @@ stdenv.mkDerivation rec {
     tar xjf ${src}
   '';
 
-  buildInputs = [ qt5 boost ];
+  buildInputs = [ qt5.base qt5.svg boost ];
 
   configurePhase = ''
     cd fritzing-${version}.source
+    echo $PATH
     qmake PREFIX=$out phoenix.pro
   '';
 
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 521f50432ff1..e1f09ccc2138 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-                [ libX11 libxcb qt5 mesa
+                [ libX11 libxcb mesa
+                  qt5.base qt5.quick1 qt5.x11extras
                   ffmpeg
                   libchardet
                   mpg123
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 5489d1ef1b1d..adcb4fa42e96 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1057py3j2flzxyiks031s0mwm9h82v033iqn5cq8sycmrb3ihj2s";
   };
 
-  buildInputs = [ pkgconfig qt5 libarchive ];
+  buildInputs = [ pkgconfig qt5.base qt5.webkit libarchive ];
 
   patchPhase = ''
     substituteInPlace src/main.cpp \
diff --git a/pkgs/desktops/plasma-5.2/startkde/default.nix b/pkgs/desktops/plasma-5.2/startkde/default.nix
index 6337769e1aa7..62f51ec8522e 100644
--- a/pkgs/desktops/plasma-5.2/startkde/default.nix
+++ b/pkgs/desktops/plasma-5.2/startkde/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation {
   name = "startkde-0.1";
   phases = "installPhase";
 
-  inherit bash gnused gnugrep kconfig kinit kservice qt5 socat;
+  inherit bash gnused gnugrep kconfig kinit kservice socat;
   inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+  qt5 = qt5.base;
   dbus_tools = dbus.tools;
   plasmaWorkspace = plasma-workspace;
   plasmaDesktop = plasma-desktop;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a339166fd2d0..534c56ed9a01 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -593,7 +593,7 @@ self: super: {
   vivid = markBroken super.vivid;
 
   # Test suite wants to connect to $DISPLAY.
-  hsqml = dontCheck super.hsqml;
+  hsqml = dontCheck (super.hsqml.override { qt5 = pkgs.qt53; });
 
   # https://github.com/megantti/rtorrent-rpc/issues/1
   rtorrent-rpc = markBroken super.rtorrent-rpc;
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 50de473c1eba..40efafdea3da 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ fftw qt5 ];
+  buildInputs = [ fftw qt5.base ];
   propagatedBuildInputs = [ boost ];
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 292db910318b..447b5e45dfb1 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "16b3mmsf9r1yqqaw89fx0c3bgfg86dz4phry89wqy2hw05szgda3";
   };
 
-  buildInputs = [ opencv qt5 ];
+  buildInputs = [ opencv qt5.base qt5.svg ];
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/libraries/phonon/qt4/default.nix b/pkgs/development/libraries/phonon/qt4/default.nix
index df32f04bb6c1..a127c063ffbe 100644
--- a/pkgs/development/libraries/phonon/qt4/default.nix
+++ b/pkgs/development/libraries/phonon/qt4/default.nix
@@ -1,7 +1,4 @@
-{ stdenv, fetchurl, cmake, automoc4, pulseaudio
-, qt4 ? null, qt5 ? null, withQt5 ? false }:
-
-assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
+{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }:
 
 with stdenv.lib;
 
@@ -17,12 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
   };
 
-  buildInputs = [ (if withQt5 then qt5 else qt4) pulseaudio ];
+  buildInputs = [ qt4 pulseaudio ];
 
   nativeBuildInputs = [ cmake automoc4 ];
 
-  cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
-
   meta = {
     homepage = http://phonon.kde.org/;
     description = "Multimedia API for Qt";
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 7fcedab199b2..9c7659efcece 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "19pz27jsdpa3pybj8sghmmd1zqgr73js1mp3875rhx158dav37nz";
   };
 
-  buildInputs = [ qt5 ];
+  buildInputs = [ qt5.base qt5.quick1 ];
 
   patchPhase = ''
     substituteInPlace qmltermwidget.pro \
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configurePhase = "qmake PREFIX=$out";
 
   installPhase=''make INSTALL_ROOT="$out" install'';
-  
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
index e120d0a920c1..b242661270d2 100644
--- a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
@@ -20,9 +20,11 @@ mkDerivation (args // {
   dontFixLibtool = args.dontFixLibtool or true;
   configureScript = args.configureScript or "qmake";
 
+  /*
   preConfigure = ''
     export PATH="$out/bin:$PATH"
   '';
+  */
 
   postInstall = ''
     rm "$out/bin/qmake" "$out/bin/qt.conf"
diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index ac76590d1174..8ab4071becfb 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -28,15 +28,15 @@ addQtModule() {
         propagatedBuildInputs+=" $1"
     fi
 
-    if [[ -f "$1/bin/qmake" ]]; then
-        addToSearchPath PATH "$qtOut/bin"
-    fi
-
     if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
         propagatedUserEnvPkgs+=" $1"
     fi
 }
 
+setQMakePath() {
+    export PATH="$qtOut/bin${PATH:+:}$PATH"
+}
+
 qtOut=""
 if [[ -z $qtSubmodule ]]; then
     qtOut="$PWD/qmake-$name"
@@ -56,3 +56,4 @@ Qml2Imports = $qtOut/lib/qt5/qml
 EOF
 
 envHooks+=(addQtModule)
+preConfigurePhases+=" setQMakePath"
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 4db9d8b4665f..9364b94e355e 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "INSTALL_ROOT=$(out)";
 
-  buildInputs = [ zlib qt ];
+  buildInputs = [ zlib qt.base ];
 
   meta = {
     description = "Provides access to ZIP archives from Qt programs";
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 58649f9220de..b1371e2f4788 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     freeglut freealut mesa libICE libjpeg openal openscenegraph plib
     libSM libunwind libX11 xproto libXext xextproto libXi inputproto
-    libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5
+    libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5.base
   ];
 
   preConfigure = ''
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index 530776903ac5..6fa0b8144d43 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7";
   };
 
-  buildInputs = [ pkgs.unzip qt5 lua5_1 hunspell libzip yajl boost makeWrapper luafilesystem luazip lrexlib luasqlite3 ];
+  buildInputs = [ pkgs.unzip qt5.base lua5_1 hunspell libzip yajl boost makeWrapper luafilesystem luazip lrexlib luasqlite3 ];
 
   configurePhase = "cd src && qmake";
 
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index f8dd35576ff7..fcd8a37382e4 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional withTeXLive texLive
     ++ lib.optional withLua lua
     ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
-    ++ lib.optional withQt [ qt ]
+    ++ lib.optional withQt [ qt.base ]
     # compiling with wxGTK causes a malloc (double free) error on darwin
     ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;
 
diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix
index 147206644277..01fb5d829947 100644
--- a/pkgs/tools/graphics/kst/default.nix
+++ b/pkgs/tools/graphics/kst/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ qt5 gsl getdata netcdf muparser matio ];
+  buildInputs = [ qt5.base gsl getdata netcdf muparser matio ];
 
   cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1";
 
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 47e4a56380ca..3bfa65cb4724 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "070rxv3kyn41ra7nnk1wbqvy6fjg38h7hrdv4dn71b201kmzd194";
   };
 
-  buildInputs = [ qt5 makeWrapper ];
+  buildInputs = [ qt5.base makeWrapper ];
 
   configurePhase = ''
     substituteInPlace ./cmst.pro \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e23c22f9c57a..d5c695c99fbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6084,9 +6084,7 @@ let
     automake = automake111x;
   };
 
-  kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 {
-    qt5 = qt54;
-  });
+  kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
   kf5_latest = kf57;
   kf5_stable = kf57;
 
@@ -6225,9 +6223,7 @@ let
   };
 
   libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
-  libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix {
-    qt5 = qt54;
-  };
+  libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { };
 
   libdc1394 = callPackage ../development/libraries/libdc1394 { };
 
@@ -6942,7 +6938,7 @@ let
   };
 
   mlt-qt5 = callPackage ../development/libraries/mlt {
-    qt = qt5;
+    qt = qt53;
   };
 
   movit = callPackage ../development/libraries/movit { };
@@ -7122,21 +7118,12 @@ let
   pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
 
   phonon = callPackage ../development/libraries/phonon/qt4 {};
-
   phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {};
-
   phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {};
 
-  phonon_qt5 = callPackage ../development/libraries/phonon/qt5 {
-    qt5 = qt54;
-  };
-
-  phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 {
-    qt5 = qt54;
-  };
-  phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 {
-    qt5 = qt54;
-  };
+  phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { };
+  phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { };
+  phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { };
 
   physfs = callPackage ../development/libraries/physfs { };
 
@@ -7162,12 +7149,11 @@ let
 
   polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 {
     withQt5 = true;
-    qt5 = qt54;
   };
 
   policykit = callPackage ../development/libraries/policykit { };
 
-  poppler = callPackage ../development/libraries/poppler { lcms = lcms2; qt5 = qt54; };
+  poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
   popplerQt4 = poppler.poppler_qt4;
   poppler_qt5 = poppler.poppler_qt5;
 
@@ -7241,7 +7227,7 @@ let
     qtLib = qt48Full;
   };
 
-  qt5 = callPackage ../development/libraries/qt-5/5.3 {
+  qt53 = callPackage ../development/libraries/qt-5/5.3 {
     mesa = mesa_noglu;
     cups = if stdenv.isLinux then cups else null;
     # GNOME dependencies are not used unless gtkStyle == true
@@ -7251,7 +7237,9 @@ let
 
   qt54 = callPackage ../development/libraries/qt-5/5.4 {};
 
-  qt5Full = appendToName "full" (qt5.override {
+  qt5 = qt54;
+
+  qt5Full = appendToName "full" (qt53.override {
     buildDocs = true;
     buildExamples = true;
     buildTests = true;
@@ -9904,6 +9892,7 @@ let
 
   calibre = callPackage ../applications/misc/calibre {
     inherit (pythonPackages) pyqt5 sip_4_16;
+    qt5 = qt53; # depends on pyqt5
   };
 
   camlistore = callPackage ../applications/misc/camlistore { };
@@ -10568,7 +10557,7 @@ let
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 
-  linssid = callPackage ../applications/networking/linssid { };
+  linssid = callPackage ../applications/networking/linssid { qt5 = qt53; };
 
   mi2ly = callPackage ../applications/audio/mi2ly {};
 
@@ -10821,7 +10810,6 @@ let
 
   kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
     kf5 = kf57;
-    qt5 = qt54;
     inherit pkgs;
     kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
@@ -11164,7 +11152,7 @@ let
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
-  shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; };
+  shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; qt5 = qt53; };
 
   smplayer = callPackage ../applications/video/smplayer { };
 
@@ -11414,7 +11402,7 @@ let
     client = false;
     withKDE = false;
     useQt5 = true;
-    qt = qt54;
+    qt = qt5;
     dconf = gnome3.dconf;
     tag = "-qt5";
   };
@@ -11584,9 +11572,7 @@ let
 
   copy-com = callPackage ../applications/networking/copy-com { };
 
-  dropbox = callPackage ../applications/networking/dropbox {
-    qt5 = qt54;
-  };
+  dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 
@@ -11607,9 +11593,7 @@ let
 
   printrun = callPackage ../applications/misc/printrun { };
 
-  sddm = callPackage ../applications/display-managers/sddm {
-    qt5 = qt54;
-  };
+  sddm = callPackage ../applications/display-managers/sddm { };
 
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;
@@ -11635,6 +11619,7 @@ let
     inherit (pkgs.vamp) vampSDK;
     inherit (pkgs.xlibs) libX11;
     fftw = pkgs.fftwSinglePrec;
+    qt5 = qt53;
   };
 
   sox = callPackage ../applications/misc/audio/sox { };
@@ -11979,7 +11964,6 @@ let
 
   vlc_qt5 = vlc.override {
     qt4 = null;
-    qt5 = qt54;
     withQt5 = true;
   };
 
@@ -13027,7 +13011,6 @@ let
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
   plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
-    qt5 = qt54;
     kf5 = kf57;
   });
   plasma5_latest = plasma52;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0490a6f5807..e1434388aebc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -151,6 +151,7 @@ let
   pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
     sip = self.sip_4_16;
     pythonDBus = self.dbus;
+    qt5 = pkgs.qt53;
   };
 
   sip = callPackage ../development/python-modules/sip { };

From 6632b151b8ffaa9b9742bd864ea7c311e903c6df Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 13 Mar 2015 16:27:49 -0500
Subject: [PATCH 0015/1143] add kf58

---
 .../libraries/kde-frameworks-5.8/default.nix  | 207 +++++++
 .../kde-frameworks-5.8/dependencies.nix       | 516 ++++++++++++++++
 .../kde-frameworks-5.8/dependencies.sh        |  22 +
 .../0001-extra-cmake-modules-paths.patch      |  74 +++
 .../kauth/kauth-policy-install.patch          |  13 +
 ...utils-pluginselector-follow-symlinks.patch |  13 +
 ...igwidgets-helpclient-follow-symlinks.patch |  13 +
 .../kdoctools-no-find-docbook-xml.patch       |  12 +
 .../kinit/kinit-libpath.patch                 |  30 +
 .../kpackage/0001-allow-external-paths.patch  |  25 +
 ...service-kbuildsycoca-follow-symlinks.patch |  13 +
 ...ce-kbuildsycoca-no-canonicalize-path.patch |  13 +
 .../0001-no-qcoreapplication.patch            |  48 ++
 .../libraries/kde-frameworks-5.8/manifest.nix | 580 ++++++++++++++++++
 .../libraries/kde-frameworks-5.8/manifest.sh  |  15 +
 .../plasma-framework-external-paths.patch     |  13 +
 .../libraries/kde-frameworks-5.8/renames.nix  |  70 +++
 .../kde-frameworks-5.8/setup-hook.sh          |   1 +
 pkgs/top-level/all-packages.nix               |   3 +-
 19 files changed, 1680 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/dependencies.nix
 create mode 100755 pkgs/development/libraries/kde-frameworks-5.8/dependencies.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/kauth/kauth-policy-install.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/kdoctools/kdoctools-no-find-docbook-xml.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/kinit/kinit-libpath.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/kpackage/0001-allow-external-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/ktexteditor/0001-no-qcoreapplication.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/manifest.nix
 create mode 100755 pkgs/development/libraries/kde-frameworks-5.8/manifest.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/plasma-framework/plasma-framework-external-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/renames.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.8/setup-hook.sh

diff --git a/pkgs/development/libraries/kde-frameworks-5.8/default.nix b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
new file mode 100644
index 000000000000..de306e312288
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
@@ -0,0 +1,207 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
+
+with stdenv.lib; with autonix;
+
+let
+
+  mkDerivation = drv:
+    let inherit (builtins.parseDrvName drv.version) version; in
+    stdenv.mkDerivation
+      (drv // {
+        setupHook = ./setup-hook.sh;
+
+        enableParallelBuilding = drv.enableParallelBuilding or true;
+        cmakeFlags =
+          (drv.cmakeFlags or [])
+          ++ [ "-DBUILD_TESTING=OFF"
+            "-DKDE_DEFAULT_HOME=.kde5"
+            "-DKDE4_DEFAULT_HOME=.kde"
+          ]
+          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+        meta =
+          {
+            license = with stdenv.lib.licenses; [
+              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+            ];
+            platforms = stdenv.lib.platforms.linux;
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+            inherit version;
+            branch = intersperse "." (take 2 (splitString "." version));
+          } // (drv.meta or {});
+      });
+
+  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
+
+  scope =
+    # packages in this collection
+    (mapAttrs (dep: name: kf5."${name}") renames) //
+    # packages pinned to this version of Qt 5
+    {
+      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      Qt5 = qt5.base;
+      Qt5Core = qt5.base;
+      Qt5DBus = qt5.base;
+      Qt5Gui = qt5.base;
+      Qt5LinguistTools = qt5.tools;
+      Qt5Qml = [qt5.declarative qt5.graphicaleffects];
+      Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects];
+      Qt5Script = qt5.script;
+      Qt5Svg = qt5.svg;
+      Qt5WebkitWidgets = qt5.webkit;
+      Qt5Widgets = qt5.base;
+      Qt5X11Extras = qt5.x11extras;
+      Qt5XmlPatterns = qt5.xmlpatterns;
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
+    } //
+    # packages from the nixpkgs collection
+    (with pkgs;
+      {
+        inherit cmake epoxy;
+        Boost = boost155;
+        GIF = giflib;
+        GLIB2 = glib;
+        Gpgme = gpgme;
+        JPEG = libjpeg;
+        LibGcrypt = libgcrypt;
+        LibGit2 = libgit2;
+        LibIntl = gettext;
+        LibLZMA = lzma;
+        NetworkManager = networkmanager;
+        Perl = perl;
+        PythonInterp = python;
+        QImageBlitz = qimageblitz;
+        SharedMimeInfo = shared_mime_info;
+        ZLIB = zlib;
+      }
+    );
+
+  mirror = "mirror://kde";
+
+  preResolve = super:
+    fold (f: x: f x) super
+      [
+        (userEnvPkg "SharedMimeInfo")
+        (userEnvPkg "SharedDesktopOntologies")
+      ];
+
+  postResolve = super:
+    super // {
+      extra-cmake-modules = {
+        inherit (super.extra-cmake-modules) name src;
+
+        propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ];
+        cmakeFlags = ["-DBUILD_TESTING=OFF"];
+        patches =
+          [
+            ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+          ];
+        meta =
+          let inherit (parseDrvName super.extra-cmake-modules.name) version; in
+          {
+            license = with stdenv.lib.licenses; [ bsd2 ];
+            platforms = stdenv.lib.platforms.linux;
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+            inherit version;
+            branch = intersperse "." (take 2 (splitString "." version));
+          };
+      };
+
+      frameworkintegration = super.frameworkintegration // {
+        buildInputs = with pkgs.xlibs; super.frameworkintegration.buildInputs ++ [ libXcursor ];
+      };
+
+      kauth = super.kauth // {
+        buildInputs =
+          super.kauth.buildInputs
+          ++ [(pkgs.polkit_qt5.override { inherit qt5; })];
+        patches = [./kauth/kauth-policy-install.patch];
+      };
+
+      kcmutils = super.kcmutils // {
+        patches =
+          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
+      };
+
+      kconfigwidgets = super.kconfigwidgets // {
+        patches =
+          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
+      };
+
+      kdelibs4support = with pkgs; super.kdelibs4support // {
+        buildInputs =
+          super.kdelibs4support.buildInputs
+          ++ [networkmanager xlibs.libSM];
+        cmakeFlags =
+          (super.kdelibs4support.cmakeFlags or [])
+          ++ [
+            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+            "-DDocBookXML4_DTD_VERSION=4.5"
+          ];
+      };
+
+      kdoctools = with pkgs; super.kdoctools // {
+        propagatedNativeBuildInputs = [ perl perlPackages.URI ];
+        cmakeFlags =
+          (super.kdoctools.cmakeFlags or [])
+          ++ [
+            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+            "-DDocBookXML4_DTD_VERSION=4.5"
+            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+          ];
+        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
+      };
+
+      ki18n = with pkgs; super.ki18n // {
+        propagatedNativeBuildInputs =
+          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
+      };
+
+      kimageformats = with pkgs; super.kimageformats // {
+        NIX_CFLAGS_COMPILE =
+          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
+          + " -I${ilmbase}/include/OpenEXR";
+      };
+
+      kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
+
+      kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };
+
+      kservice = super.kservice // {
+        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
+        patches =
+          [
+            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
+            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+          ];
+      };
+
+      ktexteditor = super.ktexteditor // {
+        patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
+      };
+
+    };
+
+  kf5 = generateCollection ./. {
+    inherit mirror mkDerivation preResolve postResolve renames scope;
+  };
+
+in
+
+  kf5 // { inherit mkDerivation qt5 scope; }
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.8/dependencies.nix
new file mode 100644
index 000000000000..babb793f2e8c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/dependencies.nix
@@ -0,0 +1,516 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+  attica = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  extra-cmake-modules = {
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Qt5QUIET" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
+    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  frameworkintegration = {
+    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kactivities = {
+    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kapidox = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "PythonInterp" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  karchive = {
+    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kauth = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbookmarks = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcmutils = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcodecs = {
+    buildInputs = [ "ECM" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcompletion = {
+    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kconfig = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kconfigwidgets = {
+    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcoreaddons = {
+    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kcrash = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdbusaddons = {
+    buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5DBus" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeclarative = {
+    buildInputs = [ "ActiveApp" "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Package" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5Package" "Qt5Qml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kded = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdelibs4support = {
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesignerplugin = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesu = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Pty" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdewebkit = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" "Qt5Core" "Qt5Network" "Qt5WebKitWidgets" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdnssd = {
+    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" "Qt5DBus" "Qt5Network" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Network" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdoctools = {
+    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" "Qt5NO_MODULE" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kemoticons = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kglobalaccel = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kguiaddons = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khtml = {
+    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ki18n = {
+    buildInputs = [ "ECM" "LibIntl" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kiconthemes = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kidletime = {
+    buildInputs = [ "ECM" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "X11" "X11_XCB" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kimageformats = {
+    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5QUIET" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kinit = {
+    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kio = {
+    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Qt5Xml" "Strigi" "X11" "ZLIB" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kitemmodels = {
+    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kitemviews = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjobwidgets = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjs = {
+    buildInputs = [ "ECM" "KF5DocTools" "PCRE" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjsembed = {
+    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmediaplayer = {
+    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Parts" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knewstuff = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knotifications = {
+    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knotifyconfig = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kpackage = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kparts = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kpeople = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "KF5ItemViews" "KF5Service" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kplotting = {
+    buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kpty = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kross = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  krunner = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Quick" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kservice = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktexteditor = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktextwidgets = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kunitconversion = {
+    buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwallet = {
+    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwidgetsaddons = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5UiTools" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwindowsystem = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5WinExtras" "Qt5X11Extras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kxmlgui = {
+    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kxmlrpcclient = {
+    buildInputs = [ "ECM" "KF5KIO" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  networkmanager-qt = {
+    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-framework = {
+    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ];
+    nativeBuildInputs = [ "SH" "cmake" ];
+    propagatedBuildInputs = [ "KF5Package" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  solid = {
+    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5Xml" "UDev" ];
+    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  sonnet = {
+    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  threadweaver = {
+    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.8/dependencies.sh
new file mode 100755
index 000000000000..2b220244c596
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/dependencies.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script rebuilds dependencies.nix.
+# You must run manifest.sh first to download the packages.
+
+# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
+# If you are working on the packages, this is probably what you want.
+
+# You can also pass the path to a source tree where you have built
+# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
+# probably what you want.
+
+manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.8/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
new file mode 100644
index 000000000000..9717716faf5b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
@@ -0,0 +1,74 @@
+From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Fri, 20 Feb 2015 23:17:39 -0600
+Subject: [PATCH] extra-cmake-modules paths
+
+---
+ kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
+ 1 file changed, 4 insertions(+), 33 deletions(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index b7cd34d..2f868ac 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -193,37 +193,8 @@
+ # (To distribute this file outside of extra-cmake-modules, substitute the full
+ #  License text for the above reference.)
+ 
+-# Figure out what the default install directory for libraries should be.
+-# This is based on the logic in GNUInstallDirs, but simplified (the
+-# GNUInstallDirs code deals with re-configuring, but that is dealt with
+-# by the _define_* macros in this module).
++# The default library directory on NixOS is *always* /lib.
+ set(_LIBDIR_DEFAULT "lib")
+-# Override this default 'lib' with 'lib64' iff:
+-#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+-#  - we are NOT on debian
+-#  - we are on a 64 bits system
+-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+-# See http://wiki.debian.org/Multiarch
+-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+-   AND NOT CMAKE_CROSSCOMPILING)
+-  if (EXISTS "/etc/debian_version") # is this a debian system ?
+-    if(CMAKE_LIBRARY_ARCHITECTURE)
+-      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-    endif()
+-  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+-      message(AUTHOR_WARNING
+-        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
+-        "Please enable at least one language before including KDEInstallDirs.")
+-    else()
+-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+-        set(_LIBDIR_DEFAULT "lib64")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+ 
+ set(_gnu_install_dirs_vars
+     BINDIR
+@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ else()
+-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
++    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
+         "Qt plugins"
+         QT_PLUGIN_INSTALL_DIR)
+ 
+-    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
++    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
+         "QtQuick1 imports"
+         IMPORTS_INSTALL_DIR)
+ 
+-    _define_relative(QMLDIR LIBDIR "qml"
++    _define_relative(QMLDIR LIBDIR "qt5/qml"
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ endif()
+-- 
+2.3.0
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.8/kauth/kauth-policy-install.patch
new file mode 100644
index 000000000000..340155256f28
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
+index e859ec7..9a8ab18 100644
+--- a/KF5AuthConfig.cmake.in
++++ b/KF5AuthConfig.cmake.in
+@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+ set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.8/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
new file mode 100644
index 000000000000..47b8dfad1800
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index c63241b..2243f94 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
+     QStringList desktopFileNames;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString &dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             desktopFileNames.append(it.next());
+         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.8/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
new file mode 100644
index 000000000000..3bd946cbd842
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
+index 53a331e..80fbb01 100644
+--- a/src/khelpclient.cpp
++++ b/src/khelpclient.cpp
+@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
+     QString docPath;
+     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
+     Q_FOREACH (const QString &dir, desktopDirs) {
+-        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             const QString desktopPath(it.next());
+             KDesktopFile desktopFile(desktopPath);
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.8/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 000000000000..4e3a33efab32
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c4863c..f731775 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
+                       )
+ 
+ 
+-find_package(DocBookXML4 "4.5")
+ 
+ set_package_properties(DocBookXML4 PROPERTIES
+                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.8/kinit/kinit-libpath.patch
new file mode 100644
index 000000000000..a6ccb2085d32
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/kinit/kinit-libpath.patch
@@ -0,0 +1,30 @@
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 3c3c913..f510620 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
+         if (!libpath.isEmpty()) {
+             if (!l.load()) {
+                 if (libpath_relative) {
+-                    // NB: Because Qt makes the actual dlopen() call, the
+-                    //     RUNPATH of kdeinit is *not* respected - see
+-                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
+-                    //     - so we try hacking it in ourselves
+-                    QString install_lib_dir = QFile::decodeName(
+-                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+-                    libpath = install_lib_dir + libpath;
+-                    l.setFileName(libpath);
++                  // Use QT_PLUGIN_PATH to find shared library directories
++                  // For KF5, the plugin path is /lib/plugins, so the kdeinit5
++                  // shared libraries should be in /lib/plugins/../
++                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
++                  const QString up = QString::fromLocal8Bit("/../");
++                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
++                  Q_FOREACH (const QString &path, paths) {
++                    l.setFileName(path + up + libpath);
+                     l.load();
++                    if (l.isLoaded()) break;
++                  }
+                 }
+             }
+             if (!l.isLoaded()) {
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.8/kpackage/0001-allow-external-paths.patch
new file mode 100644
index 000000000000..440e979c0086
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/kpackage/0001-allow-external-paths.patch
@@ -0,0 +1,25 @@
+From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 28 Jan 2015 07:15:30 -0600
+Subject: [PATCH] allow external paths
+
+---
+ src/kpackage/package.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
+index eb4a09b..f70f1a1 100644
+--- a/src/kpackage/package.cpp
++++ b/src/kpackage/package.cpp
+@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
+     : QSharedData(),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-follow-symlinks.patch
new file mode 100644
index 000000000000..e9bc418544ab
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
+index 69b1427..9c37a49 100644
+--- a/src/kbuildsycoca/kbuildsycoca.cpp
++++ b/src/kbuildsycoca/kbuildsycoca.cpp
+@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
+         QStringList relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
new file mode 100644
index 000000000000..7e21ebfe86f2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
+index 2eb1275..e39a36f 100644
+--- a/src/kbuildsycoca/vfolder_menu.cpp
++++ b/src/kbuildsycoca/vfolder_menu.cpp
+@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++        QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.8/ktexteditor/0001-no-qcoreapplication.patch
new file mode 100644
index 000000000000..c2e77a537c5a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/ktexteditor/0001-no-qcoreapplication.patch
@@ -0,0 +1,48 @@
+From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 15 Feb 2015 19:09:17 -0600
+Subject: [PATCH] no qcoreapplication
+
+---
+ src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
+index 3f02e8c..d1a865b 100644
+--- a/src/syntax/data/katehighlightingindexer.cpp
++++ b/src/syntax/data/katehighlightingindexer.cpp
+@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
+ 
+ int main(int argc, char *argv[])
+ {
+-    // get app instance
+-    QCoreApplication app(argc, argv);
+-    
+     // ensure enough arguments are passed
+-    if (app.arguments().size() < 3)
++    if (argc < 3)
+         return 1;
+ 
+     // open schema
+     QXmlSchema schema;
+-    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
++    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
+         return 2;
+ 
+-    const QString hlFilenamesListing = app.arguments().value(3);
++    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
+     if (hlFilenamesListing.isEmpty()) {
+         return 1;
+     }
+@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
+         return anyError;
+     
+     // create outfile, after all has worked!
+-    QFile outFile(app.arguments().at(1));
++    QFile outFile(QString::fromLocal8Bit(argv[1]));
+     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+         return 7;
+ 
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.8/manifest.nix
new file mode 100644
index 000000000000..86116dff5011
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/manifest.nix
@@ -0,0 +1,580 @@
+# This file is generated automatically. DO NOT EDIT!
+{ stdenv, fetchurl, mirror }:
+[
+  {
+    name = stdenv.lib.nameFromURL "kpackage-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/pr2pj0xx1xnxh3bz3zz5zymmmjfvdwks-kpackage-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kpackage-5.8.0.tar.xz";
+      sha256 = "1y4y8q5dvny00gyk5sgnack612jkpq8xlq899vp0821wf4df0r1a";
+      name = "kpackage-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesu-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/jwyz61xs4nl22wb1yahyq5kliqq1idsm-kdesu-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kdesu-5.8.0.tar.xz";
+      sha256 = "0bwxhg3bcha94k8bnlsmk0cadpx1aiyrsnzw2ivwswm2nyx1dv3v";
+      name = "kdesu-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcoreaddons-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/7pg9x6wg9j16fqv9n8dhypriqpcssfsz-kcoreaddons-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kcoreaddons-5.8.0.tar.xz";
+      sha256 = "0msh83vqprl8lcm1z0jj4gpn2mrfrxrsf9w3dm4l66x0fh972w0f";
+      name = "kcoreaddons-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sonnet-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/353pfvh6mzhfkkd3w5fys3s4cabmcq51-sonnet-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/sonnet-5.8.0.tar.xz";
+      sha256 = "09faq7j3f5divzpjfz103i0sih53fxnywfdbh1yg1wpf53afs1q7";
+      name = "sonnet-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kactivities-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/ik33fvbzj7arr9380jig3id3dadjspid-kactivities-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kactivities-5.8.0.tar.xz";
+      sha256 = "0jk3kmpsqv0bj7885lfiiwnhxw7vvqqpxnm774s946qgsbscbzsa";
+      name = "kactivities-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kio-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/vamd45ddai43sz2r6hqzp7mjvqa87273-kio-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kio-5.8.0.tar.xz";
+      sha256 = "08gzsnqfc8ql6183im21w3kb1x41gkxp5rbm9b1xj4sh2bjv12ba";
+      name = "kio-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifications-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/dxdpmbwhjn7dvs364shhzdx9ckpn8sbc-knotifications-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/knotifications-5.8.0.tar.xz";
+      sha256 = "06wvwqprq7nr33jm0lcdzgf2nqaqcdq3h353pqqhx100b7j81pvq";
+      name = "knotifications-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kinit-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/m7m2cqs903l80zdd4sdgjkx9hph8d14b-kinit-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kinit-5.8.0.tar.xz";
+      sha256 = "058rd6n29jkx0fwgg76mnnhddpppby3ap1yaq3sivik5mk4dc2hk";
+      name = "kinit-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemmodels-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/qhv3rm3j022bqjpz5nwqjvxnkjg8zvsv-kitemmodels-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kitemmodels-5.8.0.tar.xz";
+      sha256 = "1m6pgm91baaqqf9vr1z5g649v2dzgms0k8rmq64c2bsp2s58y0gj";
+      name = "kitemmodels-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbookmarks-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/192py0w7pzw5zq2536p1dg5wyk2cw520-kbookmarks-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kbookmarks-5.8.0.tar.xz";
+      sha256 = "0brlaim5ja8r9car3yjfsv1aw3g5309x3q0c3c6xhm5wchziyqqi";
+      name = "kbookmarks-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kguiaddons-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/mwnyb1bm3vvzn9qlsb3r4m3my9mynirr-kguiaddons-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kguiaddons-5.8.0.tar.xz";
+      sha256 = "11d0panxgk02zvanp8pfy9kap3qg9myasanzly1dd1xyvqvdv8w2";
+      name = "kguiaddons-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kglobalaccel-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/f2r6rdwgpgcz9hclwpv5pjfy3mv8slmc-kglobalaccel-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kglobalaccel-5.8.0.tar.xz";
+      sha256 = "0fw2si9zdq2nigjavfdy0ncwlxzra2wkdl84kyirwnm4mqvwwym4";
+      name = "kglobalaccel-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kauth-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/vvfki2y80hbgly49w4j2j3kv8zjxgg8m-kauth-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kauth-5.8.0.tar.xz";
+      sha256 = "1vzrafk13w2fyz1qz2xdkm60ajalbkky1ji9jn6bs5dhkywmfzqv";
+      name = "kauth-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwallet-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/fy65566wbdry47fq4vm5ip4zdyraskch-kwallet-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kwallet-5.8.0.tar.xz";
+      sha256 = "1hwdfjh86calyq8y86n34ybgzadhx1xw9vpzkmkrdjaqkxd67jy8";
+      name = "kwallet-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "solid-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/6k08mkbmg1dk1ckljjl2r6mrn20zivyq-solid-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/solid-5.8.0.tar.xz";
+      sha256 = "07qjih5gla2y4a59x4jb25r00hr0wsk12cs5gbwd9vi5y0345yq3";
+      name = "solid-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kidletime-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/zvb2yl00v66ra6p88hg90v2n7h0xlkga-kidletime-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kidletime-5.8.0.tar.xz";
+      sha256 = "0bnhpsrf2bs08p9hjv254mxch2gnvv28pp9ab3bfp7crdj5dbrvy";
+      name = "kidletime-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kplotting-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/aicz3im9y74y3n0pw7pfqmwks6v1qckb-kplotting-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kplotting-5.8.0.tar.xz";
+      sha256 = "15iifzwq9ldimdl1fq4ns2lagmhqyciyi8ycwp7zhwz2a4yga1xi";
+      name = "kplotting-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kparts-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/f30idimxzr7vn9x4xqf1q4dnq4xkybi2-kparts-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kparts-5.8.0.tar.xz";
+      sha256 = "009qrz8x9j12rsr678yp0n4m61k2vqgpg2x0n4z0jnzl4hp8g4b2";
+      name = "kparts-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdnssd-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/lq5gs7qa5jbzql3d90ny0ns9kvwn5nxq-kdnssd-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kdnssd-5.8.0.tar.xz";
+      sha256 = "0z8ssaxfff1ay9q0l3cp221nvnlg1vypd4ms8zdw7vglyzg3cvvg";
+      name = "kdnssd-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "karchive-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/hplgp8rl8y132ngmb55b357nn18x9684-karchive-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/karchive-5.8.0.tar.xz";
+      sha256 = "0cjwzmj4h6kf8ip4iy0vx97y49nkj0m68rgmwdp5w6wl9qsdymyr";
+      name = "karchive-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kded-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/hah2vldmgkvzxbrzfv5dwfg9wnf5k04r-kded-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kded-5.8.0.tar.xz";
+      sha256 = "18d8alv96i8a00rrylc19f7sc862zzrk5hk0dryyqyca7i4is0sv";
+      name = "kded-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfigwidgets-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/s3vfmb8y5r9ks3br1plpahg3mccxkwb3-kconfigwidgets-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kconfigwidgets-5.8.0.tar.xz";
+      sha256 = "08kvg4idmy6h2r49h9zl4s5qm18283i61vk7j9ajpzs2wj8f0yq9";
+      name = "kconfigwidgets-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpty-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/zr8y35s1abk00d072i3wh0lrra7j9miv-kpty-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kpty-5.8.0.tar.xz";
+      sha256 = "0ycx73hxf257sc77x597a888ngrv9kw23qrv15pk40k4s9r927wj";
+      name = "kpty-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/jnph6s99cfp9b1akfw7zg73jm0sjngqp-kwidgetsaddons-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kwidgetsaddons-5.8.0.tar.xz";
+      sha256 = "0ay4fxijmaxqaqkdswwqykq0xi99lj76rqllmn14w1vk60v7kc1c";
+      name = "kwidgetsaddons-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcompletion-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/0win9qp98x332z1m2sln9mkqbdiq06jj-kcompletion-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kcompletion-5.8.0.tar.xz";
+      sha256 = "13r7zs6rbqx7ylipy8738l7565xi925y12sx8lcbdw7ib0dhz0wb";
+      name = "kcompletion-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "frameworkintegration-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/m4ra9rcv4jpp60mw0s6ak3zkr1djwncl-frameworkintegration-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/frameworkintegration-5.8.0.tar.xz";
+      sha256 = "11sbnfs7wy103v46wxsx9njsjskjdig80chx193wqqqyzbdwgq3f";
+      name = "frameworkintegration-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "networkmanager-qt-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/88lzs61m9a65p1vhbyyvvqsza4pp8y8n-networkmanager-qt-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/networkmanager-qt-5.8.0.tar.xz";
+      sha256 = "07c9n2clsvb152qcxs8mhinmy8hnzhij52xx9pkd0v0az6xmi23z";
+      name = "networkmanager-qt-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-framework-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/mp3740pcgh3q2as67vw8cl6pd1mb7d42-plasma-framework-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/plasma-framework-5.8.0.tar.xz";
+      sha256 = "1042fn164dx62gqh5fnlcid7vcpv0wqal35c2s5iv89xkpa48x82";
+      name = "plasma-framework-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlgui-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/b0frky56prbmwk6v8bxgwya2x1hzi01c-kxmlgui-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kxmlgui-5.8.0.tar.xz";
+      sha256 = "1l3svzk312fv4zya7fglmy3wajr0dblfff8fdyrlfa6g4qqv0xzg";
+      name = "kxmlgui-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemviews-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/fa4nvdny3ca1a0dw23dv88kq1skwydck-kitemviews-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kitemviews-5.8.0.tar.xz";
+      sha256 = "1lryy36bm592kd1jiqxgs7s64bzfnn1mlxhi8cggckvcqc20jyfd";
+      name = "kitemviews-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeclarative-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/cnc3mvxf4xhhxffvdv982wya7ab5g13r-kdeclarative-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kdeclarative-5.8.0.tar.xz";
+      sha256 = "18yyhw4d3srlddj7ycn0qi6dcjc7hz0ml66fx2a3z8ljafplhf2n";
+      name = "kdeclarative-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kimageformats-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/s2n2g5ig1wqkyd11n0gc0ch3584k9qby-kimageformats-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kimageformats-5.8.0.tar.xz";
+      sha256 = "05nnipfq5qpqnh1drfjlbhz673zd3qi61jdx69vym5khfpxb7vaz";
+      name = "kimageformats-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcodecs-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/ll6bzn3mhhf35p8xl32n3wxmcal3dk1i-kcodecs-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kcodecs-5.8.0.tar.xz";
+      sha256 = "1ipd85hgm53vv5qhfynzhb2gp6qiz0k4d31ailjm55czrirp02zc";
+      name = "kcodecs-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktextwidgets-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/hkc48gibgnm02ywiddfq6qivwfji988a-ktextwidgets-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/ktextwidgets-5.8.0.tar.xz";
+      sha256 = "05aigqfnp1dnrlfba59rr3ccbj06jmjfhja4iz8w3vizxpc2imcv";
+      name = "ktextwidgets-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "threadweaver-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/r7aa4rhlyqhhrwlbnhgqn0w9nrazbva0-threadweaver-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/threadweaver-5.8.0.tar.xz";
+      sha256 = "0fghim7rkdf50sydzsq2q8kr9fkh7ffldn660rf39amggarhnm1c";
+      name = "threadweaver-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwindowsystem-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/mgb7hh4a1rc01xfilc9i39h0lc3gvx76-kwindowsystem-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kwindowsystem-5.8.0.tar.xz";
+      sha256 = "19caaxzps6fzi9w1k9jcyr1i6qq784q5hfkfvi7pz9aj09f89a65";
+      name = "kwindowsystem-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knewstuff-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/z00gzak0za0rvl9n98i074c9vn1ifjhq-knewstuff-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/knewstuff-5.8.0.tar.xz";
+      sha256 = "0pjxia7baapbvx7hzmk2rgh08v5n5rd8cfa4mqqz8l7ak7pvaih8";
+      name = "knewstuff-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcrash-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/7jz5m4rzrjg2sff80y7mvf62648ynd6r-kcrash-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kcrash-5.8.0.tar.xz";
+      sha256 = "02qb16pqdmcx5l5mvi6kxh8q00asq7vd2fp5n8rb8x73354njs2r";
+      name = "kcrash-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpeople-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/57l0041ivb40zbx77hcxz0v29argmsx8-kpeople-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kpeople-5.8.0.tar.xz";
+      sha256 = "1id2wasxh7him48pnsf6biilakg1hk7by9blylpsxgcj97gzh5h5";
+      name = "kpeople-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kunitconversion-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/4lf9qjhf0m1c8r36vrs7xgxc61y0kn9m-kunitconversion-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kunitconversion-5.8.0.tar.xz";
+      sha256 = "1yhwrbzbsnw9hlbcx0bpivjgwshxy412sds4gg1fkr8iwl53a353";
+      name = "kunitconversion-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktexteditor-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/d14ixg28zc0kvbrj9pyqjzch8vjqvf1k-ktexteditor-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/ktexteditor-5.8.0.tar.xz";
+      sha256 = "0hlswklc9h87mj73qm3jdc1hjhrsav58a68rbssmxdzjvq13xz33";
+      name = "ktexteditor-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifyconfig-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/dbn61n194xfh880pba8dphr5xfxag9lm-knotifyconfig-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/knotifyconfig-5.8.0.tar.xz";
+      sha256 = "1i7xcr21mjgd5ys6lhfy939v5sccq445bmjmgm3akwhvj98cm6vm";
+      name = "knotifyconfig-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjobwidgets-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/w4fry4a11m0k7agginnj3j9hqjgnad0a-kjobwidgets-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kjobwidgets-5.8.0.tar.xz";
+      sha256 = "0fv4w6jb0kx7qcm1yqghxqvzk8zi9h91756b99y4201a8i9aiz67";
+      name = "kjobwidgets-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfig-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/bby9kv5kw0spadprnafjyyviqaixbk72-kconfig-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kconfig-5.8.0.tar.xz";
+      sha256 = "0l0ah29967jkr1ajv0lzjdk0gb97ypghd01fn0z32a8l6in4k8ql";
+      name = "kconfig-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kemoticons-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/mkk8jcv0v6qgpj88ngsic033as91bjrb-kemoticons-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kemoticons-5.8.0.tar.xz";
+      sha256 = "1c7xjwm99gg8q971wak6qk9xfmd9h365cqazqqkad9sg8ndfg5hj";
+      name = "kemoticons-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdbusaddons-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/zx9ak27yf54asn5v65bkg7mxczpm852m-kdbusaddons-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kdbusaddons-5.8.0.tar.xz";
+      sha256 = "1aq0n05cpvx3zapgirbb8b45sfss148x3yshd9dwa9npqx3irjxi";
+      name = "kdbusaddons-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdoctools-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/fg02vk213msvki571pnlbcsjc47dh4id-kdoctools-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kdoctools-5.8.0.tar.xz";
+      sha256 = "02qvyz102xyfl4qsfnnpdhg0lrwkd0fp95wgbk0zl7lbh261nm0j";
+      name = "kdoctools-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapidox-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/xahpr44r52smzx3g71ss475qfyll1zw0-kapidox-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kapidox-5.8.0.tar.xz";
+      sha256 = "0l2vl6q67kripg3ajrm4lzxgg2hn18dbrgl5i3s34swg0ay668pr";
+      name = "kapidox-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "extra-cmake-modules-1.8.0.tar.xz" ".tar";
+    store = "/nix/store/gx034z2gbkgr2kd0kgm0g3yivkmxiqbd-extra-cmake-modules-1.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/extra-cmake-modules-1.8.0.tar.xz";
+      sha256 = "0spmfcs94xc4wj42sk599c11yfmy6hg9g8c60cfh8gqyk9527g27";
+      name = "extra-cmake-modules-1.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "attica-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/6p6grsyj3vlynq2800v1ybz5l2qi2dww-attica-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/attica-5.8.0.tar.xz";
+      sha256 = "11fi00x78z7bm60n0gh3025ii1gplkjihgi4x97yjc6bdvr1xigb";
+      name = "attica-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebkit-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/1ylslvzlbn52qszzzb1v5cwbbvj5gk7v-kdewebkit-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kdewebkit-5.8.0.tar.xz";
+      sha256 = "1h2qsmbc690apyg9ynff9vc1r3pbpb0369p02gbrn4m6yx40985r";
+      name = "kdewebkit-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiconthemes-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/636lwcspq1ndm8q1dcw4yln7ramj59sn-kiconthemes-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kiconthemes-5.8.0.tar.xz";
+      sha256 = "0am9kxgwfnknnjnv7pcba55n0rg73lq6wxc5fyv4nz5g2r5c7rb0";
+      name = "kiconthemes-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ki18n-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/i7ls6hsr4a91ppnghn5z8hgb1lq2krfz-ki18n-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/ki18n-5.8.0.tar.xz";
+      sha256 = "0jlw1bbza0kcnflvpw4nbamqxkj91ij5m31i5kj1kw48sc86l383";
+      name = "ki18n-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcmutils-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/78j3wzxv01vgifmrqv8a9xhsamf1cbcv-kcmutils-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kcmutils-5.8.0.tar.xz";
+      sha256 = "0zm14mdg5mkczkihgwjwz99wjx30wm6c85dm75yaqhk2d3w1aj9w";
+      name = "kcmutils-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/p9p7sks5g2zxqa9v7lphyk0vzxbrg0h8-kxmlrpcclient-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kxmlrpcclient-5.8.0.tar.xz";
+      sha256 = "0xdlz8lvi028h8d13l8zqlbsqqrlpm4x940chxhr92jxlicbhaw3";
+      name = "kxmlrpcclient-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kservice-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/gjm5i3lpn4h2sfcsjzz4yzm4pw6wzxkj-kservice-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kservice-5.8.0.tar.xz";
+      sha256 = "1jk4vh4x7bjr6gqgl118lkkbpmmj1c6y0afysjl9fa45by4bhyz8";
+      name = "kservice-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesignerplugin-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/vfjf7vs4sc13dwi21m4ikvr6qwvi1wlg-kdesignerplugin-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/kdesignerplugin-5.8.0.tar.xz";
+      sha256 = "18ckgx4dvb4bzy38q0dsi23rp5yqjvynyz2yaisczi0fi4b4zn44";
+      name = "kdesignerplugin-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjs-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/5kcpxkfv6l75pad56hk73i2aq6dhm98c-kjs-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/portingAids/kjs-5.8.0.tar.xz";
+      sha256 = "0xy51dm8dmdj7rlz1sxyzbwmxyyv0ydhj6mvzk2a2kn1189dl8kz";
+      name = "kjs-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kross-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/x6zhp5010lwmbp8p0f3dg720iqh8d9xk-kross-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/portingAids/kross-5.8.0.tar.xz";
+      sha256 = "15n2gqpxi96p899k8ggals2p9ym1hlksm1kpz7sjk33idljb9972";
+      name = "kross-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krunner-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/mxfd3j3r56048khysr8s5p6plw04g3wk-krunner-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/portingAids/krunner-5.8.0.tar.xz";
+      sha256 = "0w0s56gaw6s6hiid6dngdgjlr9zzpp9wb6f2v3pk7lg9bxqjwlwh";
+      name = "krunner-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjsembed-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/sxjsvg6x6wa0hsblsynnk6y2fp1f876l-kjsembed-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/portingAids/kjsembed-5.8.0.tar.xz";
+      sha256 = "04sqva3qngjl73nl1f6mz8np7klbsxp1h6rrqzgln6jd35rzfabx";
+      name = "kjsembed-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs4support-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/w4s7ij8hj943nkgw9xi6i29hyadlg27i-kdelibs4support-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/portingAids/kdelibs4support-5.8.0.tar.xz";
+      sha256 = "0j3jpz7zb1if9x91rz4fr6gny0a9r1c1z9796j0bn7b4frq7l232";
+      name = "kdelibs4support-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmediaplayer-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/hbam3379ghcyfw7f34gaqx53s4b92khh-kmediaplayer-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/portingAids/kmediaplayer-5.8.0.tar.xz";
+      sha256 = "0ys7q85942fd7cbpyjqj9wcn947v49f22aj64m8s40h7jiwidkpf";
+      name = "kmediaplayer-5.8.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khtml-5.8.0.tar.xz" ".tar";
+    store = "/nix/store/ajxcmpx2xzy68ls0ilxiy4hslxmbwpc2-khtml-5.8.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.8/portingAids/khtml-5.8.0.tar.xz";
+      sha256 = "0z0123ajf80m99a8kx572nymgmxqrk7svdlja9zrmc9vpbmy643b";
+      name = "khtml-5.8.0.tar.xz";
+    };
+  }
+]
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.8/manifest.sh
new file mode 100755
index 000000000000..9e44b18251af
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/manifest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]; then
+
+  # The extra slash at the end of the URL is necessary to stop wget
+  # from recursing over the whole server! (No, it's not a bug.)
+  $(nix-build ../../../.. -A autonix.manifest) \
+    http://download.kde.org/stable/frameworks/5.8/ \
+      -A '*.tar.xz'
+
+else
+
+  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
+
+fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.8/plasma-framework/plasma-framework-external-paths.patch
new file mode 100644
index 000000000000..9a22c0bdbcd5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/plasma-framework/plasma-framework-external-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
+index 07b3c90..84417e3 100644
+--- a/src/plasma/package.cpp
++++ b/src/plasma/package.cpp
+@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
+       servicePrefix("plasma-applet-"),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/renames.nix b/pkgs/development/libraries/kde-frameworks-5.8/renames.nix
new file mode 100644
index 000000000000..2a3e137c9fe6
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/renames.nix
@@ -0,0 +1,70 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+"Backend" = "plasma-framework";
+"CTest" = "attica";
+"ECM" = "extra-cmake-modules";
+"KDED" = "kded";
+"KF5Activities" = "kactivities";
+"KF5Archive" = "karchive";
+"KF5Attica" = "attica";
+"KF5Auth" = "kauth";
+"KF5Bookmarks" = "kbookmarks";
+"KF5Codecs" = "kcodecs";
+"KF5Completion" = "kcompletion";
+"KF5Config" = "kconfig";
+"KF5ConfigWidgets" = "kconfigwidgets";
+"KF5CoreAddons" = "kcoreaddons";
+"KF5Crash" = "kcrash";
+"KF5DBusAddons" = "kdbusaddons";
+"KF5DNSSD" = "kdnssd";
+"KF5Declarative" = "kdeclarative";
+"KF5DesignerPlugin" = "kdesignerplugin";
+"KF5DocTools" = "kdoctools";
+"KF5Emoticons" = "kemoticons";
+"KF5FrameworkIntegration" = "frameworkintegration";
+"KF5GlobalAccel" = "kglobalaccel";
+"KF5GuiAddons" = "kguiaddons";
+"KF5I18n" = "ki18n";
+"KF5IconThemes" = "kiconthemes";
+"KF5IdleTime" = "kidletime";
+"KF5Init" = "kinit";
+"KF5ItemModels" = "kitemmodels";
+"KF5ItemViews" = "kitemviews";
+"KF5JS" = "kjs";
+"KF5JobWidgets" = "kjobwidgets";
+"KF5JsEmbed" = "kjsembed";
+"KF5KCMUtils" = "kcmutils";
+"KF5KDE4Support" = "kdelibs4support";
+"KF5KDELibs4Support" = "kdelibs4support";
+"KF5KHtml" = "khtml";
+"KF5KIO" = "kio";
+"KF5Kross" = "kross";
+"KF5MediaPlayer" = "kmediaplayer";
+"KF5NetworkManagerQt" = "networkmanager-qt";
+"KF5NewStuff" = "knewstuff";
+"KF5Notifications" = "knotifications";
+"KF5NotifyConfig" = "knotifyconfig";
+"KF5Package" = "kpackage";
+"KF5Parts" = "kparts";
+"KF5People" = "kpeople";
+"KF5Plasma" = "plasma-framework";
+"KF5PlasmaQuick" = "plasma-framework";
+"KF5Plotting" = "kplotting";
+"KF5Pty" = "kpty";
+"KF5Runner" = "krunner";
+"KF5Service" = "kservice";
+"KF5Solid" = "solid";
+"KF5Sonnet" = "sonnet";
+"KF5Su" = "kdesu";
+"KF5TextEditor" = "ktexteditor";
+"KF5TextWidgets" = "ktextwidgets";
+"KF5ThreadWeaver" = "threadweaver";
+"KF5UnitConversion" = "kunitconversion";
+"KF5Wallet" = "kwallet";
+"KF5WebKit" = "kdewebkit";
+"KF5WidgetsAddons" = "kwidgetsaddons";
+"KF5WindowSystem" = "kwindowsystem";
+"KF5XmlGui" = "kxmlgui";
+"KF5XmlRpcClient" = "kxmlrpcclient";
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.8/setup-hook.sh
new file mode 100644
index 000000000000..a8d9b7e0e36f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.8/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c695c99fbc..c8c90b71ee1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6085,7 +6085,8 @@ let
   };
 
   kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
-  kf5_latest = kf57;
+  kf58 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.8 { });
+  kf5_latest = kf58;
   kf5_stable = kf57;
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {

From 77fb55d1f059590b15820c44dc5ee1fe46e4ee69 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Mar 2015 14:47:34 -0500
Subject: [PATCH 0016/1143] plasma52: update to plasma-5.2.2

---
 pkgs/desktops/plasma-5.2/default.nix      |   1 +
 pkgs/desktops/plasma-5.2/dependencies.nix |  22 +-
 pkgs/desktops/plasma-5.2/manifest.nix     | 683 ++++++----------------
 pkgs/desktops/plasma-5.2/manifest.sh      |   3 +-
 4 files changed, 184 insertions(+), 525 deletions(-)

diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix
index dfaafa06a77a..0b70e816c207 100644
--- a/pkgs/desktops/plasma-5.2/default.nix
+++ b/pkgs/desktops/plasma-5.2/default.nix
@@ -163,5 +163,6 @@ in
     startkde = pkgs.callPackage ./startkde {
       inherit (kf5) kconfig kinit kservice;
       inherit (plasma5) plasma-desktop plasma-workspace;
+      inherit qt5;
     };
   }
diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.2/dependencies.nix
index e96a5afbdbc1..cb23102aa1f7 100644
--- a/pkgs/desktops/plasma-5.2/dependencies.nix
+++ b/pkgs/desktops/plasma-5.2/dependencies.nix
@@ -18,7 +18,7 @@
   };
 
   breeze = {
-    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
+    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -34,7 +34,7 @@
   };
 
   kde-gtk-config = {
-    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5KCMUtils" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -138,7 +138,7 @@
   };
 
   kwin = {
-    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
+    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -186,7 +186,7 @@
   };
 
   milou = {
-    buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KF5Service" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -194,7 +194,7 @@
   };
 
   muon = {
-    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5KDELibs4Support" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "QtOAuth" "packagekitqt5" ];
+    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "QtOAuth" "packagekitqt5" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -202,7 +202,7 @@
   };
 
   oxygen = {
-    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
+    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -218,7 +218,7 @@
   };
 
   plasma-desktop = {
-    buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
+    buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5GlobalAccel" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -241,14 +241,6 @@
     propagatedUserEnvPkgs = [  ];
   };
 
-  plasma-workspace-wallpaper = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
   plasma-workspace-wallpapers = {
     buildInputs = [ "ECM" ];
     nativeBuildInputs = [ "cmake" ];
diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix
index 154c1aa98fd1..3a2dcebbc616 100644
--- a/pkgs/desktops/plasma-5.2/manifest.nix
+++ b/pkgs/desktops/plasma-5.2/manifest.nix
@@ -2,651 +2,318 @@
 { stdenv, fetchurl, mirror }:
 [
   {
-    name = stdenv.lib.nameFromURL "kwin-5.2.0.1.tar.xz" ".tar";
-    store = "/nix/store/n6p747v05l1bs1l6802apii9wad8111v-kwin-5.2.0.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdecoration-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/cppfn3gd3ff2x6llz9gmnbg2plyhxkgb-kdecoration-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.1.tar.xz";
-      sha256 = "0jfzrhcnfi4v8qa0hcj0hmvjq0gd7ampq9qvl0s4bd3n6g92pn5f";
-      name = "kwin-5.2.0.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kdecoration-5.2.2.tar.xz";
+      sha256 = "1a4vaflzr1vz0v9pp4w1nxs1qpc1yixl0llj8mjx7f2aw03yjdil";
+      name = "kdecoration-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksshaskpass-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/gv341fwlrzw3svd2vr5b8wxcjk93r64v-ksshaskpass-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/k0i9hbdiqchd6c4802mgsj6ys0i20cq7-kdeplasma-addons-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/ksshaskpass-5.2.0.tar.xz";
-      sha256 = "17xjlb1gwxcdxzfadv0brr6ainnw25m681p013na182zigx9f9bv";
-      name = "ksshaskpass-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kdeplasma-addons-5.2.2.tar.xz";
+      sha256 = "0zzzbpgllaj9kqfca9lqqgjmlybhfga5gazfwh4gmfd6vrvsv4zq";
+      name = "kdeplasma-addons-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kio-extras-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/iilra8kczb0waqigff390x2j2svkv5ba-kio-extras-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "powerdevil-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/q64lvc2svj9ab9ghr7vxgs5y6ghnhv26-powerdevil-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kio-extras-5.2.0.tar.xz";
-      sha256 = "1c5qhp6axzbn5mla9q6qk0aalm0n4hvs6c4d9pclbcv58ysv3vw5";
-      name = "kio-extras-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/powerdevil-5.2.2.tar.xz";
+      sha256 = "07p7rxmfykf03m12mpmxi5whgnizvhxbks888zd4hzy42ln8byvd";
+      name = "powerdevil-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmenuedit-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/4qcwcvnyqnpa6b7my8aqrp6v2zadz91m-kmenuedit-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/vg1jxzylncp5nz0pp41mxc1a6djv9gx5-polkit-kde-agent-1-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kmenuedit-5.2.0.tar.xz";
-      sha256 = "1qg7dh42lyp6mrckxjz07mmhk589d3wr080vljbm6hkgqm3aq7zr";
-      name = "kmenuedit-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/polkit-kde-agent-1-5.2.2.tar.xz";
+      sha256 = "18krrgcmgmw5ivmhn1i83gl2b90k1pimk91z6sqimcfabsm2207q";
+      name = "polkit-kde-agent-1-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libbluedevil-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/d7nkh5p51ab5ag94yi3ggxjpbwn2k6g3-libbluedevil-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "baloo-5.6.2.tar.xz" ".tar";
+    store = "/nix/store/ghvcq3c2q539avg2n1cm94zs0r4wkkc3-baloo-5.6.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/libbluedevil-5.2.0.tar.xz";
-      sha256 = "0s06kn9aqkyyfj1n6cb2hhnnqymwzljavfwj0f88mrkjrdf65bq9";
-      name = "libbluedevil-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/baloo-5.6.2.tar.xz";
+      sha256 = "14sq0fyy1792m8dqasr52syls2i8rbl2h333z6q9vjfp8zg1bgra";
+      name = "baloo-5.6.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkscreen-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/49pgxmxbn2qs5dzgf3iiwcaazj9ipiy3-libkscreen-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "libbluedevil-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/f4awl52gqj3w1lsy73v6pfazzb1rjmca-libbluedevil-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/libkscreen-5.2.0.tar.xz";
-      sha256 = "1v75qi7b0m8fqdj5b38ypwgp1djkg408a4csn57y3pjgp7k69k53";
-      name = "libkscreen-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/libbluedevil-5.2.2.tar.xz";
+      sha256 = "1m0g8i6a40jxjfsf24g2x29xik0qwja80az8i6v42jqjigdxqgsz";
+      name = "libbluedevil-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/vf2cvrr4p7ydz36ir0cjd3p0yqa3cwpj-kde-gtk-config-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "ksysguard-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/n78bf9pd2cxf0a8jh0snfl8dfqn59lv7-ksysguard-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kde-gtk-config-5.2.0.tar.xz";
-      sha256 = "1gafqrb5sg6jm4g3kivnwax05lq6gilzg8pc8k6dsnchyqzilbki";
-      name = "kde-gtk-config-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/ksysguard-5.2.2.tar.xz";
+      sha256 = "0sz2zjbh9zm0v16n7nfskrx5q5g0p4szqxh3fxkwvjysafvbbm2j";
+      name = "ksysguard-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/4qgb1w08k6ffyipfwbrj19pgpihg3pk7-kdeplasma-addons-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kwin-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/pdjszd0xl49ak7g2sxs9gy0yxfkqyl7w-kwin-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kdeplasma-addons-5.2.0.tar.xz";
-      sha256 = "168bl9g1s9piy0bwrx7f8pbvn3jamw1rp90rihydamm3s54p1ykw";
-      name = "kdeplasma-addons-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kwin-5.2.2.tar.xz";
+      sha256 = "1h78nb9g7ynmsx9w9gi54xzn2v3pn88fc1s9hf7w6bjbj55nmxnc";
+      name = "kwin-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-desktop-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/sjqqnbp8s802rz6ydn3if77hr57njwpk-plasma-desktop-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/5sjd1yal83dsp0sc5yb118w846ypqs3l-oxygen-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/plasma-desktop-5.2.0.tar.xz";
-      sha256 = "0xld7kxa8p78kw5f1a75nc0n69jn6vfp8nm40qqdhy2y3m5cc8p9";
-      name = "plasma-desktop-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/oxygen-5.2.2.tar.xz";
+      sha256 = "1hkm02plbsmbypywr4f84j8bb4fy9pv91rh8j8g99pahyxqjjkzm";
+      name = "oxygen-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "systemsettings-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/b0pjfkpqsvfywawinn6a3q42r675q0gw-systemsettings-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "libksysguard-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/qfim9g5jafl8c0pzd764i4y9mh2aziji-libksysguard-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/systemsettings-5.2.0.tar.xz";
-      sha256 = "0yk1zn0kkjb9rcmqa2n10igcnk2fm06gfn7fgb4mcb2vjvv7a8y0";
-      name = "systemsettings-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/libksysguard-5.2.2.tar.xz";
+      sha256 = "0pa1lqccih6d0axv4k6dbm79jlqcy6alx6zp9npbms04w004fmav";
+      name = "libksysguard-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/ri0bgnblm2s7jsyvarvn0nrmnsgbv9wv-polkit-kde-agent-1-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "khotkeys-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/1acfqi39blv2phqn5ypsbjfwb4yy6ac9-khotkeys-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/polkit-kde-agent-1-5.2.0.tar.xz";
-      sha256 = "14b5z2ijlrv7h2bh6dxyd6r4qschzh1l2iqix63nbfa5nxyfc67q";
-      name = "polkit-kde-agent-1-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/khotkeys-5.2.2.tar.xz";
+      sha256 = "16g51xs0l2fzqd9vf7qy2kda8hlnknxmxbb30wl8fc566pss4xcj";
+      name = "khotkeys-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "milou-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/gsmn9sv15f7iwk8hbh074rnm03ig5yhi-milou-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-nm-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/h2imh1yn683vahz76y2cxvc53c3zg61m-plasma-nm-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/milou-5.2.0.tar.xz";
-      sha256 = "02gd7012zbiaxhb6wliapfcb4spjrdgnhvhl3y64ixqrx2b032a5";
-      name = "milou-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/plasma-nm-5.2.2.tar.xz";
+      sha256 = "1031l97b652v2rhzwkwrl1zjm2z0lgg12p88r4sfyp8xzbr5vvsd";
+      name = "plasma-nm-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kinfocenter-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/xfnj3gy03ynfaazy82gkxijm9fykwk4x-kinfocenter-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "libmm-qt-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/mpnx11ji4qfgfylm3fy18y0gfcfiyccs-libmm-qt-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kinfocenter-5.2.0.tar.xz";
-      sha256 = "151flq4w6m94jgfrzbf3w3v11xybx92xd0nv0bdh5vvaxg97dac9";
-      name = "kinfocenter-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/libmm-qt-5.2.2.tar.xz";
+      sha256 = "0z71fn5f5ch4g4bc2nvqx8lj63bw5lxf3axrb6zn4wqviy9345fd";
+      name = "libmm-qt-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdecoration-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/dqqb6cvwcd43yanifka0kmx1pdhryjcj-kdecoration-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "libkscreen-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/dshgq9mha8j254d0x1w0k6cp2xh12y0y-libkscreen-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kdecoration-5.2.0.tar.xz";
-      sha256 = "135i1maqp0q9aa312l0dqfkmxjq12mri2zjwg03wzgmmy5b9wm52";
-      name = "kdecoration-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/libkscreen-5.2.2.tar.xz";
+      sha256 = "0ymck8yb7kphp7nd7l2kfas420qjkqay4wwxav80ga8zb5m4v9ky";
+      name = "libkscreen-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/zfnbl0kbh4x3lpalc7irjgynl53mcf52-kde-cli-tools-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-workspace-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/g72bj559sk724zyv63mwv97bdkybphwq-plasma-workspace-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kde-cli-tools-5.2.0.tar.xz";
-      sha256 = "0lr3ir8kfq1x0yn0ahhlks0ikxxqbyj6jdmkdlr8hz5ivcpr64mq";
-      name = "kde-cli-tools-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/plasma-workspace-5.2.2.tar.xz";
+      sha256 = "0wh5m525f5bdcr9mygm9q9cjwnr46irjx1xdsn873v75nxm16x5i";
+      name = "plasma-workspace-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kscreen-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/w2gq2s7lgf637qn0f5a0dh06i7mkjhki-kscreen-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "muon-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/x1lkv4pra7zd0gxqshvfk7fd6p52phgd-muon-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kscreen-5.2.0.tar.xz";
-      sha256 = "09f77vszpni93ahm31gsb7lg4lidchppa1kd9s8q98yf2rb9hl55";
-      name = "kscreen-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/muon-5.2.2.tar.xz";
+      sha256 = "1p4mamqd3xayffm6h40z5k5s24cda92vdagp916wzgzvqq9rxrl2";
+      name = "muon-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/3rzwgwlzbmin9sjpp614bavjmrqqwk9x-plasma-workspace-wallpapers-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kio-extras-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/301jm0fc13y1fnaliifrczpb6i3vnq0q-kio-extras-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-wallpapers-5.2.0.tar.xz";
-      sha256 = "1xb500w5y9jn6xyayw5v28qsy6xp0pfb3ydciga77h1xd59wp0ym";
-      name = "plasma-workspace-wallpapers-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kio-extras-5.2.2.tar.xz";
+      sha256 = "18ypgzn7zib0z6gs32l1yzwcgkk7jzwrc66j7yl19nl3j8ijflab";
+      name = "kio-extras-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "sddm-kcm-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/q3wbyymqnxwcv9c58fxc4fg2c6pc2d5r-sddm-kcm-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kscreen-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/dr2k13fzyclv2zfq09s0mhi36mxp1byq-kscreen-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/sddm-kcm-5.2.0.tar.xz";
-      sha256 = "0ds4qlgwzbpa32w3mlhf64p64n1jifm6797v6jb5v3qjnamlpk96";
-      name = "sddm-kcm-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kscreen-5.2.2.tar.xz";
+      sha256 = "0mg34046p12102kc1kkvv7famxrx3m3zvgvhllbq29pzqrhgyq7c";
+      name = "kscreen-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libksysguard-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/n50iq06yz6z2n2n7wh10ww7cks22zz4z-libksysguard-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "milou-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/whdyjzwz2f2ps9250w0w85rfc2nwakk8-milou-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/libksysguard-5.2.0.tar.xz";
-      sha256 = "0jfyy90zdajpxy5yy9w14n8r8jx7d6bdwss7h8rrkp5zljp9nzwp";
-      name = "libksysguard-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/milou-5.2.2.tar.xz";
+      sha256 = "0j70v090i6qx1y92mhnasrwx6zlwj81nly6csk4zxbrqlk1mpzfr";
+      name = "milou-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/60kb2hhwlmykfx5mc2s8hyd8zh6ngrpv-oxygen-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kfilemetadata-5.6.2.tar.xz" ".tar";
+    store = "/nix/store/giyrg1kmry1p29l2j39lqqahfrsnnx93-kfilemetadata-5.6.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/oxygen-5.2.0.tar.xz";
-      sha256 = "1wad5m36h31y99v4gwx19n3k14xxc0hvp9c4n3g67fyy8pjnr0ax";
-      name = "oxygen-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kfilemetadata-5.6.2.tar.xz";
+      sha256 = "0nkb4nzpjhpy3b2ma9ikdl29lypqrn0qj1cjn4qvrrgviqd1lj89";
+      name = "kfilemetadata-5.6.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khelpcenter-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/dfi8w8dsk5cxbyhm5kznja6kxda23n8j-khelpcenter-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/xwld1167hfar6ndwyfpv4iykxkk4fx3l-oxygen-fonts-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/khelpcenter-5.2.0.tar.xz";
-      sha256 = "1a5z2bvxjdwp81jnyrdf7q591k6ql504argl7lg3pbvph08rc0rs";
-      name = "khelpcenter-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/oxygen-fonts-5.2.2.tar.xz";
+      sha256 = "1xrzhg2255zz1hva210wnzsz537dxc2xlzbiqbzwknh3mpp7hb90";
+      name = "oxygen-fonts-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "baloo-5.6.0.tar.xz" ".tar";
-    store = "/nix/store/sgm5dcgmw5cwz60hhhqnlgxq1ck1cffh-baloo-5.6.0.tar.xz";
+    name = stdenv.lib.nameFromURL "breeze-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/0k4ljr8hp0xibwhykrqgf6md92f9p172-breeze-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/baloo-5.6.0.tar.xz";
-      sha256 = "1py0npkf8s46zwbg23cn49f777fc9cid1njg8crc8h71md71j614";
-      name = "baloo-5.6.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/breeze-5.2.2.tar.xz";
+      sha256 = "0q44bq1j3ap0wj1v582sks87ji2w4m7armb7g9p7jxzjv07hsj2v";
+      name = "breeze-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-workspace-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/g2ar4zpsc36zalpd5frzdpxscgzg727b-plasma-workspace-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "sddm-kcm-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/znayhrzlj9j5pspb7364yql46g0yrkqp-sddm-kcm-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-5.2.0.tar.xz";
-      sha256 = "1swii172mv32837kgcxnmafs1blpgpdn6hda07f1aanaz4scxvj3";
-      name = "plasma-workspace-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/sddm-kcm-5.2.2.tar.xz";
+      sha256 = "1wpafks11017m5hqprbr0qbv9wn2516nm9m5bxcs93c572f6dnkr";
+      name = "sddm-kcm-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwrited-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/r5qz9f2s7q0i00lsp86fv1b500cr2x0n-kwrited-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kmenuedit-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/29jgl4ygjk8770iqpdxnyfh7f4xaiv2w-kmenuedit-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kwrited-5.2.0.tar.xz";
-      sha256 = "0rg1ml7m6f2kql4qi9pg8dd66hr7rxqgyjg3rs66diibz383cjzb";
-      name = "kwrited-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kmenuedit-5.2.2.tar.xz";
+      sha256 = "0hwqjj247yjvxp923bqx3q78q6bav962crhrfs5phf3a22v1s5vw";
+      name = "kmenuedit-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libmm-qt-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/6fzkxwzqysgwjzmiyg16fdasp64gik52-libmm-qt-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/rdgh3m2w5bl5smc0hwcrhi04yh8x7g43-plasma-workspace-wallpapers-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/libmm-qt-5.2.0.tar.xz";
-      sha256 = "07flvspy3qs2mhjxnwy3l8giw296p3501ad1hr3bnjidm2iykc6s";
-      name = "libmm-qt-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/plasma-workspace-wallpapers-5.2.2.tar.xz";
+      sha256 = "15jw1cb4mgk5fqsmyq8wyl7xc36zyjpr1k585nxg8kqi9376rmlp";
+      name = "plasma-workspace-wallpapers-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-nm-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/9n79gfai09ydrjf12ckqviqaf5jkwar8-plasma-nm-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kinfocenter-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/a49lq7sggqarnbwcmgx82dvkb6z96zmi-kinfocenter-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/plasma-nm-5.2.0.tar.xz";
-      sha256 = "0br2mqx8g660jcs1hiwssg6fdiddn4zk78kdmcgkpq93y5ysdf5c";
-      name = "plasma-nm-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kinfocenter-5.2.2.tar.xz";
+      sha256 = "0axh3glf25110ixqgiswlv4x4gj73j61spg4pb9gfvvsi53rcqkl";
+      name = "kinfocenter-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwayland-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/jidv4bi8f2iyg3zhdqip5f7lkwmgav94-kwayland-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "ksshaskpass-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/zhpxalhlqyz0cwsx2s1b0bzrg7rs2y8m-ksshaskpass-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kwayland-5.2.0.tar.xz";
-      sha256 = "1w872ask0w9gbw46dx3si124gmzkapj7naysgrb5zdcdf8avcgqy";
-      name = "kwayland-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/ksshaskpass-5.2.2.tar.xz";
+      sha256 = "052apq5l34fa6ibwr9b67jkwj6d4calyv3b20n1556zmfy8skfpj";
+      name = "ksshaskpass-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksysguard-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/s4xb576g8hjpl39ysbmzlsw19a99zssy-ksysguard-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kwrited-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/aaa6yzg06wf0nrnbkhsfrlj1lln6jqsd-kwrited-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/ksysguard-5.2.0.tar.xz";
-      sha256 = "0kd103kzxgsgrrhfjacy50gg6wsvqa9ix9xk5nb59bbdzj0b4km1";
-      name = "ksysguard-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kwrited-5.2.2.tar.xz";
+      sha256 = "1fx162rsydmsqhfvg6mypb6xrnl3xvsgrzss25bi2w51w1wylg6h";
+      name = "kwrited-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfilemetadata-5.6.0.tar.xz" ".tar";
-    store = "/nix/store/rvjxs89p415z52nhzrmci6s91nb0fy5a-kfilemetadata-5.6.0.tar.xz";
+    name = stdenv.lib.nameFromURL "systemsettings-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/5qb2ifxfz5dp4xl6a0kdxf3yp7rc2bh5-systemsettings-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kfilemetadata-5.6.0.tar.xz";
-      sha256 = "0vg9lc6d2q6bx53lixcmdhfgwqqr3hfl6g3pvgss237kd3fbb94n";
-      name = "kfilemetadata-5.6.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/systemsettings-5.2.2.tar.xz";
+      sha256 = "09217sradvh5ygf0k4sx4j73c7bs4svljmswpsag3b27mhmcr4cz";
+      name = "systemsettings-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bluedevil-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/w4s1zfgmallmqq400pvh6zy9qrss6206-bluedevil-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kwayland-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/w5w35h0d8bcilmyi246ilfkn3wlzbvh7-kwayland-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/bluedevil-5.2.0.tar.xz";
-      sha256 = "01a3h0jp9nq9fs1zv4wp7jgmpv4nscflb3nkz93dg0g1bis1kgnh";
-      name = "bluedevil-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kwayland-5.2.2.tar.xz";
+      sha256 = "1ywp5b7v5x1lvnz330fgv8ss6ba6jcc59r75x96g15cpxj4np997";
+      name = "kwayland-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "breeze-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/yyq50zwlb2xxahkb6w0zvz41rz2gg4k1-breeze-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "khelpcenter-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/wlzijg52dxs70i3a3ah95jwxp3c3ir82-khelpcenter-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/breeze-5.2.0.tar.xz";
-      sha256 = "1s8381nhszb2d7b0r6rmngnkgw28xxsfhnginbcb6zkljgprnkkh";
-      name = "breeze-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/khelpcenter-5.2.2.tar.xz";
+      sha256 = "0r1jwf3zyqhg3ixg64ankb9k8pb2cm9k2ykjxs6zkdxrmzqczd87";
+      name = "khelpcenter-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/96is0p4rp0nqv9yllqrk9xhv4fa86gan-oxygen-fonts-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "bluedevil-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/b010icvzwl4m7pxcam4g75l5l68gni0r-bluedevil-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/oxygen-fonts-5.2.0.tar.xz";
-      sha256 = "102hycnk4naysmyj87mv1sm41aq214f3wjzzi429r0i135wdblki";
-      name = "oxygen-fonts-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/bluedevil-5.2.2.tar.xz";
+      sha256 = "193jrrcqkz1v8dh6wmjipnnpcs17fawciy6q285ipxhas1ma93hs";
+      name = "bluedevil-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "powerdevil-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/lqny6rqbrgpadkm6d1s52i9959zwhjh8-powerdevil-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/5yc85mx30w54d25a8zivbw77s2vhlng8-kde-cli-tools-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/powerdevil-5.2.0.tar.xz";
-      sha256 = "1mi60xn4pgwrq4w3i45gxqjqqfwjxzkkyx89fkwwj1xv68bkwshs";
-      name = "powerdevil-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kde-cli-tools-5.2.2.tar.xz";
+      sha256 = "0rx7xi5f4cx4y9kry56mjcqkk8sllw1rwv74hq81nyz6wlcq20zm";
+      name = "kde-cli-tools-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "muon-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/f7i8c6ig71506aqcmj3mp8yapyid5zki-muon-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-desktop-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/k5fzvwdsv7s9na2a3rr2cxysh194rbmq-plasma-desktop-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/muon-5.2.0.tar.xz";
-      sha256 = "15vcrm7y5khpc0rngzqbhizg2w0rz6adf5v3cpwafmqaq3iqlcb7";
-      name = "muon-5.2.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/plasma-desktop-5.2.2.tar.xz";
+      sha256 = "04zid1d4qmw56210hricn2mf04pv28p2063lhax2z3wxynq0wjyl";
+      name = "plasma-desktop-5.2.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khotkeys-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/6sqh6vy8i8xg5xqh0b2ic1a3wb1nv2p8-khotkeys-5.2.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.2.tar.xz" ".tar";
+    store = "/nix/store/fimbgb9rhzcqmbzhspvdfkl818frpklf-kde-gtk-config-5.2.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/khotkeys-5.2.0.tar.xz";
-      sha256 = "187757g70wjq1v9r7nf3fxc6233sb5m28s4aswlm7rjvys5lmkch";
-      name = "khotkeys-5.2.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwin-5.2.0.tar.xz" ".tar";
-    store = "/nix/store/hrv9ikwphl3mg8sk6i8b9q3wj5ca24ni-kwin-5.2.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.tar.xz";
-      sha256 = "0ys76xllgr2034bxpr5m1qm5v8qp8wnzn09f6gghcvnm3lqki79q";
-      name = "kwin-5.2.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-extras-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/79invr6hmjir390chxkbqwijfl47sn44-kio-extras-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kio-extras-5.2.1.tar.xz";
-      sha256 = "0b410hrwpanshvnr3qsgcpza142d178nr3hsgb0r0ssfh0wycmm8";
-      name = "kio-extras-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/wp46hfmfna4343jryqnxgkx0i73w206m-kde-gtk-config-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kde-gtk-config-5.2.1.tar.xz";
-      sha256 = "0d1ll4wx1wr14rczjmzxpfiwp67i0ljn172c9w8vhvrv7gy579vw";
-      name = "kde-gtk-config-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/qsi6ridvxykn2qpdq6h8s85dcnn04l1a-oxygen-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/oxygen-5.2.1.tar.xz";
-      sha256 = "1aj9y24ii51av8ydkk07nj666xk6igqkqqhlcpcc513qy87l041l";
-      name = "oxygen-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khotkeys-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/98gn6w9nnzl0901dgs7kzm9j5kgf9i75-khotkeys-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/khotkeys-5.2.1.tar.xz";
-      sha256 = "012hnykqwx4asmbsd84kqzrq90bwkpryh7nribpsc99kwlngdgsn";
-      name = "khotkeys-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-desktop-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/ndkx7f2agaxdgn0l8yz9p3a0ahkhbyy8-plasma-desktop-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/plasma-desktop-5.2.1.tar.xz";
-      sha256 = "08pjyvb8lzjd0pmc72k8c6jcgprzq0g8psd5vhmvw614j9pz1a5d";
-      name = "plasma-desktop-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "baloo-5.6.1.tar.xz" ".tar";
-    store = "/nix/store/qjcgng89qgribr5np0vrvj86jvvprsg4-baloo-5.6.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/baloo-5.6.1.tar.xz";
-      sha256 = "1agf2vqkx9hb95di99c65752q9wjnyhkz1iwwvyk1n1a7jzvdqf2";
-      name = "baloo-5.6.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sddm-kcm-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/g5lazmji9vlyiqkl6sj8h6i0yzdgnx1k-sddm-kcm-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/sddm-kcm-5.2.1.tar.xz";
-      sha256 = "0jjis582j1rk8ss64ys94izsg29sik0khv3czzw5zjqns22kn2r3";
-      name = "sddm-kcm-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "powerdevil-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/dv4cbwkmvpinz0v3s9y6p0ifci0q5fh0-powerdevil-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/powerdevil-5.2.1.tar.xz";
-      sha256 = "147hpzwmw0vxysp7wv0fhmrgaw1aclap70ii7i5pz05k093xngfm";
-      name = "powerdevil-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpaper-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/mfchg5yspiyzvhhp5qh6j3zwfnwpca70-plasma-workspace-wallpaper-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-wallpaper-5.2.1.tar.xz";
-      sha256 = "0cr6s3rs2gz8cq93q7l2w2g0ibzqqlyh0v1nkzhpyxqq0vggjliw";
-      name = "plasma-workspace-wallpaper-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libbluedevil-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/iwiksm38d0ywn3x4rvcfjiynknxmy628-libbluedevil-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/libbluedevil-5.2.1.tar.xz";
-      sha256 = "1wqk03pxl2bzy4f77fy1zwlrlv3k96x9xz8qnavkir9j0i3ijndp";
-      name = "libbluedevil-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfilemetadata-5.6.1.tar.xz" ".tar";
-    store = "/nix/store/m3f02ph2gqj8zw3p1kq86ih6m423i670-kfilemetadata-5.6.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kfilemetadata-5.6.1.tar.xz";
-      sha256 = "0w6dzhng4wp4mrxnq6859np6j3h9iydj4dscp1qr3zc0y377blw3";
-      name = "kfilemetadata-5.6.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "milou-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/f5979rdy20yxjbh9qif3wf7sylhdfr5i-milou-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/milou-5.2.1.tar.xz";
-      sha256 = "1q5bfw7wbgq3gz5r3sdvx7rmsf4cbj501cy1asl6bf1grshjqiyn";
-      name = "milou-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksysguard-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/6llw96fvpb79s3482w0v3ahb6qzn8czi-ksysguard-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/ksysguard-5.2.1.tar.xz";
-      sha256 = "06sr86siw43ly1c8iqjd672szxxjqxl6n8gnxmf92h3qqh1i8a2k";
-      name = "ksysguard-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmenuedit-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/fka4bg5h2hz93knjv2kqvz62dg5pk805-kmenuedit-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kmenuedit-5.2.1.tar.xz";
-      sha256 = "0kpfxgm8jfm2lyf7wxmnnl9flligmds8f6fy1cy36fqxpzhcal98";
-      name = "kmenuedit-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "systemsettings-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/942knn924cz51wwn3jimhcp799zlc7c8-systemsettings-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/systemsettings-5.2.1.tar.xz";
-      sha256 = "0ib84irgdbjd3sga7csjx59c2wxg34yr3j9a8ajhqvdq34yb14n4";
-      name = "systemsettings-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "muon-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/fvq7swhq8343kr70vjsl11bv1c3ayw3k-muon-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/muon-5.2.1.tar.xz";
-      sha256 = "115a7q2ns0h6lszn1lq84y5bk02fm4ly3alxkig7976jh8rbykxf";
-      name = "muon-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-nm-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/igw2v8zgczarw9ynxf473mfl76y6wd4j-plasma-nm-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/plasma-nm-5.2.1.tar.xz";
-      sha256 = "1c4gkxv24kdl2b5gslljihwh5h0v970f70802swblgrp87819bfj";
-      name = "plasma-nm-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksysguard-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/zkrwgpjsa2761wpmic225szjs4503kss-libksysguard-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/libksysguard-5.2.1.tar.xz";
-      sha256 = "0f0s3hafdvgvscfbvkkdll95rzxa44j89qm7cmsclaqclmnwcfa2";
-      name = "libksysguard-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/gsni5ny5qx2j1vic0q1pa0xb0126x2z0-polkit-kde-agent-1-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/polkit-kde-agent-1-5.2.1.tar.xz";
-      sha256 = "0scmsiwwmmz1by8yzh5waa8ngp13hk7yihxh0bf0mfph8zkv3jf4";
-      name = "polkit-kde-agent-1-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwin-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/n8bydi50mqc41sxh95v1zyncfh157am1-kwin-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kwin-5.2.1.tar.xz";
-      sha256 = "1cp7rak0y7jjizj9ampx2wcvra0kffxjs7grd2j57s4qy3z9az6i";
-      name = "kwin-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/cmrfclyx47g0byimi9fk2vgc92mi8vjd-plasma-workspace-wallpapers-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-wallpapers-5.2.1.tar.xz";
-      sha256 = "0dhbwygbxzjxzklcrqa2429k1harl9gz33l9183bz3q62iwcxf0x";
-      name = "plasma-workspace-wallpapers-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bluedevil-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/5mj21ln4sm2i32xbhzbadjhgxhig0fjs-bluedevil-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/bluedevil-5.2.1.tar.xz";
-      sha256 = "1jahp2a8v4hmar8qfiw04miiih5br5s3jpkqlqmmpc56vn1czx6m";
-      name = "bluedevil-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinfocenter-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/cww4i8a48yhm0mddak67lqy9lld20wy3-kinfocenter-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kinfocenter-5.2.1.tar.xz";
-      sha256 = "141mkk1gnhmnxxk0j1mn4p5zzwyjkbbwmwbpqq2adaar18p917i8";
-      name = "kinfocenter-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscreen-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/h65gaypalzzqfgq3vcc495cdan9k4p5v-kscreen-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kscreen-5.2.1.tar.xz";
-      sha256 = "164vwvqrvzjczg2nbi9wkpnk8yki240iz2h5j50n5gkqvgg0w7df";
-      name = "kscreen-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/hlcr09wkzjs62vwawsi9d611n0gxrixp-oxygen-fonts-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/oxygen-fonts-5.2.1.tar.xz";
-      sha256 = "0xnhh135yihmv40imd3mibwzcfdxgbn1mk4rjrsj5fqni113f0lm";
-      name = "oxygen-fonts-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkscreen-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/6xs5v03w12rmqpz235sk9scxap51s2db-libkscreen-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/libkscreen-5.2.1.tar.xz";
-      sha256 = "0i7vm73gs1f715fnmacrdnvk1hij03d72fr70wwa3x18cdcg4qas";
-      name = "libkscreen-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "breeze-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/8sr3b4ah8ds74wgfna9zcnq6vm5s3kn3-breeze-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/breeze-5.2.1.tar.xz";
-      sha256 = "0qdps15mr897s2pcjdci4nyg81n3j90ksz7jybqfkd0gr9l14iy5";
-      name = "breeze-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libmm-qt-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/cgj3wzm22izb1hvbx3wdd18zw3wswgil-libmm-qt-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/libmm-qt-5.2.1.tar.xz";
-      sha256 = "0n3q4bgj4ijrx7hdrnbbhxfnw4w97vgj5ba341qwf89hkhc4dhwn";
-      name = "libmm-qt-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwrited-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/l3swq17a373a0z131mvqn4xa0nwsvjp5-kwrited-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kwrited-5.2.1.tar.xz";
-      sha256 = "006y89c7pxzc55lrkjrvyrywj4j95641n3j0b5vjr2mgxcnv8q7a";
-      name = "kwrited-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/06vk8iv3k4xb96rghh6jva6zj8q9a7ha-kdeplasma-addons-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kdeplasma-addons-5.2.1.tar.xz";
-      sha256 = "1lfb6f5h1qjbl0zyqw5q98b27hw16lszyk1nacgncp3ig1y177r3";
-      name = "kdeplasma-addons-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksshaskpass-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/fydms9jaal65yga60hngnz7hmz268wi2-ksshaskpass-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/ksshaskpass-5.2.1.tar.xz";
-      sha256 = "18wa7naxv7g7zrrkrbh9iljd4h479cq6xmair5iqc0cbbfw7znm0";
-      name = "ksshaskpass-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/1rm663f8mdif77m0wrkib534yskj0g6n-kde-cli-tools-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kde-cli-tools-5.2.1.tar.xz";
-      sha256 = "0zxrn1j4lmlj0s6j5245sd0ykg9wa93i0d8qzca4rjxn5mh87v9q";
-      name = "kde-cli-tools-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdecoration-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/06pjfn5j8lwbd7dj808mjs2bsfwbc3hr-kdecoration-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kdecoration-5.2.1.tar.xz";
-      sha256 = "0910hgh64xbap213sjj1bbxwmibi74chdyyp2qc149f5anqs3fcy";
-      name = "kdecoration-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwayland-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/03np6kr81s99j3ijzq236ywc8nkxpy0j-kwayland-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/kwayland-5.2.1.tar.xz";
-      sha256 = "1c7h9csiam65jkrlg81iqi9y7q3mf63af87zkf6nfalbmz6j0p8l";
-      name = "kwayland-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khelpcenter-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/2ws6508gv1m375l4xcyf6pa8q5c26748-khelpcenter-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/khelpcenter-5.2.1.tar.xz";
-      sha256 = "17sl0va35p420s8lmyz1pzyhzmrssvakc3w06xjj7f6hvgh8iqxw";
-      name = "khelpcenter-5.2.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-5.2.1.tar.xz" ".tar";
-    store = "/nix/store/04b1cp5432y80dl8a55xy4nvw586f33c-plasma-workspace-5.2.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-5.2.1.tar.xz";
-      sha256 = "0ldls1q5f88imc4cvxizssizswfgalh9ix95ab7p5f6ylizagp63";
-      name = "plasma-workspace-5.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/kde-gtk-config-5.2.2.tar.xz";
+      sha256 = "0hyhxm6crzrcdnf06aav4pg6dfvhag5lcxprhhm83cfcrxqi05qb";
+      name = "kde-gtk-config-5.2.2.tar.xz";
     };
   }
 ]
diff --git a/pkgs/desktops/plasma-5.2/manifest.sh b/pkgs/desktops/plasma-5.2/manifest.sh
index 9b76cca08406..ec5e9f5ac3e2 100755
--- a/pkgs/desktops/plasma-5.2/manifest.sh
+++ b/pkgs/desktops/plasma-5.2/manifest.sh
@@ -5,8 +5,7 @@ if [ $# -eq 0 ]; then
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../.. -A autonix.manifest) \
-      http://download.kde.org/stable/plasma/5.2.0/ \
-      http://download.kde.org/stable/plasma/5.2.1/ \
+      http://download.kde.org/stable/plasma/5.2.2/ \
       -A '*.tar.xz'
 
 else

From 1c3c6e7dbbae5d054f8fa6a7110d8ad303522067 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Mar 2015 16:52:58 -0500
Subject: [PATCH 0017/1143] plasma5_latest: build with kf58

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8c90b71ee1c..ab31a8d216da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13014,7 +13014,7 @@ let
   plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
     kf5 = kf57;
   });
-  plasma5_latest = plasma52;
+  plasma5_latest = plasma52.override { kf5 = kf58; };
   plasma5_stable = plasma52;
 
   kde5 = kf5_stable // plasma5_stable // kdeApps_stable;

From 2e0775e3a84ebf9c57f9b4f946a95ab1e8823729 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Mar 2015 17:48:53 -0500
Subject: [PATCH 0018/1143] Revert "cc-wrapper: fix missing attribute"

This reverts commit 6454b8f9ef71ba6d595d318cc149cb3a63b346e4.
---
 pkgs/build-support/cc-wrapper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index ce11b1ad192a..df43da58e3ec 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -171,7 +171,7 @@ stdenv.mkDerivation {
       export real_cxx=c++
       export default_cxx_stdlib_compile="${
         if stdenv.isLinux && !(cc.isGNU or false)
-          then "-isystem $(echo -n ${cc}/include/c++/*) -isystem $(echo -n ${cc}/include/c++/*)/$(${cc}/bin/gcc -dumpmachine)"
+          then "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"
           else ""
       }"
 

From 6eeaef55e59be479f705ce6e3cf4ecef23dc9ad0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Mar 2015 17:50:46 -0500
Subject: [PATCH 0019/1143] kf58: fix inherited typo

---
 pkgs/development/libraries/kde-frameworks-5.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.8/default.nix b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
index de306e312288..30498283f08b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.8/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
@@ -19,7 +19,7 @@ with stdenv.lib; with autonix;
 let
 
   mkDerivation = drv:
-    let inherit (builtins.parseDrvName drv.version) version; in
+    let inherit (builtins.parseDrvName drv.name) version; in
     stdenv.mkDerivation
       (drv // {
         setupHook = ./setup-hook.sh;

From e1700c856c68097bf18f702f9f638229f964cca2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Mar 2015 18:21:12 -0500
Subject: [PATCH 0020/1143] kf58: fix another inherited typo

---
 pkgs/development/libraries/kde-frameworks-5.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.8/default.nix b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
index 30498283f08b..03f2ec46e6c8 100644
--- a/pkgs/development/libraries/kde-frameworks-5.8/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
@@ -112,7 +112,7 @@ let
             ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch
           ];
         meta =
-          let inherit (parseDrvName super.extra-cmake-modules.name) version; in
+          let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in
           {
             license = with stdenv.lib.licenses; [ bsd2 ];
             platforms = stdenv.lib.platforms.linux;

From b8c7afb824c4d7c4ea0808c27c0adf2bef3b0a01 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Wed, 25 Mar 2015 15:42:12 +1300
Subject: [PATCH 0021/1143] Update aliceml from git to get fix for tooltips in
 IDE

---
 pkgs/development/compilers/aliceml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
index 5059cdf21587..a57cd5b60064 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://github.com/aliceml/aliceml";
-    rev = "493cd3565f0bc3b35790185ec358fb91b7b43037";
-    sha256 = "12fbaf0a474e53f40a71f16bf61c52b7ffe044f4d0993e208e69552df3054d45";
+    rev = "7d44dc8e4097c6f85888bbf4ff86d51fe05b0a08";
+    sha256 = "ab2d5bf05c40905b02cb1ec975d4980ae4437757856eeb1f587ede2c45a1917f";
     fetchSubmodules = true;
   };
 

From 8eb5393dedcaca5d739b563c0802ca9eb816d5cf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 22:42:01 -0700
Subject: [PATCH 0022/1143] gnutar: 1.27.1 -> 1.28

---
 pkgs/tools/archivers/gnutar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 87324ac80a24..6b125b2127f8 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnutar-${version}";
-  version = "1.27.1";
+  version = "1.28";
 
   src = fetchurl {
     url = "mirror://gnu/tar/tar-${version}.tar.bz2";
-    sha256 = "1iip0fk0wqhxb0jcwphz43r4fxkx1y7mznnhmlvr618jhp7b63wv";
+    sha256 = "0qkm2k9w8z91hwj8rffpjj9v1vhpiriwz4cdj36k9vrgc3hbzr30";
   };
 
   # May have some issues with root compilation because the bootstrap tool

From 4ec8ce44323a3693e8ad8c370622e5f636f63231 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 22:42:24 -0700
Subject: [PATCH 0023/1143] xz: 5.2.0 -> 5.2.1

---
 pkgs/tools/compression/xz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index fbafe3301338..69c14023701b 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "xz-5.2.0";
+  name = "xz-5.2.1";
 
   src = fetchurl {
     url = "http://tukaani.org/xz/${name}.tar.bz2";
-    sha256 = "19f4kkydyjv240y78qnvi6vi6pfxf7d2386cnclh4rx1ams7sdgp";
+    sha256 = "101a1kih58s1ysqfncqw69qnwx1zlbjxwhnfmp0z5gz0jzs4i4b7";
   };
 
   doCheck = true;

From 2e3a2299152649503f7ddffd5376ca0af398dd53 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 22:42:36 -0700
Subject: [PATCH 0024/1143] which: 2.20 -> 2.21

---
 pkgs/tools/system/which/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index 6662d90e8bd4..e9199a8f0632 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "which-2.20";
+stdenv.mkDerivation rec {
+  name = "which-2.21";
   
   src = fetchurl {
-    url = mirror://gnu/which/which-2.20.tar.gz;
-    sha256 = "1y2p50zadb36izzh2zw4dm5hvdiydqf3qa88l8kav20dcmfbc5yl";
+    url = "mirror://gnu/which/${name}.tar.gz";
+    sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://ftp.gnu.org/gnu/which/;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.gpl3;
   };
 }

From 361f72f52bf80ad1267e14f516b312c678e81291 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 22:53:13 -0700
Subject: [PATCH 0025/1143] libssh2: 1.4.3 -> 1.5.0

---
 pkgs/development/libraries/libssh2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 93377429e7ea..daeb39bc9821 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurlBoot, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "libssh2-1.4.3";
+  name = "libssh2-1.5.0";
 
   src = fetchurlBoot {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d";
+    sha256 = "1z6hfgak00yz0azx6lk6n688mywhdxx03j6sdf95p3w6ssnnn6c3";
   };
 
   buildInputs = [ openssl zlib ];

From cf1ec77ff6e8907b601cddf774239ee8e260c95f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 22:59:04 -0700
Subject: [PATCH 0026/1143] gmp: Add version 6

---
 pkgs/development/libraries/gmp/6.x.nix | 65 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  3 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gmp/6.x.nix

diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
new file mode 100644
index 000000000000..b7350c19960a
--- /dev/null
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
+
+with { inherit (stdenv.lib) optional; };
+
+stdenv.mkDerivation rec {
+  name = "gmp-6.0.0a";
+
+  src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
+    urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
+    sha256 = "1bwsfmf0vrx3rwl4xmi5jhhy3v1qx1xj0m7p9hb0fvcw9f09m3kz";
+  };
+
+  nativeBuildInputs = [ m4 ];
+
+  configureFlags =
+    # Build a "fat binary", with routines for several sub-architectures
+    # (x86), except on Solaris where some tests crash with "Memory fault".
+    # See <http://hydra.nixos.org/build/2760931>, for instance.
+    #
+    # no darwin because gmp uses ASM that clang doesn't like
+    optional (!stdenv.isSunOS) "--enable-fat"
+    ++ (if cxx then [ "--enable-cxx"  ]
+               else [ "--disable-cxx" ])
+    ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
+    ++ optional stdenv.isDarwin "ABI=64"
+    ++ optional stdenv.is64bit "--with-pic"
+    ;
+
+  doCheck = true;
+
+  dontDisableStatic = withStatic;
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "http://gmplib.org/";
+    description = "GNU multiple precision arithmetic library";
+    license = licenses.gpl3Plus;
+
+    longDescription =
+      '' GMP is a free library for arbitrary precision arithmetic, operating
+         on signed integers, rational numbers, and floating point numbers.
+         There is no practical limit to the precision except the ones implied
+         by the available memory in the machine GMP runs on.  GMP has a rich
+         set of functions, and the functions have a regular interface.
+
+         The main target applications for GMP are cryptography applications
+         and research, Internet security applications, algebra systems,
+         computational algebra research, etc.
+
+         GMP is carefully designed to be as fast as possible, both for small
+         operands and for huge operands.  The speed is achieved by using
+         fullwords as the basic arithmetic type, by using fast algorithms,
+         with highly optimised assembly code for the most common inner loops
+         for a lot of CPUs, and by a general emphasis on speed.
+
+         GMP is faster than any other bignum library.  The advantage for GMP
+         increases with the operand sizes for many operations, since GMP uses
+         asymptotically faster algorithms.
+      '';
+
+    platforms = platforms.all;
+    maintainers = [ maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b76e93ab4bd8..fee3f0ff993f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5795,7 +5795,8 @@ let
 
   gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions
   gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { };
-  gmp = gmp5;
+  gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
+  gmp = gmp6;
   gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
 
   #GMP ex-satellite, so better keep it near gmp

From 5f50b087f84a44a1a403d84f21a4b806fe950aac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 22:53:01 -0700
Subject: [PATCH 0027/1143] perl: 5.20.1 -> 5.20.2

---
 pkgs/development/interpreters/perl/5.20/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 7c5cb27e37f0..0ad955d03630 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -21,11 +21,11 @@ in
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "perl-5.20.1";
+  name = "perl-5.20.2";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz";
-    sha256 = "1dfl4v5fngnkd1c4278gcdjgcapsw7laxq0b34nxrx76z4805wgy";
+    sha256 = "17cvplgpxbm1hshxlkra2fldn4da1iap1lsnb04hdm8ply93k95i";
   };
 
   patches =

From 4adae43646b2e2a7608238b199f280f856f82271 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 22:46:18 -0700
Subject: [PATCH 0028/1143] binutils: 2.23.1 -> 2.25

---
 .../tools/misc/binutils/default.nix           |    6 +-
 .../misc/binutils/pt-pax-flags-20121023.patch | 1786 -----------------
 .../misc/binutils/pt-pax-flags-20141022.patch | 1030 ++++++++++
 3 files changed, 1033 insertions(+), 1789 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch
 create mode 100644 pkgs/development/tools/misc/binutils/pt-pax-flags-20141022.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index f740c60c4877..ec16b3181119 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -4,7 +4,7 @@
 
 assert !stdenv.isDarwin;
 
-let basename = "binutils-2.23.1"; in
+let basename = "binutils-2.25"; in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "06bs5v5ndb4g5qx96d52lc818gkbskd1m0sz57314v887sqfbcia";
+    sha256 = "08r9i26b05zcwb9zxb6zllpfdiiicdfsgbpsjlrjmvx3rxjzrpi2";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     # Always add PaX flags section to ELF files.
     # This is needed, for instance, so that running "ldd" on a binary that is
     # PaX-marked to disable mprotect doesn't fail with permission denied.
-    ./pt-pax-flags-20121023.patch
+    ./pt-pax-flags-20141022.patch
   ];
 
   nativeBuildInputs = optional gold bison;
diff --git a/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch b/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch
deleted file mode 100644
index bb0785fe192e..000000000000
--- a/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch
+++ /dev/null
@@ -1,1786 +0,0 @@
---- binutils-2.23/bfd/elf-bfd.h
-+++ binutils-2.23/bfd/elf-bfd.h
-@@ -1577,6 +1577,9 @@ struct elf_obj_tdata
-   /* Segment flags for the PT_GNU_STACK segment.  */
-   unsigned int stack_flags;
- 
-+  /* Segment flags for the PT_PAX_FLAGS segment.  */
-+  unsigned int pax_flags;
-+
-   /* Symbol version definitions in external objects.  */
-   Elf_Internal_Verdef *verdef;
- 
---- binutils-2.23/bfd/elf.c
-+++ binutils-2.23/bfd/elf.c
-@@ -1158,6 +1158,7 @@ get_segment_type (unsigned int p_type)
-     case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
-     case PT_GNU_STACK: pt = "STACK"; break;
-     case PT_GNU_RELRO: pt = "RELRO"; break;
-+    case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
-     default: pt = NULL; break;
-     }
-   return pt;
-@@ -2477,6 +2478,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index)
-     case PT_GNU_RELRO:
-       return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro");
- 
-+    case PT_PAX_FLAGS:
-+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags");
-+
-     default:
-       /* Check for any processor-specific program segment types.  */
-       bed = get_elf_backend_data (abfd);
-@@ -3551,6 +3555,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
-       ++segs;
-     }
- 
-+    {
-+      /* We need a PT_PAX_FLAGS segment.  */
-+      ++segs;
-+    }
-+
-   for (s = abfd->sections; s != NULL; s = s->next)
-     {
-       if ((s->flags & SEC_LOAD) != 0
-@@ -4153,6 +4162,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
- 	    }
- 	}
- 
-+    {
-+      amt = sizeof (struct elf_segment_map);
-+      m = bfd_zalloc (abfd, amt);
-+      if (m == NULL)
-+	goto error_return;
-+      m->next = NULL;
-+      m->p_type = PT_PAX_FLAGS;
-+      m->p_flags = elf_tdata (abfd)->pax_flags;
-+      m->p_flags_valid = 1;
-+
-+      *pm = m;
-+      pm = &m->next;
-+    }
-+
-       free (sections);
-       elf_tdata (abfd)->segment_map = mfirst;
-     }
-@@ -5417,7 +5440,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
-        6. PT_TLS segment includes only SHF_TLS sections.
-        7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
-        8. PT_DYNAMIC should not contain empty sections at the beginning
--	  (with the possible exception of .dynamic).  */
-+	  (with the possible exception of .dynamic).
-+       9. PT_PAX_FLAGS segments do not include any sections.  */
- #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed)		\
-   ((((segment->p_paddr							\
-       ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr)	\
-@@ -5425,6 +5449,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
-      && (section->flags & SEC_ALLOC) != 0)				\
-     || IS_NOTE (segment, section))					\
-    && segment->p_type != PT_GNU_STACK					\
-+   && segment->p_type != PT_PAX_FLAGS					\
-    && (segment->p_type != PT_TLS					\
-        || (section->flags & SEC_THREAD_LOCAL))				\
-    && (segment->p_type == PT_LOAD					\
---- binutils-2.23/bfd/elflink.c
-+++ binutils-2.23/bfd/elflink.c
-@@ -5545,16 +5545,30 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
-     return TRUE;
- 
-   bed = get_elf_backend_data (output_bfd);
-+
-+  elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
-+  if (info->execheap)
-+    elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
-+  else if (info->noexecheap)
-+    elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
-+
-   if (info->execstack)
--    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-+    {
-+      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-+      elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
-+    }
-   else if (info->noexecstack)
--    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
-+    {
-+      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
-+      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
-+    }
-   else
-     {
-       bfd *inputobj;
-       asection *notesec = NULL;
-       int exec = 0;
- 
-+      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
-       for (inputobj = info->input_bfds;
- 	   inputobj;
- 	   inputobj = inputobj->link_next)
-@@ -5567,7 +5581,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
- 	  if (s)
- 	    {
- 	      if (s->flags & SEC_CODE)
--		exec = PF_X;
-+		{
-+		  elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
-+		  elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
-+		  exec = PF_X;
-+		}
- 	      notesec = s;
- 	    }
- 	  else if (bed->default_execstack)
---- binutils-2.23/binutils/readelf.c
-+++ binutils-2.23/binutils/readelf.c
-@@ -2740,6 +2740,7 @@ get_segment_type (unsigned long p_type)
- 			return "GNU_EH_FRAME";
-     case PT_GNU_STACK:	return "GNU_STACK";
-     case PT_GNU_RELRO:  return "GNU_RELRO";
-+    case PT_PAX_FLAGS:  return "PAX_FLAGS";
- 
-     default:
-       if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
---- binutils-2.23/include/bfdlink.h
-+++ binutils-2.23/include/bfdlink.h
-@@ -322,6 +322,14 @@ struct bfd_link_info
-   /* TRUE if PT_GNU_RELRO segment should be created.  */
-   unsigned int relro: 1;
- 
-+  /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
-+     flags.  */
-+  unsigned int execheap: 1;
-+
-+  /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
-+     flags.  */
-+  unsigned int noexecheap: 1;
-+
-   /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
-      should be created.  */
-   unsigned int eh_frame_hdr: 1;
---- binutils-2.23/include/elf/common.h
-+++ binutils-2.23/include/elf/common.h
-@@ -429,6 +429,7 @@
- #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
- #define PT_GNU_STACK	(PT_LOOS + 0x474e551) /* Stack flags */
- #define PT_GNU_RELRO	(PT_LOOS + 0x474e552) /* Read-only after relocation */
-+#define PT_PAX_FLAGS	(PT_LOOS + 0x5041580) /* PaX flags */
- 
- /* Program segment permissions, in program header p_flags field.  */
- 
-@@ -439,6 +440,21 @@
- #define PF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
- #define PF_MASKPROC	0xF0000000	/* Processor-specific reserved bits */
- 
-+/* Flags to control PaX behavior.  */
-+
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
-+
- /* Values for section header, sh_type field.  */
- 
- #define SHT_NULL	0		/* Section header table entry unused */
---- binutils-2.23/ld/emultempl/elf32.em
-+++ binutils-2.23/ld/emultempl/elf32.em
-@@ -2285,6 +2285,16 @@ fragment <<EOF
- 	  link_info.noexecstack = TRUE;
- 	  link_info.execstack = FALSE;
- 	}
-+      else if (strcmp (optarg, "execheap") == 0)
-+	{
-+	  link_info.execheap = TRUE;
-+	  link_info.noexecheap = FALSE;
-+	}
-+      else if (strcmp (optarg, "noexecheap") == 0)
-+	{
-+	  link_info.noexecheap = TRUE;
-+	  link_info.execheap = FALSE;
-+	}
- EOF
- if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
- fragment <<EOF
-@@ -2368,6 +2378,8 @@ fragment <<EOF
-   -z defs                     Report unresolved symbols in object files.\n"));
-   fprintf (file, _("\
-   -z execstack                Mark executable as requiring executable stack\n"));
-+  fprintf (file, _("\
-+  -z execheap                 Mark executable as requiring executable heap\n"));
- EOF
- 
- if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
-@@ -2391,6 +2403,8 @@ fragment <<EOF
- fragment <<EOF
-   fprintf (file, _("\
-   -z noexecstack              Mark executable as not requiring executable stack\n"));
-+  fprintf (file, _("\
-+  -z noexecheap               Mark executable as not requiring executable heap\n"));
- EOF
- if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
- fragment <<EOF
---- binutils-2.23/ld/ldgram.y
-+++ binutils-2.23/ld/ldgram.y
-@@ -1119,6 +1119,8 @@ phdr_type:
- 			    $$ = exp_intop (0x6474e550);
- 			  else if (strcmp (s, "PT_GNU_STACK") == 0)
- 			    $$ = exp_intop (0x6474e551);
-+			  else if (strcmp (s, "PT_PAX_FLAGS") == 0)
-+			    $$ = exp_intop (0x65041580);
- 			  else
- 			    {
- 			      einfo (_("\
---- binutils-2.23/ld/testsuite/ld-alpha/tlsbin.rd
-+++ binutils-2.23/ld/testsuite/ld-alpha/tlsbin.rd
-@@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
--  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8
-+  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+188 R E 0x8
-   INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
- .*Requesting program interpreter.*
-   LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
-   LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
-   DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
-   TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries:
---- binutils-2.23/ld/testsuite/ld-alpha/tlsbinr.rd
-+++ binutils-2.23/ld/testsuite/ld-alpha/tlsbinr.rd
-@@ -42,6 +42,7 @@ Program Headers:
-  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
-  +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries:
---- binutils-2.23/ld/testsuite/ld-alpha/tlspic.rd
-+++ binutils-2.23/ld/testsuite/ld-alpha/tlspic.rd
-@@ -38,6 +38,7 @@ Program Headers:
-  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
-  +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
-  +TLS +0x0+10e0 0x0+110e0 0x0+110e0 0x0+60 0x0+80 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries:
---- binutils-2.23/ld/testsuite/ld-elf/eh1.d
-+++ binutils-2.23/ld/testsuite/ld-elf/eh1.d
-@@ -22,11 +22,11 @@ Contents of the .eh_frame section:
-   DW_CFA_nop
-   DW_CFA_nop
- 
--00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
--  DW_CFA_advance_loc: 0 to 00400078
-+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1
-+  DW_CFA_advance_loc: 0 to [0-9a-f]+
-   DW_CFA_def_cfa_offset: 16
-   DW_CFA_offset: r6 \(rbp\) at cfa-16
--  DW_CFA_advance_loc: 0 to 00400078
-+  DW_CFA_advance_loc: 0 to [0-9a-f]+
-   DW_CFA_def_cfa_register: r6 \(rbp\)
- 
- 00000038 ZERO terminator
---- binutils-2.23/ld/testsuite/ld-elf/eh2.d
-+++ binutils-2.23/ld/testsuite/ld-elf/eh2.d
-@@ -22,11 +22,11 @@ Contents of the .eh_frame section:
-   DW_CFA_nop
-   DW_CFA_nop
- 
--00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
--  DW_CFA_advance_loc: 0 to 00400078
-+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1
-+  DW_CFA_advance_loc: 0 to [0-9a-f]+
-   DW_CFA_def_cfa_offset: 16
-   DW_CFA_offset: r6 \(rbp\) at cfa-16
--  DW_CFA_advance_loc: 0 to 00400078
-+  DW_CFA_advance_loc: 0 to [0-9a-f]+
-   DW_CFA_def_cfa_register: r6 \(rbp\)
- 
- 00000038 ZERO terminator
---- binutils-2.23/ld/testsuite/ld-elf/eh3.d
-+++ binutils-2.23/ld/testsuite/ld-elf/eh3.d
-@@ -22,11 +22,11 @@ Contents of the .eh_frame section:
-   DW_CFA_nop
-   DW_CFA_nop
- 
--00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
--  DW_CFA_advance_loc: 0 to 00400078
-+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1
-+  DW_CFA_advance_loc: 0 to [0-9a-f]+
-   DW_CFA_def_cfa_offset: 16
-   DW_CFA_offset: r6 \(rbp\) at cfa-16
--  DW_CFA_advance_loc: 0 to 00400078
-+  DW_CFA_advance_loc: 0 to [0-9a-f]+
-   DW_CFA_def_cfa_register: r6 \(rbp\)
- 
- 00000038 ZERO terminator
---- binutils-2.23/ld/testsuite/ld-elf/orphan-region.d
-+++ binutils-2.23/ld/testsuite/ld-elf/orphan-region.d
-@@ -15,7 +15,9 @@
- Program Headers:
-   Type.*
-   LOAD[ \t]+0x[0-9a-f]+ 0x0*40000000 0x0*40000000 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x[0-9a-f]+
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-   Segment Sections...
-    00     .text .rodata .moredata *
-+   01 +
---- binutils-2.23/ld/testsuite/ld-i386/tlsbin.rd
-+++ binutils-2.23/ld/testsuite/ld-i386/tlsbin.rd
-@@ -44,6 +44,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -53,6 +54,7 @@ Program Headers:
-  +03 +.tdata .dynamic .got .got.plt *
-  +04 +.dynamic *
-  +05 +.tdata .tbss *
-+ +06 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.23/ld/testsuite/ld-i386/tlsbindesc.rd
-+++ binutils-2.23/ld/testsuite/ld-i386/tlsbindesc.rd
-@@ -42,6 +42,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -51,6 +52,7 @@ Program Headers:
-  +03 +.tdata .dynamic .got .got.plt *
-  +04 +.dynamic *
-  +05 +.tdata .tbss *
-+ +06 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.23/ld/testsuite/ld-i386/tlsdesc.rd
-+++ binutils-2.23/ld/testsuite/ld-i386/tlsdesc.rd
-@@ -39,6 +39,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -46,6 +47,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got .got.plt *
-  +02 +.dynamic *
-  +03 +.tdata .tbss *
-+ +04 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.23/ld/testsuite/ld-i386/tlsgdesc.rd
-+++ binutils-2.23/ld/testsuite/ld-i386/tlsgdesc.rd
-@@ -36,12 +36,14 @@ Program Headers:
-  +LOAD.*
-  +LOAD.*
-  +DYNAMIC.*
-+ +PAX_FLAGS.*
- 
-  Section to Segment mapping:
-  +Segment Sections...
-  +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text *
-  +01 +.dynamic .got .got.plt *
-  +02 +.dynamic *
-+ +03 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.23/ld/testsuite/ld-i386/tlsnopic.rd
-+++ binutils-2.23/ld/testsuite/ld-i386/tlsnopic.rd
-@@ -37,6 +37,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -44,6 +45,7 @@ Program Headers:
-  +01 +.dynamic .got .got.plt *
-  +02 +.dynamic *
-  +03 +.tbss *
-+ +04 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.23/ld/testsuite/ld-i386/tlspic.rd
-+++ binutils-2.23/ld/testsuite/ld-i386/tlspic.rd
-@@ -40,6 +40,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -47,6 +48,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got .got.plt *
-  +02 +.dynamic *
-  +03 +.tdata .tbss *
-+ +04 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.23/ld/testsuite/ld-ia64/merge1.d
-+++ binutils-2.23/ld/testsuite/ld-ia64/merge1.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+1e0 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 c0 04 00 48 00 	            addl r12=24,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.23/ld/testsuite/ld-ia64/merge2.d
-+++ binutils-2.23/ld/testsuite/ld-ia64/merge2.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+1e0 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 c0 04 00 48 00 	            addl r12=24,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.23/ld/testsuite/ld-ia64/merge3.d
-+++ binutils-2.23/ld/testsuite/ld-ia64/merge3.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+210 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.23/ld/testsuite/ld-ia64/merge4.d
-+++ binutils-2.23/ld/testsuite/ld-ia64/merge4.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+240 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.23/ld/testsuite/ld-ia64/merge5.d
-+++ binutils-2.23/ld/testsuite/ld-ia64/merge5.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+270 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.23/ld/testsuite/ld-ia64/tlsbin.rd
-+++ binutils-2.23/ld/testsuite/ld-ia64/tlsbin.rd
-@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-- +PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8
-- +INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
-+ +PHDR +0x0+40 0x40+40 0x40+40 (0x[0-9a-f]+) \1 R E 0x8
-+ +INTERP +0x0+([0-9a-f]+) (0x40+\1) \2 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
- .*Requesting program interpreter.*
-  +LOAD +0x0+ 0x40+ 0x40+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ R E 0x10000
-  +LOAD +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
-  +DYNAMIC +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+150 0x0+150 RW +0x8
-  +TLS +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+60 0x0+a0 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  +IA_64_UNWIND .* R +0x8
- #...
- 
---- binutils-2.23/ld/testsuite/ld-ia64/tlspic.rd
-+++ binutils-2.23/ld/testsuite/ld-ia64/tlspic.rd
-@@ -40,6 +40,7 @@ Program Headers:
-  +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
-  +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8
-  +TLS +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+60 0x0+80 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8
- #...
- 
---- binutils-2.23/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
-@@ -8,9 +8,9 @@
- .*: +file format.*
- 
- Disassembly of section \.text:
--004000b0 <[^>]*> 3c1c0043 	lui	gp,0x43
--004000b4 <[^>]*> 279c9ff0 	addiu	gp,gp,-24592
--004000b8 <[^>]*> afbc0008 	sw	gp,8\(sp\)
-+004000d0 <[^>]*> 3c1c0043 	lui	gp,0x43
-+004000d4 <[^>]*> 279c9ff0 	addiu	gp,gp,-24592
-+004000d8 <[^>]*> afbc0008 	sw	gp,8\(sp\)
- #...
- 00408d60 <[^>]*> 3c1c0043 	lui	gp,0x43
- 00408d64 <[^>]*> 279c2c98 	addiu	gp,gp,11416
---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is DYN \(Shared object file\)
- Entry point .*
--There are 5 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -9,6 +9,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.*
-  * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -18,3 +19,4 @@ Program Headers:
-  *0*2 * \.data \.got *
-  *0*3 * \.dynamic *
-  *0*4 *
-+ *0*5 *
---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 *\.got \.data *
-  *0*6 *\.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 * \.got \.data \.bss *
-  *0*6 * \.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 * \.got \.data \.bss *
-  *0*6 * \.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 * \.got \.data \.bss *
-  *0*6 * \.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 7 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -12,6 +12,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -23,3 +24,4 @@ Program Headers:
-  *0*4 * \.got \.data \.bss *
-  *0*5 * \.dynamic *
-  *0*6 *
-+ *0*7 *
---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 * \.got \.data \.bss *
-  *0*6 * \.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.23/ld/testsuite/ld-mips-elf/tlsbin-o32.d
-+++ binutils-2.23/ld/testsuite/ld-mips-elf/tlsbin-o32.d
-@@ -2,42 +2,42 @@
- 
- Disassembly of section .text:
- 
--004000d0 <__start>:
--  4000d0:	3c1c0fc0 	lui	gp,0xfc0
--  4000d4:	279c7f30 	addiu	gp,gp,32560
--  4000d8:	0399e021 	addu	gp,gp,t9
--  4000dc:	27bdfff0 	addiu	sp,sp,-16
--  4000e0:	afbe0008 	sw	s8,8\(sp\)
--  4000e4:	03a0f021 	move	s8,sp
--  4000e8:	afbc0000 	sw	gp,0\(sp\)
--  4000ec:	8f998018 	lw	t9,-32744\(gp\)
--  4000f0:	27848028 	addiu	a0,gp,-32728
--  4000f4:	0320f809 	jalr	t9
--  4000f8:	00000000 	nop
--  4000fc:	8fdc0000 	lw	gp,0\(s8\)
--  400100:	00000000 	nop
--  400104:	8f998018 	lw	t9,-32744\(gp\)
--  400108:	27848020 	addiu	a0,gp,-32736
--  40010c:	0320f809 	jalr	t9
--  400110:	00000000 	nop
--  400114:	8fdc0000 	lw	gp,0\(s8\)
--  400118:	00401021 	move	v0,v0
--  40011c:	3c030000 	lui	v1,0x0
--  400120:	24638000 	addiu	v1,v1,-32768
--  400124:	00621821 	addu	v1,v1,v0
--  400128:	7c02283b 	rdhwr	v0,\$5
--  40012c:	8f83801c 	lw	v1,-32740\(gp\)
--  400130:	00000000 	nop
--  400134:	00621821 	addu	v1,v1,v0
--  400138:	7c02283b 	rdhwr	v0,\$5
--  40013c:	3c030000 	lui	v1,0x0
--  400140:	24639004 	addiu	v1,v1,-28668
--  400144:	00621821 	addu	v1,v1,v0
--  400148:	03c0e821 	move	sp,s8
--  40014c:	8fbe0008 	lw	s8,8\(sp\)
--  400150:	03e00008 	jr	ra
--  400154:	27bd0010 	addiu	sp,sp,16
-+00400[0-9a-f]{3} <__start>:
-+  400[0-9a-f]{3}:	3c1c0fc0 	lui	gp,0xfc0
-+  400[0-9a-f]{3}:	279c7f30 	addiu	gp,gp,32560
-+  400[0-9a-f]{3}:	0399e021 	addu	gp,gp,t9
-+  400[0-9a-f]{3}:	27bdfff0 	addiu	sp,sp,-16
-+  400[0-9a-f]{3}:	afbe0008 	sw	s8,8\(sp\)
-+  400[0-9a-f]{3}:	03a0f021 	move	s8,sp
-+  400[0-9a-f]{3}:	afbc0000 	sw	gp,0\(sp\)
-+  400[0-9a-f]{3}:	8f998018 	lw	t9,-32744\(gp\)
-+  400[0-9a-f]{3}:	27848028 	addiu	a0,gp,-32728
-+  400[0-9a-f]{3}:	0320f809 	jalr	t9
-+  400[0-9a-f]{3}:	00000000 	nop
-+  400[0-9a-f]{3}:	8fdc0000 	lw	gp,0\(s8\)
-+  400[0-9a-f]{3}:	00000000 	nop
-+  400[0-9a-f]{3}:	8f998018 	lw	t9,-32744\(gp\)
-+  400[0-9a-f]{3}:	27848020 	addiu	a0,gp,-32736
-+  400[0-9a-f]{3}:	0320f809 	jalr	t9
-+  400[0-9a-f]{3}:	00000000 	nop
-+  400[0-9a-f]{3}:	8fdc0000 	lw	gp,0\(s8\)
-+  400[0-9a-f]{3}:	00401021 	move	v0,v0
-+  400[0-9a-f]{3}:	3c030000 	lui	v1,0x0
-+  400[0-9a-f]{3}:	24638000 	addiu	v1,v1,-32768
-+  400[0-9a-f]{3}:	00621821 	addu	v1,v1,v0
-+  400[0-9a-f]{3}:	7c02283b 	rdhwr	v0,\$5
-+  400[0-9a-f]{3}:	8f83801c 	lw	v1,-32740\(gp\)
-+  400[0-9a-f]{3}:	00000000 	nop
-+  400[0-9a-f]{3}:	00621821 	addu	v1,v1,v0
-+  400[0-9a-f]{3}:	7c02283b 	rdhwr	v0,\$5
-+  400[0-9a-f]{3}:	3c030000 	lui	v1,0x0
-+  400[0-9a-f]{3}:	24639004 	addiu	v1,v1,-28668
-+  400[0-9a-f]{3}:	00621821 	addu	v1,v1,v0
-+  400[0-9a-f]{3}:	03c0e821 	move	sp,s8
-+  400[0-9a-f]{3}:	8fbe0008 	lw	s8,8\(sp\)
-+  400[0-9a-f]{3}:	03e00008 	jr	ra
-+  400[0-9a-f]{3}:	27bd0010 	addiu	sp,sp,16
- 
--00400158 <__tls_get_addr>:
--  400158:	03e00008 	jr	ra
--  40015c:	00000000 	nop
-+00400[0-9a-f]{3} <__tls_get_addr>:
-+  400[0-9a-f]{3}:	03e00008 	jr	ra
-+  400[0-9a-f]{3}:	00000000 	nop
---- binutils-2.23/ld/testsuite/ld-powerpc/tls.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tls.d
-@@ -9,45 +9,45 @@
- 
- Disassembly of section \.text:
- 
--0+100000e8 <_start>:
--    100000e8:	3c 6d 00 00 	addis   r3,r13,0
--    100000ec:	60 00 00 00 	nop
--    100000f0:	38 63 90 78 	addi    r3,r3,-28552
--    100000f4:	3c 6d 00 00 	addis   r3,r13,0
--    100000f8:	60 00 00 00 	nop
--    100000fc:	38 63 10 00 	addi    r3,r3,4096
--    10000100:	3c 6d 00 00 	addis   r3,r13,0
--    10000104:	60 00 00 00 	nop
--    10000108:	38 63 90 40 	addi    r3,r3,-28608
--    1000010c:	3c 6d 00 00 	addis   r3,r13,0
--    10000110:	60 00 00 00 	nop
--    10000114:	38 63 10 00 	addi    r3,r3,4096
--    10000118:	39 23 80 48 	addi    r9,r3,-32696
--    1000011c:	3d 23 00 00 	addis   r9,r3,0
--    10000120:	81 49 80 50 	lwz     r10,-32688\(r9\)
--    10000124:	e9 22 80 10 	ld      r9,-32752\(r2\)
--    10000128:	7d 49 18 2a 	ldx     r10,r9,r3
--    1000012c:	3d 2d 00 00 	addis   r9,r13,0
--    10000130:	a1 49 90 60 	lhz     r10,-28576\(r9\)
--    10000134:	89 4d 90 68 	lbz     r10,-28568\(r13\)
--    10000138:	3d 2d 00 00 	addis   r9,r13,0
--    1000013c:	99 49 90 70 	stb     r10,-28560\(r9\)
--    10000140:	3c 6d 00 00 	addis   r3,r13,0
--    10000144:	60 00 00 00 	nop
--    10000148:	38 63 90 00 	addi    r3,r3,-28672
--    1000014c:	3c 6d 00 00 	addis   r3,r13,0
--    10000150:	60 00 00 00 	nop
--    10000154:	38 63 10 00 	addi    r3,r3,4096
--    10000158:	f9 43 80 08 	std     r10,-32760\(r3\)
--    1000015c:	3d 23 00 00 	addis   r9,r3,0
--    10000160:	91 49 80 10 	stw     r10,-32752\(r9\)
--    10000164:	e9 22 80 08 	ld      r9,-32760\(r2\)
--    10000168:	7d 49 19 2a 	stdx    r10,r9,r3
--    1000016c:	3d 2d 00 00 	addis   r9,r13,0
--    10000170:	b1 49 90 60 	sth     r10,-28576\(r9\)
--    10000174:	e9 4d 90 2a 	lwa     r10,-28632\(r13\)
--    10000178:	3d 2d 00 00 	addis   r9,r13,0
--    1000017c:	a9 49 90 30 	lha     r10,-28624\(r9\)
-+0+10000[0-9a-f]{3} <_start>:
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 78 	addi    r3,r3,-28552
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 40 	addi    r3,r3,-28608
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
-+    10000[0-9a-f]{3}:	39 23 80 48 	addi    r9,r3,-32696
-+    10000[0-9a-f]{3}:	3d 23 00 00 	addis   r9,r3,0
-+    10000[0-9a-f]{3}:	81 49 80 50 	lwz     r10,-32688\(r9\)
-+    10000[0-9a-f]{3}:	e9 22 80 10 	ld      r9,-32752\(r2\)
-+    10000[0-9a-f]{3}:	7d 49 18 2a 	ldx     r10,r9,r3
-+    10000[0-9a-f]{3}:	3d 2d 00 00 	addis   r9,r13,0
-+    10000[0-9a-f]{3}:	a1 49 90 60 	lhz     r10,-28576\(r9\)
-+    10000[0-9a-f]{3}:	89 4d 90 68 	lbz     r10,-28568\(r13\)
-+    10000[0-9a-f]{3}:	3d 2d 00 00 	addis   r9,r13,0
-+    10000[0-9a-f]{3}:	99 49 90 70 	stb     r10,-28560\(r9\)
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 00 	addi    r3,r3,-28672
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
-+    10000[0-9a-f]{3}:	f9 43 80 08 	std     r10,-32760\(r3\)
-+    10000[0-9a-f]{3}:	3d 23 00 00 	addis   r9,r3,0
-+    10000[0-9a-f]{3}:	91 49 80 10 	stw     r10,-32752\(r9\)
-+    10000[0-9a-f]{3}:	e9 22 80 08 	ld      r9,-32760\(r2\)
-+    10000[0-9a-f]{3}:	7d 49 19 2a 	stdx    r10,r9,r3
-+    10000[0-9a-f]{3}:	3d 2d 00 00 	addis   r9,r13,0
-+    10000[0-9a-f]{3}:	b1 49 90 60 	sth     r10,-28576\(r9\)
-+    10000[0-9a-f]{3}:	e9 4d 90 2a 	lwa     r10,-28632\(r13\)
-+    10000[0-9a-f]{3}:	3d 2d 00 00 	addis   r9,r13,0
-+    10000[0-9a-f]{3}:	a9 49 90 30 	lha     r10,-28624\(r9\)
- 
--0+10000180 <\.__tls_get_addr>:
--    10000180:	4e 80 00 20 	blr
-+0+10000[0-9a-f]{3} <\.__tls_get_addr>:
-+    10000[0-9a-f]{3}:	4e 80 00 20 	blr
---- binutils-2.23/ld/testsuite/ld-powerpc/tls.g
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tls.g
-@@ -8,5 +8,5 @@
- .*: +file format elf64-powerpc
- 
- Contents of section \.got:
-- 100101e0 00000000 100181e0 ffffffff ffff8018  .*
-- 100101f0 ffffffff ffff8058                    .*
-+ 10010([0-9a-f]{3}) 00000000 10018\1 ffffffff ffff8018  .*
-+ 10010[0-9a-f]{3} ffffffff ffff8058                    .*
---- binutils-2.23/ld/testsuite/ld-powerpc/tls32.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.d
-@@ -9,42 +9,42 @@
- 
- Disassembly of section \.text:
- 
--0+1800094 <_start>:
-- 1800094:	3c 62 00 00 	addis   r3,r2,0
-- 1800098:	38 63 90 3c 	addi    r3,r3,-28612
-- 180009c:	3c 62 00 00 	addis   r3,r2,0
-- 18000a0:	38 63 10 00 	addi    r3,r3,4096
-- 18000a4:	3c 62 00 00 	addis   r3,r2,0
-- 18000a8:	38 63 90 20 	addi    r3,r3,-28640
-- 18000ac:	3c 62 00 00 	addis   r3,r2,0
-- 18000b0:	38 63 10 00 	addi    r3,r3,4096
-- 18000b4:	39 23 80 24 	addi    r9,r3,-32732
-- 18000b8:	3d 23 00 00 	addis   r9,r3,0
-- 18000bc:	81 49 80 28 	lwz     r10,-32728\(r9\)
-- 18000c0:	3d 22 00 00 	addis   r9,r2,0
-- 18000c4:	a1 49 90 30 	lhz     r10,-28624\(r9\)
-- 18000c8:	89 42 90 34 	lbz     r10,-28620\(r2\)
-- 18000cc:	3d 22 00 00 	addis   r9,r2,0
-- 18000d0:	99 49 90 38 	stb     r10,-28616\(r9\)
-- 18000d4:	3c 62 00 00 	addis   r3,r2,0
-- 18000d8:	38 63 90 00 	addi    r3,r3,-28672
-- 18000dc:	3c 62 00 00 	addis   r3,r2,0
-- 18000e0:	38 63 10 00 	addi    r3,r3,4096
-- 18000e4:	91 43 80 04 	stw     r10,-32764\(r3\)
-- 18000e8:	3d 23 00 00 	addis   r9,r3,0
-- 18000ec:	91 49 80 08 	stw     r10,-32760\(r9\)
-- 18000f0:	3d 22 00 00 	addis   r9,r2,0
-- 18000f4:	b1 49 90 30 	sth     r10,-28624\(r9\)
-- 18000f8:	a1 42 90 14 	lhz     r10,-28652\(r2\)
-- 18000fc:	3d 22 00 00 	addis   r9,r2,0
-- 1800100:	a9 49 90 18 	lha     r10,-28648\(r9\)
-+0+1800[0-9a-f]{3} <_start>:
-+ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
-+ 1800[0-9a-f]{3}:	38 63 90 3c 	addi    r3,r3,-28612
-+ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
-+ 1800[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
-+ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
-+ 1800[0-9a-f]{3}:	38 63 90 20 	addi    r3,r3,-28640
-+ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
-+ 1800[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
-+ 1800[0-9a-f]{3}:	39 23 80 24 	addi    r9,r3,-32732
-+ 1800[0-9a-f]{3}:	3d 23 00 00 	addis   r9,r3,0
-+ 1800[0-9a-f]{3}:	81 49 80 28 	lwz     r10,-32728\(r9\)
-+ 1800[0-9a-f]{3}:	3d 22 00 00 	addis   r9,r2,0
-+ 1800[0-9a-f]{3}:	a1 49 90 30 	lhz     r10,-28624\(r9\)
-+ 1800[0-9a-f]{3}:	89 42 90 34 	lbz     r10,-28620\(r2\)
-+ 1800[0-9a-f]{3}:	3d 22 00 00 	addis   r9,r2,0
-+ 1800[0-9a-f]{3}:	99 49 90 38 	stb     r10,-28616\(r9\)
-+ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
-+ 1800[0-9a-f]{3}:	38 63 90 00 	addi    r3,r3,-28672
-+ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
-+ 1800[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
-+ 1800[0-9a-f]{3}:	91 43 80 04 	stw     r10,-32764\(r3\)
-+ 1800[0-9a-f]{3}:	3d 23 00 00 	addis   r9,r3,0
-+ 1800[0-9a-f]{3}:	91 49 80 08 	stw     r10,-32760\(r9\)
-+ 1800[0-9a-f]{3}:	3d 22 00 00 	addis   r9,r2,0
-+ 1800[0-9a-f]{3}:	b1 49 90 30 	sth     r10,-28624\(r9\)
-+ 1800[0-9a-f]{3}:	a1 42 90 14 	lhz     r10,-28652\(r2\)
-+ 1800[0-9a-f]{3}:	3d 22 00 00 	addis   r9,r2,0
-+ 1800[0-9a-f]{3}:	a9 49 90 18 	lha     r10,-28648\(r9\)
- 
--0+1800104 <__tls_get_addr>:
-- 1800104:	4e 80 00 20 	blr
-+0+1800[0-9a-f]{3} <__tls_get_addr>:
-+ 1800[0-9a-f]{3}:	4e 80 00 20 	blr
- Disassembly of section \.got:
- 
--0+1810128 <_GLOBAL_OFFSET_TABLE_-0x4>:
-- 1810128:	4e 80 00 21 	blrl
-+0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_-0x4>:
-+ 1810[0-9a-f]{3}:	4e 80 00 21 	blrl
- 
--0+181012c <_GLOBAL_OFFSET_TABLE_>:
-+0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_>:
- 	\.\.\.
---- binutils-2.23/ld/testsuite/ld-powerpc/tls32.g
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.g
-@@ -8,4 +8,4 @@
- .*: +file format elf32-powerpc
- 
- Contents of section \.got:
-- 1810128 4e800021 00000000 00000000 00000000  .*
-+ 18101[0-9a-f]{2} 4e800021 00000000 00000000 00000000  .*
---- binutils-2.23/ld/testsuite/ld-powerpc/tls32.t
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.t
-@@ -8,5 +8,5 @@
- .*: +file format elf32-powerpc
- 
- Contents of section \.tdata:
-- 1810108 12345678 23456789 3456789a 456789ab  .*
-- 1810118 56789abc 6789abcd 789abcde 00c0ffee  .*
-+ 18101[0-9a-f]{2} 12345678 23456789 3456789a 456789ab  .*
-+ 18101[0-9a-f]{2} 56789abc 6789abcd 789abcde 00c0ffee  .*
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.d
-@@ -44,4 +44,4 @@ Disassembly of section \.got:
- .*:	4e 80 00 21 	blrl
- 
- .* <_GLOBAL_OFFSET_TABLE_>:
--.*:	01 81 02 b8 00 00 00 00 00 00 00 00  .*
-+.*:	01 81 02 [bd]8 00 00 00 00 00 00 00 00  .*
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.g
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.g
-@@ -8,4 +8,4 @@
- 
- Contents of section \.got:
- .* 00000000 00000000 00000000 4e800021  .*
--.* 018102b8 00000000 00000000           .*
-+.* 018102[bd]8 00000000 00000000           .*
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.r
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.r
-@@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
-- +PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4
-- +INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1
-+ +PHDR +0x000034 0x01800034 0x01800034 (0x000[0-9a-f]{2}) \1 R E 0x4
-+ +INTERP +0x000([0-9a-f]{3}) 0x01800\1 0x01800\1 0x00011 0x00011 R +0x1
-  +\[Requesting program interpreter: .*\]
-  +LOAD .* R E 0x10000
-  +LOAD .* RWE 0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0001c 0x00038 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -49,6 +50,7 @@ Program Headers:
-  +03 +\.tdata \.dynamic \.got \.plt 
-  +04 +\.dynamic 
-  +05 +\.tdata \.tbss 
-+ +06 +
- 
- Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
-  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsmark.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsmark.d
-@@ -9,29 +9,29 @@
- 
- Disassembly of section \.text:
- 
--0+100000e8 <_start>:
--    100000e8:	48 00 00 18 	b       10000100 <_start\+0x18>
--    100000ec:	60 00 00 00 	nop
--    100000f0:	38 63 90 00 	addi    r3,r3,-28672
--    100000f4:	e8 83 00 00 	ld      r4,0\(r3\)
--    100000f8:	3c 6d 00 00 	addis   r3,r13,0
--    100000fc:	48 00 00 0c 	b       10000108 <_start\+0x20>
--    10000100:	3c 6d 00 00 	addis   r3,r13,0
--    10000104:	4b ff ff e8 	b       100000ec <_start\+0x4>
--    10000108:	60 00 00 00 	nop
--    1000010c:	38 63 10 00 	addi    r3,r3,4096
--    10000110:	e8 83 80 00 	ld      r4,-32768\(r3\)
--    10000114:	3c 6d 00 00 	addis   r3,r13,0
--    10000118:	48 00 00 0c 	b       10000124 <_start\+0x3c>
--    1000011c:	3c 6d 00 00 	addis   r3,r13,0
--    10000120:	48 00 00 14 	b       10000134 <_start\+0x4c>
--    10000124:	60 00 00 00 	nop
--    10000128:	38 63 90 04 	addi    r3,r3,-28668
--    1000012c:	e8 a3 00 00 	ld      r5,0\(r3\)
--    10000130:	4b ff ff ec 	b       1000011c <_start\+0x34>
--    10000134:	60 00 00 00 	nop
--    10000138:	38 63 10 00 	addi    r3,r3,4096
--    1000013c:	e8 a3 80 04 	ld      r5,-32764\(r3\)
-+0+10000[0-9a-f]{3} <_start>:
-+    10000[0-9a-f]{3}:	48 00 00 18 	b       10000[0-9a-f]{3} <_start\+0x18>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 00 	addi    r3,r3,-28672
-+    10000[0-9a-f]{3}:	e8 83 00 00 	ld      r4,0\(r3\)
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	48 00 00 0c 	b       10000[0-9a-f]{3} <_start\+0x20>
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	4b ff ff e8 	b       10000[0-9a-f]{3} <_start\+0x4>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
-+    10000[0-9a-f]{3}:	e8 83 80 00 	ld      r4,-32768\(r3\)
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	48 00 00 0c 	b       10000[0-9a-f]{3} <_start\+0x3c>
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	48 00 00 14 	b       10000[0-9a-f]{3} <_start\+0x4c>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 04 	addi    r3,r3,-28668
-+    10000[0-9a-f]{3}:	e8 a3 00 00 	ld      r5,0\(r3\)
-+    10000[0-9a-f]{3}:	4b ff ff ec 	b       10000[0-9a-f]{3} <_start\+0x34>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
-+    10000[0-9a-f]{3}:	e8 a3 80 04 	ld      r5,-32764\(r3\)
- 
--0+10000140 <\.__tls_get_addr>:
--    10000140:	4e 80 00 20 	blr
-+0+10000[0-9a-f]{3} <\.__tls_get_addr>:
-+    10000[0-9a-f]{3}:	4e 80 00 20 	blr
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsmark32.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsmark32.d
-@@ -9,17 +9,17 @@
- 
- Disassembly of section \.text:
- 
--0+1800094 <_start>:
-- 1800094:	48 00 00 14 	b       18000a8 <_start\+0x14>
-- 1800098:	38 63 90 00 	addi    r3,r3,-28672
-- 180009c:	80 83 00 00 	lwz     r4,0\(r3\)
-- 18000a0:	3c 62 00 00 	addis   r3,r2,0
-- 18000a4:	48 00 00 0c 	b       18000b0 <_start\+0x1c>
-- 18000a8:	3c 62 00 00 	addis   r3,r2,0
-- 18000ac:	4b ff ff ec 	b       1800098 <_start\+0x4>
-- 18000b0:	38 63 10 00 	addi    r3,r3,4096
-- 18000b4:	80 83 80 00 	lwz     r4,-32768\(r3\)
-+0+18000[0-9a-f]{2} <_start>:
-+ 18000[0-9a-f]{2}:	48 00 00 14 	b       18000[0-9a-f]{2} <_start\+0x14>
-+ 18000[0-9a-f]{2}:	38 63 90 00 	addi    r3,r3,-28672
-+ 18000[0-9a-f]{2}:	80 83 00 00 	lwz     r4,0\(r3\)
-+ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
-+ 18000[0-9a-f]{2}:	48 00 00 0c 	b       18000[0-9a-f]{2} <_start\+0x1c>
-+ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
-+ 18000[0-9a-f]{2}:	4b ff ff ec 	b       18000[0-9a-f]{2} <_start\+0x4>
-+ 18000[0-9a-f]{2}:	38 63 10 00 	addi    r3,r3,4096
-+ 18000[0-9a-f]{2}:	80 83 80 00 	lwz     r4,-32768\(r3\)
- 
--0+18000b8 <__tls_get_addr>:
-- 18000b8:	4e 80 00 20 	blr
--#pass
-\ No newline at end of file
-+0+18000[0-9a-f]{2} <__tls_get_addr>:
-+ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
-+#pass
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1.d
-@@ -9,17 +9,17 @@
- 
- Disassembly of section \.text:
- 
--0+100000e8 <\.__tls_get_addr>:
--    100000e8:	4e 80 00 20 	blr
-+0+10000[0-9a-f]{3} <\.__tls_get_addr>:
-+    10000[0-9a-f]{3}:	4e 80 00 20 	blr
- 
- Disassembly of section \.no_opt1:
- 
--0+100000ec <\.no_opt1>:
--    100000ec:	38 62 80 08 	addi    r3,r2,-32760
--    100000f0:	2c 24 00 00 	cmpdi   r4,0
--    100000f4:	41 82 00 10 	beq-    .*
--    100000f8:	4b ff ff f1 	bl      100000e8 <\.__tls_get_addr>
--    100000fc:	60 00 00 00 	nop
--    10000100:	48 00 00 0c 	b       .*
--    10000104:	4b ff ff e5 	bl      100000e8 <\.__tls_get_addr>
--    10000108:	60 00 00 00 	nop
-+0+10000[0-9a-f]{3} <\.no_opt1>:
-+    10000[0-9a-f]{3}:	38 62 80 08 	addi    r3,r2,-32760
-+    10000[0-9a-f]{3}:	2c 24 00 00 	cmpdi   r4,0
-+    10000[0-9a-f]{3}:	41 82 00 10 	beq-    .*
-+    10000[0-9a-f]{3}:	4b ff ff f1 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
-+    10000[0-9a-f]{3}:	4b ff ff e5 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1_32.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1_32.d
-@@ -9,16 +9,16 @@
- 
- Disassembly of section \.text:
- 
--0+1800094 <__tls_get_addr>:
-- 1800094:	4e 80 00 20 	blr
-+0+18000[0-9a-f]{2} <__tls_get_addr>:
-+ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
- 
- Disassembly of section \.no_opt1:
- 
--0+1800098 <\.no_opt1>:
-- 1800098:	38 6d ff f4 	addi    r3,r13,-12
-- 180009c:	2c 04 00 00 	cmpwi   r4,0
-- 18000a0:	41 82 00 0c 	beq-    .*
-- 18000a4:	4b ff ff f1 	bl      1800094 <__tls_get_addr>
-- 18000a8:	48 00 00 08 	b       .*
-- 18000ac:	4b ff ff e9 	bl      1800094 <__tls_get_addr>
-+0+18000[0-9a-f]{2} <\.no_opt1>:
-+ 18000[0-9a-f]{2}:	38 6d ff f4 	addi    r3,r13,-12
-+ 18000[0-9a-f]{2}:	2c 04 00 00 	cmpwi   r4,0
-+ 18000[0-9a-f]{2}:	41 82 00 0c 	beq-    .*
-+ 18000[0-9a-f]{2}:	4b ff ff f1 	bl      18000[0-9a-f]{2} <__tls_get_addr>
-+ 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
-+ 18000[0-9a-f]{2}:	4b ff ff e9 	bl      18000[0-9a-f]{2} <__tls_get_addr>
- #pass
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2.d
-@@ -9,15 +9,15 @@
- 
- Disassembly of section \.text:
- 
--0+100000e8 <\.__tls_get_addr>:
--    100000e8:	4e 80 00 20 	blr
-+0+10000[0-9a-f]{3} <\.__tls_get_addr>:
-+    10000[0-9a-f]{3}:	4e 80 00 20 	blr
- 
- Disassembly of section \.no_opt2:
- 
--0+100000ec <\.no_opt2>:
--    100000ec:	38 62 80 08 	addi    r3,r2,-32760
--    100000f0:	2c 24 00 00 	cmpdi   r4,0
--    100000f4:	41 82 00 08 	beq-    .*
--    100000f8:	38 62 80 08 	addi    r3,r2,-32760
--    100000fc:	4b ff ff ed 	bl      100000e8 <\.__tls_get_addr>
--    10000100:	60 00 00 00 	nop
-+0+10000[0-9a-f]{3} <\.no_opt2>:
-+    10000[0-9a-f]{3}:	38 62 80 08 	addi    r3,r2,-32760
-+    10000[0-9a-f]{3}:	2c 24 00 00 	cmpdi   r4,0
-+    10000[0-9a-f]{3}:	41 82 00 08 	beq-    .*
-+    10000[0-9a-f]{3}:	38 62 80 08 	addi    r3,r2,-32760
-+    10000[0-9a-f]{3}:	4b ff ff ed 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2_32.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2_32.d
-@@ -9,15 +9,15 @@
- 
- Disassembly of section \.text:
- 
--0+1800094 <__tls_get_addr>:
-- 1800094:	4e 80 00 20 	blr
-+0+18000[0-9a-f]{2} <__tls_get_addr>:
-+ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
- 
- Disassembly of section \.no_opt2:
- 
--0+1800098 <\.no_opt2>:
-- 1800098:	38 6d ff f4 	addi    r3,r13,-12
-- 180009c:	2c 04 00 00 	cmpwi   r4,0
-- 18000a0:	41 82 00 08 	beq-    .*
-- 18000a4:	38 6d ff f4 	addi    r3,r13,-12
-- 18000a8:	4b ff ff ed 	bl      1800094 <__tls_get_addr>
-+0+18000[0-9a-f]{2} <\.no_opt2>:
-+ 18000[0-9a-f]{2}:	38 6d ff f4 	addi    r3,r13,-12
-+ 18000[0-9a-f]{2}:	2c 04 00 00 	cmpwi   r4,0
-+ 18000[0-9a-f]{2}:	41 82 00 08 	beq-    .*
-+ 18000[0-9a-f]{2}:	38 6d ff f4 	addi    r3,r13,-12
-+ 18000[0-9a-f]{2}:	4b ff ff ed 	bl      18000[0-9a-f]{2} <__tls_get_addr>
- #pass
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3.d
-@@ -9,18 +9,18 @@
- 
- Disassembly of section \.text:
- 
--00000000100000e8 <\.__tls_get_addr>:
--    100000e8:	4e 80 00 20 	blr
-+0000000010000[0-9a-f]{3} <\.__tls_get_addr>:
-+    10000[0-9a-f]{3}:	4e 80 00 20 	blr
- 
- Disassembly of section \.no_opt3:
- 
--00000000100000ec <\.no_opt3>:
--    100000ec:	38 62 80 08 	addi    r3,r2,-32760
--    100000f0:	48 00 00 0c 	b       .*
--    100000f4:	38 62 80 18 	addi    r3,r2,-32744
--    100000f8:	48 00 00 10 	b       .*
--    100000fc:	4b ff ff ed 	bl      100000e8 <\.__tls_get_addr>
--    10000100:	60 00 00 00 	nop
--    10000104:	48 00 00 0c 	b       .*
--    10000108:	4b ff ff e1 	bl      100000e8 <\.__tls_get_addr>
--    1000010c:	60 00 00 00 	nop
-+0000000010000[0-9a-f]{3} <\.no_opt3>:
-+    10000[0-9a-f]{3}:	38 62 80 08 	addi    r3,r2,-32760
-+    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
-+    10000[0-9a-f]{3}:	38 62 80 18 	addi    r3,r2,-32744
-+    10000[0-9a-f]{3}:	48 00 00 10 	b       .*
-+    10000[0-9a-f]{3}:	4b ff ff ed 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
-+    10000[0-9a-f]{3}:	4b ff ff e1 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3_32.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3_32.d
-@@ -9,17 +9,17 @@
- 
- Disassembly of section \.text:
- 
--0+1800094 <__tls_get_addr>:
-- 1800094:	4e 80 00 20 	blr
-+0+18000[0-9a-f]{2} <__tls_get_addr>:
-+ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
- 
- Disassembly of section \.no_opt3:
- 
--0+1800098 <\.no_opt3>:
-- 1800098:	38 6d ff ec 	addi    r3,r13,-20
-- 180009c:	48 00 00 0c 	b       .*
-- 18000a0:	38 6d ff f4 	addi    r3,r13,-12
-- 18000a4:	48 00 00 0c 	b       .*
-- 18000a8:	4b ff ff ed 	bl      1800094 <__tls_get_addr>
-- 18000ac:	48 00 00 08 	b       .*
-- 18000b0:	4b ff ff e5 	bl      1800094 <__tls_get_addr>
-+0+18000[0-9a-f]{2} <\.no_opt3>:
-+ 18000[0-9a-f]{2}:	38 6d ff ec 	addi    r3,r13,-20
-+ 18000[0-9a-f]{2}:	48 00 00 0c 	b       .*
-+ 18000[0-9a-f]{2}:	38 6d ff f4 	addi    r3,r13,-12
-+ 18000[0-9a-f]{2}:	48 00 00 0c 	b       .*
-+ 18000[0-9a-f]{2}:	4b ff ff ed 	bl      18000[0-9a-f]{2} <__tls_get_addr>
-+ 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
-+ 18000[0-9a-f]{2}:	4b ff ff e5 	bl      18000[0-9a-f]{2} <__tls_get_addr>
- #pass
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4.d
-@@ -9,40 +9,40 @@
- 
- Disassembly of section \.text:
- 
--0+100000e8 <\.__tls_get_addr>:
--    100000e8:	4e 80 00 20 	blr
-+0+10000[0-9a-f]{3} <\.__tls_get_addr>:
-+    10000[0-9a-f]{3}:	4e 80 00 20 	blr
- 
- Disassembly of section \.opt1:
- 
--0+100000ec <\.opt1>:
--    100000ec:	3c 6d 00 00 	addis   r3,r13,0
--    100000f0:	2c 24 00 00 	cmpdi   r4,0
--    100000f4:	41 82 00 10 	beq-    .*
--    100000f8:	60 00 00 00 	nop
--    100000fc:	38 63 90 10 	addi    r3,r3,-28656
--    10000100:	48 00 00 0c 	b       .*
--    10000104:	60 00 00 00 	nop
--    10000108:	38 63 90 10 	addi    r3,r3,-28656
-+0+10000[0-9a-f]{3} <\.opt1>:
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	2c 24 00 00 	cmpdi   r4,0
-+    10000[0-9a-f]{3}:	41 82 00 10 	beq-    .*
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 10 	addi    r3,r3,-28656
-+    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 10 	addi    r3,r3,-28656
- 
- Disassembly of section \.opt2:
- 
--0+1000010c <\.opt2>:
--    1000010c:	3c 6d 00 00 	addis   r3,r13,0
--    10000110:	2c 24 00 00 	cmpdi   r4,0
--    10000114:	41 82 00 08 	beq-    .*
--    10000118:	3c 6d 00 00 	addis   r3,r13,0
--    1000011c:	60 00 00 00 	nop
--    10000120:	38 63 90 10 	addi    r3,r3,-28656
-+0+10000[0-9a-f]{3} <\.opt2>:
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	2c 24 00 00 	cmpdi   r4,0
-+    10000[0-9a-f]{3}:	41 82 00 08 	beq-    .*
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 10 	addi    r3,r3,-28656
- 
- Disassembly of section \.opt3:
- 
--0+10000124 <\.opt3>:
--    10000124:	3c 6d 00 00 	addis   r3,r13,0
--    10000128:	48 00 00 0c 	b       .*
--    1000012c:	3c 6d 00 00 	addis   r3,r13,0
--    10000130:	48 00 00 10 	b       .*
--    10000134:	60 00 00 00 	nop
--    10000138:	38 63 90 10 	addi    r3,r3,-28656
--    1000013c:	48 00 00 0c 	b       .*
--    10000140:	60 00 00 00 	nop
--    10000144:	38 63 90 08 	addi    r3,r3,-28664
-+0+10000[0-9a-f]{3} <\.opt3>:
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
-+    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
-+    10000[0-9a-f]{3}:	48 00 00 10 	b       .*
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 10 	addi    r3,r3,-28656
-+    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
-+    10000[0-9a-f]{3}:	60 00 00 00 	nop
-+    10000[0-9a-f]{3}:	38 63 90 08 	addi    r3,r3,-28664
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4_32.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4_32.d
-@@ -9,36 +9,36 @@
- 
- Disassembly of section \.text:
- 
--0+1800094 <__tls_get_addr>:
-- 1800094:	4e 80 00 20 	blr
-+0+18000[0-9a-f]{2} <__tls_get_addr>:
-+ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
- 
- Disassembly of section \.opt1:
- 
--0+1800098 <\.opt1>:
-- 1800098:	3c 62 00 00 	addis   r3,r2,0
-- 180009c:	2c 04 00 00 	cmpwi   r4,0
-- 18000a0:	41 82 00 0c 	beq-    .*
-- 18000a4:	38 63 90 10 	addi    r3,r3,-28656
-- 18000a8:	48 00 00 08 	b       .*
-- 18000ac:	38 63 90 10 	addi    r3,r3,-28656
-+0+18000[0-9a-f]{2} <\.opt1>:
-+ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
-+ 18000[0-9a-f]{2}:	2c 04 00 00 	cmpwi   r4,0
-+ 18000[0-9a-f]{2}:	41 82 00 0c 	beq-    .*
-+ 18000[0-9a-f]{2}:	38 63 90 10 	addi    r3,r3,-28656
-+ 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
-+ 18000[0-9a-f]{2}:	38 63 90 10 	addi    r3,r3,-28656
- 
- Disassembly of section \.opt2:
- 
--0+18000b0 <\.opt2>:
-- 18000b0:	3c 62 00 00 	addis   r3,r2,0
-- 18000b4:	2c 04 00 00 	cmpwi   r4,0
-- 18000b8:	41 82 00 08 	beq-    .*
-- 18000bc:	3c 62 00 00 	addis   r3,r2,0
-- 18000c0:	38 63 90 10 	addi    r3,r3,-28656
-+0+18000[0-9a-f]{2} <\.opt2>:
-+ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
-+ 18000[0-9a-f]{2}:	2c 04 00 00 	cmpwi   r4,0
-+ 18000[0-9a-f]{2}:	41 82 00 08 	beq-    .*
-+ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
-+ 18000[0-9a-f]{2}:	38 63 90 10 	addi    r3,r3,-28656
- 
- Disassembly of section \.opt3:
- 
--0+18000c4 <\.opt3>:
-- 18000c4:	3c 62 00 00 	addis   r3,r2,0
-- 18000c8:	48 00 00 0c 	b       .*
-- 18000cc:	3c 62 00 00 	addis   r3,r2,0
-- 18000d0:	48 00 00 0c 	b       .*
-- 18000d4:	38 63 90 10 	addi    r3,r3,-28656
-- 18000d8:	48 00 00 08 	b       .*
-- 18000dc:	38 63 90 08 	addi    r3,r3,-28664
-+0+18000[0-9a-f]{2} <\.opt3>:
-+ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
-+ 18000[0-9a-f]{2}:	48 00 00 0c 	b       .*
-+ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
-+ 18000[0-9a-f]{2}:	48 00 00 0c 	b       .*
-+ 18000[0-9a-f]{2}:	38 63 90 10 	addi    r3,r3,-28656
-+ 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
-+ 18000[0-9a-f]{2}:	38 63 90 08 	addi    r3,r3,-28664
- #pass
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.d
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.d
-@@ -42,5 +42,5 @@ Disassembly of section \.got:
- #...
- .*:	4e 80 00 21 	blrl
- .* <_GLOBAL_OFFSET_TABLE_>:
--.*:	00 01 03 ec .*
-+.*:	00 01 [0-9a-f]{2} [0-9a-f]{2} .*
- #pass
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.g
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.g
-@@ -9,5 +9,5 @@
- Contents of section \.got:
- .* 00000000 00000000 00000000 00000000  .*
- .* 00000000 00000000 00000000 00000000  .*
--.* 00000000 4e800021 000103ec 00000000  .*
-+.* 00000000 4e800021 00010[0-9a-f]{3} 00000000  .*
- .* 00000000                             .*
---- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.r
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.r
-@@ -35,6 +35,7 @@ Program Headers:
-  +LOAD .* RWE 0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+1c 0x0+38 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -42,6 +43,7 @@ Program Headers:
-  +01 +\.tdata \.dynamic \.got \.plt 
-  +02 +\.dynamic 
-  +03 +\.tdata \.tbss 
-+ +04 +
- 
- Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
-  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-@@ -52,9 +54,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
- [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0
- [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0
- [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0
--[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4
--[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8
--[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8
-+[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
-+[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
-+[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
- [0-9a-f ]+R_PPC_DTPMOD32 +0
- [0-9a-f ]+R_PPC_DTPREL32 +0
- [0-9a-f ]+R_PPC_DTPMOD32 +0
---- binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.g
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.g
-@@ -8,8 +8,8 @@
- .*: +file format elf64-powerpc
- 
- Contents of section \.got:
-- 100101a0 00000000 00000001 00000000 00000000  .*
-- 100101b0 00000000 00000001 00000000 00000000  .*
-- 100101c0 00000000 00000001 00000000 00000000  .*
-- 100101d0 00000000 00000001 00000000 00000000  .*
-- 100101e0 ffffffff ffff8060 00000000 00000000  .*
-+ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
-+ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
-+ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
-+ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
-+ 10010[0-9a-f]{3} ffffffff ffff8060 00000000 00000000  .*
---- binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.t
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.t
-@@ -8,7 +8,7 @@
- .*: +file format elf64-powerpc
- 
- Contents of section \.tdata:
-- 10010148 00c0ffee 00000000 12345678 9abcdef0  .*
-- 10010158 23456789 abcdef01 3456789a bcdef012  .*
-- 10010168 456789ab cdef0123 56789abc def01234  .*
-- 10010178 6789abcd ef012345 789abcde f0123456  .*
-+ 10010180 00c0ffee 00000000 12345678 9abcdef0  .*
-+ 10010190 23456789 abcdef01 3456789a bcdef012  .*
-+ 100101a0 456789ab cdef0123 56789abc def01234  .*
-+ 100101b0 6789abcd ef012345 789abcde f0123456  .*
---- binutils-2.23/ld/testsuite/ld-powerpc/tlstocso.g
-+++ binutils-2.23/ld/testsuite/ld-powerpc/tlstocso.g
-@@ -7,7 +7,7 @@
- .*: +file format elf64-powerpc
- 
- Contents of section \.got:
--.* 00000000 000186c0 00000000 00000000  .*
-+.* 00000000 000186f8 00000000 00000000  .*
- .* 00000000 00000000 00000000 00000000  .*
- .* 00000000 00000000 00000000 00000000  .*
- .* 00000000 00000000 00000000 00000000  .*
---- binutils-2.23/ld/testsuite/ld-s390/tlsbin.rd
-+++ binutils-2.23/ld/testsuite/ld-s390/tlsbin.rd
-@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+
-  +LOAD .* RW +0x1000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+60 0x0+a0 R +0x20
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -52,6 +53,7 @@ Program Headers:
-  +03 +.tdata .dynamic .got *
-  +04 +.dynamic *
-  +05 +.tdata .tbss *
-+ +06 +
- 
- Relocation section '.rela.dyn' at offset .* contains 4 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
---- binutils-2.23/ld/testsuite/ld-s390/tlsbin_64.rd
-+++ binutils-2.23/ld/testsuite/ld-s390/tlsbin_64.rd
-@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+
-  +LOAD .* RW +0x1000
-  +DYNAMIC .* RW +0x8
-  +TLS .* 0x0+60 0x0+a0 R +0x20
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -52,6 +53,7 @@ Program Headers:
-  +03 +.tdata .dynamic .got *
-  +04 +.dynamic *
-  +05 +.tdata .tbss *
-+ +06 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
-  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.23/ld/testsuite/ld-s390/tlspic.rd
-+++ binutils-2.23/ld/testsuite/ld-s390/tlspic.rd
-@@ -39,6 +39,7 @@ Program Headers:
-  +LOAD .* RW +0x1000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+60 0x0+80 R +0x20
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -46,6 +47,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got 
-  +02 +.dynamic 
-  +03 +.tdata .tbss 
-+ +04 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
---- binutils-2.23/ld/testsuite/ld-s390/tlspic_64.rd
-+++ binutils-2.23/ld/testsuite/ld-s390/tlspic_64.rd
-@@ -39,6 +39,7 @@ Program Headers:
-  +LOAD .* RW +0x1000
-  +DYNAMIC .* RW +0x8
-  +TLS .* 0x0+60 0x0+80 R +0x20
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -46,6 +47,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got *
-  +02 +.dynamic *
-  +03 +.tdata .tbss *
-+ +04 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
-  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.23/ld/testsuite/ld-scripts/empty-aligned.d
-+++ binutils-2.23/ld/testsuite/ld-scripts/empty-aligned.d
-@@ -8,7 +8,9 @@
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg +Align
-  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ [RWE ]+ +0x[0-9a-f]+
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-  +00 +.text 
-+ +01 +
---- binutils-2.23/ld/testsuite/ld-sh/tlsbin-2.d
-+++ binutils-2.23/ld/testsuite/ld-sh/tlsbin-2.d
-@@ -44,6 +44,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+28 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -53,6 +54,7 @@ Program Headers:
-  +03 +\.tdata \.dynamic \.got *
-  +04 +\.dynamic *
-  +05 +\.tdata \.tbss *
-+ +06 +
- 
- Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
-  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
---- binutils-2.23/ld/testsuite/ld-sh/tlspic-2.d
-+++ binutils-2.23/ld/testsuite/ld-sh/tlspic-2.d
-@@ -32,7 +32,7 @@ Key to Flags:
- 
- Elf file type is DYN \(Shared object file\)
- Entry point 0x[0-9a-f]+
--There are 4 program headers, starting at offset [0-9]+
-+There are [0-9] program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-@@ -40,6 +40,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS .* 0x0+18 0x0+20 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -47,6 +48,7 @@ Program Headers:
-  +01 +\.tdata \.dynamic \.got *
-  +02 +\.dynamic *
-  +03 +\.tdata \.tbss *
-+ +04 +
- 
- Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
-  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
---- binutils-2.23/ld/testsuite/ld-sparc/gotop32.rd
-+++ binutils-2.23/ld/testsuite/ld-sparc/gotop32.rd
-@@ -31,6 +31,7 @@ Program Headers:
-  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
-  +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000
-  +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+70 0x0+70 RW +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
---- binutils-2.23/ld/testsuite/ld-sparc/gotop64.rd
-+++ binutils-2.23/ld/testsuite/ld-sparc/gotop64.rd
-@@ -31,6 +31,7 @@ Program Headers:
-  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000
-  +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000
-  +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+e0 0x0+e0 RW +0x8
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
---- binutils-2.23/ld/testsuite/ld-sparc/tlssunbin32.rd
-+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunbin32.rd
-@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
-- +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4
-- +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1
-+ +PHDR +0x0+34 0x0+10034 0x0+10034 (0x[0-9a-f]+) \1 R E 0x4
-+ +INTERP +(0x[0-9a-f]+ ){3}0x0+11 0x0+11 R +0x1
- .*Requesting program interpreter.*
-  +LOAD .* R E 0x10000
-  +LOAD .* RW +0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+1060 0x0+10a0 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
---- binutils-2.23/ld/testsuite/ld-sparc/tlssunbin64.rd
-+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunbin64.rd
-@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-- +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8
-- +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1
-+ +PHDR +0x0+40 0x0+100040 0x0+100040 (0x[0-9a-f]+) \1 R E 0x8
-+ +INTERP +0x0+([0-9a-f]+) (0x0+10+\1) \2 0x0+19 0x0+19 R +0x1
- .*Requesting program interpreter.*
-  +LOAD .* R E 0x100000
-  +LOAD .* RW +0x100000
-  +DYNAMIC .* RW +0x8
-  +TLS .* 0x0+60 0x0+a0 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
---- binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic32.rd
-+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic32.rd
-@@ -32,6 +32,7 @@ Program Headers:
-  +LOAD .* RW +0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+ 0x0+24 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
---- binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic64.rd
-+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic64.rd
-@@ -32,6 +32,7 @@ Program Headers:
-  +LOAD .* RW +0x100000
-  +DYNAMIC .* RW +0x8
-  +TLS .* 0x0+ 0x0+24 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.23/ld/testsuite/ld-sparc/tlssunpic32.rd
-+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunpic32.rd
-@@ -36,6 +36,7 @@ Program Headers:
-  +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000
-  +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4
-  +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.23/ld/testsuite/ld-sparc/tlssunpic64.rd
-+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunpic64.rd
-@@ -36,6 +36,7 @@ Program Headers:
-  +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000
-  +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8
-  +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+60 0x0+80 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.23/ld/testsuite/ld-x86-64/tlsgdesc.rd
-+++ binutils-2.23/ld/testsuite/ld-x86-64/tlsgdesc.rd
-@@ -36,12 +36,14 @@ Program Headers:
-  +LOAD.*
-  +LOAD.*
-  +DYNAMIC.*
-+ +PAX_FLAGS.*
- 
-  Section to Segment mapping:
-  +Segment Sections...
-  +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
-  +01 +.dynamic .got .got.plt *
-  +02 +.dynamic *
-+ +03 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
-  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.23/ld/testsuite/ld-x86-64/tlspic.rd
-+++ binutils-2.23/ld/testsuite/ld-x86-64/tlspic.rd
-@@ -40,6 +40,7 @@ Program Headers:
-  +LOAD +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+244 0x0+244 RW +0x200000
-  +DYNAMIC +0x0+1210 0x0+201210 0x0+201210 0x0+130 0x0+130 RW +0x8
-  +TLS +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+60 0x0+80 R +0x1
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -47,6 +48,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got .got.plt *
-  +02 +.dynamic *
-  +03 +.tdata .tbss *
-+ +04 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
-  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
diff --git a/pkgs/development/tools/misc/binutils/pt-pax-flags-20141022.patch b/pkgs/development/tools/misc/binutils/pt-pax-flags-20141022.patch
new file mode 100644
index 000000000000..e942787da01c
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/pt-pax-flags-20141022.patch
@@ -0,0 +1,1030 @@
+--- binutils-2.24.90/bfd/elf-bfd.h
++++ binutils-2.24.90/bfd/elf-bfd.h
+@@ -1558,6 +1558,9 @@ struct output_elf_obj_tdata
+   /* Segment flags for the PT_GNU_STACK segment.  */
+   unsigned int stack_flags;
+ 
++  /* Segment flags for the PT_PAX_FLAGS segment.  */
++  unsigned int pax_flags;
++
+   /* This is set to TRUE if the object was created by the backend
+      linker.  */
+   bfd_boolean linker;
+@@ -1703,6 +1706,7 @@ struct elf_obj_tdata
+ #define elf_eh_frame_hdr(bfd)	(elf_tdata(bfd) -> o->eh_frame_hdr)
+ #define elf_linker(bfd)		(elf_tdata(bfd) -> o->linker)
+ #define elf_stack_flags(bfd)	(elf_tdata(bfd) -> o->stack_flags)
++#define elf_pax_flags(bfd)	(elf_tdata(bfd) -> o->pax_flags)
+ #define elf_shstrtab(bfd)	(elf_tdata(bfd) -> o->strtab_ptr)
+ #define elf_onesymtab(bfd)	(elf_tdata(bfd) -> symtab_section)
+ #define elf_symtab_shndx(bfd)	(elf_tdata(bfd) -> symtab_shndx_section)
+--- binutils-2.24.90/bfd/elf.c
++++ binutils-2.24.90/bfd/elf.c
+@@ -1151,6 +1151,7 @@ get_segment_type (unsigned int p_type)
+     case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
+     case PT_GNU_STACK: pt = "STACK"; break;
+     case PT_GNU_RELRO: pt = "RELRO"; break;
++    case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
+     default: pt = NULL; break;
+     }
+   return pt;
+@@ -2498,6 +2499,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index)
+     case PT_GNU_RELRO:
+       return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro");
+ 
++    case PT_PAX_FLAGS:
++      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags");
++
+     default:
+       /* Check for any processor-specific program segment types.  */
+       bed = get_elf_backend_data (abfd);
+@@ -3590,6 +3594,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
+       ++segs;
+     }
+ 
++    {
++      /* We need a PT_PAX_FLAGS segment.  */
++      ++segs;
++    }
++
+   for (s = abfd->sections; s != NULL; s = s->next)
+     {
+       if ((s->flags & SEC_LOAD) != 0
+@@ -4226,6 +4235,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
+ 	    }
+ 	}
+ 
++    {
++      amt = sizeof (struct elf_segment_map);
++      m = bfd_zalloc (abfd, amt);
++      if (m == NULL)
++	goto error_return;
++      m->next = NULL;
++      m->p_type = PT_PAX_FLAGS;
++      m->p_flags = elf_pax_flags (abfd);
++      m->p_flags_valid = 1;
++
++      *pm = m;
++      pm = &m->next;
++    }
++
+       free (sections);
+       elf_seg_map (abfd) = mfirst;
+     }
+@@ -5584,7 +5607,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
+        6. PT_TLS segment includes only SHF_TLS sections.
+        7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
+        8. PT_DYNAMIC should not contain empty sections at the beginning
+-	  (with the possible exception of .dynamic).  */
++	  (with the possible exception of .dynamic).
++       9. PT_PAX_FLAGS segments do not include any sections.  */
+ #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed)		\
+   ((((segment->p_paddr							\
+       ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr)	\
+@@ -5592,6 +5616,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
+      && (section->flags & SEC_ALLOC) != 0)				\
+     || IS_NOTE (segment, section))					\
+    && segment->p_type != PT_GNU_STACK					\
++   && segment->p_type != PT_PAX_FLAGS					\
+    && (segment->p_type != PT_TLS					\
+        || (section->flags & SEC_THREAD_LOCAL))				\
+    && (segment->p_type == PT_LOAD					\
+--- binutils-2.24.90/bfd/elflink.c
++++ binutils-2.24.90/bfd/elflink.c
+@@ -5563,18 +5563,31 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
+       && ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
+     return FALSE;
+ 
++  elf_pax_flags (output_bfd) = PF_NORANDEXEC;
++  if (info->execheap)
++    elf_pax_flags (output_bfd) |= PF_NOMPROTECT;
++  else if (info->noexecheap)
++    elf_pax_flags (output_bfd) |= PF_MPROTECT;
++
+   /* Determine any GNU_STACK segment requirements, after the backend
+      has had a chance to set a default segment size.  */
+   if (info->execstack)
+-    elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X;
++    {
++      elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X;
++      elf_pax_flags (output_bfd) |= PF_EMUTRAMP;
++    }
+   else if (info->noexecstack)
+-    elf_stack_flags (output_bfd) = PF_R | PF_W;
++    {
++      elf_stack_flags (output_bfd) = PF_R | PF_W;
++      elf_pax_flags (output_bfd) |= PF_NOEMUTRAMP;
++    }
+   else
+     {
+       bfd *inputobj;
+       asection *notesec = NULL;
+       int exec = 0;
+ 
++      elf_pax_flags (output_bfd) |= PF_NOEMUTRAMP;
+       for (inputobj = info->input_bfds;
+ 	   inputobj;
+ 	   inputobj = inputobj->link.next)
+@@ -5601,7 +5601,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
+ 	  if (s)
+ 	    {
+ 	      if (s->flags & SEC_CODE)
+-		exec = PF_X;
++		{
++		  elf_pax_flags (output_bfd) &= ~PF_NOEMUTRAMP;
++		  elf_pax_flags (output_bfd) |= PF_EMUTRAMP;
++		  exec = PF_X;
++		}
+ 	      notesec = s;
+ 	    }
+ 	  else if (bed->default_execstack)
+--- binutils-2.24.90/binutils/readelf.c
++++ binutils-2.24.90/binutils/readelf.c
+@@ -3262,6 +3262,7 @@ get_segment_type (unsigned long p_type)
+ 			return "GNU_EH_FRAME";
+     case PT_GNU_STACK:	return "GNU_STACK";
+     case PT_GNU_RELRO:  return "GNU_RELRO";
++    case PT_PAX_FLAGS:  return "PAX_FLAGS";
+ 
+     default:
+       if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
+--- binutils-2.24.90/include/bfdlink.h
++++ binutils-2.24.90/include/bfdlink.h
+@@ -339,6 +339,14 @@ struct bfd_link_info
+   /* TRUE if PT_GNU_RELRO segment should be created.  */
+   unsigned int relro: 1;
+ 
++  /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
++     flags.  */
++  unsigned int execheap: 1;
++
++  /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
++     flags.  */
++  unsigned int noexecheap: 1;
++
+   /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
+      should be created.  */
+   unsigned int eh_frame_hdr: 1;
+--- binutils-2.24.90/include/elf/common.h
++++ binutils-2.24.90/include/elf/common.h
+@@ -434,6 +434,7 @@
+ #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
+ #define PT_GNU_STACK	(PT_LOOS + 0x474e551) /* Stack flags */
+ #define PT_GNU_RELRO	(PT_LOOS + 0x474e552) /* Read-only after relocation */
++#define PT_PAX_FLAGS	(PT_LOOS + 0x5041580) /* PaX flags */
+ 
+ /* Program segment permissions, in program header p_flags field.  */
+ 
+@@ -444,6 +445,21 @@
+ #define PF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
+ #define PF_MASKPROC	0xF0000000	/* Processor-specific reserved bits */
+ 
++/* Flags to control PaX behavior.  */
++
++#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
++#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
++#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
++#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
++#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
++#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
++#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
++#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
++#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
++#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
++#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
++#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
++
+ /* Values for section header, sh_type field.  */
+ 
+ #define SHT_NULL	0		/* Section header table entry unused */
+--- binutils-2.24.90/ld/emultempl/elf32.em
++++ binutils-2.24.90/ld/emultempl/elf32.em
+@@ -2276,6 +2276,16 @@ fragment <<EOF
+ 	  link_info.noexecstack = TRUE;
+ 	  link_info.execstack = FALSE;
+ 	}
++      else if (strcmp (optarg, "execheap") == 0)
++	{
++	  link_info.execheap = TRUE;
++	  link_info.noexecheap = FALSE;
++	}
++      else if (strcmp (optarg, "noexecheap") == 0)
++	{
++	  link_info.noexecheap = TRUE;
++	  link_info.execheap = FALSE;
++	}
+ EOF
+ if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
+ fragment <<EOF
+@@ -2395,6 +2405,8 @@ fragment <<EOF
+   -z defs                     Report unresolved symbols in object files.\n"));
+   fprintf (file, _("\
+   -z execstack                Mark executable as requiring executable stack\n"));
++  fprintf (file, _("\
++  -z execheap                 Mark executable as requiring executable heap\n"));
+ EOF
+ 
+ if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
+@@ -2439,6 +2451,8 @@ fi
+ fragment <<EOF
+   fprintf (file, _("\
+   -z noexecstack              Mark executable as not requiring executable stack\n"));
++  fprintf (file, _("\
++  -z noexecheap               Mark executable as not requiring executable heap\n"));
+ EOF
+ if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
+ fragment <<EOF
+--- binutils-2.24.90/ld/ldgram.y
++++ binutils-2.24.90/ld/ldgram.y
+@@ -1235,6 +1235,8 @@ phdr_type:
+ 			    $$ = exp_intop (0x6474e550);
+ 			  else if (strcmp (s, "PT_GNU_STACK") == 0)
+ 			    $$ = exp_intop (0x6474e551);
++			  else if (strcmp (s, "PT_PAX_FLAGS") == 0)
++			    $$ = exp_intop (0x65041580);
+ 			  else
+ 			    {
+ 			      einfo (_("\
+--- binutils-2.24.90/ld/testsuite/ld-alpha/tlsbin.rd
++++ binutils-2.24.90/ld/testsuite/ld-alpha/tlsbin.rd
+@@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+-  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8
++  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+188 R E 0x8
+   INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
+ .*Requesting program interpreter.*
+   LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
+   LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+   DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
+   TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries:
+--- binutils-2.24.90/ld/testsuite/ld-alpha/tlsbinr.rd
++++ binutils-2.24.90/ld/testsuite/ld-alpha/tlsbinr.rd
+@@ -42,6 +42,7 @@ Program Headers:
+  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+  +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries:
+--- binutils-2.24.90/ld/testsuite/ld-alpha/tlspic.rd
++++ binutils-2.24.90/ld/testsuite/ld-alpha/tlspic.rd
+@@ -38,6 +38,7 @@ Program Headers:
+  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+  +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
+  +TLS +0x0+10e0 0x0+110e0 0x0+110e0 0x0+60 0x0+80 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries:
+--- binutils-2.24.90/ld/testsuite/ld-elf/eh1.d
++++ binutils-2.24.90/ld/testsuite/ld-elf/eh1.d
+@@ -23,11 +23,11 @@ Contents of the .eh_frame section:
+   DW_CFA_nop
+   DW_CFA_nop
+ 
+-0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078\.\.0+400090
+-  DW_CFA_advance_loc: 8 to 0+400080
++0+0018 0+001c 0+001c FDE cie=0+0000 pc=[0-9a-f.]+
++  DW_CFA_advance_loc: 8 to [0-9a-f]+
+   DW_CFA_def_cfa_offset: 16
+   DW_CFA_offset: r6 \(rbp\) at cfa-16
+-  DW_CFA_advance_loc: 8 to 0+400088
++  DW_CFA_advance_loc: 8 to [0-9a-f]+
+   DW_CFA_def_cfa_register: r6 \(rbp\)
+ 
+ 0+0038 ZERO terminator
+--- binutils-2.24.90/ld/testsuite/ld-elf/eh2.d
++++ binutils-2.24.90/ld/testsuite/ld-elf/eh2.d
+@@ -23,11 +23,11 @@ Contents of the .eh_frame section:
+   DW_CFA_nop
+   DW_CFA_nop
+ 
+-0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078\.\.0+400090
+-  DW_CFA_advance_loc: 8 to 0+400080
++0+0018 0+001c 0+001c FDE cie=0+0000 pc=[0-9a-f.]+
++  DW_CFA_advance_loc: 8 to [0-9a-f]+
+   DW_CFA_def_cfa_offset: 16
+   DW_CFA_offset: r6 \(rbp\) at cfa-16
+-  DW_CFA_advance_loc: 8 to 0+400088
++  DW_CFA_advance_loc: 8 to [0-9a-f]+
+   DW_CFA_def_cfa_register: r6 \(rbp\)
+ 
+ 0+0038 ZERO terminator
+--- binutils-2.24.90/ld/testsuite/ld-elf/eh3.d
++++ binutils-2.24.90/ld/testsuite/ld-elf/eh3.d
+@@ -23,11 +23,11 @@ Contents of the .eh_frame section:
+   DW_CFA_nop
+   DW_CFA_nop
+ 
+-0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078\.\.0+400090
+-  DW_CFA_advance_loc: 8 to 0+400080
++0+0018 0+001c 0+001c FDE cie=0+0000 pc=[0-9a-f.]+)
++  DW_CFA_advance_loc: 8 to [0-9a-f]+
+   DW_CFA_def_cfa_offset: 16
+   DW_CFA_offset: r6 \(rbp\) at cfa-16
+-  DW_CFA_advance_loc: 8 to 0+400088
++  DW_CFA_advance_loc: 8 to [0-9a-f]+
+   DW_CFA_def_cfa_register: r6 \(rbp\)
+ 
+ 0+0038 ZERO terminator
+--- binutils-2.24.90/ld/testsuite/ld-elf/orphan-region.d
++++ binutils-2.24.90/ld/testsuite/ld-elf/orphan-region.d
+@@ -15,7 +15,9 @@
+ Program Headers:
+   Type.*
+   LOAD[ \t]+0x[0-9a-f]+ 0x0*40000000 0x0*40000000 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x[0-9a-f]+
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+   Segment Sections...
+    00     .text .rodata .moredata *
++   01 +
+--- binutils-2.24.90/ld/testsuite/ld-i386/tlsbin.rd
++++ binutils-2.24.90/ld/testsuite/ld-i386/tlsbin.rd
+@@ -44,6 +44,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -53,6 +54,7 @@ Program Headers:
+  +03 +.tdata .dynamic .got .got.plt *
+  +04 +.dynamic *
+  +05 +.tdata .tbss *
++ +06 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.24.90/ld/testsuite/ld-i386/tlsbindesc.rd
++++ binutils-2.24.90/ld/testsuite/ld-i386/tlsbindesc.rd
+@@ -42,6 +42,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -51,6 +52,7 @@ Program Headers:
+  +03 +.tdata .dynamic .got .got.plt *
+  +04 +.dynamic *
+  +05 +.tdata .tbss *
++ +06 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.24.90/ld/testsuite/ld-i386/tlsdesc.rd
++++ binutils-2.24.90/ld/testsuite/ld-i386/tlsdesc.rd
+@@ -39,6 +39,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -46,6 +47,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got .got.plt *
+  +02 +.dynamic *
+  +03 +.tdata .tbss *
++ +04 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.24.90/ld/testsuite/ld-i386/tlsgdesc.rd
++++ binutils-2.24.90/ld/testsuite/ld-i386/tlsgdesc.rd
+@@ -36,12 +36,14 @@ Program Headers:
+  +LOAD.*
+  +LOAD.*
+  +DYNAMIC.*
++ +PAX_FLAGS.*
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+  +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text *
+  +01 +.dynamic .got .got.plt *
+  +02 +.dynamic *
++ +03 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.24.90/ld/testsuite/ld-i386/tlsnopic.rd
++++ binutils-2.24.90/ld/testsuite/ld-i386/tlsnopic.rd
+@@ -37,6 +37,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -44,6 +45,7 @@ Program Headers:
+  +01 +.dynamic .got .got.plt *
+  +02 +.dynamic *
+  +03 +.tbss *
++ +04 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.24.90/ld/testsuite/ld-i386/tlspic.rd
++++ binutils-2.24.90/ld/testsuite/ld-i386/tlspic.rd
+@@ -40,6 +40,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -47,6 +48,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got .got.plt *
+  +02 +.dynamic *
+  +03 +.tdata .tbss *
++ +04 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.24.90/ld/testsuite/ld-ia64/merge1.d
++++ binutils-2.24.90/ld/testsuite/ld-ia64/merge1.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+1e0 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 c0 04 00 48 00 	            addl r12=24,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.24.90/ld/testsuite/ld-ia64/merge2.d
++++ binutils-2.24.90/ld/testsuite/ld-ia64/merge2.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+1e0 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 c0 04 00 48 00 	            addl r12=24,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.24.90/ld/testsuite/ld-ia64/merge3.d
++++ binutils-2.24.90/ld/testsuite/ld-ia64/merge3.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+210 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.24.90/ld/testsuite/ld-ia64/merge4.d
++++ binutils-2.24.90/ld/testsuite/ld-ia64/merge4.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+240 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.24.90/ld/testsuite/ld-ia64/merge5.d
++++ binutils-2.24.90/ld/testsuite/ld-ia64/merge5.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+270 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.24.90/ld/testsuite/ld-ia64/tlsbin.rd
++++ binutils-2.24.90/ld/testsuite/ld-ia64/tlsbin.rd
+@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+- +PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8
+- +INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
++ +PHDR +0x0+40 0x40+40 0x40+40 (0x[0-9a-f]+) \1 R E 0x8
++ +INTERP +0x0+([0-9a-f]+) (0x40+\1) \2 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
+ .*Requesting program interpreter.*
+  +LOAD +0x0+ 0x40+ 0x40+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ R E 0x10000
+  +LOAD +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
+  +DYNAMIC +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+150 0x0+150 RW +0x8
+  +TLS +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+60 0x0+a0 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  +IA_64_UNWIND .* R +0x8
+ #...
+ 
+--- binutils-2.24.90/ld/testsuite/ld-ia64/tlspic.rd
++++ binutils-2.24.90/ld/testsuite/ld-ia64/tlspic.rd
+@@ -40,6 +40,7 @@ Program Headers:
+  +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
+  +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8
+  +TLS +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+60 0x0+80 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8
+ #...
+ 
+--- binutils-2.24.90/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
++++ binutils-2.24.90/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
+@@ -8,9 +8,9 @@
+ .*: +file format.*
+ 
+ Disassembly of section \.text:
+-004000f0 <[^>]*> 3c1c0043 	lui	gp,0x43
+-004000f4 <[^>]*> 279c9ff0 	addiu	gp,gp,-24592
+-004000f8 <[^>]*> afbc0008 	sw	gp,8\(sp\)
++00400110 <[^>]*> 3c1c0043 	lui	gp,0x43
++00400114 <[^>]*> 279c9ff0 	addiu	gp,gp,-24592
++00400118 <[^>]*> afbc0008 	sw	gp,8\(sp\)
+ #...
+ 00408da0 <[^>]*> 3c1c0043 	lui	gp,0x43
+ 00408da4 <[^>]*> 279c2c98 	addiu	gp,gp,11416
+--- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
++++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is DYN \(Shared object file\)
+ Entry point .*
+-There are 5 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -9,6 +9,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.*
+  * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 [^ ]+ * [^ ]+ * R  * 0x.*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -18,3 +19,4 @@ Program Headers:
+  *0*2 * \.data \.got *
+  *0*3 * \.dynamic *
+  *0*4 *
++ *0*5 *
+--- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
++++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 *\.got \.data *
+  *0*6 *\.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
++++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 * \.got \.data \.bss *
+  *0*6 * \.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
++++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 * \.got \.data \.bss *
+  *0*6 * \.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
++++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 * \.got \.data \.bss *
+  *0*6 * \.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
++++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 7 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -12,6 +12,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -23,3 +24,4 @@ Program Headers:
+  *0*4 * \.got \.data \.bss *
+  *0*5 * \.dynamic *
+  *0*6 *
++ *0*7 *
+--- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
++++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 * \.got \.data \.bss *
+  *0*6 * \.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.24.90/ld/testsuite/ld-powerpc/tlsexe32.r
++++ binutils-2.24.90/ld/testsuite/ld-powerpc/tlsexe32.r
+@@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
+- +PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4
+- +INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1
++ +PHDR +0x000034 0x01800034 0x01800034 (0x000[0-9a-f]{2}) \1 R E 0x4
++ +INTERP +0x000([0-9a-f]{3}) 0x01800\1 0x01800\1 0x00011 0x00011 R +0x1
+  +\[Requesting program interpreter: .*\]
+  +LOAD .* R E 0x10000
+  +LOAD .* RWE 0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0001c 0x00038 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -49,6 +50,7 @@ Program Headers:
+  +03 +\.tdata \.dynamic \.got \.plt 
+  +04 +\.dynamic 
+  +05 +\.tdata \.tbss 
++ +06 +
+ 
+ Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
+  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
+--- binutils-2.24.90/ld/testsuite/ld-powerpc/tlsso32.r
++++ binutils-2.24.90/ld/testsuite/ld-powerpc/tlsso32.r
+@@ -35,6 +35,7 @@ Program Headers:
+  +LOAD .* RWE 0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+1c 0x0+38 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -42,6 +43,7 @@ Program Headers:
+  +01 +\.tdata \.dynamic \.got \.plt 
+  +02 +\.dynamic 
+  +03 +\.tdata \.tbss 
++ +04 +
+ 
+ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
+  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
+@@ -52,9 +54,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
+ [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0
+ [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0
+ [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0
+-[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4
+-[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8
+-[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8
++[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
++[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
++[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
+ [0-9a-f ]+R_PPC_DTPMOD32 +0
+ [0-9a-f ]+R_PPC_DTPREL32 +0
+ [0-9a-f ]+R_PPC_DTPMOD32 +0
+--- binutils-2.24.90/ld/testsuite/ld-s390/tlsbin.rd
++++ binutils-2.24.90/ld/testsuite/ld-s390/tlsbin.rd
+@@ -43,6 +43,7 @@ Program Headers:
+  +LOAD .* RW +0x1000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+60 0x0+a0 R +0x20
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -52,6 +53,7 @@ Program Headers:
+  +03 +.tdata .dynamic .got *
+  +04 +.dynamic *
+  +05 +.tdata .tbss *
++ +06 +
+ 
+ Relocation section '.rela.dyn' at offset .* contains 4 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
+--- binutils-2.24.90/ld/testsuite/ld-s390/tlsbin_64.rd
++++ binutils-2.24.90/ld/testsuite/ld-s390/tlsbin_64.rd
+@@ -43,6 +43,7 @@ Program Headers:
+  +LOAD .* RW +0x1000
+  +DYNAMIC .* RW +0x8
+  +TLS .* 0x0+60 0x0+a0 R +0x20
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -52,6 +53,7 @@ Program Headers:
+  +03 +.tdata .dynamic .got *
+  +04 +.dynamic *
+  +05 +.tdata .tbss *
++ +06 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+--- binutils-2.24.90/ld/testsuite/ld-s390/tlspic.rd
++++ binutils-2.24.90/ld/testsuite/ld-s390/tlspic.rd
+@@ -39,6 +39,7 @@ Program Headers:
+  +LOAD .* RW +0x1000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+60 0x0+80 R +0x20
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -46,6 +47,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got 
+  +02 +.dynamic 
+  +03 +.tdata .tbss 
++ +04 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
+--- binutils-2.24.90/ld/testsuite/ld-s390/tlspic_64.rd
++++ binutils-2.24.90/ld/testsuite/ld-s390/tlspic_64.rd
+@@ -39,6 +39,7 @@ Program Headers:
+  +LOAD .* RW +0x1000
+  +DYNAMIC .* RW +0x8
+  +TLS .* 0x0+60 0x0+80 R +0x20
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -46,6 +47,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got *
+  +02 +.dynamic *
+  +03 +.tdata .tbss *
++ +04 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+--- binutils-2.24.90/ld/testsuite/ld-sh/tlsbin-2.d
++++ binutils-2.24.90/ld/testsuite/ld-sh/tlsbin-2.d
+@@ -44,6 +44,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+28 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -53,6 +54,7 @@ Program Headers:
+  +03 +\.tdata \.dynamic \.got *
+  +04 +\.dynamic *
+  +05 +\.tdata \.tbss *
++ +06 +
+ 
+ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
+--- binutils-2.24.90/ld/testsuite/ld-sh/tlspic-2.d
++++ binutils-2.24.90/ld/testsuite/ld-sh/tlspic-2.d
+@@ -32,7 +32,7 @@ Key to Flags:
+ 
+ Elf file type is DYN \(Shared object file\)
+ Entry point 0x[0-9a-f]+
+-There are 4 program headers, starting at offset [0-9]+
++There are [0-9] program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+@@ -40,6 +40,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS .* 0x0+18 0x0+20 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -47,6 +48,7 @@ Program Headers:
+  +01 +\.tdata \.dynamic \.got *
+  +02 +\.dynamic *
+  +03 +\.tdata \.tbss *
++ +04 +
+ 
+ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
+  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
+--- binutils-2.24.90/ld/testsuite/ld-sparc/gotop32.rd
++++ binutils-2.24.90/ld/testsuite/ld-sparc/gotop32.rd
+@@ -31,6 +31,7 @@ Program Headers:
+  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
+  +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000
+  +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+70 0x0+70 RW +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
+--- binutils-2.24.90/ld/testsuite/ld-sparc/gotop64.rd
++++ binutils-2.24.90/ld/testsuite/ld-sparc/gotop64.rd
+@@ -31,6 +31,7 @@ Program Headers:
+  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000
+  +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000
+  +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+e0 0x0+e0 RW +0x8
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
+--- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunbin32.rd
++++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunbin32.rd
+@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
+- +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4
+- +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1
++ +PHDR +0x0+34 0x0+10034 0x0+10034 (0x[0-9a-f]+) \1 R E 0x4
++ +INTERP +(0x[0-9a-f]+ ){3}0x0+11 0x0+11 R +0x1
+ .*Requesting program interpreter.*
+  +LOAD .* R E 0x10000
+  +LOAD .* RW +0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+1060 0x0+10a0 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+--- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunbin64.rd
++++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunbin64.rd
+@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+- +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8
+- +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1
++ +PHDR +0x0+40 0x0+100040 0x0+100040 (0x[0-9a-f]+) \1 R E 0x8
++ +INTERP +0x0+([0-9a-f]+) (0x0+10+\1) \2 0x0+19 0x0+19 R +0x1
+ .*Requesting program interpreter.*
+  +LOAD .* R E 0x100000
+  +LOAD .* RW +0x100000
+  +DYNAMIC .* RW +0x8
+  +TLS .* 0x0+60 0x0+a0 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+--- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunnopic32.rd
++++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunnopic32.rd
+@@ -32,6 +32,7 @@ Program Headers:
+  +LOAD .* RW +0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+ 0x0+24 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
+--- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunnopic64.rd
++++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunnopic64.rd
+@@ -32,6 +32,7 @@ Program Headers:
+  +LOAD .* RW +0x100000
+  +DYNAMIC .* RW +0x8
+  +TLS .* 0x0+ 0x0+24 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+--- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunpic32.rd
++++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunpic32.rd
+@@ -36,6 +36,7 @@ Program Headers:
+  +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000
+  +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4
+  +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+--- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunpic64.rd
++++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunpic64.rd
+@@ -36,6 +36,7 @@ Program Headers:
+  +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000
+  +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8
+  +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+60 0x0+80 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+--- binutils-2.24.90/ld/testsuite/ld-x86-64/tlsgdesc.rd
++++ binutils-2.24.90/ld/testsuite/ld-x86-64/tlsgdesc.rd
+@@ -36,12 +36,14 @@ Program Headers:
+  +LOAD.*
+  +LOAD.*
+  +DYNAMIC.*
++ +PAX_FLAGS.*
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+  +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
+  +01 +.dynamic .got .got.plt *
+  +02 +.dynamic *
++ +03 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
+  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+--- binutils-2.24.90/ld/testsuite/ld-x86-64/tlspic.rd
++++ binutils-2.24.90/ld/testsuite/ld-x86-64/tlspic.rd
+@@ -40,6 +40,7 @@ Program Headers:
+  +LOAD +0x0+131a 0x0+20131a 0x0+20131a 0x0+246 0x0+246 RW +0x200000
+  +DYNAMIC +0x0+1380 0x0+201380 0x0+201380 0x0+130 0x0+130 RW +0x8
+  +TLS +0x0+131a 0x0+20131a 0x0+20131a 0x0+60 0x0+80 R +0x1
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -47,6 +48,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got .got.plt *
+  +02 +.dynamic *
+  +03 +.tdata .tbss *
++ +04 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend

From 39ccf1971f46b282472dc34196f68c893a9a6658 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 23:29:29 -0700
Subject: [PATCH 0029/1143] libmpc: 1.0.1 -> 1.0.3

---
 pkgs/development/libraries/libmpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index d5fd91712638..1e8ea0ffa138 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, gmp, mpfr }:
 let
-  version = "1.0.1";
+  version = "1.0.3";
 in
 stdenv.mkDerivation rec {
   name = "libmpc-${version}"; # to avoid clash with the MPD client
 
   src = fetchurl {
     url = "http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz";
-    sha1 = "vxg0rkyn4cs40wr2cp6bbcyr1nnijzlc";
+    sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1";
   };
 
   buildInputs = [ gmp mpfr ];

From ae336a419e90c8c5e2d12a3ed6b5f92843408544 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 22:43:04 -0700
Subject: [PATCH 0030/1143] patch: 2.7.3 -> 2.7.5

---
 pkgs/tools/text/gnupatch/bashishms.patch | 67 ------------------------
 pkgs/tools/text/gnupatch/default.nix     |  8 ++-
 2 files changed, 3 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/tools/text/gnupatch/bashishms.patch

diff --git a/pkgs/tools/text/gnupatch/bashishms.patch b/pkgs/tools/text/gnupatch/bashishms.patch
deleted file mode 100644
index 1a2cfbd8e4a2..000000000000
--- a/pkgs/tools/text/gnupatch/bashishms.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-http://lists.gnu.org/archive/html/bug-patch/2012-11/msg00001.html
-Tested on Illumos, where ksh is /bin/sh.
-
---- patch-2.7.1/tests/test-lib.sh
-+++ patch-2.7.1/tests/test-lib.sh
-@@ -118,7 +118,7 @@
- }
- 
- if test -z "`echo -n`"; then
--    if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
-+    if (eval 'test -n "${BASH_LINENO[0]}"') 2>/dev/null; then
- 	eval '
- 	    _start_test() {
- 		echo -n "[${BASH_LINENO[2]}] $* -- "
-
---- patch-2.7.1/tests/crlf-handling
-+++ patch-2.7.1/tests/crlf-handling
-@@ -14,7 +14,7 @@
- use_tmpdir
- 
- lf2crlf() {
--    while read l; do echo -e "$l\r"; done
-+    while read l; do printf "%s\r\n" "$l"; done
- }
- 
- echo 1 > a
-
---- patch-2.7.1/tests/merge
-+++ patch-2.7.1/tests/merge
-@@ -32,18 +32,20 @@
-     shift
-     done > a.sed
-     echo "$body" | sed -f a.sed > b
--    shift
--    while test $# -gt 0 ; do
--	echo "$1"
-+    if test $# -gt 0 ; then
- 	shift
--    done > b.sed
-+    while test $# -gt 0 ; do
-+	echo "$1"
-+	shift
-+    done
-+    fi > b.sed
-     echo "$body" | sed -f b.sed > c
-     rm -f a.sed b.sed
-     output=`diff -u a b | patch $ARGS -f c`
-     status=$?
-     echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d'
-     cat c
--    test $status == 0 || echo "Status: $status"
-+    test $status = 0 || echo "Status: $status"
- }
- 
- x() {
-
---- patch-2.7.1/tests/read-only-files
-+++ patch-2.7.1/tests/read-only-files
-@@ -16,7 +16,7 @@
-
- : > read-only
- chmod a-w read-only
--if : 2> /dev/null > read-only; then
-+if (: > read-only) 2> /dev/null; then
-     echo "Files with read-only permissions are writable" \
-         "(probably running as superuser)" >&2
-     exit 77
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index 138126cf4aaa..adbd69154ecc 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ed }:
 
 stdenv.mkDerivation rec {
-  name = "patch-2.7.3";
+  name = "patch-2.7.5";
 
   src = fetchurl {
-    url = "mirror://gnu/patch/${name}.tar.bz2";
-    sha256 = "0za8wh4lgjk8k9s0rd7y5gjid99126myrh3nkifpi4ny6rkj9xh2";
+    url = "mirror://gnu/patch/${name}.tar.xz";
+    sha256 = "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx";
   };
 
   buildInputs = stdenv.lib.optional doCheck ed;
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
     configureFlags = [ "ac_cv_func_strnlen_working=yes" ];
   };
 
-  patches = [ ./bashishms.patch ];
-
   doCheck = true;
 
   meta = {

From 8af39c1cf725be2f42b8d104cf39f2cd74840cac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 23:12:00 -0700
Subject: [PATCH 0031/1143] isl: 0.11.1 -> 0.14

---
 pkgs/development/libraries/isl/default.nix        |  9 +++++----
 pkgs/development/libraries/isl/fix-gcc-build.diff | 12 ------------
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/isl/fix-gcc-build.diff

diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index 931ee831b734..5fa009277e15 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
+  name = "isl-0.14";
 
   src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
-    sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9";
+    url = "http://isl.gforge.inria.fr/${name}.tar.bz2";
+    sha256 = "0dlg4b85nw4w534525h0fvb7yhb8i4am8kskhmm0ym7qabzh4g3y";
   };
 
   buildInputs = [ gmp ];
-  patches = [ ./fix-gcc-build.diff ];
 
   enableParallelBuilding = true;
 
+  doCheck = true;
+
   meta = {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/development/libraries/isl/fix-gcc-build.diff b/pkgs/development/libraries/isl/fix-gcc-build.diff
deleted file mode 100644
index 6fbd1f9d478b..000000000000
--- a/pkgs/development/libraries/isl/fix-gcc-build.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru isl-0.11.1/include/isl/int.h isl-0.11.1.new/include/isl/int.h
---- isl-0.11.1/include/isl/int.h        2012-11-29 09:47:32.000000000 +0100
-+++ isl-0.11.1.new/include/isl/int.h    2013-10-27 15:35:31.348553812 +0100
-@@ -14,7 +14,7 @@
- #include <string.h>
- #include <gmp.h>
- #if defined(__cplusplus)
--#include <iostream>
-+#include <ostream>
- #endif
- 
- #if defined(__cplusplus)

From 5cd11989c55e32df83cf5c4bc257bb6825b4e889 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 25 Mar 2015 23:29:14 -0700
Subject: [PATCH 0032/1143] cloog: 0.18.0 -> 0.18.3

---
 pkgs/development/libraries/cloog/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 926da22b2802..629cdba1fd4c 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gmp, isl }:
 
 stdenv.mkDerivation rec {
-  name = "cloog-0.18.0";
+  name = "cloog-0.18.3";
 
   src = fetchurl {
     url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";
-    sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228";
+    sha256 = "0d4pqs4rs1qx0302wpv06ww1nwyg4yv5cw9qpfzxz36b19s6q326";
   };
 
   buildInputs = [ gmp ];
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-isl=system" ];
 
-  enableParallelBuilding = true;
+  # Breaks the test cases
+  #enableParallelBuilding = true;
 
   doCheck = true;
 

From afca882265278015a5d3bff67c0b168916399631 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 00:53:45 -0700
Subject: [PATCH 0033/1143] libcap: 2.22 -> 2.24

---
 pkgs/os-specific/linux/libcap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 92f15c1ade3d..1ffdaa36e965 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -4,11 +4,11 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name = "libcap-${version}";
-  version = "2.22";
+  version = "2.24";
   
   src = fetchurl {
-    url = "mirror://gentoo/distfiles/${name}.tar.bz2";
-    sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk";
+    url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz";
+    sha256 = "0rbc9qbqs5bp9am9s9g83wxj5k4ixps2agy9dxr1v1fwg27mdr6f";
   };
   
   nativeBuildInputs = [ perl ];

From c167a3be92bfb886fe9e0a8aa0c9c7562577fa83 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 00:54:58 -0700
Subject: [PATCH 0034/1143] file: 5.17 -> 5.22

---
 pkgs/tools/misc/file/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index f0a27c8bcbf4..2cf8d50bbe54 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "file-5.17";
+  name = "file-5.22";
 
   buildInputs = [ zlib ];
 
   src = fetchurl {
     url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
-    sha256 = "1jl31jli87s5xnjq14r1fh72qc95562qbr5f63d68yrq3ca9gsrz";
+    sha256 = "02zw14hw3gqlw91w2f2snbirvyrp7r83irvnnkjcb25q9kjaiqy4";
   };
 
   meta = {

From 63675e8c2775932851cdccf2917c1bc11d157145 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 00:57:34 -0700
Subject: [PATCH 0035/1143] procps: 3.2.8 -> 3.3.10

---
 pkgs/os-specific/linux/procps/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index 9c894256413c..1e9081499d0b 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -1,22 +1,15 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
-  name = "procps-3.2.8";
+  name = "procps-ng-3.3.10";
   
   src = fetchurl {
-    url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
+    url = "mirror://sourceforge/procps-ng/Production/${name}.tar.xz";
     sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
   };
-  
-  patches =
-    [ ./makefile.patch
-      ./procps-build.patch
-      ./gnumake3.82.patch
-      ./linux-ver-init.patch
-    ];
-    
+
   buildInputs = [ ncurses ];
-  
+
   makeFlags = "DESTDIR=$(out)";
 
   crossAttrs = {
@@ -26,5 +19,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://procps.sourceforge.net/;
     description = "Utilities that give information about processes using the /proc filesystem";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }

From 5e33c85248b6920f8b6ac675b381a7e0498e4f3a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 00:57:59 -0700
Subject: [PATCH 0036/1143] util-linux: 2.26 -> 2.26.1

---
 pkgs/os-specific/linux/util-linux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 62fb4976ad05..21eaea067880 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
 
 stdenv.mkDerivation rec {
-  name = "util-linux-2.26";
+  name = "util-linux-2.26.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v2.26/${name}.tar.xz";
-    sha256 = "a23c6f39dea0ed215ccd589509ffc7bb6f706f6e1a04760f493fb0fd7e93c489";
+    sha256 = "0vmvk5khfwf71xbsnplvmk9ikwnlbhysc96mnkgwpqk2faairp12";
   };
 
   patches = [ ./rtcwake-search-PATH-for-shutdown.patch

From 5c3cdaf3510f9231555d4c37fc06933aaa385cba Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 00:59:08 -0700
Subject: [PATCH 0037/1143] libtool: 2.4.5 -> 2.4.6

---
 pkgs/development/tools/misc/libtool/libtool2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index 443915d71e90..5d27b469680b 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "libtool-2.4.5";
+  name = "libtool-2.4.6";
 
   src = fetchurl {
     url = "mirror://gnu/libtool/${name}.tar.gz";
-    sha256 = "11v9gl8ancavx7179n6zk4k8hwa0zl4wz4w9z3mffk71gnfb972h";
+    sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3";
   };
 
   propagatedNativeBuildInputs = [ m4 ];

From 9c78bbd4059e24a98e077b85bb5c4786a8faf1ea Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 01:03:51 -0700
Subject: [PATCH 0038/1143] kmod: 18 -> 20

---
 pkgs/os-specific/linux/kmod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 9ee13135d631..1d190be71b8b 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "kmod-18";
+  name = "kmod-20";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e";
+    sha256 = "186sz8b82n02yykza6a1q8fk80fl5gx0nr42wpmzjc9w36ia3hc9";
   };
 
   # Disable xz/zlib support to prevent needing them in the initrd.

From 2d695397d87d5b90a35a97183e673f1bab235048 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 01:06:39 -0700
Subject: [PATCH 0039/1143] libpipeline: 1.2.6 -> 1.4.0

---
 pkgs/development/libraries/libpipeline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
index e56a45c92fce..2213ea2e8b94 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
  
 stdenv.mkDerivation rec {
-  name = "libpipeline-1.2.6";
+  name = "libpipeline-1.4.0";
   
   src = fetchurl {
     url = "mirror://savannah/libpipeline/${name}.tar.gz";
-    sha256 = "0wjsigim422ilzs46hxzv98l10zprpbk53gq3jzj6s9kn9n1wljc";
+    sha256 = "1dlvp2mxlhg5zbj509kc60h7g39hpgwkzkpdf855cyzizgkmkivr";
   };
 
   meta = with stdenv.lib; {

From 762861670c91c0688c1ebdc65cfb4d3d04053f37 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 12:01:42 -0700
Subject: [PATCH 0040/1143] gettext: Make 0.19 the default

---
 pkgs/development/libraries/gettext/{0.19.nix => 0.18.nix} | 5 +++--
 pkgs/development/libraries/gettext/default.nix            | 4 ++--
 pkgs/top-level/all-packages.nix                           | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/development/libraries/gettext/{0.19.nix => 0.18.nix} (59%)

diff --git a/pkgs/development/libraries/gettext/0.19.nix b/pkgs/development/libraries/gettext/0.18.nix
similarity index 59%
rename from pkgs/development/libraries/gettext/0.19.nix
rename to pkgs/development/libraries/gettext/0.18.nix
index 27a8bd252c8a..bb1a0519e7bb 100644
--- a/pkgs/development/libraries/gettext/0.19.nix
+++ b/pkgs/development/libraries/gettext/0.18.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.lib.overrideDerivation gettext (attrs: rec {
-  name = "gettext-0.19.4";
+  name = "gettext-0.18.2";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "0gvz86m4cs8bdf3mwmwsyx6lrq4ydfxgadrgd9jlx32z3bnz3jca";
+    sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
   };
+
 })
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 81918b7c5e34..8f6277ca2e94 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, xz }:
 
 stdenv.mkDerivation (rec {
-  name = "gettext-0.18.2";
+  name = "gettext-0.19.4";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
+    sha256 = "0gvz86m4cs8bdf3mwmwsyx6lrq4ydfxgadrgd9jlx32z3bnz3jca";
   };
 
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fee3f0ff993f..2dee67a59fff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5702,11 +5702,11 @@ let
 
   getdata = callPackage ../development/libraries/getdata { };
 
-  gettext = gettext_0_18;
+  gettext = gettext_0_19;
 
   gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
-  gettext_0_18 = callPackage ../development/libraries/gettext { };
-  gettext_0_19 = callPackage ../development/libraries/gettext/0.19.nix { };
+  gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { };
+  gettext_0_19 = callPackage ../development/libraries/gettext { };
 
   gd = callPackage ../development/libraries/gd { };
 

From 2c8cf45772862e7e2d77086bbaaa6ac0183ea0bf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 12:25:34 -0700
Subject: [PATCH 0041/1143] man-db: 2.6.6 -> 2.7.1

---
 pkgs/tools/misc/man-db/default.nix | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index f664bcc6917d..403068b1bf7d 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,17 +1,30 @@
 { stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
  
 stdenv.mkDerivation rec {
-  name = "man-db-2.6.6";
+  name = "man-db-2.7.1";
   
   src = fetchurl {
     url = "mirror://savannah/man-db/${name}.tar.xz";
-    sha256 = "1hv6byj6sg6cp3jyf08gbmdm4pwhvd5hzmb94xl0w7prin6hzabx";
+    sha256 = "03ly0hbpgjnag576rgccanaisn7f6422q5qxrj64vyzslc2651y4";
   };
   
   buildInputs = [ pkgconfig libpipeline db groff ];
   
-  configureFlags = ''
-    --disable-setuid
+  configureFlags = [
+    "--disable-setuid"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d"
+  ];
+
+  installFlags = [ "DESTDIR=\${out}" ];
+
+  postInstall = ''
+    mv $out/$out/* $out
+    DIR=$out/$out
+    while rmdir $DIR 2>/dev/null; do
+      DIR="$(dirname "$DIR")"
+    done
   '';
 
   meta = with stdenv.lib; {

From 5a2a71f2c2bbefe01f33c8f0542f57b770a065b2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 14:38:42 -0700
Subject: [PATCH 0042/1143] bluedevil: 1.3.1 -> 2.1.1

---
 pkgs/tools/bluetooth/bluedevil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix
index e5a4f83ab0f8..229b0512679b 100644
--- a/pkgs/tools/bluetooth/bluedevil/default.nix
+++ b/pkgs/tools/bluetooth/bluedevil/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bluedevil";
-  version = "1.3.1";
+  version = "2.1.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0di3hwgqzhx51x172wnbccf9f84cg69mab83qkcif0v3gv3pzy4f";
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi";
   };
 
   buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ];

From 001f3933aeb85f2f3ff9121e97e23b294a336da5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 14:46:35 -0700
Subject: [PATCH 0043/1143] cmake: Fix evaluation

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5f2e64ec6e3..ead3440d0031 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13023,11 +13023,11 @@ let
           kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
         };
 
-      callPackageOrig = newScope (extra // { cmake = cmake-3_2; });
+      callPackageOrig = newScope extra;
 
       makePackages = extra:
         let
-          callPackage = newScope (extra // { cmake = cmake-3_2; } // self);
+          callPackage = newScope (extra // self);
           kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; };
           self =
             kde4

From 041e3b46adde5404a568b6476f2648aa58cda12c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 14:38:42 -0700
Subject: [PATCH 0044/1143] bluedevil: 1.3.1 -> 2.1.1

---
 pkgs/tools/bluetooth/bluedevil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix
index e5a4f83ab0f8..229b0512679b 100644
--- a/pkgs/tools/bluetooth/bluedevil/default.nix
+++ b/pkgs/tools/bluetooth/bluedevil/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bluedevil";
-  version = "1.3.1";
+  version = "2.1.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0di3hwgqzhx51x172wnbccf9f84cg69mab83qkcif0v3gv3pzy4f";
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi";
   };
 
   buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ];

From 98ba8d93830f36f38774537e2e9138817bfa9cc0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 15:13:06 -0700
Subject: [PATCH 0045/1143] libtasn1: 3.6 -> 4.3

---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 5a2508a45067..543b7fafd51d 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-3.6";
+  name = "libtasn1-4.3";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "0c547qa1vfk1x2jzgjhf65izf4sfi86c6g46q7779g4aldk4gqqr";
+    sha256 = "1k2n2x5jyp1jkrjbfklf880hbd02ws1jdvwp1y8x8fxhzzii6dbk";
   };
 
   buildInputs = [ perl texinfo ];

From 008e3893d89b10f4d0e2faf091e3fd9d134ea4be Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 15:13:50 -0700
Subject: [PATCH 0046/1143] gawk: 4.1.0 -> 4.1.1

---
 pkgs/tools/text/gawk/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 7a14df63ff71..936f27421a56 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,24 +1,15 @@
 { stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }:
 
 stdenv.mkDerivation rec {
-  name = "gawk-4.1.0";
+  name = "gawk-4.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q";
+    sha256 = "1nz83vpss8xv7m475sv4qhhj40g74nvcw0y9kwq9ds8wzfmcdm7g";
   };
 
-  # Fix cross compile (stolen from Gentoo).
-  # Not needed for 4.1.1.
-  crossAttrs = {
-    preConfigure = ''
-      sed -i \
-        -e '/check-recursive all-recursive: check-for-shared-lib-support/d' \
-        extension/Makefile.in
-    '';
-  };
-
-  doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
+  # Currently broken due to locale tests failing
+  #doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
 
   buildInputs = [ libsigsegv ]
     ++ stdenv.lib.optional readlineSupport readline;

From 8286f6cef36cbd3797578723c1493480828c77a3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 15:39:20 -0700
Subject: [PATCH 0047/1143] tcl: 8.5.15 -> 8.6.4

---
 pkgs/development/interpreters/tcl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index c9a0fd7546fa..913c73f01f36 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "tcl-8.5.15";
+  name = "tcl-8.6.4";
 
   src = fetchurl {
-    url = mirror://sourceforge/tcl/tcl8.5.15-src.tar.gz;
-    sha256 = "0kl8lbfwy4v4q4461wjmva95h0pgiprykislpw4nnpkrc7jalkpj";
+    url = mirror://sourceforge/tcl/tcl8.6.4-src.tar.gz;
+    sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
   };
 
   preConfigure = "cd unix";
 
   postInstall = ''
     make install-private-headers
-    ln -s $out/bin/tclsh8.5 $out/bin/tclsh
+    ln -s $out/bin/tclsh8.6 $out/bin/tclsh
   '';
   
   meta = {

From afa998eb32b4959d5deb253bb9f96c6fd3c7af20 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 15:44:54 -0700
Subject: [PATCH 0048/1143] stdenv: Substitute correctly chmods  instead of
 .tmp which never exists

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 452a80eadc75..75be719c2b95 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -370,7 +370,7 @@ substitute() {
         content="${content//"$pattern"/$replacement}"
     done
 
-    if [ -e "$output" ]; then chmod +w "$output".tmp; fi
+    if [ -e "$output" ]; then chmod +w "$output"; fi
     printf "%s" "$content" > "$output"
 }
 

From a0aec63eb8350d369b76d67ae2f23863eef06dd7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 16:11:57 -0700
Subject: [PATCH 0049/1143] dejagnu: 1.5.1 -> 1.5.2

---
 pkgs/development/tools/misc/dejagnu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 189df4b298ab..685fde4226d6 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dejagnu-1.5.1";
+  name = "dejagnu-1.5.2";
 
   src = fetchurl {
     url = "mirror://gnu/dejagnu/${name}.tar.gz";
-    sha256 = "1lik8h4qi7x0mhsi8xmj91an1yb63rjbk6v4xrmzgiy5lk8lgrv0";
+    sha256 = "18ikblg4x4y5fkw8sg0c2zmqgxdqqycswmws17sxx8m4sz6g7dch";
   };
 
   patches = [ ./wrapped-runtest-program-name.patch ];

From 47fe162bb9e94655b2eaf3ed1fc6205fb234e37e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 16:12:24 -0700
Subject: [PATCH 0050/1143] libffi: 3.0.13 -> 3.2.1

---
 pkgs/development/libraries/libffi/default.nix | 12 +++---
 .../libffi-3.0.13-emutramp_pax_proc.patch     | 37 -------------------
 2 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/libraries/libffi/libffi-3.0.13-emutramp_pax_proc.patch

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index a1f6716009ee..bc15e88ba2f8 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,23 +1,21 @@
 { fetchurl, stdenv, dejagnu }:
 
 stdenv.mkDerivation rec {
-  name = "libffi-3.0.13";
+  name = "libffi-3.2.1";
 
   src = fetchurl {
     url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
-    sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x";
+    sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
   };
 
-  patches = stdenv.lib.optional (stdenv.needsPax) ./libffi-3.0.13-emutramp_pax_proc.patch;
-
   buildInputs = stdenv.lib.optional doCheck dejagnu;
 
   configureFlags = [
     "--with-gcc-arch=generic" # no detection of -march= or -mtune=
-  ] ++ stdenv.lib.optional (stdenv.needsPax) "--enable-pax_emutramp";
+    "--enable-pax_emutramp"
+  ];
 
-  #doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD
-  doCheck = false;
+  doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD
 
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 
diff --git a/pkgs/development/libraries/libffi/libffi-3.0.13-emutramp_pax_proc.patch b/pkgs/development/libraries/libffi/libffi-3.0.13-emutramp_pax_proc.patch
deleted file mode 100644
index c27bd9bf8893..000000000000
--- a/pkgs/development/libraries/libffi/libffi-3.0.13-emutramp_pax_proc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-2013-05-22  Magnus Granberg  <zorry@gentoo.org>
-
-	#457194
-	* src/closuer.c (emutramp_enabled_check): Check with /proc.
-
---- a/src/closures.c	2013-03-17 23:27:11.000000000 +0100
-+++ b/src/closures.c	2013-04-29 23:26:02.279022022 +0200
-@@ -181,10 +181,26 @@ static int emutramp_enabled = -1;
- static int
- emutramp_enabled_check (void)
- {
--  if (getenv ("FFI_DISABLE_EMUTRAMP") == NULL)
--    return 1;
--  else
-+  char *buf = NULL;
-+  size_t len = 0;
-+  FILE *f;
-+  int ret;
-+  f = fopen ("/proc/self/status", "r");
-+  if (f == NULL)
-     return 0;
-+  ret = 0;
-+
-+  while (getline (&buf, &len, f) != -1)
-+    if (!strncmp (buf, "PaX:", 4))
-+      {
-+        char emutramp;
-+        if (sscanf (buf, "%*s %*c%c", &emutramp) == 1)
-+          ret = (emutramp == 'E');
-+        break;
-+      }
-+  free (buf);
-+  fclose (f);
-+  return ret;
- }
- 
- #define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \

From 23c73808ac87bb5701d77ba0aa3717decdeb33ac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 27 Mar 2015 10:52:14 -0700
Subject: [PATCH 0051/1143] Revert "procps: 3.2.8 -> 3.3.10"

This reverts commit 63675e8c2775932851cdccf2917c1bc11d157145.

This should be the old version.
---
 pkgs/os-specific/linux/procps/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index 1e9081499d0b..9c894256413c 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -1,15 +1,22 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
-  name = "procps-ng-3.3.10";
+  name = "procps-3.2.8";
   
   src = fetchurl {
-    url = "mirror://sourceforge/procps-ng/Production/${name}.tar.xz";
+    url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
     sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
   };
-
+  
+  patches =
+    [ ./makefile.patch
+      ./procps-build.patch
+      ./gnumake3.82.patch
+      ./linux-ver-init.patch
+    ];
+    
   buildInputs = [ ncurses ];
-
+  
   makeFlags = "DESTDIR=$(out)";
 
   crossAttrs = {
@@ -19,7 +26,5 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://procps.sourceforge.net/;
     description = "Utilities that give information about processes using the /proc filesystem";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ wkennington ];
   };
 }

From dceff137e107fdbcf13b0d645be48e3cc4256d7f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 27 Mar 2015 11:15:49 -0700
Subject: [PATCH 0052/1143] procps-ng: Refactor a bit

---
 pkgs/os-specific/linux/procps-ng/default.nix | 24 ++++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index bfcb99b7e78a..4018e65f3f72 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, pkgconfig, ncurses, systemd }:
 
-stdenv.mkDerivation {
-  name = "procps-3.3.10";
+stdenv.mkDerivation rec {
+  name = "procps-ng-3.3.10";
 
   src = fetchurl {
-    url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz;
+    url = "mirror://sourceforge/procps-ng/${name}.tar.xz";
     sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ pkgconfig ncurses systemd ];
 
   makeFlags = "usrbin_execdir=$(out)/bin";
 
@@ -19,11 +19,21 @@ stdenv.mkDerivation {
   };
 
   # Too red
-  configureFlags = [ "--disable-modern-top" ];
+  configureFlags = [
+    "--disable-modern-top"
+    "--enable-watch8bit"
+    "--with-systemd"
+    "--enable-skill"
+    "--enable-oomem"
+    "--enable-sigwinch"
+  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://sourceforge.net/projects/procps-ng/;
     description = "Utilities that give information about processes using the /proc filesystem";
     priority = 10; # less than coreutils, which also provides "kill" and "uptime"
+    maintainers = with maintainers; [ wkennington ];
+    license = licenses.gpl;
+    platforms = platforms.linux;
   };
 }

From 22018c40d186a0969c9bdcb08f091c7f2d88d639 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 27 Mar 2015 11:30:39 -0700
Subject: [PATCH 0053/1143] cmake: Remove obsolete openssl patch

---
 pkgs/development/tools/build-managers/cmake/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 63e08c8133cd..57ccb086d32d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -33,11 +33,7 @@ stdenv.mkDerivation rec {
       url = "http://public.kitware.com/Bug/file_download.php?"
           + "file_id=4981&type=bug";
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    }) ++
-    # fix cmake detection of openssl libs
-    # see: http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
-    #      and http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1
-    [./cmake_find_openssl_for_openssl-1.0.1m_and_up.patch];
+    });
 
   buildInputs =
     [ bzip2 curl expat libarchive xz zlib ]

From 9fc53d95bca760918b85250129596434ab35255c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 27 Mar 2015 11:32:30 -0700
Subject: [PATCH 0054/1143] procps-ng: Fix license

---
 pkgs/os-specific/linux/procps-ng/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 4018e65f3f72..9ecc0c5bcb57 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Utilities that give information about processes using the /proc filesystem";
     priority = 10; # less than coreutils, which also provides "kill" and "uptime"
     maintainers = with maintainers; [ wkennington ];
-    license = licenses.gpl;
+    license = licenses.gpl2;
     platforms = platforms.linux;
   };
 }

From 5cc82f817540cbc048e27e79ce57f396b11f6766 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 28 Mar 2015 13:50:20 -0700
Subject: [PATCH 0055/1143] llvm: Enable RTTI for mesa

---
 pkgs/development/compilers/llvm/3.6/llvm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix
index a679ab3babd5..736ffca295f2 100644
--- a/pkgs/development/compilers/llvm/3.6/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.6/llvm.nix
@@ -41,6 +41,7 @@ in stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_ENABLE_RTTI=ON"
   ] ++ stdenv.lib.optionals (!isDarwin) [
     "-DBUILD_SHARED_LIBS=ON"
     "-DLLVM_BINUTILS_INCDIR=${binutils}/include"

From 51444621cd296e59c7464c4062c8165aa436e2d7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 28 Mar 2015 13:51:38 -0700
Subject: [PATCH 0056/1143] libdrm: Enable freedreno

---
 pkgs/development/libraries/libdrm/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 5323cc693fce..5ffdd9303e0c 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   preConfigure = stdenv.lib.optionalString stdenv.isDarwin
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
-  configureFlags = stdenv.lib.optional stdenv.isLinux "--enable-udev"
+  configureFlags = [ "--enable-freedreno" ]
+    ++ stdenv.lib.optional stdenv.isLinux "--enable-udev"
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 
   crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];

From 5fb86ada5ac50e4504663dfa351cc0c58c98ce3a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 28 Mar 2015 13:52:03 -0700
Subject: [PATCH 0057/1143] libva: Make mesa optional

---
 pkgs/development/libraries/libva/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index dc648e1ea2e2..440014969887 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, wayland, libffi }:
+{ stdenv, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
+, mesa ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "libva-1.5.1";
@@ -8,9 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495";
   };
 
-  buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes wayland libffi ];
+  buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ];
 
-  configureFlags = [ "--enable-glx" ];
+  configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx";
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;

From a9806e86d6bf4f7b9d4bab662efe183de45f2d79 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 28 Mar 2015 13:53:20 -0700
Subject: [PATCH 0058/1143] libomxil-bellagio: Add derivation

---
 .../libraries/libomxil-bellagio/default.nix   |  21 ++
 .../libomxil-bellagio/fedora-fixes.patch      | 199 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 222 insertions(+)
 create mode 100644 pkgs/development/libraries/libomxil-bellagio/default.nix
 create mode 100644 pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch

diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
new file mode 100644
index 000000000000..4a80ac3a8755
--- /dev/null
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libomxil-bellagio-${version}";
+  version = "0.9.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz";
+    sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r";
+  };
+  
+  patches = [ ./fedora-fixes.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = http://sourceforge.net/projects/omxil/;
+    description = "an opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch b/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch
new file mode 100644
index 000000000000..2ae3c3c871c5
--- /dev/null
+++ b/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch
@@ -0,0 +1,199 @@
+When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved.
+Link explicitly against omxil-bellagio so that ld.so can find the reference.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old	2012-03-23 15:07:47.379021034 +0000
++++ bellagio-0.9.3/src/dynamic_loader/Makefile.am	2012-03-23 15:08:47.563034818 +0000
+@@ -3,7 +3,7 @@
+ omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la
+ libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h
+ 
+-libomxdynamicloader_la_LDFLAGS =
++libomxdynamicloader_la_LDFLAGS = -L$(abs_top_srcdir)/src/.libs -lomxil-bellagio
+ libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
+ 			-I$(top_srcdir)/src \
+ 			-I$(top_srcdir)/src/base \
+Fix dependency issue to allow parallel build
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+Index: bellagio-0.9.3/src/Makefile.am
+===================================================================
+--- bellagio-0.9.3.orig/src/Makefile.am
++++ bellagio-0.9.3/src/Makefile.am
+@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist
+ omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
+ 			      -I$(top_srcdir)/include
+ omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
++omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la
+ 
+ lib_LTLIBRARIES = libomxil-bellagio.la
+ libomxil_bellagio_la_SOURCES = component_loader.h \
+We always access globalComponentList[] at indexComponent=-1 which causes a
+segfault. Use i as the index instead.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- bellagio-0.9.3/src/omx_reference_resource_manager.c.old	2012-03-13 10:15:25.743940980 +0000
++++ bellagio-0.9.3/src/omx_reference_resource_manager.c	2012-03-13 10:18:02.201971009 +0000
+@@ -485,7 +485,6 @@
+ OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) {
+ 	omx_base_component_PrivateType* omx_base_component_Private;
+ 	int i = 0;
+-	int indexComponent = -1;
+ 
+ 	DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__);
+ 	omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate;
+@@ -493,16 +492,13 @@
+ 	while(listOfcomponentRegistered[i].component_name != NULL ) {
+ 		if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) {
+ 			// found component in the list of the resource manager
+-			removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp);
+-			break;
++			removeElemFromList(&globalComponentList[i], openmaxStandComp);
++			DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
++			return OMX_ErrorNone;
+ 		}
+ 		i++;
+ 	}
+-	if (indexComponent <0) {
+-		// No resource to be handled
+-		DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
+-		return OMX_ErrorNone;
+-	}
+-	DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
++	// No resource to be handled
++	DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
+ 	return OMX_ErrorNone;
+ }
+ OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch
+ src/base/omx_base_component.c |   54 ++++++++++++++++++++++-------------------
+ 1 files changed, 29 insertions(+), 25 deletions(-)
+--- a/src/base/omx_base_component.c	
++++ a/src/base/omx_base_component.c	
+@@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter(
+     return OMX_ErrorBadParameter;
+   }
+   switch(nParamIndex) {
+-  case OMX_IndexParameterThreadsID:
+-	    if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) {
+-	      break;
+-	    }
+-	  threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure;
+-	  threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID;
+-	  threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID;
+-	  break;
+   case OMX_IndexParamAudioInit:
+   case OMX_IndexParamVideoInit:
+   case OMX_IndexParamImageInit:
+@@ -988,28 +980,40 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter(
+       }
+     }
+     break;
+-  case OMX_IndexVendorCompPropTunnelFlags:
+-    pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure;
++  default:
++    /* additional switch statement for extended OMX_INDEXTYPE */
++    switch((OMX_INDEXVENDORTYPE) nParamIndex) {
++    case OMX_IndexParameterThreadsID:
++        if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) {
++          break;
++        }
++      threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure;
++      threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID;
++      threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID;
++      break;
++    case OMX_IndexVendorCompPropTunnelFlags:
++      pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure;
+ 
+-    if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts +
+-                                         omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts +
+-                                         omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts +
+-                                         omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) {
++      if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts +
++                                           omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts +
++                                           omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts +
++                                           omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) {
+ 
+-      DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n",
+-          __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__);
++        DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n",
++            __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__);
+ 
+-      return OMX_ErrorBadPortIndex;
+-    }
++        return OMX_ErrorBadPortIndex;
++      }
+ 
+-    pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex];
++      pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex];
+ 
+-    pPropTunnelSetup->nTunnelSetup.nTunnelFlags  = pPort->nTunnelFlags;
+-    pPropTunnelSetup->nTunnelSetup.eSupplier     = pPort->eBufferSupplier;
+-    break;
+-  default:
+-    err = OMX_ErrorUnsupportedIndex;
+-    break;
++      pPropTunnelSetup->nTunnelSetup.nTunnelFlags  = pPort->nTunnelFlags;
++      pPropTunnelSetup->nTunnelSetup.eSupplier     = pPort->eBufferSupplier;
++      break;
++    default:
++      err = OMX_ErrorUnsupportedIndex;
++      break;
++    }
+   }
+   DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent);
+   return err;
+diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am
+--- libomxil-bellagio-0.9.3/Makefile.am.nodoc	2011-01-12 08:53:26.000000000 +0100
++++ libomxil-bellagio-0.9.3/Makefile.am	2012-04-23 13:46:15.410823381 +0200
+@@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libomxil-bellagio.pc
+ 
+-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@
+ doc_DATA = README \
+ 	   ChangeLog \
+ 	   TODO
+diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9.3/src/omxregister.c
+--- libomxil-bellagio-0.9.3/src/omxregister.c.unused	2011-01-12 08:53:26.000000000 +0100
++++ libomxil-bellagio-0.9.3/src/omxregister.c	2012-12-10 22:02:28.621695659 +0100
+@@ -248,7 +248,15 @@ static int buildComponentsList(FILE* omx
+ 						}
+ 						fptr(stComponents);
+ 						err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp);
+-						err = fwrite("\n", 1, 1, omxregistryfp);
++						if (err != strlen(lib_absolute_path)) {
++							DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(lib_absolute_path), fileno(omxregistryfp));
++							continue;
++						}
++						err = fwrite("\n", 1, strlen(buffer), omxregistryfp);
++						if (err != strlen(buffer)) {
++							DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(buffer), fileno(omxregistryfp));
++							continue;
++						}
+ 
+ 
+ 						for (i = 0; i<num_of_comp; i++) {
+--- libomxil-bellagio-0.9.3/include/OMX_Types.h.orig 2011-01-12 08:53:26.000000000 +0100
++++ libomxil-bellagio-0.9.3/include/OMX_Types.h 2013-02-25 09:53:55.000000000 +0100
+@@ -314,6 +314,18 @@
+  *  platform & operating specific object used to reference the window */
+ typedef void* OMX_NATIVE_WINDOWTYPE;
+
++
++/** Define the OMX IL version that corresponds to this set of header files.
++ *  We also define a combined version that can be used to write or compare
++ *  values of the 32bit nVersion field, assuming a little endian architecture */
++#define OMX_VERSION_MAJOR 1
++#define OMX_VERSION_MINOR 1
++#define OMX_VERSION_REVISION 2
++#define OMX_VERSION_STEP 0
++
++#define OMX_VERSION ((OMX_VERSION_STEP<<24) | (OMX_VERSION_REVISION<<16) | (OMX_VERSION_MINOR<<8) | OMX_VERSION_MAJOR)
++
++
+ /** The OMX_VERSIONTYPE union is used to specify the version for
+     a structure or component.  For a component, the version is entirely
+     specified by the component vendor.  Components doing the same function
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebd4836ce764..b02fc31073f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6608,6 +6608,8 @@ let
 
   liboil = callPackage ../development/libraries/liboil { };
 
+  libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { };
+
   liboop = callPackage ../development/libraries/liboop { };
 
   libopus = callPackage ../development/libraries/libopus { };

From 53336e7a9134c8fc86f8c37952c0965ea2d6eab7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 28 Mar 2015 13:54:27 -0700
Subject: [PATCH 0059/1143] libclc: Add derivation

---
 pkgs/development/libraries/libclc/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/libclc/default.nix

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
new file mode 100644
index 000000000000..c41e2e0a70b5
--- /dev/null
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchsvn, python, llvm, clang }:
+
+stdenv.mkDerivation {
+  name = "libclc-2015-03-27";
+
+  src = fetchsvn {
+    url = "http://llvm.org/svn/llvm-project/libclc/trunk";
+    rev = "233456";
+    sha256 = "0g56kgffc1qr9rzhcjr4w8kljcicg0q828s9b4bmfzjvywd7hhr0";
+  };
+
+  buildInputs = [ python llvm clang ];
+
+  postPatch = ''
+    sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py
+    sed -i 's,cxx_compiler =.*,cxx_compiler = "${clang}/bin/clang++",' configure.py
+  '';
+
+  configurePhase = ''
+    python2 ./configure.py --prefix=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://libclc.llvm.org/;
+    description = "implementation of the library requirements of the OpenCL C programming language";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b02fc31073f6..31ac24aa3ae4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6209,6 +6209,8 @@ let
 
   libchop = callPackage ../development/libraries/libchop { };
 
+  libclc = callPackage ../development/libraries/libclc { };
+
   libcli = callPackage ../development/libraries/libcli { };
 
   libcm = callPackage ../development/libraries/libcm { };

From 50cd6236321bd8dac53247141a63d8c65cb73d48 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 28 Mar 2015 13:56:12 -0700
Subject: [PATCH 0060/1143] mako: 0.9.1 -> 1.0.1

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 52cece1494c9..644c410b5e6e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5957,14 +5957,14 @@ let
 
 
   Mako = buildPythonPackage rec {
-    name = "Mako-0.9.1";
+    name = "Mako-1.0.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz";
-      md5 = "fe3f394ef714776d09ec6133923736a7";
+      md5 = "9f0aafd177b039ef67b90ea350497a54";
     };
 
-    buildInputs = with self; [ markupsafe nose ];
+    buildInputs = with self; [ markupsafe nose mock ];
     propagatedBuildInputs = with self; [ markupsafe ];
 
     meta = {

From 7a77553d97d5ed477daf8b2729743f392f3fe167 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 28 Mar 2015 13:57:03 -0700
Subject: [PATCH 0061/1143] mesa: 10.4.5 -> 10.5.1

---
 pkgs/development/libraries/mesa/default.nix | 89 ++++++++++++++-------
 pkgs/top-level/all-packages.nix             |  3 +-
 2 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 875dabc37342..b6ad9b42122c 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll
-, python, libxml2Python, file, expat, makedepend
-, libdrm, xorg, wayland, udev, llvm, libffi
-, libvdpau, libelf
+, python, libxml2Python, file, expat, makedepend, pythonPackages
+, libdrm, xorg, wayland, udev, llvmPackages, libffi, libomxil-bellagio
+, libvdpau, libelf, libva, libclc
 , grsecEnabled
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableExtraFeatures ? false # not maintained
@@ -23,9 +23,10 @@ else
 */
 
 let
-  version = "10.4.5";
+  version = "10.5.1";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
+  clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
 in
 with { inherit (stdenv.lib) optional optionals optionalString; };
 
@@ -34,10 +35,10 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     urls = [
-      "https://launchpad.net/mesa/trunk/${version}/+download/MesaLib-${version}.tar.bz2"
-      "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"
+      "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
+      "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "bf60000700a9d58e3aca2bfeee7e781053b0d839e61a95b1883e05a2dee247a0";
+    sha256 = "ffc51943d15c6812ee7611d053d8980a683fbd6a4986cff567b12cc66637d679";
   };
 
   prePatch = "patchShebangs .";
@@ -60,52 +61,78 @@ stdenv.mkDerivation {
   outputs = ["out" "drivers" "osmesa"];
 
   configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-clang-libdir=${clang}/lib"
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${driverLink}/lib/dri"
 
+    "--enable-gles1"
+    "--enable-gles2"
     "--enable-dri"
-    "--enable-glx-tls"
-    "--enable-shared-glapi"
-    "--enable-driglx-direct" # seems enabled anyway
-    "--enable-gallium-llvm" "--enable-llvm-shared-libs"
+  ] ++ optional stdenv.isLinux "--enable-dri3"
+    ++ [
+    "--enable-glx"
+    "--enable-gallium-osmesa" # used by wine
+    "--enable-egl"
     "--enable-xa" # used in vmware driver
-    "--enable-gles1" "--enable-gles2"
+    "--enable-gbm"
+  ] ++ optional stdenv.isLinux "--enable-nine" # Direct3D in Wine
+    ++ [
+    "--enable-xvmc"
     "--enable-vdpau"
-    "--enable-osmesa" # used by wine
+    "--enable-omx"
+    "--enable-va"
+    "--enable-opencl"
+    "--enable-opencl-icd"
 
-    "--with-dri-drivers=i965,r200,radeon"
-    "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi"
-    "--with-egl-platforms=x11,wayland,drm" "--enable-gbm"
-  ]
-    ++ optional enableTextureFloats "--enable-texture-float"
-    ++ optionals enableExtraFeatures [
-      "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful
-      #"--enable-xvmc" # tests segfault with 9.1.{1,2,3}
-      #"--enable-opencl" # ToDo: opencl seems to need libclc for clover
-    ]
+    "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
+    "--enable-shared-glapi"
+    "--enable-sysfs"
+    "--enable-driglx-direct" # seems enabled anyway
+    "--enable-glx-tls"
+    "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
+    "--with-egl-platforms=x11,wayland,drm"
+
+    "--enable-gallium-llvm"
+    "--enable-llvm-shared-libs"
+  ] ++ optional enableTextureFloats "--enable-texture-float"
     ++ optional grsecEnabled "--enable-glx-rts"; # slight performance degradation, enable only for grsec
 
-  nativeBuildInputs = [ pkgconfig python makedepend file flex bison ];
+  nativeBuildInputs = [ pkgconfig python makedepend file flex bison pythonPackages.Mako ];
 
   propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]
-    ++ optionals stdenv.isLinux [libdrm]
-    ;
+    ++ optionals stdenv.isLinux [ libdrm ];
+
   buildInputs = with xorg; [
-    autoreconfHook intltool expat libxml2Python llvm
+    autoreconfHook intltool expat libxml2Python llvmPackages.llvm
     glproto dri2proto dri3proto presentproto
     libX11 libXext libxcb libXt libXfixes libxshmfence
-    libffi wayland libvdpau libelf
-  ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
-    ++ optional stdenv.isLinux udev
-    ;
+    libffi wayland libvdpau libelf libXvMC libomxil-bellagio libva
+    libclc clang
+  ] ++ optional stdenv.isLinux udev;
 
   enableParallelBuilding = true;
   doCheck = false;
 
+  installFlags = [ "DESTDIR=\${out}" ];
+
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
   #   also move libOSMesa to $osmesa, as it's relatively big
   # ToDo: probably not all .la files are completely fixed, but it shouldn't matter
   postInstall = with stdenv.lib; ''
+    fix_dirs () {
+      mkdir -p $1
+      mv $out/$1/* $1
+      DIR=$out/$1
+      while rmdir $DIR 2>/dev/null; do
+        DIR="$(dirname "$DIR")"
+      done
+    }
+    fix_dirs $out
+    fix_dirs $drivers
+    fix_dirs $osmesa
+
     mv -t "$drivers/lib/" \
   '' + optionalString enableExtraFeatures ''
       `#$out/lib/libXvMC*` \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31ac24aa3ae4..c66e1e1fe0a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6912,7 +6912,8 @@ let
     # makes it slower, but during runtime we link against just mesa_drivers
     # through /run/opengl-driver*, which is overriden according to config.grsecurity
     grsecEnabled = true;
-    llvm = llvm_35;
+    libva = libva.override { mesa = null; };
+    llvmPackages = llvmPackages_36;
   });
   mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
   mesa_drivers = mesaDarwinOr (

From 6d0bfb1b198902dbeacd5e10bfd042084375594c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 29 Mar 2015 14:01:38 -0700
Subject: [PATCH 0062/1143] tk: 8.5.15 -> 8.6.4

---
 pkgs/development/libraries/tk/default.nix     |  8 ++---
 .../tk/different-prefix-with-tcl.patch        | 33 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index fd3684d189c8..e44514d5abf1 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
 
 stdenv.mkDerivation {
-  name = "tk-8.5.15";
+  name = "tk-8.6.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz";
-    sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41";
+    url = "mirror://sourceforge/tcl/tk8.6.4-src.tar.gz";
+    sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
   };
 
   patches = [ ./different-prefix-with-tcl.patch ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   inherit tcl;
 
   passthru = {
-    libPrefix = "tk8.5";
+    libPrefix = "tk8.6";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/tk/different-prefix-with-tcl.patch b/pkgs/development/libraries/tk/different-prefix-with-tcl.patch
index bf331b75cae0..aee46e149b1a 100644
--- a/pkgs/development/libraries/tk/different-prefix-with-tcl.patch
+++ b/pkgs/development/libraries/tk/different-prefix-with-tcl.patch
@@ -1,22 +1,25 @@
---- tk8.5.15-orig/unix/Makefile.in	2014-01-25 08:57:45.626713122 +0800
-+++ tk8.5.15/unix/Makefile.in	2014-01-25 08:59:35.315341825 +0800
-@@ -995,7 +995,8 @@
+diff --git a/generic/tkWindow.c b/generic/tkWindow.c
+index b5cbbab..96b5501 100644
+--- a/generic/tkWindow.c
++++ b/generic/tkWindow.c
+@@ -988,6 +988,7 @@ TkCreateMainWindow(
+ 
+     Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
+     Tcl_SetVar2(interp, "tk_version",    NULL, TK_VERSION,     TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp, "tk_library",    NULL, TK_LIBRARY,     TCL_GLOBAL_ONLY);
+ 
+     tsdPtr->numMainWindows++;
+     return tkwin;
+diff --git a/unix/Makefile.in b/unix/Makefile.in
+index f21fdbb..c61b0df 100644
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -1029,7 +1029,7 @@ tkVisual.o: $(GENERIC_DIR)/tkVisual.c
  	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
  
  tkWindow.o: $(GENERIC_DIR)/tkWindow.c
 -	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
-+	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
-+	    $(GENERIC_DIR)/tkWindow.c
++	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" $(GENERIC_DIR)/tkWindow.c
  
  tkButton.o: $(GENERIC_DIR)/tkButton.c
  	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c
---- tk8.5.15-orig/generic/tkWindow.c	2014-01-25 10:10:03.964476436 +0800
-+++ tk8.5.15/generic/tkWindow.c	2014-01-25 10:08:06.020950933 +0800
-@@ -983,6 +983,7 @@
- 
-     Tcl_SetVar(interp, "tk_patchLevel", TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
-     Tcl_SetVar(interp, "tk_version",    TK_VERSION,     TCL_GLOBAL_ONLY);
-+    Tcl_SetVar(interp, "tk_library",    TK_LIBRARY,     TCL_GLOBAL_ONLY);
- 
-     tsdPtr->numMainWindows++;
-     return tkwin;

From aeb0b610db241b6e6b7d37efeb54848ef0a3c8df Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 29 Mar 2015 14:17:35 -0700
Subject: [PATCH 0063/1143] libunwind: Fix build

---
 .../libraries/libunwind/default.nix           |  6 ++
 .../libunwind/libunwind-1.1-lzma.patch        | 63 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 75139ea988b6..6e8f3548e87c 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
   };
 
+  patches = [ ./libunwind-1.1-lzma.patch ];
+
+  postPatch = ''
+    sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure
+  '';
+
   propagatedBuildInputs = [ xz ];
 
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
diff --git a/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch b/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch
new file mode 100644
index 000000000000..09cefa028539
--- /dev/null
+++ b/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch
@@ -0,0 +1,63 @@
+From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 15 Feb 2014 21:00:59 -0500
+Subject: [PATCH] link sublibs against liblzma as needed
+
+The coredump/elf32/elf64/elfxx libs use lzma funcs but don't link against
+it.  This produces sub-shared libs that don't link against lzma and can
+make the linker angry due to underlinking like so:
+
+libtool: link: x86_64-pc-linux-gnu-gcc -O2 -march=amdfam10 -pipe -g \
+	-frecord-gcc-switches -Wimplicit-function-declaration -fexceptions \
+	-Wall -Wsign-compare -Wl,-O1 -Wl,--hash-style=gnu \
+	-o .libs/test-coredump-unwind test-coredump-unwind.o  \
+	../src/.libs/libunwind-coredump.so ../src/.libs/libunwind-x86_64.so
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_footer_decode'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_buffer_decode'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_size'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_end'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_uncompressed_size'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_buffer_decode'
+collect2: error: ld returned 1 exit status
+
+So add LIBLZMA to the right LIBADD for each of these libraries.
+
+URL: https://bugs.gentoo.org/444050
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -169,7 +169,7 @@ libunwind_arm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libunwind_arm_la_LDFLAGS) $(LDFLAGS) -o $@
+ @ARCH_ARM_TRUE@am_libunwind_arm_la_rpath = -rpath $(libdir)
+-libunwind_coredump_la_LIBADD =
++libunwind_coredump_la_LIBADD = $(LIBLZMA)
+ am__libunwind_coredump_la_SOURCES_DIST = coredump/_UCD_accessors.c \
+ 	coredump/_UCD_create.c coredump/_UCD_destroy.c \
+ 	coredump/_UCD_access_mem.c coredump/_UCD_elf_map_image.c \
+@@ -214,15 +214,15 @@ am_libunwind_dwarf_local_la_OBJECTS = dwarf/Lexpr.lo dwarf/Lfde.lo \
+ libunwind_dwarf_local_la_OBJECTS =  \
+ 	$(am_libunwind_dwarf_local_la_OBJECTS)
+ @REMOTE_ONLY_FALSE@@USE_DWARF_TRUE@am_libunwind_dwarf_local_la_rpath =
+-libunwind_elf32_la_LIBADD =
++libunwind_elf32_la_LIBADD = $(LIBLZMA)
+ am_libunwind_elf32_la_OBJECTS = elf32.lo
+ libunwind_elf32_la_OBJECTS = $(am_libunwind_elf32_la_OBJECTS)
+ @USE_ELF32_TRUE@am_libunwind_elf32_la_rpath =
+-libunwind_elf64_la_LIBADD =
++libunwind_elf64_la_LIBADD = $(LIBLZMA)
+ am_libunwind_elf64_la_OBJECTS = elf64.lo
+ libunwind_elf64_la_OBJECTS = $(am_libunwind_elf64_la_OBJECTS)
+ @USE_ELF64_TRUE@am_libunwind_elf64_la_rpath =
+-libunwind_elfxx_la_LIBADD =
++libunwind_elfxx_la_LIBADD = $(LIBLZMA)
+ am_libunwind_elfxx_la_OBJECTS = elfxx.lo
+ libunwind_elfxx_la_OBJECTS = $(am_libunwind_elfxx_la_OBJECTS)
+ @USE_ELFXX_TRUE@am_libunwind_elfxx_la_rpath =
+-- 
+1.8.5.5
+

From fa24f563de9f5d7c86a08f059bdf9fcc1a5f56de Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 29 Mar 2015 19:03:50 -0700
Subject: [PATCH 0064/1143] libtasn1: 4.3 -> 4.4

---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 543b7fafd51d..a0e53cf90587 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-4.3";
+  name = "libtasn1-4.4";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "1k2n2x5jyp1jkrjbfklf880hbd02ws1jdvwp1y8x8fxhzzii6dbk";
+    sha256 = "0p8c5s1gm3z3nn4s9qc6gs18grbk45mx44byqw2l2qzynjqrsd7q";
   };
 
   buildInputs = [ perl texinfo ];

From 49ffc37b1c8bcd4d437c725a1aefc2aedf27c22e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 29 Mar 2015 19:06:46 -0700
Subject: [PATCH 0065/1143] mesa: 1.5.1 -> 1.5.2

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index b6ad9b42122c..da2a1d1b5294 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.5.1";
+  version = "10.5.2";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
   clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "ffc51943d15c6812ee7611d053d8980a683fbd6a4986cff567b12cc66637d679";
+    sha256 = "0i6xqklphkk2n38xinkkwvhpbxbk6158il2q2n36yz9ygjvnyjrg";
   };
 
   prePatch = "patchShebangs .";

From 7e9ef553d99a722c089c5c6641f642796ef42f72 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 29 Mar 2015 21:26:39 -0700
Subject: [PATCH 0066/1143] nixos/initrd: Allow overriding of binaries

---
 nixos/modules/system/boot/stage-1.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 0bf5a2f3c80c..47d6dd2bf54b 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -43,7 +43,7 @@ let
       cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
 
       copy_bin_and_libs () {
-        [ -f "$out/bin/$(basename $1)" ] && return 0
+        [ -f "$out/bin/$(basename $1)" ] && rm "$out/bin/$(basename $1)"
         cp -pdv $1 $out/bin
         LDD="$(ldd $1)" || return 0
         LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')"
@@ -110,11 +110,11 @@ let
       echo "testing patched programs..."
       $out/bin/ash -c 'echo hello world' | grep "hello world"
       export LD_LIBRARY_PATH=$out/lib
-      $out/bin/mount --help 2>&1 | grep "BusyBox"
-      $out/bin/blkid >/dev/null
+      $out/bin/mount --help 2>&1 | grep -q "BusyBox"
+      $out/bin/blkid --help 2>&1 | grep -q 'libblkid'
       $out/bin/udevadm --version
-      $out/bin/dmsetup --version 2>&1 | tee -a log | grep "version:"
-      LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep "LVM"
+      $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:"
+      LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep -q "LVM"
       $out/bin/mdadm --version
 
       ${config.boot.initrd.extraUtilsCommandsTest}

From eee9efa6da0cd33ceb3cf1be0b9734532474adc3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 29 Mar 2015 21:53:25 -0700
Subject: [PATCH 0067/1143] nixos/initrd: Do a lazy library copy in hopes to
 save some space for replaced binaries

---
 nixos/modules/system/boot/stage-1.nix | 38 +++++++++++++++------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 47d6dd2bf54b..8b58eccdcec7 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -39,26 +39,9 @@ let
       mkdir -p $out/bin $out/lib
       ln -s $out/bin $out/sbin
 
-      # Copy ld manually since it isn't detected correctly
-      cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
-
       copy_bin_and_libs () {
         [ -f "$out/bin/$(basename $1)" ] && rm "$out/bin/$(basename $1)"
         cp -pdv $1 $out/bin
-        LDD="$(ldd $1)" || return 0
-        LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')"
-        for LIB in $LIBS; do
-          [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib
-          while [ "$(readlink $LIB)" != "" ]; do
-            LINK="$(readlink $LIB)"
-            if [ "${LINK:0:1}" != "/" ]; then
-              LINK="$(dirname $LIB)/$LINK"
-            fi
-            LIB="$LINK"
-            [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib
-          done
-        done
-        return 0
       }
 
       # Copy BusyBox.
@@ -89,6 +72,27 @@ let
 
       ${config.boot.initrd.extraUtilsCommands}
 
+      # Copy ld manually since it isn't detected correctly
+      cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
+
+      # Copy all of the needed libraries for the binaries
+      for BIN in $(find $out/{bin,sbin} -type f); do
+        echo "Copying libs for bin $BIN"
+        LDD="$(ldd $BIN)" || continue
+        LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')"
+        for LIB in $LIBS; do
+          [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib
+          while [ "$(readlink $LIB)" != "" ]; do
+            LINK="$(readlink $LIB)"
+            if [ "${LINK:0:1}" != "/" ]; then
+              LINK="$(dirname $LIB)/$LINK"
+            fi
+            LIB="$LINK"
+            [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib
+          done
+        done
+      done
+
       # Strip binaries further than normal.
       chmod -R u+w $out
       stripDirs "lib bin" "-s"

From ff35c4a5e2df6c3b2c3a6ddcbb756112cb024e62 Mon Sep 17 00:00:00 2001
From: "Luis G. Torres" <lgtorres42@gmail.com>
Date: Mon, 23 Mar 2015 08:54:39 -0400
Subject: [PATCH 0068/1143] Make cmake install libraries with full install
 names by default so that executables can find cmake-installed shared
 libraries at runtime on Darwin. Addresses #6821.

---
 .../development/tools/build-managers/cmake/setup-hook.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 39052fea6cb5..670376efdcab 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -36,6 +36,15 @@ cmakeConfigurePhase() {
         cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-g++ -DCMAKE_C_COMPILER=$crossConfig-gcc $cmakeFlags"
     fi
 
+    # This installs shared libraries with a fully-specified install
+    # name. By default, cmake installs shared libraries with just the
+    # basename as the install name, which means that, on Darwin, they
+    # can only be found by an executable at runtime if the shared
+    # libraries are in a system path or in the same directory as the
+    # executable. This flag makes the shared library accessible from its
+    # nix/store directory.
+    cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=$prefix/lib $cmakeFlags"
+
     # Avoid cmake resetting the rpath of binaries, on make install
     # And build always Release, to ensure optimisation flags
     cmakeFlags="-DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"

From 1db981a05035854442c56da547d5ac09af676bcf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Apr 2015 10:57:41 -0700
Subject: [PATCH 0069/1143] firefox: 36.0.4 -> 37.0

---
 pkgs/applications/networking/browsers/firefox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index ec7c6047ae48..111a704cec78 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "36.0.4"; in
+let version = "37.0"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "ccd8fb7881dcb9ae07a47ceeea561e50b80d55ea";
+    sha1 = "c23a3d36603edd9d2fbac51afe7a4825c0ac15d8";
   };
 
   buildInputs =

From 04e39bdb5cc52de47c741c555ec301370abfc113 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Apr 2015 18:36:31 -0700
Subject: [PATCH 0070/1143] kbd: 1.15.3 -> 2.0.2

---
 pkgs/os-specific/linux/kbd/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index d2413be6f5ab..e7b9753c6b7b 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, gzip, bzip2 }:
+{ stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, check, pam }:
 
 stdenv.mkDerivation rec {
-  name = "kbd-1.15.3";
+  name = "kbd-2.0.2";
 
   src = fetchurl {
     url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz";
-    sha256 = "1vcl2791xshjdpi4w88iy87gkb7zv0dbvi83f98v30dvqc9mfl46";
+    sha256 = "08f0nc78h6l2z39lr5jddpq7lvm365sc42597nvd6f8hc2bcgr5i";
   };
 
   /* Get the dvorak programmer keymap (present in X but not in kbd) */
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
     sha256 = "1wlgp09wq84hml60hi4ls6d4zna7vhycyg40iipyh1279i91hsx7";
   };
 
-  configureFlags = "--disable-nls";
-
-  preConfigure = ''
-    sh autogen.sh
-  '';
+  configureFlags = [
+    "--enable-optional-progs"
+    "--enable-libkeymap"
+    "--disable-nls"
+  ];
 
   patchPhase =
     ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       ${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map
 
       # Fix the path to gzip/bzip2.
-      substituteInPlace src/findfile.c \
+      substituteInPlace src/libkeymap/findfile.c \
         --replace gzip ${gzip}/bin/gzip \
         --replace bzip2 ${bzip2}/bin/bzip2 \
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       ''}
     '';
 
-  buildInputs = [ autoconf automake libtool ];
+  buildInputs = [ autoreconfHook pkgconfig check pam ];
 
   makeFlags = "setowner= ";
 

From c94b24fa4ab2b247ef6c90a426bc07ccf216db2c Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 6 Apr 2015 19:48:44 -0700
Subject: [PATCH 0071/1143] fix fallout from merge of master

---
 .../tools/build-managers/cmake/default.nix            |  5 +++++
 pkgs/development/tools/misc/fswatch/default.nix       |  4 ++--
 pkgs/top-level/all-packages.nix                       | 11 ++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 57ccb086d32d..210c94860509 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,10 +1,13 @@
 { stdenv, fetchurl
 , bzip2, curl, expat, jsoncpp, libarchive, xz, zlib
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
+, wantPS ? false, ps ? null
 }:
 
 with stdenv.lib;
 
+assert wantPS -> (ps != null);
+
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.2";
@@ -41,6 +44,8 @@ stdenv.mkDerivation rec {
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
+  propagatedBuildInputs = optional wantPS ps;
+
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
 
   configureFlags =
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 35468d1351f0..8f7f9437d4ef 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -3,7 +3,7 @@
 , autoconf
 , automake
 , findutils                     # for xargs
-, gettext_0_19
+, gettext
 , libtool
 , makeWrapper
 , texinfo
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
     sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4";
   };
 
-  buildInputs = [ autoconf automake gettext_0_19 libtool makeWrapper texinfo ];
+  buildInputs = [ autoconf automake gettext libtool makeWrapper texinfo ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4067ccdbc8d7..89d7696ed1f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4972,12 +4972,6 @@ let
     ps     = if stdenv.isDarwin then darwin.ps else null;
   };
 
-  cmake-3_2 = callPackage ../development/tools/build-managers/cmake/3.2.nix {
-    jsoncpp = jsoncpp-1_6;
-  };
-  cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { };
-  cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
-
   cmakeCurses = cmake.override { useNcurses = true; };
 
   cmakeWithGui = cmakeCurses.override { useQt4 = true; };
@@ -5772,7 +5766,6 @@ let
 
   gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
   gettext_0_18 = callPackage ../development/libraries/gettext { };
-  gettext_0_19 = callPackage ../development/libraries/gettext/0.19.nix { };
 
   gd = callPackage ../development/libraries/gd { };
 
@@ -6143,7 +6136,6 @@ let
   json_c = callPackage ../development/libraries/json-c { };
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
-  jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { };
 
   libjson = callPackage ../development/libraries/libjson { };
 
@@ -6973,7 +6965,8 @@ let
     # makes it slower, but during runtime we link against just mesa_drivers
     # through /run/opengl-driver*, which is overriden according to config.grsecurity
     grsecEnabled = true;
-    llvm = llvm_35;
+    libva = libva.override { mesa = null; };
+    llvmPackages = llvmPackages_36;
   });
   mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
   mesa_drivers = mesaDarwinOr (

From 8e9f13e7e97c81d3b1423269ea0de6504843567f Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 6 Apr 2015 20:12:47 -0700
Subject: [PATCH 0072/1143] more merge fallout

---
 pkgs/top-level/all-packages.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89d7696ed1f3..18a838d6f0bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5777,7 +5777,7 @@ let
 
   giblib = callPackage ../development/libraries/giblib { };
 
-  libgit2 = callPackage ../development/libraries/git2 { cmake = cmake-3_2; };
+  libgit2 = callPackage ../development/libraries/git2 { };
 
   glew = callPackage ../development/libraries/glew { };
 
@@ -6261,6 +6261,8 @@ let
 
   libchop = callPackage ../development/libraries/libchop { };
 
+  libclc = callPackage ../development/libraries/libclc { };
+
   libcli = callPackage ../development/libraries/libcli { };
 
   libcm = callPackage ../development/libraries/libcm { };
@@ -6662,6 +6664,8 @@ let
 
   liboil = callPackage ../development/libraries/liboil { };
 
+  libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { };
+
   liboop = callPackage ../development/libraries/liboop { };
 
   libopus = callPackage ../development/libraries/libopus { };
@@ -7332,7 +7336,7 @@ let
     qtLib = qt48Full;
   };
 
-  qt5 = callPackage ../development/libraries/qt-5/5.3 {
+  qt53 = callPackage ../development/libraries/qt-5/5.3 {
     mesa = mesa_noglu;
     cups = if stdenv.isLinux then cups else null;
     # GNOME dependencies are not used unless gtkStyle == true
@@ -7342,7 +7346,9 @@ let
 
   qt54 = callPackage ../development/libraries/qt-5/5.4 {};
 
-  qt5Full = appendToName "full" (qt5.override {
+  qt5 = qt54;
+
+  qt5Full = appendToName "full" (qt53.override {
     buildDocs = true;
     buildExamples = true;
     buildTests = true;
@@ -10990,9 +10996,6 @@ let
   kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
     kf5 = kf57;
     qt5 = qt54;
-    pkgs = pkgs // {
-      cmake = cmake-3_2;
-    };
     kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
   kdeApps_stable = kdeApps_14_12;
@@ -13144,11 +13147,11 @@ let
           kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
         };
 
-      callPackageOrig = newScope (extra // { cmake = cmake-3_2; });
+      callPackageOrig = newScope extra;
 
       makePackages = extra:
         let
-          callPackage = newScope (extra // { cmake = cmake-3_2; } // self);
+          callPackage = newScope (extra // self);
           kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; };
           self =
             kde4

From 4b5592cff7483e629245b7a1509e7bda40a82b2e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Apr 2015 20:20:55 -0700
Subject: [PATCH 0073/1143] top-level: Fix gettext versioning

---
 pkgs/top-level/all-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18a838d6f0bb..93ca7200641c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5762,10 +5762,11 @@ let
 
   getdata = callPackage ../development/libraries/getdata { };
 
-  gettext = gettext_0_18;
+  gettext = gettext_0_19;
 
   gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
-  gettext_0_18 = callPackage ../development/libraries/gettext { };
+  gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { };
+  gettext_0_19 = callPackage ../development/libraries/gettext { };
 
   gd = callPackage ../development/libraries/gd { };
 

From 5598a5b359396f0e0132014bf53b545d52b817bf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Apr 2015 20:23:36 -0700
Subject: [PATCH 0074/1143] qt5Full: Fix version

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93ca7200641c..89c19824c268 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7349,7 +7349,7 @@ let
 
   qt5 = qt54;
 
-  qt5Full = appendToName "full" (qt53.override {
+  qt5Full = appendToName "full" (qt5.override {
     buildDocs = true;
     buildExamples = true;
     buildTests = true;

From 6c9b529dd3f63091ef0c6e31fcd61c5bb556428f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Apr 2015 20:24:32 -0700
Subject: [PATCH 0075/1143] Revert "qt5Full: Fix version"

This reverts commit 5598a5b359396f0e0132014bf53b545d52b817bf.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89c19824c268..93ca7200641c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7349,7 +7349,7 @@ let
 
   qt5 = qt54;
 
-  qt5Full = appendToName "full" (qt5.override {
+  qt5Full = appendToName "full" (qt53.override {
     buildDocs = true;
     buildExamples = true;
     buildTests = true;

From e29bf6e26ebe2f4b5b03588b415c53cc73500793 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 6 Apr 2015 20:56:19 -0700
Subject: [PATCH 0076/1143] gnutar: patch to build on darwin

---
 pkgs/tools/archivers/gnutar/default.nix       |   5 +-
 .../archivers/gnutar/gnutar-1.28-darwin.patch | 114 ++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/archivers/gnutar/gnutar-1.28-darwin.patch

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 6b125b2127f8..e34bc2b394f1 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "gnutar-${version}";
@@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "0qkm2k9w8z91hwj8rffpjj9v1vhpiriwz4cdj36k9vrgc3hbzr30";
   };
 
+  patches = stdenv.lib.optional stdenv.isDarwin ./gnutar-1.28-darwin.patch;
+  buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+
   # May have some issues with root compilation because the bootstrap tool
   # cannot be used as a login shell for now.
   FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
diff --git a/pkgs/tools/archivers/gnutar/gnutar-1.28-darwin.patch b/pkgs/tools/archivers/gnutar/gnutar-1.28-darwin.patch
new file mode 100644
index 000000000000..cab0e4406d8e
--- /dev/null
+++ b/pkgs/tools/archivers/gnutar/gnutar-1.28-darwin.patch
@@ -0,0 +1,114 @@
+>From 7d1d3d38cb66b02c062de77847e3c0ecd842366c Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <address@hidden>
+Date: Mon, 4 Aug 2014 13:19:49 +0200
+Subject: [PATCH] xattrs: fix bug in configure
+
+Be careful to define HAVE_XATTRS when not all needed xattr-related
+functions are properly defined either in libc or libattr.
+
+Reported independently by Denis Excoffier and Dominyk Tille.
+
+* acinclude.m4 (TAR_HEADERS_ATTR_XATTR_H): Check for each xattr
+function separately.  Don't AC_CHECK_LIB (LIBS is filled by
+AC_SEARCH_LIBS when necessary).
+* lib/xattr-at.c: Do not build when HAVE_XATTRS is not defined.
+* src/Makefile.am: The LDADD -lattr was redundant.
+---
+ acinclude.m4    | 42 ++++++++++++++----------------------------
+ lib/xattr-at.c  |  7 +++++++
+ src/Makefile.am |  4 ----
+ 3 files changed, 21 insertions(+), 32 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 3b28b3b..db0bbc7 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,37 +40,23 @@ AC_DEFUN([TAR_HEADERS_ATTR_XATTR_H],
+   # First check for <sys/xattr.h>
+   AC_CHECK_HEADERS([sys/xattr.h])
+   AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_sys_xattr_h" = yes])
+-  AM_CONDITIONAL([TAR_LIB_ATTR],[false])
+-  if test "$ac_cv_header_sys_xattr_h" = yes; then
+-    AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \
+-                   setxattr  fsetxattr  lsetxattr \
+-                   listxattr flistxattr llistxattr,
+-        # only when functions are present
+-        AC_DEFINE([HAVE_SYS_XATTR_H], [1],
+-                    [define to 1 if we have <sys/xattr.h> header])
+-        if test "$with_xattrs" != no; then
+-          AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.])
+-        fi
+-    )
+-  fi
+-
+-  # If <sys/xattr.h> is not found, then check for <attr/xattr.h>
+   if test "$ac_cv_header_sys_xattr_h" != yes; then
+     AC_CHECK_HEADERS([attr/xattr.h])
+     AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_attr_xattr_h" = yes])
+-    AC_CHECK_LIB([attr],[fgetxattr])
+-    AM_CONDITIONAL([TAR_LIB_ATTR],[test "$ac_cv_lib_attr_fgetxattr" = yes])
+-    if test "$ac_cv_header_attr_xattr_h" = yes; then
+-      AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \
+-                     setxattr  fsetxattr  lsetxattr \
+-                     listxattr flistxattr llistxattr,
+-          # only when functions are present
+-          AC_DEFINE([HAVE_ATTR_XATTR_H], [1],
+-                      [define to 1 if we have <attr/xattr.h> header])
+-          if test "$with_xattrs" != no; then
+-            AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.])
+-          fi
+-      )
++  fi
++
++  if test "$with_xattrs" != no; then
++    for i in getxattr  fgetxattr  lgetxattr \
++             setxattr  fsetxattr  lsetxattr \
++             listxattr flistxattr llistxattr
++    do
++      AC_SEARCH_LIBS($i, attr)
++      eval found=\$ac_cv_search_$i
++      test "$found" = "no" && break
++    done
++
++    if test "$found" != no; then
++      AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.])
+     fi
+   fi
+ ])
+diff --git a/lib/xattr-at.c b/lib/xattr-at.c
+index 443ccae..009bde5 100644
+--- a/lib/xattr-at.c
++++ b/lib/xattr-at.c
+@@ -18,6 +18,11 @@
+ 
+ #include <config.h>
+ 
++/* Temporarily don't build.  We are unable to build on (probably not only)
++   darwin due to lack of l*xattr callbacks (XATTR_NOFOLLOW is alternative) and
++   different function definitions. */
++#ifdef HAVE_XATTRS
++
+ #include "xattr-at.h"
+ #include "openat.h"
+ 
+@@ -108,3 +113,5 @@
+ #undef AT_FUNC_RESULT
+ #undef AT_FUNC_POST_FILE_PARAM_DECLS
+ #undef AT_FUNC_POST_FILE_ARGS
++
++#endif
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 82b2d46..42daaef 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,7 +52,3 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV)
+ 
+ tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX)
+-
+-if TAR_LIB_ATTR
+-tar_LDADD += -lattr
+-endif
+-- 
+1.9.3
+

From 1e47ac93aa5b03d36f54538d76468034626d63e3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Apr 2015 23:07:27 -0700
Subject: [PATCH 0077/1143] mesa: Disable opencl temporarily

---
 pkgs/development/libraries/mesa/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index da2a1d1b5294..85d35f2189f4 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -83,8 +83,11 @@ stdenv.mkDerivation {
     "--enable-vdpau"
     "--enable-omx"
     "--enable-va"
-    "--enable-opencl"
-    "--enable-opencl-icd"
+
+    # TODO: Figure out how to enable opencl without having a runtime dependency on clang
+    "--disable-opencl"
+    #"--enable-opencl"
+    #"--enable-opencl-icd"
 
     "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
     "--enable-shared-glapi"

From 033472c136ee39d17a5b0bf0688b512134c4e266 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Tue, 7 Apr 2015 03:34:27 -0400
Subject: [PATCH 0078/1143] ffmpeg: refactor, ffmpeg -> ffmpeg-full & add
 ffmpeg (minimal)

+ adds a minimal dependency version of ffmpeg as the default
+ the current ffmpeg changes have been moved to ffmpeg-full
+ ffmpeg default 2.5 -> 2.6
+ removed ffmpeg 0.5 & 2.5 (unused versions)

Close #7160.
---
 .../libraries/ffmpeg-full/default.nix         | 468 ++++++++++++++++
 pkgs/development/libraries/ffmpeg/0.5.nix     |   7 -
 pkgs/development/libraries/ffmpeg/2.5.nix     |   7 -
 pkgs/development/libraries/ffmpeg/generic.nix | 517 +++---------------
 pkgs/top-level/all-packages.nix               |  28 +-
 5 files changed, 580 insertions(+), 447 deletions(-)
 create mode 100644 pkgs/development/libraries/ffmpeg-full/default.nix
 delete mode 100644 pkgs/development/libraries/ffmpeg/0.5.nix
 delete mode 100644 pkgs/development/libraries/ffmpeg/2.5.nix

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
new file mode 100644
index 000000000000..e674ef0b97bd
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -0,0 +1,468 @@
+{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
+/*
+ *  Licensing options (yes some are listed twice, filters and such are not listed)
+ */
+, gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab
+, version3Licensing ? true # (L)GPL3: opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc
+, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,faac,aacplus,blackmagic-design-desktop-video
+/*
+ *  Build options
+ */
+, smallBuild ? false # Optimize for size instead of speed
+, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively)
+, grayBuild ? true # Full grayscale support
+, swscaleAlphaBuild ? true # Alpha channel support in swscale
+, incompatibleLibavAbiBuild ? false # Incompatible Libav fork ABI
+, hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation
+, safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders
+, memalignHackBuild ? false # Emulate memalign
+, multithreadBuild ? true # Multithreading via pthreads/win32 threads
+, networkBuild ? true # Network support
+, pixelutilsBuild ? true # Pixel utils in libavutil
+/*
+ *  Program options
+ */
+, ffmpegProgram ? true # Build ffmpeg executable
+, ffplayProgram ? true # Build ffplay executable
+, ffprobeProgram ? true # Build ffprobe executable
+, ffserverProgram ? true # Build ffserver executable
+, qtFaststartProgram ? true # Build qt-faststart executable
+/*
+ *  Library options
+ */
+, avcodecLibrary ? true # Build avcodec library
+, avdeviceLibrary ? true # Build avdevice library
+, avfilterLibrary ? true # Build avfilter library
+, avformatLibrary ? true # Build avformat library
+, avresampleLibrary ? true # Build avresample library
+, avutilLibrary ? true # Build avutil library
+, postprocLibrary ? true # Build postproc library
+, swresampleLibrary ? true # Build swresample library
+, swscaleLibrary ? true # Build swscale library
+/*
+ *  Documentation options
+ */
+, htmlpagesDocumentation ? false # HTML documentation pages
+, manpagesDocumentation ? true # Man documentation pages
+, podpagesDocumentation ? false # POD documentation pages
+, txtpagesDocumentation ? false # Text documentation pages
+/*
+ *  External libraries options
+ */
+#, aacplusExtlib ? false, aacplus ? null # AAC+ encoder
+, alsaLib ? null # Alsa in/output support
+#, avisynth ? null # Support for reading AviSynth scripts
+, bzip2 ? null
+, celt ? null # CELT decoder
+#, crystalhd ? null # Broadcom CrystalHD hardware acceleration
+#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support
+, faacExtlib ? false, faac ? null # AAC encoder
+, fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder
+#, flite ? null # Flite (voice synthesis) support
+, fontconfig ? null # Needed for drawtext filter
+, freetype ? null # Needed for drawtext filter
+, frei0r ? null # frei0r video filtering
+, fribidi ? null # Needed for drawtext filter
+, game-music-emu ? null # Game Music Emulator
+, gnutls ? null
+, gsm ? null # GSM de/encoder
+#, ilbc ? null # iLBC de/encoder
+, jack2 ? null # Jack audio (only version 2 is supported in this build)
+, ladspaH ? null # LADSPA audio filtering
+, lame ? null # LAME MP3 encoder
+, libass ? null # (Advanced) SubStation Alpha subtitle rendering
+, libbluray ? null # BluRay reading
+, libbs2b ? null # bs2b DSP library
+, libcaca ? null # Textual display (ASCII art)
+#, libcdio-paranoia ? null # Audio CD grabbing
+, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394)
+, libiconv ? null
+#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394)
+#, libmfx ? null # Hardware acceleration vis libmfx
+, libmodplug ? null # ModPlug support
+#, libnut ? null # NUT (de)muxer, native (de)muser exists
+, libogg ? null # Ogg container used by vorbis & theora
+, libopus ? null # Opus de/encoder
+, libsndio ? null # sndio playback/record support
+, libssh ? null # SFTP protocol
+, libtheora ? null # Theora encoder
+, libv4l ? null # Video 4 Linux support
+, libva ? null # Vaapi hardware acceleration
+, libvdpau ? null # Vdpau hardware acceleration
+, libvorbis ? null # Vorbis de/encoding, native encoder exists
+, libvpx ? null # VP8 & VP9 de/encoding
+, libwebp ? null # WebP encoder
+, libX11 ? null # Xlib support
+, libxcb ? null # X11 grabbing using XCB
+, libxcbshmExtlib ? true # X11 grabbing shm communication
+, libxcbxfixesExtlib ? true # X11 grabbing mouse rendering
+, libxcbshapeExtlib ? true # X11 grabbing shape rendering
+, libXv ? null # Xlib support
+, lzma ? null # xz-utils
+#, nvenc ? null # NVIDIA NVENC support
+, openal ? null # OpenAL 1.1 capture support
+#, opencl ? null # OpenCL code
+#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
+#, opencv ? null # Video filtering
+, openglExtlib ? false, mesa ? null # OpenGL rendering
+#, openh264 ? null # H.264/AVC encoder
+, openjpeg_1 ? null # JPEG 2000 de/encoder
+, opensslExtlib ? false, openssl ? null
+, pulseaudio ? null # Pulseaudio input support
+, rtmpdump ? null # RTMP[E] support
+#, libquvi ? null # Quvi input support
+, samba ? null # Samba protocol
+#, schroedinger ? null # Dirac de/encoder
+, SDL ? null
+#, shine ? null # Fixed-point MP3 encoder
+, soxr ? null # Resampling via soxr
+, speex ? null # Speex de/encoder
+#, twolame ? null # MP2 encoder
+#, utvideo ? null # Ut Video de/encoder
+, vid-stab ? null # Video stabilization
+#, vo-aacenc ? null # AAC encoder
+#, vo-amrwbenc ? null # AMR-WB encoder
+, wavpack ? null # Wavpack encoder
+, x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy)
+, x264 ? null # H.264/AVC encoder
+, x265 ? null # H.265/HEVC encoder
+, xavs ? null # AVS encoder
+, xvidcore ? null # Xvid encoder, native encoder exists
+, zeromq4 ? null # Message passing
+, zlib ? null
+#, zvbi ? null # Teletext support
+/*
+ *  Developer options
+ */
+, debugDeveloper ? false
+, optimizationsDeveloper ? true
+, extraWarningsDeveloper ? false
+, strippingDeveloper ? false
+}:
+
+/* Maintainer notes:
+ *
+ * Version bumps:
+ * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release)
+ * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed
+ *   and make the necessary changes.
+ *
+ * Packages with errors:
+ *   flite ilbc schroedinger
+ *   opencv - circular dependency issue
+ *
+ * Not packaged:
+ *   aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
+ *   libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame
+ *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
+ *
+ * Need fixes to support Darwin:
+ *   frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
+ *   pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs
+ *
+ * Not supported:
+ *   stagefright-h264(android only)
+ *
+ * Known issues:
+ * flite: configure fails to find library
+ *   Tried modifying ffmpeg's configure script and flite to use pkg-config
+ * Cross-compiling will disable features not present on host OS
+ *   (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin)
+ *
+ */
+
+let
+  inherit (stdenv) isCygwin isFreeBSD isLinux;
+  inherit (stdenv.lib) optional optionals enableFeature;
+in
+
+/*
+ *  Licensing dependencies
+ */
+assert version3Licensing -> gplLicensing;
+assert nonfreeLicensing -> gplLicensing && version3Licensing;
+/*
+ *  Build dependencies
+ */
+assert networkBuild -> gnutls != null || opensslExtlib;
+assert pixelutilsBuild -> avutilLibrary;
+/*
+ *  Program dependencies
+ */
+assert ffmpegProgram -> avcodecLibrary
+                     && avfilterLibrary
+                     && avformatLibrary
+                     && swresampleLibrary;
+assert ffplayProgram -> avcodecLibrary
+                     && avformatLibrary
+                     && swscaleLibrary
+                     && swresampleLibrary
+                     && SDL != null;
+assert ffprobeProgram -> avcodecLibrary && avformatLibrary;
+assert ffserverProgram -> avformatLibrary;
+/*
+ *  Library dependencies
+ */
+assert avcodecLibrary -> avutilLibrary; # configure flag since 0.6
+assert avdeviceLibrary -> avformatLibrary
+                       && avcodecLibrary
+                       && avutilLibrary; # configure flag since 0.6
+assert avformatLibrary -> avcodecLibrary && avutilLibrary; # configure flag since 0.6
+assert avresampleLibrary -> avutilLibrary;
+assert postprocLibrary -> avutilLibrary;
+assert swresampleLibrary -> soxr != null;
+assert swscaleLibrary -> avutilLibrary;
+/*
+ *  External libraries
+ */
+#assert aacplusExtlib -> nonfreeLicensing;
+#assert decklinkExtlib -> blackmagic-design-desktop-video != null
+#                                       && !isCygwin && multithreadBuild # POSIX threads required
+#                                       && nonfreeLicensing;
+assert faacExtlib -> faac != null && nonfreeLicensing;
+assert fdkaacExtlib -> fdk_aac != null && nonfreeLicensing;
+assert gnutls != null -> !opensslExtlib;
+assert libxcbshmExtlib -> libxcb != null;
+assert libxcbxfixesExtlib -> libxcb != null;
+assert libxcbshapeExtlib -> libxcb != null;
+assert openglExtlib -> mesa != null;
+assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
+assert x11grabExtlib -> libX11 != null && libXv != null;
+
+stdenv.mkDerivation rec {
+  name = "ffmpeg-${version}";
+  version = "2.6.1";
+
+  src = fetchurl {
+    url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
+    sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4";
+  };
+
+  patchPhase = ''patchShebangs .'';
+
+  configureFlags = [
+    /*
+     *  Licensing flags
+     */
+    (enableFeature gplLicensing "gpl")
+    (enableFeature version3Licensing "version3")
+    (enableFeature nonfreeLicensing "nonfree")
+    /*
+     *  Build flags
+     */
+    # On some ARM platforms --enable-thumb
+    "--enable-shared --disable-static"
+    (enableFeature true "pic")
+    (if (stdenv.cc.cc.isClang or false) then "--cc=clang" else null)
+    (enableFeature smallBuild "small")
+    (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
+    (enableFeature grayBuild "gray")
+    (enableFeature swscaleAlphaBuild "swscale-alpha")
+    (enableFeature incompatibleLibavAbiBuild "incompatible-libav-abi")
+    (enableFeature hardcodedTablesBuild "hardcoded-tables")
+    (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader")
+    (enableFeature memalignHackBuild "memalign-hack")
+    (if multithreadBuild then (
+       if isCygwin then
+         "--disable-pthreads --enable-w32threads"
+       else # Use POSIX threads by default
+         "--enable-pthreads --disable-w32threads")
+     else
+       "--disable-pthreads --disable-w32threads")
+    "--disable-os2threads" # We don't support OS/2
+    (enableFeature networkBuild "network")
+    (enableFeature pixelutilsBuild "pixelutils")
+    /*
+     *  Program flags
+     */
+    (enableFeature ffmpegProgram "ffmpeg")
+    (enableFeature ffplayProgram "ffplay")
+    (enableFeature ffprobeProgram "ffprobe")
+    (enableFeature ffserverProgram "ffserver")
+    /*
+     *  Library flags
+     */
+    (enableFeature avcodecLibrary "avcodec")
+    (enableFeature avdeviceLibrary "avdevice")
+    (enableFeature avfilterLibrary "avfilter")
+    (enableFeature avformatLibrary "avformat")
+    (enableFeature avresampleLibrary "avresample")
+    (enableFeature avutilLibrary "avutil")
+    (enableFeature (postprocLibrary && gplLicensing) "postproc")
+    (enableFeature swresampleLibrary "swresample")
+    (enableFeature swscaleLibrary "swscale")
+    /*
+     *  Documentation flags
+     */
+    (enableFeature (htmlpagesDocumentation
+          || manpagesDocumentation
+          || podpagesDocumentation
+          || txtpagesDocumentation) "doc")
+    (enableFeature htmlpagesDocumentation "htmlpages")
+    (enableFeature manpagesDocumentation "manpages")
+    (enableFeature podpagesDocumentation "podpages")
+    (enableFeature txtpagesDocumentation "txtpages")
+    /*
+     *  External libraries
+     */
+    #(enableFeature aacplus "libaacplus")
+    #(enableFeature avisynth "avisynth")
+    (enableFeature (bzip2 != null) "bzlib")
+    (enableFeature (celt != null) "libcelt")
+    #(enableFeature crystalhd "crystalhd")
+    #(enableFeature decklinkExtlib "decklink")
+    (enableFeature faacExtlib "libfaac")
+    (enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac")
+    #(enableFeature (flite != null) "libflite")
+    "--disable-libflite" # Force disable until a solution is found
+    (enableFeature (fontconfig != null) "fontconfig")
+    (enableFeature (freetype != null) "libfreetype")
+    (enableFeature (frei0r != null && gplLicensing) "frei0r")
+    (enableFeature (fribidi != null) "libfribidi")
+    (enableFeature (game-music-emu != null) "libgme")
+    (enableFeature (gnutls != null) "gnutls")
+    (enableFeature (gsm != null) "libgsm")
+    #(enableFeature (ilbc != null) "libilbc")
+    (enableFeature (ladspaH !=null) "ladspa")
+    (enableFeature (lame != null) "libmp3lame")
+    (enableFeature (libass != null) "libass")
+    #(enableFeature (libavc1394 != null) null null)
+    (enableFeature (libbluray != null) "libbluray")
+    (enableFeature (libbs2b != null) "libbs2b")
+    #(enableFeature (libcaca != null) "libcaca")
+    #(enableFeature (cdio-paranoia != null && gplLicensing) "libcdio")
+    (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394")
+    (enableFeature (libiconv != null) "iconv")
+    #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883")
+    #(enableFeature (libmfx != null) "libmfx")
+    (enableFeature (libmodplug != null) "libmodplug")
+    #(enableFeature (libnut != null) "libnut")
+    (enableFeature (libopus != null) "libopus")
+    (enableFeature (libssh != null) "libssh")
+    (enableFeature (libtheora != null) "libtheora")
+    (enableFeature (if isLinux then libv4l != null else false) "libv4l2")
+    (enableFeature ((isLinux || isFreeBSD) && libva != null) "vaapi")
+    (enableFeature (libvdpau != null) "vdpau")
+    (enableFeature (libvorbis != null) "libvorbis")
+    (enableFeature (libvpx != null) "libvpx")
+    (enableFeature (libwebp != null) "libwebp")
+    (enableFeature (libX11 != null && libXv != null) "xlib")
+    (enableFeature (libxcb != null) "libxcb")
+    (enableFeature libxcbshmExtlib "libxcb-shm")
+    (enableFeature libxcbxfixesExtlib "libxcb-xfixes")
+    (enableFeature libxcbshapeExtlib "libxcb-shape")
+    (enableFeature (lzma != null) "lzma")
+    #(enableFeature nvenc "nvenc")
+    (enableFeature (openal != null) "openal")
+    #(enableFeature opencl "opencl")
+    #(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb")
+    #(enableFeature (opencv != null) "libopencv")
+    (enableFeature openglExtlib "opengl")
+    #(enableFeature (openh264 != null) "openh264")
+    (enableFeature (openjpeg_1 != null) "libopenjpeg")
+    (enableFeature (opensslExtlib && gplLicensing) "openssl")
+    (enableFeature (pulseaudio != null) "libpulse")
+    #(enableFeature quvi "libquvi")
+    (enableFeature (rtmpdump != null) "librtmp")
+    #(enableFeature (schroedinger != null) "libschroedinger")
+    #(enableFeature (shine != null) "libshine")
+    (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient")
+    (enableFeature (SDL != null) "sdl") # Only configurable since 2.5, auto detected before then
+    (enableFeature (soxr != null) "libsoxr")
+    (enableFeature (speex != null) "libspeex")
+    #(enableFeature (twolame != null) "libtwolame")
+    #(enableFeature (utvideo != null && gplLicensing) "libutvideo")
+    (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0
+    #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc")
+    #(enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc")
+    (enableFeature (wavpack != null) "libwavpack")
+    (enableFeature (x11grabExtlib && gplLicensing) "x11grab")
+    (enableFeature (x264 != null && gplLicensing) "libx264")
+    (enableFeature (x265 != null && gplLicensing) "libx265")
+    (enableFeature (xavs != null && gplLicensing) "libxavs")
+    (enableFeature (xvidcore != null && gplLicensing) "libxvid")
+    (enableFeature (zeromq4 != null) "libzmq")
+    (enableFeature (zlib != null) "zlib")
+    #(enableFeature (zvbi != null && gplLicensing) "libzvbi")
+    /*
+     * Developer flags
+     */
+    (enableFeature debugDeveloper "debug")
+    (enableFeature optimizationsDeveloper "optimizations")
+    (enableFeature extraWarningsDeveloper "extra-warnings")
+    (enableFeature strippingDeveloper "stripping")
+  ];
+
+  nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
+
+  buildInputs = [
+    bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
+    jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
+    libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
+    libxcb libXext libXfixes libXv lzma openal openjpeg_1 pulseaudio rtmpdump
+    samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
+  ] ++ optional openglExtlib mesa
+    ++ optionals x11grabExtlib [ libXext libXfixes ]
+    ++ optionals nonfreeLicensing [ faac fdk_aac openssl ]
+    ++ optional ((isLinux || isFreeBSD) && libva != null) libva
+    ++ optionals isLinux [ alsaLib libraw1394 libv4l ];
+
+  # Build qt-faststart executable
+  buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';
+  postInstall = optional qtFaststartProgram ''cp -a tools/qt-faststart $out/bin/'';
+
+  enableParallelBuilding = true;
+
+  /* Cross-compilation is untested, consider this an outline, more work
+     needs to be done to portions of the build to get it to work correctly */
+  crossAttrs = let
+    os = ''
+      if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then
+        # Probably should look for mingw too
+        echo "cygwin"
+      elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then
+        echo "darwin"
+      elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then
+        echo "freebsd"
+      elif [ "${stdenv.cross.config}" = "*linux*" ] ; then
+        echo "linux"
+      elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then
+        echo "netbsd"
+      elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then
+        echo "openbsd"
+      fi
+    '';
+  in {
+    dontSetConfigureCross = true;
+    configureFlags = configureFlags ++ [
+      "--cross-prefix=${stdenv.cross.config}-"
+      "--enable-cross-compile"
+      "--target_os=${os}"
+      "--arch=${stdenv.cross.arch}"
+    ];
+  };
+
+  meta = with stdenv.lib; {
+    description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    homepage = http://www.ffmpeg.org/;
+    longDescription = ''
+      FFmpeg is the leading multimedia framework, able to decode, encode, transcode, 
+      mux, demux, stream, filter and play pretty much anything that humans and machines 
+      have created. It supports the most obscure ancient formats up to the cutting edge. 
+      No matter if they were designed by some standards committee, the community or 
+      a corporation. 
+    '';
+    license = (
+      if nonfreeLicensing then
+        licenses.unfreeRedistributable
+      else if version3Licensing then
+        licenses.gpl3
+      else if gplLicensing then
+        licenses.gpl2Plus
+      else
+        licenses.lgpl21Plus
+    );
+    platforms = platforms.all;
+    maintainers = with maintainers; [ codyopel fuuzetsu ];
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg/0.5.nix b/pkgs/development/libraries/ffmpeg/0.5.nix
deleted file mode 100644
index 82e0026ecbe4..000000000000
--- a/pkgs/development/libraries/ffmpeg/0.5.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.15";
-  branch = "0.5";
-  sha256 = "1rcy15dv5bnpnncb78kgki9xl279bh99b76nzqdd87b61r04z74z";
-})
diff --git a/pkgs/development/libraries/ffmpeg/2.5.nix b/pkgs/development/libraries/ffmpeg/2.5.nix
deleted file mode 100644
index dbd5e0e24032..000000000000
--- a/pkgs/development/libraries/ffmpeg/2.5.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.4";
-  branch = "2.5";
-  sha256 = "11m2hbhdgphjxjp6hk438cxmipqjg5ixbr1kqnn9mbdhq9kc34fc";
-})
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 9cb8f86d01d3..1f127d948afc 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,276 +1,60 @@
 { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
-/*
- *  Licensing options (yes some are listed twice, filters and such are not listed)
- */
-, gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab
-, version3Licensing ? true # (L)GPL3: opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc
-, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,faac,aacplus,blackmagic-design-desktop-video
-/*
- *  Build options
- */
-, smallBuild ? false # Optimize for size instead of speed
-, runtime-cpudetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively)
-, grayBuild ? true # Full grayscale support
-, swscale-alphaBuild ? true # Alpha channel support in swscale
-, incompatible-libav-abiBuild ? false # Incompatible Libav fork ABI
-, hardcoded-tablesBuild ? true # Hardcode decode tables instead of runtime generation
-, safe-bitstream-readerBuild ? true # Buffer boundary checking in bitreaders
-, memalign-hackBuild ? false # Emulate memalign
+, alsaLib, bzip2, fontconfig, freetype, libiconv, lame, libass, libogg, libtheora
+, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr, x264
+, xvidcore, zlib
+, openglSupport ? false, mesa ? null
+# Build options
+, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
 , multithreadBuild ? true # Multithreading via pthreads/win32 threads
-, networkBuild ? true # Network support
-, pixelutilsBuild ? true # Pixel utils in libavutil
-/*
- *  Program options
- */
-, ffmpegProgram ? true # Build ffmpeg executable
-, ffplayProgram ? true # Build ffplay executable
-, ffprobeProgram ? true # Build ffprobe executable
-, ffserverProgram ? true # Build ffserver executable
-, qt-faststartProgram ? true # Build qt-faststart executable
-/*
- *  Library options
- */
-, avcodecLibrary ? true # Build avcodec library
-, avdeviceLibrary ? true # Build avdevice library
-, avfilterLibrary ? true # Build avfilter library
-, avformatLibrary ? true # Build avformat library
-, avresampleLibrary ? true # Build avresample library
-, avutilLibrary ? true # Build avutil library
-, postprocLibrary ? true # Build postproc library
-, swresampleLibrary ? true # Build swresample library
-, swscaleLibrary ? true # Build swscale library
-/*
- *  Documentation options
- */
-, htmlpagesDocumentation ? false # HTML documentation pages
-, manpagesDocumentation ? true # Man documentation pages
-, podpagesDocumentation ? false # POD documentation pages
-, txtpagesDocumentation ? false # Text documentation pages
-/*
- *  External libraries options
- */
-#, aacplusExtlib ? false, aacplus ? null # AAC+ encoder
-, alsaLib ? null # Alsa in/output support
-#, avisynth ? null # Support for reading AviSynth scripts
-, bzip2 ? null
-, celt ? null # CELT decoder
-#, crystalhd ? null # Broadcom CrystalHD hardware acceleration
-#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support
-, faacExtlib ? false, faac ? null # AAC encoder
-, faad2Extlib ? false, faad2 ? null # AAC decoder - DEPRECATED
-, fdk-aacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder
-#, flite ? null # Flite (voice synthesis) support
-, fontconfig ? null # Needed for drawtext filter
-, freetype ? null # Needed for drawtext filter
-, frei0r ? null # frei0r video filtering
-, fribidi ? null # Needed for drawtext filter
-#, game-music-emu ? null # Game Music Emulator
-, gnutls ? null
-#, gsm ? null # GSM de/encoder
-#, ilbc ? null # iLBC de/encoder
-#, jack2 ? null # Jack audio (only version 2 is supported in this build)
-, ladspaH ? null # LADSPA audio filtering
-, lame ? null # LAME MP3 encoder
-, libass ? null # (Advanced) SubStation Alpha subtitle rendering
-, libbluray ? null # BluRay reading
-, libbs2b ? null # bs2b DSP library
-#, libcaca ? null # Textual display (ASCII art)
-#, libcdio-paranoia ? null # Audio CD grabbing
-, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394)
-, libiconv ? null
-#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394)
-#, libmfx ? null # Hardware acceleration vis libmfx
-, libmodplug ? null # ModPlug support
-#, libnut ? null # NUT (de)muxer, native (de)muser exists
-, libogg ? null # Ogg container used by vorbis & theora
-, libopus ? null # Opus de/encoder
-, libsndio ? null # sndio playback/record support
-, libssh ? null # SFTP protocol
-, libtheora ? null # Theora encoder
-, libva ? null # Vaapi hardware acceleration
-, libvdpau ? null # Vdpau hardware acceleration
-, libvorbis ? null # Vorbis de/encoding, native encoder exists
-, libvpx ? null # VP8 & VP9 de/encoding
-, libwebp ? null # WebP encoder
-, libX11 ? null # Xlib support
-, libxcb ? null # X11 grabbing using XCB
-, libxcb-shmExtlib ? true # X11 grabbing shm communication
-, libxcb-xfixesExtlib ? true # X11 grabbing mouse rendering
-, libxcb-shapeExtlib ? true # X11 grabbing shape rendering
-, libXv ? null # Xlib support
-, lzma ? null # xz-utils
-#, nvenc ? null # NVIDIA NVENC support
-#, openal ? null # OpenAL 1.1 capture support
-#, opencl ? null # OpenCL code
-#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
-#, opencv ? null # Video filtering
-, openglExtlib ? false, mesa ? null # OpenGL rendering
-#, openh264 ? null # H.264/AVC encoder
-, openjpeg_1 ? null # JPEG 2000 de/encoder
-, opensslExtlib ? false, openssl ? null
-, pulseaudio ? null # Pulseaudio input support
-, rtmpdump ? null # RTMP[E] support
-#, libquvi ? null # Quvi input support
-, sambaExtlib ? false, samba ? null # Samba protocol
-#, schroedinger ? null # Dirac de/encoder
-, SDL ? null
-#, shine ? null # Fixed-point MP3 encoder
-, soxr ? null # Resampling via soxr
-, speex ? null # Speex de/encoder
-#, twolame ? null # MP2 encoder
-#, utvideo ? null # Ut Video de/encoder
-, v4l_utils ? null # Video 4 Linux support
-, vid-stab ? null # Video stabilization
-#, vo-aacenc ? null # AAC encoder
-#, vo-amrwbenc ? null # AMR-WB encoder
-, wavpack ? null # Wavpack encoder
-, x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy)
-, x264 ? null # H.264/AVC encoder
-, x265 ? null # H.265/HEVC encoder
-#, xavs ? null # AVS encoder
-, xvidcore ? null # Xvid encoder, native encoder exists
-#, zeromq4 ? null # Message passing
-, zlib ? null
-#, zvbi ? null # Teletext support
-/*
- *  Developer options
- */
+# Developer options
 , debugDeveloper ? false
 , optimizationsDeveloper ? true
-, extra-warningsDeveloper ? false
-, strippingDeveloper ? false
-/*
- *  Inherit generics
- */
+, extraWarningsDeveloper ? false
+# Inherit generics
 , branch, sha256, version, ...
 }:
 
 /* Maintainer notes:
  *
- * Version bumps:
- * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release)
- * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed
- *   and make the necessary changes.
- *
- * En/disabling in/outdevs was added in 0.6
- *
- * Packages with errors:
- *   flite ilbc schroedinger
- *   opencv - circular dependency issue
- *
- * Not packaged:
- *   aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
- *   libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame
- *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
+ * THIS IS A MINIMAL BUILD OF FFMPEG, do not include dependencies unless
+ * a build that depends on ffmpeg requires them to be compiled into ffmpeg,
+ * see `ffmpeg-full' for an ffmpeg build with all features included.
  *
  * Need fixes to support Darwin:
- *   frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
- *   pulseaudio, rtmpdump, samba, vit-stab, wavpack, x265. xavs
- *
- * Not supported:
- *   stagefright-h264(android only)
+ *   libvpx pulseaudio
  *
  * Known issues:
- * 0.5     - libgsm: configure fails to find library (fix: disable for 0.5)
- * 0.5-0.8 - qt-quickstart: make error (fix: disable for 0.5-0.8)
- * 0.6     - fails to compile (unresolved) (so far, only disabling a number of features
- *           works, but that is not a feasible solution)
+ * 0.6     - fails to compile (unresolved) (so far, only disabling a number of
+ *           features works, but that is not a feasible solution)
  * 0.6.90  - mmx: compile errors (fix: disable for 0.6.90-rc0)
- * 0.7-1.1 - opencv: compile error, flag added in 0.7 (fix: disable for 0.7-1.1)
  * 1.1     - libsoxr: compile error (fix: disable for 1.1)
- *           Support was initially added in 1.1 before soxr api change, fix would probably be to add soxr-1.0
- * 2.0-2.1 - vid-stab: compile errors, flag added in 2.0 (fix: disable for 2.0-2.1)
- *           Recent changes (circa 2014) more than likely broke compatibility and a fix has not been back ported
- * ALL     - flite: configure fails to find library (tested against 1.4 & 1.9 & 2.0)
- *           Tried modifying configure and flite to use pkg-config
+ *           Support was initially added in 1.1 before soxr api change, fix
+ *           would probably be to add soxr-1.0
  * ALL     - Cross-compiling will disable features not present on host OS
- *           (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin)
+ *           (e.g. dxva2 support [DirectX] will not be enabled unless natively
+ *           compiled on Cygwin)
  *
  */
 
 let
-  # Minimum/maximun/matching version
+  inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux;
+  inherit (stdenv.lib) optional optionals enableFeature;
+
   cmpVer = builtins.compareVersions;
   reqMin = requiredVersion: (cmpVer requiredVersion branch != 1);
-  reqMax = requiredVersion: (cmpVer branch requiredVersion != 1);
   reqMatch = requiredVersion: (cmpVer requiredVersion branch == 0);
 
-  # Configure flag
-  mkFlag = optSet: minVer: flag: if reqMin minVer then (
-                                   if optSet then "--enable-${flag}" else "--disable-${flag}")
-                                 else null;
-  # Deprecated configure flag (e.g. faad2)
-  depFlag = optSet: minVer: maxVer: flag: if reqMin minVer && reqMax maxVer then mkFlag optSet minVer flag else null;
+  ifMinVer = minVer: flag: if reqMin minVer then flag else null;
 
   # Version specific fix
   verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix;
 
-  # Flag change between versions (e.g. "--enable-armvfp" -> "--enable-vfp" changed in v1.1)
-  chgFlg = chgVer: oldFlag: newFlag: if reqMin chgVer then newFlag else oldFlag;
-
   # Disable dependency that needs fixes before it will work on Darwin
-  disDarwinFix = origArg: if stdenv.isDarwin then false else origArg;
-
-  isCygwin = stdenv.isCygwin;
-  isDarwin = stdenv.isDarwin;
-  isLinux = stdenv.isLinux;
+  disDarwinFix = origArg: minVer: fixArg: if (isDarwin && reqMin minVer) then fixArg else origArg;
 in
 
-/*
- *  Licensing dependencies
- */
-assert version3Licensing && reqMin "0.5" -> gplLicensing;
-assert nonfreeLicensing && reqMin "0.5" -> gplLicensing && version3Licensing;
-/*
- *  Build dependencies
- */
-assert networkBuild -> gnutls != null || opensslExtlib;
-assert pixelutilsBuild -> avutilLibrary;
-/*
- *  Program dependencies
- */
-assert ffmpegProgram && reqMin "0.5" -> avcodecLibrary
-                                     && avfilterLibrary
-                                     && avformatLibrary
-                                     && swresampleLibrary;
-assert ffplayProgram && reqMin "0.5" -> avcodecLibrary
-                                     && avformatLibrary
-                                     && swscaleLibrary
-                                     && swresampleLibrary
-                                     && SDL != null;
-assert ffprobeProgram && reqMin "0.6" -> avcodecLibrary && avformatLibrary;
-assert ffserverProgram && reqMin "0.5" -> avformatLibrary;
-/*
- *  Library dependencies
- */
-assert avcodecLibrary && reqMin "0.6" -> avutilLibrary; # configure flag since 0.6
-assert avdeviceLibrary && reqMin "0.6" -> avformatLibrary
-                                       && avcodecLibrary
-                                       && avutilLibrary; # configure flag since 0.6
-assert avformatLibrary && reqMin "0.6" -> avcodecLibrary && avutilLibrary; # configure flag since 0.6
-assert avresampleLibrary && reqMin "0.11" -> avutilLibrary;
-assert postprocLibrary && reqMin "0.5" -> avutilLibrary;
-assert swresampleLibrary && reqMin "0.9" -> soxr != null;
-assert swscaleLibrary && reqMin "0.5" -> avutilLibrary;
-/*
- *  External libraries
- */
-#assert aacplusExtlib && reqMin "0.7" -> nonfreeLicensing;
-#assert decklinkExtlib && reqMin "2.2" -> blackmagic-design-desktop-video != null
-#                                       && !isCygwin && multithreadBuild # POSIX threads required
-#                                       && nonfreeLicensing;
-assert faacExtlib && reqMin "0.5" -> faac != null && nonfreeLicensing;
-assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && nonfreeLicensing;
-assert gnutls != null && reqMin "0.9" -> !opensslExtlib;
-assert libxcb-shmExtlib && reqMin "2.5" -> libxcb != null;
-assert libxcb-xfixesExtlib && reqMin "2.5" -> libxcb != null;
-assert libxcb-shapeExtlib && reqMin "2.5" -> libxcb != null;
-assert openglExtlib && reqMin "2.2" -> mesa != null;
-assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && nonfreeLicensing;
-assert sambaExtlib && reqMin "2.3" -> samba != null && !isDarwin;
-assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null;
+assert openglSupport -> mesa != null;
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "ffmpeg-${version}";
@@ -284,186 +68,78 @@ stdenv.mkDerivation rec {
   patchPhase = ''patchShebangs .'';
 
   configureFlags = [
-    /*
-     *  Licensing flags
-     */
-    (mkFlag gplLicensing "0.5" "gpl")
-    (mkFlag version3Licensing "0.5" "version3")
-    (mkFlag nonfreeLicensing "0.5" "nonfree")
-    /*
-     *  Build flags
-     */
-    # On some ARM platforms --enable-thumb
-    "--enable-shared --disable-static"
-    (mkFlag true "0.6" "pic")
-    (if (stdenv.cc.cc.isClang or false) then "--cc=clang" else null)
-    (mkFlag smallBuild "0.5" "small")
-    (mkFlag runtime-cpudetectBuild "0.5" "runtime-cpudetect")
-    (mkFlag grayBuild "0.5" "gray")
-    (mkFlag swscale-alphaBuild "0.6" "swscale-alpha")
-    (mkFlag incompatible-libav-abiBuild "2.0" "incompatible-libav-abi")
-    (mkFlag hardcoded-tablesBuild "0.5" "hardcoded-tables")
-    (mkFlag safe-bitstream-readerBuild "0.9" "safe-bitstream-reader")
-    (mkFlag memalign-hackBuild "0.5" "memalign-hack")
-    (if reqMin "0.5" then (
-       if multithreadBuild then (
-         if isCygwin then
+    # License
+      "--enable-gpl"
+      "--enable-version3"
+    # Build flags
+      "--enable-shared"
+      "--disable-static"
+      (ifMinVer "0.6" "--enable-pic")
+      (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
+      "--enable-hardcoded-tables"
+      (if multithreadBuild then (
+         if stdenv.isCygwin then
            "--disable-pthreads --enable-w32threads"
          else # Use POSIX threads by default
            "--enable-pthreads --disable-w32threads")
        else
          "--disable-pthreads --disable-w32threads")
-     else null)
-    (if reqMin "0.9" then "--disable-os2threads" else null) # We don't support OS/2
-    (mkFlag networkBuild "0.5" "network")
-    (mkFlag pixelutilsBuild "2.4" "pixelutils")
-    /*
-     *  Program flags
-     */
-    (mkFlag ffmpegProgram "0.5" "ffmpeg")
-    (mkFlag ffplayProgram "0.5" "ffplay")
-    (mkFlag ffprobeProgram "0.6" "ffprobe")
-    (mkFlag ffserverProgram "0.5" "ffserver")
-    /*
-     *  Library flags
-     */
-    (mkFlag avcodecLibrary "0.6" "avcodec")
-    (mkFlag avdeviceLibrary "0.6" "avdevice")
-    (mkFlag avfilterLibrary "0.5" "avfilter")
-    (mkFlag avformatLibrary "0.6" "avformat")
-    (mkFlag avresampleLibrary "1.0" "avresample")
-    (mkFlag avutilLibrary "1.1" "avutil")
-    (mkFlag (postprocLibrary && gplLicensing) "0.5" "postproc")
-    (mkFlag swresampleLibrary "0.9" "swresample")
-    (mkFlag swscaleLibrary "0.5" "swscale")
-    /*
-     *  Documentation flags
-     */
-    (mkFlag (htmlpagesDocumentation
-          || manpagesDocumentation
-          || podpagesDocumentation
-          || txtpagesDocumentation) "0.6" "doc")
-    (mkFlag htmlpagesDocumentation "1.0" "htmlpages")
-    (mkFlag manpagesDocumentation "1.0" "manpages")
-    (mkFlag podpagesDocumentation "1.0" "podpages")
-    (mkFlag txtpagesDocumentation "1.0" "txtpages")
-    /*
-     *  External libraries
-     */
-    #(mkFlag aacplus      "0.7" "libaacplus")
-    #(mkFlag avisynth     "0.5" "avisynth")
-    (mkFlag (bzip2 != null) "0.5" "bzlib")
-    (mkFlag (celt != null) "0.8" "libcelt")
-    #crystalhd
-    #(mkFlag decklinkExtlib "2.2" "decklink")
-    (mkFlag faacExtlib "0.5" "libfaac")
-    (depFlag faad2Extlib "0.5" "0.6" "libfaad")
-    (mkFlag (fdk-aacExtlib && gplLicensing) "1.0" "libfdk-aac")
-    #(mkFlag (flite != null) "1.0" "libflite")
-    (if reqMin "1.0" then # Force disable until a solution is found
-      "--disable-libflite"
-     else null)
-    (mkFlag (fontconfig != null) "1.0" "fontconfig")
-    (mkFlag (freetype != null) "0.7" "libfreetype")
-    (mkFlag (disDarwinFix (frei0r != null && gplLicensing)) "0.7" "frei0r")
-    (mkFlag (fribidi != null) "2.3" "libfribidi")
-    #(mkFlag (disDarwinFix (game-music-emu != null)) "2.2" "libgme")
-    (mkFlag (gnutls != null) "0.9" "gnutls")
-    #(verFix (mkFlag (disDarwinFix (gsm != null)) "0.5" "libgsm") "0.5" "--disable-libgsm")
-    #(mkFlag (ilbc != null) "1.0" "libilbc")
-    (mkFlag (ladspaH !=null) "2.1" "ladspa")
-    (mkFlag (lame != null) "0.5" "libmp3lame")
-    (mkFlag (libass != null) "0.9" "libass")
-    #(mkFlag (libavc1394 != null) null null)
-    (mkFlag (libbluray != null) "1.0" "libbluray")
-    (mkFlag (libbs2b != null) "2.3" "libbs2b")
-    #(mkFlag (libcaca != null) "1.0" "libcaca")
-    #(mkFlag (cdio-paranoia != null && gplLicensing) "0.9" "libcdio")
-    (mkFlag (if !isLinux then false else libdc1394 != null && libraw1394 != null && isLinux) "0.5" "libdc1394")
-    (mkFlag (libiconv != null) "1.2" "iconv")
-    #(mkFlag (if !isLinux then false else libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883")
-    #(mkFlag (libmfx != null) "2.6" "libmfx")
-    (mkFlag (disDarwinFix (libmodplug != null)) "0.9" "libmodplug")
-    #(mkFlag (libnut != null) "0.5" "libnut")
-    (mkFlag (libopus != null) "1.0" "libopus")
-    (mkFlag (disDarwinFix (libssh != null)) "2.1" "libssh")
-    (mkFlag (libtheora != null) "0.5" "libtheora")
-    (mkFlag (if isDarwin then false else libva != null) "0.6" "vaapi")
-    (mkFlag (libvdpau != null) "0.5" "vdpau")
-    (mkFlag (libvorbis != null) "0.5" "libvorbis")
-    (mkFlag (disDarwinFix (libvpx != null)) "0.6" "libvpx")
-    (mkFlag (libwebp != null) "2.2" "libwebp")
-    (mkFlag (libX11 != null && libXv != null) "2.3" "xlib")
-    (mkFlag (libxcb != null) "2.5" "libxcb")
-    (mkFlag libxcb-shmExtlib "2.5" "libxcb-shm")
-    (mkFlag libxcb-xfixesExtlib "2.5" "libxcb-xfixes")
-    (mkFlag libxcb-shapeExtlib "2.5" "libxcb-shape")
-    (mkFlag (lzma != null) "2.4" "lzma")
-    #(mkFlag nvenc        "2.6" "nvenc")
-    #(mkFlag (disDarwinFix (openal != null)) "0.9" "openal")
-    #(mkFlag opencl       "2.2" "opencl")
-    #(mkFlag (opencore-amr != null && version3Licensing) "0.5" "libopencore-amrnb")
-    #(mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7
-    (mkFlag openglExtlib "2.2" "opengl")
-    #(mkFlag (openh264 != null) "2.6" "openh264")
-    (mkFlag (disDarwinFix (openjpeg_1 != null)) "0.5" "libopenjpeg")
-    (mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl")
-    (mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse")
-    #(mkFlag quvi         "2.0" "libquvi")
-    (mkFlag (disDarwinFix (rtmpdump != null)) "0.6" "librtmp")
-    #(mkFlag (schroedinger != null) "0.5" "libschroedinger")
-    #(mkFlag (shine != null) "2.0" "libshine")
-    (mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient")
-    (mkFlag (SDL != null) "2.5" "sdl") # Only configurable since 2.5, auto detected before then
-    (mkFlag (soxr != null) "1.2" "libsoxr")
-    (mkFlag (speex != null) "0.5" "libspeex")
-    #(mkFlag (twolame != null) "1.0" "libtwolame")
-    #(mkFlag (utvideo != null && gplLicensing) "0.9" "libutvideo")
-    #(mkFlag (if !isLinux then false else v4l_utils != null && isLinux) "0.9" "libv4l2")
-    (mkFlag (disDarwinFix (vid-stab != null && gplLicensing)) "2.2" "libvidstab") # Actual min. version 2.0
-    #(mkFlag (vo-aacenc != null && version3Licensing) "0.6" "libvo-aacenc")
-    #(mkFlag (vo-amrwbenc != null && version3Licensing) "0.7" "libvo-amrwbenc")
-    (mkFlag (disDarwinFix (wavpack != null)) "2.0" "libwavpack")
-    (mkFlag (x11grabExtlib && gplLicensing) "0.5" "x11grab")
-    (mkFlag (x264 != null && gplLicensing) "0.5" "libx264")
-    (mkFlag (disDarwinFix (x265 != null && gplLicensing)) "2.2" "libx265")
-    #(mkFlag (disDarwinFix (xavs != null && gplLicensing)) "0.7" "libxavs")
-    (mkFlag (xvidcore != null && gplLicensing) "0.5" "libxvid")
-    #(mkFlag (zeromq4 != null) "2.0" "libzmq")
-    (mkFlag (zlib != null) "0.5" "zlib")
-    #(mkFlag (zvbi != null && gplLicensing) "2.1" "libzvbi")
-    /*
-     * Developer flags
-     */
-    (mkFlag debugDeveloper "0.5" "debug")
-    (mkFlag optimizationsDeveloper "0.5" "optimizations")
-    (mkFlag extra-warningsDeveloper "0.5" "extra-warnings")
-    (mkFlag strippingDeveloper "0.5" "stripping")
-    
+      (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2
+      (ifMinVer "2.4" "--enable-pixelutils")
+    # Executables
+      "--enable-ffmpeg"
+      "--disable-ffplay"
+      (ifMinVer "0.6" "--enable-ffprobe")
+      "--disable-ffserver"
+    # Libraries
+      (ifMinVer "0.6" "--enable-avcodec")
+      (ifMinVer "0.6" "--enable-avdevice")
+      "--enable-avfilter"
+      (ifMinVer "0.6" "--enable-avformat")
+      (ifMinVer "1.0" "--enable-avresample")
+      (ifMinVer "1.1" "--enable-avutil")
+      "--enable-postproc"
+      (ifMinVer "0.9" "--enable-swresample")
+      "--enable-swscale"
+    # Docs
+      (ifMinVer "0.6" "--disable-doc")
+    # External Libraries
+      "--enable-bzlib"
+      (ifMinVer "1.0" "--enable-fontconfig")
+      (ifMinVer "0.7" "--enable-libfreetype")
+      "--enable-libmp3lame"
+      (ifMinVer "1.2" "--enable-iconv")
+      "--enable-libtheora"
+      (ifMinVer "0.6" (enableFeature (isLinux || isFreeBSD) "vaapi"))
+      "--enable-vdpau"
+      "--enable-libvorbis"
+      (disDarwinFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx")
+      (ifMinVer "2.4" "--enable-lzma")
+      (ifMinVer "2.2" (enableFeature openglSupport "opengl"))
+      (disDarwinFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse")
+      (ifMinVer "2.5" "--enable-sdl") # Only configurable since 2.5, auto detected before then
+      (ifMinVer "1.2" "--enable-libsoxr")
+      "--enable-libx264"
+      "--enable-libxvid"
+      "--enable-zlib"
+    # Developer flags
+      (enableFeature debugDeveloper "debug")
+      (enableFeature optimizationsDeveloper "optimizations")
+      (enableFeature extraWarningsDeveloper "extra-warnings")
+      "--disable-stripping"
     # Disable mmx support for 0.6.90
-    (verFix null "0.6.90" "--disable-mmx")
-  ];
+      (verFix null "0.6.90" "--disable-mmx")
+  ] ++ optional (stdenv.cc.cc.isClang or false) "--cc=clang";
 
   nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
 
   buildInputs = [
-    bzip2 celt fontconfig freetype fribidi gnutls ladspaH lame libass libbluray
-    libbs2b /* libcaca */ libdc1394 libogg libopus libtheora libvdpau libvorbis
-    libwebp libX11 libxcb libXext libXfixes libXv lzma SDL soxr speex x264
-    xvidcore /* zeromq4 */ zlib
-  ] ++ optional (disDarwinFix sambaExtlib) samba
-    ++ optional openglExtlib mesa
-    ++ optionals x11grabExtlib [ libXext libXfixes ]
-    ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ]
-    ++ optionals (!isDarwin) [
-      frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */
-      openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 /* xavs */
-  ] ++ optional (!isDarwin && !isCygwin) libva
-    ++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ];
-
-  # Build qt-faststart executable
-  buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart'';
-  postInstall = optional (qt-faststartProgram && (reqMin "0.9")) ''cp -a tools/qt-faststart $out/bin/'';
+    bzip2 fontconfig freetype libiconv lame libass libogg libtheora libvdpau
+    libvorbis lzma SDL soxr x264 xvidcore zlib
+  ] ++ optional openglSupport mesa
+    ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin
+    ++ optional (isLinux || isFreeBSD) libva
+    ++ optional isLinux alsaLib;
 
   enableParallelBuilding = true;
 
@@ -496,14 +172,12 @@ stdenv.mkDerivation rec {
     ];
   };
 
-  /* TODO: In the future more FFmpeg optionals should be added so that packages that
-     depend on FFmpeg can check to make sure a required feature is enabled.  Since
-     features are version dependent, versioning needs to be handled as well */
   passthru = {
-    vdpauSupport = libvdpau != null;
+    vaapiSupport = if reqMin "0.6" && (isLinux || isFreeBSD) then true else false;
+    vdpauSupport = true;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     homepage = http://www.ffmpeg.org/;
     longDescription = ''
@@ -513,16 +187,7 @@ stdenv.mkDerivation rec {
       No matter if they were designed by some standards committee, the community or 
       a corporation. 
     '';
-    licenses = (
-      if nonfreeLicensing then
-        licenses.unfreeRedistributable
-      else if version3Licensing then
-        licenses.gpl3
-      else if gplLicensing then
-        licenses.gpl2Plus
-      else
-        licenses.lgpl21Plus
-    );
+    license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = with maintainers; [ codyopel fuuzetsu ];
     inherit branch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93ca7200641c..a8abaaa43b6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1373,9 +1373,7 @@ let
 
   ftop = callPackage ../os-specific/linux/ftop { };
 
-  fuppes = callPackage ../tools/networking/fuppes {
-    ffmpeg = ffmpeg_0_5;
-  };
+  fuppes = callPackage ../tools/networking/fuppes { };
 
   fsfs = callPackage ../tools/filesystems/fsfs { };
 
@@ -5667,19 +5665,35 @@ let
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
-  ffmpeg_0_5 = callPackage ../development/libraries/ffmpeg/0.5.nix { };
   ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { };
   ffmpeg_0_11 = callPackage ../development/libraries/ffmpeg/0.11.nix { };
   ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { };
   ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { };
-  ffmpeg_2_5 = callPackage ../development/libraries/ffmpeg/2.5.nix { };
   ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
   # Aliases
   ffmpeg_0 = ffmpeg_0_11;
   ffmpeg_1 = ffmpeg_1_2;
-  ffmpeg_2 = ffmpeg_2_5;
+  ffmpeg_2 = ffmpeg_2_6;
   ffmpeg = ffmpeg_2;
 
+  ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
+    # The following need to be fixed on Darwin
+    frei0r = if stdenv.isDarwin then null else frei0r;
+    game-music-emu = if stdenv.isDarwin then null else game-music-emu;
+    gsm = if stdenv.isDarwin then null else gsm;
+    jack2 = if stdenv.isDarwin then null else jack2;
+    libmodplug = if stdenv.isDarwin then null else libmodplug;
+    libssh = if stdenv.isDarwin then null else libssh;
+    libvpx = if stdenv.isDarwin then null else libvpx;
+    openal = if stdenv.isDarwin then null else openal;
+    openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1;
+    pulseaudio = if stdenv.isDarwin then null else pulseaudio;
+    samba = if stdenv.isDarwin then null else samba;
+    vid-stab = if stdenv.isDarwin then null else vid-stab;
+    x265 = if stdenv.isDarwin then null else x265;
+    xavs = if stdenv.isDarwin then null else xavs;
+  };
+
   ffms = callPackage ../development/libraries/ffms { };
 
   fftw = callPackage ../development/libraries/fftw { };
@@ -12853,7 +12867,7 @@ let
   ultimatestunts = callPackage ../games/ultimatestunts { };
 
   ultrastardx = callPackage ../games/ultrastardx {
-    ffmpeg = ffmpeg_0_5;
+    ffmpeg = ffmpeg_0_10;
     lua = lua5;
   };
 

From 35fb8d9eb9f2c90df4914c815ed6606c69ad5fa7 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 5 Apr 2015 09:53:54 +0200
Subject: [PATCH 0079/1143] Qt 5.4.1: Make it build. Looks like the original
 version update was incomplete. This sets the right version attribute and
 fixes two patches which no longer apply.

---
 .../qt-5/5.4/0011-dlopen-openssl.patch        | 24 ++++------------
 .../libraries/qt-5/5.4/0012-dlopen-dbus.patch | 28 ++++++-------------
 .../libraries/qt-5/5.4/default.nix            |  2 +-
 3 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch
index d08061dd5dd6..a79f0f363899 100644
--- a/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch
+++ b/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch
@@ -1,17 +1,8 @@
-From 99d458c93698b2d4f16ff164ed54237279ffbb64 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:35:21 -0600
-Subject: [PATCH] dlopen-openssl
-
----
- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
 diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 4e6200f..d9c3e7d 100644
+index c1fea93..bc1c0f0 100644
 --- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
 +++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -585,8 +585,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
+@@ -611,8 +611,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
  #endif
  #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
      // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
@@ -22,10 +13,10 @@ index 4e6200f..d9c3e7d 100644
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
          return pair;
-@@ -597,8 +597,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
- #endif
- 
-     // second attempt: find the development files libssl.so and libcrypto.so
+@@ -629,8 +629,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
+     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
+     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
+     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
 -    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
 -    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
 +    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
@@ -33,6 +24,3 @@ index 4e6200f..d9c3e7d 100644
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.0 and libcrypto.so.0 found
          return pair;
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch
index f32386e114b7..77eb7bc85af5 100644
--- a/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch
+++ b/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch
@@ -1,25 +1,13 @@
-From eec8a79c6cc9e2c65fd43db48ca2347de3ae0c5e Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:38:04 -0600
-Subject: [PATCH] dlopen-dbus
-
----
- qtbase/src/dbus/qdbus_symbols.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp
-index a7a1b67..661baf1 100644
+index 6764309..33f25f9 100644
 --- a/qtbase/src/dbus/qdbus_symbols.cpp
 +++ b/qtbase/src/dbus/qdbus_symbols.cpp
-@@ -93,7 +93,7 @@ bool qdbus_loadLibDBus()
+@@ -88,7 +88,7 @@ bool qdbus_loadLibDBus()
+ #ifdef Q_OS_WIN
+         QLatin1String("dbus-1"),
+ #endif
+-        QLatin1String("libdbus-1")
++        QLatin1String("@dbus_libs@/lib/libdbus-1")
+     };
  
-     static int majorversions[] = { 3, 2, -1 };
      lib->unload();
--    lib->setFileName(QLatin1String("dbus-1"));
-+    lib->setFileName(QLatin1String("@dbus_libs@/lib/libdbus-1"));
-     for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) {
-         lib->setFileNameAndVersion(lib->fileName(), majorversions[i]);
-         if (lib->load() && lib->resolve("dbus_connection_open_private"))
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index 0a460f863af6..ca6491f0c7db 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -30,7 +30,7 @@ let
     importManifest ./manifest.nix { mirror = "http://download.qt.io"; };
   srcs = mapAttrs (name: manifest: manifest.src) manifest;
 
-  version = "5.4.0";
+  version = "5.4.1";
 
   callPackage = newScope (self // { inherit qtSubmodule; });
 

From bd368b75303a4219d854db3e67b6c25ea50cb304 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 5 Apr 2015 09:54:12 +0200
Subject: [PATCH 0080/1143] Plasma 5.2.2: Update source package for muon. The
 original 5.2.2 version has been replaced with 5.2.2-1.

---
 pkgs/desktops/plasma-5.2/manifest.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix
index 3a2dcebbc616..4a0161770c8d 100644
--- a/pkgs/desktops/plasma-5.2/manifest.nix
+++ b/pkgs/desktops/plasma-5.2/manifest.nix
@@ -137,12 +137,12 @@
     };
   }
   {
-    name = stdenv.lib.nameFromURL "muon-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/x1lkv4pra7zd0gxqshvfk7fd6p52phgd-muon-5.2.2.tar.xz";
+    name = stdenv.lib.nameFromURL "muon-5.2.2-1.tar.xz" ".tar";
+    store = "/nix/store/kxgn4px54mw23g6zjafxx091vpx5vvw7-muon-5.2.2-1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/muon-5.2.2.tar.xz";
-      sha256 = "1p4mamqd3xayffm6h40z5k5s24cda92vdagp916wzgzvqq9rxrl2";
-      name = "muon-5.2.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.2.2/muon-5.2.2-1.tar.xz";
+      sha256 = "0nq0wi0fx69mrvc6aah8xvakjwsvx87ykfrarb0pd1cidjz7k698";
+      name = "muon-5.2.2-1.tar.xz";
     };
   }
   {

From 858e3a0abacda2829180af16cb25dce971912ddc Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 5 Apr 2015 10:38:21 +0200
Subject: [PATCH 0081/1143] kf58: don't set obsolete KDE_DEFAULT_HOME This is
 the same as 07774208507ad34ad8b279006c5b7227afd0db95.

---
 pkgs/development/libraries/kde-frameworks-5.8/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.8/default.nix b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
index 03f2ec46e6c8..c050baf33cbc 100644
--- a/pkgs/development/libraries/kde-frameworks-5.8/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
@@ -27,10 +27,7 @@ let
         enableParallelBuilding = drv.enableParallelBuilding or true;
         cmakeFlags =
           (drv.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF"
-            "-DKDE_DEFAULT_HOME=.kde5"
-            "-DKDE4_DEFAULT_HOME=.kde"
-          ]
+          ++ [ "-DBUILD_TESTING=OFF" ]
           ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
 
         meta =

From e8932ddcefb15f1d9b20b9171b2753e1e32ace14 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 5 Apr 2015 14:20:38 +0200
Subject: [PATCH 0082/1143] kf58: use cmake-3.2 This is the same as
 a17535822a68582d04c8b49d1ecf53c4ccaa5b91.

---
 pkgs/development/libraries/kde-frameworks-5.8/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.8/default.nix b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
index c050baf33cbc..6a30fd5d6f18 100644
--- a/pkgs/development/libraries/kde-frameworks-5.8/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
@@ -69,8 +69,9 @@ let
     # packages from the nixpkgs collection
     (with pkgs;
       {
-        inherit cmake epoxy;
         Boost = boost155;
+        cmake = cmake-3_2;
+        inherit epoxy;
         GIF = giflib;
         GLIB2 = glib;
         Gpgme = gpgme;
@@ -102,7 +103,7 @@ let
       extra-cmake-modules = {
         inherit (super.extra-cmake-modules) name src;
 
-        propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ];
+        propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
         cmakeFlags = ["-DBUILD_TESTING=OFF"];
         patches =
           [

From 6e3642b89e0e233f0827df1882fb0730c0442f55 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 5 Apr 2015 09:54:38 +0200
Subject: [PATCH 0083/1143] Plasma 5.2.2: Fix startkde due to qdbus and qtpaths
 moving to qt5.base in Qt5.4.

---
 pkgs/desktops/plasma-5.2/startkde/default.nix |  2 +-
 pkgs/desktops/plasma-5.2/startkde/startkde.in | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/plasma-5.2/startkde/default.nix b/pkgs/desktops/plasma-5.2/startkde/default.nix
index 62f51ec8522e..624c5d239d5d 100644
--- a/pkgs/desktops/plasma-5.2/startkde/default.nix
+++ b/pkgs/desktops/plasma-5.2/startkde/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   inherit bash gnused gnugrep kconfig kinit kservice socat;
   inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-  qt5 = qt5.base;
+  qt5tools = qt5.tools;
   dbus_tools = dbus.tools;
   plasmaWorkspace = plasma-workspace;
   plasmaDesktop = plasma-desktop;
diff --git a/pkgs/desktops/plasma-5.2/startkde/startkde.in b/pkgs/desktops/plasma-5.2/startkde/startkde.in
index 0693f1027817..0825a0733f43 100644
--- a/pkgs/desktops/plasma-5.2/startkde/startkde.in
+++ b/pkgs/desktops/plasma-5.2/startkde/startkde.in
@@ -63,7 +63,7 @@ fi
 # * Then ksmserver is started which takes control of the rest of the startup sequence
 
 # We need to create config folder so we can write startupconfigkeys
-configDir=$(@qt5@/bin/qtpaths --writable-path GenericConfigLocation)
+configDir=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation)
 mkdir -p "$configDir"
 
 # This is basically setting defaults so we can use them with kstartupconfig5
@@ -133,7 +133,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment
 if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
     eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
 fi
-if @qt5@/bin/qdbus >/dev/null 2>/dev/null; then
+if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
     : # ok
 else
     echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
@@ -170,7 +170,7 @@ fi
 # For anything else (that doesn't set env vars, or that needs a window manager),
 # better use the Autostart folder.
 
-scriptpath=$(@qt5@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
+scriptpath=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
 
 # Add /env/ to the directory to locate the scripts to be sourced
 for prefix in `echo $scriptpath`; do
@@ -180,7 +180,7 @@ for prefix in `echo $scriptpath`; do
 done
 
 # Set the path for Qt plugins provided by KDE
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5@/bin/qtpaths --plugin-dir`
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir`
 # TODO: Do we really need this?
 QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
 export QT_PLUGIN_PATH
@@ -336,13 +336,13 @@ if test x"$wait_drkonqi"x = x"true"x ; then
     # wait for remaining drkonqi instances with timeout (in seconds)
     wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
     wait_drkonqi_counter=0
-    while @qt5@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+    while @qt5tools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
         sleep 5
         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
             # ask remaining drkonqis to die in a graceful way
-            @qt5@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
-                @qt5@/bin/qdbus "$address" "/MainApplication" "quit"
+            @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
+                @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit"
             done
             break
         fi

From 7205c4fcf963f540854ef677a5aa4f39f6dc764c Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Tue, 7 Apr 2015 11:42:44 -0700
Subject: [PATCH 0084/1143] gnutar: patch out unsafe gettext calls on darwin

---
 pkgs/tools/archivers/gnutar/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index e34bc2b394f1..8c48417a8191 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./gnutar-1.28-darwin.patch;
+
+  # gnutar tries to call into gettext between `fork` and `exec`,
+  # which is not safe on darwin.
+  # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/system.c --replace '_(' 'N_('
+  '';
+
   buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
 
   # May have some issues with root compilation because the bootstrap tool

From 265ffd8b3494d555473e74a958aa073e50212b0b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Apr 2015 11:26:36 -0700
Subject: [PATCH 0085/1143] kbd: Fix file descriptor issue with the console

---
 pkgs/os-specific/linux/kbd/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index e7b9753c6b7b..fba63daf8e5c 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "kbd-2.0.2";
 
   src = fetchurl {
-    url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz";
-    sha256 = "08f0nc78h6l2z39lr5jddpq7lvm365sc42597nvd6f8hc2bcgr5i";
+    url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
+    sha256 = "04mrms12nm5sas0nxs94yrr3hz7gmqhnmfgb9ff34bh1jszxmzcx";
   };
 
   /* Get the dvorak programmer keymap (present in X but not in kbd) */
@@ -26,7 +26,9 @@ stdenv.mkDerivation rec {
     "--disable-nls"
   ];
 
-  patchPhase =
+  patches = [ ./console-fix.patch ];
+
+  postPatch =
     ''
       mkdir -p data/keymaps/i386/neo
       cat "$neoSrc" > data/keymaps/i386/neo/neo.map

From 487e4b13db79dc8f5dfcdc2bc5a31053f185aa21 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Apr 2015 11:45:16 -0700
Subject: [PATCH 0086/1143] kbd: Fix missing patch

---
 pkgs/os-specific/linux/kbd/console-fix.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kbd/console-fix.patch

diff --git a/pkgs/os-specific/linux/kbd/console-fix.patch b/pkgs/os-specific/linux/kbd/console-fix.patch
new file mode 100644
index 000000000000..aefc20ff9140
--- /dev/null
+++ b/pkgs/os-specific/linux/kbd/console-fix.patch
@@ -0,0 +1,18 @@
+diff --git a/src/loadkeys.c b/src/loadkeys.c
+index 6b23f68..adf65a0 100644
+--- a/src/loadkeys.c
++++ b/src/loadkeys.c
+@@ -166,10 +166,10 @@ main(int argc, char *argv[])
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+-	/* get console */
+-	fd = getfd(console);
+-
+ 	if (!(options & OPT_M) && !(options & OPT_B)) {
++		/* get console */
++		fd = getfd(console);
++
+ 		/* check whether the keyboard is in Unicode mode */
+ 		if (ioctl(fd, KDGKBMODE, &kbd_mode) ||
+ 		    ioctl(fd, KDGETMODE, &kd_mode)) {

From 3935b43992db44f46173cfbf549b9bf8b8dbc0d8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Apr 2015 12:50:36 -0700
Subject: [PATCH 0087/1143] cracklib: 2.9.1 -> 2.9.2

---
 pkgs/development/libraries/cracklib/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index e0c8d443ec80..506bb0d70719 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libintlOrEmpty }:
+{ stdenv, fetchurl, libintlOrEmpty, zlib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "cracklib-2.9.1";
+  name = "cracklib-2.9.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/cracklib/${name}.tar.gz";
-    sha256 = "0mni2sz7350d4acs7gdl8nilfmnb8qhcvmxnpf6dr5wsag10b2a0";
+    sha256 = "1xarjwga2bc4hys4fkspcp1cph699ag8gg6gmv8rjgj43llrkj61";
   };
 
-  buildInputs = libintlOrEmpty;
+  buildInputs = [ libintlOrEmpty zlib gettext ];
 
   meta = with stdenv.lib; {
     homepage    = http://sourceforge.net/projects/cracklib;

From 5872185250eecbbcd457bfac867bd8fd09943bfe Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Apr 2015 12:57:50 -0700
Subject: [PATCH 0088/1143] automake: Bump to 1.15

---
 .../tools/misc/automake/automake-1.15.x.nix   | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/automake/automake-1.15.x.nix

diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
new file mode 100644
index 000000000000..9db2375a5c63
--- /dev/null
+++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
+
+stdenv.mkDerivation rec {
+  name = "automake-1.15";
+
+  src = fetchurl {
+    url = "mirror://gnu/automake/${name}.tar.xz";
+    sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r";
+  };
+
+  buildInputs = [ perl autoconf ];
+
+  setupHook = ./setup-hook.sh;
+
+  # Disable indented log output from Make, otherwise "make.test" will
+  # fail.
+  preCheck = "unset NIX_INDENT_MAKE";
+  inherit doCheck;
+
+  # The test suite can run in parallel.
+  enableParallelBuilding = true;
+
+  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
+
+  meta = {
+    branch = "1.15";
+    homepage = "http://www.gnu.org/software/automake/";
+    description = "GNU standard-compliant makefile generator";
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    longDescription = ''
+      GNU Automake is a tool for automatically generating
+      `Makefile.in' files compliant with the GNU Coding
+      Standards.  Automake requires the use of Autoconf.
+    '';
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8abaaa43b6b..74f5f041e72b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4849,7 +4849,7 @@ let
 
   autocutsel = callPackage ../tools/X11/autocutsel{ };
 
-  automake = automake114x;
+  automake = automake115x;
 
   automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
 
@@ -4861,6 +4861,8 @@ let
 
   automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { };
 
+  automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { };
+
   automoc4 = callPackage ../development/tools/misc/automoc4 { };
 
   avrdude = callPackage ../development/tools/misc/avrdude { };

From 723b60805e587aa51f00199c99efe993905e303c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 8 Apr 2015 11:33:07 +0200
Subject: [PATCH 0089/1143] mpfr: move gmp to propagatedBuildInputs

---
 pkgs/development/libraries/mpfr/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index d24431e59fe6..555351bddc35 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
   };
 
-  buildInputs = [ gmp ];
+  # mpfr.h requires gmp.h
+  propagatedBuildInputs = [ gmp ];
 
   CFLAGS = "-I${gmp}/include";
   LDFLAGS = if stdenv.isDarwin then "-L${gmp}/lib" else null;

From 91221f5941a7a23807eaf90d4c5f35f11521a175 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Apr 2015 12:14:08 -0700
Subject: [PATCH 0090/1143] Revert "binutils: 2.23.1 -> 2.25"

This reverts commit 4adae43646b2e2a7608238b199f280f856f82271.

This breaks the building of samba and likely other binaries as some
libraries are never linked.
---
 .../tools/misc/binutils/default.nix           |    6 +-
 .../misc/binutils/pt-pax-flags-20121023.patch | 1786 +++++++++++++++++
 .../misc/binutils/pt-pax-flags-20141022.patch | 1030 ----------
 3 files changed, 1789 insertions(+), 1033 deletions(-)
 create mode 100644 pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch
 delete mode 100644 pkgs/development/tools/misc/binutils/pt-pax-flags-20141022.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ec16b3181119..f740c60c4877 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -4,7 +4,7 @@
 
 assert !stdenv.isDarwin;
 
-let basename = "binutils-2.25"; in
+let basename = "binutils-2.23.1"; in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "08r9i26b05zcwb9zxb6zllpfdiiicdfsgbpsjlrjmvx3rxjzrpi2";
+    sha256 = "06bs5v5ndb4g5qx96d52lc818gkbskd1m0sz57314v887sqfbcia";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     # Always add PaX flags section to ELF files.
     # This is needed, for instance, so that running "ldd" on a binary that is
     # PaX-marked to disable mprotect doesn't fail with permission denied.
-    ./pt-pax-flags-20141022.patch
+    ./pt-pax-flags-20121023.patch
   ];
 
   nativeBuildInputs = optional gold bison;
diff --git a/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch b/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch
new file mode 100644
index 000000000000..bb0785fe192e
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch
@@ -0,0 +1,1786 @@
+--- binutils-2.23/bfd/elf-bfd.h
++++ binutils-2.23/bfd/elf-bfd.h
+@@ -1577,6 +1577,9 @@ struct elf_obj_tdata
+   /* Segment flags for the PT_GNU_STACK segment.  */
+   unsigned int stack_flags;
+ 
++  /* Segment flags for the PT_PAX_FLAGS segment.  */
++  unsigned int pax_flags;
++
+   /* Symbol version definitions in external objects.  */
+   Elf_Internal_Verdef *verdef;
+ 
+--- binutils-2.23/bfd/elf.c
++++ binutils-2.23/bfd/elf.c
+@@ -1158,6 +1158,7 @@ get_segment_type (unsigned int p_type)
+     case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
+     case PT_GNU_STACK: pt = "STACK"; break;
+     case PT_GNU_RELRO: pt = "RELRO"; break;
++    case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
+     default: pt = NULL; break;
+     }
+   return pt;
+@@ -2477,6 +2478,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index)
+     case PT_GNU_RELRO:
+       return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro");
+ 
++    case PT_PAX_FLAGS:
++      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags");
++
+     default:
+       /* Check for any processor-specific program segment types.  */
+       bed = get_elf_backend_data (abfd);
+@@ -3551,6 +3555,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
+       ++segs;
+     }
+ 
++    {
++      /* We need a PT_PAX_FLAGS segment.  */
++      ++segs;
++    }
++
+   for (s = abfd->sections; s != NULL; s = s->next)
+     {
+       if ((s->flags & SEC_LOAD) != 0
+@@ -4153,6 +4162,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
+ 	    }
+ 	}
+ 
++    {
++      amt = sizeof (struct elf_segment_map);
++      m = bfd_zalloc (abfd, amt);
++      if (m == NULL)
++	goto error_return;
++      m->next = NULL;
++      m->p_type = PT_PAX_FLAGS;
++      m->p_flags = elf_tdata (abfd)->pax_flags;
++      m->p_flags_valid = 1;
++
++      *pm = m;
++      pm = &m->next;
++    }
++
+       free (sections);
+       elf_tdata (abfd)->segment_map = mfirst;
+     }
+@@ -5417,7 +5440,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
+        6. PT_TLS segment includes only SHF_TLS sections.
+        7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
+        8. PT_DYNAMIC should not contain empty sections at the beginning
+-	  (with the possible exception of .dynamic).  */
++	  (with the possible exception of .dynamic).
++       9. PT_PAX_FLAGS segments do not include any sections.  */
+ #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed)		\
+   ((((segment->p_paddr							\
+       ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr)	\
+@@ -5425,6 +5449,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
+      && (section->flags & SEC_ALLOC) != 0)				\
+     || IS_NOTE (segment, section))					\
+    && segment->p_type != PT_GNU_STACK					\
++   && segment->p_type != PT_PAX_FLAGS					\
+    && (segment->p_type != PT_TLS					\
+        || (section->flags & SEC_THREAD_LOCAL))				\
+    && (segment->p_type == PT_LOAD					\
+--- binutils-2.23/bfd/elflink.c
++++ binutils-2.23/bfd/elflink.c
+@@ -5545,16 +5545,30 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
+     return TRUE;
+ 
+   bed = get_elf_backend_data (output_bfd);
++
++  elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
++  if (info->execheap)
++    elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
++  else if (info->noexecheap)
++    elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
++
+   if (info->execstack)
+-    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
++    {
++      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
++      elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
++    }
+   else if (info->noexecstack)
+-    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
++    {
++      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
++      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
++    }
+   else
+     {
+       bfd *inputobj;
+       asection *notesec = NULL;
+       int exec = 0;
+ 
++      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
+       for (inputobj = info->input_bfds;
+ 	   inputobj;
+ 	   inputobj = inputobj->link_next)
+@@ -5567,7 +5581,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
+ 	  if (s)
+ 	    {
+ 	      if (s->flags & SEC_CODE)
+-		exec = PF_X;
++		{
++		  elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
++		  elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
++		  exec = PF_X;
++		}
+ 	      notesec = s;
+ 	    }
+ 	  else if (bed->default_execstack)
+--- binutils-2.23/binutils/readelf.c
++++ binutils-2.23/binutils/readelf.c
+@@ -2740,6 +2740,7 @@ get_segment_type (unsigned long p_type)
+ 			return "GNU_EH_FRAME";
+     case PT_GNU_STACK:	return "GNU_STACK";
+     case PT_GNU_RELRO:  return "GNU_RELRO";
++    case PT_PAX_FLAGS:  return "PAX_FLAGS";
+ 
+     default:
+       if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
+--- binutils-2.23/include/bfdlink.h
++++ binutils-2.23/include/bfdlink.h
+@@ -322,6 +322,14 @@ struct bfd_link_info
+   /* TRUE if PT_GNU_RELRO segment should be created.  */
+   unsigned int relro: 1;
+ 
++  /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
++     flags.  */
++  unsigned int execheap: 1;
++
++  /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
++     flags.  */
++  unsigned int noexecheap: 1;
++
+   /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
+      should be created.  */
+   unsigned int eh_frame_hdr: 1;
+--- binutils-2.23/include/elf/common.h
++++ binutils-2.23/include/elf/common.h
+@@ -429,6 +429,7 @@
+ #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
+ #define PT_GNU_STACK	(PT_LOOS + 0x474e551) /* Stack flags */
+ #define PT_GNU_RELRO	(PT_LOOS + 0x474e552) /* Read-only after relocation */
++#define PT_PAX_FLAGS	(PT_LOOS + 0x5041580) /* PaX flags */
+ 
+ /* Program segment permissions, in program header p_flags field.  */
+ 
+@@ -439,6 +440,21 @@
+ #define PF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
+ #define PF_MASKPROC	0xF0000000	/* Processor-specific reserved bits */
+ 
++/* Flags to control PaX behavior.  */
++
++#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
++#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
++#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
++#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
++#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
++#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
++#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
++#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
++#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
++#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
++#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
++#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
++
+ /* Values for section header, sh_type field.  */
+ 
+ #define SHT_NULL	0		/* Section header table entry unused */
+--- binutils-2.23/ld/emultempl/elf32.em
++++ binutils-2.23/ld/emultempl/elf32.em
+@@ -2285,6 +2285,16 @@ fragment <<EOF
+ 	  link_info.noexecstack = TRUE;
+ 	  link_info.execstack = FALSE;
+ 	}
++      else if (strcmp (optarg, "execheap") == 0)
++	{
++	  link_info.execheap = TRUE;
++	  link_info.noexecheap = FALSE;
++	}
++      else if (strcmp (optarg, "noexecheap") == 0)
++	{
++	  link_info.noexecheap = TRUE;
++	  link_info.execheap = FALSE;
++	}
+ EOF
+ if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
+ fragment <<EOF
+@@ -2368,6 +2378,8 @@ fragment <<EOF
+   -z defs                     Report unresolved symbols in object files.\n"));
+   fprintf (file, _("\
+   -z execstack                Mark executable as requiring executable stack\n"));
++  fprintf (file, _("\
++  -z execheap                 Mark executable as requiring executable heap\n"));
+ EOF
+ 
+ if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
+@@ -2391,6 +2403,8 @@ fragment <<EOF
+ fragment <<EOF
+   fprintf (file, _("\
+   -z noexecstack              Mark executable as not requiring executable stack\n"));
++  fprintf (file, _("\
++  -z noexecheap               Mark executable as not requiring executable heap\n"));
+ EOF
+ if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
+ fragment <<EOF
+--- binutils-2.23/ld/ldgram.y
++++ binutils-2.23/ld/ldgram.y
+@@ -1119,6 +1119,8 @@ phdr_type:
+ 			    $$ = exp_intop (0x6474e550);
+ 			  else if (strcmp (s, "PT_GNU_STACK") == 0)
+ 			    $$ = exp_intop (0x6474e551);
++			  else if (strcmp (s, "PT_PAX_FLAGS") == 0)
++			    $$ = exp_intop (0x65041580);
+ 			  else
+ 			    {
+ 			      einfo (_("\
+--- binutils-2.23/ld/testsuite/ld-alpha/tlsbin.rd
++++ binutils-2.23/ld/testsuite/ld-alpha/tlsbin.rd
+@@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+-  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8
++  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+188 R E 0x8
+   INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
+ .*Requesting program interpreter.*
+   LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
+   LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+   DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
+   TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries:
+--- binutils-2.23/ld/testsuite/ld-alpha/tlsbinr.rd
++++ binutils-2.23/ld/testsuite/ld-alpha/tlsbinr.rd
+@@ -42,6 +42,7 @@ Program Headers:
+  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+  +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries:
+--- binutils-2.23/ld/testsuite/ld-alpha/tlspic.rd
++++ binutils-2.23/ld/testsuite/ld-alpha/tlspic.rd
+@@ -38,6 +38,7 @@ Program Headers:
+  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+  +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
+  +TLS +0x0+10e0 0x0+110e0 0x0+110e0 0x0+60 0x0+80 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries:
+--- binutils-2.23/ld/testsuite/ld-elf/eh1.d
++++ binutils-2.23/ld/testsuite/ld-elf/eh1.d
+@@ -22,11 +22,11 @@ Contents of the .eh_frame section:
+   DW_CFA_nop
+   DW_CFA_nop
+ 
+-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
+-  DW_CFA_advance_loc: 0 to 00400078
++00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1
++  DW_CFA_advance_loc: 0 to [0-9a-f]+
+   DW_CFA_def_cfa_offset: 16
+   DW_CFA_offset: r6 \(rbp\) at cfa-16
+-  DW_CFA_advance_loc: 0 to 00400078
++  DW_CFA_advance_loc: 0 to [0-9a-f]+
+   DW_CFA_def_cfa_register: r6 \(rbp\)
+ 
+ 00000038 ZERO terminator
+--- binutils-2.23/ld/testsuite/ld-elf/eh2.d
++++ binutils-2.23/ld/testsuite/ld-elf/eh2.d
+@@ -22,11 +22,11 @@ Contents of the .eh_frame section:
+   DW_CFA_nop
+   DW_CFA_nop
+ 
+-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
+-  DW_CFA_advance_loc: 0 to 00400078
++00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1
++  DW_CFA_advance_loc: 0 to [0-9a-f]+
+   DW_CFA_def_cfa_offset: 16
+   DW_CFA_offset: r6 \(rbp\) at cfa-16
+-  DW_CFA_advance_loc: 0 to 00400078
++  DW_CFA_advance_loc: 0 to [0-9a-f]+
+   DW_CFA_def_cfa_register: r6 \(rbp\)
+ 
+ 00000038 ZERO terminator
+--- binutils-2.23/ld/testsuite/ld-elf/eh3.d
++++ binutils-2.23/ld/testsuite/ld-elf/eh3.d
+@@ -22,11 +22,11 @@ Contents of the .eh_frame section:
+   DW_CFA_nop
+   DW_CFA_nop
+ 
+-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
+-  DW_CFA_advance_loc: 0 to 00400078
++00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1
++  DW_CFA_advance_loc: 0 to [0-9a-f]+
+   DW_CFA_def_cfa_offset: 16
+   DW_CFA_offset: r6 \(rbp\) at cfa-16
+-  DW_CFA_advance_loc: 0 to 00400078
++  DW_CFA_advance_loc: 0 to [0-9a-f]+
+   DW_CFA_def_cfa_register: r6 \(rbp\)
+ 
+ 00000038 ZERO terminator
+--- binutils-2.23/ld/testsuite/ld-elf/orphan-region.d
++++ binutils-2.23/ld/testsuite/ld-elf/orphan-region.d
+@@ -15,7 +15,9 @@
+ Program Headers:
+   Type.*
+   LOAD[ \t]+0x[0-9a-f]+ 0x0*40000000 0x0*40000000 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x[0-9a-f]+
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+   Segment Sections...
+    00     .text .rodata .moredata *
++   01 +
+--- binutils-2.23/ld/testsuite/ld-i386/tlsbin.rd
++++ binutils-2.23/ld/testsuite/ld-i386/tlsbin.rd
+@@ -44,6 +44,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -53,6 +54,7 @@ Program Headers:
+  +03 +.tdata .dynamic .got .got.plt *
+  +04 +.dynamic *
+  +05 +.tdata .tbss *
++ +06 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.23/ld/testsuite/ld-i386/tlsbindesc.rd
++++ binutils-2.23/ld/testsuite/ld-i386/tlsbindesc.rd
+@@ -42,6 +42,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -51,6 +52,7 @@ Program Headers:
+  +03 +.tdata .dynamic .got .got.plt *
+  +04 +.dynamic *
+  +05 +.tdata .tbss *
++ +06 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.23/ld/testsuite/ld-i386/tlsdesc.rd
++++ binutils-2.23/ld/testsuite/ld-i386/tlsdesc.rd
+@@ -39,6 +39,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -46,6 +47,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got .got.plt *
+  +02 +.dynamic *
+  +03 +.tdata .tbss *
++ +04 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.23/ld/testsuite/ld-i386/tlsgdesc.rd
++++ binutils-2.23/ld/testsuite/ld-i386/tlsgdesc.rd
+@@ -36,12 +36,14 @@ Program Headers:
+  +LOAD.*
+  +LOAD.*
+  +DYNAMIC.*
++ +PAX_FLAGS.*
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+  +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text *
+  +01 +.dynamic .got .got.plt *
+  +02 +.dynamic *
++ +03 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.23/ld/testsuite/ld-i386/tlsnopic.rd
++++ binutils-2.23/ld/testsuite/ld-i386/tlsnopic.rd
+@@ -37,6 +37,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -44,6 +45,7 @@ Program Headers:
+  +01 +.dynamic .got .got.plt *
+  +02 +.dynamic *
+  +03 +.tbss *
++ +04 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.23/ld/testsuite/ld-i386/tlspic.rd
++++ binutils-2.23/ld/testsuite/ld-i386/tlspic.rd
+@@ -40,6 +40,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -47,6 +48,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got .got.plt *
+  +02 +.dynamic *
+  +03 +.tdata .tbss *
++ +04 +
+ 
+ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name
+--- binutils-2.23/ld/testsuite/ld-ia64/merge1.d
++++ binutils-2.23/ld/testsuite/ld-ia64/merge1.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+1e0 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 c0 04 00 48 00 	            addl r12=24,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.23/ld/testsuite/ld-ia64/merge2.d
++++ binutils-2.23/ld/testsuite/ld-ia64/merge2.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+1e0 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 c0 04 00 48 00 	            addl r12=24,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.23/ld/testsuite/ld-ia64/merge3.d
++++ binutils-2.23/ld/testsuite/ld-ia64/merge3.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+210 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.23/ld/testsuite/ld-ia64/merge4.d
++++ binutils-2.23/ld/testsuite/ld-ia64/merge4.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+240 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.23/ld/testsuite/ld-ia64/merge5.d
++++ binutils-2.23/ld/testsuite/ld-ia64/merge5.d
+@@ -4,7 +4,7 @@
+ #objdump: -d
+ 
+ #...
+-0+270 <.text>:
++[a-f0-9]+ <.text>:
+ [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
+ [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
+ [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
+--- binutils-2.23/ld/testsuite/ld-ia64/tlsbin.rd
++++ binutils-2.23/ld/testsuite/ld-ia64/tlsbin.rd
+@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+- +PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8
+- +INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
++ +PHDR +0x0+40 0x40+40 0x40+40 (0x[0-9a-f]+) \1 R E 0x8
++ +INTERP +0x0+([0-9a-f]+) (0x40+\1) \2 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
+ .*Requesting program interpreter.*
+  +LOAD +0x0+ 0x40+ 0x40+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ R E 0x10000
+  +LOAD +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
+  +DYNAMIC +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+150 0x0+150 RW +0x8
+  +TLS +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+60 0x0+a0 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  +IA_64_UNWIND .* R +0x8
+ #...
+ 
+--- binutils-2.23/ld/testsuite/ld-ia64/tlspic.rd
++++ binutils-2.23/ld/testsuite/ld-ia64/tlspic.rd
+@@ -40,6 +40,7 @@ Program Headers:
+  +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
+  +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8
+  +TLS +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+60 0x0+80 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8
+ #...
+ 
+--- binutils-2.23/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
++++ binutils-2.23/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
+@@ -8,9 +8,9 @@
+ .*: +file format.*
+ 
+ Disassembly of section \.text:
+-004000b0 <[^>]*> 3c1c0043 	lui	gp,0x43
+-004000b4 <[^>]*> 279c9ff0 	addiu	gp,gp,-24592
+-004000b8 <[^>]*> afbc0008 	sw	gp,8\(sp\)
++004000d0 <[^>]*> 3c1c0043 	lui	gp,0x43
++004000d4 <[^>]*> 279c9ff0 	addiu	gp,gp,-24592
++004000d8 <[^>]*> afbc0008 	sw	gp,8\(sp\)
+ #...
+ 00408d60 <[^>]*> 3c1c0043 	lui	gp,0x43
+ 00408d64 <[^>]*> 279c2c98 	addiu	gp,gp,11416
+--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is DYN \(Shared object file\)
+ Entry point .*
+-There are 5 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -9,6 +9,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.*
+  * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -18,3 +19,4 @@ Program Headers:
+  *0*2 * \.data \.got *
+  *0*3 * \.dynamic *
+  *0*4 *
++ *0*5 *
+--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 *\.got \.data *
+  *0*6 *\.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 * \.got \.data \.bss *
+  *0*6 * \.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 * \.got \.data \.bss *
+  *0*6 * \.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 * \.got \.data \.bss *
+  *0*6 * \.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 7 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -12,6 +12,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -23,3 +24,4 @@ Program Headers:
+  *0*4 * \.got \.data \.bss *
+  *0*5 * \.dynamic *
+  *0*6 *
++ *0*7 *
+--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
+@@ -1,7 +1,7 @@
+ 
+ Elf file type is EXEC \(Executable file\)
+ Entry point 0x44000
+-There are 8 program headers, starting at offset .*
++There are [0-9] program headers, starting at offset .*
+ 
+ Program Headers:
+  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
+@@ -13,6 +13,7 @@ Program Headers:
+  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
+  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+  * NULL * .*
+ 
+  *Section to Segment mapping:
+@@ -25,3 +26,4 @@ Program Headers:
+  *0*5 * \.got \.data \.bss *
+  *0*6 * \.dynamic *
+  *0*7 *
++ *0*8 *
+--- binutils-2.23/ld/testsuite/ld-mips-elf/tlsbin-o32.d
++++ binutils-2.23/ld/testsuite/ld-mips-elf/tlsbin-o32.d
+@@ -2,42 +2,42 @@
+ 
+ Disassembly of section .text:
+ 
+-004000d0 <__start>:
+-  4000d0:	3c1c0fc0 	lui	gp,0xfc0
+-  4000d4:	279c7f30 	addiu	gp,gp,32560
+-  4000d8:	0399e021 	addu	gp,gp,t9
+-  4000dc:	27bdfff0 	addiu	sp,sp,-16
+-  4000e0:	afbe0008 	sw	s8,8\(sp\)
+-  4000e4:	03a0f021 	move	s8,sp
+-  4000e8:	afbc0000 	sw	gp,0\(sp\)
+-  4000ec:	8f998018 	lw	t9,-32744\(gp\)
+-  4000f0:	27848028 	addiu	a0,gp,-32728
+-  4000f4:	0320f809 	jalr	t9
+-  4000f8:	00000000 	nop
+-  4000fc:	8fdc0000 	lw	gp,0\(s8\)
+-  400100:	00000000 	nop
+-  400104:	8f998018 	lw	t9,-32744\(gp\)
+-  400108:	27848020 	addiu	a0,gp,-32736
+-  40010c:	0320f809 	jalr	t9
+-  400110:	00000000 	nop
+-  400114:	8fdc0000 	lw	gp,0\(s8\)
+-  400118:	00401021 	move	v0,v0
+-  40011c:	3c030000 	lui	v1,0x0
+-  400120:	24638000 	addiu	v1,v1,-32768
+-  400124:	00621821 	addu	v1,v1,v0
+-  400128:	7c02283b 	rdhwr	v0,\$5
+-  40012c:	8f83801c 	lw	v1,-32740\(gp\)
+-  400130:	00000000 	nop
+-  400134:	00621821 	addu	v1,v1,v0
+-  400138:	7c02283b 	rdhwr	v0,\$5
+-  40013c:	3c030000 	lui	v1,0x0
+-  400140:	24639004 	addiu	v1,v1,-28668
+-  400144:	00621821 	addu	v1,v1,v0
+-  400148:	03c0e821 	move	sp,s8
+-  40014c:	8fbe0008 	lw	s8,8\(sp\)
+-  400150:	03e00008 	jr	ra
+-  400154:	27bd0010 	addiu	sp,sp,16
++00400[0-9a-f]{3} <__start>:
++  400[0-9a-f]{3}:	3c1c0fc0 	lui	gp,0xfc0
++  400[0-9a-f]{3}:	279c7f30 	addiu	gp,gp,32560
++  400[0-9a-f]{3}:	0399e021 	addu	gp,gp,t9
++  400[0-9a-f]{3}:	27bdfff0 	addiu	sp,sp,-16
++  400[0-9a-f]{3}:	afbe0008 	sw	s8,8\(sp\)
++  400[0-9a-f]{3}:	03a0f021 	move	s8,sp
++  400[0-9a-f]{3}:	afbc0000 	sw	gp,0\(sp\)
++  400[0-9a-f]{3}:	8f998018 	lw	t9,-32744\(gp\)
++  400[0-9a-f]{3}:	27848028 	addiu	a0,gp,-32728
++  400[0-9a-f]{3}:	0320f809 	jalr	t9
++  400[0-9a-f]{3}:	00000000 	nop
++  400[0-9a-f]{3}:	8fdc0000 	lw	gp,0\(s8\)
++  400[0-9a-f]{3}:	00000000 	nop
++  400[0-9a-f]{3}:	8f998018 	lw	t9,-32744\(gp\)
++  400[0-9a-f]{3}:	27848020 	addiu	a0,gp,-32736
++  400[0-9a-f]{3}:	0320f809 	jalr	t9
++  400[0-9a-f]{3}:	00000000 	nop
++  400[0-9a-f]{3}:	8fdc0000 	lw	gp,0\(s8\)
++  400[0-9a-f]{3}:	00401021 	move	v0,v0
++  400[0-9a-f]{3}:	3c030000 	lui	v1,0x0
++  400[0-9a-f]{3}:	24638000 	addiu	v1,v1,-32768
++  400[0-9a-f]{3}:	00621821 	addu	v1,v1,v0
++  400[0-9a-f]{3}:	7c02283b 	rdhwr	v0,\$5
++  400[0-9a-f]{3}:	8f83801c 	lw	v1,-32740\(gp\)
++  400[0-9a-f]{3}:	00000000 	nop
++  400[0-9a-f]{3}:	00621821 	addu	v1,v1,v0
++  400[0-9a-f]{3}:	7c02283b 	rdhwr	v0,\$5
++  400[0-9a-f]{3}:	3c030000 	lui	v1,0x0
++  400[0-9a-f]{3}:	24639004 	addiu	v1,v1,-28668
++  400[0-9a-f]{3}:	00621821 	addu	v1,v1,v0
++  400[0-9a-f]{3}:	03c0e821 	move	sp,s8
++  400[0-9a-f]{3}:	8fbe0008 	lw	s8,8\(sp\)
++  400[0-9a-f]{3}:	03e00008 	jr	ra
++  400[0-9a-f]{3}:	27bd0010 	addiu	sp,sp,16
+ 
+-00400158 <__tls_get_addr>:
+-  400158:	03e00008 	jr	ra
+-  40015c:	00000000 	nop
++00400[0-9a-f]{3} <__tls_get_addr>:
++  400[0-9a-f]{3}:	03e00008 	jr	ra
++  400[0-9a-f]{3}:	00000000 	nop
+--- binutils-2.23/ld/testsuite/ld-powerpc/tls.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tls.d
+@@ -9,45 +9,45 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+100000e8 <_start>:
+-    100000e8:	3c 6d 00 00 	addis   r3,r13,0
+-    100000ec:	60 00 00 00 	nop
+-    100000f0:	38 63 90 78 	addi    r3,r3,-28552
+-    100000f4:	3c 6d 00 00 	addis   r3,r13,0
+-    100000f8:	60 00 00 00 	nop
+-    100000fc:	38 63 10 00 	addi    r3,r3,4096
+-    10000100:	3c 6d 00 00 	addis   r3,r13,0
+-    10000104:	60 00 00 00 	nop
+-    10000108:	38 63 90 40 	addi    r3,r3,-28608
+-    1000010c:	3c 6d 00 00 	addis   r3,r13,0
+-    10000110:	60 00 00 00 	nop
+-    10000114:	38 63 10 00 	addi    r3,r3,4096
+-    10000118:	39 23 80 48 	addi    r9,r3,-32696
+-    1000011c:	3d 23 00 00 	addis   r9,r3,0
+-    10000120:	81 49 80 50 	lwz     r10,-32688\(r9\)
+-    10000124:	e9 22 80 10 	ld      r9,-32752\(r2\)
+-    10000128:	7d 49 18 2a 	ldx     r10,r9,r3
+-    1000012c:	3d 2d 00 00 	addis   r9,r13,0
+-    10000130:	a1 49 90 60 	lhz     r10,-28576\(r9\)
+-    10000134:	89 4d 90 68 	lbz     r10,-28568\(r13\)
+-    10000138:	3d 2d 00 00 	addis   r9,r13,0
+-    1000013c:	99 49 90 70 	stb     r10,-28560\(r9\)
+-    10000140:	3c 6d 00 00 	addis   r3,r13,0
+-    10000144:	60 00 00 00 	nop
+-    10000148:	38 63 90 00 	addi    r3,r3,-28672
+-    1000014c:	3c 6d 00 00 	addis   r3,r13,0
+-    10000150:	60 00 00 00 	nop
+-    10000154:	38 63 10 00 	addi    r3,r3,4096
+-    10000158:	f9 43 80 08 	std     r10,-32760\(r3\)
+-    1000015c:	3d 23 00 00 	addis   r9,r3,0
+-    10000160:	91 49 80 10 	stw     r10,-32752\(r9\)
+-    10000164:	e9 22 80 08 	ld      r9,-32760\(r2\)
+-    10000168:	7d 49 19 2a 	stdx    r10,r9,r3
+-    1000016c:	3d 2d 00 00 	addis   r9,r13,0
+-    10000170:	b1 49 90 60 	sth     r10,-28576\(r9\)
+-    10000174:	e9 4d 90 2a 	lwa     r10,-28632\(r13\)
+-    10000178:	3d 2d 00 00 	addis   r9,r13,0
+-    1000017c:	a9 49 90 30 	lha     r10,-28624\(r9\)
++0+10000[0-9a-f]{3} <_start>:
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 78 	addi    r3,r3,-28552
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 40 	addi    r3,r3,-28608
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
++    10000[0-9a-f]{3}:	39 23 80 48 	addi    r9,r3,-32696
++    10000[0-9a-f]{3}:	3d 23 00 00 	addis   r9,r3,0
++    10000[0-9a-f]{3}:	81 49 80 50 	lwz     r10,-32688\(r9\)
++    10000[0-9a-f]{3}:	e9 22 80 10 	ld      r9,-32752\(r2\)
++    10000[0-9a-f]{3}:	7d 49 18 2a 	ldx     r10,r9,r3
++    10000[0-9a-f]{3}:	3d 2d 00 00 	addis   r9,r13,0
++    10000[0-9a-f]{3}:	a1 49 90 60 	lhz     r10,-28576\(r9\)
++    10000[0-9a-f]{3}:	89 4d 90 68 	lbz     r10,-28568\(r13\)
++    10000[0-9a-f]{3}:	3d 2d 00 00 	addis   r9,r13,0
++    10000[0-9a-f]{3}:	99 49 90 70 	stb     r10,-28560\(r9\)
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 00 	addi    r3,r3,-28672
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
++    10000[0-9a-f]{3}:	f9 43 80 08 	std     r10,-32760\(r3\)
++    10000[0-9a-f]{3}:	3d 23 00 00 	addis   r9,r3,0
++    10000[0-9a-f]{3}:	91 49 80 10 	stw     r10,-32752\(r9\)
++    10000[0-9a-f]{3}:	e9 22 80 08 	ld      r9,-32760\(r2\)
++    10000[0-9a-f]{3}:	7d 49 19 2a 	stdx    r10,r9,r3
++    10000[0-9a-f]{3}:	3d 2d 00 00 	addis   r9,r13,0
++    10000[0-9a-f]{3}:	b1 49 90 60 	sth     r10,-28576\(r9\)
++    10000[0-9a-f]{3}:	e9 4d 90 2a 	lwa     r10,-28632\(r13\)
++    10000[0-9a-f]{3}:	3d 2d 00 00 	addis   r9,r13,0
++    10000[0-9a-f]{3}:	a9 49 90 30 	lha     r10,-28624\(r9\)
+ 
+-0+10000180 <\.__tls_get_addr>:
+-    10000180:	4e 80 00 20 	blr
++0+10000[0-9a-f]{3} <\.__tls_get_addr>:
++    10000[0-9a-f]{3}:	4e 80 00 20 	blr
+--- binutils-2.23/ld/testsuite/ld-powerpc/tls.g
++++ binutils-2.23/ld/testsuite/ld-powerpc/tls.g
+@@ -8,5 +8,5 @@
+ .*: +file format elf64-powerpc
+ 
+ Contents of section \.got:
+- 100101e0 00000000 100181e0 ffffffff ffff8018  .*
+- 100101f0 ffffffff ffff8058                    .*
++ 10010([0-9a-f]{3}) 00000000 10018\1 ffffffff ffff8018  .*
++ 10010[0-9a-f]{3} ffffffff ffff8058                    .*
+--- binutils-2.23/ld/testsuite/ld-powerpc/tls32.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.d
+@@ -9,42 +9,42 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+1800094 <_start>:
+- 1800094:	3c 62 00 00 	addis   r3,r2,0
+- 1800098:	38 63 90 3c 	addi    r3,r3,-28612
+- 180009c:	3c 62 00 00 	addis   r3,r2,0
+- 18000a0:	38 63 10 00 	addi    r3,r3,4096
+- 18000a4:	3c 62 00 00 	addis   r3,r2,0
+- 18000a8:	38 63 90 20 	addi    r3,r3,-28640
+- 18000ac:	3c 62 00 00 	addis   r3,r2,0
+- 18000b0:	38 63 10 00 	addi    r3,r3,4096
+- 18000b4:	39 23 80 24 	addi    r9,r3,-32732
+- 18000b8:	3d 23 00 00 	addis   r9,r3,0
+- 18000bc:	81 49 80 28 	lwz     r10,-32728\(r9\)
+- 18000c0:	3d 22 00 00 	addis   r9,r2,0
+- 18000c4:	a1 49 90 30 	lhz     r10,-28624\(r9\)
+- 18000c8:	89 42 90 34 	lbz     r10,-28620\(r2\)
+- 18000cc:	3d 22 00 00 	addis   r9,r2,0
+- 18000d0:	99 49 90 38 	stb     r10,-28616\(r9\)
+- 18000d4:	3c 62 00 00 	addis   r3,r2,0
+- 18000d8:	38 63 90 00 	addi    r3,r3,-28672
+- 18000dc:	3c 62 00 00 	addis   r3,r2,0
+- 18000e0:	38 63 10 00 	addi    r3,r3,4096
+- 18000e4:	91 43 80 04 	stw     r10,-32764\(r3\)
+- 18000e8:	3d 23 00 00 	addis   r9,r3,0
+- 18000ec:	91 49 80 08 	stw     r10,-32760\(r9\)
+- 18000f0:	3d 22 00 00 	addis   r9,r2,0
+- 18000f4:	b1 49 90 30 	sth     r10,-28624\(r9\)
+- 18000f8:	a1 42 90 14 	lhz     r10,-28652\(r2\)
+- 18000fc:	3d 22 00 00 	addis   r9,r2,0
+- 1800100:	a9 49 90 18 	lha     r10,-28648\(r9\)
++0+1800[0-9a-f]{3} <_start>:
++ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
++ 1800[0-9a-f]{3}:	38 63 90 3c 	addi    r3,r3,-28612
++ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
++ 1800[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
++ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
++ 1800[0-9a-f]{3}:	38 63 90 20 	addi    r3,r3,-28640
++ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
++ 1800[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
++ 1800[0-9a-f]{3}:	39 23 80 24 	addi    r9,r3,-32732
++ 1800[0-9a-f]{3}:	3d 23 00 00 	addis   r9,r3,0
++ 1800[0-9a-f]{3}:	81 49 80 28 	lwz     r10,-32728\(r9\)
++ 1800[0-9a-f]{3}:	3d 22 00 00 	addis   r9,r2,0
++ 1800[0-9a-f]{3}:	a1 49 90 30 	lhz     r10,-28624\(r9\)
++ 1800[0-9a-f]{3}:	89 42 90 34 	lbz     r10,-28620\(r2\)
++ 1800[0-9a-f]{3}:	3d 22 00 00 	addis   r9,r2,0
++ 1800[0-9a-f]{3}:	99 49 90 38 	stb     r10,-28616\(r9\)
++ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
++ 1800[0-9a-f]{3}:	38 63 90 00 	addi    r3,r3,-28672
++ 1800[0-9a-f]{3}:	3c 62 00 00 	addis   r3,r2,0
++ 1800[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
++ 1800[0-9a-f]{3}:	91 43 80 04 	stw     r10,-32764\(r3\)
++ 1800[0-9a-f]{3}:	3d 23 00 00 	addis   r9,r3,0
++ 1800[0-9a-f]{3}:	91 49 80 08 	stw     r10,-32760\(r9\)
++ 1800[0-9a-f]{3}:	3d 22 00 00 	addis   r9,r2,0
++ 1800[0-9a-f]{3}:	b1 49 90 30 	sth     r10,-28624\(r9\)
++ 1800[0-9a-f]{3}:	a1 42 90 14 	lhz     r10,-28652\(r2\)
++ 1800[0-9a-f]{3}:	3d 22 00 00 	addis   r9,r2,0
++ 1800[0-9a-f]{3}:	a9 49 90 18 	lha     r10,-28648\(r9\)
+ 
+-0+1800104 <__tls_get_addr>:
+- 1800104:	4e 80 00 20 	blr
++0+1800[0-9a-f]{3} <__tls_get_addr>:
++ 1800[0-9a-f]{3}:	4e 80 00 20 	blr
+ Disassembly of section \.got:
+ 
+-0+1810128 <_GLOBAL_OFFSET_TABLE_-0x4>:
+- 1810128:	4e 80 00 21 	blrl
++0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_-0x4>:
++ 1810[0-9a-f]{3}:	4e 80 00 21 	blrl
+ 
+-0+181012c <_GLOBAL_OFFSET_TABLE_>:
++0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_>:
+ 	\.\.\.
+--- binutils-2.23/ld/testsuite/ld-powerpc/tls32.g
++++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.g
+@@ -8,4 +8,4 @@
+ .*: +file format elf32-powerpc
+ 
+ Contents of section \.got:
+- 1810128 4e800021 00000000 00000000 00000000  .*
++ 18101[0-9a-f]{2} 4e800021 00000000 00000000 00000000  .*
+--- binutils-2.23/ld/testsuite/ld-powerpc/tls32.t
++++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.t
+@@ -8,5 +8,5 @@
+ .*: +file format elf32-powerpc
+ 
+ Contents of section \.tdata:
+- 1810108 12345678 23456789 3456789a 456789ab  .*
+- 1810118 56789abc 6789abcd 789abcde 00c0ffee  .*
++ 18101[0-9a-f]{2} 12345678 23456789 3456789a 456789ab  .*
++ 18101[0-9a-f]{2} 56789abc 6789abcd 789abcde 00c0ffee  .*
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.d
+@@ -44,4 +44,4 @@ Disassembly of section \.got:
+ .*:	4e 80 00 21 	blrl
+ 
+ .* <_GLOBAL_OFFSET_TABLE_>:
+-.*:	01 81 02 b8 00 00 00 00 00 00 00 00  .*
++.*:	01 81 02 [bd]8 00 00 00 00 00 00 00 00  .*
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.g
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.g
+@@ -8,4 +8,4 @@
+ 
+ Contents of section \.got:
+ .* 00000000 00000000 00000000 4e800021  .*
+-.* 018102b8 00000000 00000000           .*
++.* 018102[bd]8 00000000 00000000           .*
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.r
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.r
+@@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
+- +PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4
+- +INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1
++ +PHDR +0x000034 0x01800034 0x01800034 (0x000[0-9a-f]{2}) \1 R E 0x4
++ +INTERP +0x000([0-9a-f]{3}) 0x01800\1 0x01800\1 0x00011 0x00011 R +0x1
+  +\[Requesting program interpreter: .*\]
+  +LOAD .* R E 0x10000
+  +LOAD .* RWE 0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0001c 0x00038 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -49,6 +50,7 @@ Program Headers:
+  +03 +\.tdata \.dynamic \.got \.plt 
+  +04 +\.dynamic 
+  +05 +\.tdata \.tbss 
++ +06 +
+ 
+ Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
+  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsmark.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsmark.d
+@@ -9,29 +9,29 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+100000e8 <_start>:
+-    100000e8:	48 00 00 18 	b       10000100 <_start\+0x18>
+-    100000ec:	60 00 00 00 	nop
+-    100000f0:	38 63 90 00 	addi    r3,r3,-28672
+-    100000f4:	e8 83 00 00 	ld      r4,0\(r3\)
+-    100000f8:	3c 6d 00 00 	addis   r3,r13,0
+-    100000fc:	48 00 00 0c 	b       10000108 <_start\+0x20>
+-    10000100:	3c 6d 00 00 	addis   r3,r13,0
+-    10000104:	4b ff ff e8 	b       100000ec <_start\+0x4>
+-    10000108:	60 00 00 00 	nop
+-    1000010c:	38 63 10 00 	addi    r3,r3,4096
+-    10000110:	e8 83 80 00 	ld      r4,-32768\(r3\)
+-    10000114:	3c 6d 00 00 	addis   r3,r13,0
+-    10000118:	48 00 00 0c 	b       10000124 <_start\+0x3c>
+-    1000011c:	3c 6d 00 00 	addis   r3,r13,0
+-    10000120:	48 00 00 14 	b       10000134 <_start\+0x4c>
+-    10000124:	60 00 00 00 	nop
+-    10000128:	38 63 90 04 	addi    r3,r3,-28668
+-    1000012c:	e8 a3 00 00 	ld      r5,0\(r3\)
+-    10000130:	4b ff ff ec 	b       1000011c <_start\+0x34>
+-    10000134:	60 00 00 00 	nop
+-    10000138:	38 63 10 00 	addi    r3,r3,4096
+-    1000013c:	e8 a3 80 04 	ld      r5,-32764\(r3\)
++0+10000[0-9a-f]{3} <_start>:
++    10000[0-9a-f]{3}:	48 00 00 18 	b       10000[0-9a-f]{3} <_start\+0x18>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 00 	addi    r3,r3,-28672
++    10000[0-9a-f]{3}:	e8 83 00 00 	ld      r4,0\(r3\)
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	48 00 00 0c 	b       10000[0-9a-f]{3} <_start\+0x20>
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	4b ff ff e8 	b       10000[0-9a-f]{3} <_start\+0x4>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
++    10000[0-9a-f]{3}:	e8 83 80 00 	ld      r4,-32768\(r3\)
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	48 00 00 0c 	b       10000[0-9a-f]{3} <_start\+0x3c>
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	48 00 00 14 	b       10000[0-9a-f]{3} <_start\+0x4c>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 04 	addi    r3,r3,-28668
++    10000[0-9a-f]{3}:	e8 a3 00 00 	ld      r5,0\(r3\)
++    10000[0-9a-f]{3}:	4b ff ff ec 	b       10000[0-9a-f]{3} <_start\+0x34>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 10 00 	addi    r3,r3,4096
++    10000[0-9a-f]{3}:	e8 a3 80 04 	ld      r5,-32764\(r3\)
+ 
+-0+10000140 <\.__tls_get_addr>:
+-    10000140:	4e 80 00 20 	blr
++0+10000[0-9a-f]{3} <\.__tls_get_addr>:
++    10000[0-9a-f]{3}:	4e 80 00 20 	blr
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsmark32.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsmark32.d
+@@ -9,17 +9,17 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+1800094 <_start>:
+- 1800094:	48 00 00 14 	b       18000a8 <_start\+0x14>
+- 1800098:	38 63 90 00 	addi    r3,r3,-28672
+- 180009c:	80 83 00 00 	lwz     r4,0\(r3\)
+- 18000a0:	3c 62 00 00 	addis   r3,r2,0
+- 18000a4:	48 00 00 0c 	b       18000b0 <_start\+0x1c>
+- 18000a8:	3c 62 00 00 	addis   r3,r2,0
+- 18000ac:	4b ff ff ec 	b       1800098 <_start\+0x4>
+- 18000b0:	38 63 10 00 	addi    r3,r3,4096
+- 18000b4:	80 83 80 00 	lwz     r4,-32768\(r3\)
++0+18000[0-9a-f]{2} <_start>:
++ 18000[0-9a-f]{2}:	48 00 00 14 	b       18000[0-9a-f]{2} <_start\+0x14>
++ 18000[0-9a-f]{2}:	38 63 90 00 	addi    r3,r3,-28672
++ 18000[0-9a-f]{2}:	80 83 00 00 	lwz     r4,0\(r3\)
++ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
++ 18000[0-9a-f]{2}:	48 00 00 0c 	b       18000[0-9a-f]{2} <_start\+0x1c>
++ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
++ 18000[0-9a-f]{2}:	4b ff ff ec 	b       18000[0-9a-f]{2} <_start\+0x4>
++ 18000[0-9a-f]{2}:	38 63 10 00 	addi    r3,r3,4096
++ 18000[0-9a-f]{2}:	80 83 80 00 	lwz     r4,-32768\(r3\)
+ 
+-0+18000b8 <__tls_get_addr>:
+- 18000b8:	4e 80 00 20 	blr
+-#pass
+\ No newline at end of file
++0+18000[0-9a-f]{2} <__tls_get_addr>:
++ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
++#pass
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1.d
+@@ -9,17 +9,17 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+100000e8 <\.__tls_get_addr>:
+-    100000e8:	4e 80 00 20 	blr
++0+10000[0-9a-f]{3} <\.__tls_get_addr>:
++    10000[0-9a-f]{3}:	4e 80 00 20 	blr
+ 
+ Disassembly of section \.no_opt1:
+ 
+-0+100000ec <\.no_opt1>:
+-    100000ec:	38 62 80 08 	addi    r3,r2,-32760
+-    100000f0:	2c 24 00 00 	cmpdi   r4,0
+-    100000f4:	41 82 00 10 	beq-    .*
+-    100000f8:	4b ff ff f1 	bl      100000e8 <\.__tls_get_addr>
+-    100000fc:	60 00 00 00 	nop
+-    10000100:	48 00 00 0c 	b       .*
+-    10000104:	4b ff ff e5 	bl      100000e8 <\.__tls_get_addr>
+-    10000108:	60 00 00 00 	nop
++0+10000[0-9a-f]{3} <\.no_opt1>:
++    10000[0-9a-f]{3}:	38 62 80 08 	addi    r3,r2,-32760
++    10000[0-9a-f]{3}:	2c 24 00 00 	cmpdi   r4,0
++    10000[0-9a-f]{3}:	41 82 00 10 	beq-    .*
++    10000[0-9a-f]{3}:	4b ff ff f1 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
++    10000[0-9a-f]{3}:	4b ff ff e5 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1_32.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1_32.d
+@@ -9,16 +9,16 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+1800094 <__tls_get_addr>:
+- 1800094:	4e 80 00 20 	blr
++0+18000[0-9a-f]{2} <__tls_get_addr>:
++ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
+ 
+ Disassembly of section \.no_opt1:
+ 
+-0+1800098 <\.no_opt1>:
+- 1800098:	38 6d ff f4 	addi    r3,r13,-12
+- 180009c:	2c 04 00 00 	cmpwi   r4,0
+- 18000a0:	41 82 00 0c 	beq-    .*
+- 18000a4:	4b ff ff f1 	bl      1800094 <__tls_get_addr>
+- 18000a8:	48 00 00 08 	b       .*
+- 18000ac:	4b ff ff e9 	bl      1800094 <__tls_get_addr>
++0+18000[0-9a-f]{2} <\.no_opt1>:
++ 18000[0-9a-f]{2}:	38 6d ff f4 	addi    r3,r13,-12
++ 18000[0-9a-f]{2}:	2c 04 00 00 	cmpwi   r4,0
++ 18000[0-9a-f]{2}:	41 82 00 0c 	beq-    .*
++ 18000[0-9a-f]{2}:	4b ff ff f1 	bl      18000[0-9a-f]{2} <__tls_get_addr>
++ 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
++ 18000[0-9a-f]{2}:	4b ff ff e9 	bl      18000[0-9a-f]{2} <__tls_get_addr>
+ #pass
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2.d
+@@ -9,15 +9,15 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+100000e8 <\.__tls_get_addr>:
+-    100000e8:	4e 80 00 20 	blr
++0+10000[0-9a-f]{3} <\.__tls_get_addr>:
++    10000[0-9a-f]{3}:	4e 80 00 20 	blr
+ 
+ Disassembly of section \.no_opt2:
+ 
+-0+100000ec <\.no_opt2>:
+-    100000ec:	38 62 80 08 	addi    r3,r2,-32760
+-    100000f0:	2c 24 00 00 	cmpdi   r4,0
+-    100000f4:	41 82 00 08 	beq-    .*
+-    100000f8:	38 62 80 08 	addi    r3,r2,-32760
+-    100000fc:	4b ff ff ed 	bl      100000e8 <\.__tls_get_addr>
+-    10000100:	60 00 00 00 	nop
++0+10000[0-9a-f]{3} <\.no_opt2>:
++    10000[0-9a-f]{3}:	38 62 80 08 	addi    r3,r2,-32760
++    10000[0-9a-f]{3}:	2c 24 00 00 	cmpdi   r4,0
++    10000[0-9a-f]{3}:	41 82 00 08 	beq-    .*
++    10000[0-9a-f]{3}:	38 62 80 08 	addi    r3,r2,-32760
++    10000[0-9a-f]{3}:	4b ff ff ed 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2_32.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2_32.d
+@@ -9,15 +9,15 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+1800094 <__tls_get_addr>:
+- 1800094:	4e 80 00 20 	blr
++0+18000[0-9a-f]{2} <__tls_get_addr>:
++ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
+ 
+ Disassembly of section \.no_opt2:
+ 
+-0+1800098 <\.no_opt2>:
+- 1800098:	38 6d ff f4 	addi    r3,r13,-12
+- 180009c:	2c 04 00 00 	cmpwi   r4,0
+- 18000a0:	41 82 00 08 	beq-    .*
+- 18000a4:	38 6d ff f4 	addi    r3,r13,-12
+- 18000a8:	4b ff ff ed 	bl      1800094 <__tls_get_addr>
++0+18000[0-9a-f]{2} <\.no_opt2>:
++ 18000[0-9a-f]{2}:	38 6d ff f4 	addi    r3,r13,-12
++ 18000[0-9a-f]{2}:	2c 04 00 00 	cmpwi   r4,0
++ 18000[0-9a-f]{2}:	41 82 00 08 	beq-    .*
++ 18000[0-9a-f]{2}:	38 6d ff f4 	addi    r3,r13,-12
++ 18000[0-9a-f]{2}:	4b ff ff ed 	bl      18000[0-9a-f]{2} <__tls_get_addr>
+ #pass
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3.d
+@@ -9,18 +9,18 @@
+ 
+ Disassembly of section \.text:
+ 
+-00000000100000e8 <\.__tls_get_addr>:
+-    100000e8:	4e 80 00 20 	blr
++0000000010000[0-9a-f]{3} <\.__tls_get_addr>:
++    10000[0-9a-f]{3}:	4e 80 00 20 	blr
+ 
+ Disassembly of section \.no_opt3:
+ 
+-00000000100000ec <\.no_opt3>:
+-    100000ec:	38 62 80 08 	addi    r3,r2,-32760
+-    100000f0:	48 00 00 0c 	b       .*
+-    100000f4:	38 62 80 18 	addi    r3,r2,-32744
+-    100000f8:	48 00 00 10 	b       .*
+-    100000fc:	4b ff ff ed 	bl      100000e8 <\.__tls_get_addr>
+-    10000100:	60 00 00 00 	nop
+-    10000104:	48 00 00 0c 	b       .*
+-    10000108:	4b ff ff e1 	bl      100000e8 <\.__tls_get_addr>
+-    1000010c:	60 00 00 00 	nop
++0000000010000[0-9a-f]{3} <\.no_opt3>:
++    10000[0-9a-f]{3}:	38 62 80 08 	addi    r3,r2,-32760
++    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
++    10000[0-9a-f]{3}:	38 62 80 18 	addi    r3,r2,-32744
++    10000[0-9a-f]{3}:	48 00 00 10 	b       .*
++    10000[0-9a-f]{3}:	4b ff ff ed 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
++    10000[0-9a-f]{3}:	4b ff ff e1 	bl      10000[0-9a-f]{3} <\.__tls_get_addr>
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3_32.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3_32.d
+@@ -9,17 +9,17 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+1800094 <__tls_get_addr>:
+- 1800094:	4e 80 00 20 	blr
++0+18000[0-9a-f]{2} <__tls_get_addr>:
++ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
+ 
+ Disassembly of section \.no_opt3:
+ 
+-0+1800098 <\.no_opt3>:
+- 1800098:	38 6d ff ec 	addi    r3,r13,-20
+- 180009c:	48 00 00 0c 	b       .*
+- 18000a0:	38 6d ff f4 	addi    r3,r13,-12
+- 18000a4:	48 00 00 0c 	b       .*
+- 18000a8:	4b ff ff ed 	bl      1800094 <__tls_get_addr>
+- 18000ac:	48 00 00 08 	b       .*
+- 18000b0:	4b ff ff e5 	bl      1800094 <__tls_get_addr>
++0+18000[0-9a-f]{2} <\.no_opt3>:
++ 18000[0-9a-f]{2}:	38 6d ff ec 	addi    r3,r13,-20
++ 18000[0-9a-f]{2}:	48 00 00 0c 	b       .*
++ 18000[0-9a-f]{2}:	38 6d ff f4 	addi    r3,r13,-12
++ 18000[0-9a-f]{2}:	48 00 00 0c 	b       .*
++ 18000[0-9a-f]{2}:	4b ff ff ed 	bl      18000[0-9a-f]{2} <__tls_get_addr>
++ 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
++ 18000[0-9a-f]{2}:	4b ff ff e5 	bl      18000[0-9a-f]{2} <__tls_get_addr>
+ #pass
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4.d
+@@ -9,40 +9,40 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+100000e8 <\.__tls_get_addr>:
+-    100000e8:	4e 80 00 20 	blr
++0+10000[0-9a-f]{3} <\.__tls_get_addr>:
++    10000[0-9a-f]{3}:	4e 80 00 20 	blr
+ 
+ Disassembly of section \.opt1:
+ 
+-0+100000ec <\.opt1>:
+-    100000ec:	3c 6d 00 00 	addis   r3,r13,0
+-    100000f0:	2c 24 00 00 	cmpdi   r4,0
+-    100000f4:	41 82 00 10 	beq-    .*
+-    100000f8:	60 00 00 00 	nop
+-    100000fc:	38 63 90 10 	addi    r3,r3,-28656
+-    10000100:	48 00 00 0c 	b       .*
+-    10000104:	60 00 00 00 	nop
+-    10000108:	38 63 90 10 	addi    r3,r3,-28656
++0+10000[0-9a-f]{3} <\.opt1>:
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	2c 24 00 00 	cmpdi   r4,0
++    10000[0-9a-f]{3}:	41 82 00 10 	beq-    .*
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 10 	addi    r3,r3,-28656
++    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 10 	addi    r3,r3,-28656
+ 
+ Disassembly of section \.opt2:
+ 
+-0+1000010c <\.opt2>:
+-    1000010c:	3c 6d 00 00 	addis   r3,r13,0
+-    10000110:	2c 24 00 00 	cmpdi   r4,0
+-    10000114:	41 82 00 08 	beq-    .*
+-    10000118:	3c 6d 00 00 	addis   r3,r13,0
+-    1000011c:	60 00 00 00 	nop
+-    10000120:	38 63 90 10 	addi    r3,r3,-28656
++0+10000[0-9a-f]{3} <\.opt2>:
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	2c 24 00 00 	cmpdi   r4,0
++    10000[0-9a-f]{3}:	41 82 00 08 	beq-    .*
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 10 	addi    r3,r3,-28656
+ 
+ Disassembly of section \.opt3:
+ 
+-0+10000124 <\.opt3>:
+-    10000124:	3c 6d 00 00 	addis   r3,r13,0
+-    10000128:	48 00 00 0c 	b       .*
+-    1000012c:	3c 6d 00 00 	addis   r3,r13,0
+-    10000130:	48 00 00 10 	b       .*
+-    10000134:	60 00 00 00 	nop
+-    10000138:	38 63 90 10 	addi    r3,r3,-28656
+-    1000013c:	48 00 00 0c 	b       .*
+-    10000140:	60 00 00 00 	nop
+-    10000144:	38 63 90 08 	addi    r3,r3,-28664
++0+10000[0-9a-f]{3} <\.opt3>:
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
++    10000[0-9a-f]{3}:	3c 6d 00 00 	addis   r3,r13,0
++    10000[0-9a-f]{3}:	48 00 00 10 	b       .*
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 10 	addi    r3,r3,-28656
++    10000[0-9a-f]{3}:	48 00 00 0c 	b       .*
++    10000[0-9a-f]{3}:	60 00 00 00 	nop
++    10000[0-9a-f]{3}:	38 63 90 08 	addi    r3,r3,-28664
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4_32.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4_32.d
+@@ -9,36 +9,36 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+1800094 <__tls_get_addr>:
+- 1800094:	4e 80 00 20 	blr
++0+18000[0-9a-f]{2} <__tls_get_addr>:
++ 18000[0-9a-f]{2}:	4e 80 00 20 	blr
+ 
+ Disassembly of section \.opt1:
+ 
+-0+1800098 <\.opt1>:
+- 1800098:	3c 62 00 00 	addis   r3,r2,0
+- 180009c:	2c 04 00 00 	cmpwi   r4,0
+- 18000a0:	41 82 00 0c 	beq-    .*
+- 18000a4:	38 63 90 10 	addi    r3,r3,-28656
+- 18000a8:	48 00 00 08 	b       .*
+- 18000ac:	38 63 90 10 	addi    r3,r3,-28656
++0+18000[0-9a-f]{2} <\.opt1>:
++ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
++ 18000[0-9a-f]{2}:	2c 04 00 00 	cmpwi   r4,0
++ 18000[0-9a-f]{2}:	41 82 00 0c 	beq-    .*
++ 18000[0-9a-f]{2}:	38 63 90 10 	addi    r3,r3,-28656
++ 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
++ 18000[0-9a-f]{2}:	38 63 90 10 	addi    r3,r3,-28656
+ 
+ Disassembly of section \.opt2:
+ 
+-0+18000b0 <\.opt2>:
+- 18000b0:	3c 62 00 00 	addis   r3,r2,0
+- 18000b4:	2c 04 00 00 	cmpwi   r4,0
+- 18000b8:	41 82 00 08 	beq-    .*
+- 18000bc:	3c 62 00 00 	addis   r3,r2,0
+- 18000c0:	38 63 90 10 	addi    r3,r3,-28656
++0+18000[0-9a-f]{2} <\.opt2>:
++ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
++ 18000[0-9a-f]{2}:	2c 04 00 00 	cmpwi   r4,0
++ 18000[0-9a-f]{2}:	41 82 00 08 	beq-    .*
++ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
++ 18000[0-9a-f]{2}:	38 63 90 10 	addi    r3,r3,-28656
+ 
+ Disassembly of section \.opt3:
+ 
+-0+18000c4 <\.opt3>:
+- 18000c4:	3c 62 00 00 	addis   r3,r2,0
+- 18000c8:	48 00 00 0c 	b       .*
+- 18000cc:	3c 62 00 00 	addis   r3,r2,0
+- 18000d0:	48 00 00 0c 	b       .*
+- 18000d4:	38 63 90 10 	addi    r3,r3,-28656
+- 18000d8:	48 00 00 08 	b       .*
+- 18000dc:	38 63 90 08 	addi    r3,r3,-28664
++0+18000[0-9a-f]{2} <\.opt3>:
++ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
++ 18000[0-9a-f]{2}:	48 00 00 0c 	b       .*
++ 18000[0-9a-f]{2}:	3c 62 00 00 	addis   r3,r2,0
++ 18000[0-9a-f]{2}:	48 00 00 0c 	b       .*
++ 18000[0-9a-f]{2}:	38 63 90 10 	addi    r3,r3,-28656
++ 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
++ 18000[0-9a-f]{2}:	38 63 90 08 	addi    r3,r3,-28664
+ #pass
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.d
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.d
+@@ -42,5 +42,5 @@ Disassembly of section \.got:
+ #...
+ .*:	4e 80 00 21 	blrl
+ .* <_GLOBAL_OFFSET_TABLE_>:
+-.*:	00 01 03 ec .*
++.*:	00 01 [0-9a-f]{2} [0-9a-f]{2} .*
+ #pass
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.g
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.g
+@@ -9,5 +9,5 @@
+ Contents of section \.got:
+ .* 00000000 00000000 00000000 00000000  .*
+ .* 00000000 00000000 00000000 00000000  .*
+-.* 00000000 4e800021 000103ec 00000000  .*
++.* 00000000 4e800021 00010[0-9a-f]{3} 00000000  .*
+ .* 00000000                             .*
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.r
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.r
+@@ -35,6 +35,7 @@ Program Headers:
+  +LOAD .* RWE 0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+1c 0x0+38 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -42,6 +43,7 @@ Program Headers:
+  +01 +\.tdata \.dynamic \.got \.plt 
+  +02 +\.dynamic 
+  +03 +\.tdata \.tbss 
++ +04 +
+ 
+ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
+  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
+@@ -52,9 +54,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
+ [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0
+ [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0
+ [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0
+-[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4
+-[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8
+-[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8
++[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
++[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
++[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
+ [0-9a-f ]+R_PPC_DTPMOD32 +0
+ [0-9a-f ]+R_PPC_DTPREL32 +0
+ [0-9a-f ]+R_PPC_DTPMOD32 +0
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.g
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.g
+@@ -8,8 +8,8 @@
+ .*: +file format elf64-powerpc
+ 
+ Contents of section \.got:
+- 100101a0 00000000 00000001 00000000 00000000  .*
+- 100101b0 00000000 00000001 00000000 00000000  .*
+- 100101c0 00000000 00000001 00000000 00000000  .*
+- 100101d0 00000000 00000001 00000000 00000000  .*
+- 100101e0 ffffffff ffff8060 00000000 00000000  .*
++ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
++ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
++ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
++ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
++ 10010[0-9a-f]{3} ffffffff ffff8060 00000000 00000000  .*
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.t
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.t
+@@ -8,7 +8,7 @@
+ .*: +file format elf64-powerpc
+ 
+ Contents of section \.tdata:
+- 10010148 00c0ffee 00000000 12345678 9abcdef0  .*
+- 10010158 23456789 abcdef01 3456789a bcdef012  .*
+- 10010168 456789ab cdef0123 56789abc def01234  .*
+- 10010178 6789abcd ef012345 789abcde f0123456  .*
++ 10010180 00c0ffee 00000000 12345678 9abcdef0  .*
++ 10010190 23456789 abcdef01 3456789a bcdef012  .*
++ 100101a0 456789ab cdef0123 56789abc def01234  .*
++ 100101b0 6789abcd ef012345 789abcde f0123456  .*
+--- binutils-2.23/ld/testsuite/ld-powerpc/tlstocso.g
++++ binutils-2.23/ld/testsuite/ld-powerpc/tlstocso.g
+@@ -7,7 +7,7 @@
+ .*: +file format elf64-powerpc
+ 
+ Contents of section \.got:
+-.* 00000000 000186c0 00000000 00000000  .*
++.* 00000000 000186f8 00000000 00000000  .*
+ .* 00000000 00000000 00000000 00000000  .*
+ .* 00000000 00000000 00000000 00000000  .*
+ .* 00000000 00000000 00000000 00000000  .*
+--- binutils-2.23/ld/testsuite/ld-s390/tlsbin.rd
++++ binutils-2.23/ld/testsuite/ld-s390/tlsbin.rd
+@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+  +LOAD .* RW +0x1000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+60 0x0+a0 R +0x20
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -52,6 +53,7 @@ Program Headers:
+  +03 +.tdata .dynamic .got *
+  +04 +.dynamic *
+  +05 +.tdata .tbss *
++ +06 +
+ 
+ Relocation section '.rela.dyn' at offset .* contains 4 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
+--- binutils-2.23/ld/testsuite/ld-s390/tlsbin_64.rd
++++ binutils-2.23/ld/testsuite/ld-s390/tlsbin_64.rd
+@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+  +LOAD .* RW +0x1000
+  +DYNAMIC .* RW +0x8
+  +TLS .* 0x0+60 0x0+a0 R +0x20
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -52,6 +53,7 @@ Program Headers:
+  +03 +.tdata .dynamic .got *
+  +04 +.dynamic *
+  +05 +.tdata .tbss *
++ +06 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+--- binutils-2.23/ld/testsuite/ld-s390/tlspic.rd
++++ binutils-2.23/ld/testsuite/ld-s390/tlspic.rd
+@@ -39,6 +39,7 @@ Program Headers:
+  +LOAD .* RW +0x1000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+60 0x0+80 R +0x20
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -46,6 +47,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got 
+  +02 +.dynamic 
+  +03 +.tdata .tbss 
++ +04 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
+--- binutils-2.23/ld/testsuite/ld-s390/tlspic_64.rd
++++ binutils-2.23/ld/testsuite/ld-s390/tlspic_64.rd
+@@ -39,6 +39,7 @@ Program Headers:
+  +LOAD .* RW +0x1000
+  +DYNAMIC .* RW +0x8
+  +TLS .* 0x0+60 0x0+80 R +0x20
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -46,6 +47,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got *
+  +02 +.dynamic *
+  +03 +.tdata .tbss *
++ +04 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+--- binutils-2.23/ld/testsuite/ld-scripts/empty-aligned.d
++++ binutils-2.23/ld/testsuite/ld-scripts/empty-aligned.d
+@@ -8,7 +8,9 @@
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg +Align
+  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ [RWE ]+ +0x[0-9a-f]+
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+  +00 +.text 
++ +01 +
+--- binutils-2.23/ld/testsuite/ld-sh/tlsbin-2.d
++++ binutils-2.23/ld/testsuite/ld-sh/tlsbin-2.d
+@@ -44,6 +44,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+28 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -53,6 +54,7 @@ Program Headers:
+  +03 +\.tdata \.dynamic \.got *
+  +04 +\.dynamic *
+  +05 +\.tdata \.tbss *
++ +06 +
+ 
+ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
+--- binutils-2.23/ld/testsuite/ld-sh/tlspic-2.d
++++ binutils-2.23/ld/testsuite/ld-sh/tlspic-2.d
+@@ -32,7 +32,7 @@ Key to Flags:
+ 
+ Elf file type is DYN \(Shared object file\)
+ Entry point 0x[0-9a-f]+
+-There are 4 program headers, starting at offset [0-9]+
++There are [0-9] program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+@@ -40,6 +40,7 @@ Program Headers:
+  +LOAD.*
+  +DYNAMIC.*
+  +TLS .* 0x0+18 0x0+20 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -47,6 +48,7 @@ Program Headers:
+  +01 +\.tdata \.dynamic \.got *
+  +02 +\.dynamic *
+  +03 +\.tdata \.tbss *
++ +04 +
+ 
+ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
+  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
+--- binutils-2.23/ld/testsuite/ld-sparc/gotop32.rd
++++ binutils-2.23/ld/testsuite/ld-sparc/gotop32.rd
+@@ -31,6 +31,7 @@ Program Headers:
+  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
+  +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000
+  +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+70 0x0+70 RW +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
+--- binutils-2.23/ld/testsuite/ld-sparc/gotop64.rd
++++ binutils-2.23/ld/testsuite/ld-sparc/gotop64.rd
+@@ -31,6 +31,7 @@ Program Headers:
+  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000
+  +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000
+  +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+e0 0x0+e0 RW +0x8
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
+--- binutils-2.23/ld/testsuite/ld-sparc/tlssunbin32.rd
++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunbin32.rd
+@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
+- +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4
+- +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1
++ +PHDR +0x0+34 0x0+10034 0x0+10034 (0x[0-9a-f]+) \1 R E 0x4
++ +INTERP +(0x[0-9a-f]+ ){3}0x0+11 0x0+11 R +0x1
+ .*Requesting program interpreter.*
+  +LOAD .* R E 0x10000
+  +LOAD .* RW +0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+1060 0x0+10a0 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+--- binutils-2.23/ld/testsuite/ld-sparc/tlssunbin64.rd
++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunbin64.rd
+@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+- +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8
+- +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1
++ +PHDR +0x0+40 0x0+100040 0x0+100040 (0x[0-9a-f]+) \1 R E 0x8
++ +INTERP +0x0+([0-9a-f]+) (0x0+10+\1) \2 0x0+19 0x0+19 R +0x1
+ .*Requesting program interpreter.*
+  +LOAD .* R E 0x100000
+  +LOAD .* RW +0x100000
+  +DYNAMIC .* RW +0x8
+  +TLS .* 0x0+60 0x0+a0 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+--- binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic32.rd
++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic32.rd
+@@ -32,6 +32,7 @@ Program Headers:
+  +LOAD .* RW +0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+ 0x0+24 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
+--- binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic64.rd
++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic64.rd
+@@ -32,6 +32,7 @@ Program Headers:
+  +LOAD .* RW +0x100000
+  +DYNAMIC .* RW +0x8
+  +TLS .* 0x0+ 0x0+24 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+--- binutils-2.23/ld/testsuite/ld-sparc/tlssunpic32.rd
++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunpic32.rd
+@@ -36,6 +36,7 @@ Program Headers:
+  +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000
+  +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4
+  +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+--- binutils-2.23/ld/testsuite/ld-sparc/tlssunpic64.rd
++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunpic64.rd
+@@ -36,6 +36,7 @@ Program Headers:
+  +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000
+  +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8
+  +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+60 0x0+80 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ #...
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+--- binutils-2.23/ld/testsuite/ld-x86-64/tlsgdesc.rd
++++ binutils-2.23/ld/testsuite/ld-x86-64/tlsgdesc.rd
+@@ -36,12 +36,14 @@ Program Headers:
+  +LOAD.*
+  +LOAD.*
+  +DYNAMIC.*
++ +PAX_FLAGS.*
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+  +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
+  +01 +.dynamic .got .got.plt *
+  +02 +.dynamic *
++ +03 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
+  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+--- binutils-2.23/ld/testsuite/ld-x86-64/tlspic.rd
++++ binutils-2.23/ld/testsuite/ld-x86-64/tlspic.rd
+@@ -40,6 +40,7 @@ Program Headers:
+  +LOAD +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+244 0x0+244 RW +0x200000
+  +DYNAMIC +0x0+1210 0x0+201210 0x0+201210 0x0+130 0x0+130 RW +0x8
+  +TLS +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+60 0x0+80 R +0x1
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections...
+@@ -47,6 +48,7 @@ Program Headers:
+  +01 +.tdata .dynamic .got .got.plt *
+  +02 +.dynamic *
+  +03 +.tdata .tbss *
++ +04 +
+ 
+ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
diff --git a/pkgs/development/tools/misc/binutils/pt-pax-flags-20141022.patch b/pkgs/development/tools/misc/binutils/pt-pax-flags-20141022.patch
deleted file mode 100644
index e942787da01c..000000000000
--- a/pkgs/development/tools/misc/binutils/pt-pax-flags-20141022.patch
+++ /dev/null
@@ -1,1030 +0,0 @@
---- binutils-2.24.90/bfd/elf-bfd.h
-+++ binutils-2.24.90/bfd/elf-bfd.h
-@@ -1558,6 +1558,9 @@ struct output_elf_obj_tdata
-   /* Segment flags for the PT_GNU_STACK segment.  */
-   unsigned int stack_flags;
- 
-+  /* Segment flags for the PT_PAX_FLAGS segment.  */
-+  unsigned int pax_flags;
-+
-   /* This is set to TRUE if the object was created by the backend
-      linker.  */
-   bfd_boolean linker;
-@@ -1703,6 +1706,7 @@ struct elf_obj_tdata
- #define elf_eh_frame_hdr(bfd)	(elf_tdata(bfd) -> o->eh_frame_hdr)
- #define elf_linker(bfd)		(elf_tdata(bfd) -> o->linker)
- #define elf_stack_flags(bfd)	(elf_tdata(bfd) -> o->stack_flags)
-+#define elf_pax_flags(bfd)	(elf_tdata(bfd) -> o->pax_flags)
- #define elf_shstrtab(bfd)	(elf_tdata(bfd) -> o->strtab_ptr)
- #define elf_onesymtab(bfd)	(elf_tdata(bfd) -> symtab_section)
- #define elf_symtab_shndx(bfd)	(elf_tdata(bfd) -> symtab_shndx_section)
---- binutils-2.24.90/bfd/elf.c
-+++ binutils-2.24.90/bfd/elf.c
-@@ -1151,6 +1151,7 @@ get_segment_type (unsigned int p_type)
-     case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
-     case PT_GNU_STACK: pt = "STACK"; break;
-     case PT_GNU_RELRO: pt = "RELRO"; break;
-+    case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
-     default: pt = NULL; break;
-     }
-   return pt;
-@@ -2498,6 +2499,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index)
-     case PT_GNU_RELRO:
-       return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro");
- 
-+    case PT_PAX_FLAGS:
-+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags");
-+
-     default:
-       /* Check for any processor-specific program segment types.  */
-       bed = get_elf_backend_data (abfd);
-@@ -3590,6 +3594,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
-       ++segs;
-     }
- 
-+    {
-+      /* We need a PT_PAX_FLAGS segment.  */
-+      ++segs;
-+    }
-+
-   for (s = abfd->sections; s != NULL; s = s->next)
-     {
-       if ((s->flags & SEC_LOAD) != 0
-@@ -4226,6 +4235,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
- 	    }
- 	}
- 
-+    {
-+      amt = sizeof (struct elf_segment_map);
-+      m = bfd_zalloc (abfd, amt);
-+      if (m == NULL)
-+	goto error_return;
-+      m->next = NULL;
-+      m->p_type = PT_PAX_FLAGS;
-+      m->p_flags = elf_pax_flags (abfd);
-+      m->p_flags_valid = 1;
-+
-+      *pm = m;
-+      pm = &m->next;
-+    }
-+
-       free (sections);
-       elf_seg_map (abfd) = mfirst;
-     }
-@@ -5584,7 +5607,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
-        6. PT_TLS segment includes only SHF_TLS sections.
-        7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
-        8. PT_DYNAMIC should not contain empty sections at the beginning
--	  (with the possible exception of .dynamic).  */
-+	  (with the possible exception of .dynamic).
-+       9. PT_PAX_FLAGS segments do not include any sections.  */
- #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed)		\
-   ((((segment->p_paddr							\
-       ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr)	\
-@@ -5592,6 +5616,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
-      && (section->flags & SEC_ALLOC) != 0)				\
-     || IS_NOTE (segment, section))					\
-    && segment->p_type != PT_GNU_STACK					\
-+   && segment->p_type != PT_PAX_FLAGS					\
-    && (segment->p_type != PT_TLS					\
-        || (section->flags & SEC_THREAD_LOCAL))				\
-    && (segment->p_type == PT_LOAD					\
---- binutils-2.24.90/bfd/elflink.c
-+++ binutils-2.24.90/bfd/elflink.c
-@@ -5563,18 +5563,31 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
-       && ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
-     return FALSE;
- 
-+  elf_pax_flags (output_bfd) = PF_NORANDEXEC;
-+  if (info->execheap)
-+    elf_pax_flags (output_bfd) |= PF_NOMPROTECT;
-+  else if (info->noexecheap)
-+    elf_pax_flags (output_bfd) |= PF_MPROTECT;
-+
-   /* Determine any GNU_STACK segment requirements, after the backend
-      has had a chance to set a default segment size.  */
-   if (info->execstack)
--    elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X;
-+    {
-+      elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X;
-+      elf_pax_flags (output_bfd) |= PF_EMUTRAMP;
-+    }
-   else if (info->noexecstack)
--    elf_stack_flags (output_bfd) = PF_R | PF_W;
-+    {
-+      elf_stack_flags (output_bfd) = PF_R | PF_W;
-+      elf_pax_flags (output_bfd) |= PF_NOEMUTRAMP;
-+    }
-   else
-     {
-       bfd *inputobj;
-       asection *notesec = NULL;
-       int exec = 0;
- 
-+      elf_pax_flags (output_bfd) |= PF_NOEMUTRAMP;
-       for (inputobj = info->input_bfds;
- 	   inputobj;
- 	   inputobj = inputobj->link.next)
-@@ -5601,7 +5601,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
- 	  if (s)
- 	    {
- 	      if (s->flags & SEC_CODE)
--		exec = PF_X;
-+		{
-+		  elf_pax_flags (output_bfd) &= ~PF_NOEMUTRAMP;
-+		  elf_pax_flags (output_bfd) |= PF_EMUTRAMP;
-+		  exec = PF_X;
-+		}
- 	      notesec = s;
- 	    }
- 	  else if (bed->default_execstack)
---- binutils-2.24.90/binutils/readelf.c
-+++ binutils-2.24.90/binutils/readelf.c
-@@ -3262,6 +3262,7 @@ get_segment_type (unsigned long p_type)
- 			return "GNU_EH_FRAME";
-     case PT_GNU_STACK:	return "GNU_STACK";
-     case PT_GNU_RELRO:  return "GNU_RELRO";
-+    case PT_PAX_FLAGS:  return "PAX_FLAGS";
- 
-     default:
-       if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
---- binutils-2.24.90/include/bfdlink.h
-+++ binutils-2.24.90/include/bfdlink.h
-@@ -339,6 +339,14 @@ struct bfd_link_info
-   /* TRUE if PT_GNU_RELRO segment should be created.  */
-   unsigned int relro: 1;
- 
-+  /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
-+     flags.  */
-+  unsigned int execheap: 1;
-+
-+  /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
-+     flags.  */
-+  unsigned int noexecheap: 1;
-+
-   /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
-      should be created.  */
-   unsigned int eh_frame_hdr: 1;
---- binutils-2.24.90/include/elf/common.h
-+++ binutils-2.24.90/include/elf/common.h
-@@ -434,6 +434,7 @@
- #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
- #define PT_GNU_STACK	(PT_LOOS + 0x474e551) /* Stack flags */
- #define PT_GNU_RELRO	(PT_LOOS + 0x474e552) /* Read-only after relocation */
-+#define PT_PAX_FLAGS	(PT_LOOS + 0x5041580) /* PaX flags */
- 
- /* Program segment permissions, in program header p_flags field.  */
- 
-@@ -444,6 +445,21 @@
- #define PF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
- #define PF_MASKPROC	0xF0000000	/* Processor-specific reserved bits */
- 
-+/* Flags to control PaX behavior.  */
-+
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
-+
- /* Values for section header, sh_type field.  */
- 
- #define SHT_NULL	0		/* Section header table entry unused */
---- binutils-2.24.90/ld/emultempl/elf32.em
-+++ binutils-2.24.90/ld/emultempl/elf32.em
-@@ -2276,6 +2276,16 @@ fragment <<EOF
- 	  link_info.noexecstack = TRUE;
- 	  link_info.execstack = FALSE;
- 	}
-+      else if (strcmp (optarg, "execheap") == 0)
-+	{
-+	  link_info.execheap = TRUE;
-+	  link_info.noexecheap = FALSE;
-+	}
-+      else if (strcmp (optarg, "noexecheap") == 0)
-+	{
-+	  link_info.noexecheap = TRUE;
-+	  link_info.execheap = FALSE;
-+	}
- EOF
- if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
- fragment <<EOF
-@@ -2395,6 +2405,8 @@ fragment <<EOF
-   -z defs                     Report unresolved symbols in object files.\n"));
-   fprintf (file, _("\
-   -z execstack                Mark executable as requiring executable stack\n"));
-+  fprintf (file, _("\
-+  -z execheap                 Mark executable as requiring executable heap\n"));
- EOF
- 
- if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
-@@ -2439,6 +2451,8 @@ fi
- fragment <<EOF
-   fprintf (file, _("\
-   -z noexecstack              Mark executable as not requiring executable stack\n"));
-+  fprintf (file, _("\
-+  -z noexecheap               Mark executable as not requiring executable heap\n"));
- EOF
- if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
- fragment <<EOF
---- binutils-2.24.90/ld/ldgram.y
-+++ binutils-2.24.90/ld/ldgram.y
-@@ -1235,6 +1235,8 @@ phdr_type:
- 			    $$ = exp_intop (0x6474e550);
- 			  else if (strcmp (s, "PT_GNU_STACK") == 0)
- 			    $$ = exp_intop (0x6474e551);
-+			  else if (strcmp (s, "PT_PAX_FLAGS") == 0)
-+			    $$ = exp_intop (0x65041580);
- 			  else
- 			    {
- 			      einfo (_("\
---- binutils-2.24.90/ld/testsuite/ld-alpha/tlsbin.rd
-+++ binutils-2.24.90/ld/testsuite/ld-alpha/tlsbin.rd
-@@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
--  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8
-+  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+188 R E 0x8
-   INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
- .*Requesting program interpreter.*
-   LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
-   LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
-   DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
-   TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries:
---- binutils-2.24.90/ld/testsuite/ld-alpha/tlsbinr.rd
-+++ binutils-2.24.90/ld/testsuite/ld-alpha/tlsbinr.rd
-@@ -42,6 +42,7 @@ Program Headers:
-  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
-  +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries:
---- binutils-2.24.90/ld/testsuite/ld-alpha/tlspic.rd
-+++ binutils-2.24.90/ld/testsuite/ld-alpha/tlspic.rd
-@@ -38,6 +38,7 @@ Program Headers:
-  +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
-  +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
-  +TLS +0x0+10e0 0x0+110e0 0x0+110e0 0x0+60 0x0+80 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries:
---- binutils-2.24.90/ld/testsuite/ld-elf/eh1.d
-+++ binutils-2.24.90/ld/testsuite/ld-elf/eh1.d
-@@ -23,11 +23,11 @@ Contents of the .eh_frame section:
-   DW_CFA_nop
-   DW_CFA_nop
- 
--0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078\.\.0+400090
--  DW_CFA_advance_loc: 8 to 0+400080
-+0+0018 0+001c 0+001c FDE cie=0+0000 pc=[0-9a-f.]+
-+  DW_CFA_advance_loc: 8 to [0-9a-f]+
-   DW_CFA_def_cfa_offset: 16
-   DW_CFA_offset: r6 \(rbp\) at cfa-16
--  DW_CFA_advance_loc: 8 to 0+400088
-+  DW_CFA_advance_loc: 8 to [0-9a-f]+
-   DW_CFA_def_cfa_register: r6 \(rbp\)
- 
- 0+0038 ZERO terminator
---- binutils-2.24.90/ld/testsuite/ld-elf/eh2.d
-+++ binutils-2.24.90/ld/testsuite/ld-elf/eh2.d
-@@ -23,11 +23,11 @@ Contents of the .eh_frame section:
-   DW_CFA_nop
-   DW_CFA_nop
- 
--0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078\.\.0+400090
--  DW_CFA_advance_loc: 8 to 0+400080
-+0+0018 0+001c 0+001c FDE cie=0+0000 pc=[0-9a-f.]+
-+  DW_CFA_advance_loc: 8 to [0-9a-f]+
-   DW_CFA_def_cfa_offset: 16
-   DW_CFA_offset: r6 \(rbp\) at cfa-16
--  DW_CFA_advance_loc: 8 to 0+400088
-+  DW_CFA_advance_loc: 8 to [0-9a-f]+
-   DW_CFA_def_cfa_register: r6 \(rbp\)
- 
- 0+0038 ZERO terminator
---- binutils-2.24.90/ld/testsuite/ld-elf/eh3.d
-+++ binutils-2.24.90/ld/testsuite/ld-elf/eh3.d
-@@ -23,11 +23,11 @@ Contents of the .eh_frame section:
-   DW_CFA_nop
-   DW_CFA_nop
- 
--0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078\.\.0+400090
--  DW_CFA_advance_loc: 8 to 0+400080
-+0+0018 0+001c 0+001c FDE cie=0+0000 pc=[0-9a-f.]+)
-+  DW_CFA_advance_loc: 8 to [0-9a-f]+
-   DW_CFA_def_cfa_offset: 16
-   DW_CFA_offset: r6 \(rbp\) at cfa-16
--  DW_CFA_advance_loc: 8 to 0+400088
-+  DW_CFA_advance_loc: 8 to [0-9a-f]+
-   DW_CFA_def_cfa_register: r6 \(rbp\)
- 
- 0+0038 ZERO terminator
---- binutils-2.24.90/ld/testsuite/ld-elf/orphan-region.d
-+++ binutils-2.24.90/ld/testsuite/ld-elf/orphan-region.d
-@@ -15,7 +15,9 @@
- Program Headers:
-   Type.*
-   LOAD[ \t]+0x[0-9a-f]+ 0x0*40000000 0x0*40000000 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x[0-9a-f]+
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-   Segment Sections...
-    00     .text .rodata .moredata *
-+   01 +
---- binutils-2.24.90/ld/testsuite/ld-i386/tlsbin.rd
-+++ binutils-2.24.90/ld/testsuite/ld-i386/tlsbin.rd
-@@ -44,6 +44,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -53,6 +54,7 @@ Program Headers:
-  +03 +.tdata .dynamic .got .got.plt *
-  +04 +.dynamic *
-  +05 +.tdata .tbss *
-+ +06 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.24.90/ld/testsuite/ld-i386/tlsbindesc.rd
-+++ binutils-2.24.90/ld/testsuite/ld-i386/tlsbindesc.rd
-@@ -42,6 +42,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -51,6 +52,7 @@ Program Headers:
-  +03 +.tdata .dynamic .got .got.plt *
-  +04 +.dynamic *
-  +05 +.tdata .tbss *
-+ +06 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.24.90/ld/testsuite/ld-i386/tlsdesc.rd
-+++ binutils-2.24.90/ld/testsuite/ld-i386/tlsdesc.rd
-@@ -39,6 +39,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -46,6 +47,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got .got.plt *
-  +02 +.dynamic *
-  +03 +.tdata .tbss *
-+ +04 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.24.90/ld/testsuite/ld-i386/tlsgdesc.rd
-+++ binutils-2.24.90/ld/testsuite/ld-i386/tlsgdesc.rd
-@@ -36,12 +36,14 @@ Program Headers:
-  +LOAD.*
-  +LOAD.*
-  +DYNAMIC.*
-+ +PAX_FLAGS.*
- 
-  Section to Segment mapping:
-  +Segment Sections...
-  +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text *
-  +01 +.dynamic .got .got.plt *
-  +02 +.dynamic *
-+ +03 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.24.90/ld/testsuite/ld-i386/tlsnopic.rd
-+++ binutils-2.24.90/ld/testsuite/ld-i386/tlsnopic.rd
-@@ -37,6 +37,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -44,6 +45,7 @@ Program Headers:
-  +01 +.dynamic .got .got.plt *
-  +02 +.dynamic *
-  +03 +.tbss *
-+ +04 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.24.90/ld/testsuite/ld-i386/tlspic.rd
-+++ binutils-2.24.90/ld/testsuite/ld-i386/tlspic.rd
-@@ -40,6 +40,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -47,6 +48,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got .got.plt *
-  +02 +.dynamic *
-  +03 +.tdata .tbss *
-+ +04 +
- 
- Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.24.90/ld/testsuite/ld-ia64/merge1.d
-+++ binutils-2.24.90/ld/testsuite/ld-ia64/merge1.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+1e0 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 c0 04 00 48 00 	            addl r12=24,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.24.90/ld/testsuite/ld-ia64/merge2.d
-+++ binutils-2.24.90/ld/testsuite/ld-ia64/merge2.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+1e0 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 c0 04 00 48 00 	            addl r12=24,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.24.90/ld/testsuite/ld-ia64/merge3.d
-+++ binutils-2.24.90/ld/testsuite/ld-ia64/merge3.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+210 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.24.90/ld/testsuite/ld-ia64/merge4.d
-+++ binutils-2.24.90/ld/testsuite/ld-ia64/merge4.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+240 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.24.90/ld/testsuite/ld-ia64/merge5.d
-+++ binutils-2.24.90/ld/testsuite/ld-ia64/merge5.d
-@@ -4,7 +4,7 @@
- #objdump: -d
- 
- #...
--0+270 <.text>:
-+[a-f0-9]+ <.text>:
- [ 	]*[a-f0-9]+:	0b 60 80 02 00 24 	\[MMI\]       addl r12=32,r1;;
- [ 	]*[a-f0-9]+:	c0 40 05 00 48 00 	            addl r12=40,r1
- [ 	]*[a-f0-9]+:	00 00 04 00       	            nop.i 0x0;;
---- binutils-2.24.90/ld/testsuite/ld-ia64/tlsbin.rd
-+++ binutils-2.24.90/ld/testsuite/ld-ia64/tlsbin.rd
-@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-- +PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8
-- +INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
-+ +PHDR +0x0+40 0x40+40 0x40+40 (0x[0-9a-f]+) \1 R E 0x8
-+ +INTERP +0x0+([0-9a-f]+) (0x40+\1) \2 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
- .*Requesting program interpreter.*
-  +LOAD +0x0+ 0x40+ 0x40+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ R E 0x10000
-  +LOAD +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
-  +DYNAMIC +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+150 0x0+150 RW +0x8
-  +TLS +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+60 0x0+a0 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  +IA_64_UNWIND .* R +0x8
- #...
- 
---- binutils-2.24.90/ld/testsuite/ld-ia64/tlspic.rd
-+++ binutils-2.24.90/ld/testsuite/ld-ia64/tlspic.rd
-@@ -40,6 +40,7 @@ Program Headers:
-  +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
-  +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8
-  +TLS +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+60 0x0+80 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8
- #...
- 
---- binutils-2.24.90/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
-+++ binutils-2.24.90/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
-@@ -8,9 +8,9 @@
- .*: +file format.*
- 
- Disassembly of section \.text:
--004000f0 <[^>]*> 3c1c0043 	lui	gp,0x43
--004000f4 <[^>]*> 279c9ff0 	addiu	gp,gp,-24592
--004000f8 <[^>]*> afbc0008 	sw	gp,8\(sp\)
-+00400110 <[^>]*> 3c1c0043 	lui	gp,0x43
-+00400114 <[^>]*> 279c9ff0 	addiu	gp,gp,-24592
-+00400118 <[^>]*> afbc0008 	sw	gp,8\(sp\)
- #...
- 00408da0 <[^>]*> 3c1c0043 	lui	gp,0x43
- 00408da4 <[^>]*> 279c2c98 	addiu	gp,gp,11416
---- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
-+++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is DYN \(Shared object file\)
- Entry point .*
--There are 5 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -9,6 +9,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.*
-  * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 [^ ]+ * [^ ]+ * R  * 0x.*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -18,3 +19,4 @@ Program Headers:
-  *0*2 * \.data \.got *
-  *0*3 * \.dynamic *
-  *0*4 *
-+ *0*5 *
---- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
-+++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 *\.got \.data *
-  *0*6 *\.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
-+++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 * \.got \.data \.bss *
-  *0*6 * \.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
-+++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 * \.got \.data \.bss *
-  *0*6 * \.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
-+++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 * \.got \.data \.bss *
-  *0*6 * \.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
-+++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 7 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -12,6 +12,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -23,3 +24,4 @@ Program Headers:
-  *0*4 * \.got \.data \.bss *
-  *0*5 * \.dynamic *
-  *0*6 *
-+ *0*7 *
---- binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
-+++ binutils-2.24.90/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
-@@ -1,7 +1,7 @@
- 
- Elf file type is EXEC \(Executable file\)
- Entry point 0x44000
--There are 8 program headers, starting at offset .*
-+There are [0-9] program headers, starting at offset .*
- 
- Program Headers:
-  * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align
-@@ -13,6 +13,7 @@ Program Headers:
-  * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW  * 0x.*
-  * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .*
-+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
-  * NULL * .*
- 
-  *Section to Segment mapping:
-@@ -25,3 +26,4 @@ Program Headers:
-  *0*5 * \.got \.data \.bss *
-  *0*6 * \.dynamic *
-  *0*7 *
-+ *0*8 *
---- binutils-2.24.90/ld/testsuite/ld-powerpc/tlsexe32.r
-+++ binutils-2.24.90/ld/testsuite/ld-powerpc/tlsexe32.r
-@@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
-- +PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4
-- +INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1
-+ +PHDR +0x000034 0x01800034 0x01800034 (0x000[0-9a-f]{2}) \1 R E 0x4
-+ +INTERP +0x000([0-9a-f]{3}) 0x01800\1 0x01800\1 0x00011 0x00011 R +0x1
-  +\[Requesting program interpreter: .*\]
-  +LOAD .* R E 0x10000
-  +LOAD .* RWE 0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0001c 0x00038 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -49,6 +50,7 @@ Program Headers:
-  +03 +\.tdata \.dynamic \.got \.plt 
-  +04 +\.dynamic 
-  +05 +\.tdata \.tbss 
-+ +06 +
- 
- Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
-  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
---- binutils-2.24.90/ld/testsuite/ld-powerpc/tlsso32.r
-+++ binutils-2.24.90/ld/testsuite/ld-powerpc/tlsso32.r
-@@ -35,6 +35,7 @@ Program Headers:
-  +LOAD .* RWE 0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+1c 0x0+38 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -42,6 +43,7 @@ Program Headers:
-  +01 +\.tdata \.dynamic \.got \.plt 
-  +02 +\.dynamic 
-  +03 +\.tdata \.tbss 
-+ +04 +
- 
- Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
-  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-@@ -52,9 +54,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
- [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0
- [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0
- [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0
--[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4
--[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8
--[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8
-+[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
-+[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
-+[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
- [0-9a-f ]+R_PPC_DTPMOD32 +0
- [0-9a-f ]+R_PPC_DTPREL32 +0
- [0-9a-f ]+R_PPC_DTPMOD32 +0
---- binutils-2.24.90/ld/testsuite/ld-s390/tlsbin.rd
-+++ binutils-2.24.90/ld/testsuite/ld-s390/tlsbin.rd
-@@ -43,6 +43,7 @@ Program Headers:
-  +LOAD .* RW +0x1000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+60 0x0+a0 R +0x20
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -52,6 +53,7 @@ Program Headers:
-  +03 +.tdata .dynamic .got *
-  +04 +.dynamic *
-  +05 +.tdata .tbss *
-+ +06 +
- 
- Relocation section '.rela.dyn' at offset .* contains 4 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
---- binutils-2.24.90/ld/testsuite/ld-s390/tlsbin_64.rd
-+++ binutils-2.24.90/ld/testsuite/ld-s390/tlsbin_64.rd
-@@ -43,6 +43,7 @@ Program Headers:
-  +LOAD .* RW +0x1000
-  +DYNAMIC .* RW +0x8
-  +TLS .* 0x0+60 0x0+a0 R +0x20
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -52,6 +53,7 @@ Program Headers:
-  +03 +.tdata .dynamic .got *
-  +04 +.dynamic *
-  +05 +.tdata .tbss *
-+ +06 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
-  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.24.90/ld/testsuite/ld-s390/tlspic.rd
-+++ binutils-2.24.90/ld/testsuite/ld-s390/tlspic.rd
-@@ -39,6 +39,7 @@ Program Headers:
-  +LOAD .* RW +0x1000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+60 0x0+80 R +0x20
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -46,6 +47,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got 
-  +02 +.dynamic 
-  +03 +.tdata .tbss 
-+ +04 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
-  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
---- binutils-2.24.90/ld/testsuite/ld-s390/tlspic_64.rd
-+++ binutils-2.24.90/ld/testsuite/ld-s390/tlspic_64.rd
-@@ -39,6 +39,7 @@ Program Headers:
-  +LOAD .* RW +0x1000
-  +DYNAMIC .* RW +0x8
-  +TLS .* 0x0+60 0x0+80 R +0x20
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -46,6 +47,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got *
-  +02 +.dynamic *
-  +03 +.tdata .tbss *
-+ +04 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
-  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.24.90/ld/testsuite/ld-sh/tlsbin-2.d
-+++ binutils-2.24.90/ld/testsuite/ld-sh/tlsbin-2.d
-@@ -44,6 +44,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+28 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -53,6 +54,7 @@ Program Headers:
-  +03 +\.tdata \.dynamic \.got *
-  +04 +\.dynamic *
-  +05 +\.tdata \.tbss *
-+ +06 +
- 
- Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
-  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
---- binutils-2.24.90/ld/testsuite/ld-sh/tlspic-2.d
-+++ binutils-2.24.90/ld/testsuite/ld-sh/tlspic-2.d
-@@ -32,7 +32,7 @@ Key to Flags:
- 
- Elf file type is DYN \(Shared object file\)
- Entry point 0x[0-9a-f]+
--There are 4 program headers, starting at offset [0-9]+
-+There are [0-9] program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-@@ -40,6 +40,7 @@ Program Headers:
-  +LOAD.*
-  +DYNAMIC.*
-  +TLS .* 0x0+18 0x0+20 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -47,6 +48,7 @@ Program Headers:
-  +01 +\.tdata \.dynamic \.got *
-  +02 +\.dynamic *
-  +03 +\.tdata \.tbss *
-+ +04 +
- 
- Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
-  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
---- binutils-2.24.90/ld/testsuite/ld-sparc/gotop32.rd
-+++ binutils-2.24.90/ld/testsuite/ld-sparc/gotop32.rd
-@@ -31,6 +31,7 @@ Program Headers:
-  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
-  +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000
-  +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+70 0x0+70 RW +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
---- binutils-2.24.90/ld/testsuite/ld-sparc/gotop64.rd
-+++ binutils-2.24.90/ld/testsuite/ld-sparc/gotop64.rd
-@@ -31,6 +31,7 @@ Program Headers:
-  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000
-  +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000
-  +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+e0 0x0+e0 RW +0x8
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
---- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunbin32.rd
-+++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunbin32.rd
-@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
-- +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4
-- +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1
-+ +PHDR +0x0+34 0x0+10034 0x0+10034 (0x[0-9a-f]+) \1 R E 0x4
-+ +INTERP +(0x[0-9a-f]+ ){3}0x0+11 0x0+11 R +0x1
- .*Requesting program interpreter.*
-  +LOAD .* R E 0x10000
-  +LOAD .* RW +0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+1060 0x0+10a0 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
---- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunbin64.rd
-+++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunbin64.rd
-@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-- +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8
-- +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1
-+ +PHDR +0x0+40 0x0+100040 0x0+100040 (0x[0-9a-f]+) \1 R E 0x8
-+ +INTERP +0x0+([0-9a-f]+) (0x0+10+\1) \2 0x0+19 0x0+19 R +0x1
- .*Requesting program interpreter.*
-  +LOAD .* R E 0x100000
-  +LOAD .* RW +0x100000
-  +DYNAMIC .* RW +0x8
-  +TLS .* 0x0+60 0x0+a0 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
---- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunnopic32.rd
-+++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunnopic32.rd
-@@ -32,6 +32,7 @@ Program Headers:
-  +LOAD .* RW +0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+ 0x0+24 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
---- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunnopic64.rd
-+++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunnopic64.rd
-@@ -32,6 +32,7 @@ Program Headers:
-  +LOAD .* RW +0x100000
-  +DYNAMIC .* RW +0x8
-  +TLS .* 0x0+ 0x0+24 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunpic32.rd
-+++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunpic32.rd
-@@ -36,6 +36,7 @@ Program Headers:
-  +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000
-  +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4
-  +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.24.90/ld/testsuite/ld-sparc/tlssunpic64.rd
-+++ binutils-2.24.90/ld/testsuite/ld-sparc/tlssunpic64.rd
-@@ -36,6 +36,7 @@ Program Headers:
-  +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000
-  +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8
-  +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+60 0x0+80 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- #...
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.24.90/ld/testsuite/ld-x86-64/tlsgdesc.rd
-+++ binutils-2.24.90/ld/testsuite/ld-x86-64/tlsgdesc.rd
-@@ -36,12 +36,14 @@ Program Headers:
-  +LOAD.*
-  +LOAD.*
-  +DYNAMIC.*
-+ +PAX_FLAGS.*
- 
-  Section to Segment mapping:
-  +Segment Sections...
-  +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
-  +01 +.dynamic .got .got.plt *
-  +02 +.dynamic *
-+ +03 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
-  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.24.90/ld/testsuite/ld-x86-64/tlspic.rd
-+++ binutils-2.24.90/ld/testsuite/ld-x86-64/tlspic.rd
-@@ -40,6 +40,7 @@ Program Headers:
-  +LOAD +0x0+131a 0x0+20131a 0x0+20131a 0x0+246 0x0+246 RW +0x200000
-  +DYNAMIC +0x0+1380 0x0+201380 0x0+201380 0x0+130 0x0+130 RW +0x8
-  +TLS +0x0+131a 0x0+20131a 0x0+20131a 0x0+60 0x0+80 R +0x1
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections...
-@@ -47,6 +48,7 @@ Program Headers:
-  +01 +.tdata .dynamic .got .got.plt *
-  +02 +.dynamic *
-  +03 +.tdata .tbss *
-+ +04 +
- 
- Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
-  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend

From 596bf235b6bb666173fbf8dcbbd430f932b2074a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Apr 2015 20:41:58 +0200
Subject: [PATCH 0091/1143] glibc: security fix CVE-2014-8121, fixes #7207

---
 pkgs/development/libraries/glibc/common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 01b60361e8e1..9a451d48cbcf 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -77,6 +77,12 @@ stdenv.mkDerivation ({
     + ''
       cat ${./glibc-remove-datetime-from-nscd.patch} \
         | sed "s,@out@,$out," | patch -p1
+    ''
+    # CVE-2014-8121, see https://bugzilla.redhat.com/show_bug.cgi?id=1165192
+    + ''
+      substituteInPlace ./nss/nss_files/files-XXX.c \
+        --replace 'status = internal_setent (stayopen);' \
+                  'status = internal_setent (1);'
     '';
 
   configureFlags =

From d353521423c7871a93380410e8fb06ce2d9d53f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Apr 2015 21:45:27 +0200
Subject: [PATCH 0092/1143] icu: update, probably including security

I think this should fix all security problems in icu,
if there were any, but I've found no explicit reference.
So, close #7202?
---
 pkgs/development/libraries/icu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index ee8dc5945987..e95cb7ad0974 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "icu4c";
-  version = "53.1";
+  version = "55.1";
 in
 stdenv.mkDerivation {
   name = pname + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "0a4sg9w054640zncb13lhrcjqn7yg1qilwd1mczc4w60maslz9vg";
+    sha256 = "0ys5f5spizg45qlaa31j2lhgry0jka2gfha527n4ndfxxz5j4sz1";
   };
 
   makeFlags = stdenv.lib.optionalString stdenv.isDarwin

From 49ad4c14173d8491fb8c73b5b2d294a1c898f93b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 8 Apr 2015 07:14:04 -0500
Subject: [PATCH 0093/1143] qt5: don't pin packages to qt54 now that it is
 default

---
 pkgs/top-level/all-packages.nix | 39 ++++++++++-----------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74f5f041e72b..7234be5080de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6167,9 +6167,7 @@ let
     automake = automake111x;
   };
 
-  kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 {
-    qt5 = qt54;
-  });
+  kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
   kf5_latest = kf57;
   kf5_stable = kf57;
 
@@ -6312,9 +6310,7 @@ let
   };
 
   libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
-  libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix {
-    qt5 = qt54;
-  };
+  libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { };
 
   libdc1394 = callPackage ../development/libraries/libdc1394 { };
 
@@ -7229,16 +7225,11 @@ let
 
   phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {};
 
-  phonon_qt5 = callPackage ../development/libraries/phonon/qt5 {
-    qt5 = qt54;
-  };
+  phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { };
 
-  phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 {
-    qt5 = qt54;
-  };
-  phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 {
-    qt5 = qt54;
-  };
+  phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { };
+
+  phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { };
 
   physfs = callPackage ../development/libraries/physfs { };
 
@@ -7264,7 +7255,7 @@ let
 
   polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 {
     withQt5 = true;
-    qt5 = qt54;
+    inherit qt5;
   };
 
   policykit = callPackage ../development/libraries/policykit { };
@@ -7278,8 +7269,8 @@ let
   };
 
   poppler_qt5 = poppler.override {
-    qt5 = qt54;
     qt5Support = true;
+    inherit qt5;
     suffix = "qt5";
   };
 
@@ -11012,7 +11003,6 @@ let
 
   kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
     kf5 = kf57;
-    qt5 = qt54;
     kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
   kdeApps_stable = kdeApps_14_12;
@@ -11605,7 +11595,7 @@ let
     client = false;
     withKDE = false;
     useQt5 = true;
-    qt = qt54;
+    qt = qt5;
     dconf = gnome3.dconf;
     tag = "-qt5";
   };
@@ -11786,9 +11776,7 @@ let
 
   copy-com = callPackage ../applications/networking/copy-com { };
 
-  dropbox = callPackage ../applications/networking/dropbox {
-    qt5 = qt54;
-  };
+  dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 
@@ -11809,9 +11797,7 @@ let
 
   printrun = callPackage ../applications/misc/printrun { };
 
-  sddm = callPackage ../applications/display-managers/sddm {
-    qt5 = qt54;
-  };
+  sddm = callPackage ../applications/display-managers/sddm { };
 
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;
@@ -12177,8 +12163,8 @@ let
 
   vlc_qt5 = vlc.override {
     qt4 = null;
-    qt5 = qt54;
     withQt5 = true;
+    inherit qt5;
   };
 
   vmpk = callPackage ../applications/audio/vmpk { };
@@ -13216,7 +13202,6 @@ let
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
   plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
-    qt5 = qt54;
     kf5 = kf57;
   });
   plasma5_latest = plasma52;

From 768f5a6d3e3d9826b5498e8dd5701edf29c475fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 8 Apr 2015 09:41:05 -0500
Subject: [PATCH 0094/1143] add kde-apps-15.04

---
 pkgs/applications/kde-apps-15.04/default.nix  |  324 +++
 .../kde-apps-15.04/dependencies.nix           | 1732 +++++++++++++++
 .../kde-apps-15.04/dependencies.sh            |   12 +
 .../kdelibs/polkit-install.patch              |   12 +
 pkgs/applications/kde-apps-15.04/manifest.nix | 1948 +++++++++++++++++
 pkgs/applications/kde-apps-15.04/manifest.sh  |   15 +
 pkgs/applications/kde-apps-15.04/renames.nix  |   29 +
 .../applications/kde-apps-15.04/setup-hook.sh |    1 +
 pkgs/top-level/all-packages.nix               |    9 +-
 9 files changed, 4080 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/kde-apps-15.04/default.nix
 create mode 100644 pkgs/applications/kde-apps-15.04/dependencies.nix
 create mode 100755 pkgs/applications/kde-apps-15.04/dependencies.sh
 create mode 100644 pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch
 create mode 100644 pkgs/applications/kde-apps-15.04/manifest.nix
 create mode 100755 pkgs/applications/kde-apps-15.04/manifest.sh
 create mode 100644 pkgs/applications/kde-apps-15.04/renames.nix
 create mode 100644 pkgs/applications/kde-apps-15.04/setup-hook.sh

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
new file mode 100644
index 000000000000..96f1aea68753
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -0,0 +1,324 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, debug ? false }:
+
+with stdenv.lib; with autonix;
+
+let kf5Orig = kf5; in
+
+let
+
+  kf5 = kf5Orig.override { inherit debug qt5; };
+
+  mirror = "mirror://kde";
+
+  renames =
+    (builtins.removeAttrs
+      (import ./renames.nix {})
+      ["Backend" "CTest"])
+    // {
+      "KDE4" = "kdelibs";
+      "Kexiv2" = "libkexiv2";
+      "Kdcraw" = "libkdcraw";
+      "Kipi" = "libkipi";
+      "LibKMahjongg" = "libkmahjongg";
+      "LibKonq" = "kde-baseapps";
+    };
+
+  mkDerivation = drv: kf5.mkDerivation (drv // {
+    preHook = (drv.preHook or "") + ''
+      addQt4Plugins() {
+        if [[ -d "$1/lib/qt4/plugins" ]]; then
+            propagatedUserEnvPkgs+=" $1"
+        fi
+
+        if [[ -d "$1/lib/kde4/plugins" ]]; then
+            propagatedUserEnvPkgs+=" $1"
+        fi
+      }
+
+      envHooks+=(addQt4Plugins)
+    '';
+  });
+
+  scope =
+    # packages in this collection
+    (mapAttrs (dep: name: kdeApps."${name}") renames) //
+    # packages from KDE Frameworks 5
+    kf5.scope //
+    # packages from nixpkgs
+    (with pkgs;
+      {
+        ACL = acl;
+        Akonadi = kde4.akonadi;
+        Alsa = alsaLib;
+        Automoc4 = automoc4;
+        Avahi = avahi;
+        BISON = bison;
+        Baloo = kde4.baloo;
+        Boost = boost156;
+        Canberra = libcanberra;
+        Cdparanoia = cdparanoia;
+        CUPS = cups;
+        DBusMenuQt = libdbusmenu_qt;
+        DjVuLibre = djvulibre;
+        ENCHANT = enchant;
+        EPub = ebook_tools;
+        Eigen2 = eigen2;
+        Eigen3 = eigen;
+        Exiv2 = exiv2;
+        FAM = fam;
+        FFmpeg = ffmpeg;
+        Flac = flac;
+        FLEX = flex;
+        Freetype = freetype;
+        GMP = gmp;
+        Gettext = gettext;
+        Gpgme = gpgme;
+        Gphoto2 = libgphoto2;
+        Grantlee = grantlee;
+        GSL = gsl;
+        HUNSPELL = hunspell;
+        HUpnp = herqq;
+        Jasper = jasper;
+        KActivities = kde4.kactivities;
+        LCMS2 = lcms2;
+        Ldap = openldap;
+        LibAttica = attica;
+        LibGcrypt = libgcrypt;
+        LibSSH = libssh;
+        LibSpectre = libspectre;
+        LibVNCServer = libvncserver;
+        Libical = libical;
+        MusicBrainz3 = libmusicbrainz;
+        NetworkManager = networkmanager;
+        OggVorbis = libvorbis;
+        OpenAL = openal;
+        OpenEXR = openexr;
+        Poppler = poppler_qt4;
+        Prison = prison;
+        PulseAudio = pulseaudio;
+        PythonLibrary = python;
+        Qalculate = libqalculate;
+        QCA2 = qca2;
+        QImageBlitz = qimageblitz;
+        QJSON = qjson;
+        Qt4 = qt4;
+        Samba = samba;
+        Sasl2 = cyrus_sasl;
+        SharedDesktopOntologies = shared_desktop_ontologies;
+        SndFile = libsndfile;
+        Speechd = speechd;
+        TIFF = libtiff;
+        Taglib = taglib;
+        TelepathyQt4 = telepathy_qt;
+        TunePimp = libtunepimp;
+        UDev = udev;
+        USB = libusb;
+        Xscreensaver = xscreensaver;
+        Xsltproc = libxslt;
+      }
+    );
+
+  qt5Only = tgt:
+    let qt4Deps = [ "KDE4" "Phonon" ];
+    in mapAttrs (name: if name == tgt then removePkgDeps qt4Deps else id);
+
+  preResolve = super:
+    fold (f: x: f x) super
+      [
+        (qt5Only "kmix")
+        (userEnvPkg "SharedMimeInfo")
+        (userEnvPkg "SharedDesktopOntologies")
+        (blacklist ["artikulate"]) # build failure, wrong boost?
+        (blacklist ["kde-dev-scripts" "kde-dev-utils"]) # docbook errors
+        (blacklist ["kdewebdev"]) # unknown build failure
+      ];
+
+  l10nPkgQt4 = orig:
+    let drvName = builtins.parseDrvName orig.name; in
+    mkDerivation {
+      name = "${drvName.name}-qt4-${drvName.version}";
+      inherit (orig) src;
+      buildInputs = [ kdeApps.kdelibs ];
+      nativeBuildInputs = with pkgs; [ cmake gettext perl ];
+      preConfigure = ''
+        cd 4/
+      '';
+    };
+
+  l10nPkgQt5 = orig:
+    let drvName = builtins.parseDrvName orig.name; in
+    mkDerivation {
+      name = "${drvName.name}-qt5-${drvName.version}";
+      inherit (orig) src;
+      buildInputs = with kf5; [ kdoctools ki18n ];
+      nativeBuildInputs = with pkgs; [ cmake kf5.extra-cmake-modules gettext perl ];
+      preConfigure = ''
+        cd 5/
+      '';
+    };
+
+  l10nPkg = name: orig: symlinkJoin orig.name [(l10nPkgQt4 orig) (l10nPkgQt5 orig)];
+
+  removeL10nPkgs = filterAttrs (n: v: !(hasPrefix "kde-l10n") n);
+
+  postResolve = super:
+    (removeL10nPkgs super) // {
+
+      ark = with pkgs; super.ark // {
+        buildInputs = (super.ark.buildInputs or []) ++ [ makeWrapper ];
+        postInstall = ''
+          wrapProgram $out/bin/ark --prefix PATH : "${unzipNLS}/bin"
+        '';
+      };
+
+      ffmpegthumbs = with pkgs; super.ffmpegthumbs // {
+        nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
+      };
+
+      kalzium = with pkgs; super.kalzium // {
+        nativeBuildInputs = super.kalzium.nativeBuildInputs ++ [pkgconfig];
+      };
+
+      kde-runtime = with pkgs; super.kde-runtime // {
+        buildInputs =
+          super.kde-runtime.buildInputs ++ [libcanberra];
+        nativeBuildInputs =
+          super.kde-runtime.nativeBuildInputs ++ [pkgconfig];
+        NIX_CFLAGS_COMPILE =
+          (super.kde-runtime.NIX_CFLAGS_COMPILE or "")
+          + " -I${ilmbase}/include/OpenEXR";
+        meta = { priority = 10; };
+      };
+
+      kde-workspace = with pkgs; super.kde-workspace // {
+        buildInputs = with xlibs;
+          super.kde-workspace.buildInputs
+          ++
+          [
+            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms
+            xcbutilrenderutil
+          ];
+        nativeBuildInputs =
+          super.kde-workspace.nativeBuildInputs
+          ++ [ pkgconfig ];
+        meta = { priority = 10; };
+      };
+
+      kdelibs = with pkgs; super.kdelibs // {
+        buildInputs =
+          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz ];
+
+        nativeBuildInputs =
+          super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];
+
+        NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+        propagatedBuildInputs =
+          super.kdelibs.propagatedBuildInputs ++ [ qt4 soprano phonon strigi ];
+
+        propagatedNativeBuildInputs =
+          super.kdelibs.propagatedNativeBuildInputs
+          ++ [ automoc4 cmake perl shared_mime_info ];
+
+        patches = [ ./kdelibs/polkit-install.patch ];
+
+        cmakeFlags = [
+          "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+          "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+          "-DHUPNP_ENABLED=ON"
+          "-DWITH_SOLID_UDISKS2=ON"
+          "-DKDE_DEFAULT_HOME=.kde"
+        ];
+      };
+
+      kdepim = with pkgs; super.kdepim // {
+        buildInputs =
+          super.kdepim.buildInputs ++ [ gpgme libassuan ];
+        nativeBuildInputs =
+          super.kdepim.nativeBuildInputs ++ [ pkgconfig ];
+      };
+
+      kdepimlibs = with pkgs; super.kdepimlibs // {
+        nativeBuildInputs =
+          super.kdepimlibs.nativeBuildInputs ++ [ pkgconfig ];
+      };
+
+      kdesdk-thumbnailers = with pkgs; super.kdesdk-thumbnailers // {
+        nativeBuildInputs =
+          super.kdesdk-thumbnailers.nativeBuildInputs
+          ++ [gettext];
+      };
+
+      kgpg = with pkgs; super.kgpg // {
+        buildInputs = super.kgpg.buildInputs ++ [boost];
+      };
+
+      kmix = with pkgs; super.kmix // {
+        nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
+        cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
+      };
+
+      kmousetool = with pkgs; super.kmousetool // {
+        buildInputs = with xlibs;
+          super.kmousetool.buildInputs
+          ++ [libXtst libXt];
+      };
+
+      kremotecontrol = with pkgs; super.kremotecontrol // {
+        buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst];
+      };
+
+      krfb = super.krfb // {
+        buildInputs =
+          super.krfb.buildInputs
+          ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
+      };
+
+      libkdcraw = with pkgs; super.libkdcraw // {
+        buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
+        nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];
+      };
+
+      libkexiv2 = with pkgs; super.libkexiv2 // {
+        buildInputs = super.libkexiv2.buildInputs ++ [exiv2 scope.KDE4];
+      };
+
+      libkface = with pkgs; super.libkface // {
+        buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
+      };
+
+      libkipi = with pkgs; super.libkipi // {
+        buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
+      };
+
+      libksane = with pkgs; super.libksane // {
+        buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
+      };
+
+    };
+
+  l10nManifest =
+    filterAttrs
+      (n: v: hasPrefix "kde-l10n" n)
+      (importManifest ./manifest.nix { inherit mirror; });
+
+  kdeApps = generateCollection ./. {
+    inherit mkDerivation;
+    inherit mirror preResolve postResolve renames scope;
+  };
+
+in kdeApps // (mapAttrs l10nPkg l10nManifest)
diff --git a/pkgs/applications/kde-apps-15.04/dependencies.nix b/pkgs/applications/kde-apps-15.04/dependencies.nix
new file mode 100644
index 000000000000..a088e74e6978
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/dependencies.nix
@@ -0,0 +1,1732 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+  amor = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  analitza = {
+    buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ark = {
+    buildInputs = [ "BZip2" "KDE4" "LibArchive" "LibKonq" "LibLZMA" "QJSON" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  artikulate = {
+    buildInputs = [ "KDE4" "KDeclarative" "QtGStreamer" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  audiocd-kio = {
+    buildInputs = [ "Cdparanoia" "Flac" "KDE4" "Libkcddb" "Libkcompactdisc" "OggVorbis" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  blinken = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  bomber = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5KDEGames" "KF5KIO" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  bovo = {
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5Declarative" "KF5KDEGames" "KF5NewStuff" "KF5XmlGui" "Qt5" "Qt5Concurrent" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  cantor = {
+    buildInputs = [ "Analitza5" "ECM" "KDE4" "KF5" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5KDELibs4Support" "KF5NewStuff" "KF5Parts" "KF5Pty" "KF5TextEditor" "LibSpectre" "LuaJIT" "PythonLibs" "PythonLibs3" "Qalculate" "Qt5" "Qt5Core" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" "R" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  cervisia = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  dolphin-plugins = {
+    buildInputs = [ "KDE4" "LibKonq" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  dragon = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ffmpegthumbs = {
+    buildInputs = [ "FFmpeg" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  filelight = {
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Solid" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  granatier = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  gwenview = {
+    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KDcraw" "KF5KIO" "KF5Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5OpenGL" "Qt5QUIET" "Qt5Script" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  juk = {
+    buildInputs = [ "KDE4" "Taglib" "TunePimp" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kaccessible = {
+    buildInputs = [ "KDE4" "Qt4" "Speechd" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kaccounts-integration = {
+    buildInputs = [ "AccountsQt5" "ECM" "KF5" "KF5Akonadi" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5Wallet" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "SignOnQt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "AccountsQt5" "KF5CoreAddons" "Qt5Widgets" "SignOnQt5" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kaccounts-providers = {
+    buildInputs = [ "AccountsFileDir" "ECM" "Intltool" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kalgebra = {
+    buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Xml" "Readline" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kalzium = {
+    buildInputs = [ "KDE4" "KDEWIN32" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kamera = {
+    buildInputs = [ "Gphoto2" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kanagram = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Qt5" "Qt5Core" "Qt5OPTIONAL_COMPONENTS" "Qt5OpenGL" "Qt5QUIET" "Qt5Qml" "Qt5Quick" "Qt5TextToSpeech" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kapman = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WindowSystem" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kapptemplate = {
+    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "RBKCONFIG_COMPILER4" "RBUIC4" "XSLTPROC_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  katomic = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kblackbox = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDEGames" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kblocks = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5ItemModels" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbounce = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbreakout = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KDEGames" "KF5KIO" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbruch = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcachegrind = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcalc = {
+    buildInputs = [ "ECM" "GMP" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5Notifications" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcharselect = {
+    buildInputs = [ "ECM" "KF5" "KF5DocTools" "KF5I18n" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcolorchooser = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcron = {
+    buildInputs = [ "ECM" "KF5" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5PrintSupport" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-base-artwork = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-baseapps = {
+    buildInputs = [ "Baloo" "BalooWidgets" "GLIB2" "KActivities" "KDE4" "KFileMetaData" "LibTidy" "X11" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-dev-scripts = {
+    buildInputs = [ "ECM" "KDE4" "KF5DocTools" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-dev-utils = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ar = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-bg = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-bs = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ca = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ca_valencia = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-cs = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-da = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-de = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-el = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-en_gb = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-es = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-et = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-eu = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-fa = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-fi = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-fr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ga = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-gl = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-he = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-hi = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-hr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-hu = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ia = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-id = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-is = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-it = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ja = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-kk = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-km = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ko = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-lt = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-lv = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-mr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-nb = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-nds = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-nl = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-nn = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-pa = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-pl = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-pt = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-pt_br = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ro = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ru = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-sk = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-sl = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-sr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-sv = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-tr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ug = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-uk = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-wa = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-zh_cn = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-zh_tw = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-runtime = {
+    buildInputs = [ "Alsa" "BZip2" "Exiv2" "GLIB2" "Gpgme" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "LibAttica" "LibGcrypt" "LibLZMA" "LibSSH" "NepomukCore" "NetworkManager" "OpenEXR" "PulseAudio" "QCA2" "QGpgme" "QNtrack" "SLP" "Samba" "SharedMimeInfo" "Soprano" ];
+    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "WINDRES_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kde-wallpapers = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeartwork = {
+    buildInputs = [ "Eigen3" "KDE4" "KDE4Workspace" "Kexiv2" "OpenGL" "Xscreensaver" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeedu-data = {
+    buildInputs = [ "ECM" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdegraphics-mobipocket = {
+    buildInputs = [ "KDE4" "Strigi" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdegraphics-strigi-analyzer = {
+    buildInputs = [ "KDE4" "OpenEXR" "Strigi" "TIFF" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdegraphics-thumbnailers = {
+    buildInputs = [ "KDE4" "Kdcraw" "Kexiv2" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdenetwork-filesharing = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdenetwork-strigi-analyzers = {
+    buildInputs = [ "Boost" "KDE4" "Strigi" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdenlive = {
+    buildInputs = [ "ECM" "Git" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5IconThemes" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5NotifyConfig" "KF5Plotting" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "LibV4L2" "MLT" "OpenGL" "Qt5" "Qt5Core" "Qt5DBus" "Qt5OpenGL" "Qt5Script" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SDL" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kdesdk-kioslaves = {
+    buildInputs = [ "KDE4" "SVN" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesdk-strigi-analyzers = {
+    buildInputs = [ "KDE4" "Strigi" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesdk-thumbnailers = {
+    buildInputs = [ "GettextPO" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdewebdev = {
+    buildInputs = [ "KDE4" "KdepimLibs" "LibTidy" "RUBY" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdf = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdiamond = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDEGames" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kfloppy = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kfourinline = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemModels" "KF5ItemViews" "KF5KDEGames" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kgamma = {
+    buildInputs = [ "KDE4" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kgeography = {
+    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kget = {
+    buildInputs = [ "Boost" "KDE4" "KDE4Workspace" "KTorrent" "LibMms" "NepomukCore" "NepomukWidgets" "QCA2" "QGpgme" "SharedDesktopOntologies" "Soprano" "Sqlite" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kgoldrunner = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kgpg = {
+    buildInputs = [ "Gpgme" "KDE4" "KdepimLibs" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khangman = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Qt5" "Qt5Core" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kig = {
+    buildInputs = [ "BoostPython" "ECM" "KF5Archive" "KF5ConfigWidgets" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5IconThemes" "KF5ItemModels" "KF5KDELibs4Support" "KF5Parts" "KF5TextEditor" "KF5XmlGui" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kigo = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  killbots = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kiriki = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kiten = {
+    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KHtml" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjumpingcube = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5ItemModels" "KF5KDEGames" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  klettres = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KDELibs4Support" "KF5NewStuff" "KF5WidgetsAddons" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  klickety = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  klines = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmag = {
+    buildInputs = [ "KDE4" "QAccessibilityClient" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmahjongg = {
+    buildInputs = [ "KDE4" "KDEGames" "LibKMahjongg" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmines = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmix = {
+    buildInputs = [ "Alsa" "Canberra" "ECM" "GLIB2" "KDE4" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5XmlGui" "Phonon" "PulseAudio" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmousetool = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmouth = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmplot = {
+    buildInputs = [ "ECM" "KF5" "KF5GuiAddons" "KF5I18n" "KF5KDELibs4Support" "KF5Parts" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5Gui" "Qt5PrintSupport" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knavalbattle = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knetwalk = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kolf = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kollision = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kolourpaint = {
+    buildInputs = [ "KDE4" "QImageBlitz" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kompare = {
+    buildInputs = [ "ECM" "KF5" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5JobWidgets" "KF5Parts" "KF5TextEditor" "KF5WidgetsAddons" "LibKompareDiff2" "Qt5" "Qt5Core" "Qt5PrintSupport" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  konquest = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  konsole = {
+    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Test" "Qt5Widgets" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kopete = {
+    buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "Qt5QUIET" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kpat = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kppp = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kqtquickcharts = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  krdc = {
+    buildInputs = [ "KDE4" "LibNXCL" "LibVNCServer" "TelepathyQt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kremotecontrol = {
+    buildInputs = [ "KDE4" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kreversi = {
+    buildInputs = [ "KDE4" "KDEGames" "KDeclarative" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  krfb = {
+    buildInputs = [ "KDE4" "KTp" "LibVNCServer" "TelepathyQt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kruler = {
+    buildInputs = [ "ECM" "KF5" "KF5DocTools" "KF5I18n" "KF5Notifications" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksaneplugin = {
+    buildInputs = [ "KDE4" "KSane" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kscd = {
+    buildInputs = [ "Alsa" "KDE4" "MusicBrainz3" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kshisen = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DNSSD" "KF5Declarative" "KF5DocTools" "KF5KDEGames" "KF5KIO" "KF5KMahjongglib" "KF5NewStuff" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksirk = {
+    buildInputs = [ "KDE4" "KDEGames" "QCA2" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksnakeduel = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksnapshot = {
+    buildInputs = [ "KDE4" "Kipi" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksquares = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kstars = {
+    buildInputs = [ "AstrometryNet" "CFitsio" "ECM" "Eigen3" "INDI" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Plotting" "KF5TextEditor" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenGL" "Qt5" "Qt5Gui" "Qt5Multimedia" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Xml" "WCSLIB" "Xplanet" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksudoku = {
+    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksystemlog = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kteatime = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktimer = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktouch = {
+    buildInputs = [ "KDE4" "KDeclarative" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-accounts-kcm = {
+    buildInputs = [ "AccountsFileDir" "AccountsQt5" "ECM" "Intltool" "KAccounts" "KF5" "KF5Codecs" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KIO" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "SignOnQt5" "TelepathyQt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-approver = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Service" "Qt5" "Qt5Network" "Qt5Widgets" "TelepathyQt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-auth-handler = {
+    buildInputs = [ "AccountsQt5" "ECM" "KAccounts" "KF5" "KF5I18n" "KF5KIO" "KF5Wallet" "KF5WebKit" "KF5WidgetsAddons" "KTp" "Qca-qt5" "Qca-qt5-ossl" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Network" "SignOnQt5" "TelepathyQt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-common-internals = {
+    buildInputs = [ "AccountsQt5" "Doxygen" "ECM" "KAccounts" "KF5" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5TextEditor" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "LibOTR" "Libgcrypt" "Qt5" "Qt5Qml" "Qt5Sql" "Qt5Test" "TelepathyLoggerQt" "TelepathyQt5" "TelepathyQt5Service" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Wallet" "TelepathyLoggerQt" "TelepathyQt5" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-contact-list = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5WindowSystem" "KF5XmlGui" "KTp" "Qt5" "Qt5Widgets" "Qt5Xml" "TelepathyQt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-contact-runner = {
+    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5Runner" "KF5Service" "KTp" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-desktop-applets = {
+    buildInputs = [ "ECM" "KF5" "KF5Plasma" "KF5WindowSystem" "Qt5" "Qt5Qml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-filetransfer-handler = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KTp" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-kded-module = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5DBusAddons" "KF5I18n" "KF5IdleTime" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KTp" "Qt5" "Qt5Concurrent" "Qt5Network" "Qt5Sql" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-send-file = {
+    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KTp" "Qt5" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktp-text-ui = {
+    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5Emoticons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5Service" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KTp" "Qt5" "Qt5WebKitWidgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktuberling = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kturtle = {
+    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktux = {
+    buildInputs = [ "KDE4" "KDE4Workspace" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kubrick = {
+    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kuser = {
+    buildInputs = [ "KDE4" "KdepimLibs" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwalletmanager = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwordquiz = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5NotifyConfig" "KF5Sonnet" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5PrintSupport" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkcddb = {
+    buildInputs = [ "KDE4" "MusicBrainz5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkcompactdisc = {
+    buildInputs = [ "Alsa" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkdcraw = {
+    buildInputs = [ "KDE4" "LibRaw" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkdeedu = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkdegames = {
+    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DNSSD" "KF5Declarative" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "OpenAL" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SndFile" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KDELibs4Support" "KF5WidgetsAddons" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Widgets" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkeduvocdocument = {
+    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkexiv2 = {
+    buildInputs = [ "Exiv2" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkface = {
+    buildInputs = [ "KDE4" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkgeomap = {
+    buildInputs = [ "KDE4" "Marble" "MarbleWidget" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkipi = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkmahjongg = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkomparediff2 = {
+    buildInputs = [ "ECM" "KF5" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5XmlGui" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libksane = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  lokalize = {
+    buildInputs = [ "ECM" "HUNSPELL" "KF5" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Kross" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Sql" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  lskat = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  marble = {
+    buildInputs = [ "KDE4" "Phonon" "Protobuf" "PyQt4" "PythonLibrary" "QextSerialPort" "Qt4" "Qt5Concurrent" "Qt5Core" "Qt5Designer" "Qt5Network" "Qt5PrintSupport" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" "QtLocation" "SIP" "SharedMimeInfo" "ZLIB" "libgps" "liblocation" "libshp" "libwlocate" "quazip" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  mplayerthumbs = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  okteta = {
+    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qca-qt5" "Qt5" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5QUIET" "Qt5Script" "Qt5ScriptTools" "Qt5Test" "Qt5Widgets" "Qt5Xml" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" "KastenCore" "KastenGui" "OktetaCore" "OktetaGui" "OktetaKastenCore" "OktetaKastenGui" "Qt5Core" "Qt5Gui" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  okular = {
+    buildInputs = [ "ActiveApp" "CHM" "DjVuLibre" "EPub" "Freetype" "JPEG" "KActivities" "KDE4" "Kexiv2" "LibKScreen" "LibSpectre" "Poppler" "QCA2" "QImageBlitz" "QMobipocket" "TIFF" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  oxygen-icons = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  pairs = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  palapeli = {
+    buildInputs = [ "KDE4" "KDEGames" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "QVORONOI_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  parley = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Multimedia" "Qt5Svg" "Qt5Test" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  picmi = {
+    buildInputs = [ "KDE4" "KDEGames" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  poxml = {
+    buildInputs = [ "Gettext" "GettextPO" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  print-manager = {
+    buildInputs = [ "CUPS" "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5Plasma" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  rocs = {
+    buildInputs = [ "Boost" "ECM" "Grantlee5" "KF5" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5ItemViews" "KF5TextEditor" "KF5XmlGui" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5QuickWidgets" "Qt5Script" "Qt5ScriptTools" "Qt5Svg" "Qt5Test" "Qt5WebKit" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5XmlPatterns" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  signon-kwallet-extension = {
+    buildInputs = [ "ECM" "KF5" "KF5Wallet" "Qt5" "Qt5Core" "Qt5DBus" "Qt5QUIET" "Qt5Test" "SignOnExtension" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  step = {
+    buildInputs = [ "ECM" "Eigen3" "GSL" "KF5" "KF5Config" "KF5DocTools" "KF5KDELibs4Support" "KF5KHtml" "KF5NewStuff" "KF5Plotting" "Qalculate" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5QUIET" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "PythonInterp" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  superkaramba = {
+    buildInputs = [ "KDE4" "PythonLibs" "QImageBlitz" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  svgpart = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  sweeper = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  umbrello = {
+    buildInputs = [ "KDE4" "LibXml2" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  zeroconf-ioslave = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+}
diff --git a/pkgs/applications/kde-apps-15.04/dependencies.sh b/pkgs/applications/kde-apps-15.04/dependencies.sh
new file mode 100755
index 000000000000..e00c7770ab8e
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/dependencies.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch
new file mode 100644
index 000000000000..d2ecac663ec5
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
+ 
+-    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
++    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
+         "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix
new file mode 100644
index 000000000000..c413abeea756
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/manifest.nix
@@ -0,0 +1,1948 @@
+# This file is generated automatically. DO NOT EDIT!
+{ stdenv, fetchurl, mirror }:
+[
+  {
+    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/fzwlsgxvxd1xp98ba1ksfbwjn20da65v-ktp-accounts-kcm-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-accounts-kcm-15.03.97.tar.xz";
+      sha256 = "1m9z8h2dvbwj9rxqp5kj24ndqp070nhi2qk1k07qc7shcivmcpzb";
+      name = "ktp-accounts-kcm-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cervisia-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/jszqrw79x8cxbpckhg73npzirli3axjq-cervisia-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/cervisia-15.03.97.tar.xz";
+      sha256 = "0aqfxbs1ssdpijvrw51qy131mns6br18mgv0nvys6l83ssanpn9v";
+      name = "cervisia-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmahjongg-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ygn36njvhb5vcy560z70ppzv13ilbb99-kmahjongg-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kmahjongg-15.03.97.tar.xz";
+      sha256 = "0x5qm94a3q2r0kq0k6n8iylbzq9binbkwbb0gbcm9hnylyl4chki";
+      name = "kmahjongg-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "killbots-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/38n1ajabh2s6sq3xlvxkv8r759fd8xwl-killbots-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/killbots-15.03.97.tar.xz";
+      sha256 = "0l0xjhc7vxmycn8j88h42lirl6rbn29x4rc670kcgm6ly8la5zki";
+      name = "killbots-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-common-internals-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/9zzgdr465wngzkgjplykk9l8d5shcicx-ktp-common-internals-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-common-internals-15.03.97.tar.xz";
+      sha256 = "1b813w17k013gik8i2ji2bb0m6pa8mab4bcqwsx95mv72l25ld4i";
+      name = "ktp-common-internals-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmines-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/a07306c2bs073jkq27d8kcd97cyp153r-kmines-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kmines-15.03.97.tar.xz";
+      sha256 = "089y8jzqcd1s0q0cfv9i7hcj18rj7vhmiw1rwr0pwfmnixjrn2hl";
+      name = "kmines-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkgeomap-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/3vpnb3007jxrmhr21k52nln8f73dn8lh-libkgeomap-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkgeomap-15.03.97.tar.xz";
+      sha256 = "04q45hfhck8v4hxyw7fszvz48gch4pz2aqql98ynhshx19aj4c0w";
+      name = "libkgeomap-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kruler-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/vkrpkcplvfa7mrfdjv0is8w52fzlldiz-kruler-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kruler-15.03.97.tar.xz";
+      sha256 = "0f6z9ii72dkkx8jkmf18k2mlxnflpd2n5qb36s0rzndli7n71x9n";
+      name = "kruler-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksystemlog-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/v1qxds25w9yk7m0ym2xjgdhj5ag8g9zn-ksystemlog-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ksystemlog-15.03.97.tar.xz";
+      sha256 = "1mvj308sf17ljs74y7xc1ynnqblvgjzblblfnihmg6wlbigri3sb";
+      name = "ksystemlog-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "analitza-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/4xmy1jf4ng641bshcgczy4vq1jlz4dc7-analitza-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/analitza-15.03.97.tar.xz";
+      sha256 = "0p98dcynn33yssc84j5aykhiiwdd5hgg7jdpvdzbwcqdnbnkwp11";
+      name = "analitza-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kompare-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/idhczh8j0f8h7ibbcprmrj8z45hmya0c-kompare-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kompare-15.03.97.tar.xz";
+      sha256 = "12whm20jxhcqcpx7br7m54dcbjl1z0ngjq42zn2ldp43lgd5hjpa";
+      name = "kompare-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcron-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/1svwivcnq60pbnv11wwcq0vhlbyydcri-kcron-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kcron-15.03.97.tar.xz";
+      sha256 = "18z3kn8ay69nk1anawm6k08xl4xng7rpzvqmxwiyp102bvbxv6xr";
+      name = "kcron-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kppp-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/n1ix532hcm0m1agsknsvxhmghir7zfr0-kppp-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kppp-15.03.97.tar.xz";
+      sha256 = "12jibm5xihq44kxgv7g1zfyhvp9nbv0dyxnb2gwarngqa0yv20sy";
+      name = "kppp-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/dv34q5wny1n7xwz590xcn1j3k1k3s1lf-kde-l10n-ar-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ar-15.03.97.tar.xz";
+      sha256 = "1jzal66wlkdqd85dj4rp5akrrbd80iw72swdnav3zbwlmcs53val";
+      name = "kde-l10n-ar-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/dhp5j6702hjdjyl0im5sq4pcsmyc4m6h-kde-l10n-sk-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sk-15.03.97.tar.xz";
+      sha256 = "1sm9axz2mwgvw2gws2bmr2c2nj7fk1gnmry19432b7sf7khil9as";
+      name = "kde-l10n-sk-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/q0ldpyshshs6grvdpm73d533dkdscizc-kde-l10n-sl-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sl-15.03.97.tar.xz";
+      sha256 = "1077lzin7ygjbcfb613c2lj83jiqxn85zchlcmxbkz2fmh3ycwy8";
+      name = "kde-l10n-sl-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/cbydlyizpj9nncj80a2my7anydmw11if-kde-l10n-lv-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-lv-15.03.97.tar.xz";
+      sha256 = "1x36i97a8hpkbqgxd6cfcqvyx3a1i7cl0s4bhz94kjvncmn5f55r";
+      name = "kde-l10n-lv-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-is-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/lzzcc3d64wy83rci6pkdirbgbjpfvg1b-kde-l10n-is-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-is-15.03.97.tar.xz";
+      sha256 = "0rk8km86n1iv1id9whjz6rnpzi2ncpckws9kzzk2s9lfrf5sq0wv";
+      name = "kde-l10n-is-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-km-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/hrhsn3g0rn9l7zn9664harxvd8yjcvhm-kde-l10n-km-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-km-15.03.97.tar.xz";
+      sha256 = "1kyklr6m42jc9k6py5d0f79vmc6gs0iajzsx71jpc98amqm40dvc";
+      name = "kde-l10n-km-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/3g2xlsklwbfzx2gzjxfg053gw0gssi5y-kde-l10n-uk-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-uk-15.03.97.tar.xz";
+      sha256 = "0kfvdq6ggc52hd5d1y9xmrp985magfszs9bvvv9pi3j3aawp0nr3";
+      name = "kde-l10n-uk-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/wyp8qzfx2p2nxacv85c4yg7f5bkzqs8v-kde-l10n-ug-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ug-15.03.97.tar.xz";
+      sha256 = "0ysy6548wdf6k44bylbk969cakla8zk6n2laaajxrb0ydqdy8ryf";
+      name = "kde-l10n-ug-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/k2622ylc5rq0vzcaxs2qzxw19z1lf47m-kde-l10n-ro-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ro-15.03.97.tar.xz";
+      sha256 = "032rpjnh8b0idcvcnc5lc9kkgzvivk45sw4rg2b84rlwhnvs4yxq";
+      name = "kde-l10n-ro-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-el-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/q3ibkqyra322i3q042m1nwaaxjk7vy7x-kde-l10n-el-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-el-15.03.97.tar.xz";
+      sha256 = "0f6l2j743r98j6axn2f1rn76fibcjgy3n2lw15ahiik584gjmm3c";
+      name = "kde-l10n-el-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/hsjrf139kiykjcg4x6h7j4z6m0fhh6yq-kde-l10n-fr-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fr-15.03.97.tar.xz";
+      sha256 = "1mv781g64w8vw8fx2jiavh8kdb21p0jzc3cnxgwphpz2igphs2i5";
+      name = "kde-l10n-fr-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/dgkb5dgb9gdgy7q5bicn2lmdpd891hdr-kde-l10n-cs-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-cs-15.03.97.tar.xz";
+      sha256 = "1xqj92xk69csifq0hzx367zwvck1d89izdrggcqqki5rblgywixs";
+      name = "kde-l10n-cs-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/hxdn5gs171wjz2grpbdh1x4405bj0m8h-kde-l10n-pa-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pa-15.03.97.tar.xz";
+      sha256 = "09sqxglpzkf4ai0kph4wybb2z7ccwkwgkz5n7k0iplv4c0calk4c";
+      name = "kde-l10n-pa-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-es-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/74s8g8x9znrx83ys4vqfmnf1fk0yw48v-kde-l10n-es-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-es-15.03.97.tar.xz";
+      sha256 = "0qqvqz7jcnzlw8l8wh4ngl54dnhj2hmdvha10yqh4jg93492161w";
+      name = "kde-l10n-es-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/xalqsk1g1inbk6wxirfbnjymzmf7lidy-kde-l10n-ia-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ia-15.03.97.tar.xz";
+      sha256 = "0k5gc5hf5nf6yizqdwkdwrhkhcs6hkansilr3hkwxjyl4rgn3xgn";
+      name = "kde-l10n-ia-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-it-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/n2k0lbnmwvzd6g62wm1fr451kapmdd3p-kde-l10n-it-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-it-15.03.97.tar.xz";
+      sha256 = "1d23k78pw8z17m1bwy9hnjdrfh3xsndbizir65slg7nhz3yn7zvs";
+      name = "kde-l10n-it-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-he-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/kcyax5wp8kfc52h1zhwd9kn8ix57v0ky-kde-l10n-he-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-he-15.03.97.tar.xz";
+      sha256 = "0lwbpnn3cl5069c3cqnx8g3n5k7wh1i89nj3s2qqwch13c1ri4qh";
+      name = "kde-l10n-he-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/f36j585s3fcxi3ddbnbwjcxn6dpm8g8c-kde-l10n-nn-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nn-15.03.97.tar.xz";
+      sha256 = "1s319pjkd4xlk6qjvd0smzb462dxffbldj1ls8lbq3b66qj922nb";
+      name = "kde-l10n-nn-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/l532av8373imngcmnf1zl6mixl0wjpwz-kde-l10n-pt-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pt-15.03.97.tar.xz";
+      sha256 = "0cxcp0n6qqwvnyrv595mkfvvrp09n8d07rwk2fcfyzcbiir619ip";
+      name = "kde-l10n-pt-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/k83ryjj4g5ksvwkx1ldhcp982srl4hrr-kde-l10n-fa-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fa-15.03.97.tar.xz";
+      sha256 = "07ckz57ihr90filnl37dvvnpi7snax9i21bnblmw3lckhdd9yaj0";
+      name = "kde-l10n-fa-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/00lm3069ynks9d5w2mm1nf5psya0xmc1-kde-l10n-hi-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hi-15.03.97.tar.xz";
+      sha256 = "0cw2x3p6llys54zlv2a1v383vbmyfjff9bwffs0dcxnvwpk2xbw2";
+      name = "kde-l10n-hi-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-da-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/jhsjymvl9wqpxc0wjvn37h8px16v36bg-kde-l10n-da-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-da-15.03.97.tar.xz";
+      sha256 = "0yb780ciap47sa61pz66q3w4na7yqhvj1idb3vv28zh583yzhwjq";
+      name = "kde-l10n-da-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/drhl1i7qb41n9r5767adxx7jw21x5jxn-kde-l10n-ko-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ko-15.03.97.tar.xz";
+      sha256 = "19xwgs383kcypkz90q3d05szj8s8mw96xh0vy4v492hln6vrbw5w";
+      name = "kde-l10n-ko-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/szl8g0yvc72cy83a2mzknkd0fpncyagh-kde-l10n-eu-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-eu-15.03.97.tar.xz";
+      sha256 = "07f987zsignkvgh63nn67qrspxs60nlyjgd0hjnnjagnvmm5n3nl";
+      name = "kde-l10n-eu-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/cd7lglrrq1a3d4paqlinxps93gvil3ai-kde-l10n-ca-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca-15.03.97.tar.xz";
+      sha256 = "0rdmmbj2rfjfbpdanfwrfx5mz8a1b7yibqanwsnfjmxg2x7g2amk";
+      name = "kde-l10n-ca-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/jiw90iwzrbdldkj606x598fl7ymj30qi-kde-l10n-sv-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sv-15.03.97.tar.xz";
+      sha256 = "0v9q1hd14vx658swvirlrpzlsz56563nsfykwgpwpvp4nmsy4ryj";
+      name = "kde-l10n-sv-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/j7hl9spj7dg85hdylhzv7mfjj9fs35fb-kde-l10n-hu-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hu-15.03.97.tar.xz";
+      sha256 = "084wvhsig3vdza8ik6cr7sicdhyyr0i1rp5y90mpgk9w4cpc4hdb";
+      name = "kde-l10n-hu-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/vyim28mkvi3i41ij6jv3j0ma53mczxx5-kde-l10n-sr-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sr-15.03.97.tar.xz";
+      sha256 = "0f76ynprvszvq1m2pycggfpng727dh3007hm9nfcdnic7riix7cs";
+      name = "kde-l10n-sr-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/5zg8z85gx4xbg85bv60bzq5ggiwsp6sz-kde-l10n-nl-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nl-15.03.97.tar.xz";
+      sha256 = "1k7pb79r29fc4qdq9qsiv9ngycbl47nxnsy5hhig0mijnlyjafcg";
+      name = "kde-l10n-nl-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/zgrr858247hggw2zapfqy7r6dnjk7jal-kde-l10n-bs-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-bs-15.03.97.tar.xz";
+      sha256 = "0cpv16ss70pxlmmpk6gqf7ym7lgxyyc80np1c7rqh19wi4fyyhsw";
+      name = "kde-l10n-bs-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-id-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/52y7ar13x8k9j6r6lam9lfl44ic3gnlp-kde-l10n-id-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-id-15.03.97.tar.xz";
+      sha256 = "135jh54f39c28k0x8s6r0m0zzmbxyxav9br0n963501w0xxajprq";
+      name = "kde-l10n-id-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/xiqp0z906kdvbhwv5qvpzsz2b1x6035f-kde-l10n-ru-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ru-15.03.97.tar.xz";
+      sha256 = "1jh78m3hdzplwb9min9dxzp6f0qlksrlkv1maf6145g282xyx5z0";
+      name = "kde-l10n-ru-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ck99fha1k79n8w31mj86h7ars0aj48l7-kde-l10n-fi-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fi-15.03.97.tar.xz";
+      sha256 = "155ignyq0mmcvckam8dn6hg0hfj6gvcdcnvvp30wxg6v8grk85za";
+      name = "kde-l10n-fi-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/w3d62n11mdpws1l6k33kwzssiwdj6jpm-kde-l10n-kk-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-kk-15.03.97.tar.xz";
+      sha256 = "0hb9kbz1kxdhl853jkqmxpspbrzwhg2kgns197sm0vqlzz8arjqh";
+      name = "kde-l10n-kk-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/fybjx6l20cvkb8i1dnjbrvwai7dh84n5-kde-l10n-wa-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-wa-15.03.97.tar.xz";
+      sha256 = "0n4f7lllgjhii3jzw4jk969hrkhjx89j7s12f68jsxl7b74pwxni";
+      name = "kde-l10n-wa-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6smzivm13xpsxzprjhh9jqm5v4dmlvah-kde-l10n-bg-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-bg-15.03.97.tar.xz";
+      sha256 = "0bw7bvjrn2j099nzg9yls89cf0i45hv17jnqdva75c3p4jll1jhb";
+      name = "kde-l10n-bg-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/zygnw1vxl5g44ckc4bvl0kqsaa2r1n1k-kde-l10n-ga-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ga-15.03.97.tar.xz";
+      sha256 = "14irxcprdg7zwca3d3653kpkp4xvi8h8gfi12gd4db3mr1pp680d";
+      name = "kde-l10n-ga-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/9fqz3hl48r057jf602hypf75lm83fp6x-kde-l10n-nb-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nb-15.03.97.tar.xz";
+      sha256 = "0z6dfxyi5g223f7ljpdbn5zz3zfrh3s2zi7r7pi46bzx6xi4m596";
+      name = "kde-l10n-nb-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/b2p6jnj81j8my15ms8wcirjlpspaxngg-kde-l10n-mr-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-mr-15.03.97.tar.xz";
+      sha256 = "1f89jw179s9wgrg05n6xzizdhkyxk8571rnmvczbzs11bdqkaa1y";
+      name = "kde-l10n-mr-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/rg5h97vycf8sdp0jmrsvzr0mx1lnx3s1-kde-l10n-en_GB-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-en_GB-15.03.97.tar.xz";
+      sha256 = "0j30nphbqfq0r2m6vnv0xyybqqpnxx9py0vs76kdy6v0dwqbjk9j";
+      name = "kde-l10n-en_GB-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/jswff8i15pxlhj6m16hfscg7c9i77n0i-kde-l10n-zh_TW-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-zh_TW-15.03.97.tar.xz";
+      sha256 = "0ln5dam8mhbqsvdqk6h0r01f6yw7vrncb90d9ks5qr1q636w0c2s";
+      name = "kde-l10n-zh_TW-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6civ9la05x0bdxm8l0d6ipyqwx5bf0q6-kde-l10n-tr-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-tr-15.03.97.tar.xz";
+      sha256 = "08msarjafiz3dnjw1a9x43ka780z3mpzxvil91gpbqkhypf00912";
+      name = "kde-l10n-tr-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-et-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/fbyglhlbacqjg4wfm1hny326n678iimh-kde-l10n-et-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-et-15.03.97.tar.xz";
+      sha256 = "09vpyq8i1nghpd9v27bija5fdrb4ifi90dhm8xsk22py21p7spzv";
+      name = "kde-l10n-et-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/8jn5vknwcwd2fwb2ndv7lgb96jibf26h-kde-l10n-hr-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hr-15.03.97.tar.xz";
+      sha256 = "1lvglcqwplz5nq1444dyjbnfz1g2v843hkh4nicsx98dghgsy4yz";
+      name = "kde-l10n-hr-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/c5w8fkhy6qjd6zvhfkzmpvn54lh1pc78-kde-l10n-pt_BR-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pt_BR-15.03.97.tar.xz";
+      sha256 = "0a95b9sdpwyzisb4whw9w08h1q2jdnz11lclj5zjwz1k6hwa7q2h";
+      name = "kde-l10n-pt_BR-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ymrsrgbslqdf5q9r2yk6fshl37d6mz98-kde-l10n-pl-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pl-15.03.97.tar.xz";
+      sha256 = "0gqicbckcxvpv5pcb73r91n294l6wya6xgqisybvms43afiqd1gh";
+      name = "kde-l10n-pl-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/vpgh062m2rfrdd9q4ix7dmkbdipwnapr-kde-l10n-gl-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-gl-15.03.97.tar.xz";
+      sha256 = "198sldry5k941z928vp9vqmfs7ar7n50nybl56xh5w6b4b3qvxf2";
+      name = "kde-l10n-gl-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/hzv99y7kv4cgf2l3yjr4kc16pr6b0fjr-kde-l10n-ca_valencia-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca@valencia-15.03.97.tar.xz";
+      sha256 = "0pxknkbj73a99q5ahpg2k1h2i0pdy53n4qsvc5v2k49ymb8av93l";
+      name = "kde-l10n-ca_valencia-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/gp0zgzv913f244aba7549b47mrpc1y74-kde-l10n-ja-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ja-15.03.97.tar.xz";
+      sha256 = "1l87jq4hl07vwvq8fqh9i0prw9y66fr4k2sdfbwhylzr187bh92n";
+      name = "kde-l10n-ja-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/cj4ipjrmmrx45026mifhm1sirmp9xjah-kde-l10n-zh_CN-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-zh_CN-15.03.97.tar.xz";
+      sha256 = "12f7m016fmas5ljjfiw6ws6cjv1g21w3aq5n91f2mk5c6q8y7k54";
+      name = "kde-l10n-zh_CN-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/325p1547avvvjq5ccfpdrwnqcvs01wi0-kde-l10n-lt-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-lt-15.03.97.tar.xz";
+      sha256 = "0xb33a27ajx4674vm3mavmgdd46mk23gcnj1y1zbb52nhkmn659p";
+      name = "kde-l10n-lt-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/dksx9raabi1kxan2ihy8iyzfixfymia2-kde-l10n-nds-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nds-15.03.97.tar.xz";
+      sha256 = "1lv2mmyilpfrh3nszmzhc1cq10g088cgh34yy18wvr75zvjxy03s";
+      name = "kde-l10n-nds-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-de-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/sn20qqpfq5mhi9xzs12j91kbanp6lp07-kde-l10n-de-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-de-15.03.97.tar.xz";
+      sha256 = "14w35wnh5j0x3wm69pys9ndjmfyf9066l6jc1ysas2hcqgn5mlzk";
+      name = "kde-l10n-de-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksirk-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/gi9avd4hsvl99xg9bwlaxagd2p4bmmaj-ksirk-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ksirk-15.03.97.tar.xz";
+      sha256 = "1ffg4l5gmk9p635xzk05vlhsmrksc1x0dlhwkniyndnn6bw9hxpw";
+      name = "ksirk-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/gy96gs8knilv4zncq9hwby6z6ipbjmj4-kdesdk-strigi-analyzers-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-strigi-analyzers-15.03.97.tar.xz";
+      sha256 = "0zvcma4cwdq18sy0min65gp2b0my9dmwi09vfyrlkscr7v566vm2";
+      name = "kdesdk-strigi-analyzers-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccounts-providers-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/5ximj5vm43gvzspn0gj85608k7ii53m1-kaccounts-providers-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kaccounts-providers-15.03.97.tar.xz";
+      sha256 = "03xqddswyil1g66yrn8fndq1jsmmhas96ij9f8i5y4zp9w8gzbnc";
+      name = "kaccounts-providers-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgeography-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ygckwgrmiwh09kf1g8dryljmbn8l8vp3-kgeography-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kgeography-15.03.97.tar.xz";
+      sha256 = "06hm0gbpdf72y1dvfahf0yykhvlwpkx5zmfjgj7m4hhs3fng1268";
+      name = "kgeography-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "amor-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/jb27xg2g2fnm1ricqi9f5kj66pxdagql-amor-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/amor-15.03.97.tar.xz";
+      sha256 = "1786pl826145d92wsll2l4wkx72ki8463avknz2y61gdyrzs37ka";
+      name = "amor-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krfb-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/lr5g99ymh78s05ivdp5dn4bsv5bhzpi8-krfb-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/krfb-15.03.97.tar.xz";
+      sha256 = "1dqzwmm64hbs8cbzy5mfm8kla0xsj9mia5ysl2nikpg32xw9wppg";
+      name = "krfb-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ark-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/n516a5jcj3dkqzm5p4bgz8igw78x29v3-ark-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ark-15.03.97.tar.xz";
+      sha256 = "0lrnbrw0gfmfqqybayqwbjy4vkdvlgflb7x8ssqv4jfxhwxbcq93";
+      name = "ark-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kteatime-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/jj6cqd38jpyvnni1494z39zy9klpzlyh-kteatime-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kteatime-15.03.97.tar.xz";
+      sha256 = "0znna564iaw9f9z3jnsv5r0323gg460cpya5c2adpkgzb2h1q4rl";
+      name = "kteatime-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfloppy-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/8j8csh2z1s6k602y9dq446d5w4dk9mkn-kfloppy-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kfloppy-15.03.97.tar.xz";
+      sha256 = "0dpwdgzwdxi4591qp90zgxrh91pv259q0rz8ni695vb2zmjmad9q";
+      name = "kfloppy-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krdc-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/r2b93kzslw0h8ha58xxz01hyv4jnyvrg-krdc-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/krdc-15.03.97.tar.xz";
+      sha256 = "1bk410qp0rkpksywlmgl57kn1jral1g07bdqk6iy1bfsi8qrxz0i";
+      name = "krdc-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "print-manager-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/0a5g4rrhzsl42imcy2ajg2rffwh2cc83-print-manager-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/print-manager-15.03.97.tar.xz";
+      sha256 = "01xhvdm2nx2jmf0czi1jhdg6dlwhxga3562rbvsw3s2viwppy86r";
+      name = "print-manager-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccounts-integration-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/svp29501l2ihyb3zrdhfcxdzsz6kcad5-kaccounts-integration-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kaccounts-integration-15.03.97.tar.xz";
+      sha256 = "04f326jwppgcyhslrd1w3rlahg3cjm5jb7xnbv8r987yk6avr1wi";
+      name = "kaccounts-integration-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "granatier-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/qfsrsrz4nr018bs1gsflj1aps92g616j-granatier-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/granatier-15.03.97.tar.xz";
+      sha256 = "01fp13cgblm3rvpxl3ivvh07ip8hg7qw8iqcsnndg9xwcl2anj0f";
+      name = "granatier-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-approver-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/im6h9m6jfpz2c5p9b0ihz26347f7lj3j-ktp-approver-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-approver-15.03.97.tar.xz";
+      sha256 = "0rz6nzv4fxh80x5rrjygmy22wsrpfdnz12z9in0ssdni679gbpwm";
+      name = "ktp-approver-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolourpaint-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/bgy5rbcwi14p955dskr5yrd5kd4ywz57-kolourpaint-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kolourpaint-15.03.97.tar.xz";
+      sha256 = "0r9fwrkg2bcp6rww76iicc9nk1c99pi78y23r5ixhrgpggqhd9qn";
+      name = "kolourpaint-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kscd-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/072vh5hkamljgjns6ayadkrj3d19ascd-kscd-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kscd-15.03.97.tar.xz";
+      sha256 = "1pp40y8bbixl0cyjahdb47057djff54bqad2y0zi62y0zwrdirsk";
+      name = "kscd-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdeedu-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/alp170k1qvl2azvm87anll8hblfi5d9w-libkdeedu-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkdeedu-15.03.97.tar.xz";
+      sha256 = "0ss0csdrnyjd1nb71hn9xwbfgh0hihpqa3hbylv7hwdr7zs9kk8g";
+      name = "libkdeedu-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/maldvj3ir6n7rldvds9qi8pv8i4xxbv3-kdesdk-kioslaves-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-kioslaves-15.03.97.tar.xz";
+      sha256 = "0zk81h6w1ypvmzg7jkmmyy80drdbqldxqadzyvj9spi4s5ix2izk";
+      name = "kdesdk-kioslaves-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ymx5ccf6rj3vrxrd7m4ilip3q6n1fw45-kdegraphics-strigi-analyzer-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-strigi-analyzer-15.03.97.tar.xz";
+      sha256 = "1jl5kljqrp3jifca58kf0a79j5rdvmm49skzwggxjkdiig52hfi6";
+      name = "kdegraphics-strigi-analyzer-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konquest-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/j4fv1r2bq7rpbay99612d54q9acyrpay-konquest-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/konquest-15.03.97.tar.xz";
+      sha256 = "024as4191idnnqp98nbbzwlfpdh09fk0hkqcjc8bx3f6k1ijgm68";
+      name = "konquest-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kig-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/17kzr6sx4qj2j6v98km0dyds6vakp4yn-kig-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kig-15.03.97.tar.xz";
+      sha256 = "0gzrdla005flqgz8lgdskh5p4gczm7682mx2csqji74pmam4cz8k";
+      name = "kig-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kamera-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/na94hwvpdpssdfk0pgyy2b48k4xslnwl-kamera-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kamera-15.03.97.tar.xz";
+      sha256 = "0bd5dj81c75yl5d23nlih5hwjj0w3rd7r48iyrbc6f6jf5n2wbxq";
+      name = "kamera-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "palapeli-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/s60dj8yc70gk2iaybn9g6gb8qh3fis5i-palapeli-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/palapeli-15.03.97.tar.xz";
+      sha256 = "0wk5rwhijkg13hqyjj9nxd3yfqpq3czrsqsvd7qam5wndz9qvcln";
+      name = "palapeli-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbruch-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/0sfm45adnxqzqj1y39yvhvraaw1ym14n-kbruch-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kbruch-15.03.97.tar.xz";
+      sha256 = "1ph2wvc236gnvc1m66dsamfplxy013q3l5yhyn32q7zdnsf70c8x";
+      name = "kbruch-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lokalize-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/26fkssl1j9hxcf4a1sz7bna65w0h4qnx-lokalize-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/lokalize-15.03.97.tar.xz";
+      sha256 = "1d2i96laj0lykxgxyrpgsa4847jxm5sr8r3fx902fzww1jrnym78";
+      name = "lokalize-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kget-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/lxx2qmp8i27f5w7ywg5zxzwir4vvnvw3-kget-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kget-15.03.97.tar.xz";
+      sha256 = "0d815w9lxq352h13kgglacf2j9vq6f097ds25f892hhxbndrp8nk";
+      name = "kget-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwalletmanager-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/y9lvm079ijqwxb8ccjkyfn3w72vkb3ql-kwalletmanager-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kwalletmanager-15.03.97.tar.xz";
+      sha256 = "17f792q6n7n9wmkbjl0dlc7h30gnxgwli5b25zfgxja8zg0jpj22";
+      name = "kwalletmanager-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolf-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/63qjz32hnqjbrffrwmqf1yff5ypndqka-kolf-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kolf-15.03.97.tar.xz";
+      sha256 = "0p8c2bl4qpghfgkbl6iqjr5b38ndf6afjciaivi14mximbyzbh0r";
+      name = "kolf-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktimer-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/7m91r3kgb0wig6sfwd3bbgs0jg6g605y-ktimer-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktimer-15.03.97.tar.xz";
+      sha256 = "185d6rx5pamkiw66k67fmq2bzi2a47784l9hr21dj303vw8i47wm";
+      name = "ktimer-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kigo-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/fvyllq15h7lrwnsq783pk544x80mnyy2-kigo-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kigo-15.03.97.tar.xz";
+      sha256 = "0dz1zy4l2dkbnv57yhcy3m85d8smb66jj1l0gxyk7az72v84gkai";
+      name = "kigo-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcddb-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/2yqqhcg2rwrjdzmqrsyws0r98w5lzfll-libkcddb-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkcddb-15.03.97.tar.xz";
+      sha256 = "1mq8gjdyswdxgsa8h9kiq86qr79wm2c4xbd39x42k574ld3a9hb1";
+      name = "libkcddb-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapman-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/bsw2jxhivvp72fxjsbbr7vh05dbwnq4n-kapman-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kapman-15.03.97.tar.xz";
+      sha256 = "18lvjb4kw4jghxnqd70qnwm6nizmhpyqb196mjdgca1b4yccxagz";
+      name = "kapman-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6s4rvbx5kmrcrp87dxlq89yqphc3s0i2-kdegraphics-mobipocket-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-mobipocket-15.03.97.tar.xz";
+      sha256 = "0rrir6ljzapfx13mag1xg7953r1lkbm8ghi9vh317qb1qcc3r6gn";
+      name = "kdegraphics-mobipocket-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kuser-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/qnqf58icdkspgy9lrnb5sgxhvd4cgi5i-kuser-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kuser-15.03.97.tar.xz";
+      sha256 = "1d6gcxpjxwkcywfw0kshc5h9f9hwc3wj5mr2i08qa8jwc9r2givg";
+      name = "kuser-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdiamond-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/a2l33j3d8az9pyzxwj91jsi8fxdxca7q-kdiamond-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdiamond-15.03.97.tar.xz";
+      sha256 = "0hfp2qfrkwm9ikk9vixdcfam61zgkhzaf38vqcb4bgshikvr1p21";
+      name = "kdiamond-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "mplayerthumbs-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/qmk99gqqfi65mw645d42g50dhc5x04bj-mplayerthumbs-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/mplayerthumbs-15.03.97.tar.xz";
+      sha256 = "1i621i1blh6xsvxk5xqgzgad1w8wld2qdlv4ywh5ab1glhzkm85i";
+      name = "mplayerthumbs-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-baseapps-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/k38m1i2v10lg56hz55v5nsq0xr782kq7-kde-baseapps-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-baseapps-15.03.97.tar.xz";
+      sha256 = "0bd3axrxnr7ydhl06skvb1v0254gx0nws7lcl3p41ymd3flkygbc";
+      name = "kde-baseapps-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/4ayjbvs3jq9fdkfxp93bgx8fj3amkzip-ktp-filetransfer-handler-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-filetransfer-handler-15.03.97.tar.xz";
+      sha256 = "0dw696s1sp8g5n8j54zg743kf3l6iaanqw7q6yawvawx6h7pq8hz";
+      name = "ktp-filetransfer-handler-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktux-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/9gvqvglrrdlqs66w7bqbbhk23hyb7q9m-ktux-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktux-15.03.97.tar.xz";
+      sha256 = "1qydzqsr3xaxdgp6fck9qfzn5sn7k7gqs9pnj0j79kxsj5kqmxby";
+      name = "ktux-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-utils-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/45rkyfima16qf8m5i33pgjhhm899f3kq-kde-dev-utils-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-dev-utils-15.03.97.tar.xz";
+      sha256 = "19ks03y8n8ld5d0pwsgcs8znlpsvczdgf07lg286rv4qd337bn9d";
+      name = "kde-dev-utils-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "pairs-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/k5v5aqiw9irbz8vn2shsfyy12fziz80r-pairs-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/pairs-15.03.97.tar.xz";
+      sha256 = "07ayicd59jk0fz0jzigdnx0xsqaml9wc85k2xwl7171ly19gmdl8";
+      name = "pairs-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dolphin-plugins-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/0zxs3hp9y23566xjspk0k9h74bygxam9-dolphin-plugins-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/dolphin-plugins-15.03.97.tar.xz";
+      sha256 = "01zkpkn741pnmnamf42p0i43j4z2mv8x9xclsbxq4x56jdclpi1b";
+      name = "dolphin-plugins-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kstars-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/plq1hcmz2yv44sqxlfnrg2rfny0cn13n-kstars-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kstars-15.03.97.tar.xz";
+      sha256 = "14r7d5cwx52lbh2dp4rqvvq53g93zjp11kh8jknibfh3rx2j1g3g";
+      name = "kstars-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khangman-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/qw1fzl3g5ax1xbhs02ys9axnpi6ycwqx-khangman-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/khangman-15.03.97.tar.xz";
+      sha256 = "1kryg8c9vj5z1jcjgmj5x7s2jxhlb6jrdvyb5jpmsc00kkbiq55f";
+      name = "khangman-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "superkaramba-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/9rgk4ahf3vp7g56vhwkf0h20llzi0q5i-superkaramba-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/superkaramba-15.03.97.tar.xz";
+      sha256 = "13cqka2l6lnlk3z6650rdw36pfislsnm8j82qakm2w88x0czmygb";
+      name = "superkaramba-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiten-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/f3b6vzsaqpxs76g2qr748m1lbkp5w2x7-kiten-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kiten-15.03.97.tar.xz";
+      sha256 = "10vjhhivy06nrd3iqcqny2misg878q6i6ikig2a0spsjqxsykivf";
+      name = "kiten-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sweeper-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/2g0zw9y5fq2wkfdbws58hbbz824ck59l-sweeper-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/sweeper-15.03.97.tar.xz";
+      sha256 = "0p4hmjz36znr2w3a9b01mx9pygwbnsbmybc0lr6w1hjk66006slj";
+      name = "sweeper-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konsole-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/y3405ndszj3rwsll7n265wwk7b4zs2wr-konsole-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/konsole-15.03.97.tar.xz";
+      sha256 = "0gjv58sz55jybcq15pl1nnd3y9xw41rmw9ql7h155rxyyr1sicfg";
+      name = "konsole-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcachegrind-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/kw8g49szvz2q8sr2rw8gkgk3njjr2hai-kcachegrind-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kcachegrind-15.03.97.tar.xz";
+      sha256 = "09lqqwknzgwnx3wy2kbdh1ci971vpjq5zpnyhlfrq7ngb471469y";
+      name = "kcachegrind-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "katomic-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/1d2pfw38a4pbvw12a0py52c31a07mf6y-katomic-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/katomic-15.03.97.tar.xz";
+      sha256 = "04qcarmkzm914rwfwc2jpgp3p5kdv158k066kpmhfg83sbd5nicy";
+      name = "katomic-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalgebra-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/hq5ln85966sl8azjlmqk3r42niy2w7hz-kalgebra-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kalgebra-15.03.97.tar.xz";
+      sha256 = "0sd1fl57xli8gwn8g1byshyc74mbqp949h5jq0r1pwcvvcxn4zih";
+      name = "kalgebra-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knavalbattle-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/kjrn2cxkzkhnc5fdsvhbailmn1amag6a-knavalbattle-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/knavalbattle-15.03.97.tar.xz";
+      sha256 = "0p6h0c2msg930yvx6fy0xa5is9y8dhrzahiir6rk5mp3i4iiczsw";
+      name = "knavalbattle-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmag-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/dxzhs1qgzsyjs1ryrajdyynszh2vc829-kmag-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kmag-15.03.97.tar.xz";
+      sha256 = "0a5ibbzxj6dxxnafmgs5rfxmg80hg7kviqadkam7argv2kqqqyf7";
+      name = "kmag-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-contact-list-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/hip8z67xgz9c6il2km70jjyj1ffybzdb-ktp-contact-list-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-contact-list-15.03.97.tar.xz";
+      sha256 = "1q9m91a5caxill86pzx05wkqb57vgxpcgvjjwfdk80xy1jfjl0mj";
+      name = "ktp-contact-list-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kollision-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/yhh09c7kvvsbla8ml2s1x0vxmshqkqv5-kollision-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kollision-15.03.97.tar.xz";
+      sha256 = "1pck211yp3z93ypmi6iglvbjjm76hd8c5862zh32z04wf9flj67c";
+      name = "kollision-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "svgpart-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/zxw8q532b6iakic511m1p4rqxlwszmcy-svgpart-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/svgpart-15.03.97.tar.xz";
+      sha256 = "1vs5pnnwjawvyw44mh0bhjb1nf432jfv2a5d8q8yfh17dw7yc4n4";
+      name = "svgpart-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdf-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/z45gsfngyzihcfsr1fxv72l0pclxj4wv-kdf-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdf-15.03.97.tar.xz";
+      sha256 = "15kjbgl1ddwpmcrmc1gv1zd2kvywicy866ib1ab413w90h8ch6pc";
+      name = "kdf-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/f6gzb36gsgkpwfyz9vf125fc80hsd8h7-signon-kwallet-extension-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/signon-kwallet-extension-15.03.97.tar.xz";
+      sha256 = "1jn7bn3asd3z6zdw9f8kmw5qrd6qc3xkb9hwzfdiyzvnx4mkphkl";
+      name = "signon-kwallet-extension-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "gwenview-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/k4kw8xlacdm3cszh21a8kcznj5qw0szx-gwenview-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/gwenview-15.03.97.tar.xz";
+      sha256 = "1qznk4aw8bp0d5hqqmrwfgjdmlwzp71dckik0xw5kcl19y2yb50j";
+      name = "gwenview-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dragon-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/5m5q8y2xyvcl81k1rsqivv4w1hki8rp8-dragon-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/dragon-15.03.97.tar.xz";
+      sha256 = "1vv7k807kpfyfkj2hckdx9i83br1w87q0c280q79c0867kqz93ly";
+      name = "dragon-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnakeduel-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/2q9z23rlgzgliqdd9ay7213diwpwp4n2-ksnakeduel-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ksnakeduel-15.03.97.tar.xz";
+      sha256 = "0pfadpsg35dwy5gxb0w8f2kwam1hsr1hxhnk59rck42a00vgm9a5";
+      name = "ksnakeduel-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiriki-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/p4ya7jqqlhdhvw889qfy31x03akxpsh1-kiriki-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kiriki-15.03.97.tar.xz";
+      sha256 = "1a589bnqfl678mpah6lxm6cif3gn1drsb9d9mfq8azsxa9385hm0";
+      name = "kiriki-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkomparediff2-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/0a3yw0r25hp00j0k9y2qafysiwss7382-libkomparediff2-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkomparediff2-15.03.97.tar.xz";
+      sha256 = "0g2ivgpxmjfk5grqiw4y5j9k6bzrkyyrghq2kf8s6598k78cr6r0";
+      name = "libkomparediff2-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/b8fy5jqvnrnqga38g2srsd3yh8hm1m0v-kdegraphics-thumbnailers-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-thumbnailers-15.03.97.tar.xz";
+      sha256 = "00knd3apdy6x3p2sp8qqlhamk8p1wgzikximx4qqfnkpjxh13bhp";
+      name = "kdegraphics-thumbnailers-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-base-artwork-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/nrfkmwagh0q5p3f5qjr3yyzzwjisqnyb-kde-base-artwork-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-base-artwork-15.03.97.tar.xz";
+      sha256 = "0zqs8bmnl8lzw9a9830bgxpx9jf03wp2c21f5jd8d1fg1pps0z0i";
+      name = "kde-base-artwork-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "poxml-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/rqwxd5519acl8q2672iq88vs2zqsrkl8-poxml-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/poxml-15.03.97.tar.xz";
+      sha256 = "1lsyld927xcqi875r8q7gvcy0jx1zbizwnfiwax5hjmk8qcv92h9";
+      name = "poxml-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-kded-module-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/j80ahh8qk9yyp3aim9ng7hddw2rk9bin-ktp-kded-module-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-kded-module-15.03.97.tar.xz";
+      sha256 = "1gxk9i4yf8x4kivkji0850i64vqqir1rpmv7mi31ka0lxrnh9426";
+      name = "ktp-kded-module-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/z9kvvyqq45jyj4waqw62nwsqglh179bn-ktp-auth-handler-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-auth-handler-15.03.97.tar.xz";
+      sha256 = "1pgh1700iq0l9ayn09vfwbqcaz430r1p452fhsawa9cqhh5fb7y0";
+      name = "ktp-auth-handler-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblocks-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/pviq202zvlr66w44nryi7sy8n2345rn9-kblocks-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kblocks-15.03.97.tar.xz";
+      sha256 = "0ix8fxrkppp5vx0gp8pmcx9cckbnp3v06mwq98ca3pfdm63g6ld3";
+      name = "kblocks-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/rc1kfmfq3y62m7sxirpnds1afwhg5618-kdesdk-thumbnailers-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-thumbnailers-15.03.97.tar.xz";
+      sha256 = "0dw2g7rxb02sky91k86bk59ihwzzadbm89gj6kizzibj31dfgza7";
+      name = "kdesdk-thumbnailers-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksane-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/76wzxhdcg2wpl5fbm2d8vphnv5wm592m-libksane-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libksane-15.03.97.tar.xz";
+      sha256 = "0p7mpk2sfiq85v6f7cr1wffrgnpw33dy8x3g8vv8xbh0bry0f6vj";
+      name = "libksane-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6bc8lg99jgzzix5py3kmzn5s23nzb543-zeroconf-ioslave-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/zeroconf-ioslave-15.03.97.tar.xz";
+      sha256 = "11m3212np5i0mifzxcw8g21mbighf4512whwaipizrr5pkmiqaq0";
+      name = "zeroconf-ioslave-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kreversi-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/bn905pbkkw9pfk1zi4ibgvgbvqmmg3bh-kreversi-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kreversi-15.03.97.tar.xz";
+      sha256 = "060l13gvg40sb35ysf3s3b6rf9dcqxbg7lxq1mrkq9b41gnnwffs";
+      name = "kreversi-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapptemplate-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/4mszqip3y5nxh2sdicrljgkahzd4g76p-kapptemplate-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kapptemplate-15.03.97.tar.xz";
+      sha256 = "0ydp2dllzcm1clxlmlbz7das9kgxlgy10qazs9bqmciydz3s67qf";
+      name = "kapptemplate-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "picmi-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/dazflxly4rz3bcg7np3nkzkm1rv835kn-picmi-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/picmi-15.03.97.tar.xz";
+      sha256 = "0wrk1clrg7k3fb48bx11kbp3a71riw9ghjvmjwsvliv5iry6lijf";
+      name = "picmi-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebdev-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/gs44r2c2nxj0dy367xjyqx5k7x952wb9-kdewebdev-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdewebdev-15.03.97.tar.xz";
+      sha256 = "1g15jvpismsya39j27ikwhm7gy36kshxfdzfg6s53vgfh7kxba3s";
+      name = "kdewebdev-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cantor-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/m2qzkyb1yry7a9qia5vys08smymzh1fx-cantor-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/cantor-15.03.97.tar.xz";
+      sha256 = "0zy8pc55j63y4m7zkg700rr1561gvq5iq5g729csaaj5rxrs0qma";
+      name = "cantor-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-text-ui-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/5fdsd7z8lwn3i9iq17zcvjxqglw7d2m5-ktp-text-ui-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-text-ui-15.03.97.tar.xz";
+      sha256 = "0crv5y7c01v5s5y9mfbaz862kiyabii6ys1mv7zd1y9j1jlncmbc";
+      name = "ktp-text-ui-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbreakout-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/h6p7mjbmvzilnh64sgssy5ibk59niqck-kbreakout-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kbreakout-15.03.97.tar.xz";
+      sha256 = "1a226j933pb338i61zhfbj4qbfim47ac660g35ka49r9pd2r97h7";
+      name = "kbreakout-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "marble-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/0gjp7ilj861p1gcyabcd593ai1fsb5cm-marble-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/marble-15.03.97.tar.xz";
+      sha256 = "1saifm5y1ldyrbmqqbl42cyybxh830rs6v33pxx9ra29ynir3pnh";
+      name = "marble-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ycrpyyiz3x1x9m4fkvryqad2bhgwzlr1-kdenetwork-filesharing-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdenetwork-filesharing-15.03.97.tar.xz";
+      sha256 = "0wcg17p1wqqrxqmhqa216aps78r9w061s0a62243k1avfag4mn5d";
+      name = "kdenetwork-filesharing-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/m4d76q6jhxiy16nchx1bxfwavr3947q6-kde-dev-scripts-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-dev-scripts-15.03.97.tar.xz";
+      sha256 = "1nfanhgv8kzzak76brg71vwdbdz8nbhc457a5a21x3qa6q8y9cfv";
+      name = "kde-dev-scripts-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/nb1h1vyf5yic9dbf02lz8x6j54x9qjcl-ktp-contact-runner-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-contact-runner-15.03.97.tar.xz";
+      sha256 = "1pddmcmmlpan5ahykisfbijg5lkl1bffcc60xxlcanxb5s6f2f7i";
+      name = "ktp-contact-runner-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/spp4d4shq598fzvlz27gcvzkj1wd5nk8-kdenetwork-strigi-analyzers-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdenetwork-strigi-analyzers-15.03.97.tar.xz";
+      sha256 = "1a084dxal4l2h92mnzi6brwj5fy0393jwk53ph6lh4nc7902jsjn";
+      name = "kdenetwork-strigi-analyzers-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdegames-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/him1cfdfb128nr9l2aa4qj8bzrh3vmp6-libkdegames-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkdegames-15.03.97.tar.xz";
+      sha256 = "05s0yab89mw6997akr12jlx0zfx4365g5y96929np0qrc1vmysv3";
+      name = "libkdegames-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkipi-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/rnyfpdin4s3a0gksi82h8gyq7fkx750f-libkipi-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkipi-15.03.97.tar.xz";
+      sha256 = "1ckvjc528p2899sszw0z7z9cn6ayimcq2d7grp7bnlkrri1dwgm4";
+      name = "libkipi-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "juk-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6hvijhzrxkky1nxw88zmc5gaw16k26b9-juk-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/juk-15.03.97.tar.xz";
+      sha256 = "1749dn860vzzxbix3rnwlmg8gsa8fgjzy3dry6zv2hrwzvdd0x2c";
+      name = "juk-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "audiocd-kio-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/1qkh8akfvjmllbzz06jszpq6yqp4504q-audiocd-kio-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/audiocd-kio-15.03.97.tar.xz";
+      sha256 = "12djfs6dnvqjpmjjp32rls76l2fh43snd7d351qcyvylg1xzszzk";
+      name = "audiocd-kio-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeedu-data-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ykqy9kcqmsiqnm3f4i3dd4yn6a4ckac4-kdeedu-data-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdeedu-data-15.03.97.tar.xz";
+      sha256 = "0a31pwim66i5581kxqa9zp96n7ynbm9q133mmp6mznrkh719wmmq";
+      name = "kdeedu-data-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-icons-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/l5m57r1rs0dnd44snj35idjrxclz3c30-oxygen-icons-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/oxygen-icons-15.03.97.tar.xz";
+      sha256 = "0b3m1wsv21pfsls7xgrbdydskspy4sfyd36hisd3yq2m4l2rzhla";
+      name = "oxygen-icons-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfourinline-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/gi0k7kp0aw1f8bp5jyqg9zhzzcgd53ch-kfourinline-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kfourinline-15.03.97.tar.xz";
+      sha256 = "0bzp31i2lk14p17rzmdgia3wb1sl52a16rkigf7bixsxh0kpmjp8";
+      name = "kfourinline-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdcraw-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/s9vvyqnqqyqxw5xf3hmhrkv2ql6h1xl0-libkdcraw-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkdcraw-15.03.97.tar.xz";
+      sha256 = "1v0klb3p8g05r4g0nmnw606cjr5pcm79wbf2sxcx3a62h8hfd1ab";
+      name = "libkdcraw-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenlive-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6h09z9zvai18h5i6mcd1h1qixjn7rv7z-kdenlive-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdenlive-15.03.97.tar.xz";
+      sha256 = "078jwsi6zgxz8g9wzgsx58px019y62vwizx1f4mdb1l59zz4qs66";
+      name = "kdenlive-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "artikulate-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6ll6l4smmasjf6v6ilcyqfiqcyfv9lqc-artikulate-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/artikulate-15.03.97.tar.xz";
+      sha256 = "08zlxxjq2axfv7q6hvm90yppc19rslic43lwj7v3rlbpzafg6bfw";
+      name = "artikulate-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktouch-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/57fg1nxpfmx0g2v7z99gz88h9krgzx6v-ktouch-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktouch-15.03.97.tar.xz";
+      sha256 = "0kvd8lps9mwrj829jyjnm30nvv45k7v9bdrfjbign9qzncchfyzn";
+      name = "ktouch-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kopete-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/xsak17jj48is7x0cn7qc2ivlfldvssbh-kopete-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kopete-15.03.97.tar.xz";
+      sha256 = "0cqi4r6ks8320cl2ndjmlhvbbz0g5xjkrn8h5vhvhcx6hzllqfjz";
+      name = "kopete-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klines-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ga4495j41nv294455zi3kjyd8f81klim-klines-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/klines-15.03.97.tar.xz";
+      sha256 = "0pchlv45y3bga30fka4sa81hp6wpb9n4bsjcfisivwcq9l1x2xx3";
+      name = "klines-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmix-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/ln69lwqgwrlj6lvgz7rndxi5f979blph-kmix-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kmix-15.03.97.tar.xz";
+      sha256 = "043gc9dnc6lrpgnqqkqzc2ybp5wj9xkpwb53r7bzvr02aivci85i";
+      name = "kmix-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcolorchooser-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/lz6spcw13ab1ac21hc3bkg1v7rgkjzh9-kcolorchooser-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kcolorchooser-15.03.97.tar.xz";
+      sha256 = "0d2y21frbmq9ga4aqhr0x1bkjdx10564f8xadaymh6q8wvygizmy";
+      name = "kcolorchooser-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksaneplugin-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/r4cdj27zvlsi1w0989l97v8h02j66aif-ksaneplugin-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ksaneplugin-15.03.97.tar.xz";
+      sha256 = "0zng7rxy5qf3lrds90a652s1qjd8rrzc2b895i08kf85p4mqi5k2";
+      name = "ksaneplugin-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksudoku-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/iv657wf7d2jzdcyagpih9i1zjak1x4q1-ksudoku-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ksudoku-15.03.97.tar.xz";
+      sha256 = "09z4jk68cakp68rnz0q1xwfyxa1ykphyl639nmqzm2djfs98kph9";
+      name = "ksudoku-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kubrick-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/f310bqpghnfsszcmz1mijr768pb75cwn-kubrick-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kubrick-15.03.97.tar.xz";
+      sha256 = "12q81gggxfd7s2pwziw3z9p18kd4lapplc6cvg6wycf62gv7zxj0";
+      name = "kubrick-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okteta-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/i0xk4a4bsg33lz0hi2ppbjmkv135kayr-okteta-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/okteta-15.03.97.tar.xz";
+      sha256 = "14pd1zag13qqd5nq25shq46hrgh7m45ch06w5hb5cqg3zc6zv5lm";
+      name = "okteta-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgamma-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/zq9mxrmdsrdnwi3wzx53xnz67907wpa3-kgamma-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kgamma-15.03.97.tar.xz";
+      sha256 = "18h006i0fm997i9k1r4il5pj217klhd8xgan0jpx56kbvh0csd19";
+      name = "kgamma-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpat-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/nx9ifsjl88y9r84zki7hm7d0ss7fmxyz-kpat-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kpat-15.03.97.tar.xz";
+      sha256 = "1yz5sv3j2fjw89qdrm96xqr04fxrnpnsa1y6i5y5381hcd9r9j6m";
+      name = "kpat-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/j3y9bi6k3ljsbgd1wclylq6scqq12xn4-libkeduvocdocument-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkeduvocdocument-15.03.97.tar.xz";
+      sha256 = "1sayd4pipx2hgafxw03pjigjmqk5vkz2cbc3wjvwzsaanphg5sr1";
+      name = "libkeduvocdocument-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgoldrunner-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/syj9kp9rm42nnl9zr90y3fdkjmmmx3gr-kgoldrunner-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kgoldrunner-15.03.97.tar.xz";
+      sha256 = "1rcvd6dmdnwr44w8aq4bg9z88byz398dqq5ljjnb7g205khwkq70";
+      name = "kgoldrunner-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmouth-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/xj18z9g22xdwj527i6jmimh5f48966zc-kmouth-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kmouth-15.03.97.tar.xz";
+      sha256 = "0m8fl816g49ffg65rff1ml15hp4zdgny3j2s4wwyr7csnh1cyx9s";
+      name = "kmouth-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcompactdisc-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/vgnd6d8h7ljsyw1c3d3amfndy648mhhh-libkcompactdisc-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkcompactdisc-15.03.97.tar.xz";
+      sha256 = "0by16b1c99xnf4cif909yxgfbd4kwxp2x0wbgsrvmhrrll18ahrx";
+      name = "libkcompactdisc-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klettres-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/qh7laq9bq945p4nwkgl9cczfa67c3k8d-klettres-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/klettres-15.03.97.tar.xz";
+      sha256 = "0rc3sgnzv4lvkbp3bf1lgqzffvpnv88c21m95y1anl357yfqhpll";
+      name = "klettres-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lskat-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/kznx0jnx85vmkkhag5nzdylghaham14l-lskat-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/lskat-15.03.97.tar.xz";
+      sha256 = "0ml5r1p8x6sgxjk3fkqsvyrwaqnyyjxjy4jrsxq29z5bcsxwkdwl";
+      name = "lskat-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-runtime-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/y1l5d03ds6c9mi1hq0k85aslncls27zx-kde-runtime-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-runtime-15.03.97.tar.xz";
+      sha256 = "1f008crhnx58h28hn3mjm8ggqwwix42jg3vbch3zg6qf3y5g8pbl";
+      name = "kde-runtime-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/licjww29xgrhn22ic9s5zcm6321d8jdl-ffmpegthumbs-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ffmpegthumbs-15.03.97.tar.xz";
+      sha256 = "0116dd6lijy943hq854x0ksywqxpswvn1sijmd32bii65i4w4jkf";
+      name = "ffmpegthumbs-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjumpingcube-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/84bklrq71nsbw458czr4s9i0s612j3b1-kjumpingcube-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kjumpingcube-15.03.97.tar.xz";
+      sha256 = "1gdfgi3sqx2ix91qc1xbb2njsc92qqs70qg1y1i58hxd6y9zcba4";
+      name = "kjumpingcube-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kqtquickcharts-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/xk3c4d55xm6b67n5gxip9b14cinlyhzi-kqtquickcharts-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kqtquickcharts-15.03.97.tar.xz";
+      sha256 = "19q714d93il100qrdyq368jdr9cdrspm597rnw70wns0yh4yxla6";
+      name = "kqtquickcharts-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okular-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/rxdcw4768763s3665d971315dp0h6khy-okular-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/okular-15.03.97.tar.xz";
+      sha256 = "1jvppqlq94n81shh41dx1q53d321fiy5wg6gai96klyk5apnavr7";
+      name = "okular-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeartwork-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/3s350sis8fvm65dza217jj8ahmawwjs9-kdeartwork-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kdeartwork-15.03.97.tar.xz";
+      sha256 = "0fg261vrygxr97rn4yy8n8150icvnj8alkvva5s1hff46z1pjpn2";
+      name = "kdeartwork-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knetwalk-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/dzp0xprdjz6fvxp0pd2msxdi296yxnxy-knetwalk-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/knetwalk-15.03.97.tar.xz";
+      sha256 = "0pf658hdzzm5ax9753iyhxdq54y2rkwb22i31iqrq01m56mlqflk";
+      name = "knetwalk-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmousetool-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/s7zbpyk892flqfyr7b8h9qxg97wdsmbj-kmousetool-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kmousetool-15.03.97.tar.xz";
+      sha256 = "0slvrl6wn5c213wfpjpdcbq89rml2afcvfhrq7vw4kxc6xv57811";
+      name = "kmousetool-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktuberling-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/gssrywn435h5z1xk2lplll0gvkxlihd2-ktuberling-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktuberling-15.03.97.tar.xz";
+      sha256 = "1i6k3kpsn58bjj6187q0lay29xyknfn9k69qr4i8ry81j73qbm77";
+      name = "ktuberling-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalzium-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/1wb93a12gm4ygqfdhwn83s1z5ma2y69n-kalzium-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kalzium-15.03.97.tar.xz";
+      sha256 = "1wz9mksqk3d8n0pgj1sxfrdxgann8d6v4dj2vfl6l600ip0mzycw";
+      name = "kalzium-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "filelight-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/c135ykjfry7k6fk5khr1sicwkckvp52a-filelight-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/filelight-15.03.97.tar.xz";
+      sha256 = "0c30n68mbrp2cnqwbrh2r15vm4nppcrfxizsqc4gnfhrl1p3yyiz";
+      name = "filelight-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkface-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/jbdz7p1hl659yyrziql6aqynh8353p9a-libkface-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkface-15.03.97.tar.xz";
+      sha256 = "1gd719gxcrg88hnbdd01zflkphlrkfk3vl29w566vfg9wgdh93fj";
+      name = "libkface-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksquares-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/8gjxjvxh20x22wcwxpli2zkj9bjcwbn6-ksquares-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ksquares-15.03.97.tar.xz";
+      sha256 = "0ylpnhcccfxbkkjhzs907saq9rmqkin41ynzn1pik6y4g8asgjgf";
+      name = "ksquares-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bomber-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/2yg9z2ayyi77z7czj2phpbjdbdx2mdmv-bomber-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/bomber-15.03.97.tar.xz";
+      sha256 = "08hgj0gpkqj644nl9c9jcrqkzrz9dhh91rkvzkn0c9080s21xqhn";
+      name = "bomber-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccessible-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/y7ga3ldhk55z9r2iji8vr1xwypl5w5sd-kaccessible-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kaccessible-15.03.97.tar.xz";
+      sha256 = "0gm4nyx8w2dz6631mryqkznqnaag8fslr1x703nd9bvx6nbaf973";
+      name = "kaccessible-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-send-file-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/mirisvq9ddryfyqiixr90pqqcbwfmssw-ktp-send-file-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-send-file-15.03.97.tar.xz";
+      sha256 = "0sbq0xsw0g0vh268021csf22igyqhziy4j0imqziza3p708h1hx9";
+      name = "ktp-send-file-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kanagram-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/1c46ll16k2didp2gqw8931l4975h4a0k-kanagram-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kanagram-15.03.97.tar.xz";
+      sha256 = "1798s8hb4ikzy1bczylywjcglwc8wqwakn5chaqaiyazl4m40gdx";
+      name = "kanagram-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmplot-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/zigxsksdg9sy843b5grwa6rw7v6dzgpl-kmplot-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kmplot-15.03.97.tar.xz";
+      sha256 = "1irra5rncpsvhiapxs38340bxzn1z86fgj3jqypv1b95imgd1j4l";
+      name = "kmplot-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/sgq7pvdskhmwjrrdy4szvn0am8mm8p85-ktp-desktop-applets-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ktp-desktop-applets-15.03.97.tar.xz";
+      sha256 = "0yprnnjjjx60zi9g1wf0ngwrqsnzdbvgqlnpy53ypmsmk44mmpvq";
+      name = "ktp-desktop-applets-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kshisen-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/rgr55x43xyzsxl142xzp5qdxal628k5i-kshisen-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kshisen-15.03.97.tar.xz";
+      sha256 = "0v9nh6bl22khc79fxlq2ywa9f50hb261m0fa1xinddq2p1vkgh1a";
+      name = "kshisen-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwordquiz-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/sry2sq14f7xaa4923mq3hhhsn9asxvb1-kwordquiz-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kwordquiz-15.03.97.tar.xz";
+      sha256 = "0l5vibrp632r47vycxzz2sprgz9z8gvrwgw8wa1j6rj77n5df0ji";
+      name = "kwordquiz-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnapshot-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/9fbhvnrkqdyp67cq4djszrwi1ap1alqr-ksnapshot-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/ksnapshot-15.03.97.tar.xz";
+      sha256 = "0ps703b3xrkm9rk07kn3bf7df17wpy9syr4vqz8clvqkkvpminjk";
+      name = "ksnapshot-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kturtle-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/xwy4rkjppksz5yjj5d4i6gf0rm588rhg-kturtle-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kturtle-15.03.97.tar.xz";
+      sha256 = "02rrs9b4ynbch14r3yknnf31mgksv9wi61yj7zb1a3n0lysv6rzx";
+      name = "kturtle-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcalc-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6n5aqymfc5ry8vpzgqg8pdf9g98093jl-kcalc-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kcalc-15.03.97.tar.xz";
+      sha256 = "04xbym3jqcqyly2pv5m3v4z9x8r3bg66x0z862pj8y8i1n79lwgd";
+      name = "kcalc-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bovo-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/np48z8sc9sb5szhbxxgxh0s9pczvk6jy-bovo-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/bovo-15.03.97.tar.xz";
+      sha256 = "1n2wqp6zgg46kmr5lc605371vm8dbida922jfjjfn0g32b66g4zp";
+      name = "bovo-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kremotecontrol-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/mb6b6aj1zdx2l6q1g0cyvjb20q5znrlp-kremotecontrol-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kremotecontrol-15.03.97.tar.xz";
+      sha256 = "0rckl38br7paj0bwhc86j2hq3xl48xh9539byxqsr66p2d6rkf81";
+      name = "kremotecontrol-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcharselect-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/pd4lin2281pz6hbm7hb3nfxaqn201w7r-kcharselect-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kcharselect-15.03.97.tar.xz";
+      sha256 = "1wybg9qfk59425sfj5rkrb1hn3kkgfrv2nxln8yf4215zwasivvd";
+      name = "kcharselect-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgpg-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/43pag9nl9m1ij7q3nl4plahd0ivpjkx7-kgpg-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kgpg-15.03.97.tar.xz";
+      sha256 = "0y9jg4p1x2vq9mfxlh2g64bxlrkm6s9qzb2mrzm3b660plhq8ain";
+      name = "kgpg-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "parley-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/q9vp14gqi2sa052n2300z4zx6g7ia1gy-parley-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/parley-15.03.97.tar.xz";
+      sha256 = "0vayhq39afw25g1pns79f5jczr29z4kyzi7as6lhggpp0fx5gzrh";
+      name = "parley-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klickety-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/rk00agcks0cwszrrd4dhv4pwnbngyp9n-klickety-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/klickety-15.03.97.tar.xz";
+      sha256 = "0n8bfdzmmzdb8ywfpjy4rqyj0lyw00lz16dyqhg65b501g4xfx1n";
+      name = "klickety-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbounce-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/0jnr85v0cwj0si80dybb147w5pgwc2av-kbounce-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kbounce-15.03.97.tar.xz";
+      sha256 = "1n9n1ijai7prgihncz6817fccaxbawdkncn7cwbm79cdr291g5vs";
+      name = "kbounce-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "step-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/24sryfai0wy46fvp5xalsf4xaczicnih-step-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/step-15.03.97.tar.xz";
+      sha256 = "1m5lxgf3f6m9j257dg0dgvxx5xj5hfdsb16qqhqvyyvka125k9j3";
+      name = "step-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "umbrello-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/k97rbdbywsq7ddax8shrqghvzwl7la0w-umbrello-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/umbrello-15.03.97.tar.xz";
+      sha256 = "0i3iiy2krd50iib20api9sdm6pbw8ixczr31l2xhsa7508wvdfjg";
+      name = "umbrello-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblackbox-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/45b72yj5m5cn88z4wm2b9w3wd21pyib1-kblackbox-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kblackbox-15.03.97.tar.xz";
+      sha256 = "0vp49qgw7m1ikb1s1vq359lxc9bzwip68j2qix16c9w89mgzcwas";
+      name = "kblackbox-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkexiv2-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/vp3v5dp9930az3jm9gzrk4kl9km1him0-libkexiv2-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkexiv2-15.03.97.tar.xz";
+      sha256 = "1k7lxr3sdx8qnpr8hwvykdp589677c59qahsr3xg72658jiliyzz";
+      name = "libkexiv2-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "rocs-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/1srxr5sy3apaa33n603mshps9rz0r3k4-rocs-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/rocs-15.03.97.tar.xz";
+      sha256 = "0ynaqahwr0j06hfjzsya1z9zcdp4m3bg62bc55k54iygydhkwf8n";
+      name = "rocs-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkmahjongg-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/jqap4lnyi6dij0lm11xvfcydchz25gg2-libkmahjongg-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/libkmahjongg-15.03.97.tar.xz";
+      sha256 = "0lcykfziqaw3k84as85pgar2a5jvy67qd4v0w7riyyp5ndnqdfb6";
+      name = "libkmahjongg-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-wallpapers-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/lw3288r7mjnn6yc16gjr79mvpfamj5dp-kde-wallpapers-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-wallpapers-15.03.97.tar.xz";
+      sha256 = "11qb8rli0jazxfjwv2k2n5ya39n1spgdj525fnpc2gzxyp3pwdg2";
+      name = "kde-wallpapers-15.03.97.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "blinken-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/n1n0by4sqvsvvm2nq6k3d7m5cvya76h9-blinken-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/blinken-15.03.97.tar.xz";
+      sha256 = "1nbcl5fjpw8w2hyiwx4qksf1x1w3nij9rssvjiccn6clz006jcrs";
+      name = "blinken-15.03.97.tar.xz";
+    };
+  }
+]
diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh
new file mode 100755
index 000000000000..b50380304253
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/manifest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]; then
+
+  # The extra slash at the end of the URL is necessary to stop wget
+  # from recursing over the whole server! (No, it's not a bug.)
+  $(nix-build ../../.. -A autonix.manifest) \
+      http://download.kde.org/unstable/applications/15.03.97/ \
+      -A '*.tar.xz'
+
+else
+
+  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
+
+fi
diff --git a/pkgs/applications/kde-apps-15.04/renames.nix b/pkgs/applications/kde-apps-15.04/renames.nix
new file mode 100644
index 000000000000..d9eee9614a62
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/renames.nix
@@ -0,0 +1,29 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+"Analitza5" = "analitza";
+"CTest" = "sweeper";
+"ECM" = "extra-cmake-modules";
+"JDns" = "kopete";
+"KAccounts" = "kaccounts-integration";
+"KDEGames" = "libkdegames";
+"KF5KMahjongglib" = "libkmahjongg";
+"KSane" = "libksane";
+"KTp" = "ktp-common-internals";
+"KastenControllers" = "okteta";
+"KastenCore" = "okteta";
+"KastenGui" = "okteta";
+"LibKEduVocDocument" = "libkeduvocdocument";
+"LibKdeEdu" = "libkdeedu";
+"LibKompareDiff2" = "libkomparediff2";
+"Libkcddb" = "libkcddb";
+"Libkcompactdisc" = "libkcompactdisc";
+"OktetaCore" = "okteta";
+"OktetaGui" = "okteta";
+"OktetaKastenControllers" = "okteta";
+"OktetaKastenCore" = "okteta";
+"OktetaKastenGui" = "okteta";
+"Okular" = "okular";
+"QJDns" = "kopete";
+"QMobipocket" = "kdegraphics-mobipocket";
+}
diff --git a/pkgs/applications/kde-apps-15.04/setup-hook.sh b/pkgs/applications/kde-apps-15.04/setup-hook.sh
new file mode 100644
index 000000000000..a8d9b7e0e36f
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7234be5080de..883d5fcdf26f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6168,7 +6168,8 @@ let
   };
 
   kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
-  kf5_latest = kf57;
+  kf58 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.8 { });
+  kf5_latest = kf58;
   kf5_stable = kf57;
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
@@ -11005,8 +11006,12 @@ let
     kf5 = kf57;
     kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
+  kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {
+    kf5 = kf58;
+    kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
+  });
   kdeApps_stable = kdeApps_14_12;
-  kdeApps_latest = kdeApps_14_12;
+  kdeApps_latest = kdeApps_15_04;
 
   keepnote = callPackage ../applications/office/keepnote {
     pygtk = pyGtkGlade;

From 2354c68d1dd79999a471829d6e83a26a1acc1ee0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 8 Apr 2015 09:41:41 -0500
Subject: [PATCH 0095/1143] kf58: use default cmake

---
 pkgs/development/libraries/kde-frameworks-5.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.8/default.nix b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
index 6a30fd5d6f18..b985ffe8f972 100644
--- a/pkgs/development/libraries/kde-frameworks-5.8/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.8/default.nix
@@ -70,7 +70,7 @@ let
     (with pkgs;
       {
         Boost = boost155;
-        cmake = cmake-3_2;
+        inherit cmake;
         inherit epoxy;
         GIF = giflib;
         GLIB2 = glib;

From 0d7955677fb34766dbeb87c7c028685683d1780b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 8 Apr 2015 10:09:49 -0500
Subject: [PATCH 0096/1143] qt54: recurseIntoAttrs for nix-env

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 883d5fcdf26f..fde2ce71d6e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7353,7 +7353,7 @@ let
     bison = bison2; # error: too few arguments to function 'int yylex(...
   };
 
-  qt54 = callPackage ../development/libraries/qt-5/5.4 {};
+  qt54 = recurseIntoAttrs (callPackage ../development/libraries/qt-5/5.4 {});
 
   qt5 = qt54;
 

From 204734c8cb519d92cacbb2da0aff14277a396156 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 8 Apr 2015 13:19:37 -0500
Subject: [PATCH 0097/1143] plasma52: build with kf58

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fde2ce71d6e2..b15176320138 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13207,7 +13207,7 @@ let
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
   plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
-    kf5 = kf57;
+    kf5 = kf58;
   });
   plasma5_latest = plasma52;
   plasma5_stable = plasma52;

From 9863db756f1f91de1e4673510221359245a83a8f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 10 Apr 2015 07:40:33 -0500
Subject: [PATCH 0098/1143] kdeApps_15_04: keep 14.12 around for LTS packages

---
 .../kde-apps-15.04/dependencies.nix           |   72 +
 pkgs/applications/kde-apps-15.04/manifest.nix | 5688 +++++++++++++++++
 pkgs/applications/kde-apps-15.04/manifest.sh  |    5 +
 pkgs/applications/kde-apps-15.04/renames.nix  |    5 +
 4 files changed, 5770 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/dependencies.nix b/pkgs/applications/kde-apps-15.04/dependencies.nix
index a088e74e6978..08ceda442d5b 100644
--- a/pkgs/applications/kde-apps-15.04/dependencies.nix
+++ b/pkgs/applications/kde-apps-15.04/dependencies.nix
@@ -129,6 +129,14 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  jovie = {
+    buildInputs = [ "KDE4" "Qt4" "Speechd" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   juk = {
     buildInputs = [ "KDE4" "Taglib" "TunePimp" ];
     nativeBuildInputs = [ "cmake" ];
@@ -161,6 +169,14 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  kajongg = {
+    buildInputs = [ "KDE4" "Twisted" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   kalgebra = {
     buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Xml" "Readline" ];
     nativeBuildInputs = [ "cmake" ];
@@ -209,6 +225,14 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  kate = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5Widgets" "SIP" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   katomic = {
     buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
@@ -769,6 +793,14 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  kde-workspace = {
+    buildInputs = [ "Akonadi" "Boost" "DBusMenuQt" "Fontconfig" "Freetype" "GLIB2" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "NepomukCore" "OpenGL" "OpenGLES" "PCIUTILS" "PNG" "Prison" "PythonLibrary" "QImageBlitz" "QJSON" "Qalculate" "Qt4" "RAW1394" "Sensors" "Soprano" "Strigi" "UDev" "USB" "Wayland" "X11" "X11_XCB" "XCB" "Xmms" "ZLIB" "libgps" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   kdeartwork = {
     buildInputs = [ "Eigen3" "KDE4" "KDE4Workspace" "Kexiv2" "OpenGL" "Xscreensaver" ];
     nativeBuildInputs = [ "cmake" ];
@@ -809,6 +841,14 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  kdelibs = {
+    buildInputs = [ "ACL" "AGG" "ASPELL" "Automoc4" "Avahi" "BZip2" "Blitz" "BlueZ" "Carbon" "DBusMenuQt" "DNSSD" "DocBookXML" "DocBookXSL" "ENCHANT" "Eigen2" "FAM" "FFmpeg" "Flac" "Flex" "GIF" "GObject" "GSSAPI" "GStreamer" "Grantlee" "HSPELL" "HUNSPELL" "HUpnp" "IOKit" "JPEG" "Jasper" "KDE4" "KDE4Internal" "LCMS" "LibArt" "LibAttica" "LibXml2" "Libintl" "OpenEXR" "OpenSSL" "PCRE" "PNG" "QCA2" "QImageBlitz" "Qt4" "SharedDesktopOntologies" "SharedMimeInfo" "Soprano" "Sqlite" "Strigi" "UDev" "USB" "Xine" "Xmms" "ZLIB" ];
+    nativeBuildInputs = [ "BISON" "FLEX" "LibXslt" "Perl" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
   kdenetwork-filesharing = {
     buildInputs = [ "KDE4" ];
     nativeBuildInputs = [ "cmake" ];
@@ -833,6 +873,30 @@
     propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
   };
 
+  kdepim = {
+    buildInputs = [ "Akonadi" "Baloo" "Boost" "Git" "Grantlee" "KDE4" "KdepimLibs" "LibKGAPI2" "Prison" "QGpgme" "QJSON" "Sasl2" "Xsltproc" "ZLIB" ];
+    nativeBuildInputs = [ "DBLATEX_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdepim-runtime = {
+    buildInputs = [ "AccountsQt" "Akonadi" "Boost" "KDE4" "KdepimLibs" "LibKFbAPI" "LibKGAPI2" "Libkolab" "Libkolabxml" "QJSON" "Qt4" "Sasl2" "SharedMimeInfo" "SignOnQt" "Xsltproc" ];
+    nativeBuildInputs = [ "_testrunner" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kdepimlibs = {
+    buildInputs = [ "Akonadi" "Boost" "Gpgme" "KDE4" "Ldap" "LibXml2" "Libical" "Prison" "QJSON" "Sasl2" "SharedMimeInfo" "Xsltproc" ];
+    nativeBuildInputs = [ "LibXslt" "PERL_EXECUTABLE" "_testrunner" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
   kdesdk-kioslaves = {
     buildInputs = [ "KDE4" "SVN" ];
     nativeBuildInputs = [ "Perl" "cmake" ];
@@ -1257,6 +1321,14 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  kspaceduel = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   ksquares = {
     buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix
index c413abeea756..9475b54c571d 100644
--- a/pkgs/applications/kde-apps-15.04/manifest.nix
+++ b/pkgs/applications/kde-apps-15.04/manifest.nix
@@ -1,6 +1,5649 @@
 # This file is generated automatically. DO NOT EDIT!
 { stdenv, fetchurl, mirror }:
 [
+  {
+    name = stdenv.lib.nameFromURL "pairs-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/fsaycjsmkm1g92j3syc2a8nwdgfgs99g-pairs-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/pairs-14.12.1.tar.xz";
+      sha256 = "13byliibd6fwa8bsgka8hc64jkprmgsnqh9sks36w7ic22f32qhx";
+      name = "pairs-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgamma-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/4ggxl3vnlngg1p6irixa42as7gyp3c8k-kgamma-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kgamma-14.12.1.tar.xz";
+      sha256 = "1ad2c1l2lbc2pdybavnnj834ww82rbm91k0wjgz25xc3l3gkrg9i";
+      name = "kgamma-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktux-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/n68cvnv9h371cx7q5jqfqs2bdj1rqvyi-ktux-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ktux-14.12.1.tar.xz";
+      sha256 = "00x5jm26w1a214chdg1fkzki1z3h1dbw5qagal4lkcb98fi5sbcq";
+      name = "ktux-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "analitza-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/n8ayxw5rwzlyc015ff1lzwnd2wa3ss4x-analitza-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/analitza-14.12.1.tar.xz";
+      sha256 = "0jgmjda5n5935v37jgaichk5hif67mzlyvxqmr19wwmbiqfbazx8";
+      name = "analitza-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kubrick-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/hz00x8miy3gw4gm2ylw0v90d8xnxxqml-kubrick-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kubrick-14.12.1.tar.xz";
+      sha256 = "0c2ixhd3763pzy92z1ck638wggmq3h4jvnax5ralfhhvn9r2f5bj";
+      name = "kubrick-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksirk-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/fv5vdi5m80l7hzkhkidyk5rd1srghl8x-ksirk-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ksirk-14.12.1.tar.xz";
+      sha256 = "1sdd117xhn9jclqiczh1cr8apy0akwncmbj82gwm7i1qx31i55fx";
+      name = "ksirk-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "katomic-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/9wa79ygill8gb5n281cybrmj4zv627h9-katomic-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/katomic-14.12.1.tar.xz";
+      sha256 = "1mjzm4v80cva7kfakjpjkd4sw4fdcyin5f2srck7fl0pnqdpnhqz";
+      name = "katomic-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "jovie-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/w4b045lmp2viqrvifkm11n282l5khwbd-jovie-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/jovie-14.12.1.tar.xz";
+      sha256 = "1xkmybfgn6mbrp6lx8ri0dzmz1nsvg9cxlxan4n5bzwd3zjpycjd";
+      name = "jovie-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeartwork-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ky4vpsb0mm22raiq0r6jfxjsdr5c0vmv-kdeartwork-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdeartwork-14.12.1.tar.xz";
+      sha256 = "0jrdyy787wnqx31nrgmf7amhy5ix9w7anfnqrdn4w8yydpvghhqw";
+      name = "kdeartwork-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapman-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/l5xwmjgcw6rbmmhy2m5z55hxcf9d12hv-kapman-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kapman-14.12.1.tar.xz";
+      sha256 = "0bkpcjdcax6b3dp236ybaakpxz5b1vkrmmxpczvg6hf2cqwmlsv5";
+      name = "kapman-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/aixz1c1q6rnpqxm805xdirlqg47kw1kr-libkomparediff2-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkomparediff2-14.12.1.tar.xz";
+      sha256 = "0fjqsa83sqd7gcpm818yirnm077g6q616rh9676dzwv0cmc334zx";
+      name = "libkomparediff2-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/kx7kv61rc3ddz7gmm5k5cwp9zh3k70nk-kde-wallpapers-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-wallpapers-14.12.1.tar.xz";
+      sha256 = "1q28rb8a4rw6v5wvwri3aslc8xwbn0324b07lnkvn58alpmdga8v";
+      name = "kde-wallpapers-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ark-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/c21hgh72czi1nqr3lci8lynvsd3qkvzh-ark-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ark-14.12.1.tar.xz";
+      sha256 = "1fimg9f4l373l31kr59fvvsavssvn3ljdrxrgnl6a66v1gwgjsdp";
+      name = "ark-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/b867ygwgvr9g8j54s3gya7c2wpr9gwf8-kdesdk-thumbnailers-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-thumbnailers-14.12.1.tar.xz";
+      sha256 = "1p3abcnidk07jgr9qn03zfnhqci27683gz25wy271v6gl7b0wp6c";
+      name = "kdesdk-thumbnailers-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/hp6x10injwcygbd5zqvkkg2k85n62drw-kde-l10n-wa-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-wa-14.12.1.tar.xz";
+      sha256 = "0aq5n0n0saqkllkwpf9a5scjpsv4bxzx89z2a048kh76i8h9zr5p";
+      name = "kde-l10n-wa-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/j8x84jy2x4fw72a2mj7zgzkbd2v430np-kde-l10n-it-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-it-14.12.1.tar.xz";
+      sha256 = "13z9gmaziyvw112phzxc7893lz6wh8q92gb3fj3hmdmzj0vfqv4r";
+      name = "kde-l10n-it-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/yccjbanz6ijsf5rdd0n53cwygbv5jm4m-kde-l10n-km-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-km-14.12.1.tar.xz";
+      sha256 = "0fdns3fifr4ypz5mi798xc18miwlb7lqz22f18gnrza22vnzwi09";
+      name = "kde-l10n-km-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/mzfjypmyhmp3s7mnxk0mwf57s3l440c2-kde-l10n-pt-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt-14.12.1.tar.xz";
+      sha256 = "13pzz23zf9nnl3a65nrpmwlpnkvr490vfs7yfvvr5w0nrqfwzhp6";
+      name = "kde-l10n-pt-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/pjdp04f6m3ghqr23lyzxw7w0fgg5i6ll-kde-l10n-ru-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ru-14.12.1.tar.xz";
+      sha256 = "1a5ygssdwkm9iqakl1w4pza70g1gwh7mzi6jzhbd4jsn740ykw0r";
+      name = "kde-l10n-ru-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/4j1r5xz2fslwv0di0dn9x8n49hrxizg4-kde-l10n-de-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-de-14.12.1.tar.xz";
+      sha256 = "1iavp7xr2qv8i97sl1kpl9kasi21br91l3mdah382ayhaz5khnlb";
+      name = "kde-l10n-de-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/dz1zi3jrw92cgci5zc8nia3xzq1zykdf-kde-l10n-uk-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-uk-14.12.1.tar.xz";
+      sha256 = "1228lpwggkwz9rwnmrmrw4f72hcbng40g1q1bfhjzw078s7j6nxr";
+      name = "kde-l10n-uk-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ylf7xmqdh9yrz37yaq4f8nddap1gfanc-kde-l10n-ja-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ja-14.12.1.tar.xz";
+      sha256 = "191whr3i7qkqj2wjzjqgagb1vs391x9sp688w56ynjjmh58vrvq1";
+      name = "kde-l10n-ja-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/b6n06i5p82k6fq4p4rpl7bf0cyklazxb-kde-l10n-kk-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-kk-14.12.1.tar.xz";
+      sha256 = "01ivq7g550i9ik18xnibn7xl5mmm237wrsksjm0xni18s89wwz8b";
+      name = "kde-l10n-kk-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ysarksjh5lcm2yhbphrsqhyzmlp6qclr-kde-l10n-pl-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pl-14.12.1.tar.xz";
+      sha256 = "0ni41lp6l4l3pa1xf6kkim2k5qcvapm2g65nh5hryiwx9dpgkimv";
+      name = "kde-l10n-pl-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/zpq7ayj7ihr1xw4ihcnckqvnagl28lk0-kde-l10n-sv-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sv-14.12.1.tar.xz";
+      sha256 = "1r84629cv7c0lkfxii0q133cl710rgiqp5iylb3w32h7c1ji4x19";
+      name = "kde-l10n-sv-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/g5pcas9cz1yq6qz9883l2djfpb77li8a-kde-l10n-ca-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca-14.12.1.tar.xz";
+      sha256 = "1xprgp7l1h7wkfjh6v3yya9xw3r60vhsyk3ly38vcwxy5b6fjigd";
+      name = "kde-l10n-ca-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/v6hb004qp3i0p4vp1yslnmz4clb66p8d-kde-l10n-da-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-da-14.12.1.tar.xz";
+      sha256 = "0b38wgm8f23l9ya9h67m6zm785fmqi7737xfphjmrjh2i13gxpbl";
+      name = "kde-l10n-da-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/33f2k043b8gi64mr4wwrs6pwp5b9bq7h-kde-l10n-he-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-he-14.12.1.tar.xz";
+      sha256 = "0ynvsrczdraf55gaiwbv9nzwy548zkkbdh475frqfmalzh9b7jww";
+      name = "kde-l10n-he-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/7hlk5vyd3pl9rdp22ybsj868w6s7sfz0-kde-l10n-lv-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lv-14.12.1.tar.xz";
+      sha256 = "0x3rlallirrzgn8gfyssyvaj3zaji672n6hfacp2djpfzbfwqq6l";
+      name = "kde-l10n-lv-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/b2v25j4hlsl7lqb77wk7sj1j5z9q7ldm-kde-l10n-hu-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hu-14.12.1.tar.xz";
+      sha256 = "061kyzz24f6bink3sm4p7q959977ril3m86lm8fa1ddnccw7ya46";
+      name = "kde-l10n-hu-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/8a3pmbwm8k7g951yi5d3mv57y9vxn84z-kde-l10n-sr-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sr-14.12.1.tar.xz";
+      sha256 = "16kcpilb4mp4cfgklc4dr6y389hlmzvwx8wp0y3i2w1r18nwd8m8";
+      name = "kde-l10n-sr-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/l4fy9j1aix7fyisan5f2pa4273misph2-kde-l10n-is-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-is-14.12.1.tar.xz";
+      sha256 = "14r5wrkr39cipx40hqqcx12cvv0vql829689yiy97ypcg4bqndma";
+      name = "kde-l10n-is-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/vk6fz8gixl7wv6w20h4inn984839lkkk-kde-l10n-mr-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-mr-14.12.1.tar.xz";
+      sha256 = "1nvaxd38c4f9kkhkrv4bb1aczi1iv1bp16kmm47s1y6kzb93zq9h";
+      name = "kde-l10n-mr-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/0f4agkrcrb1cn6sdgdpj1bwln6f2ra5i-kde-l10n-gl-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-gl-14.12.1.tar.xz";
+      sha256 = "1xjh19c7rjd5k3v3c7g0ljz1kz5vv3zhji4rm84j30z12cks3nhh";
+      name = "kde-l10n-gl-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/3nk8pxfypvnwbcszm33fn3j7f0kmgdji-kde-l10n-cs-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-cs-14.12.1.tar.xz";
+      sha256 = "1qg9y5173374fpf6yk4v8mlsqdjzp8inirp08qx0lh33jd6rpddb";
+      name = "kde-l10n-cs-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/i5vsmw062i49ki35qqyi0ix6x5fl4jvg-kde-l10n-en_GB-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-en_GB-14.12.1.tar.xz";
+      sha256 = "04b7amh2247ksr414m3x7bc4p22xm6kxncsax9ggapx613flb2zc";
+      name = "kde-l10n-en_GB-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/p2jc4kci6k5kn1ihy9yv5inp4p4g01n9-kde-l10n-sk-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sk-14.12.1.tar.xz";
+      sha256 = "0ic2y081699mv16hpkb3ivdvd4ph51wz3md5bz65pfz404gn7krf";
+      name = "kde-l10n-sk-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/4kbdmqqmv1slh4z56rifg8sw0a9980m4-kde-l10n-ga-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ga-14.12.1.tar.xz";
+      sha256 = "0794p0dqa1nnkwwc2ipslzhaakcx3r4b6s03hf7m14r58wmvws28";
+      name = "kde-l10n-ga-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/hdyxfm2wnigh8wb3ay8y8v7psjrbijy7-kde-l10n-sl-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sl-14.12.1.tar.xz";
+      sha256 = "0nv2yrk99dkvb49ww6l6za0czy89p1nsilm56f4mdgbvrgzwk9zp";
+      name = "kde-l10n-sl-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ln3d7jpln9kl947fhgknbhg0rh6lnxds-kde-l10n-nb-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nb-14.12.1.tar.xz";
+      sha256 = "0zj66ydg5pwlx3hwwdxz6i8m330wz0w2l2p4fvf4kjvy49cafrmd";
+      name = "kde-l10n-nb-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/vw8kpmpiyrrqch5wb4164yv0jhkdkpkk-kde-l10n-ko-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ko-14.12.1.tar.xz";
+      sha256 = "08q0d0q2cm2bmdwwmyavzb07wlbnf5lpl071gjm146kzk0y1kmpg";
+      name = "kde-l10n-ko-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/87kmgghdnkmzvdbk611qmv2nav8m2f0p-kde-l10n-ro-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ro-14.12.1.tar.xz";
+      sha256 = "0xprq9jw94i38aaq1drkv1qpgf3rf75745zlagzb430jr1a285lb";
+      name = "kde-l10n-ro-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/h8wfla9jsbhfjvjfnca6yjwpcc90nb5m-kde-l10n-ug-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ug-14.12.1.tar.xz";
+      sha256 = "1am6yr3qq4l2wgpphxhqfj8ydndvjxmc3cl4gz6zlkddaw4pv5kr";
+      name = "kde-l10n-ug-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/mja592hds8ajqsx96wb1zxph1n0pxqb0-kde-l10n-hr-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hr-14.12.1.tar.xz";
+      sha256 = "0hjhzf77mckh9xqqxn54w47lsn3fwl2p4rfk22ijlliglrylpajv";
+      name = "kde-l10n-hr-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/9vay8airc00fg0d91lpp84l21akqxn27-kde-l10n-pa-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pa-14.12.1.tar.xz";
+      sha256 = "0sr6pygs0lk1ar2zn6966ngaf9vjfy207i1bgg6gr3559v5wkx8x";
+      name = "kde-l10n-pa-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/sx4w67x5xq87ragvsysg4jwcpvrk674p-kde-l10n-id-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-id-14.12.1.tar.xz";
+      sha256 = "018yvdp7l9qjaj7niyjas87dhna1xr0mikpdycw5dbwchpizlr53";
+      name = "kde-l10n-id-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/l9cx18xxg7ly9nrsfi1lj9vxzg19h9sq-kde-l10n-bs-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bs-14.12.1.tar.xz";
+      sha256 = "0ybh9wyhym05rlc3s0kl9lh07y96nyl3p4lifj13lcqi975mgnp9";
+      name = "kde-l10n-bs-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/59bsq0cq07hc9apbfdmaa66jg5n8wlwg-kde-l10n-pt_BR-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt_BR-14.12.1.tar.xz";
+      sha256 = "1wbgns7pq0jxjffgvr6hgfg3san1k2c7wppsvn2cpjiph0v4azz9";
+      name = "kde-l10n-pt_BR-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/9xiaf2c0lbxy65vrx6hdh884ky6h2s79-kde-l10n-bg-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bg-14.12.1.tar.xz";
+      sha256 = "0m404hxz8dskbdsni021703vdn4lvwpf88hwrdrfnhcv06jazjiq";
+      name = "kde-l10n-bg-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/m8ahg0qxpv2hskl9dl7dgch10adxfia5-kde-l10n-nds-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nds-14.12.1.tar.xz";
+      sha256 = "09r79l4ngcsnya6kqj5hj69xq00bf4ndxgkkplwiq137zqamqcfl";
+      name = "kde-l10n-nds-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/mq5v891rzj692h61aak71g71iy963ayw-kde-l10n-zh_TW-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_TW-14.12.1.tar.xz";
+      sha256 = "1azwmzg47pk4b23hpnpic3c8phnfz4iy3n6lv50sz98b9whkmf0s";
+      name = "kde-l10n-zh_TW-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/gprdva58d383n4ka677pdbpaz8l05w8i-kde-l10n-nn-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nn-14.12.1.tar.xz";
+      sha256 = "1xp44glwk6nnnavw0lrl7ssl5miqfd7b093chfz35g2g92nyaa3g";
+      name = "kde-l10n-nn-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/jhv6zy04igavcq0dxsg9kk3vfh2063m9-kde-l10n-ia-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ia-14.12.1.tar.xz";
+      sha256 = "1kjjg4z4y0fh4kyzy9vzxlw47xkiirh207d7x0b94nksxzbqwg67";
+      name = "kde-l10n-ia-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/hy0v61dnnmpbj84a4imvgxqx3y0fd5qg-kde-l10n-tr-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-tr-14.12.1.tar.xz";
+      sha256 = "1kdxps75gv2vlf98f958llkk161z2y908bg1fdq4rgdh1n3bylkh";
+      name = "kde-l10n-tr-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/jmjbgfmqvcqd1sxdj0a7c73a9yqyzvpz-kde-l10n-ar-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ar-14.12.1.tar.xz";
+      sha256 = "121dblyh53fb3qirg7s9givqcn0xswdj2hrnqc8s2x2qas74v6a9";
+      name = "kde-l10n-ar-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/b9dqgb7nsfgyzhr4vw7fnl287spyjigg-kde-l10n-zh_CN-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_CN-14.12.1.tar.xz";
+      sha256 = "0cyi0g55xln8smnlnhl0vfpi0jrihnfp3vrv6j2gz30zzfgkw9dp";
+      name = "kde-l10n-zh_CN-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/0ycvh7sgyhjqffzq5ff5mjnv0y4f8pxy-kde-l10n-es-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-es-14.12.1.tar.xz";
+      sha256 = "11i4xmsigmi9mqbc5x9l96vsrfh6709fbbfpqa6b28a5jif9anmr";
+      name = "kde-l10n-es-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/9rbki0767k1hirpx7530lqcw74bfy2b1-kde-l10n-et-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-et-14.12.1.tar.xz";
+      sha256 = "0c8vhbi1bi29krh1sway8z0536cn507i1lp8jffb4mk953mm5y9n";
+      name = "kde-l10n-et-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/pq8r37pcg05p9rc5prcy9r2f5mby7m0z-kde-l10n-fr-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fr-14.12.1.tar.xz";
+      sha256 = "1s2glywjbrr2q6ssmalblschrgny4rk3q3aws2ffrrlkanx0qyva";
+      name = "kde-l10n-fr-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/k0amn3lcd7xcssqh8fs46swa9jmksv9x-kde-l10n-fa-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fa-14.12.1.tar.xz";
+      sha256 = "0pj3klcdlash8wgvz75nw009jz63rblv038yhrh1qsidjw4vsl85";
+      name = "kde-l10n-fa-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/cqbsi6sr0mcl3pnzlk0w52disg2xgm1i-kde-l10n-lt-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lt-14.12.1.tar.xz";
+      sha256 = "0k4m1ixlnmmgbznhgvbmfss0c1fynd492sylcvbsrnqcawq3fqdz";
+      name = "kde-l10n-lt-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/8pw7v2ccr5vgl6ic7dnlm5xcqgkbvxyr-kde-l10n-nl-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nl-14.12.1.tar.xz";
+      sha256 = "0m0hwib0v5j2bmgkgwjzhbhqnyk8gcm46969rr2qf51snrvynlax";
+      name = "kde-l10n-nl-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/vplfymrx36jk65b0xjmzh2g4l9ky7dfm-kde-l10n-eu-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-eu-14.12.1.tar.xz";
+      sha256 = "0wcax8gnnk6rwpfl6ph8z5i013rmh08pr159nxpakdsvbcn5ma5v";
+      name = "kde-l10n-eu-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca@valencia-14.12.1.tar.xz";
+      sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq";
+      name = "kde-l10n-ca_valencia-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/p9a3lyi934i4pc5p8433firhkcs0ybn3-kde-l10n-el-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-el-14.12.1.tar.xz";
+      sha256 = "022kr5cvlz8hxj3s74my680ghp23lj8amykzgr5z9i996q2hs6ps";
+      name = "kde-l10n-el-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/9f3cb3yksriwphrnkmn1knrq0108ka4p-kde-l10n-fi-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fi-14.12.1.tar.xz";
+      sha256 = "1sxs5z3dkx7hb8l7ilrhzvl2ip02fsb24iqgh0gadqwdfj46gwjn";
+      name = "kde-l10n-fi-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/pfswxr29nz9qylmb7n83cnap95khz248-kde-l10n-hi-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hi-14.12.1.tar.xz";
+      sha256 = "0a5ilahwh6wpxg4mb3wqg079qfvcxg7zqblwyx6mdwh4d2ly5y1f";
+      name = "kde-l10n-hi-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "granatier-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ychwcs2gn4mgmhza315nmf2z35c0ibb7-granatier-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/granatier-14.12.1.tar.xz";
+      sha256 = "0lifihkssp0g30kv3iigbpr9ghdwwykmzfiv4qwsxaxadil9qqlm";
+      name = "granatier-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kamera-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/c1n1s1hbj8q4smgxnd4kka9qidh0rvvw-kamera-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kamera-14.12.1.tar.xz";
+      sha256 = "1avmsy622rnyyvsx9zwspqx9g4mb5wzc74mvcjrivi3c3mcz2ng6";
+      name = "kamera-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfloppy-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/bl5csvnm20xxaqz5p7d3ymnkbd0df1p1-kfloppy-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kfloppy-14.12.1.tar.xz";
+      sha256 = "1ky8n0zk07d3cnap8f3zw5qck2kw4l0dql0fnbk3s58r982af2fd";
+      name = "kfloppy-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.4.tar.xz" ".tar";
+    store = "/nix/store/v157pqk6clf9yn21cdbvxxvh0sn892rd-kdepimlibs-4.14.4.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdepimlibs-4.14.4.tar.xz";
+      sha256 = "04c53ms91r8bpxgn305zzvagi30jli7217kvgdy4z4il6wnvns8r";
+      name = "kdepimlibs-4.14.4.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkipi-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/7amx4gdg85lw28amb0v3nd92hk71lphs-libkipi-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkipi-14.12.1.tar.xz";
+      sha256 = "01bpjh40p5cwli018sgyn6jgis1l83icikabcw6vxkp8vsn3q6yg";
+      name = "libkipi-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khangman-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/jyx0msd02v7iikj7czv3y8ckw79rahpa-khangman-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/khangman-14.12.1.tar.xz";
+      sha256 = "1574cdbq5lyq4hl84xwia5z15az4zzh6zvasxvaa5bz94cjkpyns";
+      name = "khangman-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konsole-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/0wy6dhhq6gn6h58vi324yiqa2f5ni5py-konsole-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/konsole-14.12.1.tar.xz";
+      sha256 = "0i7mccspglppz0sx2zqfn0861h6ibxkwrcscivqk7yxpq44nb58j";
+      name = "konsole-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "killbots-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/yg7gb0aidvcxh4i1z0ja8nvs23vhdf22-killbots-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/killbots-14.12.1.tar.xz";
+      sha256 = "0i006gjysfbf9wn0qgbv47fvx8z4v49ikcaqg9y83pl72shnsa1j";
+      name = "killbots-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kturtle-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/s16w00cgm430r315d2v2a041hivc5a1q-kturtle-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kturtle-14.12.1.tar.xz";
+      sha256 = "0sn74w413xx5y3kh0fqf7f47pklz4v22nnv6x11kpkcyx1xmghh9";
+      name = "kturtle-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kajongg-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/j2qlvd878dlxkaps9v61dw9k1n6nmh4p-kajongg-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kajongg-14.12.1.tar.xz";
+      sha256 = "0690jlsnj3s2l51nmx3an75q0m6xv0rssdmshrmbxgp2cqx5b455";
+      name = "kajongg-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bomber-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/8v0k2n5pkvv6wg3q957zqclasmsw2a7c-bomber-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/bomber-14.12.1.tar.xz";
+      sha256 = "0g4cb3jwva9saddf9m2j4k3y1gybh2bv8dxzfb1xqy5cv20qlrfc";
+      name = "bomber-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kruler-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/c61iqdbq71kb6wvnzfq7436hni8anrrn-kruler-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kruler-14.12.1.tar.xz";
+      sha256 = "0rag54kg5jzgj32fnf4xmawb0hnk52rhjf7i2y5f3156x3iraxxx";
+      name = "kruler-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmag-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/r2c1gika9sw2m5i1mmj3b47n7g19715k-kmag-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kmag-14.12.1.tar.xz";
+      sha256 = "1wlz3n3z9qcsqvs7rz3a76bh6rkrq0g9p797axcsfp7wzjfilj5c";
+      name = "kmag-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/rqrykz2vvj59w1563dgcjpi8fmkwdnm5-kwalletmanager-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kwalletmanager-14.12.1.tar.xz";
+      sha256 = "16pd2iym8v9xxdmazn2i7vq61c9m805h9a7awy8wha8bfdinazvi";
+      name = "kwalletmanager-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krfb-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/x147kkpbjm9mmdbapxs040cvb8fci9ab-krfb-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/krfb-14.12.1.tar.xz";
+      sha256 = "15kxapi1mwjpbj995k8rxla0h1wwvhd406pbwkpak3a9szljsv72";
+      name = "krfb-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcddb-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ar6s1pn0lfgs1iw6q5akr0l5dcrd1x2a-libkcddb-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkcddb-14.12.1.tar.xz";
+      sha256 = "1vb8rmb1j0nh2dh8ch19v1qpdxhc4c0am7k11lld45kamg3az0gd";
+      name = "libkcddb-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klettres-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/dbf3r79p85w5v6jihmqndcb631kqpb7m-klettres-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/klettres-14.12.1.tar.xz";
+      sha256 = "1bj5s3js6v3641s2kgrl6a5bgr25g9lgbvsfzqrp0pil2nx1g6h1";
+      name = "klettres-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klines-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/xwj5di67f0swj1w0c2235vrbany8ffgn-klines-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/klines-14.12.1.tar.xz";
+      sha256 = "1hxjqpc1z47dj1ryp116hdzkla4h1awnlmyzq7yjhki2viw32n3f";
+      name = "klines-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksystemlog-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/aj1drn165rirvr5wjmqfnzsfknnb32gj-ksystemlog-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ksystemlog-14.12.1.tar.xz";
+      sha256 = "15a92f873vybp3m9icjshbqs8nl6xm4cl9ca3cghmdlcqrn7f92x";
+      name = "ksystemlog-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klickety-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/y8p216blw2zrld7mj5c1ji9nwqhrbqsf-klickety-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/klickety-14.12.1.tar.xz";
+      sha256 = "071y9khz57mrw12dvwxhs03jn56j06hw38hcf8d4r4wksbwr3j87";
+      name = "klickety-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lokalize-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/5c1isv8y9s4k7153i5y41jdps6zsp8gl-lokalize-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/lokalize-14.12.1.tar.xz";
+      sha256 = "1ala2pfqh0a0kqxiyfpp11rcn805g6gcn0m9qjbmdqhl9wviij9h";
+      name = "lokalize-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/d315k9787k4c5ww7zp0341cybnwwsy2j-kdegraphics-thumbnailers-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-thumbnailers-14.12.1.tar.xz";
+      sha256 = "198m7iw621azbcp4abv3izq5p29yz9s2apr6ivxpp1iqzpz2x70g";
+      name = "kdegraphics-thumbnailers-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/6v8hm7rgdvfkvakv1jfq3g7jk3zq7x3z-kde-base-artwork-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-base-artwork-14.12.1.tar.xz";
+      sha256 = "0zd298ii8a3lnfh6lxgw6nmf91kx3days1nqk5arilkbrf7b4952";
+      name = "kde-base-artwork-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "artikulate-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/xaibvsd6g0xnwpnayb0jxhah9hmb3xin-artikulate-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/artikulate-14.12.1.tar.xz";
+      sha256 = "021hyprapc6fjhls55yn69sndm13krfriwj1vmq5mvqxzr0aid2k";
+      name = "artikulate-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccessible-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/s6j8nymsygqkh4vfgkgqwcg6xigda53d-kaccessible-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kaccessible-14.12.1.tar.xz";
+      sha256 = "0gp49jxkscdqd35xqmzhr17smiwyxgx8xbr7hkvbm10dzn9kx6x7";
+      name = "kaccessible-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konquest-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/wxk5v878fibdxxd9m9f6phyc99a56psc-konquest-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/konquest-14.12.1.tar.xz";
+      sha256 = "006an4bpfsnzcpm086xjyryd1xlzw0yz2knbzkvsdf3jr9kpmnrr";
+      name = "konquest-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "superkaramba-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/p3yhp4gg9pfbmnlb6jqk6xhaz2yllx9w-superkaramba-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/superkaramba-14.12.1.tar.xz";
+      sha256 = "10dlnn4knlvkz38c98613x9px85a8dhlfwpp4231r3v5va03xszj";
+      name = "superkaramba-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ga54jhkjav5i83vmir8j6l51d3gv1cs1-kdesdk-kioslaves-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-kioslaves-14.12.1.tar.xz";
+      sha256 = "06f8xxzldsqmch9acmfd95lr48rm94d6qll62bj5zi0bs5qjygbw";
+      name = "kdesdk-kioslaves-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cantor-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/xhdgix591fkzqdzw0pch0vv8wk2kkhz5-cantor-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/cantor-14.12.1.tar.xz";
+      sha256 = "100yscp21w7amqmwzh4zsk7kmyn5pf3swlkwipz857wi3wajkm75";
+      name = "cantor-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/pvk5701kz79m2bn13n45ffwy0zjng838-kdegraphics-mobipocket-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-mobipocket-14.12.1.tar.xz";
+      sha256 = "0qa0bpfvgbq3x3wlgi1cp3v8xn1wayyjrc07ffdr63w1gfi10mg1";
+      name = "kdegraphics-mobipocket-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-runtime-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/yd2zzjmb762dkjbkhjxdsnbg38k53f65-kde-runtime-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-runtime-14.12.1.tar.xz";
+      sha256 = "0cy2dhxw2cvbgqrknb3iy97rip2dcd7nrq3pj649mpq9a3r3cg17";
+      name = "kde-runtime-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiriki-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/hxk0628k5s042wcxwd1v7vy951bsjqxp-kiriki-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kiriki-14.12.1.tar.xz";
+      sha256 = "00j95hcyrnw2li2abkwqsd0dp8ph4wlqzy0d3gzfnkal19j2x2m2";
+      name = "kiriki-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwordquiz-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/6a5bi2hpxmry12zq6qkwk2hzlv5h7qkz-kwordquiz-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kwordquiz-14.12.1.tar.xz";
+      sha256 = "1c03ab89lnnin81lvq3mbcw2d10k3rjlk2fpplcbbnsryq35bivi";
+      name = "kwordquiz-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kate-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ykssldwmik1x7njph3rmzh9d14n7f0mi-kate-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kate-14.12.1.tar.xz";
+      sha256 = "0c3diy846drf5nihvhzhpsp8pl2kviyn6ian61myy2147smkany5";
+      name = "kate-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "parley-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/3k84f0vl6l7l65hmbbdlfp2zg348kcmi-parley-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/parley-14.12.1.tar.xz";
+      sha256 = "0awzpa9bl1j9gzy3596dhpsg3pqbmmdh87n52z7cjyk8sw0ikk19";
+      name = "parley-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdegames-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/clfp83sn2pg1jr82j79szwkx0aysl9a3-libkdegames-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkdegames-14.12.1.tar.xz";
+      sha256 = "0af15lbsjc7w5p3s3nxsb08cvyg7dncjmpw7z1vhgqykzmwpyp56";
+      name = "libkdegames-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ghjddljclnsn3z0rflrrxanbkzxn46m5-libkcompactdisc-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkcompactdisc-14.12.1.tar.xz";
+      sha256 = "10zpv05wmqs1lrby95d5bgvwiqcmkd3ndrdsr6cpayg2lw9nq86d";
+      name = "libkcompactdisc-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmplot-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/k78l2m24w71dbczia8bnwi3fhpqghj6b-kmplot-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kmplot-14.12.1.tar.xz";
+      sha256 = "0p0iv3m2648vyr1imzwdfs73rc2q39nl8r7w31z5dhm65rq2zi27";
+      name = "kmplot-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kuser-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/lpdpdbbbgfyib95cq1m1db5fdym6wjxz-kuser-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kuser-14.12.1.tar.xz";
+      sha256 = "1zgik2i9z0n58m3fm8g0kgjm9aqa6v1f3331r8nrjir9vd9vr8g7";
+      name = "kuser-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kspaceduel-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/p1lzq3dbil7klabykd2995j65qwqfldd-kspaceduel-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kspaceduel-14.12.1.tar.xz";
+      sha256 = "1zihp0nc6gs4xymyykldjw22zrxm8qznjaya4z1fw07hwndijvia";
+      name = "kspaceduel-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "gwenview-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/agnpfa5vjjfq79j3x2nf3nfwvvxjl28i-gwenview-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/gwenview-14.12.1.tar.xz";
+      sha256 = "04g3qkz1g27ph6ha1zrbqpr827vhx9n2nigr0dy95a61qw1m0jww";
+      name = "gwenview-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/wfnbykydc5zl9d678mpw7hpc1nscynmg-oxygen-icons-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/oxygen-icons-14.12.1.tar.xz";
+      sha256 = "1z27id29s98h20dg27wr28w2qpb25ii1xsrgjk6r33nhj2y39jmg";
+      name = "oxygen-icons-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kppp-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/q4fxwbxh1rl3icjzhcyij7wwbchc0xzn-kppp-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kppp-14.12.1.tar.xz";
+      sha256 = "0lvcanlskjgra2wn3k1j5jx9vy5k0g381ycg79fazkczsr8is5wf";
+      name = "kppp-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmouth-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/9ny33z3srhnwz8p9fd7i6klmm9y9j08k-kmouth-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kmouth-14.12.1.tar.xz";
+      sha256 = "0a3fhlgy8z84n83v59safl71v29px9783dndlqgh1dk8lmki7dmd";
+      name = "kmouth-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kig-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/iwj5hwmm9p278b7yi510fh38710w96rr-kig-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kig-14.12.1.tar.xz";
+      sha256 = "0qs89kpms9ch2r9xj4scvjscn7b7bh5k1nxaln1z654mgp1rl4f8";
+      name = "kig-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkexiv2-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/z8w5hn03zzpbpg7mjdmykylcbvhcd2ac-libkexiv2-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkexiv2-14.12.1.tar.xz";
+      sha256 = "0qpfccasra3ffq5iz7dpxpzcyk13ywjdaz32n1wfsylfv158w9sg";
+      name = "libkexiv2-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcron-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ixgf55ccq4gyyazhnbrrrg1qhpgh048s-kcron-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kcron-14.12.1.tar.xz";
+      sha256 = "0czcxajsdx7xal9cvy9cd4drhvaivx68mhymj5k3n90cka7qda2x";
+      name = "kcron-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnapshot-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/vjc105v5nsibh4pfvrvsjck78f2645lx-ksnapshot-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ksnapshot-14.12.1.tar.xz";
+      sha256 = "02g48b3i7xglrgp1nxvpbsrq7kqg81s4mf6k9rhfn312n45g1arg";
+      name = "ksnapshot-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "marble-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/543lrxwg6zz77yz58ihn3dvf9rhy3xzg-marble-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/marble-14.12.1.tar.xz";
+      sha256 = "13plghz8d5a8gdkq3nr7m0bvp2p0smqnj987bmsi1cldvliwiijl";
+      name = "marble-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpat-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/2ssmxyy2vhlipyrh6cs5qgms20cicmhy-kpat-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kpat-14.12.1.tar.xz";
+      sha256 = "02bh34553r7k0vf7sb5nsr6zgmh1xfgyjfyfc22yvknpmz2zz8wb";
+      name = "kpat-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "poxml-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/n8504ljfha2rq1r0lrpz0gyyh59rpjln-poxml-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/poxml-14.12.1.tar.xz";
+      sha256 = "1r0iqqszmqmjnkq41xv87sc601fm8s94ga9pn37alni7f7qddfrs";
+      name = "poxml-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "umbrello-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/m7ia6872rxwbpx88zidqanf1wqni1az6-umbrello-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/umbrello-14.12.1.tar.xz";
+      sha256 = "0kr60kdfg2pl049n4rkksfs6160jijxdwymx60gj44h8w2dxrx6c";
+      name = "umbrello-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krdc-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/qlj342akja4fh4yp2fib4v4bm3kn2bmg-krdc-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/krdc-14.12.1.tar.xz";
+      sha256 = "0jqq60spxb64m9y37q2wd7w1z3h0c0hcjvd6wi694v0zhblg5622";
+      name = "krdc-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktimer-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/39r333hqffzycjszw3wbash4p8cs4vrc-ktimer-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ktimer-14.12.1.tar.xz";
+      sha256 = "1p4y1kx3w6rqwjnhpjx17246w8gp7l8q2212x7khs8karnfyvxh2";
+      name = "ktimer-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/p9al8bnc7cy61ccnbmw5vzbvg36rq3yl-kremotecontrol-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kremotecontrol-14.12.1.tar.xz";
+      sha256 = "0rvf73bj6l7cgbjcpn2bgy00zpdw4sj5zcchgl42xldl75zzr6mc";
+      name = "kremotecontrol-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/qsdvwqqp7pwbh2vdi5p3w56snysf94f8-kde-dev-utils-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-utils-14.12.1.tar.xz";
+      sha256 = "1wpiarm8h4y5yjrdrxkmndps06h08vql70n63aai8crdvgwixdqy";
+      name = "kde-dev-utils-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knavalbattle-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/6ic12j8bm99jckl82p347717mrhl5v6r-knavalbattle-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/knavalbattle-14.12.1.tar.xz";
+      sha256 = "1jd4b2kmlknh1xz055xysasfs90810m8sg4iwyzqv2j5kj8i4x4l";
+      name = "knavalbattle-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksane-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/72jv9b0id1ql2pbz8vdcm77n7s7br3vk-libksane-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libksane-14.12.1.tar.xz";
+      sha256 = "0a4hp2d0h26nkggmkiswywlw0aj5wkk8c6s9wy2h7m7qcmyq4gk0";
+      name = "libksane-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdcraw-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/j4y0bpk9zir6270cmxmfxn10bphgbdw8-libkdcraw-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkdcraw-14.12.1.tar.xz";
+      sha256 = "0svalln7g862d6f5k76vdggqc1h1x9gagm6v56yzr9dypz81y40m";
+      name = "libkdcraw-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "blinken-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/xl2fn6zcfr99ir7l10y8dd79ns4msgyp-blinken-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/blinken-14.12.1.tar.xz";
+      sha256 = "1fvgq57qhx305qxmhzm628p283dyk9nnp33q5vgcxxfw726mi5pq";
+      name = "blinken-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "step-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/1v6hadh7m1i58hc62c6z2qs2ycsi02rw-step-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/step-14.12.1.tar.xz";
+      sha256 = "15wlgig9b932ck1hwdld0q8nh74rh820wj4nc6ifys83wv43jnzh";
+      name = "step-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/0invqcgsx7scwmihagccpgdfq3aa52w8-kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+      sha256 = "03lajpwia7fmlnr9l0g44knwghz8b2i70i659nkvypw6qd89cccr";
+      name = "kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/rjsmd2babmjdbwvr5n5gv1f9wcag4iln-kde-baseapps-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-baseapps-14.12.1.tar.xz";
+      sha256 = "0l31842mmriirkcqsdmj7s31yjwr5im8di7z7dfjgjqy0j1q1jzc";
+      name = "kde-baseapps-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/h2hcdrv66b95ajbj5wrz1aspq4fr85pd-kde-dev-scripts-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-scripts-14.12.1.tar.xz";
+      sha256 = "0g3i26vm3n2jc69mpwy94b60ff9c6fsr4yrl1h4f3408f4g4sjj4";
+      name = "kde-dev-scripts-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kollision-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/8kf7fxqm2avmamkdidsglx7rvl30cj1n-kollision-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kollision-14.12.1.tar.xz";
+      sha256 = "1l2c34l95kj4f8y156yirc35vfb2yblnkkjq1bfkmiavsb6vzhd5";
+      name = "kollision-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/82jk65vx3xpg2ydn3fzg6v2w07xgihhc-kgoldrunner-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kgoldrunner-14.12.1.tar.xz";
+      sha256 = "0sgr2034mr5gmmg81qp9sqjw2sn2cgdw8bl9dq2iid43czih5zbw";
+      name = "kgoldrunner-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolf-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/y7m9zzkm4wz23myj568sdjpn86f6m4iy-kolf-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kolf-14.12.1.tar.xz";
+      sha256 = "0arxis9q9qzbv35qq52pl4j5xzqhdwypjhxwdiqammqksdnln8lw";
+      name = "kolf-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okular-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/8ipl9g3hgm04x1xpvyy8ahlbvjq6birx-okular-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/okular-14.12.1.tar.xz";
+      sha256 = "1my3d91lm6wz8gh9g7pw4rrdxkc22vr9v02b22qqvxb2z8mdq5cb";
+      name = "okular-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/jl34m0f1m497dpwnmmw2svy9ig9x7x5q-libkmahjongg-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkmahjongg-14.12.1.tar.xz";
+      sha256 = "00s4akfgr33n1bg2bds1fxccnig9hybm95qq95ii6ky4jyjc6b78";
+      name = "libkmahjongg-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbreakout-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ab28gj1xwh9calkkf87xqnh84x8cjq08-kbreakout-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kbreakout-14.12.1.tar.xz";
+      sha256 = "1cvqjch9ymjii7xmlg1clscbv6245m5bnf77dxz6nkzsrcy4khbx";
+      name = "kbreakout-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgpg-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/8bfm6nbnd3clpdy108yab44vv7552c1i-kgpg-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kgpg-14.12.1.tar.xz";
+      sha256 = "0cfhmlp200dbhdkckf7xvfbfsz985zw7vp6vin4w378dzyw55lmb";
+      name = "kgpg-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kscd-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/lfsycaw8n7kjsbnkga24cfqmpr0rpff8-kscd-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kscd-14.12.1.tar.xz";
+      sha256 = "0ag9i649ah627b5xsacvz1q05pijfrbwrg34bpcc61px9zsgk18l";
+      name = "kscd-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcalc-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/5avv44x780sz0v874cl781k7camn6xcj-kcalc-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kcalc-14.12.1.tar.xz";
+      sha256 = "0qsfllwhn1gd675k5fxbfcfflnn86cbh3nzn70bc2lmxmwrlzbj2";
+      name = "kcalc-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfourinline-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/qbgn1hkh15gv93wbrfg2bh14zsfgxfva-kfourinline-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kfourinline-14.12.1.tar.xz";
+      sha256 = "0mhykajapvbcrasadyjjjz7sps3vmmw1hhijfjbswkb62ikmwc6k";
+      name = "kfourinline-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "picmi-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/s1m8hz32vjf2v38p2rkznrx4mgn6rzr3-picmi-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/picmi-14.12.1.tar.xz";
+      sha256 = "0nrg4qza4h99k59w92v3qy68xlkdslqrlqi62fg94i88rl9l6ypq";
+      name = "picmi-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebdev-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/9mqr7imp19hgjl7bn5sbp2d3xmgrr3p1-kdewebdev-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdewebdev-14.12.1.tar.xz";
+      sha256 = "0iv2r5vxkk8bg8p2zpq2dqnq0vvwhmjls0gdg30gyc4w04a7jcqr";
+      name = "kdewebdev-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmines-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/nx62f1snc9d786yi1vsh0vzixkgrv9gr-kmines-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kmines-14.12.1.tar.xz";
+      sha256 = "13f070kh0rfs5pmw3lnlwxwvx2ph2q8n1vm9lvr6kw1ablngiacm";
+      name = "kmines-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "filelight-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/syf2l3yk3wga82cyak82janjsjhgvbd5-filelight-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/filelight-14.12.1.tar.xz";
+      sha256 = "1dzcgric6rxhxhi84lgbsmkfk6s6b96px8019njnp744jys2ikv8";
+      name = "filelight-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "amor-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/5nkk3cqvi177qd3mq0n687r5swcrixfd-amor-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/amor-14.12.1.tar.xz";
+      sha256 = "0p0fgp3j6x1f83kxdvmkcy4ladhg206m261fbpa92zyxp2ylnl0a";
+      name = "amor-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdiamond-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/6pbb85yp6xhd3x5w0a5ql6ms10yj1pj3-kdiamond-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdiamond-14.12.1.tar.xz";
+      sha256 = "12frpi62f4w86ygxa68dvx1nj8n7w7lsgizfdyc6lix6l5vfzn7x";
+      name = "kdiamond-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kteatime-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/89l402jmb83ji7xvkz82kz024l012yaz-kteatime-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kteatime-14.12.1.tar.xz";
+      sha256 = "0my0fjiblkkfy2148axc7gp1nsx5lr2y8zn6d2labai2f6dy1bpf";
+      name = "kteatime-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "juk-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/gjxwckkx3mikzkpxs7vzk830nj42fj6q-juk-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/juk-14.12.1.tar.xz";
+      sha256 = "0wzjrk5w5y0f6bc98pr7xni1j8krdyjsk3agcwkhb4d4c0aa5gka";
+      name = "juk-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/kdk1frzcpvc11ln0vamc6m0m7h1xfnj5-mplayerthumbs-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/mplayerthumbs-14.12.1.tar.xz";
+      sha256 = "0z9iw1syv61y4fb4dlr9n8w78ri7wpznys5bd5sn0hxbkwnavs6b";
+      name = "mplayerthumbs-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kget-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/v34rq3l61yyxsml99xp18adg85ki53r1-kget-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kget-14.12.1.tar.xz";
+      sha256 = "1jr15bcc09pypihva7pjsq6rlj0kqqhqvprxdggmwa7fnyyjxrg4";
+      name = "kget-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkface-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/8l4frnslphg2rbpmaikwi0j7w4hfw56r-libkface-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkface-14.12.1.tar.xz";
+      sha256 = "198z0n286qnngrln24s1dfghkddz5zy7qr8af0jkywxdj3j2ks3a";
+      name = "libkface-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ygwdm76ijc39y3blkfl7s6g21328dk1p-kcolorchooser-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kcolorchooser-14.12.1.tar.xz";
+      sha256 = "1yw1cxg2caddncnhqyck1fh7g43svgcb8pb15wp5rz7qqs0p65mf";
+      name = "kcolorchooser-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dragon-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/2iwy70md4cqg461x92sbxwbfzmj4y1xz-dragon-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/dragon-14.12.1.tar.xz";
+      sha256 = "0wqmjb7zl883mcmx4x8ss0x64r79wrphfxkyva6sifcy596y2wxh";
+      name = "dragon-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/5n1arbyl0fjp5b5xdlgyha4nwpxbczyz-kjumpingcube-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kjumpingcube-14.12.1.tar.xz";
+      sha256 = "1h7nypr5b8b5az7c2gszihlhq9k2dn92cabjmif9rlkrvl6nahcy";
+      name = "kjumpingcube-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapptemplate-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/fxh9hhx7z5bv151xrxw26h91pz09lw9z-kapptemplate-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kapptemplate-14.12.1.tar.xz";
+      sha256 = "00df6ckfaglnnxizzqmci10h8hiqjv0fgi8xb3x4d3aszb049k1y";
+      name = "kapptemplate-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksquares-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/16zwzi9y1215imff1phggjza00j9y4br-ksquares-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ksquares-14.12.1.tar.xz";
+      sha256 = "0b1av02srxfd9ji51f2pcb5phmlqdz2lzik1n97yzn6f0xh19h9y";
+      name = "ksquares-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bovo-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/gfficdhz1w80xmvn9842jx1fwpd81lqi-bovo-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/bovo-14.12.1.tar.xz";
+      sha256 = "08in3ppksxp7zdgrv5lvjxzlvc6srfjcicagqbj2r8nrfmngjlim";
+      name = "bovo-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/pafvmq1gg81mjpwyf388k311qwf7pgcj-ksaneplugin-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ksaneplugin-14.12.1.tar.xz";
+      sha256 = "00bsd58kfvhp36rbwsmbk3yqjx8gca3r42q5z3fvd0jpf7y8xxip";
+      name = "ksaneplugin-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "rocs-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/n25f8hphjdbwbk9z488i4bjmfai5vzsx-rocs-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/rocs-14.12.1.tar.xz";
+      sha256 = "033irmbjs6d8q7zdvz7vzx61d0gmgxb96cypwlwjmww1czgy9zcg";
+      name = "rocs-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kompare-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ikirdy65sp1w2w38p28nkzic0zhw5iyp-kompare-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kompare-14.12.1.tar.xz";
+      sha256 = "1js49gfffbv6nplr907dkcq3j6xi6h1276n0fbkpd7y31cca6mi7";
+      name = "kompare-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalzium-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/4zh8mah5lsisbnv07nas6wqv6xvsqzy4-kalzium-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kalzium-14.12.1.tar.xz";
+      sha256 = "180qq9h046hax0jl13iy9mzbzhn66y41p8cj5447qgrnjbdk5qa8";
+      name = "kalzium-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksudoku-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/1pbw74v9j5r9x36b2r7yq5k8n9fbcvwz-ksudoku-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ksudoku-14.12.1.tar.xz";
+      sha256 = "1majccia02g7icqh8pad3m91nj94j228s66v25szlwacg2zc86zr";
+      name = "ksudoku-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cervisia-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/2ifpmknn9aw760hsz4j7cf7kc6x704hl-cervisia-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/cervisia-14.12.1.tar.xz";
+      sha256 = "1xgvk1qar2mg5awkwsc0wzyzmskgv9r6bgbczyy0fjjd9xh0mp75";
+      name = "cervisia-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcharselect-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/3qpkmwxn855x58k5za6r67rniyzkj006-kcharselect-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kcharselect-14.12.1.tar.xz";
+      sha256 = "0rb4dr7ygiks45c73nwab9wg9zdn1xgq93yhkpp23bkfq9ca7z4f";
+      name = "kcharselect-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbruch-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/mvjdshn07gw1jn31y7igfzrzdmkpw98d-kbruch-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kbruch-14.12.1.tar.xz";
+      sha256 = "180gbax6lrn5qr1l7x1c3i0i2kh1by4j80bif66jxwra505by50z";
+      name = "kbruch-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knetwalk-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/y0pg73qfkvfdrk3r7xz7yfgzl2s24vg5-knetwalk-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/knetwalk-14.12.1.tar.xz";
+      sha256 = "00b2zkiv3i99k6ri3xljas2fc2ihri84cmckgwrzvpxbdha8wpj8";
+      name = "knetwalk-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "palapeli-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/7vjjf69hw3kkwxmnlxfcg44wh7yy1s5i-palapeli-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/palapeli-14.12.1.tar.xz";
+      sha256 = "1zdbhn7dfrzb18k3rjgm934gjib5kazkgblsl15jxlzw2yfy458i";
+      name = "palapeli-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okteta-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/mk87jrnhqgcarmc658k4f2fpm1181i3g-okteta-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/okteta-14.12.1.tar.xz";
+      sha256 = "1mw32cjj2kw36frki26nycwi48p1s0wi2v9h85v9dwgk6235i7d8";
+      name = "okteta-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/1mbdk8jijasnkhrzavpv89mzbfrz9b6n-ksnakeduel-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ksnakeduel-14.12.1.tar.xz";
+      sha256 = "14ryx9ydwi23lhf5xr5mn77ixzkirwdg43mrh2cc0rnq440mzalv";
+      name = "ksnakeduel-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.4.tar.xz" ".tar";
+    store = "/nix/store/nky571v70dk45hy9jfvii63amga1qx55-kdelibs-4.14.4.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdelibs-4.14.4.tar.xz";
+      sha256 = "0h255hhl46r7ax9hm9sr7qddljwzfky2ssh695ml3svfwg52mihl";
+      name = "kdelibs-4.14.4.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/6sfiw6s55wnsnsyh0sas9s3f8fbpwnw4-kdesdk-strigi-analyzers-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-strigi-analyzers-14.12.1.tar.xz";
+      sha256 = "1bsf1dgb2039jjzqy6pr66yw08kxbn5xpna0bfmrbiw4pprlmbi4";
+      name = "kdesdk-strigi-analyzers-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "svgpart-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/hcxrbw696pca5z4p95ws7373x55bi9lj-svgpart-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/svgpart-14.12.1.tar.xz";
+      sha256 = "18r6n6wh8yg5wmd5wyc8sf6k994ghfknanlp7l1pcqwqa6wfv6rx";
+      name = "svgpart-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/dazj5495njhw8bdyizpx0af9r20bvj5a-kdenetwork-filesharing-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-filesharing-14.12.1.tar.xz";
+      sha256 = "0id8qmr432ygkfmcq3mfr3zv0w58393w0z5pd86k8nnkz43nh208";
+      name = "kdenetwork-filesharing-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/11nyk47q1i4qh92kdzw3l6gi5nqhja5b-ffmpegthumbs-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ffmpegthumbs-14.12.1.tar.xz";
+      sha256 = "1q6ayhxrsq3y5yvrawsvr88pzl7vcz5ms6dq0sgd4mad83kwl5yj";
+      name = "ffmpegthumbs-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmix-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/5y3gdnaa0a8nhpd5a2abp3ixcdnmg9im-kmix-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kmix-14.12.1.tar.xz";
+      sha256 = "1zk1c1m1zihb4wih2330a95gd1skakwsx0vccxp8np3nsh71z3fa";
+      name = "kmix-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/6h2dlw28xi87axxdglbkjz2jyjl78ijv-audiocd-kio-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/audiocd-kio-14.12.1.tar.xz";
+      sha256 = "1wi3mwx9v7lh71ciar29c1bprwh2lgq46yq3kx5gq7wz20cx54hh";
+      name = "audiocd-kio-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lskat-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/awrjks0ihywpqygz8aqwrxn53yd8sljb-lskat-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/lskat-14.12.1.tar.xz";
+      sha256 = "19q5qzfh1dczkdz612hw21849h438dhl21ghbfm5hi5m04vmn8rc";
+      name = "lskat-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmahjongg-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/kk2rlvdl5hm4b0ms3i5pvs1r6lh5ipbh-kmahjongg-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kmahjongg-14.12.1.tar.xz";
+      sha256 = "1pbq9f6zb96v98sz94kz979z5scpqzvc5fp4nxs2dg1rx1la8qxl";
+      name = "kmahjongg-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.15.tar.xz" ".tar";
+    store = "/nix/store/pmn8vgwjdszsl46pra65vn5i7pxfj7g4-kde-workspace-4.11.15.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kde-workspace-4.11.15.tar.xz";
+      sha256 = "1y7df6mar72lzy1dan7v5wwgf2w669b0hkrdb6ai1s3whmqr611a";
+      name = "kde-workspace-4.11.15.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdeedu-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/1l6fwf3bb28myf3k3hsiv27gk8ar6gz1-libkdeedu-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkdeedu-14.12.1.tar.xz";
+      sha256 = "03jic27ghfz2gpbn2nb69qiiip4vgy3y4as8qx328cl39l5vh8d4";
+      name = "libkdeedu-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktouch-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/wvgsj2m324xic0rjr6kyi7pfwqnfpmzq-ktouch-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ktouch-14.12.1.tar.xz";
+      sha256 = "07z1nkyc4hxjd39pczkv1z6dxdjn3334wnv778mdrf98lm77vjxd";
+      name = "ktouch-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblocks-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/wgjmvym6jg44xr5mzgw3pb77w1ya8s2h-kblocks-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kblocks-14.12.1.tar.xz";
+      sha256 = "0qk5g5karl29g4hbpl7lfgahv71as3mj6j604cpd2wiwma05qa2s";
+      name = "kblocks-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/5ppmqjmqizw31x1yjnzmicybln433l9a-kqtquickcharts-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kqtquickcharts-14.12.1.tar.xz";
+      sha256 = "026am7l64m721vv3l79z6v3avxq94z1vrzx1ifwf8p001inf4ydy";
+      name = "kqtquickcharts-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sweeper-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/1nwklpfvdggaxadjc3396j8qgwdl619h-sweeper-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/sweeper-14.12.1.tar.xz";
+      sha256 = "0c3kqnjwi5q24k7b05dr5mygd3ps0r1s9cbs49r9zikswz7gky1d";
+      name = "sweeper-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kopete-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/gcj1qvbh1m7hbbyfdsl1nypc07nzy0yn-kopete-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kopete-14.12.1.tar.xz";
+      sha256 = "1pkgzlq7scz0pvmn2dis128rh2hdfxhbg6imn4mwrizmlpaycb98";
+      name = "kopete-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbounce-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/w5dhnrmkm982i7kw1j9j5rf09z22cka9-kbounce-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kbounce-14.12.1.tar.xz";
+      sha256 = "1x726x5x6cpdnig0wmam7zzigj33afwswdmxxgspnpimkybwpy0f";
+      name = "kbounce-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kanagram-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/cxxfxxpmnk70i9cx0cgx7k6jdg32s73f-kanagram-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kanagram-14.12.1.tar.xz";
+      sha256 = "07lz09armwr4j594pn30d617ngxcn8n3yxikm79ck5020gx4wvgx";
+      name = "kanagram-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/5jhzsqxdfzh1zw1d103np2rm34jdj945-zeroconf-ioslave-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/zeroconf-ioslave-14.12.1.tar.xz";
+      sha256 = "12ri1dbbzc9dwx2n843979yvh93a9yrzpprk9jdmjr1hkna8rgmy";
+      name = "zeroconf-ioslave-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/zcxv7zv41p63pij7d37wdp4hcll77ldc-libkeduvocdocument-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/libkeduvocdocument-14.12.1.tar.xz";
+      sha256 = "0nqjcddjmapgadlkv97banjk5fh7p355hfxcbspksyndsgplz1hv";
+      name = "libkeduvocdocument-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmousetool-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/dv7j6rb4688zzlp36l45f2h0vzykvybj-kmousetool-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kmousetool-14.12.1.tar.xz";
+      sha256 = "0k38qj2hv9k846fba4sxdg1biplbdn5hfmfhx5qmc6g6h8xrs2dr";
+      name = "kmousetool-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolourpaint-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/dqi11m0gnkyrfppdlibvgv2gbycpjqm6-kolourpaint-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kolourpaint-14.12.1.tar.xz";
+      sha256 = "15vkd7i35myfi9m11p52g8x7dlkvf06fa400r9vbw321fza2gyjc";
+      name = "kolourpaint-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgeography-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/zl0qg5scvgmzsq6c7l4s2rs4dh6v243h-kgeography-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kgeography-14.12.1.tar.xz";
+      sha256 = "04g2sw2r1i8kc85n9igk15kmk3hc8gdci52lxk4ca04bxcif7061";
+      name = "kgeography-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/1cknwl7y4djaq1cwjj3g38k8w8gi6zwc-dolphin-plugins-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/dolphin-plugins-14.12.1.tar.xz";
+      sha256 = "0sjfm5ry54h56vbbch11js50a70pvwbkinyxxgyvs6g260ngpkx2";
+      name = "dolphin-plugins-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kreversi-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/rbc1h7c1v7bdzgwxqw5xs2x19rn4z9q4-kreversi-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kreversi-14.12.1.tar.xz";
+      sha256 = "1011262n5zh6hji7xxgq3k2hkgh0hqhpvk9krw22plda4nww2xwc";
+      name = "kreversi-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.4.tar.xz" ".tar";
+    store = "/nix/store/rwsx6c3s4nc7vkcfk0c39jbp7f5f0rvp-kdepim-runtime-4.14.4.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdepim-runtime-4.14.4.tar.xz";
+      sha256 = "08axhahiqv77cr6ssvh1cadqjvv1064w5l94wxadnyq3vz8kl6kz";
+      name = "kdepim-runtime-4.14.4.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdf-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/5caacq7s0yh79mqykwj5wydj3b5gyl83-kdf-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdf-14.12.1.tar.xz";
+      sha256 = "1cvd7ydk277crv1wiw7sn72mv9lf5pqk56gylfmzr63mr7dyj5iz";
+      name = "kdf-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiten-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/8dl8yv38wpv199jjgw3kdl8rajxnnc77-kiten-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kiten-14.12.1.tar.xz";
+      sha256 = "0518zbvgn3w00b7lxfivrgrp8xrpb09rf9cf9zdxdl2z37gxmvmv";
+      name = "kiten-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/1widcjdd8hzy1dnabg9px06yjc0k7ncf-kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+      sha256 = "1xdb3hm7iad2wvbwqaa5bbqzgg6xdbbv68xfjajpx8k9cn20kh9r";
+      name = "kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcachegrind-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/k4y83g821js66c35bc6x2r8m1924vd4f-kcachegrind-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kcachegrind-14.12.1.tar.xz";
+      sha256 = "01fa9b73ymym5qyd5lirb4cf6c37x02a1a9ls2qgzswflm557d49";
+      name = "kcachegrind-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kstars-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/plbszpr250pr7x41578a4b5n329wgl4l-kstars-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kstars-14.12.1.tar.xz";
+      sha256 = "08px9765vl6hpmy39wyhlbm4d3y5wh82w33g2fppx4d9bxmpz166";
+      name = "kstars-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-4.14.4.tar.xz" ".tar";
+    store = "/nix/store/shap58rcwhg13766v7zm28nxr6rn09gw-kdepim-4.14.4.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdepim-4.14.4.tar.xz";
+      sha256 = "0jpbc84xv07j2qynkn4mhmwlldbmjg6v7dqc1028kfk7sbcahhf2";
+      name = "kdepim-4.14.4.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktuberling-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/c4m2nwfbjwqgc9ydq6macg4zkmrsd7v6-ktuberling-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/ktuberling-14.12.1.tar.xz";
+      sha256 = "1ghymw6ljvkd9wi4j0f1n8gjkhxfkqvmb8n36lasrfr27v57z68v";
+      name = "ktuberling-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblackbox-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/rnz72ryzp7mcxk83l71rw7br3k6hamr9-kblackbox-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kblackbox-14.12.1.tar.xz";
+      sha256 = "0cxyzlsvhw9rg3b9c558zbqr3ijbzyx5as9g92ald8w7qjja5jnv";
+      name = "kblackbox-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalgebra-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/c3gmynlqgyhdx3nghhwgk8i85qqysjsj-kalgebra-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kalgebra-14.12.1.tar.xz";
+      sha256 = "0pn4scp7y7ih60jaq39kanwgsc2aslb41v9xw8322kk8q4gyc8g4";
+      name = "kalgebra-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/53ksfs7gxzr33sgdbfxk4ydjzzl2c7y3-kdeedu-data-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kdeedu-data-14.12.1.tar.xz";
+      sha256 = "0hyqwkva7bgi43fgad4caz8q4pcb9kx5czpc3d8nksk5q28a1llg";
+      name = "kdeedu-data-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kigo-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/ggvs29ryi85ig0r9z3jq259kvyq1k1h0-kigo-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kigo-14.12.1.tar.xz";
+      sha256 = "100rrip6w08ld2xgwdm2dryk8qa92dssdz0a0iykgklddq6dvxr1";
+      name = "kigo-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "print-manager-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/p445xkdbm1dqqb3p2x10rag6xccidp9c-print-manager-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/print-manager-14.12.1.tar.xz";
+      sha256 = "1ad9a23cfivyzfgajg1bn10n2glp2ks8yqkl5f0xk5alyldzbir6";
+      name = "print-manager-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kshisen-14.12.1.tar.xz" ".tar";
+    store = "/nix/store/1hx5ws8bbzh0lnmjp0x8ln1s7rv3x62a-kshisen-14.12.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.1/src/kshisen-14.12.1.tar.xz";
+      sha256 = "1b0csn1ngpcwcl8iwv02hy1gb6hk13453khzgya6ckixk5szcdy7";
+      name = "kshisen-14.12.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lskat-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/w24lqbmni5n7w2xdmw1khzixg9f2p64m-lskat-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/lskat-14.12.2.tar.xz";
+      sha256 = "0c5zg0lkzcgf7ff1hqy6rh8cq5z4935p7rmm463pl933djpbl5bn";
+      name = "lskat-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpat-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/1w6n38dac3mslyfl5blf1cas013m9h8g-kpat-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kpat-14.12.2.tar.xz";
+      sha256 = "1rhs752b3ncbpbmrc9zknww0dsihh3lvwvh629v1s6xc0vqvcar4";
+      name = "kpat-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/738qaln8qxvsdnqiy6adk9sh28rfjkgy-kdesdk-strigi-analyzers-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-strigi-analyzers-14.12.2.tar.xz";
+      sha256 = "08db2nhkw265i2dfbka5q6vm7bxbjywk1p52hhjc57a2qvqfb5ww";
+      name = "kdesdk-strigi-analyzers-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/fl2nm7vv3k36vyf2wml8pv4sskh53ycr-zeroconf-ioslave-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/zeroconf-ioslave-14.12.2.tar.xz";
+      sha256 = "0jx35018amdcgmxi9c7alc4c80qywzakqdrzyq5i7jxjcl3y1ly0";
+      name = "zeroconf-ioslave-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmix-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/jrmw028qjd86q4mjyasx64iyssaj7wk7-kmix-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kmix-14.12.2.tar.xz";
+      sha256 = "1jx2mkrdx5jgrjr02snb199xradpxaw42dw8y7icbpmkihxmxry1";
+      name = "kmix-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmag-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/g87b5njzgp7jrydvwvc2xwpnwv0p33kd-kmag-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kmag-14.12.2.tar.xz";
+      sha256 = "0bcrr67v6h9vc69341b662z7dbgxm3yrazfkfsdlxp1ahqspl6w5";
+      name = "kmag-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/35izrbqhb52zlfs2x1qsjc0k1l2d1pkk-mplayerthumbs-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/mplayerthumbs-14.12.2.tar.xz";
+      sha256 = "1kwpd3j64zm78qwn42q3kgipywdlcpvibng06x032yv6i8wmi6m1";
+      name = "mplayerthumbs-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbreakout-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/hqsma0ww8philxqp1hk22sk3lf711y4i-kbreakout-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kbreakout-14.12.2.tar.xz";
+      sha256 = "12y03rbm13pg1c8xpgclklin5vjzsidyaiamhh5bqpqsxsqcnh5n";
+      name = "kbreakout-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kreversi-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/cixkkb370365vic33rl9n9846ll44rqx-kreversi-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kreversi-14.12.2.tar.xz";
+      sha256 = "05zkwswpy5sw9ab3gc012pgvl0wq8f2lb0qhdr96rvxgp8m273j5";
+      name = "kreversi-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "jovie-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/xmvafr9hszzwndqazdzsn9i90cwi0afs-jovie-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/jovie-14.12.2.tar.xz";
+      sha256 = "0yfn5n3n3knacvpr3cqiii0hldbxc6m09k1g53hlksay61s2r56v";
+      name = "jovie-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/yhs96yv9mv61pp521mpay8i0dgqlmm1y-kde-l10n-sr-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sr-14.12.2.tar.xz";
+      sha256 = "07f8x34q8bdcsvc3a76zpd0sjxnq5ja6ghl3d9a0a4ix0hyyv8zd";
+      name = "kde-l10n-sr-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/l2499bc6hfv5x284cs4bjvqbmbxr0aij-kde-l10n-hi-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hi-14.12.2.tar.xz";
+      sha256 = "12ky5zmds18n2sgivrnpds8qjkd64397ia9h8h9s5s9l3cwgipb2";
+      name = "kde-l10n-hi-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/kpcnzwp6wg76slwd2zdmzmg09iydims6-kde-l10n-tr-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-tr-14.12.2.tar.xz";
+      sha256 = "1d326cxhfx0434x45lq9wgn5csvmclgd6fmyqzwlax88vm57gg62";
+      name = "kde-l10n-tr-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/p36g7i6w8hgsz3wdax3ldxzv3djmw258-kde-l10n-pl-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pl-14.12.2.tar.xz";
+      sha256 = "0knjhk0941qf28l4izz2ssfri88s09k0vxd3d6xblg51r6m0b2sk";
+      name = "kde-l10n-pl-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/iyab41x341l7b1acprqv7azbdbxbd0lw-kde-l10n-km-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-km-14.12.2.tar.xz";
+      sha256 = "108pcxflcbhisixivg6153sm8rrbdrrh6rbvxib307dh1q1sl7ix";
+      name = "kde-l10n-km-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/sqlfyy4bhzgnv75msvyv2m7sx8vwhb0g-kde-l10n-eu-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-eu-14.12.2.tar.xz";
+      sha256 = "0x8dihag23ljyw50qpg3bqyhfg8p4f6k1daz2102wkqdbwhzk1ch";
+      name = "kde-l10n-eu-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/63qi174y5jw1cs3q0wzb5jk4j64q4zqp-kde-l10n-nds-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nds-14.12.2.tar.xz";
+      sha256 = "1nyz71cpin9cqffjaca9wv9s5v9n358agb1ncamg5iqj176cxvrl";
+      name = "kde-l10n-nds-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/f4jmy4xgm9a50a4r6nlvjz61ihw3w14j-kde-l10n-et-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-et-14.12.2.tar.xz";
+      sha256 = "1a4kih4lb4sqwasvqhqj06r37rj00vjlhwihlr7jk8z373yg6kk3";
+      name = "kde-l10n-et-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/j4jf2n3bikb23kzg55i538jjhz7gn2jx-kde-l10n-ko-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ko-14.12.2.tar.xz";
+      sha256 = "0vv4xdis64nc66i81fnilnkl8max6wm07kzwiqahdnrbrza8vqab";
+      name = "kde-l10n-ko-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ha5w0palyj9b7ajwd5xdqppgjnx1vsv0-kde-l10n-kk-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-kk-14.12.2.tar.xz";
+      sha256 = "0bvghaggmzm8a12gl2z6ykgf8qabiagjmmddiqihbnvdi27ia78c";
+      name = "kde-l10n-kk-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/9cjm0q29zj5p7if67m6ax4vp9bsp1xmq-kde-l10n-hu-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hu-14.12.2.tar.xz";
+      sha256 = "0s2h123kbylc9ijxv6yfj5l593zgy5ar843rn82jjpvfbq3qj11n";
+      name = "kde-l10n-hu-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca@valencia-14.12.2.tar.xz";
+      sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv";
+      name = "kde-l10n-ca_valencia-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/l1nsi3pqrb0wv2v650sa8xax75kpinxx-kde-l10n-fr-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fr-14.12.2.tar.xz";
+      sha256 = "01lkgx857vmxl90si1b55gyz27iqdbk7qkn5v40n356zzaicrxva";
+      name = "kde-l10n-fr-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/qmf7y72b47pnq0b0gmxhw3slsgmy2awf-kde-l10n-sk-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sk-14.12.2.tar.xz";
+      sha256 = "0diajsp56l6dg96m9nij834dmky1gh48wd8ji5zs37fvpmdc96r0";
+      name = "kde-l10n-sk-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/var4wc2isqx94ay6lq8fnnynb1566sgm-kde-l10n-es-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-es-14.12.2.tar.xz";
+      sha256 = "01ha5db71rzkr3a0mlq80ag0fagivvjh26ck0y8da101lgl01i4r";
+      name = "kde-l10n-es-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/3h7wyirznwm4zh6flqq1j2hacayvm423-kde-l10n-ca-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca-14.12.2.tar.xz";
+      sha256 = "1gcypc9l95iry45vh4pl1i7hwrdnm4lgnwnfnw1l7016lhgfjr8m";
+      name = "kde-l10n-ca-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/mi03yzrjslab56mj7qw22d2lzl2kk4pj-kde-l10n-cs-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-cs-14.12.2.tar.xz";
+      sha256 = "0rb6wnw0944zpllm4cac063r7hl5rq28x3b5a6has0cz4mqk9jw9";
+      name = "kde-l10n-cs-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/9lw0j1h2pwvl1zpcl8cjba2xqc7lwkp9-kde-l10n-ar-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ar-14.12.2.tar.xz";
+      sha256 = "0nkv2pj4f3hjrv25l8kqm9cqv0j7h3crrzyqzq026zzz6znlq190";
+      name = "kde-l10n-ar-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ix18mmzjf395q3wj2qcbpm1z9jvywm4k-kde-l10n-nl-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nl-14.12.2.tar.xz";
+      sha256 = "0izpvjmlh8yk1nnzpxa59n6lv4fk7575j8nwjapy0ynrknps4fff";
+      name = "kde-l10n-nl-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/xa7h417v8b57fzimvggiyfx7hys197kz-kde-l10n-de-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-de-14.12.2.tar.xz";
+      sha256 = "1y54csccymc7hpbsm8kjw4v9ypgvxqcqahwvan2x84fvn7p80inb";
+      name = "kde-l10n-de-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/44rprv2vwz090i48pnykzws4blyryxw8-kde-l10n-fa-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fa-14.12.2.tar.xz";
+      sha256 = "04qxb6qaj1cb174m6svd83m34fv8hwws8v4a20igkh09b5bl3dsx";
+      name = "kde-l10n-fa-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/5051arszznb40q77d34zcwnaaxwv5wx1-kde-l10n-wa-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-wa-14.12.2.tar.xz";
+      sha256 = "08il92kssd4d1zdkks4777pk8l2n3k4abv589x8rja4rlmpxrscq";
+      name = "kde-l10n-wa-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/hvcw01d444zkmyw1zpds2mnw7xmx4wca-kde-l10n-nb-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nb-14.12.2.tar.xz";
+      sha256 = "1q461np49d0n0zhby9dd8knf7y3w9vi1r49bzlqwd1y4hb3alnms";
+      name = "kde-l10n-nb-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/xqqsvrfab53ybxfm0hq63bnlqpn6pz62-kde-l10n-uk-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-uk-14.12.2.tar.xz";
+      sha256 = "0avr2c9drnkv7ndz9mqjayf6pivk6hbghmj6rli91lvqavjp6vlb";
+      name = "kde-l10n-uk-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/kc6d1lkncc3djfn8zybhz6xzz7nzickb-kde-l10n-ug-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ug-14.12.2.tar.xz";
+      sha256 = "17jizdwkfh3gfi9ykpszqw49fzswgps7xlbq9j8pjflyk36rya9i";
+      name = "kde-l10n-ug-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/35mka79zjlplbis7b6dhiz48wls25gc6-kde-l10n-zh_TW-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_TW-14.12.2.tar.xz";
+      sha256 = "0h3nfp51w7r601d6rpi55nzrmpywp3dalwqjwx4a6rnlawf3s2hr";
+      name = "kde-l10n-zh_TW-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/qs4xzws3s0vamj17m98fxcqqvp8hyyw7-kde-l10n-fi-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fi-14.12.2.tar.xz";
+      sha256 = "1q8j8v7i7lz3qk22adr1cj0bs6qw36540bj0vdzpa3390fn3i2ra";
+      name = "kde-l10n-fi-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/yz0rzw7m437glx49xdxp4zz7ic51g5nq-kde-l10n-el-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-el-14.12.2.tar.xz";
+      sha256 = "0wcbzs0s1nqafa0hi0abb17yw3jnxcq2mxyk4h5p9g7q7pkvh6s8";
+      name = "kde-l10n-el-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/fcqsn91fsip4bi7y763y07i3ii4ji8zs-kde-l10n-bg-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bg-14.12.2.tar.xz";
+      sha256 = "099af2qdxjy8whfaw0hzmlywb7l7bmpssga90xyahr7nh6l8vwnz";
+      name = "kde-l10n-bg-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/nbb6gg7pc3yzjxs3gj7l0363i5d1bq1h-kde-l10n-lt-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lt-14.12.2.tar.xz";
+      sha256 = "1lkjmcj77mmk6lvh1h51k8i9nn33b0q9vgbampj33qgax1d7a4mk";
+      name = "kde-l10n-lt-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/92dr7l2vrh1j4bxj2zy21prpfb1v9ba6-kde-l10n-pa-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pa-14.12.2.tar.xz";
+      sha256 = "1fagcrjjm7s0kpkfflkjx6rbgzprf7qidpbgwzw3jjf501vfdpkn";
+      name = "kde-l10n-pa-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/2iqdi982l5gbh3ajibgznzxg6ryjn49p-kde-l10n-hr-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hr-14.12.2.tar.xz";
+      sha256 = "11dabhhz676ria4nwvkx49igzm481fl9996j3p6rzd4kbhrksgq0";
+      name = "kde-l10n-hr-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/rfkj26fa9pi0mraxd8mgnh758dhp0m7n-kde-l10n-bs-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bs-14.12.2.tar.xz";
+      sha256 = "1x4m0cksbiy25s8pynskmasy7kkzm8i8mp5dvsx3wsh0msf4pg1i";
+      name = "kde-l10n-bs-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/sw87zcl7ddd68wlws5689h7r7g5bbcgl-kde-l10n-ga-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ga-14.12.2.tar.xz";
+      sha256 = "0ayambdzdfnky6bwnk5ghnch18y4ran6inrb8v4i1c407zn74ydx";
+      name = "kde-l10n-ga-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/id89acc90qgfqjcidjfsx1sn62yk7c56-kde-l10n-zh_CN-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_CN-14.12.2.tar.xz";
+      sha256 = "0876r1bp36w0iljrlhlnxfizapvw0h2qmpjnf5s7vf5iisrvsbrb";
+      name = "kde-l10n-zh_CN-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/rki0855bdgqwi8ajwmnl9jdm1hgn18xs-kde-l10n-ru-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ru-14.12.2.tar.xz";
+      sha256 = "0i2fb0fa1drg99m5k5d8sdv04g809c3dz507wlrb9bnmarapahhn";
+      name = "kde-l10n-ru-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/xhqd4bxhv3p1mwr4j7h59858dc782ycs-kde-l10n-gl-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-gl-14.12.2.tar.xz";
+      sha256 = "1mpzxlk93bf50ajk3m9ly19fdn34rnpznap6bad05zj9wczin9km";
+      name = "kde-l10n-gl-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/8p2ygqhbbzxmnrjjxyris3281bdklbm9-kde-l10n-da-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-da-14.12.2.tar.xz";
+      sha256 = "1lqs9fpp1dj8r0mpnjy8m7aa9jg8iv30k7wdpxpcf634m2p06911";
+      name = "kde-l10n-da-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/gdrvx87d6y9q47alc0s2251dzm04wpdi-kde-l10n-sl-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sl-14.12.2.tar.xz";
+      sha256 = "01yj9wh5zr72vgxman2j49ihhcyxr2yw820g2cz68bbqh829riiq";
+      name = "kde-l10n-sl-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/qcs4fdkjrkgva632nqyi1z24h517fvl7-kde-l10n-id-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-id-14.12.2.tar.xz";
+      sha256 = "1cc1yfps29fakra3xfnnzf6blqsydx4r9scsd0w0f8xxk3mr87j7";
+      name = "kde-l10n-id-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/klsqxbpagy7jj2ha51hqr7h9qpd4qg9s-kde-l10n-ja-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ja-14.12.2.tar.xz";
+      sha256 = "0i7x21yvj3ipg96jmfqs7kaixqa82f5s58mpi34vyypcc1ap4731";
+      name = "kde-l10n-ja-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/lmg22mpi05l0944ihv9z72jg1i8xs2zc-kde-l10n-pt-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt-14.12.2.tar.xz";
+      sha256 = "123j4h4bhy0xdhazl18yccp17283k98s4f09f24r5b54yzw5cs0k";
+      name = "kde-l10n-pt-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/pgw29ki339a22l9c7incm93qvmjhvwif-kde-l10n-mr-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-mr-14.12.2.tar.xz";
+      sha256 = "02z4hq74gxgvcnx0za74zlyx01m407bc3219wiqb88ly5b6g59af";
+      name = "kde-l10n-mr-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/4p5v5j7l1j5xvz83jilwmmg22v5pl1y0-kde-l10n-he-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-he-14.12.2.tar.xz";
+      sha256 = "02lmsvdyw878hk55r5dqm065n3f1czgq0icspi25ibxgvhf0nmji";
+      name = "kde-l10n-he-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/pzpmizw0hsfczli3wk7mihsad2ziwnjy-kde-l10n-it-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-it-14.12.2.tar.xz";
+      sha256 = "09sfiv36q40sy9w3nqld89lgmpd8kba6xav683a28a1i0ipsjjbc";
+      name = "kde-l10n-it-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/7gphdvwvll05pn6dn3wxydy66d4an0hc-kde-l10n-ia-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ia-14.12.2.tar.xz";
+      sha256 = "03jkjrbgp59xiwrbj9hp55y3qhpcyg1gxwv0vcbvxaxpg1zg7s1x";
+      name = "kde-l10n-ia-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/6xryf5sf70rqzsp6zirfc85hbq8mq93q-kde-l10n-nn-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nn-14.12.2.tar.xz";
+      sha256 = "1wr73m10liqvd7fkq3gqh4y2ibwgm200cbk6dv58xr25jjh1ji2l";
+      name = "kde-l10n-nn-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/zjdd8bp4639ylb7wr2h0a6zl4ka4hv5j-kde-l10n-ro-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ro-14.12.2.tar.xz";
+      sha256 = "0p4b7bngb3j2xsixk3s5wks7050famwbh00cgdpq8gd02i01iplc";
+      name = "kde-l10n-ro-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/hm9hivcnjbbhxnr2k1p95lfa57y9qpa0-kde-l10n-is-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-is-14.12.2.tar.xz";
+      sha256 = "1fz1azj7z127zpf257hzavsd0r3k7j1gd3wgw5i9prr3n0xp589j";
+      name = "kde-l10n-is-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/hp26lgcf3jrgcqsrai43kvimlpq9gs48-kde-l10n-en_GB-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-en_GB-14.12.2.tar.xz";
+      sha256 = "1vmgrbx31683j47na433h2sps961h5av1rkqrmspdpls32g3hjq4";
+      name = "kde-l10n-en_GB-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/y18jr4kswbh1qlhw83xyig9rri07yya3-kde-l10n-sv-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sv-14.12.2.tar.xz";
+      sha256 = "1a702cyyhg5dk9bmfxmpsyj4h9lk2hrm8rcdzwy6lmhvclgc4iqj";
+      name = "kde-l10n-sv-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/bcssbybfddwdy45n5sfr8aw2a6xxpn27-kde-l10n-pt_BR-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt_BR-14.12.2.tar.xz";
+      sha256 = "0lvjzcpv6j4i3xavkcbjbz17mxzj59rqiq9gxhvqnk6wihzwr3d1";
+      name = "kde-l10n-pt_BR-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/xszl4r8c43w086w15mf61lis5ar4ig24-kde-l10n-lv-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lv-14.12.2.tar.xz";
+      sha256 = "1i8xd2apf8gr657w8jzc2vj4s7izh1kpqnz1n75yk2b8gbr0aiqq";
+      name = "kde-l10n-lv-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktimer-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/5bknljgh37bx5v4c0vnmigasa3xq3cka-ktimer-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ktimer-14.12.2.tar.xz";
+      sha256 = "15bar1j2var6i1jawq0nc4zkifl1qghciqyqavx39sm1cxphqirf";
+      name = "ktimer-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksirk-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/xmalh942dl6rygwk4jxpirabx2l8n0j4-ksirk-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ksirk-14.12.2.tar.xz";
+      sha256 = "0ab8vbk5640jaq6r0f0f5nidf0xx62lb140hq42flmid0hw6ls57";
+      name = "ksirk-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/hl424krxwgahhhykhwhq2lxmrjdvfrxh-kdenetwork-strigi-analyzers-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-strigi-analyzers-14.12.2.tar.xz";
+      sha256 = "1802iy6w5wchj2lj6b7yp32nj4pbh1pn44v2pvhafg0nj49rn0iv";
+      name = "kdenetwork-strigi-analyzers-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cantor-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/sv2xx8whd4smmx447iaxg3akivyk74gs-cantor-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/cantor-14.12.2.tar.xz";
+      sha256 = "0hcxr28083qadm7b6pjqh959dvj79dvymkigxv851ainvspr82km";
+      name = "cantor-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdeedu-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ka3asqxgpas752w1h3agc2c1ka3brp19-libkdeedu-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkdeedu-14.12.2.tar.xz";
+      sha256 = "0w7wkcr46fp3gidfgm4gp3q26vxp4szfbqmk4624ysrdi85aa6br";
+      name = "libkdeedu-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bomber-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/dw2kr8sgmcrw2p3vy1cqdq2jk93i7rmr-bomber-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/bomber-14.12.2.tar.xz";
+      sha256 = "12ff8rikxb1x7j4b5jg41ph5pgp60vn133npzalq5vsldmrgj3h9";
+      name = "bomber-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kopete-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/iifrjlqyrylq47kvmb7idgig4y05yp69-kopete-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kopete-14.12.2.tar.xz";
+      sha256 = "025pwhvcidszg4mv8hw8hya9xvgw08yvkzigxsk4pjn5vm49y16i";
+      name = "kopete-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/c1s7763fzbnnslcn95spcv0swp6gx3xb-oxygen-icons-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/oxygen-icons-14.12.2.tar.xz";
+      sha256 = "0dc0zkl7ivigcf5vf72gqnijm8p64bq4ibqkr02k8yv7yqq123wz";
+      name = "oxygen-icons-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmplot-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ff917gin734l0i1w84xdq2s6hjkjjmwp-kmplot-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kmplot-14.12.2.tar.xz";
+      sha256 = "1j7fnqi02pqwc0pgv0qgykm2hih5ncg7pbkwyskj5sds8xs86f55";
+      name = "kmplot-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmahjongg-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/jv7gpjyhacvmdvbdy5j34nrm06zk2aig-kmahjongg-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kmahjongg-14.12.2.tar.xz";
+      sha256 = "0dc9majrsg2fgl8s8wqyhyjl3d40qf4m7wxx9m7076sa2h8hj4g9";
+      name = "kmahjongg-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolf-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/x3c14mkaxp4swyxaa7js7yq1rgrx7gvf-kolf-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kolf-14.12.2.tar.xz";
+      sha256 = "1yiq1sw6a74s8pq7cs4rl8rvawcb3rrw2kbwdgcaqvq0krgnlc8h";
+      name = "kolf-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bovo-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/habi2k9mvpz6l5lj2i2yfig6ghxrkf5g-bovo-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/bovo-14.12.2.tar.xz";
+      sha256 = "0z20lywx4x4pqdbqqhz0m84vzml6kxn53sl17z0lgnf74zh0vqam";
+      name = "bovo-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/qjs07i14179wq2gj40gcj99q0i7fgsmr-audiocd-kio-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/audiocd-kio-14.12.2.tar.xz";
+      sha256 = "1lix6yzradscrr79b4fj5lqs1f6wlrzyr0qwk5mvb9g326p8c4sr";
+      name = "audiocd-kio-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccessible-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/byi9jaq7vijdfqzbqyyl8plk0mgb6cf2-kaccessible-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kaccessible-14.12.2.tar.xz";
+      sha256 = "1xq40cl7pqm65k9h3yvhn7zjb80z3lpqyp823wm6nz6qld4hr4bg";
+      name = "kaccessible-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konquest-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/47visnxvfz3h8wa0485wiq5659y5li8k-konquest-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/konquest-14.12.2.tar.xz";
+      sha256 = "1h9ql9alyprh8ykfzfgj3nkch40hdp1vyfkshm5kaab15b657bgy";
+      name = "konquest-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdegames-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ccx7yrjpgljpv0f61jlczmx738y7skpd-libkdegames-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkdegames-14.12.2.tar.xz";
+      sha256 = "1pxq9gzw5m5i8d1v1d34mvmfr138hwfvq5z9pg2h9zw5y3hs9g7s";
+      name = "libkdegames-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dragon-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/swpywmriiwy1npn7k3gcazisra9gfzqb-dragon-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/dragon-14.12.2.tar.xz";
+      sha256 = "0gd9zr9fj4r2789bi6f836y7m6df08p05vizdy04cf9s2hjkr9wy";
+      name = "dragon-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "juk-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/nsrq6d9bini4804hkkzsny91rfxcgp01-juk-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/juk-14.12.2.tar.xz";
+      sha256 = "08brdx7hfm48hmhc0rg0r3c4brb3mkb0r23j2ps0y210pwarkwh0";
+      name = "juk-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cervisia-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/vjbvvbnqg3fjghc19159ikqm6yii6z30-cervisia-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/cervisia-14.12.2.tar.xz";
+      sha256 = "120a8brfllk6jybn4zpyj0w5bpv2dvibcqbh37qh9ld2h6v9rrr2";
+      name = "cervisia-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/1nli1nsr1a3j7wprpjhwmmy418l6ibx4-kdesdk-kioslaves-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-kioslaves-14.12.2.tar.xz";
+      sha256 = "14vk4aqdwny4iidsvznfzss51k1376lp4v65bmqbpwf2kg6mis2s";
+      name = "kdesdk-kioslaves-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.5.tar.xz" ".tar";
+    store = "/nix/store/cr9ncrb5lfgi7nyrdqlrh2c3xlj2a5rp-kdelibs-4.14.5.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdelibs-4.14.5.tar.xz";
+      sha256 = "1jizh61vz83za06mb23hhakx99jf2c59c02fz5kld9mnxzzl5fgm";
+      name = "kdelibs-4.14.5.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmousetool-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/9vi7j77n4x5qpl4jphl3cc52cc34wymq-kmousetool-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kmousetool-14.12.2.tar.xz";
+      sha256 = "06ifiay1mxcfb0bzzcf14xkvd4iwy9va37x3jm0xxhy9641cxq7i";
+      name = "kmousetool-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalgebra-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/4v4hcxa9v1hykiypb159p0618nf0dij9-kalgebra-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kalgebra-14.12.2.tar.xz";
+      sha256 = "10iz0vjn8mscgkb0vra8ac0rbdyw45xzz5rydlkczr9w3hxnccyy";
+      name = "kalgebra-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "granatier-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ilynhcqbrfbhafhvmbag1j7nrkiicszs-granatier-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/granatier-14.12.2.tar.xz";
+      sha256 = "16v0pyjby6yyrqm64p4a0lkxf0bb50smkz680b1yp3mcc5nm22mw";
+      name = "granatier-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klines-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/64fb2pidpaccqzk5wddvvxma515fk6nl-klines-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/klines-14.12.2.tar.xz";
+      sha256 = "10km97mbz9z816ki12jki46mb0h2829l24spiai9pk8mbvkyqx3w";
+      name = "klines-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmines-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/1g8n4bq8p2dn5mvncb6a046kjmndgfpy-kmines-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kmines-14.12.2.tar.xz";
+      sha256 = "04axmsgq3wcim5fs9jgwgbb9z7p0a96qxhm50s5dwk4lv6fhzzv9";
+      name = "kmines-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "superkaramba-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/l32ji88v0j54mhvsqdg7ysqqalnwjx4p-superkaramba-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/superkaramba-14.12.2.tar.xz";
+      sha256 = "0y3ld6hpbjjqkpmrpbxmznv5vjdiyh3rw6dqbygap33qvw6b3d0d";
+      name = "superkaramba-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdiamond-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/67i12gxqd5p15vdl8b5a87xl28fn9aqv-kdiamond-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdiamond-14.12.2.tar.xz";
+      sha256 = "0g3al1p68q4ypdjrnq6sf738w84x3a2l71fpg7qb5kgpaixpspjj";
+      name = "kdiamond-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kigo-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/inss9axxxz7szp7icfwsrms9jyc4c855-kigo-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kigo-14.12.2.tar.xz";
+      sha256 = "09b5hdfh46mi5qpgq0j02qw2wfrsach6lw9ydg0ybplyfvmp27l5";
+      name = "kigo-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/5dh19ycmzai2k5xwgiwmpi05nn60k089-kdenetwork-filesharing-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-filesharing-14.12.2.tar.xz";
+      sha256 = "08parv67kilxh2nzgbmj3q9g6pzncjjr23rl6ylh3vv8p2vr2v5h";
+      name = "kdenetwork-filesharing-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kajongg-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/px8xd5vjs7y6g7h4vyyiksn818waffy0-kajongg-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kajongg-14.12.2.tar.xz";
+      sha256 = "1863hczxmzrwvkv2y7kj2anf56fpwih70plsa25mkmli6l5x120q";
+      name = "kajongg-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.5.tar.xz" ".tar";
+    store = "/nix/store/670zy2wyah5qw0rp7kmzdv9q3hl2cl25-kdepimlibs-4.14.5.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdepimlibs-4.14.5.tar.xz";
+      sha256 = "12p03dljr6sldl4pxww4gb18mrvdi61r85ippmljknr4sq26kd8m";
+      name = "kdepimlibs-4.14.5.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksystemlog-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/nqwz22sa222dkr9a6mmgyc2k9xahbv8h-ksystemlog-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ksystemlog-14.12.2.tar.xz";
+      sha256 = "1j22944ham5x3y8qf7gka81nnq66f81lwrc65zmzvbf7vyj813kq";
+      name = "ksystemlog-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kturtle-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/aw9ahw1ywy5m8k8j0a2l5qfg0n2n2yn6-kturtle-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kturtle-14.12.2.tar.xz";
+      sha256 = "087wfff2qpl2shxjwj30lna480skx8j1z4rlvkbyywc645gd0afb";
+      name = "kturtle-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kppp-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/6w3pnklzw2kd761dfg3ya4k0xawnyp27-kppp-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kppp-14.12.2.tar.xz";
+      sha256 = "1hdywnsvpybfc5hcja2msfdim9g37pgggkjp4kkahc9gv62z1m0i";
+      name = "kppp-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/bbi9jdxjb1hm2cd6flh08h7ql90m9ppw-kde-base-artwork-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-base-artwork-14.12.2.tar.xz";
+      sha256 = "16jg0pm6wqqsl5g8hf55iacgxjh5x92shmf9263xpc1fiq29770c";
+      name = "kde-base-artwork-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "artikulate-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/iq6qjaw0n37gq49r4lmkjzyasvghcss5-artikulate-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/artikulate-14.12.2.tar.xz";
+      sha256 = "09jvjal3r6bl77aby1wzbpyr4rxqmghc759yrg1rbqca1filzd5w";
+      name = "artikulate-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdcraw-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/dawjc253wxbw6624zjr0v2yrq9i47v75-libkdcraw-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkdcraw-14.12.2.tar.xz";
+      sha256 = "0xj3dhyz7mf65dqiw2zz6mp3xmfaczmr7axhy0h6z1ynbyl1vkcm";
+      name = "libkdcraw-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeartwork-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/zb2sqh3qjd53nmqhs9m24kag1f3dxiah-kdeartwork-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdeartwork-14.12.2.tar.xz";
+      sha256 = "1svw3ah03g751iy37i06kw4d6jzgc8yy9cjayf3xp80m37fpjlws";
+      name = "kdeartwork-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klickety-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/dmi1azffqm3c8gjk1d300a0a2jps2j4v-klickety-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/klickety-14.12.2.tar.xz";
+      sha256 = "0rlp4bgzg7i892a89zrgaj0m1zwbb2g8ap9np3dpqljaf2la9rg3";
+      name = "klickety-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kspaceduel-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/f5ycj631mpfnyb8mngzxmvgngyk6lsw8-kspaceduel-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kspaceduel-14.12.2.tar.xz";
+      sha256 = "175n2jbx9m3yhsp10bj1fk9d2vfv2dlqd1qw7l3kmca5nr7ripzb";
+      name = "kspaceduel-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kate-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/49b5c3cm0ysi2w89a161ysmirpmckcls-kate-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kate-14.12.2.tar.xz";
+      sha256 = "0n6b5jcyb428gx9xflsqjs1jhk51n12yxyfzl6cvg29vai453fff";
+      name = "kate-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgpg-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ddc07v0j09547gnspl7c7fgcrbvv0fk0-kgpg-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kgpg-14.12.2.tar.xz";
+      sha256 = "1ihxkcx162jp4b2qgpwa65iq90n1bz21l6fli1z530247h7vzlbw";
+      name = "kgpg-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khangman-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/jvxwahcgixjygdvvyiprgwhi1c70cb5k-khangman-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/khangman-14.12.2.tar.xz";
+      sha256 = "0piyyqvfawgk3mbm51saigaswcpbk86my5v8mvha220sgzamnj9l";
+      name = "khangman-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/whd0iampjk6i5fm234gcsly38sxh5nb6-kgoldrunner-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kgoldrunner-14.12.2.tar.xz";
+      sha256 = "1ijykdnfslp2vp3y0ji0bbf9zj83rbcywvg0kgiza963vzhf7rcw";
+      name = "kgoldrunner-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/bvj41rw9x0014q6k67d2f6w8xqwpf9zi-kdesdk-thumbnailers-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-thumbnailers-14.12.2.tar.xz";
+      sha256 = "1jyn507y7h2j8cb6nblc2lcf16ld9rn9cvi4xhj4sq9ccz0w7vz1";
+      name = "kdesdk-thumbnailers-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "amor-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/kpv805bhwfkn95rnp8hzl42c26h8678l-amor-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/amor-14.12.2.tar.xz";
+      sha256 = "0wqh3csi0isfj3zpmsay5p38sbajfbrhkv6lms5nqr4k81kcpq55";
+      name = "amor-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktux-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/jfkymr2flr7p986z1larn1i2qndrij8i-ktux-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ktux-14.12.2.tar.xz";
+      sha256 = "1pml908z08y0ik4d0rncavrg26lqvchza113kxmyxc7ak95bwypd";
+      name = "ktux-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "rocs-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/vn70b248ilfjrxv9sz30c4m1czb5n6fl-rocs-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/rocs-14.12.2.tar.xz";
+      sha256 = "1nb0xq051081wps0i3g6p6vawj89vaa27di1hi2nhm1y0hx95m1j";
+      name = "rocs-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcachegrind-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/fxn7qcaa57vxyc2qfnxycfv8hpvqn190-kcachegrind-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kcachegrind-14.12.2.tar.xz";
+      sha256 = "17v1ap9jfzlk30xhx9m5456bqky4m0iywvq34r8zpwkbg4a49la9";
+      name = "kcachegrind-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktouch-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/bishs7m7snrvyrvcxhly4p4d148rmfxy-ktouch-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ktouch-14.12.2.tar.xz";
+      sha256 = "1c7mi9cs17z72hg9v44yki85lqsnl96vgrckz5qcvca2b4w3bjd3";
+      name = "ktouch-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "svgpart-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/3l7a1yydrkd824xfjsxla8swzcv7r8rx-svgpart-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/svgpart-14.12.2.tar.xz";
+      sha256 = "1zkc6p8ycpm4pa2p9yq4ajkcnqi8m3mmv8ghdgi2q3a58fvf2zz5";
+      name = "svgpart-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmouth-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/xwq02smnzwz54i165vpgm8aaamcy02xp-kmouth-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kmouth-14.12.2.tar.xz";
+      sha256 = "0qmh1kpl1asy5av976461i9fp81qan00jbqvfhi5dnli9zfrfmb9";
+      name = "kmouth-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/vv15hxdzvvgj3xhw5pig0kbzm3206j72-kdegraphics-strigi-analyzer-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-strigi-analyzer-14.12.2.tar.xz";
+      sha256 = "1acfdcg0h9kb6171lqqrnihvgynrp0har6frq0igpkz475crmkid";
+      name = "kdegraphics-strigi-analyzer-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kruler-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/g13aw9ppjbwj5rcyy46ccp9yw81bxa2d-kruler-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kruler-14.12.2.tar.xz";
+      sha256 = "08rwsmjbbaapgn98avagn8i3qmvw5fzq84snxy4a74dzf14aph5z";
+      name = "kruler-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kollision-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/lzky584al80dy5xrwvax7xs974p5s5xq-kollision-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kollision-14.12.2.tar.xz";
+      sha256 = "0v6hq3biiybrdd4lblzcadh5kpy21kjlkb5iqga95h7xxm6vd4dq";
+      name = "kollision-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/g6zkyj2i5s910qb9snnabr4ivklvgajn-libkcompactdisc-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkcompactdisc-14.12.2.tar.xz";
+      sha256 = "0xi1yrls8nsq9flll9250yfqx076p0xdxrywpiivx3yv64znjz7h";
+      name = "libkcompactdisc-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcharselect-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/fcm4sghdd7dl98zagm7xfg7lfcbhpi6p-kcharselect-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kcharselect-14.12.2.tar.xz";
+      sha256 = "0fsmh3wsiz49wgc2l1p8caclhx03mmf4q7v7l72yf59c3pczh74c";
+      name = "kcharselect-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "umbrello-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/r7gzmhlg6wlbhhxyx11n88pnd3qs1nbg-umbrello-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/umbrello-14.12.2.tar.xz";
+      sha256 = "1p9sdwalzi5j59xplzzd96m8dsvzc1r1isbljgj55h8pc3sn1am2";
+      name = "umbrello-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapman-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/1dqlriz6zxb6ss4gq2ccswn6swzxk1fp-kapman-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kapman-14.12.2.tar.xz";
+      sha256 = "00qdq5fabm6pljclchiqi0wa3cxdfxbiqs5vw86190ki23qgqfkw";
+      name = "kapman-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "marble-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/hwhbjrqg3qycpsq6kxd17fmmic1iv1ls-marble-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/marble-14.12.2.tar.xz";
+      sha256 = "04khv00h3w0i6igp8b4zh0xyyl7a3aqhbszj2qlpydghr1ghz2js";
+      name = "marble-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knavalbattle-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/b17whbxz6q409ghxcxaia83v95adkdrg-knavalbattle-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/knavalbattle-14.12.2.tar.xz";
+      sha256 = "07a9z0s12v2f5irs3d93pqjsrwv4zs7sckgvsbgaklbxwar1p26n";
+      name = "knavalbattle-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klettres-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/krcpms45cvn7dnv22rp9bdri7v76bcvd-klettres-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/klettres-14.12.2.tar.xz";
+      sha256 = "0ca23y3d2s2m4mzqvw3jknsns0da3gzhqa7g4hicl35v4cbi8w7z";
+      name = "klettres-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkipi-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/b247bpgxvgl1msrrfah432n99hi6h4h2-libkipi-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkipi-14.12.2.tar.xz";
+      sha256 = "0dp3n4awc4glwlnygq8k6119hxl2lq0l66a8a2m84bhgf1xqn05j";
+      name = "libkipi-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "step-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/djjlbx20jk6pv82jrk626k183hkn65qx-step-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/step-14.12.2.tar.xz";
+      sha256 = "1r11csc1hlkrydrznprdvq5sxnmhlpb1v08ns96bs27nxbz29zw4";
+      name = "step-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kompare-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/n3w571knhskpnv263dv67vncy1h4613i-kompare-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kompare-14.12.2.tar.xz";
+      sha256 = "0ma1kwn7psrffs2fn80did8gmv3cr527lb40n1jrvksq15fcfl5k";
+      name = "kompare-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krdc-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/r4q34i2lsi4dcpqvpqzc8c628l99nrh1-krdc-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/krdc-14.12.2.tar.xz";
+      sha256 = "069gp9ahq78pl2ax77c4k0sfvb3g70gl9ph8ariarhh3f5lvzh25";
+      name = "krdc-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbounce-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/0wq7q4n2xxkw0vn49ajjv07b9yc316b8-kbounce-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kbounce-14.12.2.tar.xz";
+      sha256 = "1iw6gwy01ri7kqc5qkk296rzbz3j1swhshxkv05vqpv69vwnfxpp";
+      name = "kbounce-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolourpaint-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/kbkrcfralyq2hal04r5qbsc9cw40yf2d-kolourpaint-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kolourpaint-14.12.2.tar.xz";
+      sha256 = "1r0xs4pisaqg53nc6zgn7bh95346wsb9756d9lq6zgp8jf2lcs4h";
+      name = "kolourpaint-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiten-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/nb1lzzscqr6g5m770aw8zjqxmng6c23s-kiten-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kiten-14.12.2.tar.xz";
+      sha256 = "1y1anhvdmcflkmhya24my80c2hfpnhw8w1b2mqqr4xyjbl0plaqs";
+      name = "kiten-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/la8lyk56j0crfjfj1h9yjxgws3f9shbl-libkomparediff2-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkomparediff2-14.12.2.tar.xz";
+      sha256 = "122078hvi34zg183r8i2ni37xi00bzv7nr5251lhgh0fd45d565i";
+      name = "libkomparediff2-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kscd-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/h9n5pglbgwqxiwdpxf0zrkyfcnqvjgyh-kscd-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kscd-14.12.2.tar.xz";
+      sha256 = "055fdr9l79xjcrl33sxmk82dsbchjjwgmd75dw0sbhwfxs99dvif";
+      name = "kscd-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ah46p15xxk89lrydhxzvyl83q3jjs5mr-kde-dev-scripts-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-scripts-14.12.2.tar.xz";
+      sha256 = "1fclm5wvz58565fx366sia4cjqrb2cr843skw4jpzhh4wb1v9v8i";
+      name = "kde-dev-scripts-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ark-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/v5cdrabvrfx1dvjibhzj6a1m200p53ks-ark-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ark-14.12.2.tar.xz";
+      sha256 = "1aj7dshigv25qki93drpfwgzdycvvh3kl52a0im7g2k6aj1yjg6b";
+      name = "ark-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kamera-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/jgnxszypng4x7wlhz0rg8390bkh87lgf-kamera-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kamera-14.12.2.tar.xz";
+      sha256 = "16zjdx7b1nqh0nfbz0qplvqhl2jnl6l0jc3lfxifiqxsbzr9wlrr";
+      name = "kamera-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapptemplate-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/mfrl2pk66facvk13mm0609ign7ilympz-kapptemplate-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kapptemplate-14.12.2.tar.xz";
+      sha256 = "18dpbvdhi8qpfxhrcjkk71cr4b7gf6achg24gn6i4rcq8bbbv07m";
+      name = "kapptemplate-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkexiv2-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/nqh3y6b9y2zgrkb07yrs07sqcxqmwwsv-libkexiv2-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkexiv2-14.12.2.tar.xz";
+      sha256 = "0fjrvk2dcd4xzbs5v6nrabchkqbvf4qhljlc10797a378sdc8znp";
+      name = "libkexiv2-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/cf4mzk51419c0v7ld561gb8jk496qgaw-kdegraphics-mobipocket-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-mobipocket-14.12.2.tar.xz";
+      sha256 = "1n2n2pd8ca5lnyv2r98jr4k9sm7lsvc5plw11xy28q829aayg8jj";
+      name = "kdegraphics-mobipocket-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksquares-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/yl49rnhq8zxyprh004g1qnqiw148x8kj-ksquares-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ksquares-14.12.2.tar.xz";
+      sha256 = "11hznb7jdamq8hnbxggdj33jrhdnxzrhapc1rsj1ms546z01flnb";
+      name = "ksquares-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kget-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ahgf7lvgcy0fzg9wzwc0agi77bj652lx-kget-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kget-14.12.2.tar.xz";
+      sha256 = "1jadb5x8bn80gwviw73cq715sw9hzx8lpj33d19vv18l2sqyb449";
+      name = "kget-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/cv1vcvvi2nfic2p51vv6jf1nc2dwv7jm-kde-baseapps-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-baseapps-14.12.2.tar.xz";
+      sha256 = "05j034g5h9cd2xw64h5zyjl8biq66p3b0z4z0z0i4min4hp52f7w";
+      name = "kde-baseapps-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/2rxc1y0r19zx61g6n9kgfp1rzgbs44xw-kcolorchooser-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kcolorchooser-14.12.2.tar.xz";
+      sha256 = "063ahsbzd1mfrkc45gjsnhj11v68x7d1a718lxsabkjjx59qpbck";
+      name = "kcolorchooser-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okular-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/dg4a3cj0wssfw3z10bwqxqrkjk3dmqaj-okular-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/okular-14.12.2.tar.xz";
+      sha256 = "1ahw7a8i1hxa8hw0407f9x1s02zn659nprx9bfi1mvxhcn5zbwq8";
+      name = "okular-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "killbots-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/x89vahdh994ax46rl3mx3dxyigph3zq4-killbots-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/killbots-14.12.2.tar.xz";
+      sha256 = "1zvjwimbjld408hplb439f4k8rm6aanlvycpmf4fdiwrcg4zjq6c";
+      name = "killbots-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krfb-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/3d0583a63pwkq8sszvl172d69j648gnq-krfb-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/krfb-14.12.2.tar.xz";
+      sha256 = "112bv9yyhg7zyhkqavjqgvkzbjm54hw4nfqrj3jmcwbjbnlzkkxm";
+      name = "krfb-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfloppy-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/6sm1200z80xxra4ibjmpgi5b626is1kc-kfloppy-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kfloppy-14.12.2.tar.xz";
+      sha256 = "0a738m6r54g4ibinxwh70d7sp736r8lr63ca8hx90a1yl5samr1b";
+      name = "kfloppy-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblackbox-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/i36hvnhadldbxl9yl9sgwzgbmip6nazh-kblackbox-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kblackbox-14.12.2.tar.xz";
+      sha256 = "1j9d33k8732dbwdnv85kr51jmjvnlcljya5q2zp6m97cy7xrf3n5";
+      name = "kblackbox-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalzium-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/hnk7d2fjhvzd1j1c0pjc4kqh3a4zv7bv-kalzium-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kalzium-14.12.2.tar.xz";
+      sha256 = "16ngwp9lf15l06yzazymrdbszkq9sx14wh4k8w1sydryl15xl77n";
+      name = "kalzium-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkface-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/a6cidm1dwqxq34q0wffn8b553xwg3sxv-libkface-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkface-14.12.2.tar.xz";
+      sha256 = "1mp19n7jhs9x74b8rlnrdc7ig1dx0v5pjvl6b4fmzfglk9akhh7v";
+      name = "libkface-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/zi3aqkz4w4s4ldzscvwby1r6xkldxpdb-kremotecontrol-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kremotecontrol-14.12.2.tar.xz";
+      sha256 = "1sbzycb2b4s7v1lr6d7g4xqadwcxh5jlsl01jl3dpni83phxzk3q";
+      name = "kremotecontrol-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblocks-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/bpi59fwiqf4rn8xgkzkhyzr6ajv1d2la-kblocks-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kblocks-14.12.2.tar.xz";
+      sha256 = "0wcb6sgbr7gm9hh3gb31zmw6rqmflzis44ry1zb7yql0kf95y5ka";
+      name = "kblocks-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/g4xg6d0syp06k3znj4xyiyv9ykiq64pf-ffmpegthumbs-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ffmpegthumbs-14.12.2.tar.xz";
+      sha256 = "1261dkxyj07gjs6rk7wh8vkxk9554b675d68w4yfzf4agb8kdb8b";
+      name = "ffmpegthumbs-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.5.tar.xz" ".tar";
+    store = "/nix/store/0s00l7a87bg4qzbd43z7yp6pqff1icn4-kdepim-runtime-4.14.5.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdepim-runtime-4.14.5.tar.xz";
+      sha256 = "00pmiifhf6km9v2hn3xiapr4vwrrijnvyjirprs99p8h39kifblc";
+      name = "kdepim-runtime-4.14.5.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "print-manager-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/1cdzh2b6wq0nmkvjx6spl70pj3538sl9-print-manager-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/print-manager-14.12.2.tar.xz";
+      sha256 = "02vz69aj56hx9jdckacjd7yzr1cmwmlqd7b3n92zmn9bx152sx86";
+      name = "print-manager-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdf-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/vk3f3512rv381dpcwihmxgx4av3d92af-kdf-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdf-14.12.2.tar.xz";
+      sha256 = "14dgcrmny2gvi3m4y95di6w3gv1bld6pbj5i5qaphhxk5gl489a0";
+      name = "kdf-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/rslsx2zc6zf7hls6l1m598a04r6l2h7k-kde-wallpapers-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-wallpapers-14.12.2.tar.xz";
+      sha256 = "1q9p1ay2n4anr822wx7lc45hwwyyl1328ick704x6kd1rz1qwjiq";
+      name = "kde-wallpapers-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/2zkg1fh4kr78r8qg5nrn72k431vxd96z-kdegraphics-thumbnailers-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-thumbnailers-14.12.2.tar.xz";
+      sha256 = "0kvqbdmjnrn5fx9ci9f4fnwk8b20d9cvxdb966cwrzz6x6rik7ww";
+      name = "kdegraphics-thumbnailers-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sweeper-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/pb6xr7b484aszpwr3pvd2pywliij31y0-sweeper-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/sweeper-14.12.2.tar.xz";
+      sha256 = "1k0brig6m5y5pv05lmpmc0m6wiz981jyx1brhy3ixv40bivm4cf6";
+      name = "sweeper-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "picmi-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/6im1sz3rqm53siyfapz4p518vaa05nvz-picmi-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/picmi-14.12.2.tar.xz";
+      sha256 = "1xnxsvpigsf4mjnxxp5w5nvp817az7c7p11z960z5f18adxg7frr";
+      name = "picmi-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/qprvh7y50d15356kdspb4cxqvm9xc30i-ksnakeduel-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ksnakeduel-14.12.2.tar.xz";
+      sha256 = "1gw9sv67jnwcxsm4qw21hjbv3fbnxw6ibr4l8zrcccahlz3lc8x1";
+      name = "ksnakeduel-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnapshot-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/yak0kczv35nhxbgr15mqr6zy9ncvg5jh-ksnapshot-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ksnapshot-14.12.2.tar.xz";
+      sha256 = "15ka0h8bc7n5023ghwgxvq36bjaipimcs09nrg3z4nvdzds6xsfr";
+      name = "ksnapshot-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgamma-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/xz6x2nvcwz2k7df7p8s8wx42309a2rhd-kgamma-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kgamma-14.12.2.tar.xz";
+      sha256 = "1lzvgdqh3i8klnj243rfak6sksnh3z10diki65zzl8wsjyagizq9";
+      name = "kgamma-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okteta-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ydd7za8ax4jb54rap067rzkwfv2ars7y-okteta-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/okteta-14.12.2.tar.xz";
+      sha256 = "1xdyg54zzylj8s6zr4z5npi9pvqx3bjma68j3p7ymqvaa71a1c0n";
+      name = "okteta-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgeography-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/99n02c3v71ycxvywrqn14zrsjgli2nkz-kgeography-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kgeography-14.12.2.tar.xz";
+      sha256 = "10bzwbxg4k487700mnkmk642b5jzvpadcmd8y3h3af91syd0v7zp";
+      name = "kgeography-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knetwalk-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/6z45z434l9dw981lqixg0jw7mb2s1j47-knetwalk-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/knetwalk-14.12.2.tar.xz";
+      sha256 = "102bd37i3z57xkq6rs7l2s4qlwayaky4qb07bh3c589g2s9nxl28";
+      name = "knetwalk-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ypdsbibg2isd991n9bmdkgi5wi59ibnk-libkeduvocdocument-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkeduvocdocument-14.12.2.tar.xz";
+      sha256 = "1rf2signnpx7ik3p7vrvlkbv0g3m280pc1qz1fxzw2kjn9ais2r7";
+      name = "libkeduvocdocument-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/i5wnc7wqbmnac1awgd45iz9d91b7misv-kdeedu-data-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdeedu-data-14.12.2.tar.xz";
+      sha256 = "09ch89pghjipxsr9j50a58xww6cxhrkh9z7ns6bh5kg9b6hc47rq";
+      name = "kdeedu-data-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "parley-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/lix9qbdd1ganlhwap696qdcyhq3awjgz-parley-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/parley-14.12.2.tar.xz";
+      sha256 = "0kq0nm732x723f1yml0cq3w1p7ah5m3q0lj0pvrvg5z393a1ki14";
+      name = "parley-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-4.14.5.tar.xz" ".tar";
+    store = "/nix/store/b3kdfd6nv23lziv5nf21g00wl7di3vz9-kdepim-4.14.5.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdepim-4.14.5.tar.xz";
+      sha256 = "07bg60b96wg107sn49h4phks55z6h69kdsznpfr09dsxf53vl2sc";
+      name = "kdepim-4.14.5.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "blinken-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/aip7i17kab1fcv43qx999cxwr8b05gdp-blinken-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/blinken-14.12.2.tar.xz";
+      sha256 = "1dkdgfmpccbpb4i4h34dg407q6h18mq7x4k2d66bly0pkwhkwkbw";
+      name = "blinken-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/hc68363pfz7k528lcv6p8gfj4r3bi061-dolphin-plugins-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/dolphin-plugins-14.12.2.tar.xz";
+      sha256 = "0lc6l84p3ixk2wzj4hbxwgvsmin3kw8xw40b3jrq2w1y21zbvf3h";
+      name = "dolphin-plugins-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/6ycc8cckv9ybw5fj6qwn53ccn5dghcz0-kwalletmanager-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kwalletmanager-14.12.2.tar.xz";
+      sha256 = "0bynykq9j6xh0a712934vyvq3yr94676xhdvf1iazky1cwwmiryi";
+      name = "kwalletmanager-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfourinline-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/vd8smizcfqw4zsks5sbf03chbxk9dqiq-kfourinline-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kfourinline-14.12.2.tar.xz";
+      sha256 = "14s4lb9kygaa16sq4xfmmabv31kg3rw7dw7k2f4vwqqh3s1168yc";
+      name = "kfourinline-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksudoku-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/rvr5bpfppyd168gfqimfavs9g4ys2412-ksudoku-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ksudoku-14.12.2.tar.xz";
+      sha256 = "10c148lksrh49mfvlx7q5i7xxjanhngm2s9d7ifx5xyqlpik2zcv";
+      name = "ksudoku-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcddb-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/j2pwfcwc6n5r8klnbxf0gpal2pinan7g-libkcddb-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkcddb-14.12.2.tar.xz";
+      sha256 = "088hhnnm09xfqkc0j2l252qgl7nlqmsdbchbr5cninf8n9ivz99d";
+      name = "libkcddb-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/gz25xkmky3kpl4hw2x9ahzr5xp3113f9-libkmahjongg-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libkmahjongg-14.12.2.tar.xz";
+      sha256 = "0min3bpd2h0lch4412ybryk1bn3rs2s4936kcjn6mn0412xyjvdf";
+      name = "libkmahjongg-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcalc-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/g7hglkwmv8kdw0cjly5pysb3i4piapkx-kcalc-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kcalc-14.12.2.tar.xz";
+      sha256 = "0vm861cd9y8ax7mfnv2aszip2z0grmjvhzp10x5f7gq1fhm1db64";
+      name = "kcalc-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/m69i89q12sb8mpc1bhs0a2miyrkfnq7y-ksaneplugin-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ksaneplugin-14.12.2.tar.xz";
+      sha256 = "1scgp9p2jb5vwwdvbgmsbr3mmijiq40m5x7nd9qx7scwn2wqjvq9";
+      name = "ksaneplugin-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "palapeli-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/cynl1ai536dqs4cnlji5db1jybpzh7s6-palapeli-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/palapeli-14.12.2.tar.xz";
+      sha256 = "1fg2ikq19g92bqfp3j27mawl284xqiwd1nr8dg94khbb111210r7";
+      name = "palapeli-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksane-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/4qwqpcwraxr0a8wy81plb3l3ij3jh3s5-libksane-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/libksane-14.12.2.tar.xz";
+      sha256 = "07nw3mjc645angwyllzff0hb7i7lp6wl3fw88zqd380w5j13a46h";
+      name = "libksane-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.16.tar.xz" ".tar";
+    store = "/nix/store/afz1vd72namq3xca96zx1c9l6n8jzk4p-kde-workspace-4.11.16.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-workspace-4.11.16.tar.xz";
+      sha256 = "11mzr55vr7x2yym4gdaj9bcvp2qpbs3vlbfmhs74r5n08vmsdq3s";
+      name = "kde-workspace-4.11.16.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/wbjy41ymgplkg26cm94k6vny2vjl6160-kqtquickcharts-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kqtquickcharts-14.12.2.tar.xz";
+      sha256 = "0v5ng9spcbv22lhpx4hzfg3n56wfrjdxg6nls6sw52zbq12lagqn";
+      name = "kqtquickcharts-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lokalize-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/zl8sxjy6mp1z6r3dajvf5ly5zsiasxjd-lokalize-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/lokalize-14.12.2.tar.xz";
+      sha256 = "04jmsysvx6ysyl3126bq7xg76y7ppzjfd55j7q7i18nrkcgw4y4i";
+      name = "lokalize-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kig-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/0sf32n3kd0fyvp4sdyv5yk4abn8gy54w-kig-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kig-14.12.2.tar.xz";
+      sha256 = "0c137jnkzpzv43yf7crymghybgz70d6q6mlfww53if2119sznzd4";
+      name = "kig-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kanagram-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/gscz4fvz0xh0szcs0jr95xiif4115vj2-kanagram-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kanagram-14.12.2.tar.xz";
+      sha256 = "1s2zn876b3css74r79acq6wys4qlq9xgb3z376xfl71rzadvisvf";
+      name = "kanagram-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "katomic-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/mljg8qpz9axmnzw9jarzz82a4qarvbwn-katomic-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/katomic-14.12.2.tar.xz";
+      sha256 = "0ns6apxaild1iiix03vjzvz45ba442agn4aqkbgik9x9wdr9yr7l";
+      name = "katomic-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "filelight-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/3mm64rsb14p9cyhw31jzvqbs6nppva9x-filelight-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/filelight-14.12.2.tar.xz";
+      sha256 = "047bki2gnwvflb57vij1576d12ml4ga9b1q44dz9rq97wwfbwqnj";
+      name = "filelight-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcron-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/9whfiwhxk7v4cfj1s863w6i789kgcbpf-kcron-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kcron-14.12.2.tar.xz";
+      sha256 = "02s782x69xrymv3wbjcfm52v246gn3illdga7g1rmhs7kmi6q7rg";
+      name = "kcron-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kuser-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/dj7svyjh962g9c3j2bgprhmmnyi45pbj-kuser-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kuser-14.12.2.tar.xz";
+      sha256 = "0p2qwv24qxzx637v5fjwzscvxa7j84j91s4c4gj5hq8939anx7q2";
+      name = "kuser-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kteatime-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/8zydgf0ncr96fgvyya9rg32ahavxm4c0-kteatime-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kteatime-14.12.2.tar.xz";
+      sha256 = "1vq21jw50w56i9bwx91hlw6a2m46q83mz2mg11cdc1nxk5gm1359";
+      name = "kteatime-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "analitza-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/im52lp4p99k9fn2ja5hch6m6glmlk7da-analitza-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/analitza-14.12.2.tar.xz";
+      sha256 = "0sjlsh8x4qzyg59zkvmrd312qvbhmf17349l0b989xm0m1nwmqfx";
+      name = "analitza-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/5rmimmbz973alzhx2xm4r80lf556v14c-kde-dev-utils-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-utils-14.12.2.tar.xz";
+      sha256 = "007w4761cv2wxqhkk7mz2pgk7zmvzkfbmy0biriy836vx99xjdky";
+      name = "kde-dev-utils-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-runtime-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/91wk4lximnfqs5ly2q340rqn87h84axl-kde-runtime-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kde-runtime-14.12.2.tar.xz";
+      sha256 = "0cs07gbx7v6ilrbp4bgl20h1yrbh07sbrrf167pyd4lfx5rz9cgk";
+      name = "kde-runtime-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "pairs-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/whl3f2bs6018bg3i10akdsjvky2wgvwd-pairs-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/pairs-14.12.2.tar.xz";
+      sha256 = "0gs76fgyszs9lrvszi57vldx6avfyiz8hdg5axb7nmyikiqnislm";
+      name = "pairs-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiriki-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/adksl0r448kybmvhs10crw43isw90i3y-kiriki-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kiriki-14.12.2.tar.xz";
+      sha256 = "0r7i6fh9apjhxc7khqb4lachqr95ypiagk7cr52kwpl8bd9zcz2p";
+      name = "kiriki-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwordquiz-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/qz2v6fj2akwll4s904z638pzwpyf18yx-kwordquiz-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kwordquiz-14.12.2.tar.xz";
+      sha256 = "03isbq1dbq5w0pd8jpb93hp6z4nwi28q5ccszvldisfna5abpkjf";
+      name = "kwordquiz-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/jhh4r8rqhcx1jbqycy1i0x5x4ivqgjhg-kjumpingcube-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kjumpingcube-14.12.2.tar.xz";
+      sha256 = "1a030z8bcxyj70in7g574p80hsm32b8s7mqnl3abmw4315dc43kf";
+      name = "kjumpingcube-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konsole-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ahyi8a1vsdyr3zdkiljrwmjz73dxknwi-konsole-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/konsole-14.12.2.tar.xz";
+      sha256 = "06rrhmmx8sdq084wb2a2pgvmi43fkjbmjsikr695c548qp76yzig";
+      name = "konsole-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebdev-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/gm8jph57vbjm15f2w0k2qijghdm9v9yw-kdewebdev-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kdewebdev-14.12.2.tar.xz";
+      sha256 = "0n4p7jflrrjq47wcy20avgjiz1c5qgwmw8nqxmaaxj8vnwk2vx37";
+      name = "kdewebdev-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kstars-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/s6n79j8914ms33xvjrx74s22axlh20b3-kstars-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kstars-14.12.2.tar.xz";
+      sha256 = "0fwfpjmr4i9kh1f3360ahhk01m8zrkipvdj0wn16a3mxvghr6vki";
+      name = "kstars-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kubrick-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/kqvqadr6n5n2200w3gr5h978y6376gbv-kubrick-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kubrick-14.12.2.tar.xz";
+      sha256 = "0r7w6787gc2kcvjgddr0lw0liihis4a5s8rim3ycjlmh60bfw2ac";
+      name = "kubrick-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kshisen-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/2m09vphyfk4wfl4pzxns8lgh00nin1pa-kshisen-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kshisen-14.12.2.tar.xz";
+      sha256 = "110fv7iqbv63sw0q8m1fj0x45ivmmhw2v32sx7my0hvch4rxif1f";
+      name = "kshisen-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "gwenview-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/aq90r77wq4qs67j8dvw89zppbrj5rhgz-gwenview-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/gwenview-14.12.2.tar.xz";
+      sha256 = "0ky9f8v3473f7ic2gaymc89f6yqnpi6vsbwlnqgjfwbq8ry47w4n";
+      name = "gwenview-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbruch-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/29vsbhggrymqqgvs490jxykrf6mhvmhg-kbruch-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/kbruch-14.12.2.tar.xz";
+      sha256 = "12gs4l5wazkym3krcfc0sjzx9kji6ca3blmprw7hfwk1yqgd36rk";
+      name = "kbruch-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktuberling-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/ccqbkxaxm7swcm1qf9rkvjs6fgfiafay-ktuberling-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/ktuberling-14.12.2.tar.xz";
+      sha256 = "0y5icsgkypcr2z9w8zbhn9z877dak2kjf0if5ag1lpmjlj0y397h";
+      name = "ktuberling-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "poxml-14.12.2.tar.xz" ".tar";
+    store = "/nix/store/8i8lf5v6bi77ijr3b8xwny3yrapqnxrg-poxml-14.12.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.2/src/poxml-14.12.2.tar.xz";
+      sha256 = "0d2iqgpxxfzvi9aim2xsz96gjpy1zcjr0f5fsha0hns6m6mdp1lh";
+      name = "poxml-14.12.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkexiv2-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/wx9ll48ipram4w163143ixab3lcdn9iq-libkexiv2-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkexiv2-14.12.3.tar.xz";
+      sha256 = "1rj7ac318rxl995cz70vdivk065mpsxk3sw0zqj7y0a2cgg67qrl";
+      name = "libkexiv2-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbruch-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/w2bqk35id2iwy0hx56a4fqlj9hmzwn6z-kbruch-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kbruch-14.12.3.tar.xz";
+      sha256 = "0vrs1mn701jydqjzlshwjq2366c65qwiz2gf37l31ha0nk8lxcxh";
+      name = "kbruch-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/14cmjnxm524ik9dmjb5p08c9hpr0xzlv-kde-dev-scripts-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-scripts-14.12.3.tar.xz";
+      sha256 = "17xwh4gwbagzdyfxb0wbl6hplrza7mj82mf1dhz5b6p1jjlfji96";
+      name = "kde-dev-scripts-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeartwork-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/r9f281gb1312wvy0dg8g8g5gd4f29mlv-kdeartwork-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdeartwork-14.12.3.tar.xz";
+      sha256 = "14m5hb1rzki0h4fdpg5bm9s4bm6lfx2i939jncjvxik8l5rk8wkh";
+      name = "kdeartwork-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkipi-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/w8s7d4pm150c4m392plhax8y1aawr8c3-libkipi-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkipi-14.12.3.tar.xz";
+      sha256 = "1k20q3f5vgvndny7zj90r6xxdvilh1qg9vksvqn1vydz9wn15by4";
+      name = "libkipi-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okteta-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/388ffmw8i1b8bwdkwyr697fhq5cwghg7-okteta-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/okteta-14.12.3.tar.xz";
+      sha256 = "1wlimwi9j5x9y0j4zsx6d4c8xl8k7sr4wclbm6bi42fk34w27f56";
+      name = "okteta-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "analitza-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/0ar4zk7r20w3xgnvv79n6kcx3p0fjvai-analitza-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/analitza-14.12.3.tar.xz";
+      sha256 = "1xlv47lgybw0wkmws6fkgjzskdmyzgrwgsfkixi2jj9yh8wj7jpi";
+      name = "analitza-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-4.14.6.tar.xz" ".tar";
+    store = "/nix/store/kbi014f4cakyzj22fviawpqzqkfdc2f8-kdepim-4.14.6.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdepim-4.14.6.tar.xz";
+      sha256 = "1c1mcxj10cirxwkzb71y2sik0xk45j2a1yhkpl5lgs1k6xwivslv";
+      name = "kdepim-4.14.6.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kteatime-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/w2m3n25m9xjnig9q4vqbwg00li866lsg-kteatime-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kteatime-14.12.3.tar.xz";
+      sha256 = "0k35gmpkmsc7fqp31l7jf5as0f25lk8kqpj300alryyr9m5i960d";
+      name = "kteatime-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "pairs-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/xgcvm6ic3xjzlbd8xblayybdjz5f8ah0-pairs-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/pairs-14.12.3.tar.xz";
+      sha256 = "1460wvjl17vzak74x5wgnx44db1vv900whl45hm6fjjciqpanb77";
+      name = "pairs-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kreversi-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/1q3i7f47j4mx8nrm0hl5hjjljn478a35-kreversi-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kreversi-14.12.3.tar.xz";
+      sha256 = "1l0pmaqwcdlzi48dcyywzlrswfr3jkywcpv93zdgxx9fba5iyhpj";
+      name = "kreversi-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcachegrind-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/8wiir69l2blpqd1w4b7mcmylsm8j2q15-kcachegrind-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kcachegrind-14.12.3.tar.xz";
+      sha256 = "1xgn2a3ahwnx00fish7n5djx2ci89shf8mjrrq8lkg3grka6cv6m";
+      name = "kcachegrind-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmouth-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/hcy2r6snkvxxmnkr93y8yb5nhrzvk8a2-kmouth-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kmouth-14.12.3.tar.xz";
+      sha256 = "1awkwq4h89qp04fid6d6df03b7fj7rdk0vjs683rpkz52qq8xwny";
+      name = "kmouth-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcron-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/7sxzmrmp6y6xn4nq7zfqbjg2cf8y4zhb-kcron-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kcron-14.12.3.tar.xz";
+      sha256 = "0w33d82253yasrhzswmpccc75mrjyrick2s6s3gibskcy3c9rx5a";
+      name = "kcron-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/q54chzx2w5p1ifvkh3dkmqwxz6q35m0m-kde-l10n-sk-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sk-14.12.3.tar.xz";
+      sha256 = "0nfikvbf10gklcn33pmwamiix1rcgdxgxk84a360rkahafw3xb1l";
+      name = "kde-l10n-sk-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/yn6w6h0ypqv34595f10l0jd76v8r3mdh-kde-l10n-mr-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-mr-14.12.3.tar.xz";
+      sha256 = "0wmkg9rwl60q354y4kz0qmbwbv892v12ybps2wj4mplwq333d03m";
+      name = "kde-l10n-mr-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/6azx1w8qq6g0aqz3jgz971k12va1si42-kde-l10n-et-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-et-14.12.3.tar.xz";
+      sha256 = "1zpj0w3v1hwxpkfmba9k46w37qi41yndhm3ymdrgyl5xgfbajdrg";
+      name = "kde-l10n-et-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/nx1jxyya8da77jg1l5jrlb46xwdn9fbp-kde-l10n-zh_TW-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_TW-14.12.3.tar.xz";
+      sha256 = "0qwykxa72c6pdzdd7kpwigrjv4l7d7kb1h06rwrcg9kk5q9hn31q";
+      name = "kde-l10n-zh_TW-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/sajpc2529bhnd5p86sn0k35wyqj302ip-kde-l10n-ga-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ga-14.12.3.tar.xz";
+      sha256 = "17mqxz2dpqyi1ngi1p2ivxg1qixivlkhzzd1id7ihff1i50f5gdf";
+      name = "kde-l10n-ga-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/m3gp02jxirgh246njwsslprfq627d13y-kde-l10n-hr-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hr-14.12.3.tar.xz";
+      sha256 = "0zv3rvrfn5khmbd495iqnsr579m6igz3fr6h729wcwmizm03kl7p";
+      name = "kde-l10n-hr-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/ghlk4l1xill1v93qnv6sp4d9ybm2m2p1-kde-l10n-uk-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-uk-14.12.3.tar.xz";
+      sha256 = "0jh17m47783vrv3c9wf7j67r937ni4xc670m758casjccwy9ldcb";
+      name = "kde-l10n-uk-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/g4l10q0rg746928lmy4jfk63aa0y063r-kde-l10n-fa-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fa-14.12.3.tar.xz";
+      sha256 = "1imx7nmxx9p8xi290llyhh2hcaax6y458hlz8sid6kq0cl7y5w79";
+      name = "kde-l10n-fa-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/lsw2ss8v9p5ryiszbfp46p1zqckqag5a-kde-l10n-pt-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt-14.12.3.tar.xz";
+      sha256 = "0wh5dgg53aic5n3h260f1908dfirp0k53hakn2kv53m3p572ck74";
+      name = "kde-l10n-pt-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/ga5jirz4ggm0qacl4rzj4rlassiswls2-kde-l10n-ar-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ar-14.12.3.tar.xz";
+      sha256 = "1ybmp4id3y9xrxcx2grmv8w3412h1qmwzawrzixfiixazbg8jgfa";
+      name = "kde-l10n-ar-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/rgsdz47748cn77nmnkysf1vhz5sgzwf5-kde-l10n-ca-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca-14.12.3.tar.xz";
+      sha256 = "14749nzfld9b97bk062d6pdpjdcfhga62n2yh1j1b0g5xqc1x0cp";
+      name = "kde-l10n-ca-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/nja0qv4yh272pjvwbbzk75zzdjn75dgk-kde-l10n-cs-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-cs-14.12.3.tar.xz";
+      sha256 = "1prhlp42vnpspj98kbdshv4liixhxak84xzr58mc8ij7whggi820";
+      name = "kde-l10n-cs-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/avwqrqad41ryhdbx9dbr5m67nn6vqphw-kde-l10n-is-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-is-14.12.3.tar.xz";
+      sha256 = "17gw5isal9xk4iz5dr7qqvqx8j06nb2wzsxkkdxk5qgnqsxdn3d4";
+      name = "kde-l10n-is-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/cmp30mff1j0jq0srvvlhl28jr3jhdrwb-kde-l10n-ia-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ia-14.12.3.tar.xz";
+      sha256 = "0qgdy7b5gs04bszpp2byj9hx3mhy18y3l859si437i0jd3aa4b75";
+      name = "kde-l10n-ia-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/4x1jjabkfwy5yk0ig70pn72awx9f1c7y-kde-l10n-wa-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-wa-14.12.3.tar.xz";
+      sha256 = "0h23mnlhd53cpayhi3kpz7abj7786cf41n41m43b09ln3bw8d8i9";
+      name = "kde-l10n-wa-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/z06s7w5m81vy7q7lm5vybpnlq75s69jz-kde-l10n-sv-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sv-14.12.3.tar.xz";
+      sha256 = "14n0i4g484rxs2qx73jb0jh0a138anhj55x49inq7s0cigq2y1k4";
+      name = "kde-l10n-sv-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/y978vl8sv6l0ls2kh6hkcj77cnz3kcvh-kde-l10n-nn-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nn-14.12.3.tar.xz";
+      sha256 = "037z0c6zy5vbzbg0i1fnyi2b88by2r65a9vyihznr2k72yzgbl53";
+      name = "kde-l10n-nn-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/b15q4v2zmbc030xb1mdw746llfq2vq0y-kde-l10n-it-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-it-14.12.3.tar.xz";
+      sha256 = "0rmy7cnsbfgzmfhq3lvap7x0q1b97np2x1kz65qy1lkdwfvqlafg";
+      name = "kde-l10n-it-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/pzn66c19cgkxlwk4dc7p14pvsagh5bks-kde-l10n-pt_BR-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt_BR-14.12.3.tar.xz";
+      sha256 = "0p2lfgf29432x7srx6piyi73gbqnwfcb6mrbgb5cbrlxmhazd0x1";
+      name = "kde-l10n-pt_BR-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/dykqy8mnwk56zyqscjsbc5l0v3caxcm9-kde-l10n-el-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-el-14.12.3.tar.xz";
+      sha256 = "1l9zjgq4mg1rsdk58csdm1bbvjfblh56isp275jm7fg05izc7idz";
+      name = "kde-l10n-el-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/vfw1xmdblc7ryz4iyddkx04n6bpsmi1p-kde-l10n-ro-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ro-14.12.3.tar.xz";
+      sha256 = "1an38a8kq5b5xzjxflr4fpwq3ld6ryb36p2fv5ks3cgp14vs9bhc";
+      name = "kde-l10n-ro-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/i8h2ydglwf8j89g22ppja7waljid0an5-kde-l10n-fi-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fi-14.12.3.tar.xz";
+      sha256 = "1v8kv7ack9l8w7pcy918vc5crhd43y35m1zkp87zdaqg9svsj893";
+      name = "kde-l10n-fi-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/s3dxzagxplipcrfh3sz9vhxsbwlvd7v8-kde-l10n-sr-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sr-14.12.3.tar.xz";
+      sha256 = "03ddq090ihma7y19l2ryjf69mbmqwigrxmhsyphkrpvkcch995vv";
+      name = "kde-l10n-sr-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/5r0zswdk5p3ais2gwwknzqh1y70v98rr-kde-l10n-da-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-da-14.12.3.tar.xz";
+      sha256 = "1nl2wvy1vg76rci4jkkgpp5ii49x6s348ps4mpj3ad46a1nxldfa";
+      name = "kde-l10n-da-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/a9nqy8yh51xmprzq7g806hpp85djxci6-kde-l10n-es-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-es-14.12.3.tar.xz";
+      sha256 = "12bj9jp6l03skx8pn2b3hrbd598kg4zm4qj88nbf6l9mzjm2pjb0";
+      name = "kde-l10n-es-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/zdrqq64485q0zz3m3mh11canxyn48i6x-kde-l10n-he-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-he-14.12.3.tar.xz";
+      sha256 = "0bsjnlnn703s5s3k8p68ic591zf2k6lcdizhm75dirrc2ydwld2p";
+      name = "kde-l10n-he-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/nxiv4m0827jvvh9pl5adani2f83jd0pa-kde-l10n-ja-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ja-14.12.3.tar.xz";
+      sha256 = "05gl706zmw0jhw7ahdg61q0swy65459j6p6qzx4g6albrxqjr2ks";
+      name = "kde-l10n-ja-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/y9sx89dk7qf8mdl18ga9s99kga8j50v1-kde-l10n-ug-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ug-14.12.3.tar.xz";
+      sha256 = "0pl9fs7gdsxafgiky7k2a6xz07xd02k3glpfd5wxa9ya6l0970nm";
+      name = "kde-l10n-ug-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/3flzizssjcyxgsdp1diq0xw5is5xdxzr-kde-l10n-bs-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bs-14.12.3.tar.xz";
+      sha256 = "19f6s5vylir9a695l0wx8fi63an2kgynmdpz3xadq197m1j8wd8d";
+      name = "kde-l10n-bs-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/id2z95s1zn6v733fyh3wazrbfy40hyvx-kde-l10n-bg-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bg-14.12.3.tar.xz";
+      sha256 = "1hp1sa8cxsgifr7vaw7iqf8bydcnb7qnz9nnac0a7sx95ypvjmlg";
+      name = "kde-l10n-bg-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/d51bwij9xq5wh9scl66y66g5cwd27dai-kde-l10n-zh_CN-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_CN-14.12.3.tar.xz";
+      sha256 = "1f5zqflfhw077zlhwdf3his89dq8g0c8blpd8rkh7sbbyqgxgcbx";
+      name = "kde-l10n-zh_CN-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/wqrvb9c3daz3hc650q212j7j6aysxs52-kde-l10n-fr-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fr-14.12.3.tar.xz";
+      sha256 = "09jriffxnkmlcwmwplspy9znbz5fa8ad06pkapl35337cisyrdqh";
+      name = "kde-l10n-fr-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/477qqq2pd57y9wb83kj2yhclvr8r6ixr-kde-l10n-de-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-de-14.12.3.tar.xz";
+      sha256 = "1y71jjigz5qg3cz16j1vrikddw94zzg00kc6ziw2dxk6sx8j7vxi";
+      name = "kde-l10n-de-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/bpw0gllnd9asq0qkzksrvfni25ai7kaj-kde-l10n-kk-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-kk-14.12.3.tar.xz";
+      sha256 = "117125baj789y88l533jpgfggz5g4i0j19qrqybqql2hys7vhvib";
+      name = "kde-l10n-kk-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/37lal5izk34xpsw4ba5i3fh7klr8s3sm-kde-l10n-eu-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-eu-14.12.3.tar.xz";
+      sha256 = "15albwrdigyk9fzgvqd23njxks0ri72j2n5isbh218gcpp3k6z3b";
+      name = "kde-l10n-eu-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/isl6qfzmn18flary4fdcz4nnfh4v8wpx-kde-l10n-lt-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lt-14.12.3.tar.xz";
+      sha256 = "0z8qpy7r22rijhyfaidxvmafbbpha90imx0zk1cg8d96qn5iz1ri";
+      name = "kde-l10n-lt-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/34jssw40n5qml1s21bsdqw3an7g02g4w-kde-l10n-pa-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pa-14.12.3.tar.xz";
+      sha256 = "17ra2abhgbh1igd36rxkdx7n30qcmcbn85sy54zig8rdcznq4bjk";
+      name = "kde-l10n-pa-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/bydiajxpa21jawxl5yd2fhdy4ha9ad43-kde-l10n-tr-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-tr-14.12.3.tar.xz";
+      sha256 = "1mwzryf00x2yaz6c4pm2459svs3hdjddms4xx3vv1r9aq7aavjqb";
+      name = "kde-l10n-tr-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/3s8gz9b9mhymdiq262w8f1skyvz25c0x-kde-l10n-nl-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nl-14.12.3.tar.xz";
+      sha256 = "0jm7z2m5ngb1z1nx2g1vwgkzj46yzm0a37br5jba9yka9dmr15mw";
+      name = "kde-l10n-nl-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/d3i513r1568j9pvqznjr94ygmpgb8zp8-kde-l10n-ca_valencia-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca@valencia-14.12.3.tar.xz";
+      sha256 = "1ybsw0r60gkxy3fshm2da5w4mlwfmanwjfwpjnwj40ydlgdi8by5";
+      name = "kde-l10n-ca_valencia-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/90rfd4hdzch06plw672qfxzljqnk7x71-kde-l10n-id-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-id-14.12.3.tar.xz";
+      sha256 = "0kxss6f349mbhwafahwdv2zgfmsg5v9wp668q9xf0649d1h2w0ww";
+      name = "kde-l10n-id-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/qb61jvp0gf8a76nkw1wqzq32mg2i926i-kde-l10n-lv-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lv-14.12.3.tar.xz";
+      sha256 = "11x1csh4f4mmkbhdmk0dibqvl8cddr8y3m9jyrgs980k7kd9617f";
+      name = "kde-l10n-lv-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/x9jkn1ngspshcja4z0h4zrlmrqbfc1a0-kde-l10n-pl-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pl-14.12.3.tar.xz";
+      sha256 = "17gbg4zb51alcp5g1bx6lbmbkzz0fzl8sbhswwc71yhkq4h9ifpc";
+      name = "kde-l10n-pl-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/zbrn541qzdcpsy20kf4mah7rqy64xwwv-kde-l10n-nds-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nds-14.12.3.tar.xz";
+      sha256 = "1mqhc2174g58180l13qygwifqxai78m7prvrd4nnmc22b86cb0i1";
+      name = "kde-l10n-nds-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/7shjylawg8f357xm52zc2qxssqind29q-kde-l10n-km-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-km-14.12.3.tar.xz";
+      sha256 = "1244bjxs2kl7hmaj4v7bfw98vawcc5ipl73payn2ygxqiqmb2jgr";
+      name = "kde-l10n-km-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/ab3swg0pgzwiihfn3vkqiw29gawrlfgf-kde-l10n-hu-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hu-14.12.3.tar.xz";
+      sha256 = "1cjfy1wash2jvvr0l9s4am9s7ny1zvabbim536b6lmqhyk5bm452";
+      name = "kde-l10n-hu-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/grsgaxij3fp3kqwlgfaqv0hzh0d6k3zf-kde-l10n-ko-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ko-14.12.3.tar.xz";
+      sha256 = "1chkk4zr7jqb0vbn3bhqpfvirpn5zqrih0124cyrfxmv4a19cz8v";
+      name = "kde-l10n-ko-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/27lgir5h7a95dgr1khc5gvk7rqmhvsnq-kde-l10n-hi-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hi-14.12.3.tar.xz";
+      sha256 = "16pmyi73yfr885xv31rfwq9ingm4cfd2p04wvrxs056yimip2hgz";
+      name = "kde-l10n-hi-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/d1ydfg70nkp219vhcc6pi62kxv275121-kde-l10n-ru-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ru-14.12.3.tar.xz";
+      sha256 = "1x89kap46by47ra278r5inps9ab8mncfw76a2scpz7db9g0vfvf3";
+      name = "kde-l10n-ru-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/xc5zsjaiyy9fzf8wdzz15g593xlkgzzb-kde-l10n-nb-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nb-14.12.3.tar.xz";
+      sha256 = "14fgxrld2q9y7w50kn9952115fviyqb66sxvi2501b6kf3xnrpp1";
+      name = "kde-l10n-nb-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/m11758s3nr89b0rzfw492ljzwkqkn30i-kde-l10n-en_GB-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-en_GB-14.12.3.tar.xz";
+      sha256 = "1fbn5rih063wgmnzzsdq5dzmw4vx4cf8jpqd0zjdp4jcja7a7z7h";
+      name = "kde-l10n-en_GB-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/rg1m42j06j7sp2sm33107krg0b655hzg-kde-l10n-gl-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-gl-14.12.3.tar.xz";
+      sha256 = "0gm2z3va0lxnk9k3mnw0crlaf946cd2v1nygzbmc74r986aiyrla";
+      name = "kde-l10n-gl-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/yidz4dma1zm6rx4axqpk37irpvmf96a8-kde-l10n-sl-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sl-14.12.3.tar.xz";
+      sha256 = "17vlwgsab5jq9r8vs5q7gwk77p9li8qk8d4997p75z9rmf95jx35";
+      name = "kde-l10n-sl-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kate-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/1p0y7hq9pqw8qjy9a5nyrjlirxkxayrs-kate-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kate-14.12.3.tar.xz";
+      sha256 = "0czcni5wfw56ar0r5p05j1wrmah98qv1wca95l5mya8fb17wcmnc";
+      name = "kate-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolourpaint-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/ad9jhnfb216r0x6dicjx3px17mqnxhzr-kolourpaint-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kolourpaint-14.12.3.tar.xz";
+      sha256 = "1rcln9nqqzhzb0qlkdx81k0zspyyf266s3sa12npil2g9n1yh12h";
+      name = "kolourpaint-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kruler-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/9g2fg6167fghd9v5nz92sadiyyac6zmv-kruler-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kruler-14.12.3.tar.xz";
+      sha256 = "0px10ilji6blpfyp44f66m53y5dhcw9s2534pwhbx9xfkal1pprj";
+      name = "kruler-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktimer-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/gg40xflg0y9c38rcg1q1m352zknrvmci-ktimer-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ktimer-14.12.3.tar.xz";
+      sha256 = "198gx9j0x556m1vbwmyfgvayjpbws380pmrz4m58ylsvg5mcgwib";
+      name = "ktimer-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksquares-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/z6ql801ixafs2n59gb6fa8z2zr8wq79h-ksquares-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ksquares-14.12.3.tar.xz";
+      sha256 = "0fyqs9b4bsgnaadcc0zhvsljmm83mc8brz1gsc7iz4pm3dnz74fr";
+      name = "ksquares-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksystemlog-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/q5rjxayccrra40ahwj8g8q3splvw10sn-ksystemlog-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ksystemlog-14.12.3.tar.xz";
+      sha256 = "0a29n39jyrlgfijn99v48z3za4nnz6bambakyri8j9da1zzwn6hy";
+      name = "ksystemlog-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kshisen-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/bfj7740qpfw5i6cjml9xf9648s9vj7wh-kshisen-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kshisen-14.12.3.tar.xz";
+      sha256 = "0h5l3m6xxq91v2fzc8p213iglvc78shqa3q0bfy3xbrnd3c8gkm2";
+      name = "kshisen-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksudoku-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/l294adqj7slk00ns53dr6p28jzbjz29b-ksudoku-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ksudoku-14.12.3.tar.xz";
+      sha256 = "1scyqlfwxgkdwh93h80wzp7a55vvy0j0zxi9fl0ihsjsh20iv0bm";
+      name = "ksudoku-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/h4x11ry35314s0max9aqh47k1pyfr22l-libkomparediff2-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkomparediff2-14.12.3.tar.xz";
+      sha256 = "1829sxn3y906hsfj6hqllx0hhwk2qngw9lvrgkcyqygb99ngg2bx";
+      name = "libkomparediff2-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kamera-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/18ywxpzrac8brdqp56vm3jbly49dis8f-kamera-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kamera-14.12.3.tar.xz";
+      sha256 = "1hrvc6l4q69npxyafznhg5i8mybg1c7z4iwp98q5rzsdw5zppvs8";
+      name = "kamera-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kscd-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/nkz7204dhnfjvjvqqp9id19l5xgzxzrx-kscd-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kscd-14.12.3.tar.xz";
+      sha256 = "1inl4sksyd27rp9g75h0900hs1hr6cb779zf92wsfflmk12gin7j";
+      name = "kscd-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/dix33an8h17r8h03vnwml2fym44hrq5l-kdegraphics-mobipocket-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-mobipocket-14.12.3.tar.xz";
+      sha256 = "1ff6bbrhwa1jp3icz6mv9m9xl7f7b786yvg8dmc795wmm5hzr721";
+      name = "kdegraphics-mobipocket-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnapshot-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/qnqwzdhg87x5dahx3avxcnys0j3k1qil-ksnapshot-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ksnapshot-14.12.3.tar.xz";
+      sha256 = "13a5cri4dqn111p8q0idfgbahlx4ks2xjgvvgcwxd2srxifld825";
+      name = "ksnapshot-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/972ra01nd7jywn427qj5jz3gwibd2cyy-ksnakeduel-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ksnakeduel-14.12.3.tar.xz";
+      sha256 = "0cjylhpsl33zgav8dyhrdl8qvi7yjafsf30drgjsc9jizhmn8hdz";
+      name = "ksnakeduel-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "filelight-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/a3rr545r48ykp0rxfk2b643w683p0af0-filelight-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/filelight-14.12.3.tar.xz";
+      sha256 = "0am2qi6v2mr1rbl4jfjc4jaxg75511n2dvfr9zlsbhglfmzagmj8";
+      name = "filelight-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "step-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/wfrkxk4f5hnvfwdraamqci3xap593sh5-step-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/step-14.12.3.tar.xz";
+      sha256 = "0pkj25jb7ydvghbx3187fjddsmck24k1kk4mms1hxp2i8xa11b1l";
+      name = "step-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kompare-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/027r3fzd86qx6rfsc5lfas02cmn60283-kompare-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kompare-14.12.3.tar.xz";
+      sha256 = "1vjq7fdbdskhymwrl8i9945qbd0xaqgcrp95p8qpmafcc88nxvdl";
+      name = "kompare-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblocks-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/kxpwjjlwa41agz76z15jbwb7b4s6x7ck-kblocks-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kblocks-14.12.3.tar.xz";
+      sha256 = "0y5f55z1i9fywfsspiyy467r2f11v7szwzhjrvacqf2g208mncwv";
+      name = "kblocks-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knetwalk-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/5j6v68g4gc7jvqrypk9s1m0grng8rpyn-knetwalk-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/knetwalk-14.12.3.tar.xz";
+      sha256 = "1bakk8linrmgzn5zn79kj9bhfn43krpdahd989ba8ldfyz9d0hcc";
+      name = "knetwalk-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "killbots-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/pgg1zvpidxgv1dacj7ncn62mizwjz0m9-killbots-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/killbots-14.12.3.tar.xz";
+      sha256 = "1b5chz21wxpmvi43iyr5gn2dh7azahamd8fwnjsdb49znyy5ab19";
+      name = "killbots-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/m3sl4zcjky2smf0vky7lwvw8g79n2idw-kde-wallpapers-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-wallpapers-14.12.3.tar.xz";
+      sha256 = "0cdaj33xim3rvq7ihwpv338g4s51xb36b6jszpfa9hnzxsxa146f";
+      name = "kde-wallpapers-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bomber-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/syx3k30s7j3s4v1hcb4azh176m4n7082-bomber-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/bomber-14.12.3.tar.xz";
+      sha256 = "0bhy5rjisq9f9ai36a0m9vhagdxj6jdyw0hlylpjl1ayy3qly1mc";
+      name = "bomber-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/y1nrp3nf81v1v6khr86xdp9bjn7fnaya-kjumpingcube-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kjumpingcube-14.12.3.tar.xz";
+      sha256 = "16fgz0jicalls8c25p1hnd92rj3vwbbdli9wi1ljdv0f799h3z9w";
+      name = "kjumpingcube-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfourinline-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/jahrwl1157161xh4dgjcnd0hnfq8x28c-kfourinline-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kfourinline-14.12.3.tar.xz";
+      sha256 = "026kvydxlrk7r91k9ffc27bsj0792shpziynh845ycbx9dy3nspk";
+      name = "kfourinline-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwordquiz-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/l3zj17f3n998w3b3mf4v8jjib0a0p3yy-kwordquiz-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kwordquiz-14.12.3.tar.xz";
+      sha256 = "1r8ms2d59aa64wnmdv8psjn4bbypjzcpb982jpc6kfrwj391q2ig";
+      name = "kwordquiz-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "palapeli-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/y8lsccnmrc8r451j1b1igjxyrnvqpbys-palapeli-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/palapeli-14.12.3.tar.xz";
+      sha256 = "1wwnsvccshg2y55zcfpy2kvyplkjjbv96nacdfhln3yilbakwv1f";
+      name = "palapeli-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdcraw-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/1nwhjxi7hmywfqiig8b60qaywwqircqh-libkdcraw-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkdcraw-14.12.3.tar.xz";
+      sha256 = "0fw025nas8x70ji534j59d6vcsvqzr7yfcyls0yznlz5ppy4g9rz";
+      name = "libkdcraw-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sweeper-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/9pj5rh11mpnr3grriz5x4c3ar5whn52g-sweeper-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/sweeper-14.12.3.tar.xz";
+      sha256 = "1y8yvjpd6v8s7xzgwkaa9sc4k715n53l01182j48lcyhfx6gbh98";
+      name = "sweeper-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/cjd95qf5ppz9msqy2ggisilhhl4h0nvy-zeroconf-ioslave-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/zeroconf-ioslave-14.12.3.tar.xz";
+      sha256 = "0x858q6w1llcyy3933sqpdi53p8h2l1rbic1v1xyqbl4zdz9ixpp";
+      name = "zeroconf-ioslave-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalgebra-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/cbndc9qfgqbksmfq1q00lhw1a6qz52wk-kalgebra-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kalgebra-14.12.3.tar.xz";
+      sha256 = "0pm2dshg73yc4h16sjm37j1003zs6hrp92lkr1679541z02m2f2l";
+      name = "kalgebra-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccessible-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/bfpnby19d3qgqhkw3fb102v8j4qh9vi0-kaccessible-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kaccessible-14.12.3.tar.xz";
+      sha256 = "02h56bykzpkvk17snm88mb8cxsy2nmhjz1by18rg4cc2gf61qk74";
+      name = "kaccessible-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.6.tar.xz" ".tar";
+    store = "/nix/store/91s8bj9j78cmwj5ijb8536ykmnh3k1fg-kdepim-runtime-4.14.6.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdepim-runtime-4.14.6.tar.xz";
+      sha256 = "1jnwgfy7052fzlz3mic7cy5jp1v5j81f28h205x56h6p7nswk29a";
+      name = "kdepim-runtime-4.14.6.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmix-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/bm5pazc7ch4k130xj2ikmdcz69490xl6-kmix-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kmix-14.12.3.tar.xz";
+      sha256 = "132k71ymd2pbbsbcw91haaalxljxzyirfw33ppk5w9d9m46h7gk8";
+      name = "kmix-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbreakout-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/yw3v6jwj76v2savll4mwsvy8bh9n3iv9-kbreakout-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kbreakout-14.12.3.tar.xz";
+      sha256 = "1kzwdz0njqggy6h208lllswaqsrwr7hid4pi1f69hnh9c27a1vbl";
+      name = "kbreakout-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/vv1vfxq2dd88qhz563dbzmd8gisrhdb9-libkmahjongg-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkmahjongg-14.12.3.tar.xz";
+      sha256 = "0kizdr1xn58wxblkkq5swy4vqap24cdcxl092aswvi7ql85zn2hy";
+      name = "libkmahjongg-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmahjongg-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/8m2kvp5j83yw25smfh55ka4x73bp3sli-kmahjongg-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kmahjongg-14.12.3.tar.xz";
+      sha256 = "08y03hszmnmf7wawrznhqhak00gd5mcrbfndb538j44k5am60ddb";
+      name = "kmahjongg-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdeedu-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/smk5qi7815a13m4c6xb7vzz18vz5n6qf-libkdeedu-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkdeedu-14.12.3.tar.xz";
+      sha256 = "0bja8qc2sbfq3ikhxk70fg72cj4hwbw4l7ag4zc9lq312jbzvkii";
+      name = "libkdeedu-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kstars-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/mi979pdj5cm4sz1qbbdvzr75731xjfbx-kstars-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kstars-14.12.3.tar.xz";
+      sha256 = "1gg96zny1vgsm1cyzxqlp617ly862r6ywv21vr99fismrasj919z";
+      name = "kstars-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "granatier-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/0661bdzswm2n96vgix2vq8rp48jg2a1d-granatier-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/granatier-14.12.3.tar.xz";
+      sha256 = "182z9lnvrxhfp1jp4lb33ij07bvzvi79xi3ncicyb9p015s9mlsg";
+      name = "granatier-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "juk-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/d6kz07a661dlyr950zmrirgsb52i8c5z-juk-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/juk-14.12.3.tar.xz";
+      sha256 = "1zaw82px1qacfy612b9bxfgksyyvhlqrn0sv6p5dqzz01kg66xwy";
+      name = "juk-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.6.tar.xz" ".tar";
+    store = "/nix/store/24hs45qvjc6ixw77rjl226y0mldn14z0-kdepimlibs-4.14.6.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdepimlibs-4.14.6.tar.xz";
+      sha256 = "03fnxg2as2rri27ajkzm2wjma25pqd97h91bxka07b3fwcqimvbh";
+      name = "kdepimlibs-4.14.6.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdegames-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/2x4jzjdy5k10dcn15q3jfnlbbaihbp2q-libkdegames-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkdegames-14.12.3.tar.xz";
+      sha256 = "0dj39kzhix9h79mnw25535n0swpb04sdl1n4l9jnj306daf16g27";
+      name = "libkdegames-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktuberling-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/id1jxy17a8g7kwbhgk0h60f8rsvf1zz3-ktuberling-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ktuberling-14.12.3.tar.xz";
+      sha256 = "0svfdfpvmwghv656rmip5y0c997pl6mlnq9ns88akqdjl45nywkm";
+      name = "ktuberling-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "poxml-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/8myygl0hkb6l20xqj8wfynfx3zx45c9h-poxml-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/poxml-14.12.3.tar.xz";
+      sha256 = "1xw1dc9zc0wnn8h7dk115zapf8kgvm57nh2zrgmahy6ppza112bd";
+      name = "poxml-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmag-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/banw9x2cffxi8a0lal0x26v0c0vlypwi-kmag-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kmag-14.12.3.tar.xz";
+      sha256 = "12aiyv848cdy0jkhbcj4ha3cg781ndjcffkl871ah7qy0sgcnkw9";
+      name = "kmag-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-runtime-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/1361pwj0m3rxysay6njg9dz04in7k1sk-kde-runtime-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-runtime-14.12.3.tar.xz";
+      sha256 = "08ndk21mq547fw26gfa7vy88vxf78v8anbvjrym2k5f59fdx2aai";
+      name = "kde-runtime-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lokalize-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/jns1ws94d4cklkzn7n9hk0a6zsbwyg6n-lokalize-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/lokalize-14.12.3.tar.xz";
+      sha256 = "0cy3zyzszbka19hy624rgxc07bh4hyfins4j2cwlivkszbssh8r2";
+      name = "lokalize-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kopete-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/y692wcc35c9dr5v9h1yjv33b0s87k3p3-kopete-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kopete-14.12.3.tar.xz";
+      sha256 = "1cdqcbafmmfq357n2kybzkfjwq926wb5lslpxbbpdnhiid23k8xp";
+      name = "kopete-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "parley-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/31mxjkglzynxwi3h928n52mi6ldszww2-parley-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/parley-14.12.3.tar.xz";
+      sha256 = "0vzqsbr26l39akpch7f1xr1xwsdybszvd1f9rrdmy4rg9swc692v";
+      name = "parley-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "svgpart-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/w58yam9l13rjzh0cc4a16qkn9xzrl72m-svgpart-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/svgpart-14.12.3.tar.xz";
+      sha256 = "0jrhyb2ji2ii1pq7fmnyln12zhrqb9ahwpdq1x8ya56bws49qira";
+      name = "svgpart-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/i6l7hapmsfcga8b9agdi0ld2sss2maqy-kdenetwork-strigi-analyzers-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-strigi-analyzers-14.12.3.tar.xz";
+      sha256 = "1w8alhwkbffvwjfpja5pw881min6mv7vc1ag1qiblrzirsx4zhvh";
+      name = "kdenetwork-strigi-analyzers-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/m7vz5qmkwxbbs0f2251a0bbrl8g2jjw5-ffmpegthumbs-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ffmpegthumbs-14.12.3.tar.xz";
+      sha256 = "1kni6fc1nb1n5zjqx736mlfcv08jp9nrchs7qkb2krzn4n5m0aji";
+      name = "ffmpegthumbs-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/5zhbmw2i3xb7axfyvq45qkp7dhf6xya0-kdesdk-kioslaves-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-kioslaves-14.12.3.tar.xz";
+      sha256 = "0w7ish8xpd7s26xmc9j9gxxy7b0lllv5px95g5dn4876qqcqpsks";
+      name = "kdesdk-kioslaves-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/x2m1gbmqsq6zd48sbpmp2dz64d5m2nm5-kremotecontrol-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kremotecontrol-14.12.3.tar.xz";
+      sha256 = "0wy2jb9dx3bf8x22l0x7bqn8n45mn6jclnsb3saq7cns5905b68m";
+      name = "kremotecontrol-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/7ckqs96cigik5syqj0ka0xk3m9ybphhx-kdenetwork-filesharing-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-filesharing-14.12.3.tar.xz";
+      sha256 = "1icg45a2qsv1n19gsfg7w3wa2ysa4rkbx3w8maq8c7x673qs5kcp";
+      name = "kdenetwork-filesharing-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/m2p9ipvfj9cdznrc736fjhbvyj3g3yz1-audiocd-kio-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/audiocd-kio-14.12.3.tar.xz";
+      sha256 = "1103f1ic5niy0zs4zvz841aaa6r4q0x0db4apnyvwbx51zi7qzsb";
+      name = "audiocd-kio-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konsole-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/4anl6k756x5n7j58rafxyx04sgxjlc20-konsole-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/konsole-14.12.3.tar.xz";
+      sha256 = "0apz7dn9lza69fgnylhy3md47palj3qzjhpihfr0qsgn6gzg6f7a";
+      name = "konsole-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/rv12zii0hdwh4fb5mv08nf0qid79miy5-mplayerthumbs-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/mplayerthumbs-14.12.3.tar.xz";
+      sha256 = "01hisifj8j88wz31q4dhj0qinzz0yw9fz0lm16qp3yxv7r7p82cr";
+      name = "mplayerthumbs-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/6lgsi6phi4p3lyh7qvw3bqkixfad0fl8-kde-dev-utils-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-utils-14.12.3.tar.xz";
+      sha256 = "0i6m5vs42c5mvznayh9rzjdp5rkcbl3aar909j3ir9kc3v3mi2ns";
+      name = "kde-dev-utils-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krdc-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/2ckqwp8l6cy1c35bvcbs4x26z1czsdc4-krdc-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/krdc-14.12.3.tar.xz";
+      sha256 = "1q8s1wdmblfx8jj8acnkkyhx3rrn1ampskd9wx39jid8vznvkwpy";
+      name = "krdc-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klickety-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/0hyjdsihgm0sn0gv2xsrijhqbgaqqn6z-klickety-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/klickety-14.12.3.tar.xz";
+      sha256 = "1cz7aam2azgqilvz6jsbkfy3dpimh86f64vmkvlk3n42zkksp7hm";
+      name = "klickety-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdiamond-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/sw2cca4mpa4y2dq1f0wjkqiqdxcjqkcn-kdiamond-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdiamond-14.12.3.tar.xz";
+      sha256 = "1cm793801nysqp90dcyvfvwxc9h212qrq3lhg7621h9fhq0946a5";
+      name = "kdiamond-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ark-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/rb4li4dqgv2mw1w732pkhkxpvjxdb50g-ark-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ark-14.12.3.tar.xz";
+      sha256 = "0a6ggjg6x9kdlhm2n8l3dw4nn765lj78gn11yxgj37riq9yhg5xx";
+      name = "ark-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfloppy-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/zpk335imsalsxqa7bfa6wcllxgcdipln-kfloppy-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kfloppy-14.12.3.tar.xz";
+      sha256 = "1b1zskwch7zz7iqfz3fa14q0bkrr2yjckr1h5fvn9k7q79x7xph6";
+      name = "kfloppy-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "picmi-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/c9z5wpwzpnvp5fiv5zbjg4fm8p8xrn7m-picmi-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/picmi-14.12.3.tar.xz";
+      sha256 = "0vlyn2f2j1p4734rcmqyjh03h4a2m79z9swfmlahh12gq5ka81im";
+      name = "picmi-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konquest-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/mfysg0babfpbzvpnh8b3a9kzk6n29ssh-konquest-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/konquest-14.12.3.tar.xz";
+      sha256 = "1il757w6xzvkaadangwfpkz14qx02wwdlflzffw9jis2lbz19qnh";
+      name = "konquest-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalzium-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/dn3vmyqlm2qsi52bhfl1cyafza31b6y9-kalzium-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kalzium-14.12.3.tar.xz";
+      sha256 = "1mnkhp5wlc3rmxyw4lli5smb419vzkv52aqpwakyncrz7nxkyk24";
+      name = "kalzium-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/fi9lq4lqwclvr627x32q8lr4cwcxbgng-kde-base-artwork-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-base-artwork-14.12.3.tar.xz";
+      sha256 = "06v3javkhkchpjc3sv7x5mk2jgb1366mi18dzwg63h2ca8740wn1";
+      name = "kde-base-artwork-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "blinken-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/2fq724w1bqmiz9hqqmhds1f0zj18k8dz-blinken-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/blinken-14.12.3.tar.xz";
+      sha256 = "0k4a5r4rq5brh5xv2lm6ldwfv1qy5wiqnj0ycp55p974isbdgqsb";
+      name = "blinken-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcharselect-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/vqyn4qdsgnai9a9w944g0jqpmvzqg5b9-kcharselect-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kcharselect-14.12.3.tar.xz";
+      sha256 = "1ycx0y82f4ah5fg9ki62fwnnhyly1sqs52zs4519hnmyqn7h7q1v";
+      name = "kcharselect-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "umbrello-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/x66xrvdlnwcs8g6l3f4iz9fvxhw61v28-umbrello-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/umbrello-14.12.3.tar.xz";
+      sha256 = "0f5qn6h89hj4n25p2nkcgqb0xk4qvlwi115n5qlsmbc3icj2j7cy";
+      name = "umbrello-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kget-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/ah3xdqjxw5h29qmjc4wdb1c5i9zdsl40-kget-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kget-14.12.3.tar.xz";
+      sha256 = "04wf6qncq1xdfrp9j5cnhdii9hj83wjkp5i168flzi292sqyw9ia";
+      name = "kget-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kuser-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/68ps9qh0w9mq4qawdzzjyy1h1y33wfqs-kuser-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kuser-14.12.3.tar.xz";
+      sha256 = "1xgd3g2fdanl28sar3mgcsnld69nczcdanvaqslil4vc7d8r1xim";
+      name = "kuser-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kigo-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/60ipws592hnlygalmkzgzmlwnhmkvjg4-kigo-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kigo-14.12.3.tar.xz";
+      sha256 = "093bm60yaj8v8g6n7x4ysjbxph6xgh9ylarhdxsrjpmq268wql31";
+      name = "kigo-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/zk9mrrc8vkzq41bx7sfyjc3lx73jzlqm-dolphin-plugins-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/dolphin-plugins-14.12.3.tar.xz";
+      sha256 = "16kxzpnfy8cxy8v1idwsisqq0p13n14zcid9a5n1sv02w91c02rj";
+      name = "dolphin-plugins-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "katomic-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/z8kgww8c0mqwx6cfsfqm8yd58k71xvrl-katomic-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/katomic-14.12.3.tar.xz";
+      sha256 = "0rbhf8j8if5r20l1cryl4irgd8p94ikbsz6456y7v8fzv5mf6kgn";
+      name = "katomic-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "rocs-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/jqamjiig020rvvyqwjarbxqj29ix93yi-rocs-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/rocs-14.12.3.tar.xz";
+      sha256 = "14k5yx0vfpf0fllqi5f72vz2135qag6gb7hs7523jaavxkb23d1p";
+      name = "rocs-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcddb-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/9vhmysfqpabx7cwrqsmkpgh4hinjqh39-libkcddb-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkcddb-14.12.3.tar.xz";
+      sha256 = "1i8n63jpckc3fa27rcqyrf10cz8zsyjyvrpa7fgmggsf91k1c144";
+      name = "libkcddb-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebdev-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/bz14zb6rlkwgmj0l8q9nffar2443zcaq-kdewebdev-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdewebdev-14.12.3.tar.xz";
+      sha256 = "17qy41gww688klpv2cgnk1r3cnd9sq72bsga82d7dnk0v6dinlxz";
+      name = "kdewebdev-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krfb-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/iq7fn9lp4fh2s74lrb2r4v39n66c8a7v-krfb-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/krfb-14.12.3.tar.xz";
+      sha256 = "0258ffj2wx25cycpw3cmvnw9ig874jpi6yw711w6d8nfy66ribpb";
+      name = "krfb-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/yv1ixn2gwc8vv32m3y5axy3dn1p3sbrv-kde-baseapps-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-baseapps-14.12.3.tar.xz";
+      sha256 = "1zcjbhnxzqxjn4xs6pwb8cvcnjypa4yh09jr4frd82nfhdsq7nyd";
+      name = "kde-baseapps-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cantor-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/7f8qlf08l8fwykz677xywlfdsf8j1pml-cantor-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/cantor-14.12.3.tar.xz";
+      sha256 = "106k9gp4r2241yh6np8mbq587chwkicxk7ssbpvvvg2m126idz9y";
+      name = "cantor-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.6.tar.xz" ".tar";
+    store = "/nix/store/24zfmzbi9q832p6i91i71sms1vk3rfg2-kdelibs-4.14.6.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdelibs-4.14.6.tar.xz";
+      sha256 = "165xn2bv03j2g4j7m287add40kwhccvp2ci5hrar2xfd9sgl24xk";
+      name = "kdelibs-4.14.6.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kubrick-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/xl12n09yvf5j7di78mrkxxhfnn6axijy-kubrick-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kubrick-14.12.3.tar.xz";
+      sha256 = "1g9ls282qy6s0xsaa50ck0gkiz980cx50zjjhq4yimlhp1gswmj0";
+      name = "kubrick-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpat-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/hq79f56cq1gqw7nfxcfliqi4k8kjpkd5-kpat-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kpat-14.12.3.tar.xz";
+      sha256 = "1787qymlsxyi7dm2q8axpjl3n62qx9xv7diyg8627kkjm1a1xw9r";
+      name = "kpat-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "marble-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/inai3p0228fmjcr8vkbnbhnvpznwvrgz-marble-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/marble-14.12.3.tar.xz";
+      sha256 = "1ylhc3278yqdcsli6yw7bnci6mdx01g0r97m78bs74l5biz4yql4";
+      name = "marble-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/szdzjvc2h3w5dpp154m0kqh5i0spk771-kcolorchooser-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kcolorchooser-14.12.3.tar.xz";
+      sha256 = "1v8mgv5pjl3g6igxs92qd3zn8qr3qip046pb77856qhn3d9s4pqj";
+      name = "kcolorchooser-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkface-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/rfk8bxw07690a9kncmcdmlqjx7qkrld2-libkface-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkface-14.12.3.tar.xz";
+      sha256 = "0zp48mlkqkjc6wk81kcf1q980196q0m153kzfjahi5w4vlslzgam";
+      name = "libkface-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbounce-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/w2gc6778llzkl8qbzdl582ay45rwn6wn-kbounce-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kbounce-14.12.3.tar.xz";
+      sha256 = "1hn09ghhmj2dk47vnkqkvrm87n50m506mmzq058cccjlfdah5iin";
+      name = "kbounce-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/jplhnd96n48zih1mbf6bx96xl5b35kdp-kdegraphics-strigi-analyzer-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-strigi-analyzer-14.12.3.tar.xz";
+      sha256 = "135dcs9ppa8lv5va8bqmccfxj0hf5f65qprx7l02k74xj4k70yki";
+      name = "kdegraphics-strigi-analyzer-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcalc-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/5aykxgy1by52pcfmv1z990kz6xpwjj18-kcalc-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kcalc-14.12.3.tar.xz";
+      sha256 = "0w5pl11vw0d2g3pnxb3ffig209r0bjg135163crnic9akfbfa9s5";
+      name = "kcalc-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lskat-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/1lk25ql2cgisdm7yhjyn1ac416h8qdc0-lskat-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/lskat-14.12.3.tar.xz";
+      sha256 = "0k5wq5naj0ahmnwpvdrif2clzxjwr9jk6p40igakzanpp23i6p9k";
+      name = "lskat-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "amor-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/vvbs6wghnrbrq9yd9v647l227bzsiyaa-amor-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/amor-14.12.3.tar.xz";
+      sha256 = "1y9cia887lqbcs6nr08mbrxr8shb895wvxf5jg8w6iic6pwy516c";
+      name = "amor-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klines-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/sxi3wlcwn3gbkmcama2vx4dg45xwm7sx-klines-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/klines-14.12.3.tar.xz";
+      sha256 = "1xsrkbjdnw4icchbr5y7w64y6szfv8qdzndwd2bgrw0yvyjg5w7x";
+      name = "klines-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiriki-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/0al1vmsjw3a94arnw19k59gajw3kpxdd-kiriki-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kiriki-14.12.3.tar.xz";
+      sha256 = "11c76kq2pji07xfbyf2621h76sjx9pqdj3qqzydzbwdinxy0bgz0";
+      name = "kiriki-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgpg-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/4bw6lkbzy88kl09gk9sv494xw4a004a9-kgpg-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kgpg-14.12.3.tar.xz";
+      sha256 = "00qjgkgy1d8wygc298z3v7y37j47w16pjzp8ssnsdkmx88h1dp3i";
+      name = "kgpg-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolf-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/97i8x4wydz1z4p2dfg2c04xvvblpdds0-kolf-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kolf-14.12.3.tar.xz";
+      sha256 = "12h4817ky9xwwrdqgba515dw87314ijci4lwqvcqmm7rq44qac8g";
+      name = "kolf-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "superkaramba-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/k35761pidfd258y0fjbcr1c22y5lwzhf-superkaramba-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/superkaramba-14.12.3.tar.xz";
+      sha256 = "1q6qpmwyics1mb44l55vy5wyjd0d5mbsm780kj4y9l6mp98b47c0";
+      name = "superkaramba-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapman-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/h55lr5qacws82h167r142367mldrq50z-kapman-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kapman-14.12.3.tar.xz";
+      sha256 = "1i3ci8qpx8njr250pgkz7zlfihyi3k6vc2vnw7dcv09qfby466qb";
+      name = "kapman-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khangman-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/y0xl8ckan6cwmz35mvzsjv35a55s45s9-khangman-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/khangman-14.12.3.tar.xz";
+      sha256 = "1y11jwsb1ba55hc2sx0adffvrck1mrn43wna16zkrh1sxk7fk8r5";
+      name = "khangman-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksane-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/rdh9ivzb5i8xilvp5v05k6szxv9nhv40-libksane-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libksane-14.12.3.tar.xz";
+      sha256 = "162bi5d6kbx7zlb4waha82ldg2j40rwcg1gikfahkjsprm6npmh3";
+      name = "libksane-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/h4if4axrpc0sdn6xmazgn2d5xhkbpr0x-kgoldrunner-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kgoldrunner-14.12.3.tar.xz";
+      sha256 = "1kg9mskg3aj0bp8h8y5bfkapmw4iys42aw3sa7f8zfkqp993zsw8";
+      name = "kgoldrunner-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bovo-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/30xn0rg0g32p4d00i9z4xs95lp504six-bovo-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/bovo-14.12.3.tar.xz";
+      sha256 = "021pmar0g7s0p7qrzimp2x54idy9pdg22y8mgi26xrk9n7i5yybp";
+      name = "bovo-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgamma-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/3ajn3gyhisbdny0q3qskhn6r9wkw0aly-kgamma-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kgamma-14.12.3.tar.xz";
+      sha256 = "1ywpkg7zbh9xy50a53dmlz1rsli5gdc52l50v14gm1sdjl2sfjpm";
+      name = "kgamma-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kajongg-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/fhr2zhxsxlc5fl15l9fil414jaxw98hz-kajongg-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kajongg-14.12.3.tar.xz";
+      sha256 = "0fdvwv5jbmc42wzc2j5y4adjqqwzq6hvl8b7nzaknphvpk7257hj";
+      name = "kajongg-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kppp-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/7q3rq4gjjkwxjlliqy76x14h45xxzhhf-kppp-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kppp-14.12.3.tar.xz";
+      sha256 = "00517rl2b5zaf42sziar2cj878dcii6jr1mx8jicq293f171krn7";
+      name = "kppp-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmplot-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/jdxf1cy03k03r51kqa1klb3ib5jvd8jy-kmplot-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kmplot-14.12.3.tar.xz";
+      sha256 = "1fq8m07pgmcfp1cr7q0y90ngaj282nz1pw5mqdfjh9syfradli0i";
+      name = "kmplot-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdf-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/wrk2mg2h2y34s0gysr095d713wim7brw-kdf-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdf-14.12.3.tar.xz";
+      sha256 = "1dd35frqxgqmhakc6f7xs6sck061271cnfym9bsd5q6fxv9s8vdp";
+      name = "kdf-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knavalbattle-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/8wa0nvqryc7gzxfk2sgbsavk1q6p3jpi-knavalbattle-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/knavalbattle-14.12.3.tar.xz";
+      sha256 = "1jl5f2ndgnffhmgpcc4in6rryshph3p12d1xa2ixw36xyr45hcki";
+      name = "knavalbattle-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksirk-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/macznkbfj12i3nfcks2fr29fy24vlda7-ksirk-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ksirk-14.12.3.tar.xz";
+      sha256 = "1h3dgp2j7lz13j16k1j5b7wyg0g4x08svw1v2pc15llakr39p88m";
+      name = "ksirk-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "print-manager-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/ja14bgwgs1wp8831ipa39s9zhayjfqdl-print-manager-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/print-manager-14.12.3.tar.xz";
+      sha256 = "1n1m5w3p4r97y7jp76q35z8g39ipfaldkgbfbz47i89bc33zaxy5";
+      name = "print-manager-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "artikulate-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/44frkjvk64qwj15g2pfh8a1ficag137d-artikulate-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/artikulate-14.12.3.tar.xz";
+      sha256 = "1rv51nk2lqvxfgwsxyzq9cd1qq68nr6z7r5xis83smc4gnaczajh";
+      name = "artikulate-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/9pd7p5vl53w6i6m324km5xkp6v967l53-kdeedu-data-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdeedu-data-14.12.3.tar.xz";
+      sha256 = "1q1vw5dprvqj7yyg9w39ndy8nvnnhkbladylv0kyh1491ba2a3kb";
+      name = "kdeedu-data-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kturtle-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/x30qa0vibvxxza1pqy9a4ddnj4w2xhcw-kturtle-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kturtle-14.12.3.tar.xz";
+      sha256 = "0hxnc8lfqrfs5njaym54kl4vf2q6jakgif90saxfm50irjbwlg34";
+      name = "kturtle-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klettres-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/734ajz153q37a4pzyh464q9aip528d77-klettres-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/klettres-14.12.3.tar.xz";
+      sha256 = "01irm9pgh46rghbmmwwrdb85ys2gv23h46qaicv4zp73bl6mhn5c";
+      name = "klettres-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/bj1igafd6x86fay8syr6d573b05472mc-libkeduvocdocument-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkeduvocdocument-14.12.3.tar.xz";
+      sha256 = "060p8sh3rbbajykjw1z2ba3xnv1bq8ns86yfwx2lv2jyaqpkkgyk";
+      name = "libkeduvocdocument-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/hbrdr0fizjfwyf4p317gwgii4ckxr9bx-libkcompactdisc-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/libkcompactdisc-14.12.3.tar.xz";
+      sha256 = "0957qd9zzbnksi1zxw1av4zxwzi48pq80jpk5h1id7cdhlfrsxz7";
+      name = "libkcompactdisc-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/m37c7klxvf2nz3byv04b763sls4j6h8r-kdesdk-strigi-analyzers-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-strigi-analyzers-14.12.3.tar.xz";
+      sha256 = "13q7cy274ibsisvchfagb5mh4iq2wpm12zriwn625ciajy1zbq1r";
+      name = "kdesdk-strigi-analyzers-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiten-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/5ibmcrrhacqq7qn5zfq7fp1y3qwj90jn-kiten-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kiten-14.12.3.tar.xz";
+      sha256 = "0iy508g6mp7gibzv3m59hjjcvl32h03pzfqj8k6pgq0jya0bqvvd";
+      name = "kiten-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/q2v3p0k65zzhmzphawir64a3x8k7qmbn-kwalletmanager-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kwalletmanager-14.12.3.tar.xz";
+      sha256 = "1sbbgvwh8d5pv4p5z89gk29lz2snp4glinpa3y2dg9s9chnn0qj4";
+      name = "kwalletmanager-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kanagram-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/hcpxv7a1j4r0pavak6zqps9kb4mlgj1a-kanagram-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kanagram-14.12.3.tar.xz";
+      sha256 = "0j8l5cx251wvb2s6xzdsx45cgwzpy8a97lbss8lhhfrqwqn62lh4";
+      name = "kanagram-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kspaceduel-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/v5rwasilq989vbmqqnj14cqq87gmvpsr-kspaceduel-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kspaceduel-14.12.3.tar.xz";
+      sha256 = "1z1p5wy39xkyplhdq8z3p61flnyzh03yhi28yc0f79iqx22psvjb";
+      name = "kspaceduel-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kig-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/amjyaqjvc88397nj2g54z6djs5rj5mgm-kig-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kig-14.12.3.tar.xz";
+      sha256 = "0vhamrasgazjn110ahh09a402vhsgqh8h5v1qqmvi49f6v44bxbb";
+      name = "kig-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "jovie-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/4fzqz8h97hnn7v0q2gadc1mp4xhssl3x-jovie-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/jovie-14.12.3.tar.xz";
+      sha256 = "12ky24hkpqm0bhi9x8fm6bf0nfqclpr5yv7n054995k3irygz9lz";
+      name = "jovie-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cervisia-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/81d3gi968mqnzps5v56lfi4dzkq7vfkw-cervisia-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/cervisia-14.12.3.tar.xz";
+      sha256 = "094x08jf21h5f0vjx28bqj207csh56rc293bs4sl8lg9d1h0gbax";
+      name = "cervisia-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dragon-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/2wh0xa17ikpsbm0addwb502rvld07ici-dragon-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/dragon-14.12.3.tar.xz";
+      sha256 = "0fngv700yhlh0q73njwfl6szf9v57csyf0gpqf1hyl9wvv2mwswj";
+      name = "dragon-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/a3lgzwlizzj1yp4n1v0k80h45rzml2bz-kqtquickcharts-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kqtquickcharts-14.12.3.tar.xz";
+      sha256 = "01017d0mww3ai4i8ik29kfwkakyp92ngrjm6704015i0wili09i0";
+      name = "kqtquickcharts-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblackbox-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/r5721x8a5aasszaw7hnj91iy90sy0007-kblackbox-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kblackbox-14.12.3.tar.xz";
+      sha256 = "1kmdxiy30cm3jrgi6kdg15rrwyyxgnrb51w3bfcgaqr48kz73id6";
+      name = "kblackbox-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapptemplate-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/xgnk2fv1a5q0xsy80xwn2p57vn10w3z7-kapptemplate-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kapptemplate-14.12.3.tar.xz";
+      sha256 = "0gwx51df5qms1vy1b6csbllcjy5xs55xmscz4i2n75ba7dsw9ivy";
+      name = "kapptemplate-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgeography-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/409f1vaf4n42mhdyxmjw0vf670frpgwg-kgeography-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kgeography-14.12.3.tar.xz";
+      sha256 = "098j76mk1lc7wjvwybvyb04zaysmmn9zl9y35r4yhr11lv2v2idf";
+      name = "kgeography-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/h3c8xaj4wybcpndp90x5qfr9602l6cr2-ksaneplugin-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ksaneplugin-14.12.3.tar.xz";
+      sha256 = "143j3ck5cy4678fx9d0jv3y8zvbkvjxc8kyx3n8hmm4plin54lah";
+      name = "ksaneplugin-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okular-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/fsviwbz3j2lx8d9hnscq7i6ncm1svq2j-okular-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/okular-14.12.3.tar.xz";
+      sha256 = "07snh1z38s1ycwfsirkzh91dw13hkf0lq79das75qjjladv3v9d7";
+      name = "okular-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/062pw1fc4w3nsflchjnzr33agfr5zpaa-kdesdk-thumbnailers-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-thumbnailers-14.12.3.tar.xz";
+      sha256 = "1vaw2p5y9q44yfcs34f501baga1rhswgawn2brglfada6y2b89jk";
+      name = "kdesdk-thumbnailers-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.17.tar.xz" ".tar";
+    store = "/nix/store/hgca7dsswq9axlaalvs1ci8zh0sl8j4k-kde-workspace-4.11.17.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kde-workspace-4.11.17.tar.xz";
+      sha256 = "0pkn49wis90v8ky8hasa80x6ji59sswlb5ib3hzr67mk191vhlhx";
+      name = "kde-workspace-4.11.17.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktux-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/kap125hfflfrp7nb58b7vv3w2kp3r6wh-ktux-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ktux-14.12.3.tar.xz";
+      sha256 = "0yg3a9wnn4rdbainypq8v6hw57flgsqsq8h8rzb6iy6hwnw8pc8p";
+      name = "ktux-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmousetool-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/li6azfrf8qsi5ai8vfrfq0md8cw581p7-kmousetool-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kmousetool-14.12.3.tar.xz";
+      sha256 = "14n79dlfiyd3pz3gi6sg71nd2p5vp18sk99bh7qz1dyid27v6z08";
+      name = "kmousetool-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/mlpp2nwbyg3dscicj50795c4bxbmzcqq-oxygen-icons-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/oxygen-icons-14.12.3.tar.xz";
+      sha256 = "0apfpfrpxjrnxf6c4bxxfhys9k7wif74yx9bbysrrndw4bvv0nx6";
+      name = "oxygen-icons-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktouch-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/3hpc3hmys0i16sh7aqmlw46flk6r110y-ktouch-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/ktouch-14.12.3.tar.xz";
+      sha256 = "1z084yi4s1i5nqir2izdaa5gca3216gqb00mr06044pc2h059j6h";
+      name = "ktouch-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kollision-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/lvsdhfw8c30z36yyjfcxprcw3ik3jb2s-kollision-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kollision-14.12.3.tar.xz";
+      sha256 = "1gfzya87q202az63dvrfpyf70khc27vh9nj5hriyql0kzyqy0xgf";
+      name = "kollision-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/0vnr7sljdzsxpkdyzz08yspr6kcbj0vn-kdegraphics-thumbnailers-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-thumbnailers-14.12.3.tar.xz";
+      sha256 = "023b1la31qc2b8rfmc3nxi29pd3jld6p2ivi1sdl1pybcillzpax";
+      name = "kdegraphics-thumbnailers-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "gwenview-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/lrkq8yk3wr9gwivm2177vqv5y2sh7zcf-gwenview-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/gwenview-14.12.3.tar.xz";
+      sha256 = "14kwdayzffsc8nk20xl86gqspbvrwja9x8h2dc498cqag0l60hcw";
+      name = "gwenview-14.12.3.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmines-14.12.3.tar.xz" ".tar";
+    store = "/nix/store/qgxz0771xbp8zvqplrv3g8rc89025xqa-kmines-14.12.3.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/14.12.3/src/kmines-14.12.3.tar.xz";
+      sha256 = "1xbpdq8250srbg2c10iz44aa6i19srk4x0f0bcsjhc53r8680g0f";
+      name = "kmines-14.12.3.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.03.97.tar.xz" ".tar";
     store = "/nix/store/fzwlsgxvxd1xp98ba1ksfbwjn20da65v-ktp-accounts-kcm-15.03.97.tar.xz";
@@ -55,6 +5698,15 @@
       name = "kmines-15.03.97.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kspaceduel-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/6vq7sl95pb7bh7w2gk7z1sgsl6zinrsv-kspaceduel-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kspaceduel-15.03.97.tar.xz";
+      sha256 = "1jfszdx6lj57c74zmvrqgzxvzqfd6zkl7irf6b3dxjg3damsfsjz";
+      name = "kspaceduel-15.03.97.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "libkgeomap-15.03.97.tar.xz" ".tar";
     store = "/nix/store/3vpnb3007jxrmhr21k52nln8f73dn8lh-libkgeomap-15.03.97.tar.xz";
@@ -433,6 +6085,15 @@
       name = "kde-l10n-wa-15.03.97.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/hzv99y7kv4cgf2l3yjr4kc16pr6b0fjr-kde-l10n-ca_valencia-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca_valencia-15.03.97.tar.xz";
+      sha256 = "0pxknkbj73a99q5ahpg2k1h2i0pdy53n4qsvc5v2k49ymb8av93l";
+      name = "kde-l10n-ca_valencia-15.03.97.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "kde-l10n-bg-15.03.97.tar.xz" ".tar";
     store = "/nix/store/6smzivm13xpsxzprjhh9jqm5v4dmlvah-kde-l10n-bg-15.03.97.tar.xz";
@@ -748,6 +6409,15 @@
       name = "libkdeedu-15.03.97.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kajongg-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/z93xrrq1jbxmw9a16wy3mvr03rnjv1ws-kajongg-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kajongg-15.03.97.tar.xz";
+      sha256 = "16m6mgzzhd4vjnznppqaiz9wly5x7l730j60k7vgrhy5fv8x2n0i";
+      name = "kajongg-15.03.97.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.03.97.tar.xz" ".tar";
     store = "/nix/store/maldvj3ir6n7rldvds9qi8pv8i4xxbv3-kdesdk-kioslaves-15.03.97.tar.xz";
@@ -1693,6 +7363,15 @@
       name = "filelight-15.03.97.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kate-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/9c2rnwlc8j3k0yjbi83j7p44c3kgpfz1-kate-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/kate-15.03.97.tar.xz";
+      sha256 = "0ccfrp346yb677fyjlqs3s30400z461cj841pmvi94cjnqlydvkb";
+      name = "kate-15.03.97.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "libkface-15.03.97.tar.xz" ".tar";
     store = "/nix/store/jbdz7p1hl659yyrziql6aqynh8353p9a-libkface-15.03.97.tar.xz";
@@ -1864,6 +7543,15 @@
       name = "klickety-15.03.97.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "jovie-15.03.97.tar.xz" ".tar";
+    store = "/nix/store/xzfgswd8bwwpbbv2dkxkjhahxa0wxkcz-jovie-15.03.97.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/unstable/applications/15.03.97/src/jovie-15.03.97.tar.xz";
+      sha256 = "053lhawgljh99fn3s48grl1ybqpa3pbmmw1ay22yprm0m0k3hbdm";
+      name = "jovie-15.03.97.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "kbounce-15.03.97.tar.xz" ".tar";
     store = "/nix/store/0jnr85v0cwj0si80dybb147w5pgwc2av-kbounce-15.03.97.tar.xz";
diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh
index b50380304253..a8e3591c2023 100755
--- a/pkgs/applications/kde-apps-15.04/manifest.sh
+++ b/pkgs/applications/kde-apps-15.04/manifest.sh
@@ -5,6 +5,11 @@ if [ $# -eq 0 ]; then
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../.. -A autonix.manifest) \
+      # We need 14.12 for some packages in LTS that are not released in beta.
+      # Remove 14.12 when 15.04 is out of beta.
+      http://download.kde.org/stable/applications/14.12.1/ \
+      http://download.kde.org/stable/applications/14.12.2/ \
+      http://download.kde.org/stable/applications/14.12.3/ \
       http://download.kde.org/unstable/applications/15.03.97/ \
       -A '*.tar.xz'
 
diff --git a/pkgs/applications/kde-apps-15.04/renames.nix b/pkgs/applications/kde-apps-15.04/renames.nix
index d9eee9614a62..37b4ef4f8beb 100644
--- a/pkgs/applications/kde-apps-15.04/renames.nix
+++ b/pkgs/applications/kde-apps-15.04/renames.nix
@@ -2,17 +2,22 @@
 { }:
 {
 "Analitza5" = "analitza";
+"Backend" = "kde-workspace";
 "CTest" = "sweeper";
 "ECM" = "extra-cmake-modules";
+"Gpgmepp" = "kdepimlibs";
 "JDns" = "kopete";
 "KAccounts" = "kaccounts-integration";
+"KDE4Workspace" = "kde-workspace";
 "KDEGames" = "libkdegames";
+"KDeclarative" = "kdelibs";
 "KF5KMahjongglib" = "libkmahjongg";
 "KSane" = "libksane";
 "KTp" = "ktp-common-internals";
 "KastenControllers" = "okteta";
 "KastenCore" = "okteta";
 "KastenGui" = "okteta";
+"KdepimLibs" = "kdepimlibs";
 "LibKEduVocDocument" = "libkeduvocdocument";
 "LibKdeEdu" = "libkdeedu";
 "LibKompareDiff2" = "libkomparediff2";

From d1a6edae0d1e8363f7330c16917b4c46315587cb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 11 Apr 2015 18:31:00 -0500
Subject: [PATCH 0099/1143] kde-frameworks: update 5.8 to 5.9

---
 pkgs/desktops/plasma-5.2/default.nix          |   4 +-
 .../libraries/kde-frameworks-5.8/manifest.nix | 580 -----------------
 .../default.nix                               |   1 +
 .../dependencies.nix                          |  60 +-
 .../dependencies.sh                           |   0
 .../0001-extra-cmake-modules-paths.patch      |   0
 .../kauth/kauth-policy-install.patch          |   0
 ...utils-pluginselector-follow-symlinks.patch |   0
 ...igwidgets-helpclient-follow-symlinks.patch |   0
 .../kdoctools-no-find-docbook-xml.patch       |   0
 .../kinit/kinit-libpath.patch                 |   0
 .../kpackage/0001-allow-external-paths.patch  |   0
 ...service-kbuildsycoca-follow-symlinks.patch |   0
 ...ce-kbuildsycoca-no-canonicalize-path.patch |   0
 .../0001-no-qcoreapplication.patch            |   0
 .../libraries/kde-frameworks-5.9/manifest.nix | 589 ++++++++++++++++++
 .../manifest.sh                               |   2 +-
 .../plasma-framework-external-paths.patch     |   0
 .../renames.nix                               |   2 +
 .../setup-hook.sh                             |   0
 pkgs/top-level/all-packages.nix               |   8 +-
 21 files changed, 632 insertions(+), 614 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.8/manifest.nix
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/default.nix (99%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/dependencies.nix (87%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/dependencies.sh (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/extra-cmake-modules/0001-extra-cmake-modules-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/kauth/kauth-policy-install.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/kcmutils/kcmutils-pluginselector-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/kinit/kinit-libpath.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/kpackage/0001-allow-external-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/kservice/kservice-kbuildsycoca-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/ktexteditor/0001-no-qcoreapplication.patch (100%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.9/manifest.nix
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/manifest.sh (85%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/plasma-framework/plasma-framework-external-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/renames.nix (95%)
 rename pkgs/development/libraries/{kde-frameworks-5.8 => kde-frameworks-5.9}/setup-hook.sh (100%)

diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix
index d399c64afae4..ed89384e26ac 100644
--- a/pkgs/desktops/plasma-5.2/default.nix
+++ b/pkgs/desktops/plasma-5.2/default.nix
@@ -53,8 +53,6 @@ let
         GTK3 = gtk3;
         Libinput = libinput;
         LibSSH = libssh;
-        ModemManager = modemmanager;
-        NetworkManager = networkmanager;
         PulseAudio = pulseaudio;
         Taglib = taglib;
         USB = libusb;
@@ -89,7 +87,7 @@ let
         name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version;
         buildInputs = with kf5; with plasma5;
           [
-            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration
+            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration kguiaddons
             frameworkintegration ki18n kwindowsystem qt5.base qt5.x11extras
           ];
         nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.8/manifest.nix
deleted file mode 100644
index 86116dff5011..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.8/manifest.nix
+++ /dev/null
@@ -1,580 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kpackage-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/pr2pj0xx1xnxh3bz3zz5zymmmjfvdwks-kpackage-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kpackage-5.8.0.tar.xz";
-      sha256 = "1y4y8q5dvny00gyk5sgnack612jkpq8xlq899vp0821wf4df0r1a";
-      name = "kpackage-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesu-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/jwyz61xs4nl22wb1yahyq5kliqq1idsm-kdesu-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kdesu-5.8.0.tar.xz";
-      sha256 = "0bwxhg3bcha94k8bnlsmk0cadpx1aiyrsnzw2ivwswm2nyx1dv3v";
-      name = "kdesu-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcoreaddons-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/7pg9x6wg9j16fqv9n8dhypriqpcssfsz-kcoreaddons-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kcoreaddons-5.8.0.tar.xz";
-      sha256 = "0msh83vqprl8lcm1z0jj4gpn2mrfrxrsf9w3dm4l66x0fh972w0f";
-      name = "kcoreaddons-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sonnet-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/353pfvh6mzhfkkd3w5fys3s4cabmcq51-sonnet-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/sonnet-5.8.0.tar.xz";
-      sha256 = "09faq7j3f5divzpjfz103i0sih53fxnywfdbh1yg1wpf53afs1q7";
-      name = "sonnet-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kactivities-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/ik33fvbzj7arr9380jig3id3dadjspid-kactivities-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kactivities-5.8.0.tar.xz";
-      sha256 = "0jk3kmpsqv0bj7885lfiiwnhxw7vvqqpxnm774s946qgsbscbzsa";
-      name = "kactivities-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/vamd45ddai43sz2r6hqzp7mjvqa87273-kio-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kio-5.8.0.tar.xz";
-      sha256 = "08gzsnqfc8ql6183im21w3kb1x41gkxp5rbm9b1xj4sh2bjv12ba";
-      name = "kio-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifications-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/dxdpmbwhjn7dvs364shhzdx9ckpn8sbc-knotifications-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/knotifications-5.8.0.tar.xz";
-      sha256 = "06wvwqprq7nr33jm0lcdzgf2nqaqcdq3h353pqqhx100b7j81pvq";
-      name = "knotifications-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinit-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/m7m2cqs903l80zdd4sdgjkx9hph8d14b-kinit-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kinit-5.8.0.tar.xz";
-      sha256 = "058rd6n29jkx0fwgg76mnnhddpppby3ap1yaq3sivik5mk4dc2hk";
-      name = "kinit-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemmodels-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/qhv3rm3j022bqjpz5nwqjvxnkjg8zvsv-kitemmodels-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kitemmodels-5.8.0.tar.xz";
-      sha256 = "1m6pgm91baaqqf9vr1z5g649v2dzgms0k8rmq64c2bsp2s58y0gj";
-      name = "kitemmodels-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbookmarks-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/192py0w7pzw5zq2536p1dg5wyk2cw520-kbookmarks-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kbookmarks-5.8.0.tar.xz";
-      sha256 = "0brlaim5ja8r9car3yjfsv1aw3g5309x3q0c3c6xhm5wchziyqqi";
-      name = "kbookmarks-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kguiaddons-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/mwnyb1bm3vvzn9qlsb3r4m3my9mynirr-kguiaddons-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kguiaddons-5.8.0.tar.xz";
-      sha256 = "11d0panxgk02zvanp8pfy9kap3qg9myasanzly1dd1xyvqvdv8w2";
-      name = "kguiaddons-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kglobalaccel-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/f2r6rdwgpgcz9hclwpv5pjfy3mv8slmc-kglobalaccel-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kglobalaccel-5.8.0.tar.xz";
-      sha256 = "0fw2si9zdq2nigjavfdy0ncwlxzra2wkdl84kyirwnm4mqvwwym4";
-      name = "kglobalaccel-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kauth-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/vvfki2y80hbgly49w4j2j3kv8zjxgg8m-kauth-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kauth-5.8.0.tar.xz";
-      sha256 = "1vzrafk13w2fyz1qz2xdkm60ajalbkky1ji9jn6bs5dhkywmfzqv";
-      name = "kauth-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwallet-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/fy65566wbdry47fq4vm5ip4zdyraskch-kwallet-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kwallet-5.8.0.tar.xz";
-      sha256 = "1hwdfjh86calyq8y86n34ybgzadhx1xw9vpzkmkrdjaqkxd67jy8";
-      name = "kwallet-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "solid-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/6k08mkbmg1dk1ckljjl2r6mrn20zivyq-solid-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/solid-5.8.0.tar.xz";
-      sha256 = "07qjih5gla2y4a59x4jb25r00hr0wsk12cs5gbwd9vi5y0345yq3";
-      name = "solid-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kidletime-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/zvb2yl00v66ra6p88hg90v2n7h0xlkga-kidletime-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kidletime-5.8.0.tar.xz";
-      sha256 = "0bnhpsrf2bs08p9hjv254mxch2gnvv28pp9ab3bfp7crdj5dbrvy";
-      name = "kidletime-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kplotting-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/aicz3im9y74y3n0pw7pfqmwks6v1qckb-kplotting-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kplotting-5.8.0.tar.xz";
-      sha256 = "15iifzwq9ldimdl1fq4ns2lagmhqyciyi8ycwp7zhwz2a4yga1xi";
-      name = "kplotting-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kparts-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/f30idimxzr7vn9x4xqf1q4dnq4xkybi2-kparts-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kparts-5.8.0.tar.xz";
-      sha256 = "009qrz8x9j12rsr678yp0n4m61k2vqgpg2x0n4z0jnzl4hp8g4b2";
-      name = "kparts-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdnssd-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/lq5gs7qa5jbzql3d90ny0ns9kvwn5nxq-kdnssd-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kdnssd-5.8.0.tar.xz";
-      sha256 = "0z8ssaxfff1ay9q0l3cp221nvnlg1vypd4ms8zdw7vglyzg3cvvg";
-      name = "kdnssd-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "karchive-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/hplgp8rl8y132ngmb55b357nn18x9684-karchive-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/karchive-5.8.0.tar.xz";
-      sha256 = "0cjwzmj4h6kf8ip4iy0vx97y49nkj0m68rgmwdp5w6wl9qsdymyr";
-      name = "karchive-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kded-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/hah2vldmgkvzxbrzfv5dwfg9wnf5k04r-kded-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kded-5.8.0.tar.xz";
-      sha256 = "18d8alv96i8a00rrylc19f7sc862zzrk5hk0dryyqyca7i4is0sv";
-      name = "kded-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfigwidgets-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/s3vfmb8y5r9ks3br1plpahg3mccxkwb3-kconfigwidgets-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kconfigwidgets-5.8.0.tar.xz";
-      sha256 = "08kvg4idmy6h2r49h9zl4s5qm18283i61vk7j9ajpzs2wj8f0yq9";
-      name = "kconfigwidgets-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpty-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/zr8y35s1abk00d072i3wh0lrra7j9miv-kpty-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kpty-5.8.0.tar.xz";
-      sha256 = "0ycx73hxf257sc77x597a888ngrv9kw23qrv15pk40k4s9r927wj";
-      name = "kpty-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/jnph6s99cfp9b1akfw7zg73jm0sjngqp-kwidgetsaddons-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kwidgetsaddons-5.8.0.tar.xz";
-      sha256 = "0ay4fxijmaxqaqkdswwqykq0xi99lj76rqllmn14w1vk60v7kc1c";
-      name = "kwidgetsaddons-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcompletion-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/0win9qp98x332z1m2sln9mkqbdiq06jj-kcompletion-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kcompletion-5.8.0.tar.xz";
-      sha256 = "13r7zs6rbqx7ylipy8738l7565xi925y12sx8lcbdw7ib0dhz0wb";
-      name = "kcompletion-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "frameworkintegration-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/m4ra9rcv4jpp60mw0s6ak3zkr1djwncl-frameworkintegration-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/frameworkintegration-5.8.0.tar.xz";
-      sha256 = "11sbnfs7wy103v46wxsx9njsjskjdig80chx193wqqqyzbdwgq3f";
-      name = "frameworkintegration-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "networkmanager-qt-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/88lzs61m9a65p1vhbyyvvqsza4pp8y8n-networkmanager-qt-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/networkmanager-qt-5.8.0.tar.xz";
-      sha256 = "07c9n2clsvb152qcxs8mhinmy8hnzhij52xx9pkd0v0az6xmi23z";
-      name = "networkmanager-qt-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-framework-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/mp3740pcgh3q2as67vw8cl6pd1mb7d42-plasma-framework-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/plasma-framework-5.8.0.tar.xz";
-      sha256 = "1042fn164dx62gqh5fnlcid7vcpv0wqal35c2s5iv89xkpa48x82";
-      name = "plasma-framework-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlgui-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/b0frky56prbmwk6v8bxgwya2x1hzi01c-kxmlgui-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kxmlgui-5.8.0.tar.xz";
-      sha256 = "1l3svzk312fv4zya7fglmy3wajr0dblfff8fdyrlfa6g4qqv0xzg";
-      name = "kxmlgui-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemviews-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/fa4nvdny3ca1a0dw23dv88kq1skwydck-kitemviews-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kitemviews-5.8.0.tar.xz";
-      sha256 = "1lryy36bm592kd1jiqxgs7s64bzfnn1mlxhi8cggckvcqc20jyfd";
-      name = "kitemviews-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeclarative-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/cnc3mvxf4xhhxffvdv982wya7ab5g13r-kdeclarative-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kdeclarative-5.8.0.tar.xz";
-      sha256 = "18yyhw4d3srlddj7ycn0qi6dcjc7hz0ml66fx2a3z8ljafplhf2n";
-      name = "kdeclarative-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kimageformats-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/s2n2g5ig1wqkyd11n0gc0ch3584k9qby-kimageformats-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kimageformats-5.8.0.tar.xz";
-      sha256 = "05nnipfq5qpqnh1drfjlbhz673zd3qi61jdx69vym5khfpxb7vaz";
-      name = "kimageformats-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcodecs-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/ll6bzn3mhhf35p8xl32n3wxmcal3dk1i-kcodecs-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kcodecs-5.8.0.tar.xz";
-      sha256 = "1ipd85hgm53vv5qhfynzhb2gp6qiz0k4d31ailjm55czrirp02zc";
-      name = "kcodecs-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktextwidgets-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/hkc48gibgnm02ywiddfq6qivwfji988a-ktextwidgets-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/ktextwidgets-5.8.0.tar.xz";
-      sha256 = "05aigqfnp1dnrlfba59rr3ccbj06jmjfhja4iz8w3vizxpc2imcv";
-      name = "ktextwidgets-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "threadweaver-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/r7aa4rhlyqhhrwlbnhgqn0w9nrazbva0-threadweaver-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/threadweaver-5.8.0.tar.xz";
-      sha256 = "0fghim7rkdf50sydzsq2q8kr9fkh7ffldn660rf39amggarhnm1c";
-      name = "threadweaver-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwindowsystem-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/mgb7hh4a1rc01xfilc9i39h0lc3gvx76-kwindowsystem-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kwindowsystem-5.8.0.tar.xz";
-      sha256 = "19caaxzps6fzi9w1k9jcyr1i6qq784q5hfkfvi7pz9aj09f89a65";
-      name = "kwindowsystem-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knewstuff-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/z00gzak0za0rvl9n98i074c9vn1ifjhq-knewstuff-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/knewstuff-5.8.0.tar.xz";
-      sha256 = "0pjxia7baapbvx7hzmk2rgh08v5n5rd8cfa4mqqz8l7ak7pvaih8";
-      name = "knewstuff-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcrash-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/7jz5m4rzrjg2sff80y7mvf62648ynd6r-kcrash-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kcrash-5.8.0.tar.xz";
-      sha256 = "02qb16pqdmcx5l5mvi6kxh8q00asq7vd2fp5n8rb8x73354njs2r";
-      name = "kcrash-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpeople-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/57l0041ivb40zbx77hcxz0v29argmsx8-kpeople-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kpeople-5.8.0.tar.xz";
-      sha256 = "1id2wasxh7him48pnsf6biilakg1hk7by9blylpsxgcj97gzh5h5";
-      name = "kpeople-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kunitconversion-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/4lf9qjhf0m1c8r36vrs7xgxc61y0kn9m-kunitconversion-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kunitconversion-5.8.0.tar.xz";
-      sha256 = "1yhwrbzbsnw9hlbcx0bpivjgwshxy412sds4gg1fkr8iwl53a353";
-      name = "kunitconversion-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktexteditor-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/d14ixg28zc0kvbrj9pyqjzch8vjqvf1k-ktexteditor-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/ktexteditor-5.8.0.tar.xz";
-      sha256 = "0hlswklc9h87mj73qm3jdc1hjhrsav58a68rbssmxdzjvq13xz33";
-      name = "ktexteditor-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifyconfig-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/dbn61n194xfh880pba8dphr5xfxag9lm-knotifyconfig-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/knotifyconfig-5.8.0.tar.xz";
-      sha256 = "1i7xcr21mjgd5ys6lhfy939v5sccq445bmjmgm3akwhvj98cm6vm";
-      name = "knotifyconfig-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjobwidgets-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/w4fry4a11m0k7agginnj3j9hqjgnad0a-kjobwidgets-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kjobwidgets-5.8.0.tar.xz";
-      sha256 = "0fv4w6jb0kx7qcm1yqghxqvzk8zi9h91756b99y4201a8i9aiz67";
-      name = "kjobwidgets-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfig-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/bby9kv5kw0spadprnafjyyviqaixbk72-kconfig-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kconfig-5.8.0.tar.xz";
-      sha256 = "0l0ah29967jkr1ajv0lzjdk0gb97ypghd01fn0z32a8l6in4k8ql";
-      name = "kconfig-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kemoticons-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/mkk8jcv0v6qgpj88ngsic033as91bjrb-kemoticons-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kemoticons-5.8.0.tar.xz";
-      sha256 = "1c7xjwm99gg8q971wak6qk9xfmd9h365cqazqqkad9sg8ndfg5hj";
-      name = "kemoticons-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdbusaddons-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/zx9ak27yf54asn5v65bkg7mxczpm852m-kdbusaddons-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kdbusaddons-5.8.0.tar.xz";
-      sha256 = "1aq0n05cpvx3zapgirbb8b45sfss148x3yshd9dwa9npqx3irjxi";
-      name = "kdbusaddons-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdoctools-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/fg02vk213msvki571pnlbcsjc47dh4id-kdoctools-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kdoctools-5.8.0.tar.xz";
-      sha256 = "02qvyz102xyfl4qsfnnpdhg0lrwkd0fp95wgbk0zl7lbh261nm0j";
-      name = "kdoctools-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapidox-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/xahpr44r52smzx3g71ss475qfyll1zw0-kapidox-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kapidox-5.8.0.tar.xz";
-      sha256 = "0l2vl6q67kripg3ajrm4lzxgg2hn18dbrgl5i3s34swg0ay668pr";
-      name = "kapidox-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "extra-cmake-modules-1.8.0.tar.xz" ".tar";
-    store = "/nix/store/gx034z2gbkgr2kd0kgm0g3yivkmxiqbd-extra-cmake-modules-1.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/extra-cmake-modules-1.8.0.tar.xz";
-      sha256 = "0spmfcs94xc4wj42sk599c11yfmy6hg9g8c60cfh8gqyk9527g27";
-      name = "extra-cmake-modules-1.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "attica-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/6p6grsyj3vlynq2800v1ybz5l2qi2dww-attica-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/attica-5.8.0.tar.xz";
-      sha256 = "11fi00x78z7bm60n0gh3025ii1gplkjihgi4x97yjc6bdvr1xigb";
-      name = "attica-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebkit-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/1ylslvzlbn52qszzzb1v5cwbbvj5gk7v-kdewebkit-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kdewebkit-5.8.0.tar.xz";
-      sha256 = "1h2qsmbc690apyg9ynff9vc1r3pbpb0369p02gbrn4m6yx40985r";
-      name = "kdewebkit-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiconthemes-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/636lwcspq1ndm8q1dcw4yln7ramj59sn-kiconthemes-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kiconthemes-5.8.0.tar.xz";
-      sha256 = "0am9kxgwfnknnjnv7pcba55n0rg73lq6wxc5fyv4nz5g2r5c7rb0";
-      name = "kiconthemes-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ki18n-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/i7ls6hsr4a91ppnghn5z8hgb1lq2krfz-ki18n-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/ki18n-5.8.0.tar.xz";
-      sha256 = "0jlw1bbza0kcnflvpw4nbamqxkj91ij5m31i5kj1kw48sc86l383";
-      name = "ki18n-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcmutils-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/78j3wzxv01vgifmrqv8a9xhsamf1cbcv-kcmutils-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kcmutils-5.8.0.tar.xz";
-      sha256 = "0zm14mdg5mkczkihgwjwz99wjx30wm6c85dm75yaqhk2d3w1aj9w";
-      name = "kcmutils-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/p9p7sks5g2zxqa9v7lphyk0vzxbrg0h8-kxmlrpcclient-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kxmlrpcclient-5.8.0.tar.xz";
-      sha256 = "0xdlz8lvi028h8d13l8zqlbsqqrlpm4x940chxhr92jxlicbhaw3";
-      name = "kxmlrpcclient-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kservice-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/gjm5i3lpn4h2sfcsjzz4yzm4pw6wzxkj-kservice-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kservice-5.8.0.tar.xz";
-      sha256 = "1jk4vh4x7bjr6gqgl118lkkbpmmj1c6y0afysjl9fa45by4bhyz8";
-      name = "kservice-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesignerplugin-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/vfjf7vs4sc13dwi21m4ikvr6qwvi1wlg-kdesignerplugin-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/kdesignerplugin-5.8.0.tar.xz";
-      sha256 = "18ckgx4dvb4bzy38q0dsi23rp5yqjvynyz2yaisczi0fi4b4zn44";
-      name = "kdesignerplugin-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjs-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/5kcpxkfv6l75pad56hk73i2aq6dhm98c-kjs-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/portingAids/kjs-5.8.0.tar.xz";
-      sha256 = "0xy51dm8dmdj7rlz1sxyzbwmxyyv0ydhj6mvzk2a2kn1189dl8kz";
-      name = "kjs-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kross-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/x6zhp5010lwmbp8p0f3dg720iqh8d9xk-kross-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/portingAids/kross-5.8.0.tar.xz";
-      sha256 = "15n2gqpxi96p899k8ggals2p9ym1hlksm1kpz7sjk33idljb9972";
-      name = "kross-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krunner-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/mxfd3j3r56048khysr8s5p6plw04g3wk-krunner-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/portingAids/krunner-5.8.0.tar.xz";
-      sha256 = "0w0s56gaw6s6hiid6dngdgjlr9zzpp9wb6f2v3pk7lg9bxqjwlwh";
-      name = "krunner-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjsembed-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/sxjsvg6x6wa0hsblsynnk6y2fp1f876l-kjsembed-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/portingAids/kjsembed-5.8.0.tar.xz";
-      sha256 = "04sqva3qngjl73nl1f6mz8np7klbsxp1h6rrqzgln6jd35rzfabx";
-      name = "kjsembed-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs4support-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/w4s7ij8hj943nkgw9xi6i29hyadlg27i-kdelibs4support-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/portingAids/kdelibs4support-5.8.0.tar.xz";
-      sha256 = "0j3jpz7zb1if9x91rz4fr6gny0a9r1c1z9796j0bn7b4frq7l232";
-      name = "kdelibs4support-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmediaplayer-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/hbam3379ghcyfw7f34gaqx53s4b92khh-kmediaplayer-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/portingAids/kmediaplayer-5.8.0.tar.xz";
-      sha256 = "0ys7q85942fd7cbpyjqj9wcn947v49f22aj64m8s40h7jiwidkpf";
-      name = "kmediaplayer-5.8.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khtml-5.8.0.tar.xz" ".tar";
-    store = "/nix/store/ajxcmpx2xzy68ls0ilxiy4hslxmbwpc2-khtml-5.8.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.8/portingAids/khtml-5.8.0.tar.xz";
-      sha256 = "0z0123ajf80m99a8kx572nymgmxqrk7svdlja9zrmc9vpbmy643b";
-      name = "khtml-5.8.0.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/default.nix b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
similarity index 99%
rename from pkgs/development/libraries/kde-frameworks-5.8/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.9/default.nix
index b985ffe8f972..0f5504fe0573 100644
--- a/pkgs/development/libraries/kde-frameworks-5.8/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
@@ -80,6 +80,7 @@ let
         LibGit2 = libgit2;
         LibIntl = gettext;
         LibLZMA = lzma;
+        ModemManager = modemmanager;
         NetworkManager = networkmanager;
         Perl = perl;
         PythonInterp = python;
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix
similarity index 87%
rename from pkgs/development/libraries/kde-frameworks-5.8/dependencies.nix
rename to pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix
index babb793f2e8c..71dbc50a806b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.8/dependencies.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix
@@ -58,17 +58,17 @@
   };
 
   kbookmarks = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
+    propagatedBuildInputs = [ "KF5WidgetsAddons" "Qt5Widgets" "Qt5Xml" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
 
   kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Package" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5Service" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -100,7 +100,7 @@
   kconfigwidgets = {
     buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
+    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5WidgetsAddons" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -146,9 +146,9 @@
   };
 
   kdelibs4support = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DBusAddons" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
+    propagatedBuildInputs = [ "KDEWin" "KF5Archive" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -162,7 +162,7 @@
   };
 
   kdesu = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Pty" ];
     propagatedNativeBuildInputs = [  ];
@@ -196,7 +196,7 @@
   kemoticons = {
     buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
+    propagatedBuildInputs = [ "KF5Service" "Qt5Gui" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -236,7 +236,7 @@
   kiconthemes = {
     buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -274,7 +274,7 @@
   };
 
   kitemmodels = {
-    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -324,7 +324,7 @@
   knewstuff = {
     buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
+    propagatedBuildInputs = [ "KF5Attica" "KF5XmlGui" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -332,7 +332,7 @@
   knotifications = {
     buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -340,7 +340,7 @@
   knotifyconfig = {
     buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -348,7 +348,7 @@
   kpackage = {
     buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
+    propagatedBuildInputs = [ "KF5CoreAddons" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -356,7 +356,7 @@
   kparts = {
     buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
+    propagatedBuildInputs = [ "KF5KIO" "KF5TextWidgets" "KF5XmlGui" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -378,9 +378,9 @@
   };
 
   kpty = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ];
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" "UTEMPTER" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -404,13 +404,13 @@
   kservice = {
     buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
 
   ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
     nativeBuildInputs = [ "Perl" "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -420,7 +420,7 @@
   ktextwidgets = {
     buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5Sonnet" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -428,7 +428,7 @@
   kunitconversion = {
     buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -436,7 +436,7 @@
   kwallet = {
     buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -460,19 +460,27 @@
   kxmlgui = {
     buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5ConfigWidgets" "Qt5DBus" "Qt5Widgets" "Qt5Xml" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
 
   kxmlrpcclient = {
-    buildInputs = [ "ECM" "KF5KIO" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5I18n" "KF5KIO" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5KIO" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
 
+  modemmanager-qt = {
+    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   networkmanager-qt = {
     buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
@@ -484,7 +492,7 @@
   plasma-framework = {
     buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ];
     nativeBuildInputs = [ "SH" "cmake" ];
-    propagatedBuildInputs = [ "KF5Package" ];
+    propagatedBuildInputs = [ "KF5Package" "KF5Service" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/dependencies.sh
rename to pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/kauth/kauth-policy-install.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/kinit/kinit-libpath.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/kpackage/0001-allow-external-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/ktexteditor/0001-no-qcoreapplication.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix
new file mode 100644
index 000000000000..c61618b6e455
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix
@@ -0,0 +1,589 @@
+# This file is generated automatically. DO NOT EDIT!
+{ stdenv, fetchurl, mirror }:
+[
+  {
+    name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz";
+      sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh";
+      name = "kemoticons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz";
+      sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4";
+      name = "kpeople-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz";
+      sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr";
+      name = "kconfigwidgets-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz";
+      sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc";
+      name = "ki18n-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz";
+      sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy";
+      name = "kplotting-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz";
+      sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9";
+      name = "kservice-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz";
+      sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06";
+      name = "kbookmarks-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz";
+      sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp";
+      name = "kded-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz";
+      sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0";
+      name = "knewstuff-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz";
+      sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7";
+      name = "knotifyconfig-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz";
+      sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq";
+      name = "threadweaver-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz";
+      sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m";
+      name = "kcmutils-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz";
+      sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z";
+      name = "kwindowsystem-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz";
+      sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9";
+      name = "extra-cmake-modules-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz";
+      sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld";
+      name = "kwallet-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz";
+      sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10";
+      name = "kguiaddons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz";
+      sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x";
+      name = "plasma-framework-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz";
+      sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib";
+      name = "kcodecs-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz";
+      sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv";
+      name = "kxmlgui-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz";
+      sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr";
+      name = "ktextwidgets-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz";
+      sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav";
+      name = "kinit-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz";
+      sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh";
+      name = "kdbusaddons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz";
+      sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9";
+      name = "frameworkintegration-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz";
+      sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n";
+      name = "kjobwidgets-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz";
+      sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4";
+      name = "networkmanager-qt-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz";
+      sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli";
+      name = "kpty-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz";
+      sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k";
+      name = "kcompletion-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz";
+      sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4";
+      name = "kio-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz";
+      sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l";
+      name = "kparts-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz";
+      sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm";
+      name = "kiconthemes-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz";
+      sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx";
+      name = "kglobalaccel-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz";
+      sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm";
+      name = "kapidox-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz";
+      sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz";
+      name = "kauth-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz";
+      sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf";
+      name = "kpackage-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz";
+      sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa";
+      name = "knotifications-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz";
+      sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r";
+      name = "kdesu-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz";
+      sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7";
+      name = "kcrash-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz";
+      sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2";
+      name = "kdnssd-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz";
+      sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif";
+      name = "kunitconversion-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz";
+      sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5";
+      name = "kidletime-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz";
+      sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix";
+      name = "kjsembed-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz";
+      sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d";
+      name = "kdelibs4support-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz";
+      sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl";
+      name = "krunner-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz";
+      sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj";
+      name = "kross-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz";
+      sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv";
+      name = "khtml-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz";
+      sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl";
+      name = "kjs-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz";
+      sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z";
+      name = "kmediaplayer-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz";
+      sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365";
+      name = "kitemmodels-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz";
+      sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3";
+      name = "modemmanager-qt-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz";
+      sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk";
+      name = "kdoctools-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz";
+      sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi";
+      name = "kcoreaddons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz";
+      sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy";
+      name = "kdewebkit-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz";
+      sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg";
+      name = "kimageformats-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz";
+      sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z";
+      name = "karchive-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz";
+      sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4";
+      name = "kdeclarative-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz";
+      sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s";
+      name = "kitemviews-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz";
+      sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28";
+      name = "sonnet-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz";
+      sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik";
+      name = "kdesignerplugin-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz";
+      sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1";
+      name = "kconfig-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz";
+      sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam";
+      name = "kactivities-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz";
+      sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn";
+      name = "solid-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz";
+      sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg";
+      name = "kxmlrpcclient-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz";
+      sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b";
+      name = "ktexteditor-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz";
+      sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj";
+      name = "attica-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz";
+      sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1";
+      name = "kwidgetsaddons-5.9.0.tar.xz";
+    };
+  }
+]
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh
similarity index 85%
rename from pkgs/development/libraries/kde-frameworks-5.8/manifest.sh
rename to pkgs/development/libraries/kde-frameworks-5.9/manifest.sh
index 9e44b18251af..0075819664a7 100755
--- a/pkgs/development/libraries/kde-frameworks-5.8/manifest.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh
@@ -5,7 +5,7 @@ if [ $# -eq 0 ]; then
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../../.. -A autonix.manifest) \
-    http://download.kde.org/stable/frameworks/5.8/ \
+    http://download.kde.org/stable/frameworks/5.9/ \
       -A '*.tar.xz'
 
 else
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/plasma-framework/plasma-framework-external-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/renames.nix b/pkgs/development/libraries/kde-frameworks-5.9/renames.nix
similarity index 95%
rename from pkgs/development/libraries/kde-frameworks-5.8/renames.nix
rename to pkgs/development/libraries/kde-frameworks-5.9/renames.nix
index 2a3e137c9fe6..7dcf3bf81d7f 100644
--- a/pkgs/development/libraries/kde-frameworks-5.8/renames.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.9/renames.nix
@@ -6,6 +6,7 @@
 "ECM" = "extra-cmake-modules";
 "KDED" = "kded";
 "KF5Activities" = "kactivities";
+"KF5ActivitiesExperimentalStats" = "kactivities";
 "KF5Archive" = "karchive";
 "KF5Attica" = "attica";
 "KF5Auth" = "kauth";
@@ -41,6 +42,7 @@
 "KF5KIO" = "kio";
 "KF5Kross" = "kross";
 "KF5MediaPlayer" = "kmediaplayer";
+"KF5ModemManagerQt" = "modemmanager-qt";
 "KF5NetworkManagerQt" = "networkmanager-qt";
 "KF5NewStuff" = "knewstuff";
 "KF5Notifications" = "knotifications";
diff --git a/pkgs/development/libraries/kde-frameworks-5.8/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.8/setup-hook.sh
rename to pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a56439f4b186..e117794126a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6174,8 +6174,8 @@ let
   };
 
   kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
-  kf58 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.8 { });
-  kf5_latest = kf58;
+  kf59 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.9 { });
+  kf5_latest = kf59;
   kf5_stable = kf57;
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
@@ -11041,7 +11041,7 @@ let
     kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
   kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {
-    kf5 = kf58;
+    kf5 = kf59;
     kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
   kdeApps_stable = kdeApps_14_12;
@@ -13239,7 +13239,7 @@ let
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
   plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
-    kf5 = kf58;
+    kf5 = kf59;
   });
   plasma5_latest = plasma52;
   plasma5_stable = plasma52;

From 49e250564a826d41fac46cea7923954f43daf0e0 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Mon, 13 Apr 2015 16:22:09 +0000
Subject: [PATCH 0100/1143] wget: 1.16 -> 1.16.3

---
 pkgs/tools/networking/wget/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 5a597afd9d37..c0952c9cd8a5 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, gettext, libidn
+{ stdenv, fetchurl, gettext, libidn, pkgconfig
 , perl, perlPackages, LWP, python3
 , libiconv, gnutls ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.16";
+  name = "wget-1.16.3";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.xz";
-    sha256 = "1rxhr3jmgbwryzl51di4avqxw9m9j1z2aak8q1npns0p184xsqcj";
+    sha256 = "0dzv5xf9qxc2bp4cyifmaghh3h464wbm73xiwcrvckf1ynqbgxv7";
   };
 
   preConfigure = stdenv.lib.optionalString doCheck
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
 
   nativeBuildInputs = [ gettext ];
-  buildInputs = [ libidn libiconv ]
+  buildInputs = [ libidn libiconv pkgconfig ]
     ++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ]
     ++ stdenv.lib.optional (gnutls != null) gnutls
     ++ stdenv.lib.optional stdenv.isDarwin perl;

From a916e97eef2fdb264775b733b633607902fee6b8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 13 Apr 2015 22:06:04 -0700
Subject: [PATCH 0101/1143] mesa: 10.5.2 -> 10.5.3

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 85d35f2189f4..dcd98de460b8 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.5.2";
+  version = "10.5.3";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
   clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "0i6xqklphkk2n38xinkkwvhpbxbk6158il2q2n36yz9ygjvnyjrg";
+    sha256 = "18ibj4c8zmg738md8phmq3va40ycsjdilg76ylw35h7mwhdyw0c7";
   };
 
   prePatch = "patchShebangs .";

From dc84c2dcee6eaddd4eec2dd6601642b3666ee7c2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 14 Apr 2015 21:38:47 -0700
Subject: [PATCH 0102/1143] mesa: Cleanup output hack

---
 pkgs/development/libraries/mesa/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index dcd98de460b8..8db89b60f181 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -118,24 +118,15 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
   doCheck = false;
 
-  installFlags = [ "DESTDIR=\${out}" ];
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
+  ];
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
   #   also move libOSMesa to $osmesa, as it's relatively big
   # ToDo: probably not all .la files are completely fixed, but it shouldn't matter
   postInstall = with stdenv.lib; ''
-    fix_dirs () {
-      mkdir -p $1
-      mv $out/$1/* $1
-      DIR=$out/$1
-      while rmdir $DIR 2>/dev/null; do
-        DIR="$(dirname "$DIR")"
-      done
-    }
-    fix_dirs $out
-    fix_dirs $drivers
-    fix_dirs $osmesa
-
     mv -t "$drivers/lib/" \
   '' + optionalString enableExtraFeatures ''
       `#$out/lib/libXvMC*` \

From 487b200ea1c2ae7361d21504ecf6666571ecaef3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 16 Apr 2015 06:29:11 +0200
Subject: [PATCH 0103/1143] util-linux: ddate was removed in 2.23

---
 pkgs/os-specific/linux/util-linux/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index cf2783b9bbee..13749d7eaa15 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
     --enable-write
     --enable-last
     --enable-mesg
-    --enable-ddate
     --disable-use-tty-group
     --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/bin:/sbin
     ${if ncurses == null then "--without-ncurses" else ""}

From 2dd534e10a84491123afe0ea5a48ef9f5569bdce Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Fri, 17 Apr 2015 10:21:24 +0000
Subject: [PATCH 0104/1143] glib: 2.42.2 -> 2.44.0

---
 pkgs/development/libraries/glib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 4749e2394b5e..91832ac650e6 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -39,8 +39,8 @@ let
     ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
   '';
 
-  ver_maj = "2.42";
-  ver_min = "2";
+  ver_maj = "2.44";
+  ver_min = "0";
 in
 
 stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "1nz7vb549gzkxcpmb7yj9dvg3k8kwwz2kr1aykysj46k5fyixk53";
+    sha256 = "1fgmjv3yzxgbks31h42201x2izpw0sd84h8dfw0si3x00sqn5lzj";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;

From 771c7fb4965833b91a2e11a5d562902e479c1490 Mon Sep 17 00:00:00 2001
From: Forkk <forkk@forkk.net>
Date: Fri, 17 Apr 2015 14:45:10 -0500
Subject: [PATCH 0105/1143] plex: add support for managing plugins via Nix

Added support for managing Plex plugins via Nix. This is done via an
"extraPlugins" configuration option which takes a list of paths to
plugin bundles, which are then symlinked into Plex's plugin directory
when the service is started.
---
 nixos/modules/services/misc/plex.nix | 59 ++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index f4642b5157ee..f5f0a8c18161 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -30,6 +30,30 @@ in
         default = "plex";
         description = "Group under which Plex runs.";
       };
+
+
+      managePlugins = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          If set to true, this option will cause all of the symlinks in Plex's
+          plugin directory to be removed and symlinks for paths specified in
+          <option>extraPlugins</option> to be added.
+        '';
+      };
+
+      extraPlugins = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = ''
+          A list of paths to extra plugin bundles to install in Plex's plugin
+          directory. Every time the systemd unit for Plex starts up, all of the
+          symlinks in Plex's plugin directory will be cleared and this module
+          will symlink all of the paths specified here to that directory. If
+          this behavior is undesired, set <option>managePlugins</option> to
+          false.
+        '';
+      };
     };
   };
 
@@ -45,13 +69,48 @@ in
           mkdir -p "${cfg.dataDir}"
           chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}"
         }
+
         # Copy the database skeleton files to /var/lib/plex/.skeleton
+        # See the the Nix expression for Plex's package for more information on
+        # why this is done.
         test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton"
         for db in "com.plexapp.plugins.library.db"; do
             cp "${plex}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"
             chmod u+w "${cfg.dataDir}/.skeleton/$db"
             chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db"
         done
+
+        # If managePlugins is enabled, setup symlinks for plugins.
+        ${optionalString cfg.managePlugins ''
+          echo "Preparing plugin directory."
+          PLUGINDIR="${cfg.dataDir}/Plex Media Server/Plug-ins"
+          test -d "$PLUGINDIR" || {
+            mkdir -p "$PLUGINDIR";
+            chown ${cfg.user}:${cfg.group} "$PLUGINDIR";
+          }
+
+          echo "Removing old symlinks."
+          # First, remove all of the symlinks in the directory.
+          for f in `ls "$PLUGINDIR/"`; do
+            if [[ -L "$PLUGINDIR/$f" ]]; then
+              echo "Removing plugin symlink $PLUGINDIR/$f."
+              rm "$PLUGINDIR/$f"
+            fi
+          done
+
+          echo "Symlinking plugins."
+          for path in ${toString cfg.extraPlugins}; do
+            dest="$PLUGINDIR/$(basename $path)"
+            if [[ ! -d "$path" ]]; then
+              echo "Error symlinking plugin from $path: no such directory."
+            elif [[ -d "$dest" || -L "$dest" ]]; then
+              echo "Error symlinking plugin from $path to $dest: file or directory already exists."
+            else
+              echo "Symlinking plugin at $path..."
+              ln -s "$path" "$dest"
+            fi
+          done
+        ''}
      '';
       serviceConfig = {
         Type = "simple";

From d3399ca45baffd28ed25658896d2c9f348687510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 12 Mar 2015 20:25:55 +0100
Subject: [PATCH 0106/1143] cairo: maintenance update

The removed patch was included in the release.
---
 pkgs/development/libraries/cairo/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index e38d996766af..89c791fae020 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -11,19 +11,13 @@ assert glSupport -> mesa_noglu != null;
 with { inherit (stdenv.lib) optional optionals; };
 
 stdenv.mkDerivation rec {
-  name = "cairo-1.14.0";
+  name = "cairo-1.14.2";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.xz";
-    sha1 = "53cf589b983412ea7f78feee2e1ba9cea6e3ebae";
+    sha1 = "c8da68aa66ca0855b5d0ff552766d3e8679e1d24";
   };
 
-  patches = [(fetchpatch {
-    name = "fix-racket.diff";
-    url = "http://cgit.freedesktop.org/cairo/patch/?id=2de69581c28bf115852037ca41eba13cb7335976";
-    sha256 = "0mk2fd9fwxqzravlmnbbrzwak15wqspn7609y0yn6qh87va5i0x4";
-  })];
-
   nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
 
   propagatedBuildInputs =

From 6087b3d16c60d13fd2c9a67a49248229fc83f2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Apr 2015 11:31:00 +0200
Subject: [PATCH 0107/1143] xorg drivers: minor updates

---
 pkgs/servers/x11/xorg/default.nix       | 30 ++++++++++++-------------
 pkgs/servers/x11/xorg/tarballs-7.7.list | 10 ++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2a1fb67b4cb6..2ad205092c45 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1375,11 +1375,11 @@ let
   }) // {inherit ;};
 
   xf86inputevdev = (mkDerivation "xf86inputevdev" {
-    name = "xf86-input-evdev-2.9.1";
+    name = "xf86-input-evdev-2.9.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.9.1.tar.bz2;
-      sha256 = "1y82hpx86rngb0yrvcl4ni88wkc3zf9dj25myjk91b7ymll07qqc";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2;
+      sha256 = "1v7gmjc1ilyhln80i87rivgls3ajlm8lnkm9rn695img66sjj8vr";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
   }) // {inherit inputproto udev xorgserver xproto ;};
@@ -1415,11 +1415,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
-    name = "xf86-input-synaptics-1.8.1";
+    name = "xf86-input-synaptics-1.8.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.1.tar.bz2;
-      sha256 = "16phzd7yhl4wns957c35qz2nahmjvnlx05jf975s524qkvrdlkyp";
+      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2;
+      sha256 = "104cd67dqalp1a73jmi61kdpxwsr61w5x5cmqvh819h2pm71c3kv";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
   }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
@@ -1575,11 +1575,11 @@ let
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomga = (mkDerivation "xf86videomga" {
-    name = "xf86-video-mga-1.6.3";
+    name = "xf86-video-mga-1.6.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2;
-      sha256 = "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p";
+      url = mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2;
+      sha256 = "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -1715,11 +1715,11 @@ let
   }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
   xf86videotdfx = (mkDerivation "xf86videotdfx" {
-    name = "xf86-video-tdfx-1.4.5";
+    name = "xf86-video-tdfx-1.4.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2;
-      sha256 = "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh";
+      url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2;
+      sha256 = "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -1735,11 +1735,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videotrident = (mkDerivation "xf86videotrident" {
-    name = "xf86-video-trident-1.3.6";
+    name = "xf86-video-trident-1.3.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2;
-      sha256 = "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a";
+      url = mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2;
+      sha256 = "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 1e16bbef97f2..6f7ed6539783 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -115,11 +115,11 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.9.1.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.8.1.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
@@ -136,7 +136,7 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2
+mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
@@ -149,9 +149,9 @@ mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2
+mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2
+mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2

From e7aec13bda6b52ce5d9a1f0a5c96d381ada26bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Apr 2015 11:39:43 +0200
Subject: [PATCH 0108/1143] xorg libs: maintenance updates

---
 pkgs/servers/x11/xorg/default.nix       | 30 ++++++++++++-------------
 pkgs/servers/x11/xorg/old.list          |  2 +-
 pkgs/servers/x11/xorg/tarballs-7.7.list |  8 +++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2ad205092c45..86da41fae613 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -605,11 +605,11 @@ let
   }) // {inherit windowswmproto libX11 libXext xextproto ;};
 
   libX11 = (mkDerivation "libX11" {
-    name = "libX11-1.6.2";
+    name = "libX11-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2;
-      sha256 = "05mx0s0vqzds3qjc1gmjr2s6x2ll37z4lfhgm7p2w7936zl2g81a";
+      url = mirror://xorg/individual/lib/libX11-1.6.3.tar.bz2;
+      sha256 = "04c1vj53xq2xgyxx5vhln3wm2d76hh1n95fvs3myhligkz1sfcfg";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
   }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
@@ -675,11 +675,11 @@ let
   }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
   libXdmcp = (mkDerivation "libXdmcp" {
-    name = "libXdmcp-1.1.1";
+    name = "libXdmcp-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2;
-      sha256 = "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls";
+      url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2;
+      sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1";
     };
     buildInputs = [pkgconfig xproto ];
   }) // {inherit xproto ;};
@@ -755,11 +755,11 @@ let
   }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
   libXp = (mkDerivation "libXp" {
-    name = "libXp-1.0.2";
+    name = "libXp-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2;
-      sha256 = "1dfh5w8sjz5b5fl6dl4y63ckq99snslz7bir8zq2rg8ax6syabwm";
+      url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2;
+      sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
   }) // {inherit printproto libX11 libXau libXext xextproto ;};
@@ -835,11 +835,11 @@ let
   }) // {inherit videoproto libX11 libXext xextproto xproto ;};
 
   libXvMC = (mkDerivation "libXvMC" {
-    name = "libXvMC-1.0.8";
+    name = "libXvMC-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXvMC-1.0.8.tar.bz2;
-      sha256 = "015jk3bxfmj6zaw99x282f9npi8qqaw34yg186frags3z8g406jy";
+      url = mirror://xorg/individual/lib/libXvMC-1.0.9.tar.bz2;
+      sha256 = "0mjp1b21dvkaz7r0iq085r92nh5vkpmx99awfgqq9hgzyvgxf0q7";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
   }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
@@ -865,11 +865,11 @@ let
   }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
   libXxf86vm = (mkDerivation "libXxf86vm" {
-    name = "libXxf86vm-1.1.3";
+    name = "libXxf86vm-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2;
-      sha256 = "1f1pxj018nk7ybxv58jmn5y8gm2288p4q3l2dng9n1p25v1qcpns";
+      url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2;
+      sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
   }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 2c2d6e0e4c4f..92fed797d70f 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -5,7 +5,7 @@ mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
 mirror://xorg/individual/app/xfs-1.1.4.tar.bz2
 mirror://xorg/individual/app/xinit-1.3.4.tar.bz2
 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2
-mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2
+mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2
 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2
 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 6f7ed6539783..274a75883ea9 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -59,13 +59,13 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.3.tar.bz2
 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2
 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2
 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
+mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2
@@ -82,9 +82,9 @@ mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
 mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2
 mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2
-mirror://xorg/individual/lib/libXvMC-1.0.8.tar.bz2
+mirror://xorg/individual/lib/libXvMC-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2
-mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2
+mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2
 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2

From 4f0dae99f9527e7fcce03eef298ad0958bff24d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Apr 2015 11:48:22 +0200
Subject: [PATCH 0109/1143] xorg misc maintenance updates

---
 pkgs/servers/x11/xorg/default.nix       | 12 ++++++------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 86da41fae613..813968ebfa97 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -455,11 +455,11 @@ let
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontutil = (mkDerivation "fontutil" {
-    name = "font-util-1.3.0";
+    name = "font-util-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2;
-      sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz";
+      url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2;
+      sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
@@ -1015,11 +1015,11 @@ let
   }) // {inherit libXau ;};
 
   randrproto = (mkDerivation "randrproto" {
-    name = "randrproto-1.4.0";
+    name = "randrproto-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2;
-      sha256 = "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45";
+      url = mirror://xorg/individual/proto/randrproto-1.4.1.tar.bz2;
+      sha256 = "1p7155hsp48b0sjm4rc67wz6y1nxqrq69vyw0sjxh8h6pcpcngal";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 274a75883ea9..c8658ec4d04b 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -43,7 +43,7 @@ mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2
 mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2
+mirror://xorg/individual/font/font-util-1.3.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2
 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2
@@ -89,7 +89,7 @@ mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2
 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2
 mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2
-mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2
+mirror://xorg/individual/proto/randrproto-1.4.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2

From 4b6b03e2ce01b8c87126598d945c57e7fb24981c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Apr 2015 11:29:45 +0200
Subject: [PATCH 0110/1143] xcb-util-cursor: autogenerate as other xorg pkgs

HEAD version still needed on darwin, reportedly:
https://github.com/vcunat/nixpkgs/commit/0c915b8812#commitcomment-10615086
---
 .../libraries/xcb-util-cursor/default.nix     | 38 -------------------
 pkgs/servers/x11/xorg/default.nix             | 12 +++++-
 pkgs/servers/x11/xorg/extra.list              |  1 +
 pkgs/servers/x11/xorg/overrides.nix           |  4 ++
 pkgs/top-level/all-packages.nix               |  3 +-
 5 files changed, 17 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/development/libraries/xcb-util-cursor/default.nix

diff --git a/pkgs/development/libraries/xcb-util-cursor/default.nix b/pkgs/development/libraries/xcb-util-cursor/default.nix
deleted file mode 100644
index 984f192e4c9b..000000000000
--- a/pkgs/development/libraries/xcb-util-cursor/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, bashInteractive, autoconf, automake, libtool, pkgconfig
-, git, xlibs, gnum4, libxcb, gperf }:
-
-stdenv.mkDerivation rec {
-  name = "xcb-util-cursor-0.1.1";
-
-  src = fetchurl {
-    url    = "http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.1.tar.gz";
-    sha256 = "0lkjbcml305imyzr80yb8spjvq6y83v2allk5gc9plkv39zag29z";
-  };
-
-  meta = with stdenv.lib; {
-    description = "XCB cursor library (libxcursor port)";
-    homepage    = http://cgit.freedesktop.org/xcb/util-cursor;
-    license     = licenses.mit;
-    maintainer  = with maintainers; [ lovek323 ];
-    platforms   = platforms.linux;
-  };
-
-  buildInputs = [
-    autoconf
-    automake
-    gnum4
-    gperf
-    libtool
-    libxcb
-    pkgconfig
-    xlibs.utilmacros
-    xlibs.xcbutilimage
-    xlibs.xcbutilrenderutil
-  ];
-
-  configurePhase = ''
-    sed -i '15 i\
-      LT_INIT' configure.ac
-    ${bashInteractive}/bin/bash autogen.sh --prefix="$out"
-  '';
-}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 813968ebfa97..6d43a0543828 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -709,7 +709,7 @@ let
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2;
-      sha256 = "b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098";
+      sha256 = "1630v3sfvwwlimb2ja10c84ql6v1mw9bdfhvan7pbybkgi99h25p";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
@@ -1194,6 +1194,16 @@ let
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
   }) // {inherit gperf m4 libxcb xproto ;};
 
+  xcbutilcursor = (mkDerivation "xcbutilcursor" {
+    name = "xcb-util-cursor-0.1.2";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2;
+      sha256 = "0fpv46zb7kz04qxwvpax4cpd2kd8yhsm2n0if1isniqdh5xkcrgd";
+    };
+    buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ];
+  }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;};
+
   xcbutilimage = (mkDerivation "xcbutilimage" {
     name = "xcb-util-image-0.4.0";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 703c920c98ea..f0bf8bf73782 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -2,6 +2,7 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
 http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 61c1391ae09e..121b9c38683d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -189,6 +189,10 @@ in
     buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ];
   };
 
+  xcbutilcursor = attrs: attrs // {
+    meta.maintainers = [ stdenv.lib.maintainers.lovek323 ];
+  };
+
   xf86inputevdev = attrs: attrs // {
     preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
     installFlags = "sdkdir=\${out}/include/xorg";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e117794126a9..b1fbbd6bf234 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7801,8 +7801,7 @@ let
 
   xbase = callPackage ../development/libraries/xbase { };
 
-  xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { };
-
+  xcb-util-cursor = xorg.xcbutilcursor;
   xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { };
 
   xdo = callPackage ../tools/misc/xdo { };

From 3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Apr 2015 12:15:09 +0200
Subject: [PATCH 0111/1143] xorg: add xf86-input-libinput and xf86-video-i740

---
 pkgs/servers/x11/xorg/default.nix       | 20 ++++++++++++++++++++
 pkgs/servers/x11/xorg/overrides.nix     |  5 +++++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  2 ++
 pkgs/top-level/all-packages.nix         |  2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6d43a0543828..b7e5eef6d56b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1414,6 +1414,16 @@ let
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   }) // {inherit inputproto xorgserver xproto ;};
 
+  xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
+    name = "xf86-input-libinput-0.8.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2;
+      sha256 = "0fm4vrkw7azipbnwvc2l18g65z77pllsznaajd8q3zpg9ycb0li1";
+    };
+    buildInputs = [pkgconfig inputproto xorgserver xproto ];
+  }) // {inherit inputproto xorgserver xproto ;};
+
   xf86inputmouse = (mkDerivation "xf86inputmouse" {
     name = "xf86-input-mouse-1.9.1";
     builder = ./builder.sh;
@@ -1564,6 +1574,16 @@ let
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
+  xf86videoi740 = (mkDerivation "xf86videoi740" {
+    name = "xf86-video-i740-1.3.5";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2;
+      sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w";
+    };
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+
   xf86videointel = (mkDerivation "xf86videointel" {
     name = "xf86-video-intel-2.99.917";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 121b9c38683d..be9a43e2bb8e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -207,6 +207,11 @@ in
     installFlags = "sdkdir=\${out}/include/xorg";
   };
 
+  xf86inputlibinput = attrs: attrs // {
+    buildInputs = attrs.buildInputs ++ [ args.libinput ];
+    installFlags = "sdkdir=\${out}/include/xorg";
+  };
+
   xf86inputsynaptics = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev];
     installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d";
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index c8658ec4d04b..f02dd1e89f03 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -118,6 +118,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
@@ -134,6 +135,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
+mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1fbbd6bf234..c4854a2d95cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8687,7 +8687,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libpng zlib perl mesa_drivers spice_protocol
-      dbus libuuid openssl gperf m4 libevdev tradcpp
+      dbus libuuid openssl gperf m4 libevdev tradcpp libinput
       autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
     bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
     mesa = mesa_noglu;

From fe3e336590df32a5e7f5c2c8ad39beda6dcbae1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Apr 2015 13:33:39 +0200
Subject: [PATCH 0112/1143] t1lib: fix several years old security problems

/cc xpdf maintainer @peti may want to use it now.

Tested pdflatex on some PDFs of mine using T1-encoded fonts
(hopefully that used the library at least).
---
 pkgs/development/libraries/t1lib/default.nix | 23 ++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 6470ebd3b466..039dc59774c5 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -1,5 +1,20 @@
-{stdenv, fetchurl, xlibsWrapper, libXaw, libXpm}:
+{ stdenv, fetchurl, fetchpatch, libX11, libXaw }:
 
+let
+  getPatch = { name, sha256 }: fetchpatch {
+    inherit name sha256;
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/${name}"
+      + "?h=packages/t1lib&id=643a4c2c58e70072b5bc1e9e4624162517b58357";
+  };
+
+  patches = map getPatch [
+    { name = "lib-cleanup.diff"; sha256 = "1w3q1y4zk0y4mf2s2x9z4cd8d4af8i868c8837p40mz3dqrai4zp"; }
+    { name = "format-security.diff"; sha256 = "0cca94bif9dsc6iwpcnk1504gb3sl3nsqhni85c21q9aywyz26l3"; }
+    { name = "CVE-2011-0764.diff"; sha256 = "1j0y3f38im7srpqjg9jvx8as6sxkz8gw7hglcxnxl9qylx8mr2jh"; }
+    { name = "CVE-2011-1552_1553_1554.patch"; sha256 = "16cyq6jhyhh8912j8hapx9pq4rzxk36ljlkxlnyi7i3wr8iz1dir"; }
+    { name = "CVE-2010-2642.patch"; sha256 = "175zvyr9v1xs22k2svgxqjcpz5nihfa7j46hn9nzvkqcrhm5m9y8"; }
+  ];
+in
 stdenv.mkDerivation {
   name = "t1lib-5.1.2";
 
@@ -7,8 +22,12 @@ stdenv.mkDerivation {
     url = "mirror://metalab/libs/graphics/t1lib-5.1.2.tar.gz";
     sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2";
   };
+  inherit patches;
 
-  buildInputs = [xlibsWrapper libXaw libXpm];
+  buildInputs = [ libX11 libXaw ];
   buildFlags = "without_doc";
+
+  postInstall = "chmod +x $out/lib/*.so.*"; # ??
+
 }
 

From 7f30d090b2c3344f839182fa4d8ef4ef2f02fcb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Apr 2015 22:15:38 +0200
Subject: [PATCH 0113/1143] xfce: maintenance updates of various core pkgs

---
 pkgs/desktops/xfce/core/exo.nix           | 4 ++--
 pkgs/desktops/xfce/core/libxfce4ui.nix    | 4 ++--
 pkgs/desktops/xfce/core/xfce4-session.nix | 4 ++--
 pkgs/desktops/xfce/core/xfwm4.nix         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix
index 7588616ac1f0..e4c7c3183521 100644
--- a/pkgs/desktops/xfce/core/exo.nix
+++ b/pkgs/desktops/xfce/core/exo.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   p_name  = "exo";
   ver_maj = "0.10";
-  ver_min = "3";
+  ver_min = "4";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1g9651ra395v2fmzb943l68b9pg0rfxc19x97a62crchxwa4nw4m";
+    sha256 = "cced5fdbc0b61a5d976210ff71ecdd81b89fcd15e5860a44f50da7b83fb2deaa";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
index 1739cfbb87a2..be4ca5d17c09 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   p_name  = "libxfce4ui";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "1";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "11rrhqxnfwx5jls3nlg9s2x8saag9f2zqk9cdm6hr3bs6cr9a781";
+    sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix
index 0f2c30befb78..7599826e8f02 100644
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
   p_name  = "xfce4-session";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "1";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "01kvbd09c06j20n155hracsgrq06rlmfgdywffjsvlwpn19m9j38";
+    sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix
index 7e4c57ad9415..cedf36d43ae1 100644
--- a/pkgs/desktops/xfce/core/xfwm4.nix
+++ b/pkgs/desktops/xfce/core/xfwm4.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   p_name  = "xfwm4";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "2";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "0fnc2ps4k733n9qfpxrz047h1myyqjzxczl7fmkjmqwshvicpx19";
+    sha256 = "5bb5f72b41060d10bd3823f8b69abcd462bbd8853fdf9c82041450ae68e7d75a";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 

From 7f81c071457cdccfe3031bd3516fdc590711abb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 10 Apr 2015 10:24:42 +0200
Subject: [PATCH 0114/1143] libsecret: clean deps, add (more) meta

Most changes from former version of this patch was already pushed in f00f25bf6af.
---
 .../libraries/libsecret/default.nix           | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index d5055d213fbd..3ceabc3f1ac3 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, glib, dbus_libs, unzip, docbook_xsl
-, intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt
-}:
-
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc
+, libgcrypt, gobjectIntrospection }:
+let
   version = "0.18";
+in
+stdenv.mkDerivation rec {
   name = "libsecret-${version}";
 
   src = fetchurl {
@@ -11,11 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1qq29c01xxjyx5sl6y5h22w8r0ff4c73bph3gfx3h7mx5mvalwqc";
   };
 
-  propagatedBuildInputs = [ glib dbus_libs ];
-  nativeBuildInputs = [ unzip ];
-  buildInputs = [ gtk_doc intltool gobjectIntrospection pkgconfig libxslt libgcrypt docbook_xsl ];
+  propagatedBuildInputs = [ glib ];
+  nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ];
+  buildInputs = [ libgcrypt gobjectIntrospection ];
+  # optional: build docs with gtk-doc? (probably needs a flag as well)
 
   meta = {
+    description = "A library for storing and retrieving passwords and other secrets";
+    homepage = https://wiki.gnome.org/Projects/Libsecret;
+    license = stdenv.lib.licenses.lgpl21Plus;
     inherit (glib.meta) platforms maintainers;
   };
 }

From 9de9669496a05f64ea436c01f9b66c057cd74f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 Apr 2015 21:33:13 +0200
Subject: [PATCH 0115/1143] pciutils: maintenance + PCI IDs update

---
 pkgs/tools/system/pciutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index fb3b6c5b9c61..972fb41804ab 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -8,11 +8,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "pciutils-3.3.0"; # with database from 2014-11-10
+  name = "pciutils-3.3.1"; # with database from 2015-04
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
-    sha256 = "008kh33kbpkk1wr9srrapw93imqx7l4djglrdkfxwvy6ppa9acs1";
+    sha256 = "1ag3skny1bamqil46dlppw8j1fp08spqa60fjygbxkg4fzdknjji";
   };
 
   buildInputs = [ pkgconfig zlib kmod which ];

From c1bd505507ce2c5a56b9475b45994597654aa347 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 16:12:24 -0400
Subject: [PATCH 0116/1143] libmodplug: Enable building on Darwin

---
 pkgs/development/libraries/libmodplug/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index c1fb0033aa92..600d7faace20 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
     description = "MOD playing library";
     homepage    = "http://modplug-xmms.sourceforge.net/";
     license     = licenses.publicDomain;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ raskin ];
   };
 

From 86f3a5756d324318858e57fa94d38f3d626cc2c9 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 16:52:17 -0400
Subject: [PATCH 0117/1143] libraw1394: Set platforms and update license

---
 pkgs/development/libraries/libraw1394/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index 81cac5be709e..e2a04b5b60a1 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0w5sw06p51wfq2ahgql93ljkkp3hqprifzcxq8dq71c8zcbgyg58";
   };
 
-  meta = { 
+  meta = {
     description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
     homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394";
-    license = ["GPL" "LGPL"];
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From deddaa6c0df9a78a42b2d7993b114e07a66cd396 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 17:02:24 -0400
Subject: [PATCH 0118/1143] libavc1394: Add platforms and update license

---
 pkgs/development/libraries/libavc1394/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 73ca029a631e..51f62b9bd5f4 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   meta = { 
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
     homepage = http://sourceforge.net/projects/libavc1394/;
-    license = [ "GPL" "LGPL" ];
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 0ffa2ffe2be529c9f28b93473cc9375989a0b710 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 17:08:23 -0400
Subject: [PATCH 0119/1143] libiec61883: Set platforms and update license

---
 pkgs/development/libraries/libiec61883/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index d13376042603..70ccf3a761f2 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -11,11 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig ];
-  
+
   propagatedBuildInputs = [ libraw1394 ];
 
-  meta = { 
+  meta = with stdenv.lib; {
     homepage = http://www.linux1394.org;
-    license = "LGPL";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
   };
 }

From de97f99e6d90c0d44b0706ab118ee834fd9f67d0 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 20:13:47 -0400
Subject: [PATCH 0120/1143] libvdpau: Build shared libraries on Darwin

Not sure why this flag was breaking shared libraries, but it no longer
seems to be necessary regardless.
---
 pkgs/development/libraries/libvdpau/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 4da60397444f..a6da96dc863e 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
-
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";

From f8a1b8b7c84ca7332a40db4856a884c254adca4e Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 20:42:58 -0400
Subject: [PATCH 0121/1143] cdparanoia: patches for Darwin

---
 pkgs/applications/audio/cdparanoia/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 5c5416b79e16..25cc33d6cb8a 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -2,14 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "cdparanoia-III-10.2";
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz";
     sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";
   };
 
   preConfigure = "unset CC";
-  
+
+  patches = stdenv.lib.optionals stdenv.isDarwin [ 
+    (fetchurl {
+      url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch";
+      sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd";
+    })
+    (fetchurl {
+      url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff";
+      sha1 = "d7dc121374df3b82e82adf544df7bf1eec377bdb";
+    })
+  ];
+
   meta = {
     homepage = http://xiph.org/paranoia;
     description = "A tool and library for reading digital audio from CDs";

From 710a31eb0869a32e31fcc153e6540cfbb101741c Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 21:41:01 -0400
Subject: [PATCH 0122/1143] libdv: refactor and Darwin fix

---
 pkgs/development/libraries/libdv/default.nix | 37 +++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index 3213c0634ba2..e8c374297d37 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,28 +1,31 @@
-{ composableDerivation, fetchurl }:
-
-let inherit (composableDerivation) edf; in
-
-composableDerivation.composableDerivation {} {
-
-  flags = { }
-    # TODO! implement flags
-    # I want to get kino and cinelerra working. That's why I don't spend more time on this now
-    // edf { name = "libtool_lock"; } #avoid locking (might break parallel builds)
-    // edf { name ="asm"; } #disable use of architecture specific assembly code
-    // edf { name ="sdl"; } #enable use of SDL for display
-    // edf { name ="gtk"; } #disable use of gtk for display
-    // edf { name ="xv"; } #disable use of XVideo extension for display
-    // edf { name ="gprof"; }; #enable compiler options for gprof profiling
+{ stdenv, fetchurl, popt }:
 
+stdenv.mkDerivation rec {
   name = "libdv-1.0.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
+    url = "mirror://sourceforge/libdv/${name}.tar.gz";
     sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
   };
 
-  meta = {
+  # This fixes an undefined symbol: _sched_setscheduler error on compile.
+  # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section
+  LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup";
+
+  configureFlags = [
+    "--disable-asm"
+    "--disable-sdl"
+    "--disable-gtk"
+    "--disable-xv"
+    "--disable-gprof"
+  ];
+
+  buildInputs = [ popt ];
+
+  meta = with stdenv.lib; {
     description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = http://sourceforge.net/projects/libdv/;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
   };
 }

From f752a8c4192787608b543e94ae5cc9afd6cb36b8 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 21:46:49 -0400
Subject: [PATCH 0123/1143] gstreamer 1.x: build on Darwin

---
 pkgs/development/libraries/gstreamer/core/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 5e306f5500fc..5dbcb1cee4b6 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     description = "Open source multimedia framework";
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 

From a9644c2ddd81964410a0c49afd9abde58c404ef8 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 21:47:56 -0400
Subject: [PATCH 0124/1143] gst-plugins-base 1.x: fix Darwin build

---
 .../libraries/gstreamer/base/default.nix      | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 61e0762826a3..f959da4045e7 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
 , orc, alsaLib, libXv, pango, libtheora
-, cdparanoia, libvisual
+, cdparanoia, libvisual, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     description = "Base plugins and helper libraries";
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 
@@ -24,12 +24,23 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    orc alsaLib libXv pango libtheora
-    cdparanoia libvisual
-  ];
+    orc libXv pango libtheora cdparanoia
+  ]
+  ++ libintlOrEmpty
+  ++ stdenv.lib.optional stdenv.isLinux alsaLib
+  ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual;
 
   propagatedBuildInputs = [ gstreamer ];
 
+  configureFlags = if stdenv.isDarwin then [ 
+    # Does not currently build on Darwin
+    "--disable-libvisual"
+    # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia
+    "--disable-cdparanoia"
+  ] else null;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   enableParallelBuilding = true;
 }
 

From f4873eff166b5610ea36ee196a2cc93a391cd613 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 21:53:06 -0400
Subject: [PATCH 0125/1143] gst-plugins-good 1.x: fix Darwin build

---
 .../libraries/gstreamer/good/default.nix       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index a06747ddc90c..51ad836b6449 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -3,9 +3,12 @@
 , libv4l, libdv, libavc1394, libiec61883
 , libvpx, speex, flac, taglib
 , cairo, gdk_pixbuf, aalib, libcaca
-, libsoup, pulseaudio
+, libsoup, pulseaudio, libintlOrEmpty
 }:
 
+let
+  inherit (stdenv.lib) optionals optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gst-plugins-good-1.4.5";
 
@@ -18,7 +21,7 @@ stdenv.mkDerivation rec {
       code, LGPL or LGPL-compatible for the supporting library).
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -31,9 +34,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gst-plugins-base orc bzip2
-    libv4l libdv libavc1394 libiec61883
-    libvpx speex flac taglib
+    libdv libvpx speex flac taglib
     cairo gdk_pixbuf aalib libcaca
-    libsoup pulseaudio
-  ];
+    libsoup
+  ]
+  ++ libintlOrEmpty
+  ++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ];
+
+  LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }

From 0115d512fe04aa25fa3ebb5542d0587358ed6edf Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 21:54:51 -0400
Subject: [PATCH 0126/1143] gst-plugins-bad 1.x: fix Darwin build

---
 .../libraries/gstreamer/bad/default.nix       | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 96a094ca9ccf..b4c962d9e54e 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -5,11 +5,14 @@
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls
-, mesa
+, mesa, libintlOrEmpty
 }:
 
 assert faacSupport -> faac != null;
 
+let
+  inherit (stdenv.lib) optional optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-1.4.5";
 
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
       a real live maintainer, or some actual wide use.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -39,7 +42,15 @@ stdenv.mkDerivation rec {
     faad2 libass libkate libmms
     libmodplug mpeg2dec mpg123
     openjpeg libopus librsvg
-    wildmidi fluidsynth libvdpau wayland
+    fluidsynth libvdpau
     libwebp xvidcore gnutls mesa
-  ] ++ stdenv.lib.optional faacSupport faac;
+  ]
+    ++ libintlOrEmpty
+    ++ optional faacSupport faac
+    ++ optional stdenv.isLinux wayland
+    # wildmidi requires apple's OpenAL
+    # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
+    ++ optional (!stdenv.isDarwin) wildmidi;
+
+  LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }

From a936dd00111ec2f3737c92de9da2b75f7045759e Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 21:55:19 -0400
Subject: [PATCH 0127/1143] gst-plugins-ugly 1.x: fix Darwin build

---
 pkgs/development/libraries/gstreamer/ugly/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 4e3d7eee78be..c13beb4d5f76 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, python
 , gst-plugins-base, orc
 , a52dec, libcdio, libdvdread
-, lame, libmad, libmpeg2, x264
+, lame, libmad, libmpeg2, x264, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       like. The code might be widely known to present patent problems.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -32,5 +32,7 @@ stdenv.mkDerivation rec {
     gst-plugins-base orc
     a52dec libcdio libdvdread
     lame libmad libmpeg2 x264
-  ];
+  ] ++ libintlOrEmpty;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 }

From a2616e0370b0b067a26584948f56764c348a2d8a Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 21:56:57 -0400
Subject: [PATCH 0128/1143] gnonlin, gst-editing-services: enable Darwin

---
 pkgs/development/libraries/gstreamer/ges/default.nix     | 2 +-
 pkgs/development/libraries/gstreamer/gnonlin/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index df7078a1365a..47b09e95e6ea 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     description = "Library for creation of audio/video non-linear editors";
     homepage    = "http://gstreamer.freedesktop.org";
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index 05113973a9d1..4b6e7957f5cd 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
       applications. It introduces the concept of a timeline.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 

From 4318768a101b01fa92d5b9f9b7f4249e99740f92 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 22:30:42 -0400
Subject: [PATCH 0129/1143] gstreamer 0.x: fix for Darwin

---
 .../gstreamer/legacy/gstreamer/darwin.patch        | 14 ++++++++++++++
 .../gstreamer/legacy/gstreamer/default.nix         |  5 +++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch

diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch b/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
new file mode 100644
index 000000000000..67dfc34434db
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
@@ -0,0 +1,14 @@
+diff --git a/gst/gstdatetime.c b/gst/gstdatetime.c
+index 60f709f..cdc7e75 100644
+--- a/gst/gstdatetime.c
++++ b/gst/gstdatetime.c
+@@ -21,8 +21,8 @@
+ #include "config.h"
+ #endif
+ 
+-#include "glib-compat-private.h"
+ #include "gst_private.h"
++#include "glib-compat-private.h"
+ #include "gstdatetime.h"
+ #include <glib.h>
+ #include <math.h>
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index b608f891533b..07b846f35b42 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i -e 's/^   /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in
+  ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    # Applying this patch manually to avoid a rebuild on Linux. Feel free to refactor later
+    # See https://trac.macports.org/ticket/40783 for explanation of patch
+    patch -p1 < ${./darwin.patch}
   '';
 
   configureFlags = ''

From 3001119d5326c6c4cea983546000b055c110bb75 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 23:10:45 -0400
Subject: [PATCH 0130/1143] gst-plugins-good 0.x: fix Darwin build

---
 .../gstreamer/legacy/gst-plugins-good/default.nix      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index d4db4fa8de5c..1db7e4dbd550 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
 , libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
-, glib, gstreamer, bzip2, libsoup
+, glib, gstreamer, bzip2, libsoup, libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
   minimalDeps ? false
@@ -23,11 +23,15 @@ stdenv.mkDerivation rec {
   configureFlags = "--enable-experimental --disable-oss";
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ]
+    [ pkgconfig glib gstreamer gst_plugins_base ]
+    ++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ]
+    ++ libintlOrEmpty
     ++ stdenv.lib.optionals (!minimalDeps)
       [ aalib libcaca cairo libdv flac libjpeg libpng speex
         taglib bzip2 libvpx gdk_pixbuf orc libsoup ];
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   enableParallelBuilding = true;
 
   meta = {
@@ -36,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "`Good' plug-ins for GStreamer";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     license = stdenv.lib.licenses.lgpl2Plus;
   };

From b2589bb0ba1308d1b664eac2046943142bcfd449 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 23:12:30 -0400
Subject: [PATCH 0131/1143] gst-plugins-ugly 0.x: fix Darwin build

---
 .../gstreamer/legacy/gst-plugins-ugly/default.nix         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index e4411fcefbbd..99ac5a5ec541 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
-, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }:
+, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-0.10.19";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ];
+    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ] ++ libintlOrEmpty;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 
   enableParallelBuilding = true;
 
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     license = stdenv.lib.licenses.lgpl2Plus;
   };

From 626a047b2d1c7375e40adf7a1ebc57737566e514 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 8 Apr 2015 23:13:42 -0400
Subject: [PATCH 0132/1143] gstreamermm: enable Darwin

---
 .../libraries/gstreamer/legacy/gstreamermm/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index 97a4638170f9..ea1c31ccab8e 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gtkmm.org/;
     license = stdenv.lib.licenses.lgpl2Plus;
     maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
 }

From f6428cf2e934826bf65283ab3124dcbca5ab7e9b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Apr 2015 18:25:25 -0500
Subject: [PATCH 0133/1143] remove kde-frameworks-5.7

---
 .../libraries/kde-frameworks-5.7/default.nix  | 203 -------
 .../kde-frameworks-5.7/dependencies.nix       | 500 ----------------
 .../kde-frameworks-5.7/dependencies.sh        |  22 -
 .../0001-extra-cmake-modules-paths.patch      |  74 ---
 .../kauth/kauth-policy-install.patch          |  13 -
 ...utils-pluginselector-follow-symlinks.patch |  13 -
 ...igwidgets-helpclient-follow-symlinks.patch |  13 -
 .../kdoctools-no-find-docbook-xml.patch       |  12 -
 .../kinit/kinit-libpath.patch                 |  30 -
 .../kpackage/0001-allow-external-paths.patch  |  25 -
 ...service-kbuildsycoca-follow-symlinks.patch |  13 -
 ...ce-kbuildsycoca-no-canonicalize-path.patch |  13 -
 .../0001-no-qcoreapplication.patch            |  48 --
 .../libraries/kde-frameworks-5.7/manifest.nix | 562 ------------------
 .../libraries/kde-frameworks-5.7/manifest.sh  |  15 -
 .../plasma-framework-external-paths.patch     |  13 -
 .../libraries/kde-frameworks-5.7/renames.nix  |  68 ---
 .../kde-frameworks-5.7/setup-hook.sh          |   1 -
 pkgs/top-level/all-packages.nix               |   5 +-
 19 files changed, 2 insertions(+), 1641 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix
 delete mode 100755 pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/manifest.nix
 delete mode 100755 pkgs/development/libraries/kde-frameworks-5.7/manifest.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/renames.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh

diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
deleted file mode 100644
index 30e8d5ffe1c3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix
+++ /dev/null
@@ -1,203 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
-
-with stdenv.lib; with autonix;
-
-let
-
-  mkDerivation = drv:
-    let inherit (builtins.parseDrvName drv.name) version; in
-    stdenv.mkDerivation
-      (drv // {
-        setupHook = ./setup-hook.sh;
-
-        enableParallelBuilding = drv.enableParallelBuilding or true;
-        cmakeFlags =
-          (drv.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta =
-          {
-            license = with stdenv.lib.licenses; [
-              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-            ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          } // (drv.meta or {});
-      });
-
-  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
-
-  scope =
-    # packages in this collection
-    (mapAttrs (dep: name: kf5."${name}") renames) //
-    # packages pinned to this version of Qt 5
-    {
-      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      Qt5 = qt5.base;
-      Qt5Core = qt5.base;
-      Qt5DBus = qt5.base;
-      Qt5Gui = qt5.base;
-      Qt5LinguistTools = qt5.tools;
-      Qt5Qml = [qt5.declarative qt5.graphicaleffects];
-      Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects];
-      Qt5Script = qt5.script;
-      Qt5Svg = qt5.svg;
-      Qt5WebkitWidgets = qt5.webkit;
-      Qt5Widgets = qt5.base;
-      Qt5X11Extras = qt5.x11extras;
-      Qt5XmlPatterns = qt5.xmlpatterns;
-      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
-    } //
-    # packages from the nixpkgs collection
-    (with pkgs;
-      {
-        Boost = boost155;
-        inherit cmake epoxy;
-        GIF = giflib;
-        GLIB2 = glib;
-        Gpgme = gpgme;
-        JPEG = libjpeg;
-        LibGcrypt = libgcrypt;
-        LibGit2 = libgit2;
-        LibIntl = gettext;
-        LibLZMA = lzma;
-        NetworkManager = networkmanager;
-        Perl = perl;
-        PythonInterp = python;
-        QImageBlitz = qimageblitz;
-        SharedMimeInfo = shared_mime_info;
-        ZLIB = zlib;
-      }
-    );
-
-  mirror = "mirror://kde";
-
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-      ];
-
-  postResolve = super:
-    super // {
-      extra-cmake-modules = {
-        inherit (super.extra-cmake-modules) name src;
-
-        propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
-        cmakeFlags = ["-DBUILD_TESTING=OFF"];
-        patches =
-          [
-            ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch
-          ];
-        meta =
-          let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in
-          {
-            license = with stdenv.lib.licenses; [ bsd2 ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          };
-      };
-
-      frameworkintegration = super.frameworkintegration // {
-        buildInputs = with pkgs.xlibs; super.frameworkintegration.buildInputs ++ [ libXcursor ];
-      };
-
-      kauth = super.kauth // {
-        buildInputs =
-          super.kauth.buildInputs
-          ++ [(pkgs.polkit_qt5.override { inherit qt5; })];
-        patches = [./kauth/kauth-policy-install.patch];
-      };
-
-      kcmutils = super.kcmutils // {
-        patches =
-          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
-      };
-
-      kconfigwidgets = super.kconfigwidgets // {
-        patches =
-          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
-      };
-
-      kdelibs4support = with pkgs; super.kdelibs4support // {
-        buildInputs =
-          super.kdelibs4support.buildInputs
-          ++ [networkmanager xlibs.libSM];
-        cmakeFlags =
-          (super.kdelibs4support.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-          ];
-      };
-
-      kdoctools = with pkgs; super.kdoctools // {
-        cmakeFlags =
-          (super.kdoctools.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-          ];
-        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
-      };
-
-      ki18n = with pkgs; super.ki18n // {
-        propagatedNativeBuildInputs =
-          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
-      };
-
-      kimageformats = with pkgs; super.kimageformats // {
-        NIX_CFLAGS_COMPILE =
-          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
-      };
-
-      kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
-
-      kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };
-
-      kservice = super.kservice // {
-        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
-        patches =
-          [
-            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
-            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
-          ];
-      };
-
-      ktexteditor = super.ktexteditor // {
-        patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
-      };
-
-    };
-
-  kf5 = generateCollection ./. {
-    inherit mirror mkDerivation preResolve postResolve renames scope;
-  };
-
-in
-
-  kf5 // { inherit mkDerivation qt5 scope; }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix
deleted file mode 100644
index c4a2977b8e55..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix
+++ /dev/null
@@ -1,500 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  attica = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  extra-cmake-modules = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Qt5QUIET" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  frameworkintegration = {
-    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kactivities = {
-    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapidox = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  karchive = {
-    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kauth = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbookmarks = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcodecs = {
-    buildInputs = [ "ECM" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcompletion = {
-    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfig = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfigwidgets = {
-    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcoreaddons = {
-    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kcrash = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdbusaddons = {
-    buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeclarative = {
-    buildInputs = [ "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kded = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs4support = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesignerplugin = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesu = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Pty" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebkit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" "Qt5Core" "Qt5Network" "Qt5WebKitWidgets" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdnssd = {
-    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" "Qt5DBus" "Qt5Network" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdoctools = {
-    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" "Qt5NO_MODULE" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kemoticons = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kglobalaccel = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kguiaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khtml = {
-    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ki18n = {
-    buildInputs = [ "ECM" "LibIntl" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiconthemes = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kidletime = {
-    buildInputs = [ "ECM" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "X11" "X11_XCB" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kimageformats = {
-    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio = {
-    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Qt5Xml" "Strigi" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemmodels = {
-    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemviews = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjobwidgets = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjs = {
-    buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjsembed = {
-    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmediaplayer = {
-    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Parts" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knewstuff = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifications = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpackage = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kparts = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kplotting = {
-    buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpty = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kross = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krunner = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Quick" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kservice = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktextwidgets = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kunitconversion = {
-    buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwallet = {
-    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwidgetsaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5UiTools" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwindowsystem = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5WinExtras" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlgui = {
-    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  networkmanager-qt = {
-    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-framework = {
-    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ];
-    nativeBuildInputs = [ "SH" "cmake" ];
-    propagatedBuildInputs = [ "KF5Package" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  solid = {
-    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5Xml" "UDev" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sonnet = {
-    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  threadweaver = {
-    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh
deleted file mode 100755
index 2b220244c596..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script rebuilds dependencies.nix.
-# You must run manifest.sh first to download the packages.
-
-# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
-# If you are working on the packages, this is probably what you want.
-
-# You can also pass the path to a source tree where you have built
-# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
-# probably what you want.
-
-manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch
deleted file mode 100644
index 340155256f28..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
deleted file mode 100644
index 47b8dfad1800..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index c63241b..2243f94 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
deleted file mode 100644
index 3bd946cbd842..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch
deleted file mode 100644
index 4e3a33efab32..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch
deleted file mode 100644
index a6ccb2085d32..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 3c3c913..f510620 100644
---- a/src/kdeinit/kinit.cpp
-+++ b/src/kdeinit/kinit.cpp
-@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
-+                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/plugins, so the kdeinit5
-+                  // shared libraries should be in /lib/plugins/../
-+                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../");
-+                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
-+                  Q_FOREACH (const QString &path, paths) {
-+                    l.setFileName(path + up + libpath);
-                     l.load();
-+                    if (l.isLoaded()) break;
-+                  }
-                 }
-             }
-             if (!l.isLoaded()) {
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch
deleted file mode 100644
index 440e979c0086..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 28 Jan 2015 07:15:30 -0600
-Subject: [PATCH] allow external paths
-
----
- src/kpackage/package.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
-index eb4a09b..f70f1a1 100644
---- a/src/kpackage/package.cpp
-+++ b/src/kpackage/package.cpp
-@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
--- 
-2.1.4
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch
deleted file mode 100644
index e9bc418544ab..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
-index 69b1427..9c37a49 100644
---- a/src/kbuildsycoca/kbuildsycoca.cpp
-+++ b/src/kbuildsycoca/kbuildsycoca.cpp
-@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
deleted file mode 100644
index 7e21ebfe86f2..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
-index 2eb1275..e39a36f 100644
---- a/src/kbuildsycoca/vfolder_menu.cpp
-+++ b/src/kbuildsycoca/vfolder_menu.cpp
-@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+        QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch
deleted file mode 100644
index c2e77a537c5a..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 15 Feb 2015 19:09:17 -0600
-Subject: [PATCH] no qcoreapplication
-
----
- src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
-index 3f02e8c..d1a865b 100644
---- a/src/syntax/data/katehighlightingindexer.cpp
-+++ b/src/syntax/data/katehighlightingindexer.cpp
-@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
- 
- int main(int argc, char *argv[])
- {
--    // get app instance
--    QCoreApplication app(argc, argv);
--    
-     // ensure enough arguments are passed
--    if (app.arguments().size() < 3)
-+    if (argc < 3)
-         return 1;
- 
-     // open schema
-     QXmlSchema schema;
--    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
-+    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
-         return 2;
- 
--    const QString hlFilenamesListing = app.arguments().value(3);
-+    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
-     if (hlFilenamesListing.isEmpty()) {
-         return 1;
-     }
-@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
-         return anyError;
-     
-     // create outfile, after all has worked!
--    QFile outFile(app.arguments().at(1));
-+    QFile outFile(QString::fromLocal8Bit(argv[1]));
-     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-         return 7;
- 
--- 
-2.1.4
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix
deleted file mode 100644
index e2d215889e09..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix
+++ /dev/null
@@ -1,562 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kplotting-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/qldfj7r4gfnwd9137m5x282kn9clghvc-kplotting-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kplotting-5.7.0.tar.xz";
-      sha256 = "0257ydhyq0f5r2yl0va4y8zcb7vxll1jdz6ykaskg413hm2qxkpi";
-      name = "kplotting-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktextwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/kpbcn842lgx6h7cj7rblc60h656qqv49-ktextwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ktextwidgets-5.7.0.tar.xz";
-      sha256 = "0yhhm9cgn2lbj2ca64szyy11xviaqj5kil5kwivwnndzvaap9ja5";
-      name = "ktextwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ki18n-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/x5y7xgpn24rw7ax1xm5m3z0kd1db3k5p-ki18n-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ki18n-5.7.0.tar.xz";
-      sha256 = "16vz9hrm1j5gl5k0mbx36rxxngxbfwwlg7sznplybcghdzf5xwpc";
-      name = "ki18n-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "attica-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/fa5fimm0kc5yymlj05hcljz4lnyx15xz-attica-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/attica-5.7.0.tar.xz";
-      sha256 = "1xxd3062bv65npc3kxpsaw3805sg12fq76wy3qa1mqqy3074hvwh";
-      name = "attica-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesignerplugin-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/0nd3wx3gkln1bdpa956b8yjcs7k9ia4j-kdesignerplugin-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdesignerplugin-5.7.0.tar.xz";
-      sha256 = "0y6yjm9zqi9plfbwqc7p8r0vsxj28drfymsdx4wvwqzfv8nby57q";
-      name = "kdesignerplugin-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kservice-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/claqclndc0kz33g5nkbpa3w38mh9jqqh-kservice-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kservice-5.7.0.tar.xz";
-      sha256 = "1aziycv2r0y02lcc3hv7kzzlk9sc3c5fmh02sgm4px2wknfd12ja";
-      name = "kservice-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbookmarks-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ww9xz56sdx2i3q8bipgf83gzdisihv0c-kbookmarks-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kbookmarks-5.7.0.tar.xz";
-      sha256 = "1vv3wirszsr5a2parbr6k4wkbp7lhcjqhbadr4fyhq62cvr7ya8l";
-      name = "kbookmarks-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kidletime-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/qiihgxjbhx39pc1p6g5w933ifzc3gdp8-kidletime-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kidletime-5.7.0.tar.xz";
-      sha256 = "15i9rj7fs6nc40axd19a8ba21wcbzvivwlsr49h27vfbhca4h5x3";
-      name = "kidletime-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpty-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ij41pg9l8j47f42yhycv8nqh7lf2zjv8-kpty-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kpty-5.7.0.tar.xz";
-      sha256 = "0sg11pzrgmdyqxbvd8rbcljmjcacnpnf6wwjqb5rj92fvrd30av0";
-      name = "kpty-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesu-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/yxxr5ldkg551dydqjwxds5fm0nsjszwp-kdesu-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdesu-5.7.0.tar.xz";
-      sha256 = "0bjvkzgkmzxk4wlpk5hcxykf2nidg1c5c65mlhabddg0bns67axd";
-      name = "kdesu-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcodecs-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/4dx78zbckkn5hyrjmch1wh5n3vkzz8lc-kcodecs-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcodecs-5.7.0.tar.xz";
-      sha256 = "0pnf435jdm8lifvq8gdy4195vq653ffqrqdw0qh36qn9242csqhj";
-      name = "kcodecs-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinit-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/laps2gv18vnzirpm4il51m1kw2p7hslq-kinit-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kinit-5.7.0.tar.xz";
-      sha256 = "1fzmizq877f124kal9vali5a910kv3fx6pwpza502h6rdhslpsx2";
-      name = "kinit-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwindowsystem-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/b4c3rpfikpk4bl9y87862h2fvfv22nvx-kwindowsystem-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwindowsystem-5.7.0.tar.xz";
-      sha256 = "1h3snqhlri98645nyc2p5jbz0s98yrppn3ipd7nyklnwk220prkk";
-      name = "kwindowsystem-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlgui-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/sb8f1fy08m738adnajy1dd0xz5ipmwkr-kxmlgui-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kxmlgui-5.7.0.tar.xz";
-      sha256 = "1zpwih2v8416r3pn4rklr6xzhcn1jf3zlj4sd75xbnx6y5fbm1q6";
-      name = "kxmlgui-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifyconfig-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/an7xgl36n79n038b9i9dg7r1ngg0vncg-knotifyconfig-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knotifyconfig-5.7.0.tar.xz";
-      sha256 = "0psv2k6p7d04s3icjw10hxi7676a9kphqcd2pzmcxg4wk50ikqns";
-      name = "knotifyconfig-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kunitconversion-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/161vcj6bf51i82rmpd9xws4h72xbcypg-kunitconversion-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kunitconversion-5.7.0.tar.xz";
-      sha256 = "1fhh2db23q0d6g9rqsbgv5wbzyzj72x9pjda5vqa549sx8yq04is";
-      name = "kunitconversion-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdbusaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/lq4kzjg64c30yrinbgmkp5w596bg2121-kdbusaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdbusaddons-5.7.0.tar.xz";
-      sha256 = "1bn5ayywnhak0933y11lzkw39rkrmrm9m73knvgb46l7x1cchr3v";
-      name = "kdbusaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "threadweaver-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/9gnqmwvy7pm5sjpfhqqk8grz1mjb2701-threadweaver-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/threadweaver-5.7.0.tar.xz";
-      sha256 = "1ab208awll2gnrs37p7k9nwp44sc30swibw75x9jh1w16nklpapa";
-      name = "threadweaver-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kparts-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/xjiy5yxbmd4g4l61qyrbdrakzxgsrhlb-kparts-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kparts-5.7.0.tar.xz";
-      sha256 = "0ws8mk1q0sd36b3ac39s4xyzhlbh897s0hkw9kyp8yk0779g09sg";
-      name = "kparts-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sonnet-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/zz72jdhabwv1wj8mr910lfl17w11ap3i-sonnet-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/sonnet-5.7.0.tar.xz";
-      sha256 = "11q0zfpcmvjs994cdcp5rg49lzibi7jaz0jb8h7s5kf27nc96w0r";
-      name = "sonnet-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebkit-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vyjpw6zsscf23xq0c4dgbldn3vizh4pj-kdewebkit-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdewebkit-5.7.0.tar.xz";
-      sha256 = "04zb2a6dj89inxppf081hzkzwlyxcsrb3j4x2y6jz8zfpsnnhkxz";
-      name = "kdewebkit-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kguiaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/1gns8ry1kiiww0lfs8m5yc8ki2sh550c-kguiaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kguiaddons-5.7.0.tar.xz";
-      sha256 = "0f63vn1f5wafzxhc50lr59qd31jav512nwh7y37jl95mrc5yjjrb";
-      name = "kguiaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-framework-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/mmwxm2jyi8lyir7g6ws8hjhzcmxkkb08-plasma-framework-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/plasma-framework-5.7.0.tar.xz";
-      sha256 = "0r5kks3a0b4cl599r2qlsigdr83psbgjw5xki480xs6caznmqd1m";
-      name = "plasma-framework-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdoctools-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/d1vx0maspgndbczfshwh3498qxwk9ca5-kdoctools-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdoctools-5.7.0.tar.xz";
-      sha256 = "01lshra3jjqklbvld004pnj4pic8yrrpgbsy1yxfdfsccnrdf9di";
-      name = "kdoctools-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjobwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/r9q0s6cpwbhjkgrji86gylmj4mfwvikl-kjobwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kjobwidgets-5.7.0.tar.xz";
-      sha256 = "033y6cmdc8gzckqmxmasmpirfzsg0ga58hf88crrp8y21a03hary";
-      name = "kjobwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcrash-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/12105y95jb4xyf4c1z8ya6d81k7z5bji-kcrash-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcrash-5.7.0.tar.xz";
-      sha256 = "0jq4rqicrvzmj8fra1zhk9b76b0x043z1ny5hf3ikyy9k4axay8z";
-      name = "kcrash-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemviews-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/2wrbbn9rr9xwqkiagiccpmr7v37c6icd-kitemviews-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kitemviews-5.7.0.tar.xz";
-      sha256 = "1ib6hlj7nv84all4j7p6k5ai5n4yslf2i2h2gwyiff2h55p2a686";
-      name = "kitemviews-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/fv1l1v4ld92shbih8cjlxyab272aygmq-kio-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kio-5.7.0.tar.xz";
-      sha256 = "0xf43ff41rgrqhici0mw2y2n4h97gkbgdngfngyzgm1vs3xq8wpl";
-      name = "kio-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/difsiryniivbnlh4j2jwssywv2ijb03s-kwidgetsaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwidgetsaddons-5.7.0.tar.xz";
-      sha256 = "19z5wr5dyq4kmry6iss85zpvjhh9a3pa6vmhbcag61sdid0nfsqx";
-      name = "kwidgetsaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapidox-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/d7f0aaamjvv67g9p5dhw98zwqg5sdl3q-kapidox-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kapidox-5.7.0.tar.xz";
-      sha256 = "1zv91a68lzh1rb12if7c67y0gy2004kh3jlcvfy270cd9rxmkywd";
-      name = "kapidox-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kimageformats-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/09c46cmhryzqnn32kxwfjblmf5fnm7pm-kimageformats-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kimageformats-5.7.0.tar.xz";
-      sha256 = "00gga2yhpdrc9y73zhs3r6vpqb5blc9r7by72i0cap5ac040a4la";
-      name = "kimageformats-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeclarative-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ylm05pqs3izryr45qqa37r82r76l1h3l-kdeclarative-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdeclarative-5.7.0.tar.xz";
-      sha256 = "13m1pf92508sk4rl54v2pwic99snj2r0sjvmxvzv11cfrddjkr5g";
-      name = "kdeclarative-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kemoticons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/msbryhpxvbp8165gyf4cp27f2fjrk09z-kemoticons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kemoticons-5.7.0.tar.xz";
-      sha256 = "1k5436xc0fv4xx66lzpy2kx7qgzbdv6n56xif1jl85x66gfvfvdv";
-      name = "kemoticons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcompletion-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/pnvb112ryqxy1q2yrrz72jak5lhm374p-kcompletion-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcompletion-5.7.0.tar.xz";
-      sha256 = "1d8q2b8rdk7dmmhnjnkg16dc6bgnq2ahss2n1z2l6fcm305zvyfh";
-      name = "kcompletion-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfig-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/cq1lbqzf4ihy8jnk2jab31wb3dljmpdz-kconfig-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kconfig-5.7.0.tar.xz";
-      sha256 = "0mvdz5vxzqb1vxiy7llgnyi1yyl5jmdyq35v1sf55gb84gyghrgh";
-      name = "kconfig-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpackage-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ph932zwlra3rsjxh37rx0i1pshk08icc-kpackage-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kpackage-5.7.0.tar.xz";
-      sha256 = "0w6ljqs2knm9jvy3hkyk0iiy295mc0dpifvxyqcq4fqj9yvkrxgq";
-      name = "kpackage-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifications-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/6ppkdiwvy2y3wwxrja117pinmc4lv92a-knotifications-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knotifications-5.7.0.tar.xz";
-      sha256 = "0z9bs21mn9i5jya0dh1sr0vvn362bz64nhbwnwkb5vgy0sl2n923";
-      name = "knotifications-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcoreaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/63phhh1pcqlsqiqs9399vqfz7c7yw6ry-kcoreaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcoreaddons-5.7.0.tar.xz";
-      sha256 = "00byxkbwm3gvlharmqvn94jw7l1c1yjv4naczqgqcppl97h0zqyb";
-      name = "kcoreaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemmodels-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/cgxjl2p9p0qmmn6vsb357pvn01zyblr2-kitemmodels-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kitemmodels-5.7.0.tar.xz";
-      sha256 = "0y3zis7rh40nrv135zb3lvl4ix4bqqvby6kcy3b1llxcmhvaglph";
-      name = "kitemmodels-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kded-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/icy79l7w5vqwmwmg21zji3y8sqpzwcq2-kded-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kded-5.7.0.tar.xz";
-      sha256 = "0146ldipacy43xypl5zshbf751bfi2mkaa5m8hcva4ygmps0xzp3";
-      name = "kded-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfigwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/lz8kkfgzz18myibj3wcijai5qs0jw03p-kconfigwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kconfigwidgets-5.7.0.tar.xz";
-      sha256 = "073rv7i04p21ifwfbhikib555067iivzybnrxw6mgb5hxgph8ggv";
-      name = "kconfigwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs4support-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/3p606b334sbng7a1ppc9wc9gjw4v0y59-kdelibs4support-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kdelibs4support-5.7.0.tar.xz";
-      sha256 = "1vl6s0bd0ykzbbnd6fq7vfxg7aly0k04wr15wlikkapgx3v0h9b5";
-      name = "kdelibs4support-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khtml-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vrdx48h2r0fvjc7h2xzsjihs57gnny38-khtml-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/khtml-5.7.0.tar.xz";
-      sha256 = "0flr8qz6nws5h52ghxrzxzmn9y85mlms4n0wzh1kski1sszv62i6";
-      name = "khtml-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjs-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/sipm1kyl3lwy2fw7lcjn2n2s8qpxhag7-kjs-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kjs-5.7.0.tar.xz";
-      sha256 = "1wjhl4j5y8q55bcgzlq3m0w1kafkivfgcdvi96f9rqyr7ij5ry9h";
-      name = "kjs-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krunner-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vid0xggxw5liig84p5jgwf3mafkyk7n5-krunner-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/krunner-5.7.0.tar.xz";
-      sha256 = "113bxzzvjw1xxkq54nizb4g4rvbbaj58zfwcz6x0pvz5jfz65b7c";
-      name = "krunner-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmediaplayer-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/629r99dj85wah0cqvpljy45n3zniqys3-kmediaplayer-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kmediaplayer-5.7.0.tar.xz";
-      sha256 = "1bdws01m37bbip4j897nwi49jakwl9j4hp3xxls15r2h5q4wylc3";
-      name = "kmediaplayer-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kross-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/8m4vp5riqrj4b1n2wvydvlz43902f01y-kross-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kross-5.7.0.tar.xz";
-      sha256 = "1larhjl2mi5v5a9a5m216idnyvxkbb9ln1czfvsg18nizai9b0bj";
-      name = "kross-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjsembed-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vcmsl5zz6lv1p92vw1k30wlzp0cr43f0-kjsembed-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kjsembed-5.7.0.tar.xz";
-      sha256 = "1717d4q4wf182s8rlf76wj7pgzmrh6j1na9myg2pqpa9564nmald";
-      name = "kjsembed-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "networkmanager-qt-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/rnixw65cmqlkkxmcn21rc73zwk4b0zg2-networkmanager-qt-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/networkmanager-qt-5.7.0.tar.xz";
-      sha256 = "1lx1vjsp25hfrg8pvpw3k17sxr9y57m4mgzikaxkh704z826npjk";
-      name = "networkmanager-qt-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktexteditor-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/m5spysm05hv2ncy392msym59jxd056qi-ktexteditor-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ktexteditor-5.7.0.tar.xz";
-      sha256 = "0ii2aw2kzvxqwlm3cjil8shkr1yfmfcwr3hvrvk99zv6mw0j8kq3";
-      name = "ktexteditor-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdnssd-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/pabbzdlfgyl58llh6m0l1j5w3r4anpv7-kdnssd-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdnssd-5.7.0.tar.xz";
-      sha256 = "120rclq82fnjz5z8q3rn9jbmql3fqpr64yspggl6ccv0f2v513dy";
-      name = "kdnssd-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "karchive-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/z31cgnvxh50m6m7xcpv087zmpdn1la8q-karchive-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/karchive-5.7.0.tar.xz";
-      sha256 = "0ppq4ml77bf9n9q216dcsmw9ipmqqaazbaaxxvqn5hmqx9j63mmq";
-      name = "karchive-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kauth-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/6axbcm8958m691k3jsk3ci41h97aymq3-kauth-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kauth-5.7.0.tar.xz";
-      sha256 = "1254rbagpcp3dpdfjcxr7b07n5dqc0iw93xgpafkhxzn0h687hg2";
-      name = "kauth-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwallet-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/7p63gkx0brvnwhzsg2laqnbrq7lgdggr-kwallet-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwallet-5.7.0.tar.xz";
-      sha256 = "19bmdc7hdvr6bxwrmlhnkclqn6dzlrdg7k870y6p4rhyrj3nvc1h";
-      name = "kwallet-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiconthemes-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/h02fsp21lh2dbd3yvpavqh1vgwc6m87v-kiconthemes-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kiconthemes-5.7.0.tar.xz";
-      sha256 = "111rdj347sf1g09zdnss4cq68ks71jxw0b22hnczqq9p60qcj1jg";
-      name = "kiconthemes-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "frameworkintegration-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/khjj7d173y5qlqqi2z6sc7zmkv5cx5lc-frameworkintegration-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/frameworkintegration-5.7.0.tar.xz";
-      sha256 = "0d0s03y99nk8cqnsz4w5v1d06bq5dl5395wgkcrchzcwqspk7z72";
-      name = "frameworkintegration-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "extra-cmake-modules-1.7.0.tar.xz" ".tar";
-    store = "/nix/store/ga7k0viqdz58drznxba2mjjq4qf0gnj1-extra-cmake-modules-1.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/extra-cmake-modules-1.7.0.tar.xz";
-      sha256 = "1lgx13y00b9mv2p10p7bbzx12aav65i4ggcnyaqmp7pv867y33f8";
-      name = "extra-cmake-modules-1.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "solid-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/rl9gv6hcsxalys9mnm00x34grsclnzh2-solid-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/solid-5.7.0.tar.xz";
-      sha256 = "0adzqbcwnqg0f2jbrsy4sqv0p94ikijm6id1yrd89nvn0iiiip14";
-      name = "solid-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcmutils-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/dql6c4ljy6jkr7zsksrq5wpmqhxsgz37-kcmutils-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcmutils-5.7.0.tar.xz";
-      sha256 = "1b0rzydyhbv7jk9amj45iryl4r2iy5k2zh8g7qwbwig8jywfhwqs";
-      name = "kcmutils-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knewstuff-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/jwckk8a1mpy4mp785mbssy0mkn3zc6b6-knewstuff-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knewstuff-5.7.0.tar.xz";
-      sha256 = "0wg3fg2kyq2j8n2qmahw30binm9pxaqvvydsxpcj97fl0wcaffgl";
-      name = "knewstuff-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kactivities-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/1s1bl23mrah31k3vqw40vfs6f79b0wnp-kactivities-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kactivities-5.7.0.tar.xz";
-      sha256 = "1d42i0a015qsr4d4rhr574xixfw1w0dgl4qag6slsj6fm5asny19";
-      name = "kactivities-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kglobalaccel-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/i6ja196cyzixsxbyg6bdivizs75y8pvb-kglobalaccel-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kglobalaccel-5.7.0.tar.xz";
-      sha256 = "0jlknk3g07x9y4vl4n82hy4msfaavqy51fpj1yffya8zbb59c29y";
-      name = "kglobalaccel-5.7.0.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh
deleted file mode 100755
index fef8b701d010..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../../.. -A autonix.manifest) \
-    http://download.kde.org/stable/frameworks/5.7/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch
deleted file mode 100644
index 9a22c0bdbcd5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
-index 07b3c90..84417e3 100644
---- a/src/plasma/package.cpp
-+++ b/src/plasma/package.cpp
-@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
-       servicePrefix("plasma-applet-"),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/renames.nix b/pkgs/development/libraries/kde-frameworks-5.7/renames.nix
deleted file mode 100644
index 58ade4e62ac0..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/renames.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "plasma-framework";
-"CTest" = "attica";
-"ECM" = "extra-cmake-modules";
-"KDED" = "kded";
-"KF5Activities" = "kactivities";
-"KF5Archive" = "karchive";
-"KF5Attica" = "attica";
-"KF5Auth" = "kauth";
-"KF5Bookmarks" = "kbookmarks";
-"KF5Codecs" = "kcodecs";
-"KF5Completion" = "kcompletion";
-"KF5Config" = "kconfig";
-"KF5ConfigWidgets" = "kconfigwidgets";
-"KF5CoreAddons" = "kcoreaddons";
-"KF5Crash" = "kcrash";
-"KF5DBusAddons" = "kdbusaddons";
-"KF5DNSSD" = "kdnssd";
-"KF5Declarative" = "kdeclarative";
-"KF5DesignerPlugin" = "kdesignerplugin";
-"KF5DocTools" = "kdoctools";
-"KF5Emoticons" = "kemoticons";
-"KF5FrameworkIntegration" = "frameworkintegration";
-"KF5GlobalAccel" = "kglobalaccel";
-"KF5GuiAddons" = "kguiaddons";
-"KF5I18n" = "ki18n";
-"KF5IconThemes" = "kiconthemes";
-"KF5IdleTime" = "kidletime";
-"KF5Init" = "kinit";
-"KF5ItemModels" = "kitemmodels";
-"KF5ItemViews" = "kitemviews";
-"KF5JS" = "kjs";
-"KF5JobWidgets" = "kjobwidgets";
-"KF5JsEmbed" = "kjsembed";
-"KF5KCMUtils" = "kcmutils";
-"KF5KDE4Support" = "kdelibs4support";
-"KF5KDELibs4Support" = "kdelibs4support";
-"KF5KHtml" = "khtml";
-"KF5KIO" = "kio";
-"KF5Kross" = "kross";
-"KF5MediaPlayer" = "kmediaplayer";
-"KF5NetworkManagerQt" = "networkmanager-qt";
-"KF5NewStuff" = "knewstuff";
-"KF5Notifications" = "knotifications";
-"KF5NotifyConfig" = "knotifyconfig";
-"KF5Package" = "kpackage";
-"KF5Parts" = "kparts";
-"KF5Plasma" = "plasma-framework";
-"KF5PlasmaQuick" = "plasma-framework";
-"KF5Plotting" = "kplotting";
-"KF5Pty" = "kpty";
-"KF5Runner" = "krunner";
-"KF5Service" = "kservice";
-"KF5Solid" = "solid";
-"KF5Sonnet" = "sonnet";
-"KF5Su" = "kdesu";
-"KF5TextEditor" = "ktexteditor";
-"KF5TextWidgets" = "ktextwidgets";
-"KF5ThreadWeaver" = "threadweaver";
-"KF5UnitConversion" = "kunitconversion";
-"KF5Wallet" = "kwallet";
-"KF5WebKit" = "kdewebkit";
-"KF5WidgetsAddons" = "kwidgetsaddons";
-"KF5WindowSystem" = "kwindowsystem";
-"KF5XmlGui" = "kxmlgui";
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36f..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4854a2d95cc..a7f15869cf36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6173,10 +6173,9 @@ let
     automake = automake111x;
   };
 
-  kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
   kf59 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.9 { });
   kf5_latest = kf59;
-  kf5_stable = kf57;
+  kf5_stable = kf59;
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
     openldap = openldap.override {
@@ -11036,7 +11035,7 @@ let
   };
 
   kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
-    kf5 = kf57;
+    kf5 = kf59;
     kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
   kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {

From 733e2fd903dea38288d1d30ee79465ffbba6fcae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Apr 2015 19:41:30 -0500
Subject: [PATCH 0134/1143] kde-apps-15.04: update to release

---
 .../kde-apps-15.04/dependencies.nix           |    8 +
 pkgs/applications/kde-apps-15.04/manifest.nix | 7858 +++--------------
 pkgs/applications/kde-apps-15.04/manifest.sh  |    9 +-
 3 files changed, 1141 insertions(+), 6734 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/dependencies.nix b/pkgs/applications/kde-apps-15.04/dependencies.nix
index 08ceda442d5b..a66843197f79 100644
--- a/pkgs/applications/kde-apps-15.04/dependencies.nix
+++ b/pkgs/applications/kde-apps-15.04/dependencies.nix
@@ -433,6 +433,14 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  kde-l10n-eo = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   kde-l10n-es = {
     buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
     nativeBuildInputs = [ "cmake" ];
diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix
index 9475b54c571d..e02efe4785d1 100644
--- a/pkgs/applications/kde-apps-15.04/manifest.nix
+++ b/pkgs/applications/kde-apps-15.04/manifest.nix
@@ -2,7635 +2,2037 @@
 { stdenv, fetchurl, mirror }:
 [
   {
-    name = stdenv.lib.nameFromURL "pairs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fsaycjsmkm1g92j3syc2a8nwdgfgs99g-pairs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/pairs-14.12.1.tar.xz";
-      sha256 = "13byliibd6fwa8bsgka8hc64jkprmgsnqh9sks36w7ic22f32qhx";
-      name = "pairs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccessible-15.04.0.tar.xz";
+      sha256 = "1q90ak7yxvvi5scxajb3d4nid2h7y7xfvdbqfd9a6w312r6lcvz8";
+      name = "kaccessible-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4ggxl3vnlngg1p6irixa42as7gyp3c8k-kgamma-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kuser-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4q0xn6h1mf6plwikl16v490hbcm1c3jf-kuser-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgamma-14.12.1.tar.xz";
-      sha256 = "1ad2c1l2lbc2pdybavnnj834ww82rbm91k0wjgz25xc3l3gkrg9i";
-      name = "kgamma-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kuser-15.04.0.tar.xz";
+      sha256 = "0fgjfd76iiyp98013x9la61qxnw454kcrl7vpikg37hqaqbzmgkh";
+      name = "kuser-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktux-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n68cvnv9h371cx7q5jqfqs2bdj1rqvyi-ktux-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kiriki-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p393dfammjyxak0wm3vblzcb8n7r0gnw-kiriki-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktux-14.12.1.tar.xz";
-      sha256 = "00x5jm26w1a214chdg1fkzki1z3h1dbw5qagal4lkcb98fi5sbcq";
-      name = "ktux-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kiriki-15.04.0.tar.xz";
+      sha256 = "0cg4iijyk96lwc48ifs5arip3y51wpb4fd4slgjbkhvg4fc859sa";
+      name = "kiriki-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "analitza-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n8ayxw5rwzlyc015ff1lzwnd2wa3ss4x-analitza-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/819bf5a5q4b4l0w9yi099capf9il9whz-kdepimlibs-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/analitza-14.12.1.tar.xz";
-      sha256 = "0jgmjda5n5935v37jgaichk5hif67mzlyvxqmr19wwmbiqfbazx8";
-      name = "analitza-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepimlibs-4.14.7.tar.xz";
+      sha256 = "1cmqyx0shm0ss48pjh9jm9g9bghkkl6fg5wgw4yhs4dgz1nj9qn1";
+      name = "kdepimlibs-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hz00x8miy3gw4gm2ylw0v90d8xnxxqml-kubrick-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "amor-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fmbdfhm9703yaq7x619d1s97il6prp7r-amor-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kubrick-14.12.1.tar.xz";
-      sha256 = "0c2ixhd3763pzy92z1ck638wggmq3h4jvnax5ralfhhvn9r2f5bj";
-      name = "kubrick-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/amor-15.04.0.tar.xz";
+      sha256 = "167j2qqkivrc2pid11nmnllw2m2amr8d9jvafy54j3i7mcbs788k";
+      name = "amor-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fv5vdi5m80l7hzkhkidyk5rd1srghl8x-ksirk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "knavalbattle-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/y9k66adhrcr1vxyzdvsx3zymkd7b4zaa-knavalbattle-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksirk-14.12.1.tar.xz";
-      sha256 = "1sdd117xhn9jclqiczh1cr8apy0akwncmbj82gwm7i1qx31i55fx";
-      name = "ksirk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/knavalbattle-15.04.0.tar.xz";
+      sha256 = "0hgwx63g1lrzrszajya4va2pidh2xm1qy7b8iw5xi1yz1khn6cvd";
+      name = "knavalbattle-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "katomic-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9wa79ygill8gb5n281cybrmj4zv627h9-katomic-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kiten-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zb4wpb0g4vbkrnwrk7d54l2dd88cz4b2-kiten-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/katomic-14.12.1.tar.xz";
-      sha256 = "1mjzm4v80cva7kfakjpjkd4sw4fdcyin5f2srck7fl0pnqdpnhqz";
-      name = "katomic-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kiten-15.04.0.tar.xz";
+      sha256 = "0lpvwm20zr7zq7p09igbacqhm7pv4bv7r701nijw5l9l4d58hq3y";
+      name = "kiten-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "jovie-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/w4b045lmp2viqrvifkm11n282l5khwbd-jovie-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4i8v7c1a44idrlpdqc6yk41w6r34259x-kwalletmanager-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/jovie-14.12.1.tar.xz";
-      sha256 = "1xkmybfgn6mbrp6lx8ri0dzmz1nsvg9cxlxan4n5bzwd3zjpycjd";
-      name = "jovie-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kwalletmanager-15.04.0.tar.xz";
+      sha256 = "0c5r6pfinb509a0mn2k31wksiya9b52pjm77bbaq60k1y39fsizc";
+      name = "kwalletmanager-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ky4vpsb0mm22raiq0r6jfxjsdr5c0vmv-kdeartwork-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kalzium-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6ivi9a4yilhb621zj0kz07yzbxa5wpxs-kalzium-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdeartwork-14.12.1.tar.xz";
-      sha256 = "0jrdyy787wnqx31nrgmf7amhy5ix9w7anfnqrdn4w8yydpvghhqw";
-      name = "kdeartwork-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kalzium-15.04.0.tar.xz";
+      sha256 = "1x3vdi9h5px84cm7k1nbrlakkb13xrc25d6yw22pnfsf3v4n66f5";
+      name = "kalzium-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kapman-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l5xwmjgcw6rbmmhy2m5z55hxcf9d12hv-kapman-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kfloppy-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7w91cal36byklnn0mzzclgjj5hpjzb2j-kfloppy-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kapman-14.12.1.tar.xz";
-      sha256 = "0bkpcjdcax6b3dp236ybaakpxz5b1vkrmmxpczvg6hf2cqwmlsv5";
-      name = "kapman-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kfloppy-15.04.0.tar.xz";
+      sha256 = "1nmcdzd7zhr4vfxb8lgl7dxfs01wy81kcag36s43hg7mfs5xb0k4";
+      name = "kfloppy-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/aixz1c1q6rnpqxm805xdirlqg47kw1kr-libkomparediff2-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kolf-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/76g0y1k03dlc50d5wfdgpb2grsy9p0qa-kolf-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkomparediff2-14.12.1.tar.xz";
-      sha256 = "0fjqsa83sqd7gcpm818yirnm077g6q616rh9676dzwv0cmc334zx";
-      name = "libkomparediff2-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kolf-15.04.0.tar.xz";
+      sha256 = "0nzqvq5y2mvh7x2lsq8prkyn99j8137hq5pyk5d9yhla4lpq2lr4";
+      name = "kolf-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kx7kv61rc3ddz7gmm5k5cwp9zh3k70nk-kde-wallpapers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "print-manager-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rmvqcnl3b77hxhcw7z22vx03pi1gk3gp-print-manager-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-wallpapers-14.12.1.tar.xz";
-      sha256 = "1q28rb8a4rw6v5wvwri3aslc8xwbn0324b07lnkvn58alpmdga8v";
-      name = "kde-wallpapers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/print-manager-15.04.0.tar.xz";
+      sha256 = "0yn8dhvpxv5dxdn41c6rzar66gvlqmgb3m9f0rdrxzqmw9xidzrg";
+      name = "print-manager-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ark-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c21hgh72czi1nqr3lci8lynvsd3qkvzh-ark-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "poxml-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kinljjyys5d6s5rfyhl6jzmh8z5bm92d-poxml-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ark-14.12.1.tar.xz";
-      sha256 = "1fimg9f4l373l31kr59fvvsavssvn3ljdrxrgnl6a66v1gwgjsdp";
-      name = "ark-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/poxml-15.04.0.tar.xz";
+      sha256 = "1cziw2ydylsx45s5hrg1bfwk8qv9jbvji3hyzwi6jqc72fpv9q5x";
+      name = "poxml-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b867ygwgvr9g8j54s3gya7c2wpr9gwf8-kdesdk-thumbnailers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kblocks-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jjkr9khw6fzh7hb4xss9jx2qwz05jral-kblocks-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-thumbnailers-14.12.1.tar.xz";
-      sha256 = "1p3abcnidk07jgr9qn03zfnhqci27683gz25wy271v6gl7b0wp6c";
-      name = "kdesdk-thumbnailers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kblocks-15.04.0.tar.xz";
+      sha256 = "0q32xvajnv7x3fmhax1bmc4f7530cijisn48hpnpkm4g4mn68qb0";
+      name = "kblocks-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hp6x10injwcygbd5zqvkkg2k85n62drw-kde-l10n-wa-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdf-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1wrgspd1n890ln1dffghslw86z2ynfz3-kdf-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-wa-14.12.1.tar.xz";
-      sha256 = "0aq5n0n0saqkllkwpf9a5scjpsv4bxzx89z2a048kh76i8h9zr5p";
-      name = "kde-l10n-wa-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdf-15.04.0.tar.xz";
+      sha256 = "18i9rbl210vj370n3irjy2ai4vrhg26ivfs37wl0zdvz4i81ncg7";
+      name = "kdf-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j8x84jy2x4fw72a2mj7zgzkbd2v430np-kde-l10n-it-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/krsghsp3cs3wmib774g36933smh1bldv-libkomparediff2-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-it-14.12.1.tar.xz";
-      sha256 = "13z9gmaziyvw112phzxc7893lz6wh8q92gb3fj3hmdmzj0vfqv4r";
-      name = "kde-l10n-it-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkomparediff2-15.04.0.tar.xz";
+      sha256 = "0i9vyc4bfqj22a1v48f3gyfkxl3pi9smsg0lql1bs0x8rsn7iznd";
+      name = "libkomparediff2-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yccjbanz6ijsf5rdd0n53cwygbv5jm4m-kde-l10n-km-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/659kk26hrkssc4xkyda1kwf41ri00csx-kde-dev-scripts-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-km-14.12.1.tar.xz";
-      sha256 = "0fdns3fifr4ypz5mi798xc18miwlb7lqz22f18gnrza22vnzwi09";
-      name = "kde-l10n-km-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-dev-scripts-15.04.0.tar.xz";
+      sha256 = "09r8wcln0m5akwjs939dbbz20kdqyxag91028vfmwzkw9r99604y";
+      name = "kde-dev-scripts-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mzfjypmyhmp3s7mnxk0mwf57s3l440c2-kde-l10n-pt-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepim-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/i8i89jlpkd3rmgyfbw8xbv67az4xkmjq-kdepim-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt-14.12.1.tar.xz";
-      sha256 = "13pzz23zf9nnl3a65nrpmwlpnkvr490vfs7yfvvr5w0nrqfwzhp6";
-      name = "kde-l10n-pt-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepim-4.14.7.tar.xz";
+      sha256 = "0hnmpjrcv0qcyn6hagpayza2bjkyd2v8y02rriifq9q99j7rwyj0";
+      name = "kdepim-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pjdp04f6m3ghqr23lyzxw7w0fgg5i6ll-kde-l10n-ru-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/xdmcjjrfxhwwigf32sbafbakczc9jfyd-kde-l10n-km-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ru-14.12.1.tar.xz";
-      sha256 = "1a5ygssdwkm9iqakl1w4pza70g1gwh7mzi6jzhbd4jsn740ykw0r";
-      name = "kde-l10n-ru-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-km-15.04.0.tar.xz";
+      sha256 = "1rv7pp35sgqppqs320pnlpqrjs0ljix9dd92fl2jrfpag15fi887";
+      name = "kde-l10n-km-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4j1r5xz2fslwv0di0dn9x8n49hrxizg4-kde-l10n-de-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0kz1fd8ha3m8r5kmqa9phr607ayry1ds-kde-l10n-es-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-de-14.12.1.tar.xz";
-      sha256 = "1iavp7xr2qv8i97sl1kpl9kasi21br91l3mdah382ayhaz5khnlb";
-      name = "kde-l10n-de-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-es-15.04.0.tar.xz";
+      sha256 = "0bjh1x3snldbmfvdamgid23cxv1sn3qwsdpy92h1djb49zbm51a0";
+      name = "kde-l10n-es-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dz1zi3jrw92cgci5zc8nia3xzq1zykdf-kde-l10n-uk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/brvc7zjfmcvif2y8n4zrmlva72v243md-kde-l10n-fi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-uk-14.12.1.tar.xz";
-      sha256 = "1228lpwggkwz9rwnmrmrw4f72hcbng40g1q1bfhjzw078s7j6nxr";
-      name = "kde-l10n-uk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fi-15.04.0.tar.xz";
+      sha256 = "0xh66i7wgapi6bhig712mlq8dkaml9dpzsj43dic58xw8bx4n6s4";
+      name = "kde-l10n-fi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ylf7xmqdh9yrz37yaq4f8nddap1gfanc-kde-l10n-ja-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h0hfrfigk06zqqgl0crsah3sqgh05syp-kde-l10n-nn-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ja-14.12.1.tar.xz";
-      sha256 = "191whr3i7qkqj2wjzjqgagb1vs391x9sp688w56ynjjmh58vrvq1";
-      name = "kde-l10n-ja-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nn-15.04.0.tar.xz";
+      sha256 = "1d2yvvl6rralsw77vg6hmbi84dswf116dpab7r5039nqgxnr8k81";
+      name = "kde-l10n-nn-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b6n06i5p82k6fq4p4rpl7bf0cyklazxb-kde-l10n-kk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/r2mbi7gj1a4f71cp6xgjxfkbmx1qzzrp-kde-l10n-it-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-kk-14.12.1.tar.xz";
-      sha256 = "01ivq7g550i9ik18xnibn7xl5mmm237wrsksjm0xni18s89wwz8b";
-      name = "kde-l10n-kk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-it-15.04.0.tar.xz";
+      sha256 = "1izidgcrzyvxka143cpnvrcnf2ddzp8384sjw6bvw32wsxi3v0mp";
+      name = "kde-l10n-it-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ysarksjh5lcm2yhbphrsqhyzmlp6qclr-kde-l10n-pl-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kxaxpwzy0bs1675by3qhhvj1hlvvig7a-kde-l10n-pt_BR-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pl-14.12.1.tar.xz";
-      sha256 = "0ni41lp6l4l3pa1xf6kkim2k5qcvapm2g65nh5hryiwx9dpgkimv";
-      name = "kde-l10n-pl-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt_BR-15.04.0.tar.xz";
+      sha256 = "0s6pc40ig83zjqbgqwhfkxzhp9wcrgac6hs5qhcxbs3awfmxi5hn";
+      name = "kde-l10n-pt_BR-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zpq7ayj7ihr1xw4ihcnckqvnagl28lk0-kde-l10n-sv-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mxmsybkjr2pr2xwfrxciwf6jjn2mp1vj-kde-l10n-kk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sv-14.12.1.tar.xz";
-      sha256 = "1r84629cv7c0lkfxii0q133cl710rgiqp5iylb3w32h7c1ji4x19";
-      name = "kde-l10n-sv-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-kk-15.04.0.tar.xz";
+      sha256 = "0czb1dmrdciim910bnazvsvi7lcvq27bj055f36w6y6l1zgvv8c3";
+      name = "kde-l10n-kk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/g5pcas9cz1yq6qz9883l2djfpb77li8a-kde-l10n-ca-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cj9bhf10x4rcvcia97l9qhjnzll979ls-kde-l10n-fr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca-14.12.1.tar.xz";
-      sha256 = "1xprgp7l1h7wkfjh6v3yya9xw3r60vhsyk3ly38vcwxy5b6fjigd";
-      name = "kde-l10n-ca-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fr-15.04.0.tar.xz";
+      sha256 = "0g94wik9q6c9w5x851k76qfk0fknv6ga497vwqka1h4yrmdmc1vl";
+      name = "kde-l10n-fr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/v6hb004qp3i0p4vp1yslnmz4clb66p8d-kde-l10n-da-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pyl52lwdrvfi3xpby5yyi93204jp3mjx-kde-l10n-he-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-da-14.12.1.tar.xz";
-      sha256 = "0b38wgm8f23l9ya9h67m6zm785fmqi7737xfphjmrjh2i13gxpbl";
-      name = "kde-l10n-da-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-he-15.04.0.tar.xz";
+      sha256 = "0hpnn6rci0bavl6hqs6v2ylz26sjyf5siwi2klfc3fsw6a04in43";
+      name = "kde-l10n-he-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/33f2k043b8gi64mr4wwrs6pwp5b9bq7h-kde-l10n-he-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rn2hih1b8fdbjahg1va76kn7cdjq05g9-kde-l10n-nb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-he-14.12.1.tar.xz";
-      sha256 = "0ynvsrczdraf55gaiwbv9nzwy548zkkbdh475frqfmalzh9b7jww";
-      name = "kde-l10n-he-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nb-15.04.0.tar.xz";
+      sha256 = "1mz3bcm92745zr6gn7q85p72l57sh19bcvvkpg40c63k34xpwpan";
+      name = "kde-l10n-nb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7hlk5vyd3pl9rdp22ybsj868w6s7sfz0-kde-l10n-lv-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8mvkdlcf0azzq8y5g1r2bbq15z92b8df-kde-l10n-fa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lv-14.12.1.tar.xz";
-      sha256 = "0x3rlallirrzgn8gfyssyvaj3zaji672n6hfacp2djpfzbfwqq6l";
-      name = "kde-l10n-lv-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fa-15.04.0.tar.xz";
+      sha256 = "1jmwjlbnlciy4k9szqi7vjwjpx94faixjg2mmg42cjfx5as9ws5x";
+      name = "kde-l10n-fa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b2v25j4hlsl7lqb77wk7sj1j5z9q7ldm-kde-l10n-hu-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/01ryc8gdgvjawaki8qaw5dpbyibvng63-kde-l10n-nl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hu-14.12.1.tar.xz";
-      sha256 = "061kyzz24f6bink3sm4p7q959977ril3m86lm8fa1ddnccw7ya46";
-      name = "kde-l10n-hu-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nl-15.04.0.tar.xz";
+      sha256 = "0a3c7fkw0cczdd5733c7klfsffpi5ah1i6alqknm15y534bsigzc";
+      name = "kde-l10n-nl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8a3pmbwm8k7g951yi5d3mv57y9vxn84z-kde-l10n-sr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g71kfpca8y88a0dmcrphban2vjvyr85m-kde-l10n-cs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sr-14.12.1.tar.xz";
-      sha256 = "16kcpilb4mp4cfgklc4dr6y389hlmzvwx8wp0y3i2w1r18nwd8m8";
-      name = "kde-l10n-sr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-cs-15.04.0.tar.xz";
+      sha256 = "1bl0w1qhk05xqniv1piik9gkj5nlcsb90bpxlvj0sd5ivcqxma53";
+      name = "kde-l10n-cs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l4fy9j1aix7fyisan5f2pa4273misph2-kde-l10n-is-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/afq8qa9cr7yli1djasn7xs9fg781b3dd-kde-l10n-ko-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-is-14.12.1.tar.xz";
-      sha256 = "14r5wrkr39cipx40hqqcx12cvv0vql829689yiy97ypcg4bqndma";
-      name = "kde-l10n-is-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ko-15.04.0.tar.xz";
+      sha256 = "181gzqhg6lc5z045l05zxz4zrc6hx36fmb91v62sfn2w70dc6jmd";
+      name = "kde-l10n-ko-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vk6fz8gixl7wv6w20h4inn984839lkkk-kde-l10n-mr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0whvwp9h1lrnqcf68qihaq5mlz73lm5b-kde-l10n-is-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-mr-14.12.1.tar.xz";
-      sha256 = "1nvaxd38c4f9kkhkrv4bb1aczi1iv1bp16kmm47s1y6kzb93zq9h";
-      name = "kde-l10n-mr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-is-15.04.0.tar.xz";
+      sha256 = "050fdym6mlj1m1m594jglhjcxwk8dx4hc6p1428ldc19m4b9q06c";
+      name = "kde-l10n-is-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0f4agkrcrb1cn6sdgdpj1bwln6f2ra5i-kde-l10n-gl-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fd72fjmwlgy7znmi7gz71qzd6fb9w5k7-kde-l10n-zh_CN-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-gl-14.12.1.tar.xz";
-      sha256 = "1xjh19c7rjd5k3v3c7g0ljz1kz5vv3zhji4rm84j30z12cks3nhh";
-      name = "kde-l10n-gl-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_CN-15.04.0.tar.xz";
+      sha256 = "0klkxznhfc5sfrlnz80fqf06lzk8g411cz2v0wpd2wjafk1pyf56";
+      name = "kde-l10n-zh_CN-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3nk8pxfypvnwbcszm33fn3j7f0kmgdji-kde-l10n-cs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g1nxxpcihfcb0kwk0bm53acvv8b0yfgh-kde-l10n-hi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-cs-14.12.1.tar.xz";
-      sha256 = "1qg9y5173374fpf6yk4v8mlsqdjzp8inirp08qx0lh33jd6rpddb";
-      name = "kde-l10n-cs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hi-15.04.0.tar.xz";
+      sha256 = "12qgzwiy0igz7i352dwk5ipsxhia0spi74ibk70xr7irr9axgidr";
+      name = "kde-l10n-hi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/i5vsmw062i49ki35qqyi0ix6x5fl4jvg-kde-l10n-en_GB-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/knj0hcr1dirq6rlhmw9dg1vl5ag52h6k-kde-l10n-ja-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-en_GB-14.12.1.tar.xz";
-      sha256 = "04b7amh2247ksr414m3x7bc4p22xm6kxncsax9ggapx613flb2zc";
-      name = "kde-l10n-en_GB-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ja-15.04.0.tar.xz";
+      sha256 = "1b8741fzhimf3bch6mc9hzdj040y50gf7fgd7ja5n5ipi0ma2drf";
+      name = "kde-l10n-ja-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p2jc4kci6k5kn1ihy9yv5inp4p4g01n9-kde-l10n-sk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lg8jgickpm35z3mfypigxhngq4r93c2h-kde-l10n-mr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sk-14.12.1.tar.xz";
-      sha256 = "0ic2y081699mv16hpkb3ivdvd4ph51wz3md5bz65pfz404gn7krf";
-      name = "kde-l10n-sk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-mr-15.04.0.tar.xz";
+      sha256 = "0v2mcmrpqz31yix7z7kcjcfpwpghsifnvwmdf1k1lif0a9mq5qq1";
+      name = "kde-l10n-mr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4kbdmqqmv1slh4z56rifg8sw0a9980m4-kde-l10n-ga-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yq2f4v4vfafxk8j1j1v97jbh39bklnag-kde-l10n-pl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ga-14.12.1.tar.xz";
-      sha256 = "0794p0dqa1nnkwwc2ipslzhaakcx3r4b6s03hf7m14r58wmvws28";
-      name = "kde-l10n-ga-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pl-15.04.0.tar.xz";
+      sha256 = "002nladxsgh9pamcaibsx7z7dcvcpbii9dyql8v3845wqjpgj8wk";
+      name = "kde-l10n-pl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hdyxfm2wnigh8wb3ay8y8v7psjrbijy7-kde-l10n-sl-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1i36fnf4018v9zc0awz7raqbv7269cay-kde-l10n-ug-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sl-14.12.1.tar.xz";
-      sha256 = "0nv2yrk99dkvb49ww6l6za0czy89p1nsilm56f4mdgbvrgzwk9zp";
-      name = "kde-l10n-sl-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ug-15.04.0.tar.xz";
+      sha256 = "094x3jnaby75q1j7q6c79y0sw63hsqqvw1qv0dzjgghky7qs584s";
+      name = "kde-l10n-ug-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ln3d7jpln9kl947fhgknbhg0rh6lnxds-kde-l10n-nb-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0svv0vq2dl7cm4wihdsp459m404jvimk-kde-l10n-pt-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nb-14.12.1.tar.xz";
-      sha256 = "0zj66ydg5pwlx3hwwdxz6i8m330wz0w2l2p4fvf4kjvy49cafrmd";
-      name = "kde-l10n-nb-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt-15.04.0.tar.xz";
+      sha256 = "177b455rgdrm021lvwlx6xgbnk3mh38l6080i2v52rzjm6bmchsy";
+      name = "kde-l10n-pt-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vw8kpmpiyrrqch5wb4164yv0jhkdkpkk-kde-l10n-ko-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h1i1cg1qhsxfiffalx4j4bar3nbwjpjr-kde-l10n-gl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ko-14.12.1.tar.xz";
-      sha256 = "08q0d0q2cm2bmdwwmyavzb07wlbnf5lpl071gjm146kzk0y1kmpg";
-      name = "kde-l10n-ko-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-gl-15.04.0.tar.xz";
+      sha256 = "0l27hrsd1pbk3w0lgz34zspmc6b4cs4y0p8i6y1sq51sd5p8qwd4";
+      name = "kde-l10n-gl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/87kmgghdnkmzvdbk611qmv2nav8m2f0p-kde-l10n-ro-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vsqwvz9r39nypa1hcxnn3figzyngpf6v-kde-l10n-ar-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ro-14.12.1.tar.xz";
-      sha256 = "0xprq9jw94i38aaq1drkv1qpgf3rf75745zlagzb430jr1a285lb";
-      name = "kde-l10n-ro-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ar-15.04.0.tar.xz";
+      sha256 = "04djbcdq3z4iysbvdiai2qd7wm9zx5fp400k3zsw36150g93ar7q";
+      name = "kde-l10n-ar-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/h8wfla9jsbhfjvjfnca6yjwpcc90nb5m-kde-l10n-ug-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ug-14.12.1.tar.xz";
-      sha256 = "1am6yr3qq4l2wgpphxhqfj8ydndvjxmc3cl4gz6zlkddaw4pv5kr";
-      name = "kde-l10n-ug-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-uk-15.04.0.tar.xz";
+      sha256 = "0n01ypzyqr8k30hakahpm68430bgr207yv5mbw2parzj3xbwzpbl";
+      name = "kde-l10n-uk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mja592hds8ajqsx96wb1zxph1n0pxqb0-kde-l10n-hr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fn45av76smcp2bj01aphy1m49na74jlz-kde-l10n-el-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hr-14.12.1.tar.xz";
-      sha256 = "0hjhzf77mckh9xqqxn54w47lsn3fwl2p4rfk22ijlliglrylpajv";
-      name = "kde-l10n-hr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-el-15.04.0.tar.xz";
+      sha256 = "0xxfqc1hzf3nbvja8c6aq6axpwx64ifqz32nxw4171valjj1faqv";
+      name = "kde-l10n-el-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9vay8airc00fg0d91lpp84l21akqxn27-kde-l10n-pa-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ijscp8qiliavdzda0k4vzgmfp30a065q-kde-l10n-eo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pa-14.12.1.tar.xz";
-      sha256 = "0sr6pygs0lk1ar2zn6966ngaf9vjfy207i1bgg6gr3559v5wkx8x";
-      name = "kde-l10n-pa-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eo-15.04.0.tar.xz";
+      sha256 = "12j9ggkgjbz229iwzpb19hjnl6zy2fvgkk68mh133ij3ik70i3bd";
+      name = "kde-l10n-eo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/sx4w67x5xq87ragvsysg4jwcpvrk674p-kde-l10n-id-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lm8d1vbsplg0r6z7ksir7z9nqjy7c0pj-kde-l10n-hr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-id-14.12.1.tar.xz";
-      sha256 = "018yvdp7l9qjaj7niyjas87dhna1xr0mikpdycw5dbwchpizlr53";
-      name = "kde-l10n-id-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hr-15.04.0.tar.xz";
+      sha256 = "0a0p1bspv849zdja86rw7lvg60h6rgl1g5hc4zajmq9sviknsy3k";
+      name = "kde-l10n-hr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l9cx18xxg7ly9nrsfi1lj9vxzg19h9sq-kde-l10n-bs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bm9c9n9jln8aadmjmqhjqh67vd2d3126-kde-l10n-lt-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bs-14.12.1.tar.xz";
-      sha256 = "0ybh9wyhym05rlc3s0kl9lh07y96nyl3p4lifj13lcqi975mgnp9";
-      name = "kde-l10n-bs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lt-15.04.0.tar.xz";
+      sha256 = "1l899bj9zw5db9wf6zhd6f9mpyynwagk907q8ws2xh6nlgrs9ydx";
+      name = "kde-l10n-lt-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/59bsq0cq07hc9apbfdmaa66jg5n8wlwg-kde-l10n-pt_BR-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bp31anbdx5f3blgdnhl205vrqw9jgfx0-kde-l10n-de-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt_BR-14.12.1.tar.xz";
-      sha256 = "1wbgns7pq0jxjffgvr6hgfg3san1k2c7wppsvn2cpjiph0v4azz9";
-      name = "kde-l10n-pt_BR-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-de-15.04.0.tar.xz";
+      sha256 = "1hd0pz2n0l1hs5dy8426n53w8d0a4mys7m7wyihs0a7akf76cy4s";
+      name = "kde-l10n-de-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9xiaf2c0lbxy65vrx6hdh884ky6h2s79-kde-l10n-bg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0a57w09ilczqr5dwwz8x8qvgqq4wbzpj-kde-l10n-ia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bg-14.12.1.tar.xz";
-      sha256 = "0m404hxz8dskbdsni021703vdn4lvwpf88hwrdrfnhcv06jazjiq";
-      name = "kde-l10n-bg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ia-15.04.0.tar.xz";
+      sha256 = "03wir3y5hz3fnkqqv97bcjv4rc768f953y8dqsc362a61zidw70l";
+      name = "kde-l10n-ia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/m8ahg0qxpv2hskl9dl7dgch10adxfia5-kde-l10n-nds-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/whhz3930c4q5n50v7n9xbzc6l4xblf3m-kde-l10n-tr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nds-14.12.1.tar.xz";
-      sha256 = "09r79l4ngcsnya6kqj5hj69xq00bf4ndxgkkplwiq137zqamqcfl";
-      name = "kde-l10n-nds-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-tr-15.04.0.tar.xz";
+      sha256 = "0h1997x62ycisnfnbawjfqfwblh6fhqqscns79f7d7krxhfyq7cr";
+      name = "kde-l10n-tr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mq5v891rzj692h61aak71g71iy963ayw-kde-l10n-zh_TW-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/22fjrzh19zha3ldbwkb7l64gnnq60i5h-kde-l10n-zh_TW-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_TW-14.12.1.tar.xz";
-      sha256 = "1azwmzg47pk4b23hpnpic3c8phnfz4iy3n6lv50sz98b9whkmf0s";
-      name = "kde-l10n-zh_TW-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_TW-15.04.0.tar.xz";
+      sha256 = "077pr968z7d8ldnv87vsfn9j13llx3qqw9gwc041c9av73vp4ccg";
+      name = "kde-l10n-zh_TW-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gprdva58d383n4ka677pdbpaz8l05w8i-kde-l10n-nn-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/16bpvmlzzw1cqjmrlvznd5751p1fsi18-kde-l10n-sr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nn-14.12.1.tar.xz";
-      sha256 = "1xp44glwk6nnnavw0lrl7ssl5miqfd7b093chfz35g2g92nyaa3g";
-      name = "kde-l10n-nn-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sr-15.04.0.tar.xz";
+      sha256 = "0yicfyaj6zckk0x9skw9q3qnh0f0vz6pmahgh1pd5ayl3sqs8dhk";
+      name = "kde-l10n-sr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jhv6zy04igavcq0dxsg9kk3vfh2063m9-kde-l10n-ia-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zv04hsibpg539rzkg1g7h2nfm946pz8h-kde-l10n-lv-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ia-14.12.1.tar.xz";
-      sha256 = "1kjjg4z4y0fh4kyzy9vzxlw47xkiirh207d7x0b94nksxzbqwg67";
-      name = "kde-l10n-ia-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lv-15.04.0.tar.xz";
+      sha256 = "1r2fahydjybk5zparmn4wjciys5kjsjps2mkhlk1x5k9aa0wimjg";
+      name = "kde-l10n-lv-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hy0v61dnnmpbj84a4imvgxqx3y0fd5qg-kde-l10n-tr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/04hs3q4dknk3b305zqibxskqnzm4f6r0-kde-l10n-hu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-tr-14.12.1.tar.xz";
-      sha256 = "1kdxps75gv2vlf98f958llkk161z2y908bg1fdq4rgdh1n3bylkh";
-      name = "kde-l10n-tr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hu-15.04.0.tar.xz";
+      sha256 = "010d3x7l1kadp3wj2v9jg0bjd9d3xw2q3ql7i21705s2zi2any7k";
+      name = "kde-l10n-hu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jmjbgfmqvcqd1sxdj0a7c73a9yqyzvpz-kde-l10n-ar-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5n06i2kass6wqnl6ql28s1ryrbj2399y-kde-l10n-nds-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ar-14.12.1.tar.xz";
-      sha256 = "121dblyh53fb3qirg7s9givqcn0xswdj2hrnqc8s2x2qas74v6a9";
-      name = "kde-l10n-ar-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nds-15.04.0.tar.xz";
+      sha256 = "0asgj3dkbjgcabl4qrz3i8dv0i0348dg6q0fk1sgicm4257y0a7l";
+      name = "kde-l10n-nds-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b9dqgb7nsfgyzhr4vw7fnl287spyjigg-kde-l10n-zh_CN-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ai53nz76fbqj1adsl4lb0byvvcn8bg2v-kde-l10n-sl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_CN-14.12.1.tar.xz";
-      sha256 = "0cyi0g55xln8smnlnhl0vfpi0jrihnfp3vrv6j2gz30zzfgkw9dp";
-      name = "kde-l10n-zh_CN-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sl-15.04.0.tar.xz";
+      sha256 = "0jm6b37irpp0jabad4jpqlvpw6ir5ygc0cs49138hb58kcjwi54v";
+      name = "kde-l10n-sl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0ycvh7sgyhjqffzq5ff5mjnv0y4f8pxy-kde-l10n-es-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p18pga44549fxqa0ksijc057dd5phbd6-kde-l10n-ro-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-es-14.12.1.tar.xz";
-      sha256 = "11i4xmsigmi9mqbc5x9l96vsrfh6709fbbfpqa6b28a5jif9anmr";
-      name = "kde-l10n-es-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ro-15.04.0.tar.xz";
+      sha256 = "1lmjz5578b1xbgdgrrlgv6vyiara2n5595kd0pg70s1ixvd986as";
+      name = "kde-l10n-ro-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9rbki0767k1hirpx7530lqcw74bfy2b1-kde-l10n-et-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6grb8a1wydjjdkn2vkv2sj1dd8wp4317-kde-l10n-ca-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-et-14.12.1.tar.xz";
-      sha256 = "0c8vhbi1bi29krh1sway8z0536cn507i1lp8jffb4mk953mm5y9n";
-      name = "kde-l10n-et-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca-15.04.0.tar.xz";
+      sha256 = "16n29ja4d83g001js682ijibblhfwfb8pww561bcvda84qbvhham";
+      name = "kde-l10n-ca-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pq8r37pcg05p9rc5prcy9r2f5mby7m0z-kde-l10n-fr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/izn9fzf1r2xyc57rj889rc6ziv9kjsiz-kde-l10n-ga-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fr-14.12.1.tar.xz";
-      sha256 = "1s2glywjbrr2q6ssmalblschrgny4rk3q3aws2ffrrlkanx0qyva";
-      name = "kde-l10n-fr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ga-15.04.0.tar.xz";
+      sha256 = "1n8prxqxxr8r76ry0jaszsn446y8vdk9b629ypj8s4d0byz336bq";
+      name = "kde-l10n-ga-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k0amn3lcd7xcssqh8fs46swa9jmksv9x-kde-l10n-fa-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pbaf3bd49drbap8bx58pgz85xllqvjhh-kde-l10n-pa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fa-14.12.1.tar.xz";
-      sha256 = "0pj3klcdlash8wgvz75nw009jz63rblv038yhrh1qsidjw4vsl85";
-      name = "kde-l10n-fa-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pa-15.04.0.tar.xz";
+      sha256 = "18rqlh26qc4h7jbsa6jq27k5d1d5kwdbrd1slm8fcw67r6iw72ai";
+      name = "kde-l10n-pa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/cqbsi6sr0mcl3pnzlk0w52disg2xgm1i-kde-l10n-lt-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/311y10ml4kxpkicjlja7k6wwm05yd75p-kde-l10n-et-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lt-14.12.1.tar.xz";
-      sha256 = "0k4m1ixlnmmgbznhgvbmfss0c1fynd492sylcvbsrnqcawq3fqdz";
-      name = "kde-l10n-lt-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-et-15.04.0.tar.xz";
+      sha256 = "0hkh800rx03w5gvy1lc7fn0s5kldihcaml5ryvx0g1qrj5k61b3r";
+      name = "kde-l10n-et-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8pw7v2ccr5vgl6ic7dnlm5xcqgkbvxyr-kde-l10n-nl-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lld8r34x3lclrb30p8w0qr6gw117h923-kde-l10n-wa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nl-14.12.1.tar.xz";
-      sha256 = "0m0hwib0v5j2bmgkgwjzhbhqnyk8gcm46969rr2qf51snrvynlax";
-      name = "kde-l10n-nl-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-wa-15.04.0.tar.xz";
+      sha256 = "0mivzilb2f3fp5wn2vc6c3z20n0l4cdpckyk43fdb4h9sys02xs3";
+      name = "kde-l10n-wa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vplfymrx36jk65b0xjmzh2g4l9ky7dfm-kde-l10n-eu-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ajsr93ly7db9pwjjbrkvr5r4n0cx03fx-kde-l10n-bs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-eu-14.12.1.tar.xz";
-      sha256 = "0wcax8gnnk6rwpfl6ph8z5i013rmh08pr159nxpakdsvbcn5ma5v";
-      name = "kde-l10n-eu-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bs-15.04.0.tar.xz";
+      sha256 = "0zw2q22lm73k04c3nb0596xd3hknfhc7gq9i4n7kj55sblv0mqzz";
+      name = "kde-l10n-bs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/45bg2qd1nyjnnqi4yzpkkwcimlnr5fs5-kde-l10n-da-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca@valencia-14.12.1.tar.xz";
-      sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq";
-      name = "kde-l10n-ca_valencia-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-da-15.04.0.tar.xz";
+      sha256 = "1v07bazlq6420zkfy6m3jvwcyy2snz93967209204jnxkzf3ssk6";
+      name = "kde-l10n-da-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p9a3lyi934i4pc5p8433firhkcs0ybn3-kde-l10n-el-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ack1f3vdjkjbzpdsai22ki3lncc5v6s9-kde-l10n-id-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-el-14.12.1.tar.xz";
-      sha256 = "022kr5cvlz8hxj3s74my680ghp23lj8amykzgr5z9i996q2hs6ps";
-      name = "kde-l10n-el-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-id-15.04.0.tar.xz";
+      sha256 = "10mr2d24akz5la2bz88y827dcv061sqrbi9awbiirgd2wqisnn8z";
+      name = "kde-l10n-id-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9f3cb3yksriwphrnkmn1knrq0108ka4p-kde-l10n-fi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gcnmv26q44ya6jb2xwhm4kvp8aqr059l-kde-l10n-sk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fi-14.12.1.tar.xz";
-      sha256 = "1sxs5z3dkx7hb8l7ilrhzvl2ip02fsb24iqgh0gadqwdfj46gwjn";
-      name = "kde-l10n-fi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sk-15.04.0.tar.xz";
+      sha256 = "13v871ahfj3bwaj0ha6fm6gpn7x9qw9m5dz89mfg3h5vskqv7akl";
+      name = "kde-l10n-sk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pfswxr29nz9qylmb7n83cnap95khz248-kde-l10n-hi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/v7ln63jsr0v32l86rqyg6fpinzpjpns0-kde-l10n-bg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hi-14.12.1.tar.xz";
-      sha256 = "0a5ilahwh6wpxg4mb3wqg079qfvcxg7zqblwyx6mdwh4d2ly5y1f";
-      name = "kde-l10n-hi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bg-15.04.0.tar.xz";
+      sha256 = "1p4y9rbxwwnghslwjk1m32a26h6pnssyj73ns1az3saqyfb85gkw";
+      name = "kde-l10n-bg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "granatier-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ychwcs2gn4mgmhza315nmf2z35c0ibb7-granatier-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/granatier-14.12.1.tar.xz";
-      sha256 = "0lifihkssp0g30kv3iigbpr9ghdwwykmzfiv4qwsxaxadil9qqlm";
-      name = "granatier-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca@valencia-15.04.0.tar.xz";
+      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
+      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kamera-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c1n1s1hbj8q4smgxnd4kka9qidh0rvvw-kamera-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rkbbjy12la1p7l7vm5xk4hwy72f4piys-kde-l10n-eu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kamera-14.12.1.tar.xz";
-      sha256 = "1avmsy622rnyyvsx9zwspqx9g4mb5wzc74mvcjrivi3c3mcz2ng6";
-      name = "kamera-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eu-15.04.0.tar.xz";
+      sha256 = "129k6m59x8f63f393jxx61s67f9gmaab9ilaqy2978d64l3z0bpv";
+      name = "kde-l10n-eu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/bl5csvnm20xxaqz5p7d3ymnkbd0df1p1-kfloppy-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fzwxz4747hfpjisg7n5kc77gb92dm3c8-kde-l10n-en_GB-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kfloppy-14.12.1.tar.xz";
-      sha256 = "1ky8n0zk07d3cnap8f3zw5qck2kw4l0dql0fnbk3s58r982af2fd";
-      name = "kfloppy-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-en_GB-15.04.0.tar.xz";
+      sha256 = "16c255j3klss711iqk41k1kcf5nn0lwg0qr74c1abvgrnpsm261h";
+      name = "kde-l10n-en_GB-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/v157pqk6clf9yn21cdbvxxvh0sn892rd-kdepimlibs-4.14.4.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/49fv8h0b5lzf4cm5qc6baj9sk9k29pnz-kde-l10n-sv-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepimlibs-4.14.4.tar.xz";
-      sha256 = "04c53ms91r8bpxgn305zzvagi30jli7217kvgdy4z4il6wnvns8r";
-      name = "kdepimlibs-4.14.4.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sv-15.04.0.tar.xz";
+      sha256 = "17z9yvw9mrjb7h3qa4zc18f5z2n6b0gr4y76s7jfnh8kpjgm1sgr";
+      name = "kde-l10n-sv-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7amx4gdg85lw28amb0v3nd92hk71lphs-libkipi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/30j0lkfk4p7pwv4nyknvm1wbd93cfji7-kde-l10n-ru-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkipi-14.12.1.tar.xz";
-      sha256 = "01bpjh40p5cwli018sgyn6jgis1l83icikabcw6vxkp8vsn3q6yg";
-      name = "libkipi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ru-15.04.0.tar.xz";
+      sha256 = "18l7wnfr1indy8im131lxd45da9x49ii1iavi8g1lzmqq0av097z";
+      name = "kde-l10n-ru-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khangman-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jyx0msd02v7iikj7czv3y8ckw79rahpa-khangman-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kcalc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4qsl43z86wq82bpspki2y4gfn8iy6xag-kcalc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/khangman-14.12.1.tar.xz";
-      sha256 = "1574cdbq5lyq4hl84xwia5z15az4zzh6zvasxvaa5bz94cjkpyns";
-      name = "khangman-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcalc-15.04.0.tar.xz";
+      sha256 = "0rkvxbz9s5wqa054bf1xg3rza95plvnakydlny04iw5w8i33i5yc";
+      name = "kcalc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "konsole-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0wy6dhhq6gn6h58vi324yiqa2f5ni5py-konsole-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkexiv2-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dnl3qi3ldzmf1yl7m8yzlgxyzvj6bm4k-libkexiv2-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/konsole-14.12.1.tar.xz";
-      sha256 = "0i7mccspglppz0sx2zqfn0861h6ibxkwrcscivqk7yxpq44nb58j";
-      name = "konsole-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkexiv2-15.04.0.tar.xz";
+      sha256 = "0zv8yjgwfdvkl2ss2gyv6bqbc3qgnz3hryhcjdyfa56kys6xz7n3";
+      name = "libkexiv2-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "killbots-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yg7gb0aidvcxh4i1z0ja8nvs23vhdf22-killbots-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kigo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yvj9sxfh55nvnlvcz4b12iqqgnd3p33y-kigo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/killbots-14.12.1.tar.xz";
-      sha256 = "0i006gjysfbf9wn0qgbv47fvx8z4v49ikcaqg9y83pl72shnsa1j";
-      name = "killbots-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kigo-15.04.0.tar.xz";
+      sha256 = "00ggvrs3mm5f2q6zkdsxbrhw8vgb0h4p4dk3v0agf3q4bqr86akr";
+      name = "kigo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s16w00cgm430r315d2v2a041hivc5a1q-kturtle-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kopete-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9yn7mj3csimgx1r4q6bp9gknh5bqnw49-kopete-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kturtle-14.12.1.tar.xz";
-      sha256 = "0sn74w413xx5y3kh0fqf7f47pklz4v22nnv6x11kpkcyx1xmghh9";
-      name = "kturtle-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kopete-15.04.0.tar.xz";
+      sha256 = "01wl7n535j9l21zbzjhix33rhr0i4rg2bb25zxwk6sc2ahbsqcp7";
+      name = "kopete-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j2qlvd878dlxkaps9v61dw9k1n6nmh4p-kajongg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qpc0c00mhc367aivilvkp329a4g6iqj4-kaccounts-integration-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kajongg-14.12.1.tar.xz";
-      sha256 = "0690jlsnj3s2l51nmx3an75q0m6xv0rssdmshrmbxgp2cqx5b455";
-      name = "kajongg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccounts-integration-15.04.0.tar.xz";
+      sha256 = "1g2rn256wfl78ajxircaikq3hpj5nxfnk0294wz10srmg5a4hgji";
+      name = "kaccounts-integration-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bomber-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8v0k2n5pkvv6wg3q957zqclasmsw2a7c-bomber-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdeedu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/wyk34ah7lc3vvrcq4ldik6brm2jk9fiv-libkdeedu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/bomber-14.12.1.tar.xz";
-      sha256 = "0g4cb3jwva9saddf9m2j4k3y1gybh2bv8dxzfb1xqy5cv20qlrfc";
-      name = "bomber-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdeedu-15.04.0.tar.xz";
+      sha256 = "140ri9whmvxjlj2i0bdpyr07zwspyl5d1bh91vm8hv2zdgmxh1rl";
+      name = "libkdeedu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kruler-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c61iqdbq71kb6wvnzfq7436hni8anrrn-kruler-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "superkaramba-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1ck2s3vi0dksdlis3cghy8advap8y5a3-superkaramba-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kruler-14.12.1.tar.xz";
-      sha256 = "0rag54kg5jzgj32fnf4xmawb0hnk52rhjf7i2y5f3156x3iraxxx";
-      name = "kruler-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/superkaramba-15.04.0.tar.xz";
+      sha256 = "05j93sa39m78vlxdy4haqj5913dyi6kab5sspi8ky0why17zmaav";
+      name = "superkaramba-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmag-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/r2c1gika9sw2m5i1mmj3b47n7g19715k-kmag-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "klines-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1zsl1wawlhzgyr53hfrn5dzqwii51ib8-klines-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmag-14.12.1.tar.xz";
-      sha256 = "1wlz3n3z9qcsqvs7rz3a76bh6rkrq0g9p797axcsfp7wzjfilj5c";
-      name = "kmag-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/klines-15.04.0.tar.xz";
+      sha256 = "0c0saaybxjshwap5rydc0606xkwmzl696r41fhkvr26c077p09p4";
+      name = "klines-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rqrykz2vvj59w1563dgcjpi8fmkwdnm5-kwalletmanager-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "cervisia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qmkqp9sgai9djwishibis5qckhl9dnrf-cervisia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kwalletmanager-14.12.1.tar.xz";
-      sha256 = "16pd2iym8v9xxdmazn2i7vq61c9m805h9a7awy8wha8bfdinazvi";
-      name = "kwalletmanager-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/cervisia-15.04.0.tar.xz";
+      sha256 = "097hayf2k2fv3d90jnhlh4iq4qvk3v0qg7ywchgipzsz0w6nayki";
+      name = "cervisia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "krfb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/x147kkpbjm9mmdbapxs040cvb8fci9ab-krfb-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ark-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nms2hq3a33k03lmhh8y7swiggglcysxv-ark-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/krfb-14.12.1.tar.xz";
-      sha256 = "15kxapi1mwjpbj995k8rxla0h1wwvhd406pbwkpak3a9szljsv72";
-      name = "krfb-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ark-15.04.0.tar.xz";
+      sha256 = "09jcz7x5rjazz8xvxy3kx32v21ig736m5gxyxhl48inxaypxxd21";
+      name = "ark-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ar6s1pn0lfgs1iw6q5akr0l5dcrd1x2a-libkcddb-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "palapeli-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zsh3ssjxmxggzf54kw9f73kzpy7y3n9d-palapeli-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkcddb-14.12.1.tar.xz";
-      sha256 = "1vb8rmb1j0nh2dh8ch19v1qpdxhc4c0am7k11lld45kamg3az0gd";
-      name = "libkcddb-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/palapeli-15.04.0.tar.xz";
+      sha256 = "1iql188gysjnhym1mj9h2cizydgd97pal37zkxljc9qhqb58wq3d";
+      name = "palapeli-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klettres-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dbf3r79p85w5v6jihmqndcb631kqpb7m-klettres-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9qg39s2sb7r8sdy37hm185jn7dsv24q1-ksnakeduel-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klettres-14.12.1.tar.xz";
-      sha256 = "1bj5s3js6v3641s2kgrl6a5bgr25g9lgbvsfzqrp0pil2nx1g6h1";
-      name = "klettres-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksnakeduel-15.04.0.tar.xz";
+      sha256 = "1i32mrc50isz0q0gzfkd0fz8in2hhc8d61q55dprq3ps28lgd77n";
+      name = "ksnakeduel-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klines-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xwj5di67f0swj1w0c2235vrbany8ffgn-klines-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kollision-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qxc07ckfn60wcyb8cs75dy2d8gbj211z-kollision-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klines-14.12.1.tar.xz";
-      sha256 = "1hxjqpc1z47dj1ryp116hdzkla4h1awnlmyzq7yjhki2viw32n3f";
-      name = "klines-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kollision-15.04.0.tar.xz";
+      sha256 = "0ch3h3g0hgm52l13v6wdrvacabwkvzx537bhfib05prb9604vkn8";
+      name = "kollision-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/aj1drn165rirvr5wjmqfnzsfknnb32gj-ksystemlog-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kamera-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6l8pgg55qph99rmprrgz56vvv621zbjk-kamera-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksystemlog-14.12.1.tar.xz";
-      sha256 = "15a92f873vybp3m9icjshbqs8nl6xm4cl9ca3cghmdlcqrn7f92x";
-      name = "ksystemlog-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kamera-15.04.0.tar.xz";
+      sha256 = "1mjpbcslba9wnxrvm4xg6kfy11msn7kvxln98ak55gvpfh7zhm5r";
+      name = "kamera-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klickety-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y8p216blw2zrld7mj5c1ji9nwqhrbqsf-klickety-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "klickety-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/iwlkabdklb3v1md6vdsjw8x09vv0kzzv-klickety-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klickety-14.12.1.tar.xz";
-      sha256 = "071y9khz57mrw12dvwxhs03jn56j06hw38hcf8d4r4wksbwr3j87";
-      name = "klickety-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/klickety-15.04.0.tar.xz";
+      sha256 = "0l8vk4gkfjs71xfzw9lg18g9xg4yf4l9jy1f9plikw9gfm7br90p";
+      name = "klickety-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5c1isv8y9s4k7153i5y41jdps6zsp8gl-lokalize-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kolourpaint-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h5x9pzbiq62jgwfln5gx6agzcfyz2j3s-kolourpaint-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/lokalize-14.12.1.tar.xz";
-      sha256 = "1ala2pfqh0a0kqxiyfpp11rcn805g6gcn0m9qjbmdqhl9wviij9h";
-      name = "lokalize-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kolourpaint-15.04.0.tar.xz";
+      sha256 = "00vyblqgp7hqigid6xgj31b8jkqb8jlsvnbd2ci4zg7s778l10sz";
+      name = "kolourpaint-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/d315k9787k4c5ww7zp0341cybnwwsy2j-kdegraphics-thumbnailers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zdqama1r97132n4ks422yzr4zhh6fjmq-kde-base-artwork-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-thumbnailers-14.12.1.tar.xz";
-      sha256 = "198m7iw621azbcp4abv3izq5p29yz9s2apr6ivxpp1iqzpz2x70g";
-      name = "kdegraphics-thumbnailers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-base-artwork-15.04.0.tar.xz";
+      sha256 = "1r3w4ab9vls7wyzy6g7ashnnixxid894ghqc5yzhpn4x999y65lp";
+      name = "kde-base-artwork-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6v8hm7rgdvfkvakv1jfq3g7jk3zq7x3z-kde-base-artwork-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "gwenview-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3wkajcx7p2wdzldbjb94brqlfqhdn54k-gwenview-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-base-artwork-14.12.1.tar.xz";
-      sha256 = "0zd298ii8a3lnfh6lxgw6nmf91kx3days1nqk5arilkbrf7b4952";
-      name = "kde-base-artwork-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/gwenview-15.04.0.tar.xz";
+      sha256 = "0h8ndywh8w9wx0zisl1b9681d7zqx2d3ki40zxdgk4clyl34aijb";
+      name = "gwenview-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xaibvsd6g0xnwpnayb0jxhah9hmb3xin-artikulate-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lgapni2v7qsl3wsi8wx0vwcav9almhs8-ktp-desktop-applets-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/artikulate-14.12.1.tar.xz";
-      sha256 = "021hyprapc6fjhls55yn69sndm13krfriwj1vmq5mvqxzr0aid2k";
-      name = "artikulate-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-desktop-applets-15.04.0.tar.xz";
+      sha256 = "1byv8dk864vwl4s5c18xjh3ckdzr9d7gq1mjrlaslxang7fr97cx";
+      name = "ktp-desktop-applets-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s6j8nymsygqkh4vfgkgqwcg6xigda53d-kaccessible-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lqdl7ks619gxdhnaa9q0axni4pz3h5v5-kdesdk-kioslaves-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kaccessible-14.12.1.tar.xz";
-      sha256 = "0gp49jxkscdqd35xqmzhr17smiwyxgx8xbr7hkvbm10dzn9kx6x7";
-      name = "kaccessible-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-kioslaves-15.04.0.tar.xz";
+      sha256 = "116xj9i3iwzbz41n3bka6xg0yq88iwzw066dy5dbs3yxbpmky19g";
+      name = "kdesdk-kioslaves-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "konquest-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wxk5v878fibdxxd9m9f6phyc99a56psc-konquest-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dymdah33hpq9qn07qcz402ijmwc67bvd-kdenetwork-strigi-analyzers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/konquest-14.12.1.tar.xz";
-      sha256 = "006an4bpfsnzcpm086xjyryd1xlzw0yz2knbzkvsdf3jr9kpmnrr";
-      name = "konquest-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenetwork-strigi-analyzers-15.04.0.tar.xz";
+      sha256 = "1zsa3ky6plfksm8k8hgd93d0awrsi5gqz3qbqfbzj3a2qic7nim6";
+      name = "kdenetwork-strigi-analyzers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p3yhp4gg9pfbmnlb6jqk6xhaz2yllx9w-superkaramba-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmix-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ql4a0i42ij33kd9y7qg4ng1a0p5j2sqs-kmix-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/superkaramba-14.12.1.tar.xz";
-      sha256 = "10dlnn4knlvkz38c98613x9px85a8dhlfwpp4231r3v5va03xszj";
-      name = "superkaramba-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmix-15.04.0.tar.xz";
+      sha256 = "0yj0byy98243c83bw938i1x8yxgbib8vr2s831hpmqi8h3v7xvyg";
+      name = "kmix-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ga54jhkjav5i83vmir8j6l51d3gv1cs1-kdesdk-kioslaves-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktuberling-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7cp8mnviqns6ij94xxz3mpizdc1avln9-ktuberling-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-kioslaves-14.12.1.tar.xz";
-      sha256 = "06f8xxzldsqmch9acmfd95lr48rm94d6qll62bj5zi0bs5qjygbw";
-      name = "kdesdk-kioslaves-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktuberling-15.04.0.tar.xz";
+      sha256 = "1kqz1g0r3icgx3brd8qlln29mxcx9b54kvl8wdar04r8ckk0m733";
+      name = "ktuberling-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "cantor-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xhdgix591fkzqdzw0pch0vv8wk2kkhz5-cantor-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kturtle-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0a3rrj74sfwhqwjql88gqzw8qbmf8llr-kturtle-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/cantor-14.12.1.tar.xz";
-      sha256 = "100yscp21w7amqmwzh4zsk7kmyn5pf3swlkwipz857wi3wajkm75";
-      name = "cantor-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kturtle-15.04.0.tar.xz";
+      sha256 = "00r3lzqa0sazccy28kmackqgqwcyqsl3mzjs7vpg4i76f0agfx4h";
+      name = "kturtle-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pvk5701kz79m2bn13n45ffwy0zjng838-kdegraphics-mobipocket-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gszm27h7rghsvkvhyf15xnp5bgjj18in-kde-dev-utils-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-mobipocket-14.12.1.tar.xz";
-      sha256 = "0qa0bpfvgbq3x3wlgi1cp3v8xn1wayyjrc07ffdr63w1gfi10mg1";
-      name = "kdegraphics-mobipocket-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-dev-utils-15.04.0.tar.xz";
+      sha256 = "1vvrrb4c94apc67fg3gpzgfmhylx6m7xfyq0y5kjxk8l91fl2bdi";
+      name = "kde-dev-utils-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yd2zzjmb762dkjbkhjxdsnbg38k53f65-kde-runtime-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktux-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cd126p5pizh2ha1jadg82csdzazlln49-ktux-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-runtime-14.12.1.tar.xz";
-      sha256 = "0cy2dhxw2cvbgqrknb3iy97rip2dcd7nrq3pj649mpq9a3r3cg17";
-      name = "kde-runtime-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktux-15.04.0.tar.xz";
+      sha256 = "1j5h65vdigym6ldz7fpn2kidxphfl02l4afg0jmj55wrym1vvc0r";
+      name = "ktux-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hxk0628k5s042wcxwd1v7vy951bsjqxp-kiriki-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/xbdr5s1xf4f58lpshppamii1j5rl5ll8-mplayerthumbs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kiriki-14.12.1.tar.xz";
-      sha256 = "00j95hcyrnw2li2abkwqsd0dp8ph4wlqzy0d3gzfnkal19j2x2m2";
-      name = "kiriki-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/mplayerthumbs-15.04.0.tar.xz";
+      sha256 = "12d60nkmfp16pgrfh5brl80n1y7crmdzk5k3ad313l4ani99z45r";
+      name = "mplayerthumbs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6a5bi2hpxmry12zq6qkwk2hzlv5h7qkz-kwordquiz-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kblackbox-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/72rhcbzax6ahi3myznpi1fkh0x9cq6ay-kblackbox-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kwordquiz-14.12.1.tar.xz";
-      sha256 = "1c03ab89lnnin81lvq3mbcw2d10k3rjlk2fpplcbbnsryq35bivi";
-      name = "kwordquiz-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kblackbox-15.04.0.tar.xz";
+      sha256 = "1w55nzadmkgspngxwazm6nfdf3s72rw4l0absx1jhinln7mif8w8";
+      name = "kblackbox-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ykssldwmik1x7njph3rmzh9d14n7f0mi-kate-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktouch-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0p1m96gmy2rw5pyy029j4257b32ziyvx-ktouch-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kate-14.12.1.tar.xz";
-      sha256 = "0c3diy846drf5nihvhzhpsp8pl2kviyn6ian61myy2147smkany5";
-      name = "kate-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktouch-15.04.0.tar.xz";
+      sha256 = "16gd6rghz1caw88yh32728kcxj79688g4hw3dkmgkayb5wcwnwl0";
+      name = "ktouch-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "parley-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3k84f0vl6l7l65hmbbdlfp2zg348kcmi-parley-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "dragon-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ha0s2dfbqb6gjgwq5451gbcgq6h3q16r-dragon-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/parley-14.12.1.tar.xz";
-      sha256 = "0awzpa9bl1j9gzy3596dhpsg3pqbmmdh87n52z7cjyk8sw0ikk19";
-      name = "parley-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/dragon-15.04.0.tar.xz";
+      sha256 = "0rzyra1xqjyrnx7926dql2fw9avy7rwx9x86v894xppcjqsyr3jx";
+      name = "dragon-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/clfp83sn2pg1jr82j79szwkx0aysl9a3-libkdegames-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "katomic-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dzv478dhlwj11gpfd0k7npmyw8z09yfw-katomic-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdegames-14.12.1.tar.xz";
-      sha256 = "0af15lbsjc7w5p3s3nxsb08cvyg7dncjmpw7z1vhgqykzmwpyp56";
-      name = "libkdegames-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/katomic-15.04.0.tar.xz";
+      sha256 = "0vbcv973ppijip8l1y2kkj93rjxbcj3xw6pypw50w3pg168s1ylv";
+      name = "katomic-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ghjddljclnsn3z0rflrrxanbkzxn46m5-libkcompactdisc-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmousetool-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8ws0s6acsrrq7x0lvy61vy4sqhndbakm-kmousetool-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkcompactdisc-14.12.1.tar.xz";
-      sha256 = "10zpv05wmqs1lrby95d5bgvwiqcmkd3ndrdsr6cpayg2lw9nq86d";
-      name = "libkcompactdisc-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmousetool-15.04.0.tar.xz";
+      sha256 = "005y7jp52f4x9193dxql8wwmimbylkazl671di2gfvrmcrh164n6";
+      name = "kmousetool-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k78l2m24w71dbczia8bnwi3fhpqghj6b-kmplot-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "rocs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/palrbcvrwp2vxf67myadgcvr5wl8v3pq-rocs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmplot-14.12.1.tar.xz";
-      sha256 = "0p0iv3m2648vyr1imzwdfs73rc2q39nl8r7w31z5dhm65rq2zi27";
-      name = "kmplot-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/rocs-15.04.0.tar.xz";
+      sha256 = "03ibi17331vcjzfc38agalbybn7k06favm0sgcyg68qribpcwmg1";
+      name = "rocs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kuser-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/lpdpdbbbgfyib95cq1m1db5fdym6wjxz-kuser-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/b7716r5kxhznfdlp9cwp3vf2vhsv1r1c-kde-wallpapers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kuser-14.12.1.tar.xz";
-      sha256 = "1zgik2i9z0n58m3fm8g0kgjm9aqa6v1f3331r8nrjir9vd9vr8g7";
-      name = "kuser-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-wallpapers-15.04.0.tar.xz";
+      sha256 = "0ckvbsdim0485h4f9sz1z0qgbb61n8l7ncwr80zm7vpnx46xzavm";
+      name = "kde-wallpapers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p1lzq3dbil7klabykd2995j65qwqfldd-kspaceduel-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdiamond-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p1f9xs4wkbdi9cmry7wc5686dxy2fvsg-kdiamond-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kspaceduel-14.12.1.tar.xz";
-      sha256 = "1zihp0nc6gs4xymyykldjw22zrxm8qznjaya4z1fw07hwndijvia";
-      name = "kspaceduel-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdiamond-15.04.0.tar.xz";
+      sha256 = "01ri6nj217dmg2xgm4ra4gdsabk28c8bkw6z69x5smbczjshdcr4";
+      name = "kdiamond-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/agnpfa5vjjfq79j3x2nf3nfwvvxjl28i-gwenview-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkipi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jckns8avmk0k34k62f77bdrl9cbf01nr-libkipi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/gwenview-14.12.1.tar.xz";
-      sha256 = "04g3qkz1g27ph6ha1zrbqpr827vhx9n2nigr0dy95a61qw1m0jww";
-      name = "gwenview-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkipi-15.04.0.tar.xz";
+      sha256 = "0c90y8f70k83pxxfx6mk6ar6zw7lf2l7mib526x8s7j534ya57ad";
+      name = "libkipi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wfnbykydc5zl9d678mpw7hpc1nscynmg-oxygen-icons-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdewebdev-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/wlx7pxcwlq5f0w2hrlms5gfxfixzfzbc-kdewebdev-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/oxygen-icons-14.12.1.tar.xz";
-      sha256 = "1z27id29s98h20dg27wr28w2qpb25ii1xsrgjk6r33nhj2y39jmg";
-      name = "oxygen-icons-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdewebdev-15.04.0.tar.xz";
+      sha256 = "17gizsgvw5ihibsf8z2rmczzkqp1gp5jbyvvsairgzv1izryi6ah";
+      name = "kdewebdev-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kppp-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/q4fxwbxh1rl3icjzhcyij7wwbchc0xzn-kppp-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3vyd044k6qmjnxc7sfig6q90g2dr58lf-kaccounts-providers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kppp-14.12.1.tar.xz";
-      sha256 = "0lvcanlskjgra2wn3k1j5jx9vy5k0g381ycg79fazkczsr8is5wf";
-      name = "kppp-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccounts-providers-15.04.0.tar.xz";
+      sha256 = "1b5cp6winxa9slqaq6mrf4y4py1d7ps55088gs35qcwrzyna04l7";
+      name = "kaccounts-providers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9ny33z3srhnwz8p9fd7i6klmm9y9j08k-kmouth-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "marble-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7kh58mg7dnd0yr6nksbfki20rncdqm1w-marble-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmouth-14.12.1.tar.xz";
-      sha256 = "0a3fhlgy8z84n83v59safl71v29px9783dndlqgh1dk8lmki7dmd";
-      name = "kmouth-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/marble-15.04.0.tar.xz";
+      sha256 = "0d6i7wwf220790ld5qgd30gph9y71a75ybjjfg81k13a4jg0ndk4";
+      name = "marble-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kig-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/iwj5hwmm9p278b7yi510fh38710w96rr-kig-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rrdyv611nn7kbnkr1fnvn6xkd01k8zwb-libkcompactdisc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kig-14.12.1.tar.xz";
-      sha256 = "0qs89kpms9ch2r9xj4scvjscn7b7bh5k1nxaln1z654mgp1rl4f8";
-      name = "kig-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkcompactdisc-15.04.0.tar.xz";
+      sha256 = "0nisrgpcgf4r83q7p82b8xfpzq96qjk8362i6dalsb0jcakia4c2";
+      name = "libkcompactdisc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/z8w5hn03zzpbpg7mjdmykylcbvhcd2ac-libkexiv2-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/fjrkx2vwb6m4kfl01sa4r23wbvmsmh05-kdepim-runtime-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkexiv2-14.12.1.tar.xz";
-      sha256 = "0qpfccasra3ffq5iz7dpxpzcyk13ywjdaz32n1wfsylfv158w9sg";
-      name = "libkexiv2-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepim-runtime-4.14.7.tar.xz";
+      sha256 = "0ywg703sqidxif853gfmqriymkkp9xzkfxd863p1sw35n1zhfkam";
+      name = "kdepim-runtime-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcron-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ixgf55ccq4gyyazhnbrrrg1qhpgh048s-kcron-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/akq8y3wjkvbzwyzwxyd1vkmqygmc78p4-oxygen-icons-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcron-14.12.1.tar.xz";
-      sha256 = "0czcxajsdx7xal9cvy9cd4drhvaivx68mhymj5k3n90cka7qda2x";
-      name = "kcron-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/oxygen-icons-15.04.0.tar.xz";
+      sha256 = "1ysy82war9n1dm5nwj69aasz9abp2zf5dmw92gv8brzyrn8svn9d";
+      name = "oxygen-icons-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vjc105v5nsibh4pfvrvsjck78f2645lx-ksnapshot-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kpat-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/af38swaxzd4yavh6iaxq3ha8xn3q9gmf-kpat-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksnapshot-14.12.1.tar.xz";
-      sha256 = "02g48b3i7xglrgp1nxvpbsrq7kqg81s4mf6k9rhfn312n45g1arg";
-      name = "ksnapshot-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kpat-15.04.0.tar.xz";
+      sha256 = "076jrjrs97353pw39gbanjf5s8l4cj8g2zapngyc1kwm6q0jry5w";
+      name = "kpat-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "marble-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/543lrxwg6zz77yz58ihn3dvf9rhy3xzg-marble-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "juk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bbvywnmrg713gdmzxkndkcyjs7jmdazj-juk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/marble-14.12.1.tar.xz";
-      sha256 = "13plghz8d5a8gdkq3nr7m0bvp2p0smqnj987bmsi1cldvliwiijl";
-      name = "marble-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/juk-15.04.0.tar.xz";
+      sha256 = "160n9wpx0krf1nlpa3hbj0b1yblgq68mw3c9is2j41k0p2b7divi";
+      name = "juk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kpat-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2ssmxyy2vhlipyrh6cs5qgms20cicmhy-kpat-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kspaceduel-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zx8jk8s9mrfga1467a42hfdz0w144p66-kspaceduel-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kpat-14.12.1.tar.xz";
-      sha256 = "02bh34553r7k0vf7sb5nsr6zgmh1xfgyjfyfc22yvknpmz2zz8wb";
-      name = "kpat-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kspaceduel-15.04.0.tar.xz";
+      sha256 = "0drb3628l47qp35h8vyz66ma6ph5v9sg2k9dp0fghrhwp1x983fv";
+      name = "kspaceduel-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "poxml-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n8504ljfha2rq1r0lrpz0gyyh59rpjln-poxml-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "picmi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rrqb0hx0kb96y9x2j65vbyq12pk4m875-picmi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/poxml-14.12.1.tar.xz";
-      sha256 = "1r0iqqszmqmjnkq41xv87sc601fm8s94ga9pn37alni7f7qddfrs";
-      name = "poxml-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/picmi-15.04.0.tar.xz";
+      sha256 = "0abas2qx83a35dghrr5gbsvgc0lg0vk0br18nizi82sbiawls24w";
+      name = "picmi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/m7ia6872rxwbpx88zidqanf1wqni1az6-umbrello-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "artikulate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/a4vr2g2m7hr6svmbdkg89na3zvsh4fg5-artikulate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/umbrello-14.12.1.tar.xz";
-      sha256 = "0kr60kdfg2pl049n4rkksfs6160jijxdwymx60gj44h8w2dxrx6c";
-      name = "umbrello-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/artikulate-15.04.0.tar.xz";
+      sha256 = "1ghffybaq2p9jx7cppbji8jk0dbblw3mh3czfzfms92ahy9xzcbz";
+      name = "artikulate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "krdc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qlj342akja4fh4yp2fib4v4bm3kn2bmg-krdc-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeartwork-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3yyj9dcqj7b2zjrz5w7j20h0pv10gnid-kdeartwork-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/krdc-14.12.1.tar.xz";
-      sha256 = "0jqq60spxb64m9y37q2wd7w1z3h0c0hcjvd6wi694v0zhblg5622";
-      name = "krdc-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdeartwork-15.04.0.tar.xz";
+      sha256 = "0kwscj036gjvai5knw1jpxjacllza4y8wnlv24lp19f2s61jqq24";
+      name = "kdeartwork-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/39r333hqffzycjszw3wbash4p8cs4vrc-ktimer-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksquares-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ayr2hry1z8z3v8q8a4iamck9bsxy1pdw-ksquares-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktimer-14.12.1.tar.xz";
-      sha256 = "1p4y1kx3w6rqwjnhpjx17246w8gp7l8q2212x7khs8karnfyvxh2";
-      name = "ktimer-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksquares-15.04.0.tar.xz";
+      sha256 = "15a605pc7jfsrsj1jj3lqy42z1bnw4pppx0hv51xlhiza00s2kww";
+      name = "ksquares-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p9al8bnc7cy61ccnbmw5vzbvg36rq3yl-kremotecontrol-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4kb7k1cfzksinnw0d08nginvli44rwx8-zeroconf-ioslave-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kremotecontrol-14.12.1.tar.xz";
-      sha256 = "0rvf73bj6l7cgbjcpn2bgy00zpdw4sj5zcchgl42xldl75zzr6mc";
-      name = "kremotecontrol-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/zeroconf-ioslave-15.04.0.tar.xz";
+      sha256 = "0fqqx0ji1v0cz87qb0kig9kkfdigmdfmz5qw1y2kx25mb0rp1g2i";
+      name = "zeroconf-ioslave-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qsdvwqqp7pwbh2vdi5p3w56snysf94f8-kde-dev-utils-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "svgpart-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n8v8kbzq9vsghk0nc47rl49zqfz1w182-svgpart-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-utils-14.12.1.tar.xz";
-      sha256 = "1wpiarm8h4y5yjrdrxkmndps06h08vql70n63aai8crdvgwixdqy";
-      name = "kde-dev-utils-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/svgpart-15.04.0.tar.xz";
+      sha256 = "0985jjy2mghs57sy53mkas5p9ya0makrkklq99s04rgl93f2akj1";
+      name = "svgpart-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6ic12j8bm99jckl82p347717mrhl5v6r-knavalbattle-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "bovo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/sigbrnva6hymkgnjd48aw65s7vrysi2g-bovo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/knavalbattle-14.12.1.tar.xz";
-      sha256 = "1jd4b2kmlknh1xz055xysasfs90810m8sg4iwyzqv2j5kj8i4x4l";
-      name = "knavalbattle-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/bovo-15.04.0.tar.xz";
+      sha256 = "0iffvb4m9bszpxh8s8yrpyzawyflwcbkajib5h1lw8xsgi6vcqhc";
+      name = "bovo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libksane-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/72jv9b0id1ql2pbz8vdcm77n7s7br3vk-libksane-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kig-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lv7d5hvgs42razrzhd3g60i1gpzb8w06-kig-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libksane-14.12.1.tar.xz";
-      sha256 = "0a4hp2d0h26nkggmkiswywlw0aj5wkk8c6s9wy2h7m7qcmyq4gk0";
-      name = "libksane-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kig-15.04.0.tar.xz";
+      sha256 = "1v9p9f9dk3f2bfbwic1vf8ky5ziac4vx0vh8wxshzbjjb89kxkq6";
+      name = "kig-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j4y0bpk9zir6270cmxmfxn10bphgbdw8-libkdcraw-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8g1l1dd5cccy6ncaywfhpf1x2633dk37-ffmpegthumbs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdcraw-14.12.1.tar.xz";
-      sha256 = "0svalln7g862d6f5k76vdggqc1h1x9gagm6v56yzr9dypz81y40m";
-      name = "libkdcraw-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ffmpegthumbs-15.04.0.tar.xz";
+      sha256 = "0j0x8b0gcwyzx307rvhrx4k4g530lgyl5rzvdpkjqpga2qjg8q96";
+      name = "ffmpegthumbs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "blinken-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xl2fn6zcfr99ir7l10y8dd79ns4msgyp-blinken-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "parley-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/piznlrz9g0kvy1262p87db03830mx6by-parley-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/blinken-14.12.1.tar.xz";
-      sha256 = "1fvgq57qhx305qxmhzm628p283dyk9nnp33q5vgcxxfw726mi5pq";
-      name = "blinken-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/parley-15.04.0.tar.xz";
+      sha256 = "1f6nmnjz84cm8yk53whjm7k471y2vj106m7q230xj1g56mb5adrc";
+      name = "parley-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "step-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1v6hadh7m1i58hc62c6z2qs2ycsi02rw-step-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "lskat-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6bdihbmhk9vdr9mzj52alqhvav2x1lc5-lskat-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/step-14.12.1.tar.xz";
-      sha256 = "15wlgig9b932ck1hwdld0q8nh74rh820wj4nc6ifys83wv43jnzh";
-      name = "step-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/lskat-15.04.0.tar.xz";
+      sha256 = "12mnvbisbaiychdgk6fb464lwvpjlkrwdz5101sdrw466c16a2a2";
+      name = "lskat-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0invqcgsx7scwmihagccpgdfq3aa52w8-kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kgpg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fys5hj4c13arjjqrh4kn8vyk92zrgz25-kgpg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-strigi-analyzer-14.12.1.tar.xz";
-      sha256 = "03lajpwia7fmlnr9l0g44knwghz8b2i70i659nkvypw6qd89cccr";
-      name = "kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kgpg-15.04.0.tar.xz";
+      sha256 = "1n37jh3zl4zb3dnb9lvjpni7gl6sb9s1jwmvf4jvqmqnlqny1b4f";
+      name = "kgpg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rjsmd2babmjdbwvr5n5gv1f9wcag4iln-kde-baseapps-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kruler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/2c9221fqxkz6ajx8g2l7xnhcfj8iivki-kruler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-baseapps-14.12.1.tar.xz";
-      sha256 = "0l31842mmriirkcqsdmj7s31yjwr5im8di7z7dfjgjqy0j1q1jzc";
-      name = "kde-baseapps-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kruler-15.04.0.tar.xz";
+      sha256 = "1pnhram0g6hfi2k13xhixwpr9vx1dhkvivn1y1ydvwk26klala1w";
+      name = "kruler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/h2hcdrv66b95ajbj5wrz1aspq4fr85pd-kde-dev-scripts-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kscd-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9yidmqhziwp6sj4l0pzh1gvmhi5g1ny6-kscd-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-scripts-14.12.1.tar.xz";
-      sha256 = "0g3i26vm3n2jc69mpwy94b60ff9c6fsr4yrl1h4f3408f4g4sjj4";
-      name = "kde-dev-scripts-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kscd-15.04.0.tar.xz";
+      sha256 = "079sj1g5mn32b2l2l9qap55s5sr6bv44a9ncswibkr49vwq7va10";
+      name = "kscd-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kollision-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8kf7fxqm2avmamkdidsglx7rvl30cj1n-kollision-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdcraw-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5y5x3vr7zibkhk5pk7hz5ibkza56d54s-libkdcraw-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kollision-14.12.1.tar.xz";
-      sha256 = "1l2c34l95kj4f8y156yirc35vfb2yblnkkjq1bfkmiavsb6vzhd5";
-      name = "kollision-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdcraw-15.04.0.tar.xz";
+      sha256 = "0h7m6m27jsp4xh6ywrbxad3c413ipzfgz357ahffqcafdjw6yfx5";
+      name = "libkdcraw-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/82jk65vx3xpg2ydn3fzg6v2w07xgihhc-kgoldrunner-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0z48pwb041r7sfwzvsxdqyw46bxy6d7d-ksaneplugin-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgoldrunner-14.12.1.tar.xz";
-      sha256 = "0sgr2034mr5gmmg81qp9sqjw2sn2cgdw8bl9dq2iid43czih5zbw";
-      name = "kgoldrunner-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksaneplugin-15.04.0.tar.xz";
+      sha256 = "1wh83c31x1n7vipi6m29hsinrpzwsvjnj3psg6s7bywnb6if2ir7";
+      name = "ksaneplugin-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kolf-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y7m9zzkm4wz23myj568sdjpn86f6m4iy-kolf-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "lokalize-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5by08m2jgiap41wrk8kg7lc8b6q6ifwh-lokalize-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kolf-14.12.1.tar.xz";
-      sha256 = "0arxis9q9qzbv35qq52pl4j5xzqhdwypjhxwdiqammqksdnln8lw";
-      name = "kolf-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/lokalize-15.04.0.tar.xz";
+      sha256 = "1nikpfjnmm3ws2qd46zq6g5v64dbfa7pmbp8nw1sv7dcin3k42ll";
+      name = "lokalize-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "okular-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8ipl9g3hgm04x1xpvyy8ahlbvjq6birx-okular-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "granatier-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/w9bkpa3frqgnh07gbaln9m15nhj0vdcj-granatier-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/okular-14.12.1.tar.xz";
-      sha256 = "1my3d91lm6wz8gh9g7pw4rrdxkc22vr9v02b22qqvxb2z8mdq5cb";
-      name = "okular-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/granatier-15.04.0.tar.xz";
+      sha256 = "1s5jkwqzjlcd343sm6akzx56a48yvx7z9n3cww9gxrjl76q1a19c";
+      name = "granatier-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jl34m0f1m497dpwnmmw2svy9ig9x7x5q-libkmahjongg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksudoku-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0ssavwdndi5h0mc3cjrgn1vpfz20wmdm-ksudoku-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkmahjongg-14.12.1.tar.xz";
-      sha256 = "00s4akfgr33n1bg2bds1fxccnig9hybm95qq95ii6ky4jyjc6b78";
-      name = "libkmahjongg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksudoku-15.04.0.tar.xz";
+      sha256 = "0bxcjqpkqr5zbjrx8drmjvjgnyjvpqbvmqgyfsidm8rgfg6mi3fz";
+      name = "ksudoku-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ab28gj1xwh9calkkf87xqnh84x8cjq08-kbreakout-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmplot-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/76appqh3cg62681baq1cy6fymadaq2c8-kmplot-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbreakout-14.12.1.tar.xz";
-      sha256 = "1cvqjch9ymjii7xmlg1clscbv6245m5bnf77dxz6nkzsrcy4khbx";
-      name = "kbreakout-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmplot-15.04.0.tar.xz";
+      sha256 = "0fnvjixnp2iyjg0hgm6lkry407f0fh39kb184jzaakrp703m3jmi";
+      name = "kmplot-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8bfm6nbnd3clpdy108yab44vv7552c1i-kgpg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kcachegrind-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ys2xzw0hck8gp7g79m933580y7rix754-kcachegrind-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgpg-14.12.1.tar.xz";
-      sha256 = "0cfhmlp200dbhdkckf7xvfbfsz985zw7vp6vin4w378dzyw55lmb";
-      name = "kgpg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcachegrind-15.04.0.tar.xz";
+      sha256 = "1q1z0w7c7j8ii97n4vcd80qi6hb7gsg6j9l3md37ls8c4qvhknx7";
+      name = "kcachegrind-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kscd-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/lfsycaw8n7kjsbnkga24cfqmpr0rpff8-kscd-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kbreakout-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/x4rsvf3qzl921vgamzjxkvwjw971r917-kbreakout-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kscd-14.12.1.tar.xz";
-      sha256 = "0ag9i649ah627b5xsacvz1q05pijfrbwrg34bpcc61px9zsgk18l";
-      name = "kscd-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kbreakout-15.04.0.tar.xz";
+      sha256 = "039g4qmmkf3lq8jx5vgasvqx19k3xbvfkm0j9his61z021ldjxla";
+      name = "kbreakout-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5avv44x780sz0v874cl781k7camn6xcj-kcalc-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kapman-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/82vlfb4yna41mip5zpkal4kpy67w4kjv-kapman-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcalc-14.12.1.tar.xz";
-      sha256 = "0qsfllwhn1gd675k5fxbfcfflnn86cbh3nzn70bc2lmxmwrlzbj2";
-      name = "kcalc-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kapman-15.04.0.tar.xz";
+      sha256 = "0glc8hcjs89s5cxa77f12pzlnmvr74kiqhcrk7djz98pnqwlsn5v";
+      name = "kapman-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qbgn1hkh15gv93wbrfg2bh14zsfgxfva-kfourinline-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kalgebra-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/346qqpdqx5hdzyvd4dlkag3ir951fjp7-kalgebra-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kfourinline-14.12.1.tar.xz";
-      sha256 = "0mhykajapvbcrasadyjjjz7sps3vmmw1hhijfjbswkb62ikmwc6k";
-      name = "kfourinline-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kalgebra-15.04.0.tar.xz";
+      sha256 = "07czg7i344qq93y95f46qvk3zpghkl3gcr8cd8wgc0v0b1mdmyfm";
+      name = "kalgebra-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "picmi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s1m8hz32vjf2v38p2rkznrx4mgn6rzr3-picmi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "pairs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cd5q5wchjl2ncm44pwl156jks832y96z-pairs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/picmi-14.12.1.tar.xz";
-      sha256 = "0nrg4qza4h99k59w92v3qy68xlkdslqrlqi62fg94i88rl9l6ypq";
-      name = "picmi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/pairs-15.04.0.tar.xz";
+      sha256 = "1d1va0b55fwivsvcz3izr680nl4zbyn44fdnirglw7q25278p7bh";
+      name = "pairs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9mqr7imp19hgjl7bn5sbp2d3xmgrr3p1-kdewebdev-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "khangman-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/krpgzhpksq4kr9r78w9f6rk2q0963lwv-khangman-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdewebdev-14.12.1.tar.xz";
-      sha256 = "0iv2r5vxkk8bg8p2zpq2dqnq0vvwhmjls0gdg30gyc4w04a7jcqr";
-      name = "kdewebdev-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/khangman-15.04.0.tar.xz";
+      sha256 = "0cnaih6xhg11wrg0c3v7lir2yknc4k6m490aw7bhraz98kfxr905";
+      name = "khangman-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmines-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/nx62f1snc9d786yi1vsh0vzixkgrv9gr-kmines-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "konsole-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qb3gypyd97v9cakicf44q7xnwfmyqsyz-konsole-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmines-14.12.1.tar.xz";
-      sha256 = "13f070kh0rfs5pmw3lnlwxwvx2ph2q8n1vm9lvr6kw1ablngiacm";
-      name = "kmines-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/konsole-15.04.0.tar.xz";
+      sha256 = "10qgynn6x7cxyp6lgri0vggmzmcvckwvrg9mrycdnwwrsfabscrc";
+      name = "konsole-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "filelight-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/syf2l3yk3wga82cyak82janjsjhgvbd5-filelight-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "analitza-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/c9xwpgl8bdp582w91zrchhywr1j9xm9r-analitza-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/filelight-14.12.1.tar.xz";
-      sha256 = "1dzcgric6rxhxhi84lgbsmkfk6s6b96px8019njnp744jys2ikv8";
-      name = "filelight-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/analitza-15.04.0.tar.xz";
+      sha256 = "03kaaa8kp92lsva5shzqb9497wmhksm79pc39ip5l50lqac9gr1l";
+      name = "analitza-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "amor-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5nkk3cqvi177qd3mq0n687r5swcrixfd-amor-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libksane-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6qn668dc4yppjwyc1ms0698nkmxj4sxm-libksane-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/amor-14.12.1.tar.xz";
-      sha256 = "0p0fgp3j6x1f83kxdvmkcy4ladhg206m261fbpa92zyxp2ylnl0a";
-      name = "amor-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libksane-15.04.0.tar.xz";
+      sha256 = "0rnja700hwjn4bvy06lijndic2zryn64kybvj71ip6knq3nx77x6";
+      name = "libksane-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6pbb85yp6xhd3x5w0a5ql6ms10yj1pj3-kdiamond-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kbruch-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g1hbkl20wkzglhaabxizzhrl1xpkfiy2-kbruch-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdiamond-14.12.1.tar.xz";
-      sha256 = "12frpi62f4w86ygxa68dvx1nj8n7w7lsgizfdyc6lix6l5vfzn7x";
-      name = "kdiamond-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kbruch-15.04.0.tar.xz";
+      sha256 = "1662hqqsf1rnfwrqwx5wpl0cvr9313sh8bla2sig8v2s8v2lyyi6";
+      name = "kbruch-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/89l402jmb83ji7xvkz82kz024l012yaz-kteatime-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmouth-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dwkbfqj5a21hcryw42dwqw9lq1r4ld0d-kmouth-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kteatime-14.12.1.tar.xz";
-      sha256 = "0my0fjiblkkfy2148axc7gp1nsx5lr2y8zn6d2labai2f6dy1bpf";
-      name = "kteatime-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmouth-15.04.0.tar.xz";
+      sha256 = "1swvdrlcfxv312kncihvxba0cklmv47qyr2dbrkhb9s9v6jbiqb3";
+      name = "kmouth-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "juk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gjxwckkx3mikzkpxs7vzk830nj42fj6q-juk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kppp-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8c2srwnwg41aypvjqzs08129wm391p2q-kppp-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/juk-14.12.1.tar.xz";
-      sha256 = "0wzjrk5w5y0f6bc98pr7xni1j8krdyjsk3agcwkhb4d4c0aa5gka";
-      name = "juk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kppp-15.04.0.tar.xz";
+      sha256 = "1ml5lc20jg05zfq9d274vqp7k7fh5369zshp073bi6zjj4cm7gss";
+      name = "kppp-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kdk1frzcpvc11ln0vamc6m0m7h1xfnj5-mplayerthumbs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmag-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gi6kw8zlmpy8gjijr34620dzp858h657-kmag-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/mplayerthumbs-14.12.1.tar.xz";
-      sha256 = "0z9iw1syv61y4fb4dlr9n8w78ri7wpznys5bd5sn0hxbkwnavs6b";
-      name = "mplayerthumbs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmag-15.04.0.tar.xz";
+      sha256 = "0wmarmybn56mppwb33cjg96906hh4vbnwxqpw2441axn5vqmf90j";
+      name = "kmag-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kget-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/v34rq3l61yyxsml99xp18adg85ki53r1-kget-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.18.tar.xz" ".tar";
+    store = "/nix/store/b65xpr56hpmfinssggl4fq88lky5czlm-kde-workspace-4.11.18.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kget-14.12.1.tar.xz";
-      sha256 = "1jr15bcc09pypihva7pjsq6rlj0kqqhqvprxdggmwa7fnyyjxrg4";
-      name = "kget-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-workspace-4.11.18.tar.xz";
+      sha256 = "1rvi88flk8c1j6qdkxak3sy1yf646ql3zipxw2azchwzd4k54mzv";
+      name = "kde-workspace-4.11.18.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkface-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8l4frnslphg2rbpmaikwi0j7w4hfw56r-libkface-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksnapshot-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zim1ydmdxhwv0cypdviqdnn0nwz2d66q-ksnapshot-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkface-14.12.1.tar.xz";
-      sha256 = "198z0n286qnngrln24s1dfghkddz5zy7qr8af0jkywxdj3j2ks3a";
-      name = "libkface-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksnapshot-15.04.0.tar.xz";
+      sha256 = "1577ybwpa52lmv5pd0223pz5l3q4h3475fz5qp3sm1rwi0nzmawq";
+      name = "ksnapshot-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ygwdm76ijc39y3blkfl7s6g21328dk1p-kcolorchooser-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "okteta-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8z78fks7wl0rf3077yrz8hzvqvmxn516-okteta-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcolorchooser-14.12.1.tar.xz";
-      sha256 = "1yw1cxg2caddncnhqyck1fh7g43svgcb8pb15wp5rz7qqs0p65mf";
-      name = "kcolorchooser-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/okteta-15.04.0.tar.xz";
+      sha256 = "0svgsy838dlc2krn2rzb65a6i0dfav4xlmi4174d23qhaikl1z42";
+      name = "okteta-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "dragon-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2iwy70md4cqg461x92sbxwbfzmj4y1xz-dragon-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "step-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/argcpdljdar6ga3psyz4wzr3kmvkmf07-step-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/dragon-14.12.1.tar.xz";
-      sha256 = "0wqmjb7zl883mcmx4x8ss0x64r79wrphfxkyva6sifcy596y2wxh";
-      name = "dragon-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/step-15.04.0.tar.xz";
+      sha256 = "1fl4zmj4k3g8c7bas7dj2n82qlbq8k5p3s5bflcillrz6pdd4s50";
+      name = "step-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5n1arbyl0fjp5b5xdlgyha4nwpxbczyz-kjumpingcube-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n3b0rfacc8i5p5hlgal66zr9gjfrkda1-ktp-kded-module-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kjumpingcube-14.12.1.tar.xz";
-      sha256 = "1h7nypr5b8b5az7c2gszihlhq9k2dn92cabjmif9rlkrvl6nahcy";
-      name = "kjumpingcube-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-kded-module-15.04.0.tar.xz";
+      sha256 = "0ijinvp48aixx8fjdc8fxpm8ilzsn9pkhsiinh47wiabyjb8rj3z";
+      name = "ktp-kded-module-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fxh9hhx7z5bv151xrxw26h91pz09lw9z-kapptemplate-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kwordquiz-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yik5ibmcy9k87y41nk3b03w1j2p3012c-kwordquiz-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kapptemplate-14.12.1.tar.xz";
-      sha256 = "00df6ckfaglnnxizzqmci10h8hiqjv0fgi8xb3x4d3aszb049k1y";
-      name = "kapptemplate-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kwordquiz-15.04.0.tar.xz";
+      sha256 = "10rq7zdd8i8dgmjzxgn6139ixzm5kzwiswal0cmkd42wwbdn6fml";
+      name = "kwordquiz-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/16zwzi9y1215imff1phggjza00j9y4br-ksquares-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/xd5jr85rzdnsrw18ab811q6hcwq1f4vk-kdelibs-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksquares-14.12.1.tar.xz";
-      sha256 = "0b1av02srxfd9ji51f2pcb5phmlqdz2lzik1n97yzn6f0xh19h9y";
-      name = "ksquares-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdelibs-4.14.7.tar.xz";
+      sha256 = "1zhqvyx8gq7514mr0423z0gl1yn33snh53fj2ijkk4blhjga601q";
+      name = "kdelibs-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bovo-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gfficdhz1w80xmvn9842jx1fwpd81lqi-bovo-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "killbots-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nshwyzk14mam2av602sqzcxnwjzpny6k-killbots-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/bovo-14.12.1.tar.xz";
-      sha256 = "08in3ppksxp7zdgrv5lvjxzlvc6srfjcicagqbj2r8nrfmngjlim";
-      name = "bovo-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/killbots-15.04.0.tar.xz";
+      sha256 = "0a9jn8i5hw3v7kr6vqagxkqvvjs6qsb23g2khaxgbw0x0cz5nqx4";
+      name = "killbots-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pafvmq1gg81mjpwyf388k311qwf7pgcj-ksaneplugin-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/55ksfn4hq342qbl8cm4jf8k8mmra096n-kdesdk-strigi-analyzers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksaneplugin-14.12.1.tar.xz";
-      sha256 = "00bsd58kfvhp36rbwsmbk3yqjx8gca3r42q5z3fvd0jpf7y8xxip";
-      name = "ksaneplugin-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-strigi-analyzers-15.04.0.tar.xz";
+      sha256 = "0k00ip8ll1i96cazs78c6al1yjcnvpr1awb6g7yvvq019icjmzvn";
+      name = "kdesdk-strigi-analyzers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "rocs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n25f8hphjdbwbk9z488i4bjmfai5vzsx-rocs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/90s1naljnqa6r99nl2dpjsf8rjb3k7cp-ktp-send-file-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/rocs-14.12.1.tar.xz";
-      sha256 = "033irmbjs6d8q7zdvz7vzx61d0gmgxb96cypwlwjmww1czgy9zcg";
-      name = "rocs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-send-file-15.04.0.tar.xz";
+      sha256 = "03i6irask1ccngwapirnc9vpk4nw7r82zl6jdnh7w9988c2wdl22";
+      name = "ktp-send-file-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kompare-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ikirdy65sp1w2w38p28nkzic0zhw5iyp-kompare-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n2vy60sdgnx3gb6fmmgd03d4jnn29nmz-dolphin-plugins-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kompare-14.12.1.tar.xz";
-      sha256 = "1js49gfffbv6nplr907dkcq3j6xi6h1276n0fbkpd7y31cca6mi7";
-      name = "kompare-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/dolphin-plugins-15.04.0.tar.xz";
+      sha256 = "0a1f1si598cmqd0j9v6pz0w8s6286xg2wcfxzrmkr994bfkydd8c";
+      name = "dolphin-plugins-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4zh8mah5lsisbnv07nas6wqv6xvsqzy4-kalzium-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksystemlog-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1wy9hsww32i53nv94bnzj83hfqw3x1ir-ksystemlog-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kalzium-14.12.1.tar.xz";
-      sha256 = "180qq9h046hax0jl13iy9mzbzhn66y41p8cj5447qgrnjbdk5qa8";
-      name = "kalzium-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksystemlog-15.04.0.tar.xz";
+      sha256 = "104yg6mjnhznsylpv8faqih9rpdxyp4667dagq7f1kfajy59jh1y";
+      name = "ksystemlog-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1pbw74v9j5r9x36b2r7yq5k8n9fbcvwz-ksudoku-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/x1qmhlskhz0ibs1pnxcb30bj1yk3f447-libkeduvocdocument-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksudoku-14.12.1.tar.xz";
-      sha256 = "1majccia02g7icqh8pad3m91nj94j228s66v25szlwacg2zc86zr";
-      name = "ksudoku-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkeduvocdocument-15.04.0.tar.xz";
+      sha256 = "0lqp2qfsdjkchnb5xrbj9hax2bf4ls1wk7pmb364qvkkhfia8qv4";
+      name = "libkeduvocdocument-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2ifpmknn9aw760hsz4j7cf7kc6x704hl-cervisia-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmines-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3vf7rffgww1k7byna7p05d0115p6924y-kmines-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/cervisia-14.12.1.tar.xz";
-      sha256 = "1xgvk1qar2mg5awkwsc0wzyzmskgv9r6bgbczyy0fjjd9xh0mp75";
-      name = "cervisia-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmines-15.04.0.tar.xz";
+      sha256 = "015xximi3xydkbygzlka7y8nmls3dc8jvr3dvvidl57gl1szmx73";
+      name = "kmines-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3qpkmwxn855x58k5za6r67rniyzkj006-kcharselect-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkgeomap-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/amqrx3hwvwrz8rgk3dljj11bvfpx4plm-libkgeomap-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcharselect-14.12.1.tar.xz";
-      sha256 = "0rb4dr7ygiks45c73nwab9wg9zdn1xgq93yhkpp23bkfq9ca7z4f";
-      name = "kcharselect-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkgeomap-15.04.0.tar.xz";
+      sha256 = "0yd17xa085rvxsnsah6ny7w88lbs7c1ilxrvbpsf2rvjkbl96giv";
+      name = "libkgeomap-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mvjdshn07gw1jn31y7igfzrzdmkpw98d-kbruch-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "umbrello-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5lahf10pz3vdh0dngi3fsmyn9g8cmk5v-umbrello-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbruch-14.12.1.tar.xz";
-      sha256 = "180gbax6lrn5qr1l7x1c3i0i2kh1by4j80bif66jxwra505by50z";
-      name = "kbruch-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/umbrello-15.04.0.tar.xz";
+      sha256 = "14lw9rnqv7bgni1rxwmgm4jnx2l2x5524wysqlhyp7np35mzdnlc";
+      name = "umbrello-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y0pg73qfkvfdrk3r7xz7yfgzl2s24vg5-knetwalk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "bomber-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7mf874dsxa6wj59zfr6s1n7399rvl7m9-bomber-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/knetwalk-14.12.1.tar.xz";
-      sha256 = "00b2zkiv3i99k6ri3xljas2fc2ihri84cmckgwrzvpxbdha8wpj8";
-      name = "knetwalk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/bomber-15.04.0.tar.xz";
+      sha256 = "1hpss9jmjsjl2shm2y50s5js33rpn0gd20il6wq454wm0k0q7rpj";
+      name = "bomber-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7vjjf69hw3kkwxmnlxfcg44wh7yy1s5i-palapeli-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "jovie-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/35zcglbjikb4ayp14d9l6hgs5myv5i6l-jovie-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/palapeli-14.12.1.tar.xz";
-      sha256 = "1zdbhn7dfrzb18k3rjgm934gjib5kazkgblsl15jxlzw2yfy458i";
-      name = "palapeli-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/jovie-15.04.0.tar.xz";
+      sha256 = "1sa6agn9zp12n98v7i9rxng2yn25b4yf2s8q8rjb3qg93kmzzx4v";
+      name = "jovie-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "okteta-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mk87jrnhqgcarmc658k4f2fpm1181i3g-okteta-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9vacywnw3knldygpgxjghjbw2nfqdszn-ktp-auth-handler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/okteta-14.12.1.tar.xz";
-      sha256 = "1mw32cjj2kw36frki26nycwi48p1s0wi2v9h85v9dwgk6235i7d8";
-      name = "okteta-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-auth-handler-15.04.0.tar.xz";
+      sha256 = "1hj3vc6wj768xdpr02v64p9wbrh1y61zg2fal3bk3fzrlz2yslg5";
+      name = "ktp-auth-handler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1mbdk8jijasnkhrzavpv89mzbfrz9b6n-ksnakeduel-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kubrick-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9rjk1xbzbnc2qqrni0ng2spbzailrb25-kubrick-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksnakeduel-14.12.1.tar.xz";
-      sha256 = "14ryx9ydwi23lhf5xr5mn77ixzkirwdg43mrh2cc0rnq440mzalv";
-      name = "ksnakeduel-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kubrick-15.04.0.tar.xz";
+      sha256 = "1qxyymrqav9hwa2ldqqpr49aj5sqzmiin6c4rmbirxmaasmyqn6a";
+      name = "kubrick-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/nky571v70dk45hy9jfvii63amga1qx55-kdelibs-4.14.4.tar.xz";
+    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/l2lbbhnr6r0q1sf3rzzjnwina7gvlllg-kgoldrunner-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdelibs-4.14.4.tar.xz";
-      sha256 = "0h255hhl46r7ax9hm9sr7qddljwzfky2ssh695ml3svfwg52mihl";
-      name = "kdelibs-4.14.4.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kgoldrunner-15.04.0.tar.xz";
+      sha256 = "1hsrjszck17gqnnpxzbdknj579n7xpmbq813a77736cmi95qr4h3";
+      name = "kgoldrunner-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6sfiw6s55wnsnsyh0sas9s3f8fbpwnw4-kdesdk-strigi-analyzers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "filelight-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pr78axnbpxwah326z7jqhq4cz1p7h7wr-filelight-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-strigi-analyzers-14.12.1.tar.xz";
-      sha256 = "1bsf1dgb2039jjzqy6pr66yw08kxbn5xpna0bfmrbiw4pprlmbi4";
-      name = "kdesdk-strigi-analyzers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/filelight-15.04.0.tar.xz";
+      sha256 = "18vcm8f8wgl0hqlycljv7kbq8iip5vadrsyhr58pw60cr8h36n0s";
+      name = "filelight-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hcxrbw696pca5z4p95ws7373x55bi9lj-svgpart-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kajongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/13030n2xwx0rnbd0myy87pfzrd93rpkw-kajongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/svgpart-14.12.1.tar.xz";
-      sha256 = "18r6n6wh8yg5wmd5wyc8sf6k994ghfknanlp7l1pcqwqa6wfv6rx";
-      name = "svgpart-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kajongg-15.04.0.tar.xz";
+      sha256 = "0aa2c2c4322lv4prwxkhanw0lbrv1145w6fz473f6ybfhg9isc7d";
+      name = "kajongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dazj5495njhw8bdyizpx0af9r20bvj5a-kdenetwork-filesharing-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kw08x6m9wzrmhm6av38hz2nd18agxapj-ktp-contact-runner-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-filesharing-14.12.1.tar.xz";
-      sha256 = "0id8qmr432ygkfmcq3mfr3zv0w58393w0z5pd86k8nnkz43nh208";
-      name = "kdenetwork-filesharing-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-contact-runner-15.04.0.tar.xz";
+      sha256 = "179q9707cxmd57iyadasdr9rvcqxwrahccc8vjylzh1x5p2arib8";
+      name = "ktp-contact-runner-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/11nyk47q1i4qh92kdzw3l6gi5nqhja5b-ffmpegthumbs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "sweeper-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yz48bx3mdyvapyz52aa846f32102jh7w-sweeper-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ffmpegthumbs-14.12.1.tar.xz";
-      sha256 = "1q6ayhxrsq3y5yvrawsvr88pzl7vcz5ms6dq0sgd4mad83kwl5yj";
-      name = "ffmpegthumbs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/sweeper-15.04.0.tar.xz";
+      sha256 = "15amamnrg7d52l0agkw66k96xk0j5shk2667wc9p2jy6g96cw53c";
+      name = "sweeper-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmix-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5y3gdnaa0a8nhpd5a2abp3ixcdnmg9im-kmix-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kfourinline-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/s96mhycwzwrv5w708mz6appsbf1vivz7-kfourinline-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmix-14.12.1.tar.xz";
-      sha256 = "1zk1c1m1zihb4wih2330a95gd1skakwsx0vccxp8np3nsh71z3fa";
-      name = "kmix-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kfourinline-15.04.0.tar.xz";
+      sha256 = "1wpcdzlpy8jdnlzzhys8n08pknk7ncq41dchs2ii3v30w1dnwln2";
+      name = "kfourinline-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6h2dlw28xi87axxdglbkjz2jyjl78ijv-audiocd-kio-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0q8wks5hqas02y3j384lwqy2a1npvmch-ktp-common-internals-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/audiocd-kio-14.12.1.tar.xz";
-      sha256 = "1wi3mwx9v7lh71ciar29c1bprwh2lgq46yq3kx5gq7wz20cx54hh";
-      name = "audiocd-kio-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-common-internals-15.04.0.tar.xz";
+      sha256 = "0y6jwqaxvkzjqdz4j3b4z5ybz4d3ci09x8apfr3h0q5pf4crkv8p";
+      name = "ktp-common-internals-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "lskat-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/awrjks0ihywpqygz8aqwrxn53yd8sljb-lskat-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "krdc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ch18h2226p60xnyjndy40r8fgwajd80p-krdc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/lskat-14.12.1.tar.xz";
-      sha256 = "19q5qzfh1dczkdz612hw21849h438dhl21ghbfm5hi5m04vmn8rc";
-      name = "lskat-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/krdc-15.04.0.tar.xz";
+      sha256 = "1ikm5a8lb65iljdvs16ipclkassjjdf7i49whcvz71rx8agp01hr";
+      name = "krdc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kk2rlvdl5hm4b0ms3i5pvs1r6lh5ipbh-kmahjongg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/05dzvpk81hhrfp0yncmgnq8q8nlps3z3-kdeedu-data-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmahjongg-14.12.1.tar.xz";
-      sha256 = "1pbq9f6zb96v98sz94kz979z5scpqzvc5fp4nxs2dg1rx1la8qxl";
-      name = "kmahjongg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdeedu-data-15.04.0.tar.xz";
+      sha256 = "1r157dbi75ayxww57vhww3cjxv1z2y2mv54xh2cf3zfjv6kmp7lc";
+      name = "kdeedu-data-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.15.tar.xz" ".tar";
-    store = "/nix/store/pmn8vgwjdszsl46pra65vn5i7pxfj7g4-kde-workspace-4.11.15.tar.xz";
+    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1z4nb0mp0d654n7wmyddxslx82rh2y10-signon-kwallet-extension-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-workspace-4.11.15.tar.xz";
-      sha256 = "1y7df6mar72lzy1dan7v5wwgf2w669b0hkrdb6ai1s3whmqr611a";
-      name = "kde-workspace-4.11.15.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/signon-kwallet-extension-15.04.0.tar.xz";
+      sha256 = "1s3nm7vrwwgin278vif6w8yyi1vg9hk401swvlhwmn9305bxqm01";
+      name = "signon-kwallet-extension-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1l6fwf3bb28myf3k3hsiv27gk8ar6gz1-libkdeedu-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kcron-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8qjk4ri8l2cvvqaf5qpmzwz33gx0n9kn-kcron-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdeedu-14.12.1.tar.xz";
-      sha256 = "03jic27ghfz2gpbn2nb69qiiip4vgy3y4as8qx328cl39l5vh8d4";
-      name = "libkdeedu-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcron-15.04.0.tar.xz";
+      sha256 = "0srq463k37klfbvrclhrni1kbn2bxxsfzp8l8lbx4dz8p93fcvdp";
+      name = "kcron-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wvgsj2m324xic0rjr6kyi7pfwqnfpmzq-ktouch-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksirk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/hngc4aajjzr5qszkxi745fi8l28k8wp4-ksirk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktouch-14.12.1.tar.xz";
-      sha256 = "07z1nkyc4hxjd39pczkv1z6dxdjn3334wnv778mdrf98lm77vjxd";
-      name = "ktouch-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksirk-15.04.0.tar.xz";
+      sha256 = "1rl2c1yjiiw3gy4kblxgf2lh2sd5bpwz36hi9kv1dvf00bwi1w0x";
+      name = "ksirk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wgjmvym6jg44xr5mzgw3pb77w1ya8s2h-kblocks-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/br98dpkixyvcr4dwp6fqfcgzrvgqvps1-kdenetwork-filesharing-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kblocks-14.12.1.tar.xz";
-      sha256 = "0qk5g5karl29g4hbpl7lfgahv71as3mj6j604cpd2wiwma05qa2s";
-      name = "kblocks-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenetwork-filesharing-15.04.0.tar.xz";
+      sha256 = "1296rg0axk6gc765kv3wnqqb7mp45sqw8rvhz631ybbsvcy9vk6c";
+      name = "kdenetwork-filesharing-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5ppmqjmqizw31x1yjnzmicybln433l9a-kqtquickcharts-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "okular-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8lzrv2slw0ck39i94w8ms8zm5vfx2x9v-okular-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kqtquickcharts-14.12.1.tar.xz";
-      sha256 = "026am7l64m721vv3l79z6v3avxq94z1vrzx1ifwf8p001inf4ydy";
-      name = "kqtquickcharts-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/okular-15.04.0.tar.xz";
+      sha256 = "1xfj7hm8149xn5g9yy56zd93bjs38k10009l6d2xynvqcd2k5sl7";
+      name = "okular-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1nwklpfvdggaxadjc3396j8qgwdl619h-sweeper-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-runtime-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1zj95rkrgbp4s8khzd7hjdnz9ndib9q3-kde-runtime-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/sweeper-14.12.1.tar.xz";
-      sha256 = "0c3kqnjwi5q24k7b05dr5mygd3ps0r1s9cbs49r9zikswz7gky1d";
-      name = "sweeper-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-runtime-15.04.0.tar.xz";
+      sha256 = "0dpbmg8w5b2hq3fw38v3fa4w45lm1p06sh72rscsz2mc2ly6bkxr";
+      name = "kde-runtime-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kopete-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gcj1qvbh1m7hbbyfdsl1nypc07nzy0yn-kopete-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "konquest-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p08rr4gqznxl4w3gfd7na11v8l1s8afq-konquest-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kopete-14.12.1.tar.xz";
-      sha256 = "1pkgzlq7scz0pvmn2dis128rh2hdfxhbg6imn4mwrizmlpaycb98";
-      name = "kopete-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/konquest-15.04.0.tar.xz";
+      sha256 = "154vbny41axcckdi4dw928kvhfvw8j5b34l79dqa15lnsml92m6f";
+      name = "konquest-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/w5dhnrmkm982i7kw1j9j5rf09z22cka9-kbounce-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g2j9js2pgakja03ljw9zl4xp9v2pn8l4-kde-baseapps-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbounce-14.12.1.tar.xz";
-      sha256 = "1x726x5x6cpdnig0wmam7zzigj33afwswdmxxgspnpimkybwpy0f";
-      name = "kbounce-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-baseapps-15.04.0.tar.xz";
+      sha256 = "1xiv9qmv7x6djv7fg7khsqhzrnypr8dg1c3ximi9r32jvcfcda7q";
+      name = "kde-baseapps-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/cxxfxxpmnk70i9cx0cgx7k6jdg32s73f-kanagram-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kreversi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h39cafz2080k7xih81jn5f7scfpvszdw-kreversi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kanagram-14.12.1.tar.xz";
-      sha256 = "07lz09armwr4j594pn30d617ngxcn8n3yxikm79ck5020gx4wvgx";
-      name = "kanagram-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kreversi-15.04.0.tar.xz";
+      sha256 = "0z7rp0d52cgc8lsnjj0p0qh7fydgk1348ljymfmw8kr41848fag7";
+      name = "kreversi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5jhzsqxdfzh1zw1d103np2rm34jdj945-zeroconf-ioslave-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/17j3xfw2gjbvkb6k09ykyf8avx7fip38-kate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/zeroconf-ioslave-14.12.1.tar.xz";
-      sha256 = "12ri1dbbzc9dwx2n843979yvh93a9yrzpprk9jdmjr1hkna8rgmy";
-      name = "zeroconf-ioslave-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kate-15.04.0.tar.xz";
+      sha256 = "1g4dh9d55mbdnxrxp8kyid52gg649rnd6xhv1di3k1zz6x5jjnr1";
+      name = "kate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zcxv7zv41p63pij7d37wdp4hcll77ldc-libkeduvocdocument-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkface-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/f6n75hb70xfprv3rpa78n59icxglv3n8-libkface-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkeduvocdocument-14.12.1.tar.xz";
-      sha256 = "0nqjcddjmapgadlkv97banjk5fh7p355hfxcbspksyndsgplz1hv";
-      name = "libkeduvocdocument-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkface-15.04.0.tar.xz";
+      sha256 = "0hm3llyjprfhj5l7y97kyyk61cbis7hmlgpf3qfin958hmip7kds";
+      name = "libkface-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dv7j6rb4688zzlp36l45f2h0vzykvybj-kmousetool-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/frl8ikxyck6mv44rdwlca5dg64vlar20-kdesdk-thumbnailers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmousetool-14.12.1.tar.xz";
-      sha256 = "0k38qj2hv9k846fba4sxdg1biplbdn5hfmfhx5qmc6g6h8xrs2dr";
-      name = "kmousetool-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-thumbnailers-15.04.0.tar.xz";
+      sha256 = "1y3wix763ndi3xfwpm3h3cfj3r446jkrslgn09bplm4x36jdd2wv";
+      name = "kdesdk-thumbnailers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dqi11m0gnkyrfppdlibvgv2gbycpjqm6-kolourpaint-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mxrd14q1c9hbw5lnpvk32s2jb18cjyrn-kremotecontrol-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kolourpaint-14.12.1.tar.xz";
-      sha256 = "15vkd7i35myfi9m11p52g8x7dlkvf06fa400r9vbw321fza2gyjc";
-      name = "kolourpaint-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kremotecontrol-15.04.0.tar.xz";
+      sha256 = "110bcp9b4y1mwpvd6r09zlrr54f1qdncxixliivclx9y0nrf9ljf";
+      name = "kremotecontrol-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zl0qg5scvgmzsq6c7l4s2rs4dh6v243h-kgeography-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmahjongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gaj2cqkjp0ynwsywrshpy7glfagz37ds-kmahjongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgeography-14.12.1.tar.xz";
-      sha256 = "04g2sw2r1i8kc85n9igk15kmk3hc8gdci52lxk4ca04bxcif7061";
-      name = "kgeography-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmahjongg-15.04.0.tar.xz";
+      sha256 = "0agqvghlvw3n8xr15n44zjidxqghpmpzf5834n7d18yllnkmyqzz";
+      name = "kmahjongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1cknwl7y4djaq1cwjj3g38k8w8gi6zwc-dolphin-plugins-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5vsvkxwxycdr0qk54ksiyrlbdfqxc7qq-ktp-text-ui-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/dolphin-plugins-14.12.1.tar.xz";
-      sha256 = "0sjfm5ry54h56vbbch11js50a70pvwbkinyxxgyvs6g260ngpkx2";
-      name = "dolphin-plugins-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-text-ui-15.04.0.tar.xz";
+      sha256 = "0az6ziraqslcidjflljc25scrg1i2kgkppm93bd8y8zy4a2q1wns";
+      name = "ktp-text-ui-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rbc1h7c1v7bdzgwxqw5xs2x19rn4z9q4-kreversi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kshisen-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jdmiqffbirvn2pzxx0vfia6v9mq9q1jx-kshisen-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kreversi-14.12.1.tar.xz";
-      sha256 = "1011262n5zh6hji7xxgq3k2hkgh0hqhpvk9krw22plda4nww2xwc";
-      name = "kreversi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kshisen-15.04.0.tar.xz";
+      sha256 = "011a3gqij509vl74v03s24in83i2qyylrpasi8cpx81hgbwd7zkd";
+      name = "kshisen-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/rwsx6c3s4nc7vkcfk0c39jbp7f5f0rvp-kdepim-runtime-4.14.4.tar.xz";
+    name = stdenv.lib.nameFromURL "krfb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/r0b24gfzlljxq2wxxs6pyfvgacarvp7n-krfb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepim-runtime-4.14.4.tar.xz";
-      sha256 = "08axhahiqv77cr6ssvh1cadqjvv1064w5l94wxadnyq3vz8kl6kz";
-      name = "kdepim-runtime-4.14.4.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/krfb-15.04.0.tar.xz";
+      sha256 = "1j1mfjgza7zs3dsvm7aqr0w3lnia1svxrc47gd5imagqxzi5xb5i";
+      name = "krfb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdf-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5caacq7s0yh79mqykwj5wydj3b5gyl83-kdf-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qqn7jza6dgshhapkvj97a4i4960dy5da-ktp-accounts-kcm-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdf-14.12.1.tar.xz";
-      sha256 = "1cvd7ydk277crv1wiw7sn72mv9lf5pqk56gylfmzr63mr7dyj5iz";
-      name = "kdf-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-accounts-kcm-15.04.0.tar.xz";
+      sha256 = "1a45apf4vmjpsrbm98ym8k7qivmfaiwsdsf0f65vi91imlkfdd2x";
+      name = "ktp-accounts-kcm-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kiten-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8dl8yv38wpv199jjgw3kdl8rajxnnc77-kiten-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kgeography-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/arp2vca2a13jqqc37cv5pa03s4aayg1y-kgeography-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kiten-14.12.1.tar.xz";
-      sha256 = "0518zbvgn3w00b7lxfivrgrp8xrpb09rf9cf9zdxdl2z37gxmvmv";
-      name = "kiten-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kgeography-15.04.0.tar.xz";
+      sha256 = "1gm17z7a4dgmqds3gvwf1scgxb2js5xvaq4f74hr1042jq2br0dk";
+      name = "kgeography-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1widcjdd8hzy1dnabg9px06yjc0k7ncf-kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7iwcjypw2l9kkgm8l3dbchm47jziyjh0-kqtquickcharts-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-strigi-analyzers-14.12.1.tar.xz";
-      sha256 = "1xdb3hm7iad2wvbwqaa5bbqzgg6xdbbv68xfjajpx8k9cn20kh9r";
-      name = "kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kqtquickcharts-15.04.0.tar.xz";
+      sha256 = "08p53xa49hwgwcp1vgp1c0pghj2l5a2g71s0q30xn7vz7y91bi92";
+      name = "kqtquickcharts-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k4y83g821js66c35bc6x2r8m1924vd4f-kcachegrind-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/28krw7dahfrcmwlbfqabzd6bmxqx9fia-kdegraphics-strigi-analyzer-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcachegrind-14.12.1.tar.xz";
-      sha256 = "01fa9b73ymym5qyd5lirb4cf6c37x02a1a9ls2qgzswflm557d49";
-      name = "kcachegrind-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-strigi-analyzer-15.04.0.tar.xz";
+      sha256 = "02zpwqcfi0v0f53y4i2x1yn6d3nynlp8x7xb4ciacvmxzssh9g0i";
+      name = "kdegraphics-strigi-analyzer-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kstars-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/plbszpr250pr7x41578a4b5n329wgl4l-kstars-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "blinken-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pr2d0pipsss9n5xdd9zrgv939smlrvwk-blinken-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kstars-14.12.1.tar.xz";
-      sha256 = "08px9765vl6hpmy39wyhlbm4d3y5wh82w33g2fppx4d9bxmpz166";
-      name = "kstars-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/blinken-15.04.0.tar.xz";
+      sha256 = "1475yf37nlmnqq5sh2gc8x1nbkypxy560qmdyar3m5cs69r77679";
+      name = "blinken-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/shap58rcwhg13766v7zm28nxr6rn09gw-kdepim-4.14.4.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdegames-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/w7f148vp2gdz22fhs5g65qjzbl9h36kh-libkdegames-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepim-4.14.4.tar.xz";
-      sha256 = "0jpbc84xv07j2qynkn4mhmwlldbmjg6v7dqc1028kfk7sbcahhf2";
-      name = "kdepim-4.14.4.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdegames-15.04.0.tar.xz";
+      sha256 = "1rwbr5pqn347rfhz56phswfzxmm37xpnw699si1612mkmmbl92ba";
+      name = "libkdegames-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c4m2nwfbjwqgc9ydq6macg4zkmrsd7v6-ktuberling-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jn27x6czz0lripamkjgkwga4cxyicmcm-kdegraphics-thumbnailers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktuberling-14.12.1.tar.xz";
-      sha256 = "1ghymw6ljvkd9wi4j0f1n8gjkhxfkqvmb8n36lasrfr27v57z68v";
-      name = "ktuberling-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-thumbnailers-15.04.0.tar.xz";
+      sha256 = "1p0alpdmhl3fm1r27cqiz80w9r1zmwj7pmdxf4f6mv2pf5q7z5kw";
+      name = "kdegraphics-thumbnailers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rnz72ryzp7mcxk83l71rw7br3k6hamr9-kblackbox-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kcharselect-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1xvdiwnp84qn7cvcissssf92w4nx8y7g-kcharselect-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kblackbox-14.12.1.tar.xz";
-      sha256 = "0cxyzlsvhw9rg3b9c558zbqr3ijbzyx5as9g92ald8w7qjja5jnv";
-      name = "kblackbox-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcharselect-15.04.0.tar.xz";
+      sha256 = "1jfh1kzcazb4b4wqv6mjy69h8fx78zzf7xk60vzaks07b4c7x9x7";
+      name = "kcharselect-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c3gmynlqgyhdx3nghhwgk8i85qqysjsj-kalgebra-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkcddb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7in63wvw5njm2gqxqbsjvj8sh7j5zbsf-libkcddb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kalgebra-14.12.1.tar.xz";
-      sha256 = "0pn4scp7y7ih60jaq39kanwgsc2aslb41v9xw8322kk8q4gyc8g4";
-      name = "kalgebra-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkcddb-15.04.0.tar.xz";
+      sha256 = "1ldjfkppfhknln6hn3py8519p5jc63pf9apwx7h5jf3z6ci1k29p";
+      name = "libkcddb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/53ksfs7gxzr33sgdbfxk4ydjzzl2c7y3-kdeedu-data-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kstars-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vqrsgg7jlr6h8y6m2cp2fvv0jpbv8jvk-kstars-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdeedu-data-14.12.1.tar.xz";
-      sha256 = "0hyqwkva7bgi43fgad4caz8q4pcb9kx5czpc3d8nksk5q28a1llg";
-      name = "kdeedu-data-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kstars-15.04.0.tar.xz";
+      sha256 = "0mj6haknp9y03md9j007w5sf66529chififw0xy6a7bvnagaph2g";
+      name = "kstars-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kigo-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ggvs29ryi85ig0r9z3jq259kvyq1k1h0-kigo-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kget-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cglfzvjxh6b61dyvla9q9g0qnw6rzlm9-kget-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kigo-14.12.1.tar.xz";
-      sha256 = "100rrip6w08ld2xgwdm2dryk8qa92dssdz0a0iykgklddq6dvxr1";
-      name = "kigo-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kget-15.04.0.tar.xz";
+      sha256 = "0v4gfik9ddzpddknrj9vp2d2awn2bjzn74n173njf90pbfnql3y5";
+      name = "kget-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p445xkdbm1dqqb3p2x10rag6xccidp9c-print-manager-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kanagram-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dh926v6zz23z9lqqqvhia5ilwxazd4lq-kanagram-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/print-manager-14.12.1.tar.xz";
-      sha256 = "1ad9a23cfivyzfgajg1bn10n2glp2ks8yqkl5f0xk5alyldzbir6";
-      name = "print-manager-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kanagram-15.04.0.tar.xz";
+      sha256 = "1iw2vp82ax93kbc7ffmh9wsgjp0a772vb2bxsmm5g5jcmjd8vcr4";
+      name = "kanagram-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1hx5ws8bbzh0lnmjp0x8ln1s7rv3x62a-kshisen-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kteatime-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mrdsmb6qaj32np3p3mcwi3sx38kmgvjj-kteatime-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kshisen-14.12.1.tar.xz";
-      sha256 = "1b0csn1ngpcwcl8iwv02hy1gb6hk13453khzgya6ckixk5szcdy7";
-      name = "kshisen-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kteatime-15.04.0.tar.xz";
+      sha256 = "0g1hhlqhag0lllm8s10ylw5a6qwgsmb5hj33l2knbifa2sdg4v0c";
+      name = "kteatime-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "lskat-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/w24lqbmni5n7w2xdmw1khzixg9f2p64m-lskat-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/44z86p3l3axqq54wnvbbjavifp6jrnxn-ktp-contact-list-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/lskat-14.12.2.tar.xz";
-      sha256 = "0c5zg0lkzcgf7ff1hqy6rh8cq5z4935p7rmm463pl933djpbl5bn";
-      name = "lskat-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-contact-list-15.04.0.tar.xz";
+      sha256 = "08k2yplr67s66y4134n007kzsdxnrwgjhv09babprb4cbcm7pdgm";
+      name = "ktp-contact-list-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kpat-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1w6n38dac3mslyfl5blf1cas013m9h8g-kpat-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/a66l0r6622i36x7njknq4rw77wq1z8f1-ktp-filetransfer-handler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kpat-14.12.2.tar.xz";
-      sha256 = "1rhs752b3ncbpbmrc9zknww0dsihh3lvwvh629v1s6xc0vqvcar4";
-      name = "kpat-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-filetransfer-handler-15.04.0.tar.xz";
+      sha256 = "0z50v3bq4i618c1sh5fa67il4vhn8mk5c55wlhxc2q8srr85ii92";
+      name = "ktp-filetransfer-handler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/738qaln8qxvsdnqiy6adk9sh28rfjkgy-kdesdk-strigi-analyzers-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kompare-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lmbjfk56h71c44paw60x7wl6pd58yc0w-kompare-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-strigi-analyzers-14.12.2.tar.xz";
-      sha256 = "08db2nhkw265i2dfbka5q6vm7bxbjywk1p52hhjc57a2qvqfb5ww";
-      name = "kdesdk-strigi-analyzers-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kompare-15.04.0.tar.xz";
+      sha256 = "1pf693s580p208dbjj6d4w11i62bwfifjn3wmn2fd8fip3ajdgxh";
+      name = "kompare-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fl2nm7vv3k36vyf2wml8pv4sskh53ycr-zeroconf-ioslave-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/54xdq0xdkmw2z3j0zhfxi6gjvm60g919-kdegraphics-mobipocket-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/zeroconf-ioslave-14.12.2.tar.xz";
-      sha256 = "0jx35018amdcgmxi9c7alc4c80qywzakqdrzyq5i7jxjcl3y1ly0";
-      name = "zeroconf-ioslave-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-mobipocket-15.04.0.tar.xz";
+      sha256 = "00m5i5jdnj92jnjm32ryh8dlf3fzl2mzybm5w5y1a82fq9l7j774";
+      name = "kdegraphics-mobipocket-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmix-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jrmw028qjd86q4mjyasx64iyssaj7wk7-kmix-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenlive-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dacxkxjxhz3afz4165nv4siyn6sb5jws-kdenlive-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmix-14.12.2.tar.xz";
-      sha256 = "1jx2mkrdx5jgrjr02snb199xradpxaw42dw8y7icbpmkihxmxry1";
-      name = "kmix-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenlive-15.04.0.tar.xz";
+      sha256 = "1ski64rqa1h1aqr16vwnvpqpww7vgfzbnlki3998k8gbc703q512";
+      name = "kdenlive-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmag-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g87b5njzgp7jrydvwvc2xwpnwv0p33kd-kmag-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktimer-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nab346b2rb5dwkj4gdnjm2pyhnzf0i4h-ktimer-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmag-14.12.2.tar.xz";
-      sha256 = "0bcrr67v6h9vc69341b662z7dbgxm3yrazfkfsdlxp1ahqspl6w5";
-      name = "kmag-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktimer-15.04.0.tar.xz";
+      sha256 = "014jfyx4lizq2bh5yx73zarn9mzp4lkyaxvml0m8i53zdnacnqvr";
+      name = "ktimer-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/35izrbqhb52zlfs2x1qsjc0k1l2d1pkk-mplayerthumbs-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1rqzjg16kl3m8cc6pjf2cakhjx90kkhw-libkmahjongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/mplayerthumbs-14.12.2.tar.xz";
-      sha256 = "1kwpd3j64zm78qwn42q3kgipywdlcpvibng06x032yv6i8wmi6m1";
-      name = "mplayerthumbs-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkmahjongg-15.04.0.tar.xz";
+      sha256 = "1912k9h4j8rhly5x03anf4gzjs0aypbwh8ifvhn289gydccqfcyy";
+      name = "libkmahjongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hqsma0ww8philxqp1hk22sk3lf711y4i-kbreakout-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-approver-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ijsjgpid0pnrq1d174gpbma6xfik9989-ktp-approver-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbreakout-14.12.2.tar.xz";
-      sha256 = "12y03rbm13pg1c8xpgclklin5vjzsidyaiamhh5bqpqsxsqcnh5n";
-      name = "kbreakout-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-approver-15.04.0.tar.xz";
+      sha256 = "0sfi4i071iini7bv9i7d4f952rnd5r89vqnhkqqrzbnmi9bh4rx4";
+      name = "ktp-approver-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cixkkb370365vic33rl9n9846ll44rqx-kreversi-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "cantor-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7rf8al4ncyxkhzg899mssimw3lwf0qy8-cantor-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kreversi-14.12.2.tar.xz";
-      sha256 = "05zkwswpy5sw9ab3gc012pgvl0wq8f2lb0qhdr96rvxgp8m273j5";
-      name = "kreversi-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/cantor-15.04.0.tar.xz";
+      sha256 = "0npl1p3gwflfl9rrvbi9ql28af6m1h2w46vkqh4ksp4d6jh9lx3p";
+      name = "cantor-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "jovie-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xmvafr9hszzwndqazdzsn9i90cwi0afs-jovie-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kbounce-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9b915jv5dcm7kinwvj9yrxs72vbsravw-kbounce-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/jovie-14.12.2.tar.xz";
-      sha256 = "0yfn5n3n3knacvpr3cqiii0hldbxc6m09k1g53hlksay61s2r56v";
-      name = "jovie-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kbounce-15.04.0.tar.xz";
+      sha256 = "1jllvam65kjfanry4wl2yhhgi5hak0swiradyh15b73rb89w2lj2";
+      name = "kbounce-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yhs96yv9mv61pp521mpay8i0dgqlmm1y-kde-l10n-sr-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zhlxa8x34g7yz6wwqnhn062d4yxgl214-kcolorchooser-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sr-14.12.2.tar.xz";
-      sha256 = "07f8x34q8bdcsvc3a76zpd0sjxnq5ja6ghl3d9a0a4ix0hyyv8zd";
-      name = "kde-l10n-sr-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcolorchooser-15.04.0.tar.xz";
+      sha256 = "0g51v8641712fyycm3d6pkx8mlxkpp832l5i77f557lgi3dqfnh8";
+      name = "kcolorchooser-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l2499bc6hfv5x284cs4bjvqbmbxr0aij-kde-l10n-hi-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gcg36nagmfjc9w510pbihc44gz765nh6-audiocd-kio-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hi-14.12.2.tar.xz";
-      sha256 = "12ky5zmds18n2sgivrnpds8qjkd64397ia9h8h9s5s9l3cwgipb2";
-      name = "kde-l10n-hi-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/audiocd-kio-15.04.0.tar.xz";
+      sha256 = "05by4zrd3s2rkv915dq3ri6rhq39sl9wkw46diajkwzqdg6ajbiz";
+      name = "audiocd-kio-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kpcnzwp6wg76slwd2zdmzmg09iydims6-kde-l10n-tr-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kgamma-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zd7r3mali9j223lm28w0xx6fl4jkiyfd-kgamma-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-tr-14.12.2.tar.xz";
-      sha256 = "1d326cxhfx0434x45lq9wgn5csvmclgd6fmyqzwlax88vm57gg62";
-      name = "kde-l10n-tr-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kgamma-15.04.0.tar.xz";
+      sha256 = "17xfiaz751q38q29s20k6fffshd3jndydnj54q4bd5l08fwmxmq6";
+      name = "kgamma-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/p36g7i6w8hgsz3wdax3ldxzv3djmw258-kde-l10n-pl-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "knetwalk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/65sm832j0rnm215vmd7gcrnnbj1gd2cj-knetwalk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pl-14.12.2.tar.xz";
-      sha256 = "0knjhk0941qf28l4izz2ssfri88s09k0vxd3d6xblg51r6m0b2sk";
-      name = "kde-l10n-pl-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/knetwalk-15.04.0.tar.xz";
+      sha256 = "0ljwgb5sb8x2g2qrvnl1lzmk34zcg6g1qfyp6p74h8lbhfk1vbgl";
+      name = "knetwalk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iyab41x341l7b1acprqv7azbdbxbd0lw-kde-l10n-km-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "klettres-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bnd0dnbv8ybywwzaskjlx2dvdw3l9afc-klettres-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-km-14.12.2.tar.xz";
-      sha256 = "108pcxflcbhisixivg6153sm8rrbdrrh6rbvxib307dh1q1sl7ix";
-      name = "kde-l10n-km-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/klettres-15.04.0.tar.xz";
+      sha256 = "1kzcqj1w5dcmc54v96q3s6v4fj86kgc9vdllg7l98bv9d2zcxpph";
+      name = "klettres-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sqlfyy4bhzgnv75msvyv2m7sx8vwhb0g-kde-l10n-eu-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kapptemplate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qg0q54wpsmr1y9dfa72y24fjr1faqd8y-kapptemplate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-eu-14.12.2.tar.xz";
-      sha256 = "0x8dihag23ljyw50qpg3bqyhfg8p4f6k1daz2102wkqdbwhzk1ch";
-      name = "kde-l10n-eu-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kapptemplate-15.04.0.tar.xz";
+      sha256 = "01ldjxgsv422l9lay5yg5b9y0cbbwpfl8x41a1wvm9h2l4k0mn3r";
+      name = "kapptemplate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/63qi174y5jw1cs3q0wzb5jk4j64q4zqp-kde-l10n-nds-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g3mfvybxvh2rws76bdsvd7fcnkc3cjdh-kjumpingcube-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nds-14.12.2.tar.xz";
-      sha256 = "1nyz71cpin9cqffjaca9wv9s5v9n358agb1ncamg5iqj176cxvrl";
-      name = "kde-l10n-nds-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/f4jmy4xgm9a50a4r6nlvjz61ihw3w14j-kde-l10n-et-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-et-14.12.2.tar.xz";
-      sha256 = "1a4kih4lb4sqwasvqhqj06r37rj00vjlhwihlr7jk8z373yg6kk3";
-      name = "kde-l10n-et-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/j4jf2n3bikb23kzg55i538jjhz7gn2jx-kde-l10n-ko-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ko-14.12.2.tar.xz";
-      sha256 = "0vv4xdis64nc66i81fnilnkl8max6wm07kzwiqahdnrbrza8vqab";
-      name = "kde-l10n-ko-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ha5w0palyj9b7ajwd5xdqppgjnx1vsv0-kde-l10n-kk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-kk-14.12.2.tar.xz";
-      sha256 = "0bvghaggmzm8a12gl2z6ykgf8qabiagjmmddiqihbnvdi27ia78c";
-      name = "kde-l10n-kk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9cjm0q29zj5p7if67m6ax4vp9bsp1xmq-kde-l10n-hu-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hu-14.12.2.tar.xz";
-      sha256 = "0s2h123kbylc9ijxv6yfj5l593zgy5ar843rn82jjpvfbq3qj11n";
-      name = "kde-l10n-hu-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca@valencia-14.12.2.tar.xz";
-      sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv";
-      name = "kde-l10n-ca_valencia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l1nsi3pqrb0wv2v650sa8xax75kpinxx-kde-l10n-fr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fr-14.12.2.tar.xz";
-      sha256 = "01lkgx857vmxl90si1b55gyz27iqdbk7qkn5v40n356zzaicrxva";
-      name = "kde-l10n-fr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qmf7y72b47pnq0b0gmxhw3slsgmy2awf-kde-l10n-sk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sk-14.12.2.tar.xz";
-      sha256 = "0diajsp56l6dg96m9nij834dmky1gh48wd8ji5zs37fvpmdc96r0";
-      name = "kde-l10n-sk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/var4wc2isqx94ay6lq8fnnynb1566sgm-kde-l10n-es-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-es-14.12.2.tar.xz";
-      sha256 = "01ha5db71rzkr3a0mlq80ag0fagivvjh26ck0y8da101lgl01i4r";
-      name = "kde-l10n-es-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3h7wyirznwm4zh6flqq1j2hacayvm423-kde-l10n-ca-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca-14.12.2.tar.xz";
-      sha256 = "1gcypc9l95iry45vh4pl1i7hwrdnm4lgnwnfnw1l7016lhgfjr8m";
-      name = "kde-l10n-ca-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mi03yzrjslab56mj7qw22d2lzl2kk4pj-kde-l10n-cs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-cs-14.12.2.tar.xz";
-      sha256 = "0rb6wnw0944zpllm4cac063r7hl5rq28x3b5a6has0cz4mqk9jw9";
-      name = "kde-l10n-cs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9lw0j1h2pwvl1zpcl8cjba2xqc7lwkp9-kde-l10n-ar-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ar-14.12.2.tar.xz";
-      sha256 = "0nkv2pj4f3hjrv25l8kqm9cqv0j7h3crrzyqzq026zzz6znlq190";
-      name = "kde-l10n-ar-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ix18mmzjf395q3wj2qcbpm1z9jvywm4k-kde-l10n-nl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nl-14.12.2.tar.xz";
-      sha256 = "0izpvjmlh8yk1nnzpxa59n6lv4fk7575j8nwjapy0ynrknps4fff";
-      name = "kde-l10n-nl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xa7h417v8b57fzimvggiyfx7hys197kz-kde-l10n-de-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-de-14.12.2.tar.xz";
-      sha256 = "1y54csccymc7hpbsm8kjw4v9ypgvxqcqahwvan2x84fvn7p80inb";
-      name = "kde-l10n-de-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/44rprv2vwz090i48pnykzws4blyryxw8-kde-l10n-fa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fa-14.12.2.tar.xz";
-      sha256 = "04qxb6qaj1cb174m6svd83m34fv8hwws8v4a20igkh09b5bl3dsx";
-      name = "kde-l10n-fa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5051arszznb40q77d34zcwnaaxwv5wx1-kde-l10n-wa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-wa-14.12.2.tar.xz";
-      sha256 = "08il92kssd4d1zdkks4777pk8l2n3k4abv589x8rja4rlmpxrscq";
-      name = "kde-l10n-wa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hvcw01d444zkmyw1zpds2mnw7xmx4wca-kde-l10n-nb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nb-14.12.2.tar.xz";
-      sha256 = "1q461np49d0n0zhby9dd8knf7y3w9vi1r49bzlqwd1y4hb3alnms";
-      name = "kde-l10n-nb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xqqsvrfab53ybxfm0hq63bnlqpn6pz62-kde-l10n-uk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-uk-14.12.2.tar.xz";
-      sha256 = "0avr2c9drnkv7ndz9mqjayf6pivk6hbghmj6rli91lvqavjp6vlb";
-      name = "kde-l10n-uk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kc6d1lkncc3djfn8zybhz6xzz7nzickb-kde-l10n-ug-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ug-14.12.2.tar.xz";
-      sha256 = "17jizdwkfh3gfi9ykpszqw49fzswgps7xlbq9j8pjflyk36rya9i";
-      name = "kde-l10n-ug-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/35mka79zjlplbis7b6dhiz48wls25gc6-kde-l10n-zh_TW-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_TW-14.12.2.tar.xz";
-      sha256 = "0h3nfp51w7r601d6rpi55nzrmpywp3dalwqjwx4a6rnlawf3s2hr";
-      name = "kde-l10n-zh_TW-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qs4xzws3s0vamj17m98fxcqqvp8hyyw7-kde-l10n-fi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fi-14.12.2.tar.xz";
-      sha256 = "1q8j8v7i7lz3qk22adr1cj0bs6qw36540bj0vdzpa3390fn3i2ra";
-      name = "kde-l10n-fi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yz0rzw7m437glx49xdxp4zz7ic51g5nq-kde-l10n-el-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-el-14.12.2.tar.xz";
-      sha256 = "0wcbzs0s1nqafa0hi0abb17yw3jnxcq2mxyk4h5p9g7q7pkvh6s8";
-      name = "kde-l10n-el-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fcqsn91fsip4bi7y763y07i3ii4ji8zs-kde-l10n-bg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bg-14.12.2.tar.xz";
-      sha256 = "099af2qdxjy8whfaw0hzmlywb7l7bmpssga90xyahr7nh6l8vwnz";
-      name = "kde-l10n-bg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nbb6gg7pc3yzjxs3gj7l0363i5d1bq1h-kde-l10n-lt-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lt-14.12.2.tar.xz";
-      sha256 = "1lkjmcj77mmk6lvh1h51k8i9nn33b0q9vgbampj33qgax1d7a4mk";
-      name = "kde-l10n-lt-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/92dr7l2vrh1j4bxj2zy21prpfb1v9ba6-kde-l10n-pa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pa-14.12.2.tar.xz";
-      sha256 = "1fagcrjjm7s0kpkfflkjx6rbgzprf7qidpbgwzw3jjf501vfdpkn";
-      name = "kde-l10n-pa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2iqdi982l5gbh3ajibgznzxg6ryjn49p-kde-l10n-hr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hr-14.12.2.tar.xz";
-      sha256 = "11dabhhz676ria4nwvkx49igzm481fl9996j3p6rzd4kbhrksgq0";
-      name = "kde-l10n-hr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rfkj26fa9pi0mraxd8mgnh758dhp0m7n-kde-l10n-bs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bs-14.12.2.tar.xz";
-      sha256 = "1x4m0cksbiy25s8pynskmasy7kkzm8i8mp5dvsx3wsh0msf4pg1i";
-      name = "kde-l10n-bs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sw87zcl7ddd68wlws5689h7r7g5bbcgl-kde-l10n-ga-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ga-14.12.2.tar.xz";
-      sha256 = "0ayambdzdfnky6bwnk5ghnch18y4ran6inrb8v4i1c407zn74ydx";
-      name = "kde-l10n-ga-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/id89acc90qgfqjcidjfsx1sn62yk7c56-kde-l10n-zh_CN-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_CN-14.12.2.tar.xz";
-      sha256 = "0876r1bp36w0iljrlhlnxfizapvw0h2qmpjnf5s7vf5iisrvsbrb";
-      name = "kde-l10n-zh_CN-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rki0855bdgqwi8ajwmnl9jdm1hgn18xs-kde-l10n-ru-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ru-14.12.2.tar.xz";
-      sha256 = "0i2fb0fa1drg99m5k5d8sdv04g809c3dz507wlrb9bnmarapahhn";
-      name = "kde-l10n-ru-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xhqd4bxhv3p1mwr4j7h59858dc782ycs-kde-l10n-gl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-gl-14.12.2.tar.xz";
-      sha256 = "1mpzxlk93bf50ajk3m9ly19fdn34rnpznap6bad05zj9wczin9km";
-      name = "kde-l10n-gl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8p2ygqhbbzxmnrjjxyris3281bdklbm9-kde-l10n-da-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-da-14.12.2.tar.xz";
-      sha256 = "1lqs9fpp1dj8r0mpnjy8m7aa9jg8iv30k7wdpxpcf634m2p06911";
-      name = "kde-l10n-da-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gdrvx87d6y9q47alc0s2251dzm04wpdi-kde-l10n-sl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sl-14.12.2.tar.xz";
-      sha256 = "01yj9wh5zr72vgxman2j49ihhcyxr2yw820g2cz68bbqh829riiq";
-      name = "kde-l10n-sl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qcs4fdkjrkgva632nqyi1z24h517fvl7-kde-l10n-id-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-id-14.12.2.tar.xz";
-      sha256 = "1cc1yfps29fakra3xfnnzf6blqsydx4r9scsd0w0f8xxk3mr87j7";
-      name = "kde-l10n-id-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/klsqxbpagy7jj2ha51hqr7h9qpd4qg9s-kde-l10n-ja-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ja-14.12.2.tar.xz";
-      sha256 = "0i7x21yvj3ipg96jmfqs7kaixqa82f5s58mpi34vyypcc1ap4731";
-      name = "kde-l10n-ja-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lmg22mpi05l0944ihv9z72jg1i8xs2zc-kde-l10n-pt-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt-14.12.2.tar.xz";
-      sha256 = "123j4h4bhy0xdhazl18yccp17283k98s4f09f24r5b54yzw5cs0k";
-      name = "kde-l10n-pt-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pgw29ki339a22l9c7incm93qvmjhvwif-kde-l10n-mr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-mr-14.12.2.tar.xz";
-      sha256 = "02z4hq74gxgvcnx0za74zlyx01m407bc3219wiqb88ly5b6g59af";
-      name = "kde-l10n-mr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4p5v5j7l1j5xvz83jilwmmg22v5pl1y0-kde-l10n-he-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-he-14.12.2.tar.xz";
-      sha256 = "02lmsvdyw878hk55r5dqm065n3f1czgq0icspi25ibxgvhf0nmji";
-      name = "kde-l10n-he-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pzpmizw0hsfczli3wk7mihsad2ziwnjy-kde-l10n-it-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-it-14.12.2.tar.xz";
-      sha256 = "09sfiv36q40sy9w3nqld89lgmpd8kba6xav683a28a1i0ipsjjbc";
-      name = "kde-l10n-it-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/7gphdvwvll05pn6dn3wxydy66d4an0hc-kde-l10n-ia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ia-14.12.2.tar.xz";
-      sha256 = "03jkjrbgp59xiwrbj9hp55y3qhpcyg1gxwv0vcbvxaxpg1zg7s1x";
-      name = "kde-l10n-ia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6xryf5sf70rqzsp6zirfc85hbq8mq93q-kde-l10n-nn-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nn-14.12.2.tar.xz";
-      sha256 = "1wr73m10liqvd7fkq3gqh4y2ibwgm200cbk6dv58xr25jjh1ji2l";
-      name = "kde-l10n-nn-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zjdd8bp4639ylb7wr2h0a6zl4ka4hv5j-kde-l10n-ro-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ro-14.12.2.tar.xz";
-      sha256 = "0p4b7bngb3j2xsixk3s5wks7050famwbh00cgdpq8gd02i01iplc";
-      name = "kde-l10n-ro-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hm9hivcnjbbhxnr2k1p95lfa57y9qpa0-kde-l10n-is-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-is-14.12.2.tar.xz";
-      sha256 = "1fz1azj7z127zpf257hzavsd0r3k7j1gd3wgw5i9prr3n0xp589j";
-      name = "kde-l10n-is-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hp26lgcf3jrgcqsrai43kvimlpq9gs48-kde-l10n-en_GB-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-en_GB-14.12.2.tar.xz";
-      sha256 = "1vmgrbx31683j47na433h2sps961h5av1rkqrmspdpls32g3hjq4";
-      name = "kde-l10n-en_GB-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/y18jr4kswbh1qlhw83xyig9rri07yya3-kde-l10n-sv-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sv-14.12.2.tar.xz";
-      sha256 = "1a702cyyhg5dk9bmfxmpsyj4h9lk2hrm8rcdzwy6lmhvclgc4iqj";
-      name = "kde-l10n-sv-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bcssbybfddwdy45n5sfr8aw2a6xxpn27-kde-l10n-pt_BR-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt_BR-14.12.2.tar.xz";
-      sha256 = "0lvjzcpv6j4i3xavkcbjbz17mxzj59rqiq9gxhvqnk6wihzwr3d1";
-      name = "kde-l10n-pt_BR-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xszl4r8c43w086w15mf61lis5ar4ig24-kde-l10n-lv-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lv-14.12.2.tar.xz";
-      sha256 = "1i8xd2apf8gr657w8jzc2vj4s7izh1kpqnz1n75yk2b8gbr0aiqq";
-      name = "kde-l10n-lv-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5bknljgh37bx5v4c0vnmigasa3xq3cka-ktimer-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktimer-14.12.2.tar.xz";
-      sha256 = "15bar1j2var6i1jawq0nc4zkifl1qghciqyqavx39sm1cxphqirf";
-      name = "ktimer-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xmalh942dl6rygwk4jxpirabx2l8n0j4-ksirk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksirk-14.12.2.tar.xz";
-      sha256 = "0ab8vbk5640jaq6r0f0f5nidf0xx62lb140hq42flmid0hw6ls57";
-      name = "ksirk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hl424krxwgahhhykhwhq2lxmrjdvfrxh-kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-      sha256 = "1802iy6w5wchj2lj6b7yp32nj4pbh1pn44v2pvhafg0nj49rn0iv";
-      name = "kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sv2xx8whd4smmx447iaxg3akivyk74gs-cantor-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/cantor-14.12.2.tar.xz";
-      sha256 = "0hcxr28083qadm7b6pjqh959dvj79dvymkigxv851ainvspr82km";
-      name = "cantor-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ka3asqxgpas752w1h3agc2c1ka3brp19-libkdeedu-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdeedu-14.12.2.tar.xz";
-      sha256 = "0w7wkcr46fp3gidfgm4gp3q26vxp4szfbqmk4624ysrdi85aa6br";
-      name = "libkdeedu-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dw2kr8sgmcrw2p3vy1cqdq2jk93i7rmr-bomber-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/bomber-14.12.2.tar.xz";
-      sha256 = "12ff8rikxb1x7j4b5jg41ph5pgp60vn133npzalq5vsldmrgj3h9";
-      name = "bomber-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iifrjlqyrylq47kvmb7idgig4y05yp69-kopete-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kopete-14.12.2.tar.xz";
-      sha256 = "025pwhvcidszg4mv8hw8hya9xvgw08yvkzigxsk4pjn5vm49y16i";
-      name = "kopete-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/c1s7763fzbnnslcn95spcv0swp6gx3xb-oxygen-icons-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/oxygen-icons-14.12.2.tar.xz";
-      sha256 = "0dc0zkl7ivigcf5vf72gqnijm8p64bq4ibqkr02k8yv7yqq123wz";
-      name = "oxygen-icons-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ff917gin734l0i1w84xdq2s6hjkjjmwp-kmplot-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmplot-14.12.2.tar.xz";
-      sha256 = "1j7fnqi02pqwc0pgv0qgykm2hih5ncg7pbkwyskj5sds8xs86f55";
-      name = "kmplot-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jv7gpjyhacvmdvbdy5j34nrm06zk2aig-kmahjongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmahjongg-14.12.2.tar.xz";
-      sha256 = "0dc9majrsg2fgl8s8wqyhyjl3d40qf4m7wxx9m7076sa2h8hj4g9";
-      name = "kmahjongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/x3c14mkaxp4swyxaa7js7yq1rgrx7gvf-kolf-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kolf-14.12.2.tar.xz";
-      sha256 = "1yiq1sw6a74s8pq7cs4rl8rvawcb3rrw2kbwdgcaqvq0krgnlc8h";
-      name = "kolf-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/habi2k9mvpz6l5lj2i2yfig6ghxrkf5g-bovo-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/bovo-14.12.2.tar.xz";
-      sha256 = "0z20lywx4x4pqdbqqhz0m84vzml6kxn53sl17z0lgnf74zh0vqam";
-      name = "bovo-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qjs07i14179wq2gj40gcj99q0i7fgsmr-audiocd-kio-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/audiocd-kio-14.12.2.tar.xz";
-      sha256 = "1lix6yzradscrr79b4fj5lqs1f6wlrzyr0qwk5mvb9g326p8c4sr";
-      name = "audiocd-kio-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/byi9jaq7vijdfqzbqyyl8plk0mgb6cf2-kaccessible-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kaccessible-14.12.2.tar.xz";
-      sha256 = "1xq40cl7pqm65k9h3yvhn7zjb80z3lpqyp823wm6nz6qld4hr4bg";
-      name = "kaccessible-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/47visnxvfz3h8wa0485wiq5659y5li8k-konquest-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/konquest-14.12.2.tar.xz";
-      sha256 = "1h9ql9alyprh8ykfzfgj3nkch40hdp1vyfkshm5kaab15b657bgy";
-      name = "konquest-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ccx7yrjpgljpv0f61jlczmx738y7skpd-libkdegames-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdegames-14.12.2.tar.xz";
-      sha256 = "1pxq9gzw5m5i8d1v1d34mvmfr138hwfvq5z9pg2h9zw5y3hs9g7s";
-      name = "libkdegames-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/swpywmriiwy1npn7k3gcazisra9gfzqb-dragon-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/dragon-14.12.2.tar.xz";
-      sha256 = "0gd9zr9fj4r2789bi6f836y7m6df08p05vizdy04cf9s2hjkr9wy";
-      name = "dragon-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nsrq6d9bini4804hkkzsny91rfxcgp01-juk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/juk-14.12.2.tar.xz";
-      sha256 = "08brdx7hfm48hmhc0rg0r3c4brb3mkb0r23j2ps0y210pwarkwh0";
-      name = "juk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vjbvvbnqg3fjghc19159ikqm6yii6z30-cervisia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/cervisia-14.12.2.tar.xz";
-      sha256 = "120a8brfllk6jybn4zpyj0w5bpv2dvibcqbh37qh9ld2h6v9rrr2";
-      name = "cervisia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1nli1nsr1a3j7wprpjhwmmy418l6ibx4-kdesdk-kioslaves-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-kioslaves-14.12.2.tar.xz";
-      sha256 = "14vk4aqdwny4iidsvznfzss51k1376lp4v65bmqbpwf2kg6mis2s";
-      name = "kdesdk-kioslaves-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/cr9ncrb5lfgi7nyrdqlrh2c3xlj2a5rp-kdelibs-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdelibs-4.14.5.tar.xz";
-      sha256 = "1jizh61vz83za06mb23hhakx99jf2c59c02fz5kld9mnxzzl5fgm";
-      name = "kdelibs-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9vi7j77n4x5qpl4jphl3cc52cc34wymq-kmousetool-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmousetool-14.12.2.tar.xz";
-      sha256 = "06ifiay1mxcfb0bzzcf14xkvd4iwy9va37x3jm0xxhy9641cxq7i";
-      name = "kmousetool-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4v4hcxa9v1hykiypb159p0618nf0dij9-kalgebra-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kalgebra-14.12.2.tar.xz";
-      sha256 = "10iz0vjn8mscgkb0vra8ac0rbdyw45xzz5rydlkczr9w3hxnccyy";
-      name = "kalgebra-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ilynhcqbrfbhafhvmbag1j7nrkiicszs-granatier-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/granatier-14.12.2.tar.xz";
-      sha256 = "16v0pyjby6yyrqm64p4a0lkxf0bb50smkz680b1yp3mcc5nm22mw";
-      name = "granatier-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/64fb2pidpaccqzk5wddvvxma515fk6nl-klines-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klines-14.12.2.tar.xz";
-      sha256 = "10km97mbz9z816ki12jki46mb0h2829l24spiai9pk8mbvkyqx3w";
-      name = "klines-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1g8n4bq8p2dn5mvncb6a046kjmndgfpy-kmines-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmines-14.12.2.tar.xz";
-      sha256 = "04axmsgq3wcim5fs9jgwgbb9z7p0a96qxhm50s5dwk4lv6fhzzv9";
-      name = "kmines-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l32ji88v0j54mhvsqdg7ysqqalnwjx4p-superkaramba-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/superkaramba-14.12.2.tar.xz";
-      sha256 = "0y3ld6hpbjjqkpmrpbxmznv5vjdiyh3rw6dqbygap33qvw6b3d0d";
-      name = "superkaramba-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/67i12gxqd5p15vdl8b5a87xl28fn9aqv-kdiamond-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdiamond-14.12.2.tar.xz";
-      sha256 = "0g3al1p68q4ypdjrnq6sf738w84x3a2l71fpg7qb5kgpaixpspjj";
-      name = "kdiamond-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/inss9axxxz7szp7icfwsrms9jyc4c855-kigo-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kigo-14.12.2.tar.xz";
-      sha256 = "09b5hdfh46mi5qpgq0j02qw2wfrsach6lw9ydg0ybplyfvmp27l5";
-      name = "kigo-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5dh19ycmzai2k5xwgiwmpi05nn60k089-kdenetwork-filesharing-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-filesharing-14.12.2.tar.xz";
-      sha256 = "08parv67kilxh2nzgbmj3q9g6pzncjjr23rl6ylh3vv8p2vr2v5h";
-      name = "kdenetwork-filesharing-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/px8xd5vjs7y6g7h4vyyiksn818waffy0-kajongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kajongg-14.12.2.tar.xz";
-      sha256 = "1863hczxmzrwvkv2y7kj2anf56fpwih70plsa25mkmli6l5x120q";
-      name = "kajongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/670zy2wyah5qw0rp7kmzdv9q3hl2cl25-kdepimlibs-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepimlibs-4.14.5.tar.xz";
-      sha256 = "12p03dljr6sldl4pxww4gb18mrvdi61r85ippmljknr4sq26kd8m";
-      name = "kdepimlibs-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nqwz22sa222dkr9a6mmgyc2k9xahbv8h-ksystemlog-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksystemlog-14.12.2.tar.xz";
-      sha256 = "1j22944ham5x3y8qf7gka81nnq66f81lwrc65zmzvbf7vyj813kq";
-      name = "ksystemlog-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aw9ahw1ywy5m8k8j0a2l5qfg0n2n2yn6-kturtle-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kturtle-14.12.2.tar.xz";
-      sha256 = "087wfff2qpl2shxjwj30lna480skx8j1z4rlvkbyywc645gd0afb";
-      name = "kturtle-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6w3pnklzw2kd761dfg3ya4k0xawnyp27-kppp-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kppp-14.12.2.tar.xz";
-      sha256 = "1hdywnsvpybfc5hcja2msfdim9g37pgggkjp4kkahc9gv62z1m0i";
-      name = "kppp-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bbi9jdxjb1hm2cd6flh08h7ql90m9ppw-kde-base-artwork-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-base-artwork-14.12.2.tar.xz";
-      sha256 = "16jg0pm6wqqsl5g8hf55iacgxjh5x92shmf9263xpc1fiq29770c";
-      name = "kde-base-artwork-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iq6qjaw0n37gq49r4lmkjzyasvghcss5-artikulate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/artikulate-14.12.2.tar.xz";
-      sha256 = "09jvjal3r6bl77aby1wzbpyr4rxqmghc759yrg1rbqca1filzd5w";
-      name = "artikulate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dawjc253wxbw6624zjr0v2yrq9i47v75-libkdcraw-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdcraw-14.12.2.tar.xz";
-      sha256 = "0xj3dhyz7mf65dqiw2zz6mp3xmfaczmr7axhy0h6z1ynbyl1vkcm";
-      name = "libkdcraw-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zb2sqh3qjd53nmqhs9m24kag1f3dxiah-kdeartwork-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdeartwork-14.12.2.tar.xz";
-      sha256 = "1svw3ah03g751iy37i06kw4d6jzgc8yy9cjayf3xp80m37fpjlws";
-      name = "kdeartwork-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dmi1azffqm3c8gjk1d300a0a2jps2j4v-klickety-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klickety-14.12.2.tar.xz";
-      sha256 = "0rlp4bgzg7i892a89zrgaj0m1zwbb2g8ap9np3dpqljaf2la9rg3";
-      name = "klickety-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/f5ycj631mpfnyb8mngzxmvgngyk6lsw8-kspaceduel-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kspaceduel-14.12.2.tar.xz";
-      sha256 = "175n2jbx9m3yhsp10bj1fk9d2vfv2dlqd1qw7l3kmca5nr7ripzb";
-      name = "kspaceduel-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/49b5c3cm0ysi2w89a161ysmirpmckcls-kate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kate-14.12.2.tar.xz";
-      sha256 = "0n6b5jcyb428gx9xflsqjs1jhk51n12yxyfzl6cvg29vai453fff";
-      name = "kate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ddc07v0j09547gnspl7c7fgcrbvv0fk0-kgpg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgpg-14.12.2.tar.xz";
-      sha256 = "1ihxkcx162jp4b2qgpwa65iq90n1bz21l6fli1z530247h7vzlbw";
-      name = "kgpg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jvxwahcgixjygdvvyiprgwhi1c70cb5k-khangman-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/khangman-14.12.2.tar.xz";
-      sha256 = "0piyyqvfawgk3mbm51saigaswcpbk86my5v8mvha220sgzamnj9l";
-      name = "khangman-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/whd0iampjk6i5fm234gcsly38sxh5nb6-kgoldrunner-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgoldrunner-14.12.2.tar.xz";
-      sha256 = "1ijykdnfslp2vp3y0ji0bbf9zj83rbcywvg0kgiza963vzhf7rcw";
-      name = "kgoldrunner-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bvj41rw9x0014q6k67d2f6w8xqwpf9zi-kdesdk-thumbnailers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-thumbnailers-14.12.2.tar.xz";
-      sha256 = "1jyn507y7h2j8cb6nblc2lcf16ld9rn9cvi4xhj4sq9ccz0w7vz1";
-      name = "kdesdk-thumbnailers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kpv805bhwfkn95rnp8hzl42c26h8678l-amor-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/amor-14.12.2.tar.xz";
-      sha256 = "0wqh3csi0isfj3zpmsay5p38sbajfbrhkv6lms5nqr4k81kcpq55";
-      name = "amor-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jfkymr2flr7p986z1larn1i2qndrij8i-ktux-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktux-14.12.2.tar.xz";
-      sha256 = "1pml908z08y0ik4d0rncavrg26lqvchza113kxmyxc7ak95bwypd";
-      name = "ktux-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vn70b248ilfjrxv9sz30c4m1czb5n6fl-rocs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/rocs-14.12.2.tar.xz";
-      sha256 = "1nb0xq051081wps0i3g6p6vawj89vaa27di1hi2nhm1y0hx95m1j";
-      name = "rocs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fxn7qcaa57vxyc2qfnxycfv8hpvqn190-kcachegrind-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcachegrind-14.12.2.tar.xz";
-      sha256 = "17v1ap9jfzlk30xhx9m5456bqky4m0iywvq34r8zpwkbg4a49la9";
-      name = "kcachegrind-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bishs7m7snrvyrvcxhly4p4d148rmfxy-ktouch-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktouch-14.12.2.tar.xz";
-      sha256 = "1c7mi9cs17z72hg9v44yki85lqsnl96vgrckz5qcvca2b4w3bjd3";
-      name = "ktouch-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3l7a1yydrkd824xfjsxla8swzcv7r8rx-svgpart-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/svgpart-14.12.2.tar.xz";
-      sha256 = "1zkc6p8ycpm4pa2p9yq4ajkcnqi8m3mmv8ghdgi2q3a58fvf2zz5";
-      name = "svgpart-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xwq02smnzwz54i165vpgm8aaamcy02xp-kmouth-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmouth-14.12.2.tar.xz";
-      sha256 = "0qmh1kpl1asy5av976461i9fp81qan00jbqvfhi5dnli9zfrfmb9";
-      name = "kmouth-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vv15hxdzvvgj3xhw5pig0kbzm3206j72-kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-      sha256 = "1acfdcg0h9kb6171lqqrnihvgynrp0har6frq0igpkz475crmkid";
-      name = "kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g13aw9ppjbwj5rcyy46ccp9yw81bxa2d-kruler-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kruler-14.12.2.tar.xz";
-      sha256 = "08rwsmjbbaapgn98avagn8i3qmvw5fzq84snxy4a74dzf14aph5z";
-      name = "kruler-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lzky584al80dy5xrwvax7xs974p5s5xq-kollision-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kollision-14.12.2.tar.xz";
-      sha256 = "0v6hq3biiybrdd4lblzcadh5kpy21kjlkb5iqga95h7xxm6vd4dq";
-      name = "kollision-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g6zkyj2i5s910qb9snnabr4ivklvgajn-libkcompactdisc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkcompactdisc-14.12.2.tar.xz";
-      sha256 = "0xi1yrls8nsq9flll9250yfqx076p0xdxrywpiivx3yv64znjz7h";
-      name = "libkcompactdisc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fcm4sghdd7dl98zagm7xfg7lfcbhpi6p-kcharselect-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcharselect-14.12.2.tar.xz";
-      sha256 = "0fsmh3wsiz49wgc2l1p8caclhx03mmf4q7v7l72yf59c3pczh74c";
-      name = "kcharselect-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/r7gzmhlg6wlbhhxyx11n88pnd3qs1nbg-umbrello-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/umbrello-14.12.2.tar.xz";
-      sha256 = "1p9sdwalzi5j59xplzzd96m8dsvzc1r1isbljgj55h8pc3sn1am2";
-      name = "umbrello-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1dqlriz6zxb6ss4gq2ccswn6swzxk1fp-kapman-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kapman-14.12.2.tar.xz";
-      sha256 = "00qdq5fabm6pljclchiqi0wa3cxdfxbiqs5vw86190ki23qgqfkw";
-      name = "kapman-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hwhbjrqg3qycpsq6kxd17fmmic1iv1ls-marble-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/marble-14.12.2.tar.xz";
-      sha256 = "04khv00h3w0i6igp8b4zh0xyyl7a3aqhbszj2qlpydghr1ghz2js";
-      name = "marble-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/b17whbxz6q409ghxcxaia83v95adkdrg-knavalbattle-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/knavalbattle-14.12.2.tar.xz";
-      sha256 = "07a9z0s12v2f5irs3d93pqjsrwv4zs7sckgvsbgaklbxwar1p26n";
-      name = "knavalbattle-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/krcpms45cvn7dnv22rp9bdri7v76bcvd-klettres-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klettres-14.12.2.tar.xz";
-      sha256 = "0ca23y3d2s2m4mzqvw3jknsns0da3gzhqa7g4hicl35v4cbi8w7z";
-      name = "klettres-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/b247bpgxvgl1msrrfah432n99hi6h4h2-libkipi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkipi-14.12.2.tar.xz";
-      sha256 = "0dp3n4awc4glwlnygq8k6119hxl2lq0l66a8a2m84bhgf1xqn05j";
-      name = "libkipi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/djjlbx20jk6pv82jrk626k183hkn65qx-step-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/step-14.12.2.tar.xz";
-      sha256 = "1r11csc1hlkrydrznprdvq5sxnmhlpb1v08ns96bs27nxbz29zw4";
-      name = "step-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/n3w571knhskpnv263dv67vncy1h4613i-kompare-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kompare-14.12.2.tar.xz";
-      sha256 = "0ma1kwn7psrffs2fn80did8gmv3cr527lb40n1jrvksq15fcfl5k";
-      name = "kompare-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/r4q34i2lsi4dcpqvpqzc8c628l99nrh1-krdc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/krdc-14.12.2.tar.xz";
-      sha256 = "069gp9ahq78pl2ax77c4k0sfvb3g70gl9ph8ariarhh3f5lvzh25";
-      name = "krdc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/0wq7q4n2xxkw0vn49ajjv07b9yc316b8-kbounce-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbounce-14.12.2.tar.xz";
-      sha256 = "1iw6gwy01ri7kqc5qkk296rzbz3j1swhshxkv05vqpv69vwnfxpp";
-      name = "kbounce-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kbkrcfralyq2hal04r5qbsc9cw40yf2d-kolourpaint-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kolourpaint-14.12.2.tar.xz";
-      sha256 = "1r0xs4pisaqg53nc6zgn7bh95346wsb9756d9lq6zgp8jf2lcs4h";
-      name = "kolourpaint-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nb1lzzscqr6g5m770aw8zjqxmng6c23s-kiten-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kiten-14.12.2.tar.xz";
-      sha256 = "1y1anhvdmcflkmhya24my80c2hfpnhw8w1b2mqqr4xyjbl0plaqs";
-      name = "kiten-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/la8lyk56j0crfjfj1h9yjxgws3f9shbl-libkomparediff2-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkomparediff2-14.12.2.tar.xz";
-      sha256 = "122078hvi34zg183r8i2ni37xi00bzv7nr5251lhgh0fd45d565i";
-      name = "libkomparediff2-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/h9n5pglbgwqxiwdpxf0zrkyfcnqvjgyh-kscd-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kscd-14.12.2.tar.xz";
-      sha256 = "055fdr9l79xjcrl33sxmk82dsbchjjwgmd75dw0sbhwfxs99dvif";
-      name = "kscd-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ah46p15xxk89lrydhxzvyl83q3jjs5mr-kde-dev-scripts-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-scripts-14.12.2.tar.xz";
-      sha256 = "1fclm5wvz58565fx366sia4cjqrb2cr843skw4jpzhh4wb1v9v8i";
-      name = "kde-dev-scripts-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v5cdrabvrfx1dvjibhzj6a1m200p53ks-ark-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ark-14.12.2.tar.xz";
-      sha256 = "1aj7dshigv25qki93drpfwgzdycvvh3kl52a0im7g2k6aj1yjg6b";
-      name = "ark-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jgnxszypng4x7wlhz0rg8390bkh87lgf-kamera-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kamera-14.12.2.tar.xz";
-      sha256 = "16zjdx7b1nqh0nfbz0qplvqhl2jnl6l0jc3lfxifiqxsbzr9wlrr";
-      name = "kamera-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mfrl2pk66facvk13mm0609ign7ilympz-kapptemplate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kapptemplate-14.12.2.tar.xz";
-      sha256 = "18dpbvdhi8qpfxhrcjkk71cr4b7gf6achg24gn6i4rcq8bbbv07m";
-      name = "kapptemplate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nqh3y6b9y2zgrkb07yrs07sqcxqmwwsv-libkexiv2-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkexiv2-14.12.2.tar.xz";
-      sha256 = "0fjrvk2dcd4xzbs5v6nrabchkqbvf4qhljlc10797a378sdc8znp";
-      name = "libkexiv2-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cf4mzk51419c0v7ld561gb8jk496qgaw-kdegraphics-mobipocket-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-mobipocket-14.12.2.tar.xz";
-      sha256 = "1n2n2pd8ca5lnyv2r98jr4k9sm7lsvc5plw11xy28q829aayg8jj";
-      name = "kdegraphics-mobipocket-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yl49rnhq8zxyprh004g1qnqiw148x8kj-ksquares-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksquares-14.12.2.tar.xz";
-      sha256 = "11hznb7jdamq8hnbxggdj33jrhdnxzrhapc1rsj1ms546z01flnb";
-      name = "ksquares-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ahgf7lvgcy0fzg9wzwc0agi77bj652lx-kget-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kget-14.12.2.tar.xz";
-      sha256 = "1jadb5x8bn80gwviw73cq715sw9hzx8lpj33d19vv18l2sqyb449";
-      name = "kget-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cv1vcvvi2nfic2p51vv6jf1nc2dwv7jm-kde-baseapps-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-baseapps-14.12.2.tar.xz";
-      sha256 = "05j034g5h9cd2xw64h5zyjl8biq66p3b0z4z0z0i4min4hp52f7w";
-      name = "kde-baseapps-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2rxc1y0r19zx61g6n9kgfp1rzgbs44xw-kcolorchooser-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcolorchooser-14.12.2.tar.xz";
-      sha256 = "063ahsbzd1mfrkc45gjsnhj11v68x7d1a718lxsabkjjx59qpbck";
-      name = "kcolorchooser-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dg4a3cj0wssfw3z10bwqxqrkjk3dmqaj-okular-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/okular-14.12.2.tar.xz";
-      sha256 = "1ahw7a8i1hxa8hw0407f9x1s02zn659nprx9bfi1mvxhcn5zbwq8";
-      name = "okular-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/x89vahdh994ax46rl3mx3dxyigph3zq4-killbots-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/killbots-14.12.2.tar.xz";
-      sha256 = "1zvjwimbjld408hplb439f4k8rm6aanlvycpmf4fdiwrcg4zjq6c";
-      name = "killbots-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3d0583a63pwkq8sszvl172d69j648gnq-krfb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/krfb-14.12.2.tar.xz";
-      sha256 = "112bv9yyhg7zyhkqavjqgvkzbjm54hw4nfqrj3jmcwbjbnlzkkxm";
-      name = "krfb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6sm1200z80xxra4ibjmpgi5b626is1kc-kfloppy-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kfloppy-14.12.2.tar.xz";
-      sha256 = "0a738m6r54g4ibinxwh70d7sp736r8lr63ca8hx90a1yl5samr1b";
-      name = "kfloppy-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/i36hvnhadldbxl9yl9sgwzgbmip6nazh-kblackbox-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kblackbox-14.12.2.tar.xz";
-      sha256 = "1j9d33k8732dbwdnv85kr51jmjvnlcljya5q2zp6m97cy7xrf3n5";
-      name = "kblackbox-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hnk7d2fjhvzd1j1c0pjc4kqh3a4zv7bv-kalzium-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kalzium-14.12.2.tar.xz";
-      sha256 = "16ngwp9lf15l06yzazymrdbszkq9sx14wh4k8w1sydryl15xl77n";
-      name = "kalzium-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/a6cidm1dwqxq34q0wffn8b553xwg3sxv-libkface-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkface-14.12.2.tar.xz";
-      sha256 = "1mp19n7jhs9x74b8rlnrdc7ig1dx0v5pjvl6b4fmzfglk9akhh7v";
-      name = "libkface-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zi3aqkz4w4s4ldzscvwby1r6xkldxpdb-kremotecontrol-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kremotecontrol-14.12.2.tar.xz";
-      sha256 = "1sbzycb2b4s7v1lr6d7g4xqadwcxh5jlsl01jl3dpni83phxzk3q";
-      name = "kremotecontrol-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bpi59fwiqf4rn8xgkzkhyzr6ajv1d2la-kblocks-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kblocks-14.12.2.tar.xz";
-      sha256 = "0wcb6sgbr7gm9hh3gb31zmw6rqmflzis44ry1zb7yql0kf95y5ka";
-      name = "kblocks-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g4xg6d0syp06k3znj4xyiyv9ykiq64pf-ffmpegthumbs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ffmpegthumbs-14.12.2.tar.xz";
-      sha256 = "1261dkxyj07gjs6rk7wh8vkxk9554b675d68w4yfzf4agb8kdb8b";
-      name = "ffmpegthumbs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/0s00l7a87bg4qzbd43z7yp6pqff1icn4-kdepim-runtime-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepim-runtime-4.14.5.tar.xz";
-      sha256 = "00pmiifhf6km9v2hn3xiapr4vwrrijnvyjirprs99p8h39kifblc";
-      name = "kdepim-runtime-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1cdzh2b6wq0nmkvjx6spl70pj3538sl9-print-manager-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/print-manager-14.12.2.tar.xz";
-      sha256 = "02vz69aj56hx9jdckacjd7yzr1cmwmlqd7b3n92zmn9bx152sx86";
-      name = "print-manager-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vk3f3512rv381dpcwihmxgx4av3d92af-kdf-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdf-14.12.2.tar.xz";
-      sha256 = "14dgcrmny2gvi3m4y95di6w3gv1bld6pbj5i5qaphhxk5gl489a0";
-      name = "kdf-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rslsx2zc6zf7hls6l1m598a04r6l2h7k-kde-wallpapers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-wallpapers-14.12.2.tar.xz";
-      sha256 = "1q9p1ay2n4anr822wx7lc45hwwyyl1328ick704x6kd1rz1qwjiq";
-      name = "kde-wallpapers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2zkg1fh4kr78r8qg5nrn72k431vxd96z-kdegraphics-thumbnailers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-thumbnailers-14.12.2.tar.xz";
-      sha256 = "0kvqbdmjnrn5fx9ci9f4fnwk8b20d9cvxdb966cwrzz6x6rik7ww";
-      name = "kdegraphics-thumbnailers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pb6xr7b484aszpwr3pvd2pywliij31y0-sweeper-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/sweeper-14.12.2.tar.xz";
-      sha256 = "1k0brig6m5y5pv05lmpmc0m6wiz981jyx1brhy3ixv40bivm4cf6";
-      name = "sweeper-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6im1sz3rqm53siyfapz4p518vaa05nvz-picmi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/picmi-14.12.2.tar.xz";
-      sha256 = "1xnxsvpigsf4mjnxxp5w5nvp817az7c7p11z960z5f18adxg7frr";
-      name = "picmi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qprvh7y50d15356kdspb4cxqvm9xc30i-ksnakeduel-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksnakeduel-14.12.2.tar.xz";
-      sha256 = "1gw9sv67jnwcxsm4qw21hjbv3fbnxw6ibr4l8zrcccahlz3lc8x1";
-      name = "ksnakeduel-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yak0kczv35nhxbgr15mqr6zy9ncvg5jh-ksnapshot-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksnapshot-14.12.2.tar.xz";
-      sha256 = "15ka0h8bc7n5023ghwgxvq36bjaipimcs09nrg3z4nvdzds6xsfr";
-      name = "ksnapshot-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xz6x2nvcwz2k7df7p8s8wx42309a2rhd-kgamma-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgamma-14.12.2.tar.xz";
-      sha256 = "1lzvgdqh3i8klnj243rfak6sksnh3z10diki65zzl8wsjyagizq9";
-      name = "kgamma-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ydd7za8ax4jb54rap067rzkwfv2ars7y-okteta-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/okteta-14.12.2.tar.xz";
-      sha256 = "1xdyg54zzylj8s6zr4z5npi9pvqx3bjma68j3p7ymqvaa71a1c0n";
-      name = "okteta-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/99n02c3v71ycxvywrqn14zrsjgli2nkz-kgeography-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgeography-14.12.2.tar.xz";
-      sha256 = "10bzwbxg4k487700mnkmk642b5jzvpadcmd8y3h3af91syd0v7zp";
-      name = "kgeography-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6z45z434l9dw981lqixg0jw7mb2s1j47-knetwalk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/knetwalk-14.12.2.tar.xz";
-      sha256 = "102bd37i3z57xkq6rs7l2s4qlwayaky4qb07bh3c589g2s9nxl28";
-      name = "knetwalk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ypdsbibg2isd991n9bmdkgi5wi59ibnk-libkeduvocdocument-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkeduvocdocument-14.12.2.tar.xz";
-      sha256 = "1rf2signnpx7ik3p7vrvlkbv0g3m280pc1qz1fxzw2kjn9ais2r7";
-      name = "libkeduvocdocument-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/i5wnc7wqbmnac1awgd45iz9d91b7misv-kdeedu-data-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdeedu-data-14.12.2.tar.xz";
-      sha256 = "09ch89pghjipxsr9j50a58xww6cxhrkh9z7ns6bh5kg9b6hc47rq";
-      name = "kdeedu-data-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lix9qbdd1ganlhwap696qdcyhq3awjgz-parley-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/parley-14.12.2.tar.xz";
-      sha256 = "0kq0nm732x723f1yml0cq3w1p7ah5m3q0lj0pvrvg5z393a1ki14";
-      name = "parley-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/b3kdfd6nv23lziv5nf21g00wl7di3vz9-kdepim-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepim-4.14.5.tar.xz";
-      sha256 = "07bg60b96wg107sn49h4phks55z6h69kdsznpfr09dsxf53vl2sc";
-      name = "kdepim-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aip7i17kab1fcv43qx999cxwr8b05gdp-blinken-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/blinken-14.12.2.tar.xz";
-      sha256 = "1dkdgfmpccbpb4i4h34dg407q6h18mq7x4k2d66bly0pkwhkwkbw";
-      name = "blinken-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hc68363pfz7k528lcv6p8gfj4r3bi061-dolphin-plugins-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/dolphin-plugins-14.12.2.tar.xz";
-      sha256 = "0lc6l84p3ixk2wzj4hbxwgvsmin3kw8xw40b3jrq2w1y21zbvf3h";
-      name = "dolphin-plugins-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6ycc8cckv9ybw5fj6qwn53ccn5dghcz0-kwalletmanager-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kwalletmanager-14.12.2.tar.xz";
-      sha256 = "0bynykq9j6xh0a712934vyvq3yr94676xhdvf1iazky1cwwmiryi";
-      name = "kwalletmanager-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vd8smizcfqw4zsks5sbf03chbxk9dqiq-kfourinline-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kfourinline-14.12.2.tar.xz";
-      sha256 = "14s4lb9kygaa16sq4xfmmabv31kg3rw7dw7k2f4vwqqh3s1168yc";
-      name = "kfourinline-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rvr5bpfppyd168gfqimfavs9g4ys2412-ksudoku-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksudoku-14.12.2.tar.xz";
-      sha256 = "10c148lksrh49mfvlx7q5i7xxjanhngm2s9d7ifx5xyqlpik2zcv";
-      name = "ksudoku-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/j2pwfcwc6n5r8klnbxf0gpal2pinan7g-libkcddb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkcddb-14.12.2.tar.xz";
-      sha256 = "088hhnnm09xfqkc0j2l252qgl7nlqmsdbchbr5cninf8n9ivz99d";
-      name = "libkcddb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gz25xkmky3kpl4hw2x9ahzr5xp3113f9-libkmahjongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkmahjongg-14.12.2.tar.xz";
-      sha256 = "0min3bpd2h0lch4412ybryk1bn3rs2s4936kcjn6mn0412xyjvdf";
-      name = "libkmahjongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g7hglkwmv8kdw0cjly5pysb3i4piapkx-kcalc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcalc-14.12.2.tar.xz";
-      sha256 = "0vm861cd9y8ax7mfnv2aszip2z0grmjvhzp10x5f7gq1fhm1db64";
-      name = "kcalc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/m69i89q12sb8mpc1bhs0a2miyrkfnq7y-ksaneplugin-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksaneplugin-14.12.2.tar.xz";
-      sha256 = "1scgp9p2jb5vwwdvbgmsbr3mmijiq40m5x7nd9qx7scwn2wqjvq9";
-      name = "ksaneplugin-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cynl1ai536dqs4cnlji5db1jybpzh7s6-palapeli-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/palapeli-14.12.2.tar.xz";
-      sha256 = "1fg2ikq19g92bqfp3j27mawl284xqiwd1nr8dg94khbb111210r7";
-      name = "palapeli-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4qwqpcwraxr0a8wy81plb3l3ij3jh3s5-libksane-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libksane-14.12.2.tar.xz";
-      sha256 = "07nw3mjc645angwyllzff0hb7i7lp6wl3fw88zqd380w5j13a46h";
-      name = "libksane-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.16.tar.xz" ".tar";
-    store = "/nix/store/afz1vd72namq3xca96zx1c9l6n8jzk4p-kde-workspace-4.11.16.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-workspace-4.11.16.tar.xz";
-      sha256 = "11mzr55vr7x2yym4gdaj9bcvp2qpbs3vlbfmhs74r5n08vmsdq3s";
-      name = "kde-workspace-4.11.16.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/wbjy41ymgplkg26cm94k6vny2vjl6160-kqtquickcharts-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kqtquickcharts-14.12.2.tar.xz";
-      sha256 = "0v5ng9spcbv22lhpx4hzfg3n56wfrjdxg6nls6sw52zbq12lagqn";
-      name = "kqtquickcharts-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zl8sxjy6mp1z6r3dajvf5ly5zsiasxjd-lokalize-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/lokalize-14.12.2.tar.xz";
-      sha256 = "04jmsysvx6ysyl3126bq7xg76y7ppzjfd55j7q7i18nrkcgw4y4i";
-      name = "lokalize-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/0sf32n3kd0fyvp4sdyv5yk4abn8gy54w-kig-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kig-14.12.2.tar.xz";
-      sha256 = "0c137jnkzpzv43yf7crymghybgz70d6q6mlfww53if2119sznzd4";
-      name = "kig-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gscz4fvz0xh0szcs0jr95xiif4115vj2-kanagram-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kanagram-14.12.2.tar.xz";
-      sha256 = "1s2zn876b3css74r79acq6wys4qlq9xgb3z376xfl71rzadvisvf";
-      name = "kanagram-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mljg8qpz9axmnzw9jarzz82a4qarvbwn-katomic-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/katomic-14.12.2.tar.xz";
-      sha256 = "0ns6apxaild1iiix03vjzvz45ba442agn4aqkbgik9x9wdr9yr7l";
-      name = "katomic-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3mm64rsb14p9cyhw31jzvqbs6nppva9x-filelight-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/filelight-14.12.2.tar.xz";
-      sha256 = "047bki2gnwvflb57vij1576d12ml4ga9b1q44dz9rq97wwfbwqnj";
-      name = "filelight-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9whfiwhxk7v4cfj1s863w6i789kgcbpf-kcron-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcron-14.12.2.tar.xz";
-      sha256 = "02s782x69xrymv3wbjcfm52v246gn3illdga7g1rmhs7kmi6q7rg";
-      name = "kcron-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dj7svyjh962g9c3j2bgprhmmnyi45pbj-kuser-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kuser-14.12.2.tar.xz";
-      sha256 = "0p2qwv24qxzx637v5fjwzscvxa7j84j91s4c4gj5hq8939anx7q2";
-      name = "kuser-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8zydgf0ncr96fgvyya9rg32ahavxm4c0-kteatime-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kteatime-14.12.2.tar.xz";
-      sha256 = "1vq21jw50w56i9bwx91hlw6a2m46q83mz2mg11cdc1nxk5gm1359";
-      name = "kteatime-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/im52lp4p99k9fn2ja5hch6m6glmlk7da-analitza-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/analitza-14.12.2.tar.xz";
-      sha256 = "0sjlsh8x4qzyg59zkvmrd312qvbhmf17349l0b989xm0m1nwmqfx";
-      name = "analitza-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5rmimmbz973alzhx2xm4r80lf556v14c-kde-dev-utils-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-utils-14.12.2.tar.xz";
-      sha256 = "007w4761cv2wxqhkk7mz2pgk7zmvzkfbmy0biriy836vx99xjdky";
-      name = "kde-dev-utils-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/91wk4lximnfqs5ly2q340rqn87h84axl-kde-runtime-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-runtime-14.12.2.tar.xz";
-      sha256 = "0cs07gbx7v6ilrbp4bgl20h1yrbh07sbrrf167pyd4lfx5rz9cgk";
-      name = "kde-runtime-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/whl3f2bs6018bg3i10akdsjvky2wgvwd-pairs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/pairs-14.12.2.tar.xz";
-      sha256 = "0gs76fgyszs9lrvszi57vldx6avfyiz8hdg5axb7nmyikiqnislm";
-      name = "pairs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/adksl0r448kybmvhs10crw43isw90i3y-kiriki-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kiriki-14.12.2.tar.xz";
-      sha256 = "0r7i6fh9apjhxc7khqb4lachqr95ypiagk7cr52kwpl8bd9zcz2p";
-      name = "kiriki-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qz2v6fj2akwll4s904z638pzwpyf18yx-kwordquiz-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kwordquiz-14.12.2.tar.xz";
-      sha256 = "03isbq1dbq5w0pd8jpb93hp6z4nwi28q5ccszvldisfna5abpkjf";
-      name = "kwordquiz-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jhh4r8rqhcx1jbqycy1i0x5x4ivqgjhg-kjumpingcube-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kjumpingcube-14.12.2.tar.xz";
-      sha256 = "1a030z8bcxyj70in7g574p80hsm32b8s7mqnl3abmw4315dc43kf";
-      name = "kjumpingcube-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ahyi8a1vsdyr3zdkiljrwmjz73dxknwi-konsole-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/konsole-14.12.2.tar.xz";
-      sha256 = "06rrhmmx8sdq084wb2a2pgvmi43fkjbmjsikr695c548qp76yzig";
-      name = "konsole-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gm8jph57vbjm15f2w0k2qijghdm9v9yw-kdewebdev-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdewebdev-14.12.2.tar.xz";
-      sha256 = "0n4p7jflrrjq47wcy20avgjiz1c5qgwmw8nqxmaaxj8vnwk2vx37";
-      name = "kdewebdev-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/s6n79j8914ms33xvjrx74s22axlh20b3-kstars-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kstars-14.12.2.tar.xz";
-      sha256 = "0fwfpjmr4i9kh1f3360ahhk01m8zrkipvdj0wn16a3mxvghr6vki";
-      name = "kstars-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kqvqadr6n5n2200w3gr5h978y6376gbv-kubrick-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kubrick-14.12.2.tar.xz";
-      sha256 = "0r7w6787gc2kcvjgddr0lw0liihis4a5s8rim3ycjlmh60bfw2ac";
-      name = "kubrick-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2m09vphyfk4wfl4pzxns8lgh00nin1pa-kshisen-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kshisen-14.12.2.tar.xz";
-      sha256 = "110fv7iqbv63sw0q8m1fj0x45ivmmhw2v32sx7my0hvch4rxif1f";
-      name = "kshisen-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aq90r77wq4qs67j8dvw89zppbrj5rhgz-gwenview-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/gwenview-14.12.2.tar.xz";
-      sha256 = "0ky9f8v3473f7ic2gaymc89f6yqnpi6vsbwlnqgjfwbq8ry47w4n";
-      name = "gwenview-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/29vsbhggrymqqgvs490jxykrf6mhvmhg-kbruch-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbruch-14.12.2.tar.xz";
-      sha256 = "12gs4l5wazkym3krcfc0sjzx9kji6ca3blmprw7hfwk1yqgd36rk";
-      name = "kbruch-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ccqbkxaxm7swcm1qf9rkvjs6fgfiafay-ktuberling-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktuberling-14.12.2.tar.xz";
-      sha256 = "0y5icsgkypcr2z9w8zbhn9z877dak2kjf0if5ag1lpmjlj0y397h";
-      name = "ktuberling-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8i8lf5v6bi77ijr3b8xwny3yrapqnxrg-poxml-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/poxml-14.12.2.tar.xz";
-      sha256 = "0d2iqgpxxfzvi9aim2xsz96gjpy1zcjr0f5fsha0hns6m6mdp1lh";
-      name = "poxml-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wx9ll48ipram4w163143ixab3lcdn9iq-libkexiv2-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkexiv2-14.12.3.tar.xz";
-      sha256 = "1rj7ac318rxl995cz70vdivk065mpsxk3sw0zqj7y0a2cgg67qrl";
-      name = "libkexiv2-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2bqk35id2iwy0hx56a4fqlj9hmzwn6z-kbruch-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbruch-14.12.3.tar.xz";
-      sha256 = "0vrs1mn701jydqjzlshwjq2366c65qwiz2gf37l31ha0nk8lxcxh";
-      name = "kbruch-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/14cmjnxm524ik9dmjb5p08c9hpr0xzlv-kde-dev-scripts-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-scripts-14.12.3.tar.xz";
-      sha256 = "17xwh4gwbagzdyfxb0wbl6hplrza7mj82mf1dhz5b6p1jjlfji96";
-      name = "kde-dev-scripts-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/r9f281gb1312wvy0dg8g8g5gd4f29mlv-kdeartwork-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdeartwork-14.12.3.tar.xz";
-      sha256 = "14m5hb1rzki0h4fdpg5bm9s4bm6lfx2i939jncjvxik8l5rk8wkh";
-      name = "kdeartwork-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w8s7d4pm150c4m392plhax8y1aawr8c3-libkipi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkipi-14.12.3.tar.xz";
-      sha256 = "1k20q3f5vgvndny7zj90r6xxdvilh1qg9vksvqn1vydz9wn15by4";
-      name = "libkipi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/388ffmw8i1b8bwdkwyr697fhq5cwghg7-okteta-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/okteta-14.12.3.tar.xz";
-      sha256 = "1wlimwi9j5x9y0j4zsx6d4c8xl8k7sr4wclbm6bi42fk34w27f56";
-      name = "okteta-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0ar4zk7r20w3xgnvv79n6kcx3p0fjvai-analitza-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/analitza-14.12.3.tar.xz";
-      sha256 = "1xlv47lgybw0wkmws6fkgjzskdmyzgrwgsfkixi2jj9yh8wj7jpi";
-      name = "analitza-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/kbi014f4cakyzj22fviawpqzqkfdc2f8-kdepim-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepim-4.14.6.tar.xz";
-      sha256 = "1c1mcxj10cirxwkzb71y2sik0xk45j2a1yhkpl5lgs1k6xwivslv";
-      name = "kdepim-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2m3n25m9xjnig9q4vqbwg00li866lsg-kteatime-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kteatime-14.12.3.tar.xz";
-      sha256 = "0k35gmpkmsc7fqp31l7jf5as0f25lk8kqpj300alryyr9m5i960d";
-      name = "kteatime-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xgcvm6ic3xjzlbd8xblayybdjz5f8ah0-pairs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/pairs-14.12.3.tar.xz";
-      sha256 = "1460wvjl17vzak74x5wgnx44db1vv900whl45hm6fjjciqpanb77";
-      name = "pairs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1q3i7f47j4mx8nrm0hl5hjjljn478a35-kreversi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kreversi-14.12.3.tar.xz";
-      sha256 = "1l0pmaqwcdlzi48dcyywzlrswfr3jkywcpv93zdgxx9fba5iyhpj";
-      name = "kreversi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8wiir69l2blpqd1w4b7mcmylsm8j2q15-kcachegrind-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcachegrind-14.12.3.tar.xz";
-      sha256 = "1xgn2a3ahwnx00fish7n5djx2ci89shf8mjrrq8lkg3grka6cv6m";
-      name = "kcachegrind-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hcy2r6snkvxxmnkr93y8yb5nhrzvk8a2-kmouth-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmouth-14.12.3.tar.xz";
-      sha256 = "1awkwq4h89qp04fid6d6df03b7fj7rdk0vjs683rpkz52qq8xwny";
-      name = "kmouth-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7sxzmrmp6y6xn4nq7zfqbjg2cf8y4zhb-kcron-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcron-14.12.3.tar.xz";
-      sha256 = "0w33d82253yasrhzswmpccc75mrjyrick2s6s3gibskcy3c9rx5a";
-      name = "kcron-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q54chzx2w5p1ifvkh3dkmqwxz6q35m0m-kde-l10n-sk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sk-14.12.3.tar.xz";
-      sha256 = "0nfikvbf10gklcn33pmwamiix1rcgdxgxk84a360rkahafw3xb1l";
-      name = "kde-l10n-sk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yn6w6h0ypqv34595f10l0jd76v8r3mdh-kde-l10n-mr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-mr-14.12.3.tar.xz";
-      sha256 = "0wmkg9rwl60q354y4kz0qmbwbv892v12ybps2wj4mplwq333d03m";
-      name = "kde-l10n-mr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/6azx1w8qq6g0aqz3jgz971k12va1si42-kde-l10n-et-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-et-14.12.3.tar.xz";
-      sha256 = "1zpj0w3v1hwxpkfmba9k46w37qi41yndhm3ymdrgyl5xgfbajdrg";
-      name = "kde-l10n-et-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nx1jxyya8da77jg1l5jrlb46xwdn9fbp-kde-l10n-zh_TW-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_TW-14.12.3.tar.xz";
-      sha256 = "0qwykxa72c6pdzdd7kpwigrjv4l7d7kb1h06rwrcg9kk5q9hn31q";
-      name = "kde-l10n-zh_TW-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sajpc2529bhnd5p86sn0k35wyqj302ip-kde-l10n-ga-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ga-14.12.3.tar.xz";
-      sha256 = "17mqxz2dpqyi1ngi1p2ivxg1qixivlkhzzd1id7ihff1i50f5gdf";
-      name = "kde-l10n-ga-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m3gp02jxirgh246njwsslprfq627d13y-kde-l10n-hr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hr-14.12.3.tar.xz";
-      sha256 = "0zv3rvrfn5khmbd495iqnsr579m6igz3fr6h729wcwmizm03kl7p";
-      name = "kde-l10n-hr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ghlk4l1xill1v93qnv6sp4d9ybm2m2p1-kde-l10n-uk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-uk-14.12.3.tar.xz";
-      sha256 = "0jh17m47783vrv3c9wf7j67r937ni4xc670m758casjccwy9ldcb";
-      name = "kde-l10n-uk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/g4l10q0rg746928lmy4jfk63aa0y063r-kde-l10n-fa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fa-14.12.3.tar.xz";
-      sha256 = "1imx7nmxx9p8xi290llyhh2hcaax6y458hlz8sid6kq0cl7y5w79";
-      name = "kde-l10n-fa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lsw2ss8v9p5ryiszbfp46p1zqckqag5a-kde-l10n-pt-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt-14.12.3.tar.xz";
-      sha256 = "0wh5dgg53aic5n3h260f1908dfirp0k53hakn2kv53m3p572ck74";
-      name = "kde-l10n-pt-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ga5jirz4ggm0qacl4rzj4rlassiswls2-kde-l10n-ar-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ar-14.12.3.tar.xz";
-      sha256 = "1ybmp4id3y9xrxcx2grmv8w3412h1qmwzawrzixfiixazbg8jgfa";
-      name = "kde-l10n-ar-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rgsdz47748cn77nmnkysf1vhz5sgzwf5-kde-l10n-ca-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca-14.12.3.tar.xz";
-      sha256 = "14749nzfld9b97bk062d6pdpjdcfhga62n2yh1j1b0g5xqc1x0cp";
-      name = "kde-l10n-ca-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nja0qv4yh272pjvwbbzk75zzdjn75dgk-kde-l10n-cs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-cs-14.12.3.tar.xz";
-      sha256 = "1prhlp42vnpspj98kbdshv4liixhxak84xzr58mc8ij7whggi820";
-      name = "kde-l10n-cs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/avwqrqad41ryhdbx9dbr5m67nn6vqphw-kde-l10n-is-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-is-14.12.3.tar.xz";
-      sha256 = "17gw5isal9xk4iz5dr7qqvqx8j06nb2wzsxkkdxk5qgnqsxdn3d4";
-      name = "kde-l10n-is-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cmp30mff1j0jq0srvvlhl28jr3jhdrwb-kde-l10n-ia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ia-14.12.3.tar.xz";
-      sha256 = "0qgdy7b5gs04bszpp2byj9hx3mhy18y3l859si437i0jd3aa4b75";
-      name = "kde-l10n-ia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4x1jjabkfwy5yk0ig70pn72awx9f1c7y-kde-l10n-wa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-wa-14.12.3.tar.xz";
-      sha256 = "0h23mnlhd53cpayhi3kpz7abj7786cf41n41m43b09ln3bw8d8i9";
-      name = "kde-l10n-wa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z06s7w5m81vy7q7lm5vybpnlq75s69jz-kde-l10n-sv-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sv-14.12.3.tar.xz";
-      sha256 = "14n0i4g484rxs2qx73jb0jh0a138anhj55x49inq7s0cigq2y1k4";
-      name = "kde-l10n-sv-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y978vl8sv6l0ls2kh6hkcj77cnz3kcvh-kde-l10n-nn-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nn-14.12.3.tar.xz";
-      sha256 = "037z0c6zy5vbzbg0i1fnyi2b88by2r65a9vyihznr2k72yzgbl53";
-      name = "kde-l10n-nn-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/b15q4v2zmbc030xb1mdw746llfq2vq0y-kde-l10n-it-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-it-14.12.3.tar.xz";
-      sha256 = "0rmy7cnsbfgzmfhq3lvap7x0q1b97np2x1kz65qy1lkdwfvqlafg";
-      name = "kde-l10n-it-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/pzn66c19cgkxlwk4dc7p14pvsagh5bks-kde-l10n-pt_BR-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt_BR-14.12.3.tar.xz";
-      sha256 = "0p2lfgf29432x7srx6piyi73gbqnwfcb6mrbgb5cbrlxmhazd0x1";
-      name = "kde-l10n-pt_BR-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dykqy8mnwk56zyqscjsbc5l0v3caxcm9-kde-l10n-el-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-el-14.12.3.tar.xz";
-      sha256 = "1l9zjgq4mg1rsdk58csdm1bbvjfblh56isp275jm7fg05izc7idz";
-      name = "kde-l10n-el-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vfw1xmdblc7ryz4iyddkx04n6bpsmi1p-kde-l10n-ro-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ro-14.12.3.tar.xz";
-      sha256 = "1an38a8kq5b5xzjxflr4fpwq3ld6ryb36p2fv5ks3cgp14vs9bhc";
-      name = "kde-l10n-ro-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/i8h2ydglwf8j89g22ppja7waljid0an5-kde-l10n-fi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fi-14.12.3.tar.xz";
-      sha256 = "1v8kv7ack9l8w7pcy918vc5crhd43y35m1zkp87zdaqg9svsj893";
-      name = "kde-l10n-fi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/s3dxzagxplipcrfh3sz9vhxsbwlvd7v8-kde-l10n-sr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sr-14.12.3.tar.xz";
-      sha256 = "03ddq090ihma7y19l2ryjf69mbmqwigrxmhsyphkrpvkcch995vv";
-      name = "kde-l10n-sr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5r0zswdk5p3ais2gwwknzqh1y70v98rr-kde-l10n-da-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-da-14.12.3.tar.xz";
-      sha256 = "1nl2wvy1vg76rci4jkkgpp5ii49x6s348ps4mpj3ad46a1nxldfa";
-      name = "kde-l10n-da-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a9nqy8yh51xmprzq7g806hpp85djxci6-kde-l10n-es-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-es-14.12.3.tar.xz";
-      sha256 = "12bj9jp6l03skx8pn2b3hrbd598kg4zm4qj88nbf6l9mzjm2pjb0";
-      name = "kde-l10n-es-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zdrqq64485q0zz3m3mh11canxyn48i6x-kde-l10n-he-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-he-14.12.3.tar.xz";
-      sha256 = "0bsjnlnn703s5s3k8p68ic591zf2k6lcdizhm75dirrc2ydwld2p";
-      name = "kde-l10n-he-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nxiv4m0827jvvh9pl5adani2f83jd0pa-kde-l10n-ja-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ja-14.12.3.tar.xz";
-      sha256 = "05gl706zmw0jhw7ahdg61q0swy65459j6p6qzx4g6albrxqjr2ks";
-      name = "kde-l10n-ja-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y9sx89dk7qf8mdl18ga9s99kga8j50v1-kde-l10n-ug-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ug-14.12.3.tar.xz";
-      sha256 = "0pl9fs7gdsxafgiky7k2a6xz07xd02k3glpfd5wxa9ya6l0970nm";
-      name = "kde-l10n-ug-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3flzizssjcyxgsdp1diq0xw5is5xdxzr-kde-l10n-bs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bs-14.12.3.tar.xz";
-      sha256 = "19f6s5vylir9a695l0wx8fi63an2kgynmdpz3xadq197m1j8wd8d";
-      name = "kde-l10n-bs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/id2z95s1zn6v733fyh3wazrbfy40hyvx-kde-l10n-bg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bg-14.12.3.tar.xz";
-      sha256 = "1hp1sa8cxsgifr7vaw7iqf8bydcnb7qnz9nnac0a7sx95ypvjmlg";
-      name = "kde-l10n-bg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d51bwij9xq5wh9scl66y66g5cwd27dai-kde-l10n-zh_CN-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_CN-14.12.3.tar.xz";
-      sha256 = "1f5zqflfhw077zlhwdf3his89dq8g0c8blpd8rkh7sbbyqgxgcbx";
-      name = "kde-l10n-zh_CN-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wqrvb9c3daz3hc650q212j7j6aysxs52-kde-l10n-fr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fr-14.12.3.tar.xz";
-      sha256 = "09jriffxnkmlcwmwplspy9znbz5fa8ad06pkapl35337cisyrdqh";
-      name = "kde-l10n-fr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/477qqq2pd57y9wb83kj2yhclvr8r6ixr-kde-l10n-de-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-de-14.12.3.tar.xz";
-      sha256 = "1y71jjigz5qg3cz16j1vrikddw94zzg00kc6ziw2dxk6sx8j7vxi";
-      name = "kde-l10n-de-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bpw0gllnd9asq0qkzksrvfni25ai7kaj-kde-l10n-kk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-kk-14.12.3.tar.xz";
-      sha256 = "117125baj789y88l533jpgfggz5g4i0j19qrqybqql2hys7vhvib";
-      name = "kde-l10n-kk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/37lal5izk34xpsw4ba5i3fh7klr8s3sm-kde-l10n-eu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-eu-14.12.3.tar.xz";
-      sha256 = "15albwrdigyk9fzgvqd23njxks0ri72j2n5isbh218gcpp3k6z3b";
-      name = "kde-l10n-eu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/isl6qfzmn18flary4fdcz4nnfh4v8wpx-kde-l10n-lt-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lt-14.12.3.tar.xz";
-      sha256 = "0z8qpy7r22rijhyfaidxvmafbbpha90imx0zk1cg8d96qn5iz1ri";
-      name = "kde-l10n-lt-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/34jssw40n5qml1s21bsdqw3an7g02g4w-kde-l10n-pa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pa-14.12.3.tar.xz";
-      sha256 = "17ra2abhgbh1igd36rxkdx7n30qcmcbn85sy54zig8rdcznq4bjk";
-      name = "kde-l10n-pa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bydiajxpa21jawxl5yd2fhdy4ha9ad43-kde-l10n-tr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-tr-14.12.3.tar.xz";
-      sha256 = "1mwzryf00x2yaz6c4pm2459svs3hdjddms4xx3vv1r9aq7aavjqb";
-      name = "kde-l10n-tr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3s8gz9b9mhymdiq262w8f1skyvz25c0x-kde-l10n-nl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nl-14.12.3.tar.xz";
-      sha256 = "0jm7z2m5ngb1z1nx2g1vwgkzj46yzm0a37br5jba9yka9dmr15mw";
-      name = "kde-l10n-nl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d3i513r1568j9pvqznjr94ygmpgb8zp8-kde-l10n-ca_valencia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca@valencia-14.12.3.tar.xz";
-      sha256 = "1ybsw0r60gkxy3fshm2da5w4mlwfmanwjfwpjnwj40ydlgdi8by5";
-      name = "kde-l10n-ca_valencia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/90rfd4hdzch06plw672qfxzljqnk7x71-kde-l10n-id-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-id-14.12.3.tar.xz";
-      sha256 = "0kxss6f349mbhwafahwdv2zgfmsg5v9wp668q9xf0649d1h2w0ww";
-      name = "kde-l10n-id-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qb61jvp0gf8a76nkw1wqzq32mg2i926i-kde-l10n-lv-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lv-14.12.3.tar.xz";
-      sha256 = "11x1csh4f4mmkbhdmk0dibqvl8cddr8y3m9jyrgs980k7kd9617f";
-      name = "kde-l10n-lv-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x9jkn1ngspshcja4z0h4zrlmrqbfc1a0-kde-l10n-pl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pl-14.12.3.tar.xz";
-      sha256 = "17gbg4zb51alcp5g1bx6lbmbkzz0fzl8sbhswwc71yhkq4h9ifpc";
-      name = "kde-l10n-pl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zbrn541qzdcpsy20kf4mah7rqy64xwwv-kde-l10n-nds-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nds-14.12.3.tar.xz";
-      sha256 = "1mqhc2174g58180l13qygwifqxai78m7prvrd4nnmc22b86cb0i1";
-      name = "kde-l10n-nds-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7shjylawg8f357xm52zc2qxssqind29q-kde-l10n-km-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-km-14.12.3.tar.xz";
-      sha256 = "1244bjxs2kl7hmaj4v7bfw98vawcc5ipl73payn2ygxqiqmb2jgr";
-      name = "kde-l10n-km-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ab3swg0pgzwiihfn3vkqiw29gawrlfgf-kde-l10n-hu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hu-14.12.3.tar.xz";
-      sha256 = "1cjfy1wash2jvvr0l9s4am9s7ny1zvabbim536b6lmqhyk5bm452";
-      name = "kde-l10n-hu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/grsgaxij3fp3kqwlgfaqv0hzh0d6k3zf-kde-l10n-ko-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ko-14.12.3.tar.xz";
-      sha256 = "1chkk4zr7jqb0vbn3bhqpfvirpn5zqrih0124cyrfxmv4a19cz8v";
-      name = "kde-l10n-ko-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/27lgir5h7a95dgr1khc5gvk7rqmhvsnq-kde-l10n-hi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hi-14.12.3.tar.xz";
-      sha256 = "16pmyi73yfr885xv31rfwq9ingm4cfd2p04wvrxs056yimip2hgz";
-      name = "kde-l10n-hi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d1ydfg70nkp219vhcc6pi62kxv275121-kde-l10n-ru-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ru-14.12.3.tar.xz";
-      sha256 = "1x89kap46by47ra278r5inps9ab8mncfw76a2scpz7db9g0vfvf3";
-      name = "kde-l10n-ru-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xc5zsjaiyy9fzf8wdzz15g593xlkgzzb-kde-l10n-nb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nb-14.12.3.tar.xz";
-      sha256 = "14fgxrld2q9y7w50kn9952115fviyqb66sxvi2501b6kf3xnrpp1";
-      name = "kde-l10n-nb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m11758s3nr89b0rzfw492ljzwkqkn30i-kde-l10n-en_GB-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-en_GB-14.12.3.tar.xz";
-      sha256 = "1fbn5rih063wgmnzzsdq5dzmw4vx4cf8jpqd0zjdp4jcja7a7z7h";
-      name = "kde-l10n-en_GB-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rg1m42j06j7sp2sm33107krg0b655hzg-kde-l10n-gl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-gl-14.12.3.tar.xz";
-      sha256 = "0gm2z3va0lxnk9k3mnw0crlaf946cd2v1nygzbmc74r986aiyrla";
-      name = "kde-l10n-gl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yidz4dma1zm6rx4axqpk37irpvmf96a8-kde-l10n-sl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sl-14.12.3.tar.xz";
-      sha256 = "17vlwgsab5jq9r8vs5q7gwk77p9li8qk8d4997p75z9rmf95jx35";
-      name = "kde-l10n-sl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1p0y7hq9pqw8qjy9a5nyrjlirxkxayrs-kate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kate-14.12.3.tar.xz";
-      sha256 = "0czcni5wfw56ar0r5p05j1wrmah98qv1wca95l5mya8fb17wcmnc";
-      name = "kate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ad9jhnfb216r0x6dicjx3px17mqnxhzr-kolourpaint-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kolourpaint-14.12.3.tar.xz";
-      sha256 = "1rcln9nqqzhzb0qlkdx81k0zspyyf266s3sa12npil2g9n1yh12h";
-      name = "kolourpaint-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9g2fg6167fghd9v5nz92sadiyyac6zmv-kruler-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kruler-14.12.3.tar.xz";
-      sha256 = "0px10ilji6blpfyp44f66m53y5dhcw9s2534pwhbx9xfkal1pprj";
-      name = "kruler-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/gg40xflg0y9c38rcg1q1m352zknrvmci-ktimer-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktimer-14.12.3.tar.xz";
-      sha256 = "198gx9j0x556m1vbwmyfgvayjpbws380pmrz4m58ylsvg5mcgwib";
-      name = "ktimer-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z6ql801ixafs2n59gb6fa8z2zr8wq79h-ksquares-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksquares-14.12.3.tar.xz";
-      sha256 = "0fyqs9b4bsgnaadcc0zhvsljmm83mc8brz1gsc7iz4pm3dnz74fr";
-      name = "ksquares-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q5rjxayccrra40ahwj8g8q3splvw10sn-ksystemlog-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksystemlog-14.12.3.tar.xz";
-      sha256 = "0a29n39jyrlgfijn99v48z3za4nnz6bambakyri8j9da1zzwn6hy";
-      name = "ksystemlog-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bfj7740qpfw5i6cjml9xf9648s9vj7wh-kshisen-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kshisen-14.12.3.tar.xz";
-      sha256 = "0h5l3m6xxq91v2fzc8p213iglvc78shqa3q0bfy3xbrnd3c8gkm2";
-      name = "kshisen-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/l294adqj7slk00ns53dr6p28jzbjz29b-ksudoku-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksudoku-14.12.3.tar.xz";
-      sha256 = "1scyqlfwxgkdwh93h80wzp7a55vvy0j0zxi9fl0ihsjsh20iv0bm";
-      name = "ksudoku-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h4x11ry35314s0max9aqh47k1pyfr22l-libkomparediff2-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkomparediff2-14.12.3.tar.xz";
-      sha256 = "1829sxn3y906hsfj6hqllx0hhwk2qngw9lvrgkcyqygb99ngg2bx";
-      name = "libkomparediff2-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/18ywxpzrac8brdqp56vm3jbly49dis8f-kamera-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kamera-14.12.3.tar.xz";
-      sha256 = "1hrvc6l4q69npxyafznhg5i8mybg1c7z4iwp98q5rzsdw5zppvs8";
-      name = "kamera-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nkz7204dhnfjvjvqqp9id19l5xgzxzrx-kscd-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kscd-14.12.3.tar.xz";
-      sha256 = "1inl4sksyd27rp9g75h0900hs1hr6cb779zf92wsfflmk12gin7j";
-      name = "kscd-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dix33an8h17r8h03vnwml2fym44hrq5l-kdegraphics-mobipocket-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-mobipocket-14.12.3.tar.xz";
-      sha256 = "1ff6bbrhwa1jp3icz6mv9m9xl7f7b786yvg8dmc795wmm5hzr721";
-      name = "kdegraphics-mobipocket-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qnqwzdhg87x5dahx3avxcnys0j3k1qil-ksnapshot-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksnapshot-14.12.3.tar.xz";
-      sha256 = "13a5cri4dqn111p8q0idfgbahlx4ks2xjgvvgcwxd2srxifld825";
-      name = "ksnapshot-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/972ra01nd7jywn427qj5jz3gwibd2cyy-ksnakeduel-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksnakeduel-14.12.3.tar.xz";
-      sha256 = "0cjylhpsl33zgav8dyhrdl8qvi7yjafsf30drgjsc9jizhmn8hdz";
-      name = "ksnakeduel-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a3rr545r48ykp0rxfk2b643w683p0af0-filelight-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/filelight-14.12.3.tar.xz";
-      sha256 = "0am2qi6v2mr1rbl4jfjc4jaxg75511n2dvfr9zlsbhglfmzagmj8";
-      name = "filelight-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wfrkxk4f5hnvfwdraamqci3xap593sh5-step-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/step-14.12.3.tar.xz";
-      sha256 = "0pkj25jb7ydvghbx3187fjddsmck24k1kk4mms1hxp2i8xa11b1l";
-      name = "step-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/027r3fzd86qx6rfsc5lfas02cmn60283-kompare-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kompare-14.12.3.tar.xz";
-      sha256 = "1vjq7fdbdskhymwrl8i9945qbd0xaqgcrp95p8qpmafcc88nxvdl";
-      name = "kompare-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/kxpwjjlwa41agz76z15jbwb7b4s6x7ck-kblocks-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kblocks-14.12.3.tar.xz";
-      sha256 = "0y5f55z1i9fywfsspiyy467r2f11v7szwzhjrvacqf2g208mncwv";
-      name = "kblocks-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5j6v68g4gc7jvqrypk9s1m0grng8rpyn-knetwalk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/knetwalk-14.12.3.tar.xz";
-      sha256 = "1bakk8linrmgzn5zn79kj9bhfn43krpdahd989ba8ldfyz9d0hcc";
-      name = "knetwalk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/pgg1zvpidxgv1dacj7ncn62mizwjz0m9-killbots-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/killbots-14.12.3.tar.xz";
-      sha256 = "1b5chz21wxpmvi43iyr5gn2dh7azahamd8fwnjsdb49znyy5ab19";
-      name = "killbots-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m3sl4zcjky2smf0vky7lwvw8g79n2idw-kde-wallpapers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-wallpapers-14.12.3.tar.xz";
-      sha256 = "0cdaj33xim3rvq7ihwpv338g4s51xb36b6jszpfa9hnzxsxa146f";
-      name = "kde-wallpapers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/syx3k30s7j3s4v1hcb4azh176m4n7082-bomber-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/bomber-14.12.3.tar.xz";
-      sha256 = "0bhy5rjisq9f9ai36a0m9vhagdxj6jdyw0hlylpjl1ayy3qly1mc";
-      name = "bomber-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y1nrp3nf81v1v6khr86xdp9bjn7fnaya-kjumpingcube-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kjumpingcube-14.12.3.tar.xz";
-      sha256 = "16fgz0jicalls8c25p1hnd92rj3vwbbdli9wi1ljdv0f799h3z9w";
-      name = "kjumpingcube-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jahrwl1157161xh4dgjcnd0hnfq8x28c-kfourinline-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kfourinline-14.12.3.tar.xz";
-      sha256 = "026kvydxlrk7r91k9ffc27bsj0792shpziynh845ycbx9dy3nspk";
-      name = "kfourinline-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/l3zj17f3n998w3b3mf4v8jjib0a0p3yy-kwordquiz-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kwordquiz-14.12.3.tar.xz";
-      sha256 = "1r8ms2d59aa64wnmdv8psjn4bbypjzcpb982jpc6kfrwj391q2ig";
-      name = "kwordquiz-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y8lsccnmrc8r451j1b1igjxyrnvqpbys-palapeli-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/palapeli-14.12.3.tar.xz";
-      sha256 = "1wwnsvccshg2y55zcfpy2kvyplkjjbv96nacdfhln3yilbakwv1f";
-      name = "palapeli-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1nwhjxi7hmywfqiig8b60qaywwqircqh-libkdcraw-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdcraw-14.12.3.tar.xz";
-      sha256 = "0fw025nas8x70ji534j59d6vcsvqzr7yfcyls0yznlz5ppy4g9rz";
-      name = "libkdcraw-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9pj5rh11mpnr3grriz5x4c3ar5whn52g-sweeper-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/sweeper-14.12.3.tar.xz";
-      sha256 = "1y8yvjpd6v8s7xzgwkaa9sc4k715n53l01182j48lcyhfx6gbh98";
-      name = "sweeper-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cjd95qf5ppz9msqy2ggisilhhl4h0nvy-zeroconf-ioslave-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/zeroconf-ioslave-14.12.3.tar.xz";
-      sha256 = "0x858q6w1llcyy3933sqpdi53p8h2l1rbic1v1xyqbl4zdz9ixpp";
-      name = "zeroconf-ioslave-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cbndc9qfgqbksmfq1q00lhw1a6qz52wk-kalgebra-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kalgebra-14.12.3.tar.xz";
-      sha256 = "0pm2dshg73yc4h16sjm37j1003zs6hrp92lkr1679541z02m2f2l";
-      name = "kalgebra-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bfpnby19d3qgqhkw3fb102v8j4qh9vi0-kaccessible-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kaccessible-14.12.3.tar.xz";
-      sha256 = "02h56bykzpkvk17snm88mb8cxsy2nmhjz1by18rg4cc2gf61qk74";
-      name = "kaccessible-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/91s8bj9j78cmwj5ijb8536ykmnh3k1fg-kdepim-runtime-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepim-runtime-4.14.6.tar.xz";
-      sha256 = "1jnwgfy7052fzlz3mic7cy5jp1v5j81f28h205x56h6p7nswk29a";
-      name = "kdepim-runtime-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bm5pazc7ch4k130xj2ikmdcz69490xl6-kmix-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmix-14.12.3.tar.xz";
-      sha256 = "132k71ymd2pbbsbcw91haaalxljxzyirfw33ppk5w9d9m46h7gk8";
-      name = "kmix-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yw3v6jwj76v2savll4mwsvy8bh9n3iv9-kbreakout-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbreakout-14.12.3.tar.xz";
-      sha256 = "1kzwdz0njqggy6h208lllswaqsrwr7hid4pi1f69hnh9c27a1vbl";
-      name = "kbreakout-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vv1vfxq2dd88qhz563dbzmd8gisrhdb9-libkmahjongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkmahjongg-14.12.3.tar.xz";
-      sha256 = "0kizdr1xn58wxblkkq5swy4vqap24cdcxl092aswvi7ql85zn2hy";
-      name = "libkmahjongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8m2kvp5j83yw25smfh55ka4x73bp3sli-kmahjongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmahjongg-14.12.3.tar.xz";
-      sha256 = "08y03hszmnmf7wawrznhqhak00gd5mcrbfndb538j44k5am60ddb";
-      name = "kmahjongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/smk5qi7815a13m4c6xb7vzz18vz5n6qf-libkdeedu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdeedu-14.12.3.tar.xz";
-      sha256 = "0bja8qc2sbfq3ikhxk70fg72cj4hwbw4l7ag4zc9lq312jbzvkii";
-      name = "libkdeedu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mi979pdj5cm4sz1qbbdvzr75731xjfbx-kstars-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kstars-14.12.3.tar.xz";
-      sha256 = "1gg96zny1vgsm1cyzxqlp617ly862r6ywv21vr99fismrasj919z";
-      name = "kstars-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0661bdzswm2n96vgix2vq8rp48jg2a1d-granatier-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/granatier-14.12.3.tar.xz";
-      sha256 = "182z9lnvrxhfp1jp4lb33ij07bvzvi79xi3ncicyb9p015s9mlsg";
-      name = "granatier-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d6kz07a661dlyr950zmrirgsb52i8c5z-juk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/juk-14.12.3.tar.xz";
-      sha256 = "1zaw82px1qacfy612b9bxfgksyyvhlqrn0sv6p5dqzz01kg66xwy";
-      name = "juk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/24hs45qvjc6ixw77rjl226y0mldn14z0-kdepimlibs-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepimlibs-4.14.6.tar.xz";
-      sha256 = "03fnxg2as2rri27ajkzm2wjma25pqd97h91bxka07b3fwcqimvbh";
-      name = "kdepimlibs-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2x4jzjdy5k10dcn15q3jfnlbbaihbp2q-libkdegames-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdegames-14.12.3.tar.xz";
-      sha256 = "0dj39kzhix9h79mnw25535n0swpb04sdl1n4l9jnj306daf16g27";
-      name = "libkdegames-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/id1jxy17a8g7kwbhgk0h60f8rsvf1zz3-ktuberling-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktuberling-14.12.3.tar.xz";
-      sha256 = "0svfdfpvmwghv656rmip5y0c997pl6mlnq9ns88akqdjl45nywkm";
-      name = "ktuberling-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8myygl0hkb6l20xqj8wfynfx3zx45c9h-poxml-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/poxml-14.12.3.tar.xz";
-      sha256 = "1xw1dc9zc0wnn8h7dk115zapf8kgvm57nh2zrgmahy6ppza112bd";
-      name = "poxml-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/banw9x2cffxi8a0lal0x26v0c0vlypwi-kmag-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmag-14.12.3.tar.xz";
-      sha256 = "12aiyv848cdy0jkhbcj4ha3cg781ndjcffkl871ah7qy0sgcnkw9";
-      name = "kmag-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1361pwj0m3rxysay6njg9dz04in7k1sk-kde-runtime-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-runtime-14.12.3.tar.xz";
-      sha256 = "08ndk21mq547fw26gfa7vy88vxf78v8anbvjrym2k5f59fdx2aai";
-      name = "kde-runtime-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jns1ws94d4cklkzn7n9hk0a6zsbwyg6n-lokalize-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/lokalize-14.12.3.tar.xz";
-      sha256 = "0cy3zyzszbka19hy624rgxc07bh4hyfins4j2cwlivkszbssh8r2";
-      name = "lokalize-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y692wcc35c9dr5v9h1yjv33b0s87k3p3-kopete-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kopete-14.12.3.tar.xz";
-      sha256 = "1cdqcbafmmfq357n2kybzkfjwq926wb5lslpxbbpdnhiid23k8xp";
-      name = "kopete-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/31mxjkglzynxwi3h928n52mi6ldszww2-parley-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/parley-14.12.3.tar.xz";
-      sha256 = "0vzqsbr26l39akpch7f1xr1xwsdybszvd1f9rrdmy4rg9swc692v";
-      name = "parley-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w58yam9l13rjzh0cc4a16qkn9xzrl72m-svgpart-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/svgpart-14.12.3.tar.xz";
-      sha256 = "0jrhyb2ji2ii1pq7fmnyln12zhrqb9ahwpdq1x8ya56bws49qira";
-      name = "svgpart-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/i6l7hapmsfcga8b9agdi0ld2sss2maqy-kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-      sha256 = "1w8alhwkbffvwjfpja5pw881min6mv7vc1ag1qiblrzirsx4zhvh";
-      name = "kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m7vz5qmkwxbbs0f2251a0bbrl8g2jjw5-ffmpegthumbs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ffmpegthumbs-14.12.3.tar.xz";
-      sha256 = "1kni6fc1nb1n5zjqx736mlfcv08jp9nrchs7qkb2krzn4n5m0aji";
-      name = "ffmpegthumbs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5zhbmw2i3xb7axfyvq45qkp7dhf6xya0-kdesdk-kioslaves-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-kioslaves-14.12.3.tar.xz";
-      sha256 = "0w7ish8xpd7s26xmc9j9gxxy7b0lllv5px95g5dn4876qqcqpsks";
-      name = "kdesdk-kioslaves-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x2m1gbmqsq6zd48sbpmp2dz64d5m2nm5-kremotecontrol-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kremotecontrol-14.12.3.tar.xz";
-      sha256 = "0wy2jb9dx3bf8x22l0x7bqn8n45mn6jclnsb3saq7cns5905b68m";
-      name = "kremotecontrol-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7ckqs96cigik5syqj0ka0xk3m9ybphhx-kdenetwork-filesharing-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-filesharing-14.12.3.tar.xz";
-      sha256 = "1icg45a2qsv1n19gsfg7w3wa2ysa4rkbx3w8maq8c7x673qs5kcp";
-      name = "kdenetwork-filesharing-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m2p9ipvfj9cdznrc736fjhbvyj3g3yz1-audiocd-kio-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/audiocd-kio-14.12.3.tar.xz";
-      sha256 = "1103f1ic5niy0zs4zvz841aaa6r4q0x0db4apnyvwbx51zi7qzsb";
-      name = "audiocd-kio-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4anl6k756x5n7j58rafxyx04sgxjlc20-konsole-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/konsole-14.12.3.tar.xz";
-      sha256 = "0apz7dn9lza69fgnylhy3md47palj3qzjhpihfr0qsgn6gzg6f7a";
-      name = "konsole-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rv12zii0hdwh4fb5mv08nf0qid79miy5-mplayerthumbs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/mplayerthumbs-14.12.3.tar.xz";
-      sha256 = "01hisifj8j88wz31q4dhj0qinzz0yw9fz0lm16qp3yxv7r7p82cr";
-      name = "mplayerthumbs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/6lgsi6phi4p3lyh7qvw3bqkixfad0fl8-kde-dev-utils-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-utils-14.12.3.tar.xz";
-      sha256 = "0i6m5vs42c5mvznayh9rzjdp5rkcbl3aar909j3ir9kc3v3mi2ns";
-      name = "kde-dev-utils-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2ckqwp8l6cy1c35bvcbs4x26z1czsdc4-krdc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/krdc-14.12.3.tar.xz";
-      sha256 = "1q8s1wdmblfx8jj8acnkkyhx3rrn1ampskd9wx39jid8vznvkwpy";
-      name = "krdc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0hyjdsihgm0sn0gv2xsrijhqbgaqqn6z-klickety-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klickety-14.12.3.tar.xz";
-      sha256 = "1cz7aam2azgqilvz6jsbkfy3dpimh86f64vmkvlk3n42zkksp7hm";
-      name = "klickety-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sw2cca4mpa4y2dq1f0wjkqiqdxcjqkcn-kdiamond-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdiamond-14.12.3.tar.xz";
-      sha256 = "1cm793801nysqp90dcyvfvwxc9h212qrq3lhg7621h9fhq0946a5";
-      name = "kdiamond-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rb4li4dqgv2mw1w732pkhkxpvjxdb50g-ark-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ark-14.12.3.tar.xz";
-      sha256 = "0a6ggjg6x9kdlhm2n8l3dw4nn765lj78gn11yxgj37riq9yhg5xx";
-      name = "ark-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zpk335imsalsxqa7bfa6wcllxgcdipln-kfloppy-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kfloppy-14.12.3.tar.xz";
-      sha256 = "1b1zskwch7zz7iqfz3fa14q0bkrr2yjckr1h5fvn9k7q79x7xph6";
-      name = "kfloppy-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/c9z5wpwzpnvp5fiv5zbjg4fm8p8xrn7m-picmi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/picmi-14.12.3.tar.xz";
-      sha256 = "0vlyn2f2j1p4734rcmqyjh03h4a2m79z9swfmlahh12gq5ka81im";
-      name = "picmi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mfysg0babfpbzvpnh8b3a9kzk6n29ssh-konquest-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/konquest-14.12.3.tar.xz";
-      sha256 = "1il757w6xzvkaadangwfpkz14qx02wwdlflzffw9jis2lbz19qnh";
-      name = "konquest-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dn3vmyqlm2qsi52bhfl1cyafza31b6y9-kalzium-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kalzium-14.12.3.tar.xz";
-      sha256 = "1mnkhp5wlc3rmxyw4lli5smb419vzkv52aqpwakyncrz7nxkyk24";
-      name = "kalzium-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fi9lq4lqwclvr627x32q8lr4cwcxbgng-kde-base-artwork-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-base-artwork-14.12.3.tar.xz";
-      sha256 = "06v3javkhkchpjc3sv7x5mk2jgb1366mi18dzwg63h2ca8740wn1";
-      name = "kde-base-artwork-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2fq724w1bqmiz9hqqmhds1f0zj18k8dz-blinken-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/blinken-14.12.3.tar.xz";
-      sha256 = "0k4a5r4rq5brh5xv2lm6ldwfv1qy5wiqnj0ycp55p974isbdgqsb";
-      name = "blinken-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vqyn4qdsgnai9a9w944g0jqpmvzqg5b9-kcharselect-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcharselect-14.12.3.tar.xz";
-      sha256 = "1ycx0y82f4ah5fg9ki62fwnnhyly1sqs52zs4519hnmyqn7h7q1v";
-      name = "kcharselect-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x66xrvdlnwcs8g6l3f4iz9fvxhw61v28-umbrello-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/umbrello-14.12.3.tar.xz";
-      sha256 = "0f5qn6h89hj4n25p2nkcgqb0xk4qvlwi115n5qlsmbc3icj2j7cy";
-      name = "umbrello-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ah3xdqjxw5h29qmjc4wdb1c5i9zdsl40-kget-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kget-14.12.3.tar.xz";
-      sha256 = "04wf6qncq1xdfrp9j5cnhdii9hj83wjkp5i168flzi292sqyw9ia";
-      name = "kget-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/68ps9qh0w9mq4qawdzzjyy1h1y33wfqs-kuser-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kuser-14.12.3.tar.xz";
-      sha256 = "1xgd3g2fdanl28sar3mgcsnld69nczcdanvaqslil4vc7d8r1xim";
-      name = "kuser-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/60ipws592hnlygalmkzgzmlwnhmkvjg4-kigo-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kigo-14.12.3.tar.xz";
-      sha256 = "093bm60yaj8v8g6n7x4ysjbxph6xgh9ylarhdxsrjpmq268wql31";
-      name = "kigo-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zk9mrrc8vkzq41bx7sfyjc3lx73jzlqm-dolphin-plugins-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/dolphin-plugins-14.12.3.tar.xz";
-      sha256 = "16kxzpnfy8cxy8v1idwsisqq0p13n14zcid9a5n1sv02w91c02rj";
-      name = "dolphin-plugins-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z8kgww8c0mqwx6cfsfqm8yd58k71xvrl-katomic-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/katomic-14.12.3.tar.xz";
-      sha256 = "0rbhf8j8if5r20l1cryl4irgd8p94ikbsz6456y7v8fzv5mf6kgn";
-      name = "katomic-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jqamjiig020rvvyqwjarbxqj29ix93yi-rocs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/rocs-14.12.3.tar.xz";
-      sha256 = "14k5yx0vfpf0fllqi5f72vz2135qag6gb7hs7523jaavxkb23d1p";
-      name = "rocs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9vhmysfqpabx7cwrqsmkpgh4hinjqh39-libkcddb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkcddb-14.12.3.tar.xz";
-      sha256 = "1i8n63jpckc3fa27rcqyrf10cz8zsyjyvrpa7fgmggsf91k1c144";
-      name = "libkcddb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bz14zb6rlkwgmj0l8q9nffar2443zcaq-kdewebdev-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdewebdev-14.12.3.tar.xz";
-      sha256 = "17qy41gww688klpv2cgnk1r3cnd9sq72bsga82d7dnk0v6dinlxz";
-      name = "kdewebdev-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/iq7fn9lp4fh2s74lrb2r4v39n66c8a7v-krfb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/krfb-14.12.3.tar.xz";
-      sha256 = "0258ffj2wx25cycpw3cmvnw9ig874jpi6yw711w6d8nfy66ribpb";
-      name = "krfb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yv1ixn2gwc8vv32m3y5axy3dn1p3sbrv-kde-baseapps-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-baseapps-14.12.3.tar.xz";
-      sha256 = "1zcjbhnxzqxjn4xs6pwb8cvcnjypa4yh09jr4frd82nfhdsq7nyd";
-      name = "kde-baseapps-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7f8qlf08l8fwykz677xywlfdsf8j1pml-cantor-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/cantor-14.12.3.tar.xz";
-      sha256 = "106k9gp4r2241yh6np8mbq587chwkicxk7ssbpvvvg2m126idz9y";
-      name = "cantor-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/24zfmzbi9q832p6i91i71sms1vk3rfg2-kdelibs-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdelibs-4.14.6.tar.xz";
-      sha256 = "165xn2bv03j2g4j7m287add40kwhccvp2ci5hrar2xfd9sgl24xk";
-      name = "kdelibs-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xl12n09yvf5j7di78mrkxxhfnn6axijy-kubrick-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kubrick-14.12.3.tar.xz";
-      sha256 = "1g9ls282qy6s0xsaa50ck0gkiz980cx50zjjhq4yimlhp1gswmj0";
-      name = "kubrick-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hq79f56cq1gqw7nfxcfliqi4k8kjpkd5-kpat-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kpat-14.12.3.tar.xz";
-      sha256 = "1787qymlsxyi7dm2q8axpjl3n62qx9xv7diyg8627kkjm1a1xw9r";
-      name = "kpat-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/inai3p0228fmjcr8vkbnbhnvpznwvrgz-marble-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/marble-14.12.3.tar.xz";
-      sha256 = "1ylhc3278yqdcsli6yw7bnci6mdx01g0r97m78bs74l5biz4yql4";
-      name = "marble-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/szdzjvc2h3w5dpp154m0kqh5i0spk771-kcolorchooser-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcolorchooser-14.12.3.tar.xz";
-      sha256 = "1v8mgv5pjl3g6igxs92qd3zn8qr3qip046pb77856qhn3d9s4pqj";
-      name = "kcolorchooser-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rfk8bxw07690a9kncmcdmlqjx7qkrld2-libkface-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkface-14.12.3.tar.xz";
-      sha256 = "0zp48mlkqkjc6wk81kcf1q980196q0m153kzfjahi5w4vlslzgam";
-      name = "libkface-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2gc6778llzkl8qbzdl582ay45rwn6wn-kbounce-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbounce-14.12.3.tar.xz";
-      sha256 = "1hn09ghhmj2dk47vnkqkvrm87n50m506mmzq058cccjlfdah5iin";
-      name = "kbounce-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jplhnd96n48zih1mbf6bx96xl5b35kdp-kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-      sha256 = "135dcs9ppa8lv5va8bqmccfxj0hf5f65qprx7l02k74xj4k70yki";
-      name = "kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5aykxgy1by52pcfmv1z990kz6xpwjj18-kcalc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcalc-14.12.3.tar.xz";
-      sha256 = "0w5pl11vw0d2g3pnxb3ffig209r0bjg135163crnic9akfbfa9s5";
-      name = "kcalc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1lk25ql2cgisdm7yhjyn1ac416h8qdc0-lskat-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/lskat-14.12.3.tar.xz";
-      sha256 = "0k5wq5naj0ahmnwpvdrif2clzxjwr9jk6p40igakzanpp23i6p9k";
-      name = "lskat-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vvbs6wghnrbrq9yd9v647l227bzsiyaa-amor-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/amor-14.12.3.tar.xz";
-      sha256 = "1y9cia887lqbcs6nr08mbrxr8shb895wvxf5jg8w6iic6pwy516c";
-      name = "amor-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sxi3wlcwn3gbkmcama2vx4dg45xwm7sx-klines-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klines-14.12.3.tar.xz";
-      sha256 = "1xsrkbjdnw4icchbr5y7w64y6szfv8qdzndwd2bgrw0yvyjg5w7x";
-      name = "klines-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0al1vmsjw3a94arnw19k59gajw3kpxdd-kiriki-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kiriki-14.12.3.tar.xz";
-      sha256 = "11c76kq2pji07xfbyf2621h76sjx9pqdj3qqzydzbwdinxy0bgz0";
-      name = "kiriki-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4bw6lkbzy88kl09gk9sv494xw4a004a9-kgpg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgpg-14.12.3.tar.xz";
-      sha256 = "00qjgkgy1d8wygc298z3v7y37j47w16pjzp8ssnsdkmx88h1dp3i";
-      name = "kgpg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/97i8x4wydz1z4p2dfg2c04xvvblpdds0-kolf-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kolf-14.12.3.tar.xz";
-      sha256 = "12h4817ky9xwwrdqgba515dw87314ijci4lwqvcqmm7rq44qac8g";
-      name = "kolf-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/k35761pidfd258y0fjbcr1c22y5lwzhf-superkaramba-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/superkaramba-14.12.3.tar.xz";
-      sha256 = "1q6qpmwyics1mb44l55vy5wyjd0d5mbsm780kj4y9l6mp98b47c0";
-      name = "superkaramba-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h55lr5qacws82h167r142367mldrq50z-kapman-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kapman-14.12.3.tar.xz";
-      sha256 = "1i3ci8qpx8njr250pgkz7zlfihyi3k6vc2vnw7dcv09qfby466qb";
-      name = "kapman-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y0xl8ckan6cwmz35mvzsjv35a55s45s9-khangman-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/khangman-14.12.3.tar.xz";
-      sha256 = "1y11jwsb1ba55hc2sx0adffvrck1mrn43wna16zkrh1sxk7fk8r5";
-      name = "khangman-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rdh9ivzb5i8xilvp5v05k6szxv9nhv40-libksane-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libksane-14.12.3.tar.xz";
-      sha256 = "162bi5d6kbx7zlb4waha82ldg2j40rwcg1gikfahkjsprm6npmh3";
-      name = "libksane-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h4if4axrpc0sdn6xmazgn2d5xhkbpr0x-kgoldrunner-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgoldrunner-14.12.3.tar.xz";
-      sha256 = "1kg9mskg3aj0bp8h8y5bfkapmw4iys42aw3sa7f8zfkqp993zsw8";
-      name = "kgoldrunner-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/30xn0rg0g32p4d00i9z4xs95lp504six-bovo-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/bovo-14.12.3.tar.xz";
-      sha256 = "021pmar0g7s0p7qrzimp2x54idy9pdg22y8mgi26xrk9n7i5yybp";
-      name = "bovo-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3ajn3gyhisbdny0q3qskhn6r9wkw0aly-kgamma-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgamma-14.12.3.tar.xz";
-      sha256 = "1ywpkg7zbh9xy50a53dmlz1rsli5gdc52l50v14gm1sdjl2sfjpm";
-      name = "kgamma-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fhr2zhxsxlc5fl15l9fil414jaxw98hz-kajongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kajongg-14.12.3.tar.xz";
-      sha256 = "0fdvwv5jbmc42wzc2j5y4adjqqwzq6hvl8b7nzaknphvpk7257hj";
-      name = "kajongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7q3rq4gjjkwxjlliqy76x14h45xxzhhf-kppp-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kppp-14.12.3.tar.xz";
-      sha256 = "00517rl2b5zaf42sziar2cj878dcii6jr1mx8jicq293f171krn7";
-      name = "kppp-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jdxf1cy03k03r51kqa1klb3ib5jvd8jy-kmplot-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmplot-14.12.3.tar.xz";
-      sha256 = "1fq8m07pgmcfp1cr7q0y90ngaj282nz1pw5mqdfjh9syfradli0i";
-      name = "kmplot-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wrk2mg2h2y34s0gysr095d713wim7brw-kdf-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdf-14.12.3.tar.xz";
-      sha256 = "1dd35frqxgqmhakc6f7xs6sck061271cnfym9bsd5q6fxv9s8vdp";
-      name = "kdf-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8wa0nvqryc7gzxfk2sgbsavk1q6p3jpi-knavalbattle-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/knavalbattle-14.12.3.tar.xz";
-      sha256 = "1jl5f2ndgnffhmgpcc4in6rryshph3p12d1xa2ixw36xyr45hcki";
-      name = "knavalbattle-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/macznkbfj12i3nfcks2fr29fy24vlda7-ksirk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksirk-14.12.3.tar.xz";
-      sha256 = "1h3dgp2j7lz13j16k1j5b7wyg0g4x08svw1v2pc15llakr39p88m";
-      name = "ksirk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ja14bgwgs1wp8831ipa39s9zhayjfqdl-print-manager-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/print-manager-14.12.3.tar.xz";
-      sha256 = "1n1m5w3p4r97y7jp76q35z8g39ipfaldkgbfbz47i89bc33zaxy5";
-      name = "print-manager-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/44frkjvk64qwj15g2pfh8a1ficag137d-artikulate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/artikulate-14.12.3.tar.xz";
-      sha256 = "1rv51nk2lqvxfgwsxyzq9cd1qq68nr6z7r5xis83smc4gnaczajh";
-      name = "artikulate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9pd7p5vl53w6i6m324km5xkp6v967l53-kdeedu-data-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdeedu-data-14.12.3.tar.xz";
-      sha256 = "1q1vw5dprvqj7yyg9w39ndy8nvnnhkbladylv0kyh1491ba2a3kb";
-      name = "kdeedu-data-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x30qa0vibvxxza1pqy9a4ddnj4w2xhcw-kturtle-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kturtle-14.12.3.tar.xz";
-      sha256 = "0hxnc8lfqrfs5njaym54kl4vf2q6jakgif90saxfm50irjbwlg34";
-      name = "kturtle-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/734ajz153q37a4pzyh464q9aip528d77-klettres-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klettres-14.12.3.tar.xz";
-      sha256 = "01irm9pgh46rghbmmwwrdb85ys2gv23h46qaicv4zp73bl6mhn5c";
-      name = "klettres-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bj1igafd6x86fay8syr6d573b05472mc-libkeduvocdocument-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkeduvocdocument-14.12.3.tar.xz";
-      sha256 = "060p8sh3rbbajykjw1z2ba3xnv1bq8ns86yfwx2lv2jyaqpkkgyk";
-      name = "libkeduvocdocument-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hbrdr0fizjfwyf4p317gwgii4ckxr9bx-libkcompactdisc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkcompactdisc-14.12.3.tar.xz";
-      sha256 = "0957qd9zzbnksi1zxw1av4zxwzi48pq80jpk5h1id7cdhlfrsxz7";
-      name = "libkcompactdisc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m37c7klxvf2nz3byv04b763sls4j6h8r-kdesdk-strigi-analyzers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-strigi-analyzers-14.12.3.tar.xz";
-      sha256 = "13q7cy274ibsisvchfagb5mh4iq2wpm12zriwn625ciajy1zbq1r";
-      name = "kdesdk-strigi-analyzers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5ibmcrrhacqq7qn5zfq7fp1y3qwj90jn-kiten-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kiten-14.12.3.tar.xz";
-      sha256 = "0iy508g6mp7gibzv3m59hjjcvl32h03pzfqj8k6pgq0jya0bqvvd";
-      name = "kiten-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q2v3p0k65zzhmzphawir64a3x8k7qmbn-kwalletmanager-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kwalletmanager-14.12.3.tar.xz";
-      sha256 = "1sbbgvwh8d5pv4p5z89gk29lz2snp4glinpa3y2dg9s9chnn0qj4";
-      name = "kwalletmanager-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hcpxv7a1j4r0pavak6zqps9kb4mlgj1a-kanagram-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kanagram-14.12.3.tar.xz";
-      sha256 = "0j8l5cx251wvb2s6xzdsx45cgwzpy8a97lbss8lhhfrqwqn62lh4";
-      name = "kanagram-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/v5rwasilq989vbmqqnj14cqq87gmvpsr-kspaceduel-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kspaceduel-14.12.3.tar.xz";
-      sha256 = "1z1p5wy39xkyplhdq8z3p61flnyzh03yhi28yc0f79iqx22psvjb";
-      name = "kspaceduel-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/amjyaqjvc88397nj2g54z6djs5rj5mgm-kig-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kig-14.12.3.tar.xz";
-      sha256 = "0vhamrasgazjn110ahh09a402vhsgqh8h5v1qqmvi49f6v44bxbb";
-      name = "kig-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4fzqz8h97hnn7v0q2gadc1mp4xhssl3x-jovie-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/jovie-14.12.3.tar.xz";
-      sha256 = "12ky24hkpqm0bhi9x8fm6bf0nfqclpr5yv7n054995k3irygz9lz";
-      name = "jovie-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/81d3gi968mqnzps5v56lfi4dzkq7vfkw-cervisia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/cervisia-14.12.3.tar.xz";
-      sha256 = "094x08jf21h5f0vjx28bqj207csh56rc293bs4sl8lg9d1h0gbax";
-      name = "cervisia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2wh0xa17ikpsbm0addwb502rvld07ici-dragon-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/dragon-14.12.3.tar.xz";
-      sha256 = "0fngv700yhlh0q73njwfl6szf9v57csyf0gpqf1hyl9wvv2mwswj";
-      name = "dragon-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a3lgzwlizzj1yp4n1v0k80h45rzml2bz-kqtquickcharts-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kqtquickcharts-14.12.3.tar.xz";
-      sha256 = "01017d0mww3ai4i8ik29kfwkakyp92ngrjm6704015i0wili09i0";
-      name = "kqtquickcharts-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/r5721x8a5aasszaw7hnj91iy90sy0007-kblackbox-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kblackbox-14.12.3.tar.xz";
-      sha256 = "1kmdxiy30cm3jrgi6kdg15rrwyyxgnrb51w3bfcgaqr48kz73id6";
-      name = "kblackbox-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xgnk2fv1a5q0xsy80xwn2p57vn10w3z7-kapptemplate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kapptemplate-14.12.3.tar.xz";
-      sha256 = "0gwx51df5qms1vy1b6csbllcjy5xs55xmscz4i2n75ba7dsw9ivy";
-      name = "kapptemplate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/409f1vaf4n42mhdyxmjw0vf670frpgwg-kgeography-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgeography-14.12.3.tar.xz";
-      sha256 = "098j76mk1lc7wjvwybvyb04zaysmmn9zl9y35r4yhr11lv2v2idf";
-      name = "kgeography-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h3c8xaj4wybcpndp90x5qfr9602l6cr2-ksaneplugin-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksaneplugin-14.12.3.tar.xz";
-      sha256 = "143j3ck5cy4678fx9d0jv3y8zvbkvjxc8kyx3n8hmm4plin54lah";
-      name = "ksaneplugin-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fsviwbz3j2lx8d9hnscq7i6ncm1svq2j-okular-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/okular-14.12.3.tar.xz";
-      sha256 = "07snh1z38s1ycwfsirkzh91dw13hkf0lq79das75qjjladv3v9d7";
-      name = "okular-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/062pw1fc4w3nsflchjnzr33agfr5zpaa-kdesdk-thumbnailers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-thumbnailers-14.12.3.tar.xz";
-      sha256 = "1vaw2p5y9q44yfcs34f501baga1rhswgawn2brglfada6y2b89jk";
-      name = "kdesdk-thumbnailers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.17.tar.xz" ".tar";
-    store = "/nix/store/hgca7dsswq9axlaalvs1ci8zh0sl8j4k-kde-workspace-4.11.17.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-workspace-4.11.17.tar.xz";
-      sha256 = "0pkn49wis90v8ky8hasa80x6ji59sswlb5ib3hzr67mk191vhlhx";
-      name = "kde-workspace-4.11.17.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/kap125hfflfrp7nb58b7vv3w2kp3r6wh-ktux-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktux-14.12.3.tar.xz";
-      sha256 = "0yg3a9wnn4rdbainypq8v6hw57flgsqsq8h8rzb6iy6hwnw8pc8p";
-      name = "ktux-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/li6azfrf8qsi5ai8vfrfq0md8cw581p7-kmousetool-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmousetool-14.12.3.tar.xz";
-      sha256 = "14n79dlfiyd3pz3gi6sg71nd2p5vp18sk99bh7qz1dyid27v6z08";
-      name = "kmousetool-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mlpp2nwbyg3dscicj50795c4bxbmzcqq-oxygen-icons-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/oxygen-icons-14.12.3.tar.xz";
-      sha256 = "0apfpfrpxjrnxf6c4bxxfhys9k7wif74yx9bbysrrndw4bvv0nx6";
-      name = "oxygen-icons-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3hpc3hmys0i16sh7aqmlw46flk6r110y-ktouch-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktouch-14.12.3.tar.xz";
-      sha256 = "1z084yi4s1i5nqir2izdaa5gca3216gqb00mr06044pc2h059j6h";
-      name = "ktouch-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lvsdhfw8c30z36yyjfcxprcw3ik3jb2s-kollision-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kollision-14.12.3.tar.xz";
-      sha256 = "1gfzya87q202az63dvrfpyf70khc27vh9nj5hriyql0kzyqy0xgf";
-      name = "kollision-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0vnr7sljdzsxpkdyzz08yspr6kcbj0vn-kdegraphics-thumbnailers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-thumbnailers-14.12.3.tar.xz";
-      sha256 = "023b1la31qc2b8rfmc3nxi29pd3jld6p2ivi1sdl1pybcillzpax";
-      name = "kdegraphics-thumbnailers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lrkq8yk3wr9gwivm2177vqv5y2sh7zcf-gwenview-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/gwenview-14.12.3.tar.xz";
-      sha256 = "14kwdayzffsc8nk20xl86gqspbvrwja9x8h2dc498cqag0l60hcw";
-      name = "gwenview-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qgxz0771xbp8zvqplrv3g8rc89025xqa-kmines-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmines-14.12.3.tar.xz";
-      sha256 = "1xbpdq8250srbg2c10iz44aa6i19srk4x0f0bcsjhc53r8680g0f";
-      name = "kmines-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/fzwlsgxvxd1xp98ba1ksfbwjn20da65v-ktp-accounts-kcm-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-accounts-kcm-15.03.97.tar.xz";
-      sha256 = "1m9z8h2dvbwj9rxqp5kj24ndqp070nhi2qk1k07qc7shcivmcpzb";
-      name = "ktp-accounts-kcm-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jszqrw79x8cxbpckhg73npzirli3axjq-cervisia-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/cervisia-15.03.97.tar.xz";
-      sha256 = "0aqfxbs1ssdpijvrw51qy131mns6br18mgv0nvys6l83ssanpn9v";
-      name = "cervisia-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ygn36njvhb5vcy560z70ppzv13ilbb99-kmahjongg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmahjongg-15.03.97.tar.xz";
-      sha256 = "0x5qm94a3q2r0kq0k6n8iylbzq9binbkwbb0gbcm9hnylyl4chki";
-      name = "kmahjongg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/38n1ajabh2s6sq3xlvxkv8r759fd8xwl-killbots-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/killbots-15.03.97.tar.xz";
-      sha256 = "0l0xjhc7vxmycn8j88h42lirl6rbn29x4rc670kcgm6ly8la5zki";
-      name = "killbots-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-common-internals-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9zzgdr465wngzkgjplykk9l8d5shcicx-ktp-common-internals-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-common-internals-15.03.97.tar.xz";
-      sha256 = "1b813w17k013gik8i2ji2bb0m6pa8mab4bcqwsx95mv72l25ld4i";
-      name = "ktp-common-internals-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/a07306c2bs073jkq27d8kcd97cyp153r-kmines-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmines-15.03.97.tar.xz";
-      sha256 = "089y8jzqcd1s0q0cfv9i7hcj18rj7vhmiw1rwr0pwfmnixjrn2hl";
-      name = "kmines-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6vq7sl95pb7bh7w2gk7z1sgsl6zinrsv-kspaceduel-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kspaceduel-15.03.97.tar.xz";
-      sha256 = "1jfszdx6lj57c74zmvrqgzxvzqfd6zkl7irf6b3dxjg3damsfsjz";
-      name = "kspaceduel-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkgeomap-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/3vpnb3007jxrmhr21k52nln8f73dn8lh-libkgeomap-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkgeomap-15.03.97.tar.xz";
-      sha256 = "04q45hfhck8v4hxyw7fszvz48gch4pz2aqql98ynhshx19aj4c0w";
-      name = "libkgeomap-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vkrpkcplvfa7mrfdjv0is8w52fzlldiz-kruler-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kruler-15.03.97.tar.xz";
-      sha256 = "0f6z9ii72dkkx8jkmf18k2mlxnflpd2n5qb36s0rzndli7n71x9n";
-      name = "kruler-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/v1qxds25w9yk7m0ym2xjgdhj5ag8g9zn-ksystemlog-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksystemlog-15.03.97.tar.xz";
-      sha256 = "1mvj308sf17ljs74y7xc1ynnqblvgjzblblfnihmg6wlbigri3sb";
-      name = "ksystemlog-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/4xmy1jf4ng641bshcgczy4vq1jlz4dc7-analitza-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/analitza-15.03.97.tar.xz";
-      sha256 = "0p98dcynn33yssc84j5aykhiiwdd5hgg7jdpvdzbwcqdnbnkwp11";
-      name = "analitza-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/idhczh8j0f8h7ibbcprmrj8z45hmya0c-kompare-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kompare-15.03.97.tar.xz";
-      sha256 = "12whm20jxhcqcpx7br7m54dcbjl1z0ngjq42zn2ldp43lgd5hjpa";
-      name = "kompare-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1svwivcnq60pbnv11wwcq0vhlbyydcri-kcron-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcron-15.03.97.tar.xz";
-      sha256 = "18z3kn8ay69nk1anawm6k08xl4xng7rpzvqmxwiyp102bvbxv6xr";
-      name = "kcron-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/n1ix532hcm0m1agsknsvxhmghir7zfr0-kppp-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kppp-15.03.97.tar.xz";
-      sha256 = "12jibm5xihq44kxgv7g1zfyhvp9nbv0dyxnb2gwarngqa0yv20sy";
-      name = "kppp-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dv34q5wny1n7xwz590xcn1j3k1k3s1lf-kde-l10n-ar-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ar-15.03.97.tar.xz";
-      sha256 = "1jzal66wlkdqd85dj4rp5akrrbd80iw72swdnav3zbwlmcs53val";
-      name = "kde-l10n-ar-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dhp5j6702hjdjyl0im5sq4pcsmyc4m6h-kde-l10n-sk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sk-15.03.97.tar.xz";
-      sha256 = "1sm9axz2mwgvw2gws2bmr2c2nj7fk1gnmry19432b7sf7khil9as";
-      name = "kde-l10n-sk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/q0ldpyshshs6grvdpm73d533dkdscizc-kde-l10n-sl-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sl-15.03.97.tar.xz";
-      sha256 = "1077lzin7ygjbcfb613c2lj83jiqxn85zchlcmxbkz2fmh3ycwy8";
-      name = "kde-l10n-sl-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/cbydlyizpj9nncj80a2my7anydmw11if-kde-l10n-lv-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-lv-15.03.97.tar.xz";
-      sha256 = "1x36i97a8hpkbqgxd6cfcqvyx3a1i7cl0s4bhz94kjvncmn5f55r";
-      name = "kde-l10n-lv-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lzzcc3d64wy83rci6pkdirbgbjpfvg1b-kde-l10n-is-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-is-15.03.97.tar.xz";
-      sha256 = "0rk8km86n1iv1id9whjz6rnpzi2ncpckws9kzzk2s9lfrf5sq0wv";
-      name = "kde-l10n-is-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hrhsn3g0rn9l7zn9664harxvd8yjcvhm-kde-l10n-km-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-km-15.03.97.tar.xz";
-      sha256 = "1kyklr6m42jc9k6py5d0f79vmc6gs0iajzsx71jpc98amqm40dvc";
-      name = "kde-l10n-km-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/3g2xlsklwbfzx2gzjxfg053gw0gssi5y-kde-l10n-uk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-uk-15.03.97.tar.xz";
-      sha256 = "0kfvdq6ggc52hd5d1y9xmrp985magfszs9bvvv9pi3j3aawp0nr3";
-      name = "kde-l10n-uk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/wyp8qzfx2p2nxacv85c4yg7f5bkzqs8v-kde-l10n-ug-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ug-15.03.97.tar.xz";
-      sha256 = "0ysy6548wdf6k44bylbk969cakla8zk6n2laaajxrb0ydqdy8ryf";
-      name = "kde-l10n-ug-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k2622ylc5rq0vzcaxs2qzxw19z1lf47m-kde-l10n-ro-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ro-15.03.97.tar.xz";
-      sha256 = "032rpjnh8b0idcvcnc5lc9kkgzvivk45sw4rg2b84rlwhnvs4yxq";
-      name = "kde-l10n-ro-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/q3ibkqyra322i3q042m1nwaaxjk7vy7x-kde-l10n-el-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-el-15.03.97.tar.xz";
-      sha256 = "0f6l2j743r98j6axn2f1rn76fibcjgy3n2lw15ahiik584gjmm3c";
-      name = "kde-l10n-el-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hsjrf139kiykjcg4x6h7j4z6m0fhh6yq-kde-l10n-fr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fr-15.03.97.tar.xz";
-      sha256 = "1mv781g64w8vw8fx2jiavh8kdb21p0jzc3cnxgwphpz2igphs2i5";
-      name = "kde-l10n-fr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dgkb5dgb9gdgy7q5bicn2lmdpd891hdr-kde-l10n-cs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-cs-15.03.97.tar.xz";
-      sha256 = "1xqj92xk69csifq0hzx367zwvck1d89izdrggcqqki5rblgywixs";
-      name = "kde-l10n-cs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hxdn5gs171wjz2grpbdh1x4405bj0m8h-kde-l10n-pa-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pa-15.03.97.tar.xz";
-      sha256 = "09sqxglpzkf4ai0kph4wybb2z7ccwkwgkz5n7k0iplv4c0calk4c";
-      name = "kde-l10n-pa-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/74s8g8x9znrx83ys4vqfmnf1fk0yw48v-kde-l10n-es-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-es-15.03.97.tar.xz";
-      sha256 = "0qqvqz7jcnzlw8l8wh4ngl54dnhj2hmdvha10yqh4jg93492161w";
-      name = "kde-l10n-es-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xalqsk1g1inbk6wxirfbnjymzmf7lidy-kde-l10n-ia-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ia-15.03.97.tar.xz";
-      sha256 = "0k5gc5hf5nf6yizqdwkdwrhkhcs6hkansilr3hkwxjyl4rgn3xgn";
-      name = "kde-l10n-ia-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/n2k0lbnmwvzd6g62wm1fr451kapmdd3p-kde-l10n-it-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-it-15.03.97.tar.xz";
-      sha256 = "1d23k78pw8z17m1bwy9hnjdrfh3xsndbizir65slg7nhz3yn7zvs";
-      name = "kde-l10n-it-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/kcyax5wp8kfc52h1zhwd9kn8ix57v0ky-kde-l10n-he-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-he-15.03.97.tar.xz";
-      sha256 = "0lwbpnn3cl5069c3cqnx8g3n5k7wh1i89nj3s2qqwch13c1ri4qh";
-      name = "kde-l10n-he-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/f36j585s3fcxi3ddbnbwjcxn6dpm8g8c-kde-l10n-nn-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nn-15.03.97.tar.xz";
-      sha256 = "1s319pjkd4xlk6qjvd0smzb462dxffbldj1ls8lbq3b66qj922nb";
-      name = "kde-l10n-nn-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/l532av8373imngcmnf1zl6mixl0wjpwz-kde-l10n-pt-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pt-15.03.97.tar.xz";
-      sha256 = "0cxcp0n6qqwvnyrv595mkfvvrp09n8d07rwk2fcfyzcbiir619ip";
-      name = "kde-l10n-pt-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k83ryjj4g5ksvwkx1ldhcp982srl4hrr-kde-l10n-fa-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fa-15.03.97.tar.xz";
-      sha256 = "07ckz57ihr90filnl37dvvnpi7snax9i21bnblmw3lckhdd9yaj0";
-      name = "kde-l10n-fa-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/00lm3069ynks9d5w2mm1nf5psya0xmc1-kde-l10n-hi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hi-15.03.97.tar.xz";
-      sha256 = "0cw2x3p6llys54zlv2a1v383vbmyfjff9bwffs0dcxnvwpk2xbw2";
-      name = "kde-l10n-hi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jhsjymvl9wqpxc0wjvn37h8px16v36bg-kde-l10n-da-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-da-15.03.97.tar.xz";
-      sha256 = "0yb780ciap47sa61pz66q3w4na7yqhvj1idb3vv28zh583yzhwjq";
-      name = "kde-l10n-da-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/drhl1i7qb41n9r5767adxx7jw21x5jxn-kde-l10n-ko-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ko-15.03.97.tar.xz";
-      sha256 = "19xwgs383kcypkz90q3d05szj8s8mw96xh0vy4v492hln6vrbw5w";
-      name = "kde-l10n-ko-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/szl8g0yvc72cy83a2mzknkd0fpncyagh-kde-l10n-eu-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-eu-15.03.97.tar.xz";
-      sha256 = "07f987zsignkvgh63nn67qrspxs60nlyjgd0hjnnjagnvmm5n3nl";
-      name = "kde-l10n-eu-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/cd7lglrrq1a3d4paqlinxps93gvil3ai-kde-l10n-ca-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca-15.03.97.tar.xz";
-      sha256 = "0rdmmbj2rfjfbpdanfwrfx5mz8a1b7yibqanwsnfjmxg2x7g2amk";
-      name = "kde-l10n-ca-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jiw90iwzrbdldkj606x598fl7ymj30qi-kde-l10n-sv-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sv-15.03.97.tar.xz";
-      sha256 = "0v9q1hd14vx658swvirlrpzlsz56563nsfykwgpwpvp4nmsy4ryj";
-      name = "kde-l10n-sv-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/j7hl9spj7dg85hdylhzv7mfjj9fs35fb-kde-l10n-hu-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hu-15.03.97.tar.xz";
-      sha256 = "084wvhsig3vdza8ik6cr7sicdhyyr0i1rp5y90mpgk9w4cpc4hdb";
-      name = "kde-l10n-hu-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vyim28mkvi3i41ij6jv3j0ma53mczxx5-kde-l10n-sr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sr-15.03.97.tar.xz";
-      sha256 = "0f76ynprvszvq1m2pycggfpng727dh3007hm9nfcdnic7riix7cs";
-      name = "kde-l10n-sr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/5zg8z85gx4xbg85bv60bzq5ggiwsp6sz-kde-l10n-nl-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nl-15.03.97.tar.xz";
-      sha256 = "1k7pb79r29fc4qdq9qsiv9ngycbl47nxnsy5hhig0mijnlyjafcg";
-      name = "kde-l10n-nl-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zgrr858247hggw2zapfqy7r6dnjk7jal-kde-l10n-bs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-bs-15.03.97.tar.xz";
-      sha256 = "0cpv16ss70pxlmmpk6gqf7ym7lgxyyc80np1c7rqh19wi4fyyhsw";
-      name = "kde-l10n-bs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/52y7ar13x8k9j6r6lam9lfl44ic3gnlp-kde-l10n-id-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-id-15.03.97.tar.xz";
-      sha256 = "135jh54f39c28k0x8s6r0m0zzmbxyxav9br0n963501w0xxajprq";
-      name = "kde-l10n-id-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xiqp0z906kdvbhwv5qvpzsz2b1x6035f-kde-l10n-ru-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ru-15.03.97.tar.xz";
-      sha256 = "1jh78m3hdzplwb9min9dxzp6f0qlksrlkv1maf6145g282xyx5z0";
-      name = "kde-l10n-ru-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ck99fha1k79n8w31mj86h7ars0aj48l7-kde-l10n-fi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fi-15.03.97.tar.xz";
-      sha256 = "155ignyq0mmcvckam8dn6hg0hfj6gvcdcnvvp30wxg6v8grk85za";
-      name = "kde-l10n-fi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/w3d62n11mdpws1l6k33kwzssiwdj6jpm-kde-l10n-kk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-kk-15.03.97.tar.xz";
-      sha256 = "0hb9kbz1kxdhl853jkqmxpspbrzwhg2kgns197sm0vqlzz8arjqh";
-      name = "kde-l10n-kk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/fybjx6l20cvkb8i1dnjbrvwai7dh84n5-kde-l10n-wa-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-wa-15.03.97.tar.xz";
-      sha256 = "0n4f7lllgjhii3jzw4jk969hrkhjx89j7s12f68jsxl7b74pwxni";
-      name = "kde-l10n-wa-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hzv99y7kv4cgf2l3yjr4kc16pr6b0fjr-kde-l10n-ca_valencia-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca_valencia-15.03.97.tar.xz";
-      sha256 = "0pxknkbj73a99q5ahpg2k1h2i0pdy53n4qsvc5v2k49ymb8av93l";
-      name = "kde-l10n-ca_valencia-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6smzivm13xpsxzprjhh9jqm5v4dmlvah-kde-l10n-bg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-bg-15.03.97.tar.xz";
-      sha256 = "0bw7bvjrn2j099nzg9yls89cf0i45hv17jnqdva75c3p4jll1jhb";
-      name = "kde-l10n-bg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zygnw1vxl5g44ckc4bvl0kqsaa2r1n1k-kde-l10n-ga-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ga-15.03.97.tar.xz";
-      sha256 = "14irxcprdg7zwca3d3653kpkp4xvi8h8gfi12gd4db3mr1pp680d";
-      name = "kde-l10n-ga-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9fqz3hl48r057jf602hypf75lm83fp6x-kde-l10n-nb-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nb-15.03.97.tar.xz";
-      sha256 = "0z6dfxyi5g223f7ljpdbn5zz3zfrh3s2zi7r7pi46bzx6xi4m596";
-      name = "kde-l10n-nb-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/b2p6jnj81j8my15ms8wcirjlpspaxngg-kde-l10n-mr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-mr-15.03.97.tar.xz";
-      sha256 = "1f89jw179s9wgrg05n6xzizdhkyxk8571rnmvczbzs11bdqkaa1y";
-      name = "kde-l10n-mr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rg5h97vycf8sdp0jmrsvzr0mx1lnx3s1-kde-l10n-en_GB-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-en_GB-15.03.97.tar.xz";
-      sha256 = "0j30nphbqfq0r2m6vnv0xyybqqpnxx9py0vs76kdy6v0dwqbjk9j";
-      name = "kde-l10n-en_GB-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jswff8i15pxlhj6m16hfscg7c9i77n0i-kde-l10n-zh_TW-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-zh_TW-15.03.97.tar.xz";
-      sha256 = "0ln5dam8mhbqsvdqk6h0r01f6yw7vrncb90d9ks5qr1q636w0c2s";
-      name = "kde-l10n-zh_TW-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6civ9la05x0bdxm8l0d6ipyqwx5bf0q6-kde-l10n-tr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-tr-15.03.97.tar.xz";
-      sha256 = "08msarjafiz3dnjw1a9x43ka780z3mpzxvil91gpbqkhypf00912";
-      name = "kde-l10n-tr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/fbyglhlbacqjg4wfm1hny326n678iimh-kde-l10n-et-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-et-15.03.97.tar.xz";
-      sha256 = "09vpyq8i1nghpd9v27bija5fdrb4ifi90dhm8xsk22py21p7spzv";
-      name = "kde-l10n-et-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/8jn5vknwcwd2fwb2ndv7lgb96jibf26h-kde-l10n-hr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hr-15.03.97.tar.xz";
-      sha256 = "1lvglcqwplz5nq1444dyjbnfz1g2v843hkh4nicsx98dghgsy4yz";
-      name = "kde-l10n-hr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/c5w8fkhy6qjd6zvhfkzmpvn54lh1pc78-kde-l10n-pt_BR-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pt_BR-15.03.97.tar.xz";
-      sha256 = "0a95b9sdpwyzisb4whw9w08h1q2jdnz11lclj5zjwz1k6hwa7q2h";
-      name = "kde-l10n-pt_BR-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ymrsrgbslqdf5q9r2yk6fshl37d6mz98-kde-l10n-pl-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pl-15.03.97.tar.xz";
-      sha256 = "0gqicbckcxvpv5pcb73r91n294l6wya6xgqisybvms43afiqd1gh";
-      name = "kde-l10n-pl-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vpgh062m2rfrdd9q4ix7dmkbdipwnapr-kde-l10n-gl-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-gl-15.03.97.tar.xz";
-      sha256 = "198sldry5k941z928vp9vqmfs7ar7n50nybl56xh5w6b4b3qvxf2";
-      name = "kde-l10n-gl-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hzv99y7kv4cgf2l3yjr4kc16pr6b0fjr-kde-l10n-ca_valencia-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca@valencia-15.03.97.tar.xz";
-      sha256 = "0pxknkbj73a99q5ahpg2k1h2i0pdy53n4qsvc5v2k49ymb8av93l";
-      name = "kde-l10n-ca_valencia-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gp0zgzv913f244aba7549b47mrpc1y74-kde-l10n-ja-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ja-15.03.97.tar.xz";
-      sha256 = "1l87jq4hl07vwvq8fqh9i0prw9y66fr4k2sdfbwhylzr187bh92n";
-      name = "kde-l10n-ja-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/cj4ipjrmmrx45026mifhm1sirmp9xjah-kde-l10n-zh_CN-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-zh_CN-15.03.97.tar.xz";
-      sha256 = "12f7m016fmas5ljjfiw6ws6cjv1g21w3aq5n91f2mk5c6q8y7k54";
-      name = "kde-l10n-zh_CN-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/325p1547avvvjq5ccfpdrwnqcvs01wi0-kde-l10n-lt-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-lt-15.03.97.tar.xz";
-      sha256 = "0xb33a27ajx4674vm3mavmgdd46mk23gcnj1y1zbb52nhkmn659p";
-      name = "kde-l10n-lt-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dksx9raabi1kxan2ihy8iyzfixfymia2-kde-l10n-nds-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nds-15.03.97.tar.xz";
-      sha256 = "1lv2mmyilpfrh3nszmzhc1cq10g088cgh34yy18wvr75zvjxy03s";
-      name = "kde-l10n-nds-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/sn20qqpfq5mhi9xzs12j91kbanp6lp07-kde-l10n-de-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-de-15.03.97.tar.xz";
-      sha256 = "14w35wnh5j0x3wm69pys9ndjmfyf9066l6jc1ysas2hcqgn5mlzk";
-      name = "kde-l10n-de-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gi9avd4hsvl99xg9bwlaxagd2p4bmmaj-ksirk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksirk-15.03.97.tar.xz";
-      sha256 = "1ffg4l5gmk9p635xzk05vlhsmrksc1x0dlhwkniyndnn6bw9hxpw";
-      name = "ksirk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gy96gs8knilv4zncq9hwby6z6ipbjmj4-kdesdk-strigi-analyzers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-strigi-analyzers-15.03.97.tar.xz";
-      sha256 = "0zvcma4cwdq18sy0min65gp2b0my9dmwi09vfyrlkscr7v566vm2";
-      name = "kdesdk-strigi-analyzers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-providers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/5ximj5vm43gvzspn0gj85608k7ii53m1-kaccounts-providers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kaccounts-providers-15.03.97.tar.xz";
-      sha256 = "03xqddswyil1g66yrn8fndq1jsmmhas96ij9f8i5y4zp9w8gzbnc";
-      name = "kaccounts-providers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ygckwgrmiwh09kf1g8dryljmbn8l8vp3-kgeography-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kgeography-15.03.97.tar.xz";
-      sha256 = "06hm0gbpdf72y1dvfahf0yykhvlwpkx5zmfjgj7m4hhs3fng1268";
-      name = "kgeography-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jb27xg2g2fnm1ricqi9f5kj66pxdagql-amor-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/amor-15.03.97.tar.xz";
-      sha256 = "1786pl826145d92wsll2l4wkx72ki8463avknz2y61gdyrzs37ka";
-      name = "amor-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lr5g99ymh78s05ivdp5dn4bsv5bhzpi8-krfb-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/krfb-15.03.97.tar.xz";
-      sha256 = "1dqzwmm64hbs8cbzy5mfm8kla0xsj9mia5ysl2nikpg32xw9wppg";
-      name = "krfb-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/n516a5jcj3dkqzm5p4bgz8igw78x29v3-ark-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ark-15.03.97.tar.xz";
-      sha256 = "0lrnbrw0gfmfqqybayqwbjy4vkdvlgflb7x8ssqv4jfxhwxbcq93";
-      name = "ark-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jj6cqd38jpyvnni1494z39zy9klpzlyh-kteatime-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kteatime-15.03.97.tar.xz";
-      sha256 = "0znna564iaw9f9z3jnsv5r0323gg460cpya5c2adpkgzb2h1q4rl";
-      name = "kteatime-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/8j8csh2z1s6k602y9dq446d5w4dk9mkn-kfloppy-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kfloppy-15.03.97.tar.xz";
-      sha256 = "0dpwdgzwdxi4591qp90zgxrh91pv259q0rz8ni695vb2zmjmad9q";
-      name = "kfloppy-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/r2b93kzslw0h8ha58xxz01hyv4jnyvrg-krdc-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/krdc-15.03.97.tar.xz";
-      sha256 = "1bk410qp0rkpksywlmgl57kn1jral1g07bdqk6iy1bfsi8qrxz0i";
-      name = "krdc-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0a5g4rrhzsl42imcy2ajg2rffwh2cc83-print-manager-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/print-manager-15.03.97.tar.xz";
-      sha256 = "01xhvdm2nx2jmf0czi1jhdg6dlwhxga3562rbvsw3s2viwppy86r";
-      name = "print-manager-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-integration-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/svp29501l2ihyb3zrdhfcxdzsz6kcad5-kaccounts-integration-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kaccounts-integration-15.03.97.tar.xz";
-      sha256 = "04f326jwppgcyhslrd1w3rlahg3cjm5jb7xnbv8r987yk6avr1wi";
-      name = "kaccounts-integration-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qfsrsrz4nr018bs1gsflj1aps92g616j-granatier-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/granatier-15.03.97.tar.xz";
-      sha256 = "01fp13cgblm3rvpxl3ivvh07ip8hg7qw8iqcsnndg9xwcl2anj0f";
-      name = "granatier-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-approver-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/im6h9m6jfpz2c5p9b0ihz26347f7lj3j-ktp-approver-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-approver-15.03.97.tar.xz";
-      sha256 = "0rz6nzv4fxh80x5rrjygmy22wsrpfdnz12z9in0ssdni679gbpwm";
-      name = "ktp-approver-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/bgy5rbcwi14p955dskr5yrd5kd4ywz57-kolourpaint-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kolourpaint-15.03.97.tar.xz";
-      sha256 = "0r9fwrkg2bcp6rww76iicc9nk1c99pi78y23r5ixhrgpggqhd9qn";
-      name = "kolourpaint-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/072vh5hkamljgjns6ayadkrj3d19ascd-kscd-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kscd-15.03.97.tar.xz";
-      sha256 = "1pp40y8bbixl0cyjahdb47057djff54bqad2y0zi62y0zwrdirsk";
-      name = "kscd-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/alp170k1qvl2azvm87anll8hblfi5d9w-libkdeedu-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkdeedu-15.03.97.tar.xz";
-      sha256 = "0ss0csdrnyjd1nb71hn9xwbfgh0hihpqa3hbylv7hwdr7zs9kk8g";
-      name = "libkdeedu-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/z93xrrq1jbxmw9a16wy3mvr03rnjv1ws-kajongg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kajongg-15.03.97.tar.xz";
-      sha256 = "16m6mgzzhd4vjnznppqaiz9wly5x7l730j60k7vgrhy5fv8x2n0i";
-      name = "kajongg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/maldvj3ir6n7rldvds9qi8pv8i4xxbv3-kdesdk-kioslaves-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-kioslaves-15.03.97.tar.xz";
-      sha256 = "0zk81h6w1ypvmzg7jkmmyy80drdbqldxqadzyvj9spi4s5ix2izk";
-      name = "kdesdk-kioslaves-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ymx5ccf6rj3vrxrd7m4ilip3q6n1fw45-kdegraphics-strigi-analyzer-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-strigi-analyzer-15.03.97.tar.xz";
-      sha256 = "1jl5kljqrp3jifca58kf0a79j5rdvmm49skzwggxjkdiig52hfi6";
-      name = "kdegraphics-strigi-analyzer-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/j4fv1r2bq7rpbay99612d54q9acyrpay-konquest-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/konquest-15.03.97.tar.xz";
-      sha256 = "024as4191idnnqp98nbbzwlfpdh09fk0hkqcjc8bx3f6k1ijgm68";
-      name = "konquest-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/17kzr6sx4qj2j6v98km0dyds6vakp4yn-kig-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kig-15.03.97.tar.xz";
-      sha256 = "0gzrdla005flqgz8lgdskh5p4gczm7682mx2csqji74pmam4cz8k";
-      name = "kig-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/na94hwvpdpssdfk0pgyy2b48k4xslnwl-kamera-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kamera-15.03.97.tar.xz";
-      sha256 = "0bd5dj81c75yl5d23nlih5hwjj0w3rd7r48iyrbc6f6jf5n2wbxq";
-      name = "kamera-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/s60dj8yc70gk2iaybn9g6gb8qh3fis5i-palapeli-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/palapeli-15.03.97.tar.xz";
-      sha256 = "0wk5rwhijkg13hqyjj9nxd3yfqpq3czrsqsvd7qam5wndz9qvcln";
-      name = "palapeli-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0sfm45adnxqzqj1y39yvhvraaw1ym14n-kbruch-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kbruch-15.03.97.tar.xz";
-      sha256 = "1ph2wvc236gnvc1m66dsamfplxy013q3l5yhyn32q7zdnsf70c8x";
-      name = "kbruch-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/26fkssl1j9hxcf4a1sz7bna65w0h4qnx-lokalize-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/lokalize-15.03.97.tar.xz";
-      sha256 = "1d2i96laj0lykxgxyrpgsa4847jxm5sr8r3fx902fzww1jrnym78";
-      name = "lokalize-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lxx2qmp8i27f5w7ywg5zxzwir4vvnvw3-kget-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kget-15.03.97.tar.xz";
-      sha256 = "0d815w9lxq352h13kgglacf2j9vq6f097ds25f892hhxbndrp8nk";
-      name = "kget-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/y9lvm079ijqwxb8ccjkyfn3w72vkb3ql-kwalletmanager-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kwalletmanager-15.03.97.tar.xz";
-      sha256 = "17f792q6n7n9wmkbjl0dlc7h30gnxgwli5b25zfgxja8zg0jpj22";
-      name = "kwalletmanager-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/63qjz32hnqjbrffrwmqf1yff5ypndqka-kolf-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kolf-15.03.97.tar.xz";
-      sha256 = "0p8c2bl4qpghfgkbl6iqjr5b38ndf6afjciaivi14mximbyzbh0r";
-      name = "kolf-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/7m91r3kgb0wig6sfwd3bbgs0jg6g605y-ktimer-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktimer-15.03.97.tar.xz";
-      sha256 = "185d6rx5pamkiw66k67fmq2bzi2a47784l9hr21dj303vw8i47wm";
-      name = "ktimer-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/fvyllq15h7lrwnsq783pk544x80mnyy2-kigo-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kigo-15.03.97.tar.xz";
-      sha256 = "0dz1zy4l2dkbnv57yhcy3m85d8smb66jj1l0gxyk7az72v84gkai";
-      name = "kigo-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/2yqqhcg2rwrjdzmqrsyws0r98w5lzfll-libkcddb-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkcddb-15.03.97.tar.xz";
-      sha256 = "1mq8gjdyswdxgsa8h9kiq86qr79wm2c4xbd39x42k574ld3a9hb1";
-      name = "libkcddb-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/bsw2jxhivvp72fxjsbbr7vh05dbwnq4n-kapman-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kapman-15.03.97.tar.xz";
-      sha256 = "18lvjb4kw4jghxnqd70qnwm6nizmhpyqb196mjdgca1b4yccxagz";
-      name = "kapman-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6s4rvbx5kmrcrp87dxlq89yqphc3s0i2-kdegraphics-mobipocket-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-mobipocket-15.03.97.tar.xz";
-      sha256 = "0rrir6ljzapfx13mag1xg7953r1lkbm8ghi9vh317qb1qcc3r6gn";
-      name = "kdegraphics-mobipocket-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qnqf58icdkspgy9lrnb5sgxhvd4cgi5i-kuser-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kuser-15.03.97.tar.xz";
-      sha256 = "1d6gcxpjxwkcywfw0kshc5h9f9hwc3wj5mr2i08qa8jwc9r2givg";
-      name = "kuser-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/a2l33j3d8az9pyzxwj91jsi8fxdxca7q-kdiamond-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdiamond-15.03.97.tar.xz";
-      sha256 = "0hfp2qfrkwm9ikk9vixdcfam61zgkhzaf38vqcb4bgshikvr1p21";
-      name = "kdiamond-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qmk99gqqfi65mw645d42g50dhc5x04bj-mplayerthumbs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/mplayerthumbs-15.03.97.tar.xz";
-      sha256 = "1i621i1blh6xsvxk5xqgzgad1w8wld2qdlv4ywh5ab1glhzkm85i";
-      name = "mplayerthumbs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k38m1i2v10lg56hz55v5nsq0xr782kq7-kde-baseapps-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-baseapps-15.03.97.tar.xz";
-      sha256 = "0bd3axrxnr7ydhl06skvb1v0254gx0nws7lcl3p41ymd3flkygbc";
-      name = "kde-baseapps-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/4ayjbvs3jq9fdkfxp93bgx8fj3amkzip-ktp-filetransfer-handler-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-filetransfer-handler-15.03.97.tar.xz";
-      sha256 = "0dw696s1sp8g5n8j54zg743kf3l6iaanqw7q6yawvawx6h7pq8hz";
-      name = "ktp-filetransfer-handler-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9gvqvglrrdlqs66w7bqbbhk23hyb7q9m-ktux-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktux-15.03.97.tar.xz";
-      sha256 = "1qydzqsr3xaxdgp6fck9qfzn5sn7k7gqs9pnj0j79kxsj5kqmxby";
-      name = "ktux-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/45rkyfima16qf8m5i33pgjhhm899f3kq-kde-dev-utils-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-dev-utils-15.03.97.tar.xz";
-      sha256 = "19ks03y8n8ld5d0pwsgcs8znlpsvczdgf07lg286rv4qd337bn9d";
-      name = "kde-dev-utils-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k5v5aqiw9irbz8vn2shsfyy12fziz80r-pairs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/pairs-15.03.97.tar.xz";
-      sha256 = "07ayicd59jk0fz0jzigdnx0xsqaml9wc85k2xwl7171ly19gmdl8";
-      name = "pairs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0zxs3hp9y23566xjspk0k9h74bygxam9-dolphin-plugins-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/dolphin-plugins-15.03.97.tar.xz";
-      sha256 = "01zkpkn741pnmnamf42p0i43j4z2mv8x9xclsbxq4x56jdclpi1b";
-      name = "dolphin-plugins-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/plq1hcmz2yv44sqxlfnrg2rfny0cn13n-kstars-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kstars-15.03.97.tar.xz";
-      sha256 = "14r7d5cwx52lbh2dp4rqvvq53g93zjp11kh8jknibfh3rx2j1g3g";
-      name = "kstars-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qw1fzl3g5ax1xbhs02ys9axnpi6ycwqx-khangman-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/khangman-15.03.97.tar.xz";
-      sha256 = "1kryg8c9vj5z1jcjgmj5x7s2jxhlb6jrdvyb5jpmsc00kkbiq55f";
-      name = "khangman-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9rgk4ahf3vp7g56vhwkf0h20llzi0q5i-superkaramba-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/superkaramba-15.03.97.tar.xz";
-      sha256 = "13cqka2l6lnlk3z6650rdw36pfislsnm8j82qakm2w88x0czmygb";
-      name = "superkaramba-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/f3b6vzsaqpxs76g2qr748m1lbkp5w2x7-kiten-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kiten-15.03.97.tar.xz";
-      sha256 = "10vjhhivy06nrd3iqcqny2misg878q6i6ikig2a0spsjqxsykivf";
-      name = "kiten-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/2g0zw9y5fq2wkfdbws58hbbz824ck59l-sweeper-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/sweeper-15.03.97.tar.xz";
-      sha256 = "0p4hmjz36znr2w3a9b01mx9pygwbnsbmybc0lr6w1hjk66006slj";
-      name = "sweeper-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/y3405ndszj3rwsll7n265wwk7b4zs2wr-konsole-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/konsole-15.03.97.tar.xz";
-      sha256 = "0gjv58sz55jybcq15pl1nnd3y9xw41rmw9ql7h155rxyyr1sicfg";
-      name = "konsole-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/kw8g49szvz2q8sr2rw8gkgk3njjr2hai-kcachegrind-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcachegrind-15.03.97.tar.xz";
-      sha256 = "09lqqwknzgwnx3wy2kbdh1ci971vpjq5zpnyhlfrq7ngb471469y";
-      name = "kcachegrind-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1d2pfw38a4pbvw12a0py52c31a07mf6y-katomic-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/katomic-15.03.97.tar.xz";
-      sha256 = "04qcarmkzm914rwfwc2jpgp3p5kdv158k066kpmhfg83sbd5nicy";
-      name = "katomic-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hq5ln85966sl8azjlmqk3r42niy2w7hz-kalgebra-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kalgebra-15.03.97.tar.xz";
-      sha256 = "0sd1fl57xli8gwn8g1byshyc74mbqp949h5jq0r1pwcvvcxn4zih";
-      name = "kalgebra-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/kjrn2cxkzkhnc5fdsvhbailmn1amag6a-knavalbattle-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/knavalbattle-15.03.97.tar.xz";
-      sha256 = "0p6h0c2msg930yvx6fy0xa5is9y8dhrzahiir6rk5mp3i4iiczsw";
-      name = "knavalbattle-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dxzhs1qgzsyjs1ryrajdyynszh2vc829-kmag-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmag-15.03.97.tar.xz";
-      sha256 = "0a5ibbzxj6dxxnafmgs5rfxmg80hg7kviqadkam7argv2kqqqyf7";
-      name = "kmag-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-list-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hip8z67xgz9c6il2km70jjyj1ffybzdb-ktp-contact-list-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-contact-list-15.03.97.tar.xz";
-      sha256 = "1q9m91a5caxill86pzx05wkqb57vgxpcgvjjwfdk80xy1jfjl0mj";
-      name = "ktp-contact-list-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/yhh09c7kvvsbla8ml2s1x0vxmshqkqv5-kollision-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kollision-15.03.97.tar.xz";
-      sha256 = "1pck211yp3z93ypmi6iglvbjjm76hd8c5862zh32z04wf9flj67c";
-      name = "kollision-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zxw8q532b6iakic511m1p4rqxlwszmcy-svgpart-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/svgpart-15.03.97.tar.xz";
-      sha256 = "1vs5pnnwjawvyw44mh0bhjb1nf432jfv2a5d8q8yfh17dw7yc4n4";
-      name = "svgpart-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/z45gsfngyzihcfsr1fxv72l0pclxj4wv-kdf-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdf-15.03.97.tar.xz";
-      sha256 = "15kjbgl1ddwpmcrmc1gv1zd2kvywicy866ib1ab413w90h8ch6pc";
-      name = "kdf-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/f6gzb36gsgkpwfyz9vf125fc80hsd8h7-signon-kwallet-extension-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/signon-kwallet-extension-15.03.97.tar.xz";
-      sha256 = "1jn7bn3asd3z6zdw9f8kmw5qrd6qc3xkb9hwzfdiyzvnx4mkphkl";
-      name = "signon-kwallet-extension-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k4kw8xlacdm3cszh21a8kcznj5qw0szx-gwenview-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/gwenview-15.03.97.tar.xz";
-      sha256 = "1qznk4aw8bp0d5hqqmrwfgjdmlwzp71dckik0xw5kcl19y2yb50j";
-      name = "gwenview-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/5m5q8y2xyvcl81k1rsqivv4w1hki8rp8-dragon-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/dragon-15.03.97.tar.xz";
-      sha256 = "1vv7k807kpfyfkj2hckdx9i83br1w87q0c280q79c0867kqz93ly";
-      name = "dragon-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/2q9z23rlgzgliqdd9ay7213diwpwp4n2-ksnakeduel-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksnakeduel-15.03.97.tar.xz";
-      sha256 = "0pfadpsg35dwy5gxb0w8f2kwam1hsr1hxhnk59rck42a00vgm9a5";
-      name = "ksnakeduel-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/p4ya7jqqlhdhvw889qfy31x03akxpsh1-kiriki-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kiriki-15.03.97.tar.xz";
-      sha256 = "1a589bnqfl678mpah6lxm6cif3gn1drsb9d9mfq8azsxa9385hm0";
-      name = "kiriki-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0a3yw0r25hp00j0k9y2qafysiwss7382-libkomparediff2-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkomparediff2-15.03.97.tar.xz";
-      sha256 = "0g2ivgpxmjfk5grqiw4y5j9k6bzrkyyrghq2kf8s6598k78cr6r0";
-      name = "libkomparediff2-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/b8fy5jqvnrnqga38g2srsd3yh8hm1m0v-kdegraphics-thumbnailers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-thumbnailers-15.03.97.tar.xz";
-      sha256 = "00knd3apdy6x3p2sp8qqlhamk8p1wgzikximx4qqfnkpjxh13bhp";
-      name = "kdegraphics-thumbnailers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/nrfkmwagh0q5p3f5qjr3yyzzwjisqnyb-kde-base-artwork-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-base-artwork-15.03.97.tar.xz";
-      sha256 = "0zqs8bmnl8lzw9a9830bgxpx9jf03wp2c21f5jd8d1fg1pps0z0i";
-      name = "kde-base-artwork-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rqwxd5519acl8q2672iq88vs2zqsrkl8-poxml-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/poxml-15.03.97.tar.xz";
-      sha256 = "1lsyld927xcqi875r8q7gvcy0jx1zbizwnfiwax5hjmk8qcv92h9";
-      name = "poxml-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-kded-module-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/j80ahh8qk9yyp3aim9ng7hddw2rk9bin-ktp-kded-module-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-kded-module-15.03.97.tar.xz";
-      sha256 = "1gxk9i4yf8x4kivkji0850i64vqqir1rpmv7mi31ka0lxrnh9426";
-      name = "ktp-kded-module-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/z9kvvyqq45jyj4waqw62nwsqglh179bn-ktp-auth-handler-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-auth-handler-15.03.97.tar.xz";
-      sha256 = "1pgh1700iq0l9ayn09vfwbqcaz430r1p452fhsawa9cqhh5fb7y0";
-      name = "ktp-auth-handler-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/pviq202zvlr66w44nryi7sy8n2345rn9-kblocks-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kblocks-15.03.97.tar.xz";
-      sha256 = "0ix8fxrkppp5vx0gp8pmcx9cckbnp3v06mwq98ca3pfdm63g6ld3";
-      name = "kblocks-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rc1kfmfq3y62m7sxirpnds1afwhg5618-kdesdk-thumbnailers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-thumbnailers-15.03.97.tar.xz";
-      sha256 = "0dw2g7rxb02sky91k86bk59ihwzzadbm89gj6kizzibj31dfgza7";
-      name = "kdesdk-thumbnailers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/76wzxhdcg2wpl5fbm2d8vphnv5wm592m-libksane-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libksane-15.03.97.tar.xz";
-      sha256 = "0p7mpk2sfiq85v6f7cr1wffrgnpw33dy8x3g8vv8xbh0bry0f6vj";
-      name = "libksane-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6bc8lg99jgzzix5py3kmzn5s23nzb543-zeroconf-ioslave-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/zeroconf-ioslave-15.03.97.tar.xz";
-      sha256 = "11m3212np5i0mifzxcw8g21mbighf4512whwaipizrr5pkmiqaq0";
-      name = "zeroconf-ioslave-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/bn905pbkkw9pfk1zi4ibgvgbvqmmg3bh-kreversi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kreversi-15.03.97.tar.xz";
-      sha256 = "060l13gvg40sb35ysf3s3b6rf9dcqxbg7lxq1mrkq9b41gnnwffs";
-      name = "kreversi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/4mszqip3y5nxh2sdicrljgkahzd4g76p-kapptemplate-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kapptemplate-15.03.97.tar.xz";
-      sha256 = "0ydp2dllzcm1clxlmlbz7das9kgxlgy10qazs9bqmciydz3s67qf";
-      name = "kapptemplate-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dazflxly4rz3bcg7np3nkzkm1rv835kn-picmi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/picmi-15.03.97.tar.xz";
-      sha256 = "0wrk1clrg7k3fb48bx11kbp3a71riw9ghjvmjwsvliv5iry6lijf";
-      name = "picmi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gs44r2c2nxj0dy367xjyqx5k7x952wb9-kdewebdev-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdewebdev-15.03.97.tar.xz";
-      sha256 = "1g15jvpismsya39j27ikwhm7gy36kshxfdzfg6s53vgfh7kxba3s";
-      name = "kdewebdev-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/m2qzkyb1yry7a9qia5vys08smymzh1fx-cantor-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/cantor-15.03.97.tar.xz";
-      sha256 = "0zy8pc55j63y4m7zkg700rr1561gvq5iq5g729csaaj5rxrs0qma";
-      name = "cantor-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-text-ui-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/5fdsd7z8lwn3i9iq17zcvjxqglw7d2m5-ktp-text-ui-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-text-ui-15.03.97.tar.xz";
-      sha256 = "0crv5y7c01v5s5y9mfbaz862kiyabii6ys1mv7zd1y9j1jlncmbc";
-      name = "ktp-text-ui-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/h6p7mjbmvzilnh64sgssy5ibk59niqck-kbreakout-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kbreakout-15.03.97.tar.xz";
-      sha256 = "1a226j933pb338i61zhfbj4qbfim47ac660g35ka49r9pd2r97h7";
-      name = "kbreakout-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0gjp7ilj861p1gcyabcd593ai1fsb5cm-marble-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/marble-15.03.97.tar.xz";
-      sha256 = "1saifm5y1ldyrbmqqbl42cyybxh830rs6v33pxx9ra29ynir3pnh";
-      name = "marble-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ycrpyyiz3x1x9m4fkvryqad2bhgwzlr1-kdenetwork-filesharing-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdenetwork-filesharing-15.03.97.tar.xz";
-      sha256 = "0wcg17p1wqqrxqmhqa216aps78r9w061s0a62243k1avfag4mn5d";
-      name = "kdenetwork-filesharing-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/m4d76q6jhxiy16nchx1bxfwavr3947q6-kde-dev-scripts-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-dev-scripts-15.03.97.tar.xz";
-      sha256 = "1nfanhgv8kzzak76brg71vwdbdz8nbhc457a5a21x3qa6q8y9cfv";
-      name = "kde-dev-scripts-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/nb1h1vyf5yic9dbf02lz8x6j54x9qjcl-ktp-contact-runner-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-contact-runner-15.03.97.tar.xz";
-      sha256 = "1pddmcmmlpan5ahykisfbijg5lkl1bffcc60xxlcanxb5s6f2f7i";
-      name = "ktp-contact-runner-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/spp4d4shq598fzvlz27gcvzkj1wd5nk8-kdenetwork-strigi-analyzers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdenetwork-strigi-analyzers-15.03.97.tar.xz";
-      sha256 = "1a084dxal4l2h92mnzi6brwj5fy0393jwk53ph6lh4nc7902jsjn";
-      name = "kdenetwork-strigi-analyzers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/him1cfdfb128nr9l2aa4qj8bzrh3vmp6-libkdegames-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkdegames-15.03.97.tar.xz";
-      sha256 = "05s0yab89mw6997akr12jlx0zfx4365g5y96929np0qrc1vmysv3";
-      name = "libkdegames-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rnyfpdin4s3a0gksi82h8gyq7fkx750f-libkipi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkipi-15.03.97.tar.xz";
-      sha256 = "1ckvjc528p2899sszw0z7z9cn6ayimcq2d7grp7bnlkrri1dwgm4";
-      name = "libkipi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6hvijhzrxkky1nxw88zmc5gaw16k26b9-juk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/juk-15.03.97.tar.xz";
-      sha256 = "1749dn860vzzxbix3rnwlmg8gsa8fgjzy3dry6zv2hrwzvdd0x2c";
-      name = "juk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1qkh8akfvjmllbzz06jszpq6yqp4504q-audiocd-kio-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/audiocd-kio-15.03.97.tar.xz";
-      sha256 = "12djfs6dnvqjpmjjp32rls76l2fh43snd7d351qcyvylg1xzszzk";
-      name = "audiocd-kio-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ykqy9kcqmsiqnm3f4i3dd4yn6a4ckac4-kdeedu-data-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdeedu-data-15.03.97.tar.xz";
-      sha256 = "0a31pwim66i5581kxqa9zp96n7ynbm9q133mmp6mznrkh719wmmq";
-      name = "kdeedu-data-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/l5m57r1rs0dnd44snj35idjrxclz3c30-oxygen-icons-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/oxygen-icons-15.03.97.tar.xz";
-      sha256 = "0b3m1wsv21pfsls7xgrbdydskspy4sfyd36hisd3yq2m4l2rzhla";
-      name = "oxygen-icons-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gi0k7kp0aw1f8bp5jyqg9zhzzcgd53ch-kfourinline-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kfourinline-15.03.97.tar.xz";
-      sha256 = "0bzp31i2lk14p17rzmdgia3wb1sl52a16rkigf7bixsxh0kpmjp8";
-      name = "kfourinline-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/s9vvyqnqqyqxw5xf3hmhrkv2ql6h1xl0-libkdcraw-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkdcraw-15.03.97.tar.xz";
-      sha256 = "1v0klb3p8g05r4g0nmnw606cjr5pcm79wbf2sxcx3a62h8hfd1ab";
-      name = "libkdcraw-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenlive-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6h09z9zvai18h5i6mcd1h1qixjn7rv7z-kdenlive-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdenlive-15.03.97.tar.xz";
-      sha256 = "078jwsi6zgxz8g9wzgsx58px019y62vwizx1f4mdb1l59zz4qs66";
-      name = "kdenlive-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6ll6l4smmasjf6v6ilcyqfiqcyfv9lqc-artikulate-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/artikulate-15.03.97.tar.xz";
-      sha256 = "08zlxxjq2axfv7q6hvm90yppc19rslic43lwj7v3rlbpzafg6bfw";
-      name = "artikulate-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/57fg1nxpfmx0g2v7z99gz88h9krgzx6v-ktouch-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktouch-15.03.97.tar.xz";
-      sha256 = "0kvd8lps9mwrj829jyjnm30nvv45k7v9bdrfjbign9qzncchfyzn";
-      name = "ktouch-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xsak17jj48is7x0cn7qc2ivlfldvssbh-kopete-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kopete-15.03.97.tar.xz";
-      sha256 = "0cqi4r6ks8320cl2ndjmlhvbbz0g5xjkrn8h5vhvhcx6hzllqfjz";
-      name = "kopete-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ga4495j41nv294455zi3kjyd8f81klim-klines-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/klines-15.03.97.tar.xz";
-      sha256 = "0pchlv45y3bga30fka4sa81hp6wpb9n4bsjcfisivwcq9l1x2xx3";
-      name = "klines-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ln69lwqgwrlj6lvgz7rndxi5f979blph-kmix-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmix-15.03.97.tar.xz";
-      sha256 = "043gc9dnc6lrpgnqqkqzc2ybp5wj9xkpwb53r7bzvr02aivci85i";
-      name = "kmix-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lz6spcw13ab1ac21hc3bkg1v7rgkjzh9-kcolorchooser-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcolorchooser-15.03.97.tar.xz";
-      sha256 = "0d2y21frbmq9ga4aqhr0x1bkjdx10564f8xadaymh6q8wvygizmy";
-      name = "kcolorchooser-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/r4cdj27zvlsi1w0989l97v8h02j66aif-ksaneplugin-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksaneplugin-15.03.97.tar.xz";
-      sha256 = "0zng7rxy5qf3lrds90a652s1qjd8rrzc2b895i08kf85p4mqi5k2";
-      name = "ksaneplugin-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/iv657wf7d2jzdcyagpih9i1zjak1x4q1-ksudoku-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksudoku-15.03.97.tar.xz";
-      sha256 = "09z4jk68cakp68rnz0q1xwfyxa1ykphyl639nmqzm2djfs98kph9";
-      name = "ksudoku-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/f310bqpghnfsszcmz1mijr768pb75cwn-kubrick-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kubrick-15.03.97.tar.xz";
-      sha256 = "12q81gggxfd7s2pwziw3z9p18kd4lapplc6cvg6wycf62gv7zxj0";
-      name = "kubrick-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/i0xk4a4bsg33lz0hi2ppbjmkv135kayr-okteta-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/okteta-15.03.97.tar.xz";
-      sha256 = "14pd1zag13qqd5nq25shq46hrgh7m45ch06w5hb5cqg3zc6zv5lm";
-      name = "okteta-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zq9mxrmdsrdnwi3wzx53xnz67907wpa3-kgamma-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kgamma-15.03.97.tar.xz";
-      sha256 = "18h006i0fm997i9k1r4il5pj217klhd8xgan0jpx56kbvh0csd19";
-      name = "kgamma-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/nx9ifsjl88y9r84zki7hm7d0ss7fmxyz-kpat-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kpat-15.03.97.tar.xz";
-      sha256 = "1yz5sv3j2fjw89qdrm96xqr04fxrnpnsa1y6i5y5381hcd9r9j6m";
-      name = "kpat-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/j3y9bi6k3ljsbgd1wclylq6scqq12xn4-libkeduvocdocument-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkeduvocdocument-15.03.97.tar.xz";
-      sha256 = "1sayd4pipx2hgafxw03pjigjmqk5vkz2cbc3wjvwzsaanphg5sr1";
-      name = "libkeduvocdocument-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/syj9kp9rm42nnl9zr90y3fdkjmmmx3gr-kgoldrunner-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kgoldrunner-15.03.97.tar.xz";
-      sha256 = "1rcvd6dmdnwr44w8aq4bg9z88byz398dqq5ljjnb7g205khwkq70";
-      name = "kgoldrunner-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xj18z9g22xdwj527i6jmimh5f48966zc-kmouth-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmouth-15.03.97.tar.xz";
-      sha256 = "0m8fl816g49ffg65rff1ml15hp4zdgny3j2s4wwyr7csnh1cyx9s";
-      name = "kmouth-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vgnd6d8h7ljsyw1c3d3amfndy648mhhh-libkcompactdisc-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkcompactdisc-15.03.97.tar.xz";
-      sha256 = "0by16b1c99xnf4cif909yxgfbd4kwxp2x0wbgsrvmhrrll18ahrx";
-      name = "libkcompactdisc-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qh7laq9bq945p4nwkgl9cczfa67c3k8d-klettres-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/klettres-15.03.97.tar.xz";
-      sha256 = "0rc3sgnzv4lvkbp3bf1lgqzffvpnv88c21m95y1anl357yfqhpll";
-      name = "klettres-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/kznx0jnx85vmkkhag5nzdylghaham14l-lskat-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/lskat-15.03.97.tar.xz";
-      sha256 = "0ml5r1p8x6sgxjk3fkqsvyrwaqnyyjxjy4jrsxq29z5bcsxwkdwl";
-      name = "lskat-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/y1l5d03ds6c9mi1hq0k85aslncls27zx-kde-runtime-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-runtime-15.03.97.tar.xz";
-      sha256 = "1f008crhnx58h28hn3mjm8ggqwwix42jg3vbch3zg6qf3y5g8pbl";
-      name = "kde-runtime-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/licjww29xgrhn22ic9s5zcm6321d8jdl-ffmpegthumbs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ffmpegthumbs-15.03.97.tar.xz";
-      sha256 = "0116dd6lijy943hq854x0ksywqxpswvn1sijmd32bii65i4w4jkf";
-      name = "ffmpegthumbs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/84bklrq71nsbw458czr4s9i0s612j3b1-kjumpingcube-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kjumpingcube-15.03.97.tar.xz";
-      sha256 = "1gdfgi3sqx2ix91qc1xbb2njsc92qqs70qg1y1i58hxd6y9zcba4";
-      name = "kjumpingcube-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xk3c4d55xm6b67n5gxip9b14cinlyhzi-kqtquickcharts-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kqtquickcharts-15.03.97.tar.xz";
-      sha256 = "19q714d93il100qrdyq368jdr9cdrspm597rnw70wns0yh4yxla6";
-      name = "kqtquickcharts-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rxdcw4768763s3665d971315dp0h6khy-okular-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/okular-15.03.97.tar.xz";
-      sha256 = "1jvppqlq94n81shh41dx1q53d321fiy5wg6gai96klyk5apnavr7";
-      name = "okular-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/3s350sis8fvm65dza217jj8ahmawwjs9-kdeartwork-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdeartwork-15.03.97.tar.xz";
-      sha256 = "0fg261vrygxr97rn4yy8n8150icvnj8alkvva5s1hff46z1pjpn2";
-      name = "kdeartwork-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dzp0xprdjz6fvxp0pd2msxdi296yxnxy-knetwalk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/knetwalk-15.03.97.tar.xz";
-      sha256 = "0pf658hdzzm5ax9753iyhxdq54y2rkwb22i31iqrq01m56mlqflk";
-      name = "knetwalk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/s7zbpyk892flqfyr7b8h9qxg97wdsmbj-kmousetool-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmousetool-15.03.97.tar.xz";
-      sha256 = "0slvrl6wn5c213wfpjpdcbq89rml2afcvfhrq7vw4kxc6xv57811";
-      name = "kmousetool-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gssrywn435h5z1xk2lplll0gvkxlihd2-ktuberling-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktuberling-15.03.97.tar.xz";
-      sha256 = "1i6k3kpsn58bjj6187q0lay29xyknfn9k69qr4i8ry81j73qbm77";
-      name = "ktuberling-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1wb93a12gm4ygqfdhwn83s1z5ma2y69n-kalzium-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kalzium-15.03.97.tar.xz";
-      sha256 = "1wz9mksqk3d8n0pgj1sxfrdxgann8d6v4dj2vfl6l600ip0mzycw";
-      name = "kalzium-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/c135ykjfry7k6fk5khr1sicwkckvp52a-filelight-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/filelight-15.03.97.tar.xz";
-      sha256 = "0c30n68mbrp2cnqwbrh2r15vm4nppcrfxizsqc4gnfhrl1p3yyiz";
-      name = "filelight-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9c2rnwlc8j3k0yjbi83j7p44c3kgpfz1-kate-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kate-15.03.97.tar.xz";
-      sha256 = "0ccfrp346yb677fyjlqs3s30400z461cj841pmvi94cjnqlydvkb";
-      name = "kate-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jbdz7p1hl659yyrziql6aqynh8353p9a-libkface-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkface-15.03.97.tar.xz";
-      sha256 = "1gd719gxcrg88hnbdd01zflkphlrkfk3vl29w566vfg9wgdh93fj";
-      name = "libkface-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/8gjxjvxh20x22wcwxpli2zkj9bjcwbn6-ksquares-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksquares-15.03.97.tar.xz";
-      sha256 = "0ylpnhcccfxbkkjhzs907saq9rmqkin41ynzn1pik6y4g8asgjgf";
-      name = "ksquares-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/2yg9z2ayyi77z7czj2phpbjdbdx2mdmv-bomber-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/bomber-15.03.97.tar.xz";
-      sha256 = "08hgj0gpkqj644nl9c9jcrqkzrz9dhh91rkvzkn0c9080s21xqhn";
-      name = "bomber-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/y7ga3ldhk55z9r2iji8vr1xwypl5w5sd-kaccessible-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kaccessible-15.03.97.tar.xz";
-      sha256 = "0gm4nyx8w2dz6631mryqkznqnaag8fslr1x703nd9bvx6nbaf973";
-      name = "kaccessible-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-send-file-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/mirisvq9ddryfyqiixr90pqqcbwfmssw-ktp-send-file-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-send-file-15.03.97.tar.xz";
-      sha256 = "0sbq0xsw0g0vh268021csf22igyqhziy4j0imqziza3p708h1hx9";
-      name = "ktp-send-file-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1c46ll16k2didp2gqw8931l4975h4a0k-kanagram-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kanagram-15.03.97.tar.xz";
-      sha256 = "1798s8hb4ikzy1bczylywjcglwc8wqwakn5chaqaiyazl4m40gdx";
-      name = "kanagram-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zigxsksdg9sy843b5grwa6rw7v6dzgpl-kmplot-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmplot-15.03.97.tar.xz";
-      sha256 = "1irra5rncpsvhiapxs38340bxzn1z86fgj3jqypv1b95imgd1j4l";
-      name = "kmplot-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/sgq7pvdskhmwjrrdy4szvn0am8mm8p85-ktp-desktop-applets-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-desktop-applets-15.03.97.tar.xz";
-      sha256 = "0yprnnjjjx60zi9g1wf0ngwrqsnzdbvgqlnpy53ypmsmk44mmpvq";
-      name = "ktp-desktop-applets-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rgr55x43xyzsxl142xzp5qdxal628k5i-kshisen-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kshisen-15.03.97.tar.xz";
-      sha256 = "0v9nh6bl22khc79fxlq2ywa9f50hb261m0fa1xinddq2p1vkgh1a";
-      name = "kshisen-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/sry2sq14f7xaa4923mq3hhhsn9asxvb1-kwordquiz-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kwordquiz-15.03.97.tar.xz";
-      sha256 = "0l5vibrp632r47vycxzz2sprgz9z8gvrwgw8wa1j6rj77n5df0ji";
-      name = "kwordquiz-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9fbhvnrkqdyp67cq4djszrwi1ap1alqr-ksnapshot-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksnapshot-15.03.97.tar.xz";
-      sha256 = "0ps703b3xrkm9rk07kn3bf7df17wpy9syr4vqz8clvqkkvpminjk";
-      name = "ksnapshot-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xwy4rkjppksz5yjj5d4i6gf0rm588rhg-kturtle-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kturtle-15.03.97.tar.xz";
-      sha256 = "02rrs9b4ynbch14r3yknnf31mgksv9wi61yj7zb1a3n0lysv6rzx";
-      name = "kturtle-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6n5aqymfc5ry8vpzgqg8pdf9g98093jl-kcalc-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcalc-15.03.97.tar.xz";
-      sha256 = "04xbym3jqcqyly2pv5m3v4z9x8r3bg66x0z862pj8y8i1n79lwgd";
-      name = "kcalc-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/np48z8sc9sb5szhbxxgxh0s9pczvk6jy-bovo-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/bovo-15.03.97.tar.xz";
-      sha256 = "1n2wqp6zgg46kmr5lc605371vm8dbida922jfjjfn0g32b66g4zp";
-      name = "bovo-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/mb6b6aj1zdx2l6q1g0cyvjb20q5znrlp-kremotecontrol-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kremotecontrol-15.03.97.tar.xz";
-      sha256 = "0rckl38br7paj0bwhc86j2hq3xl48xh9539byxqsr66p2d6rkf81";
-      name = "kremotecontrol-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/pd4lin2281pz6hbm7hb3nfxaqn201w7r-kcharselect-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcharselect-15.03.97.tar.xz";
-      sha256 = "1wybg9qfk59425sfj5rkrb1hn3kkgfrv2nxln8yf4215zwasivvd";
-      name = "kcharselect-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/43pag9nl9m1ij7q3nl4plahd0ivpjkx7-kgpg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kgpg-15.03.97.tar.xz";
-      sha256 = "0y9jg4p1x2vq9mfxlh2g64bxlrkm6s9qzb2mrzm3b660plhq8ain";
-      name = "kgpg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/q9vp14gqi2sa052n2300z4zx6g7ia1gy-parley-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/parley-15.03.97.tar.xz";
-      sha256 = "0vayhq39afw25g1pns79f5jczr29z4kyzi7as6lhggpp0fx5gzrh";
-      name = "parley-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rk00agcks0cwszrrd4dhv4pwnbngyp9n-klickety-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/klickety-15.03.97.tar.xz";
-      sha256 = "0n8bfdzmmzdb8ywfpjy4rqyj0lyw00lz16dyqhg65b501g4xfx1n";
-      name = "klickety-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xzfgswd8bwwpbbv2dkxkjhahxa0wxkcz-jovie-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/jovie-15.03.97.tar.xz";
-      sha256 = "053lhawgljh99fn3s48grl1ybqpa3pbmmw1ay22yprm0m0k3hbdm";
-      name = "jovie-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0jnr85v0cwj0si80dybb147w5pgwc2av-kbounce-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kbounce-15.03.97.tar.xz";
-      sha256 = "1n9n1ijai7prgihncz6817fccaxbawdkncn7cwbm79cdr291g5vs";
-      name = "kbounce-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/24sryfai0wy46fvp5xalsf4xaczicnih-step-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/step-15.03.97.tar.xz";
-      sha256 = "1m5lxgf3f6m9j257dg0dgvxx5xj5hfdsb16qqhqvyyvka125k9j3";
-      name = "step-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k97rbdbywsq7ddax8shrqghvzwl7la0w-umbrello-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/umbrello-15.03.97.tar.xz";
-      sha256 = "0i3iiy2krd50iib20api9sdm6pbw8ixczr31l2xhsa7508wvdfjg";
-      name = "umbrello-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/45b72yj5m5cn88z4wm2b9w3wd21pyib1-kblackbox-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kblackbox-15.03.97.tar.xz";
-      sha256 = "0vp49qgw7m1ikb1s1vq359lxc9bzwip68j2qix16c9w89mgzcwas";
-      name = "kblackbox-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vp3v5dp9930az3jm9gzrk4kl9km1him0-libkexiv2-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkexiv2-15.03.97.tar.xz";
-      sha256 = "1k7lxr3sdx8qnpr8hwvykdp589677c59qahsr3xg72658jiliyzz";
-      name = "libkexiv2-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1srxr5sy3apaa33n603mshps9rz0r3k4-rocs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/rocs-15.03.97.tar.xz";
-      sha256 = "0ynaqahwr0j06hfjzsya1z9zcdp4m3bg62bc55k54iygydhkwf8n";
-      name = "rocs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jqap4lnyi6dij0lm11xvfcydchz25gg2-libkmahjongg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkmahjongg-15.03.97.tar.xz";
-      sha256 = "0lcykfziqaw3k84as85pgar2a5jvy67qd4v0w7riyyp5ndnqdfb6";
-      name = "libkmahjongg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lw3288r7mjnn6yc16gjr79mvpfamj5dp-kde-wallpapers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-wallpapers-15.03.97.tar.xz";
-      sha256 = "11qb8rli0jazxfjwv2k2n5ya39n1spgdj525fnpc2gzxyp3pwdg2";
-      name = "kde-wallpapers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/n1n0by4sqvsvvm2nq6k3d7m5cvya76h9-blinken-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/blinken-15.03.97.tar.xz";
-      sha256 = "1nbcl5fjpw8w2hyiwx4qksf1x1w3nij9rssvjiccn6clz006jcrs";
-      name = "blinken-15.03.97.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kjumpingcube-15.04.0.tar.xz";
+      sha256 = "0mj33yz2565px6ljlw6k0pgd2ljq9gsjx4x9jzq6wbcjg6vbiyah";
+      name = "kjumpingcube-15.04.0.tar.xz";
     };
   }
 ]
diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh
index a8e3591c2023..a26fa4b80e28 100755
--- a/pkgs/applications/kde-apps-15.04/manifest.sh
+++ b/pkgs/applications/kde-apps-15.04/manifest.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
 
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
 if [ $# -eq 0 ]; then
 
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../.. -A autonix.manifest) \
-      # We need 14.12 for some packages in LTS that are not released in beta.
-      # Remove 14.12 when 15.04 is out of beta.
-      http://download.kde.org/stable/applications/14.12.1/ \
-      http://download.kde.org/stable/applications/14.12.2/ \
-      http://download.kde.org/stable/applications/14.12.3/ \
-      http://download.kde.org/unstable/applications/15.03.97/ \
+      "${KDE_MIRROR}/stable/applications/15.04.0/" \
       -A '*.tar.xz'
 
 else

From 0444e9266c21bb71fe554f3f4a630285e8bb51bf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Apr 2015 19:42:18 -0500
Subject: [PATCH 0135/1143] remove kde-apps-14.12

---
 pkgs/applications/kde-apps-14.12/default.nix  |  324 -
 .../kde-apps-14.12/dependencies.nix           | 1676 -----
 .../kde-apps-14.12/dependencies.sh            |   12 -
 .../kdelibs/polkit-install.patch              |   12 -
 pkgs/applications/kde-apps-14.12/manifest.nix | 5665 -----------------
 pkgs/applications/kde-apps-14.12/manifest.sh  |   17 -
 pkgs/applications/kde-apps-14.12/renames.nix  |   23 -
 .../applications/kde-apps-14.12/setup-hook.sh |    1 -
 pkgs/top-level/all-packages.nix               |    7 +-
 9 files changed, 1 insertion(+), 7736 deletions(-)
 delete mode 100644 pkgs/applications/kde-apps-14.12/default.nix
 delete mode 100644 pkgs/applications/kde-apps-14.12/dependencies.nix
 delete mode 100755 pkgs/applications/kde-apps-14.12/dependencies.sh
 delete mode 100644 pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch
 delete mode 100644 pkgs/applications/kde-apps-14.12/manifest.nix
 delete mode 100755 pkgs/applications/kde-apps-14.12/manifest.sh
 delete mode 100644 pkgs/applications/kde-apps-14.12/renames.nix
 delete mode 100644 pkgs/applications/kde-apps-14.12/setup-hook.sh

diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix
deleted file mode 100644
index 96f1aea68753..000000000000
--- a/pkgs/applications/kde-apps-14.12/default.nix
+++ /dev/null
@@ -1,324 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, debug ? false }:
-
-with stdenv.lib; with autonix;
-
-let kf5Orig = kf5; in
-
-let
-
-  kf5 = kf5Orig.override { inherit debug qt5; };
-
-  mirror = "mirror://kde";
-
-  renames =
-    (builtins.removeAttrs
-      (import ./renames.nix {})
-      ["Backend" "CTest"])
-    // {
-      "KDE4" = "kdelibs";
-      "Kexiv2" = "libkexiv2";
-      "Kdcraw" = "libkdcraw";
-      "Kipi" = "libkipi";
-      "LibKMahjongg" = "libkmahjongg";
-      "LibKonq" = "kde-baseapps";
-    };
-
-  mkDerivation = drv: kf5.mkDerivation (drv // {
-    preHook = (drv.preHook or "") + ''
-      addQt4Plugins() {
-        if [[ -d "$1/lib/qt4/plugins" ]]; then
-            propagatedUserEnvPkgs+=" $1"
-        fi
-
-        if [[ -d "$1/lib/kde4/plugins" ]]; then
-            propagatedUserEnvPkgs+=" $1"
-        fi
-      }
-
-      envHooks+=(addQt4Plugins)
-    '';
-  });
-
-  scope =
-    # packages in this collection
-    (mapAttrs (dep: name: kdeApps."${name}") renames) //
-    # packages from KDE Frameworks 5
-    kf5.scope //
-    # packages from nixpkgs
-    (with pkgs;
-      {
-        ACL = acl;
-        Akonadi = kde4.akonadi;
-        Alsa = alsaLib;
-        Automoc4 = automoc4;
-        Avahi = avahi;
-        BISON = bison;
-        Baloo = kde4.baloo;
-        Boost = boost156;
-        Canberra = libcanberra;
-        Cdparanoia = cdparanoia;
-        CUPS = cups;
-        DBusMenuQt = libdbusmenu_qt;
-        DjVuLibre = djvulibre;
-        ENCHANT = enchant;
-        EPub = ebook_tools;
-        Eigen2 = eigen2;
-        Eigen3 = eigen;
-        Exiv2 = exiv2;
-        FAM = fam;
-        FFmpeg = ffmpeg;
-        Flac = flac;
-        FLEX = flex;
-        Freetype = freetype;
-        GMP = gmp;
-        Gettext = gettext;
-        Gpgme = gpgme;
-        Gphoto2 = libgphoto2;
-        Grantlee = grantlee;
-        GSL = gsl;
-        HUNSPELL = hunspell;
-        HUpnp = herqq;
-        Jasper = jasper;
-        KActivities = kde4.kactivities;
-        LCMS2 = lcms2;
-        Ldap = openldap;
-        LibAttica = attica;
-        LibGcrypt = libgcrypt;
-        LibSSH = libssh;
-        LibSpectre = libspectre;
-        LibVNCServer = libvncserver;
-        Libical = libical;
-        MusicBrainz3 = libmusicbrainz;
-        NetworkManager = networkmanager;
-        OggVorbis = libvorbis;
-        OpenAL = openal;
-        OpenEXR = openexr;
-        Poppler = poppler_qt4;
-        Prison = prison;
-        PulseAudio = pulseaudio;
-        PythonLibrary = python;
-        Qalculate = libqalculate;
-        QCA2 = qca2;
-        QImageBlitz = qimageblitz;
-        QJSON = qjson;
-        Qt4 = qt4;
-        Samba = samba;
-        Sasl2 = cyrus_sasl;
-        SharedDesktopOntologies = shared_desktop_ontologies;
-        SndFile = libsndfile;
-        Speechd = speechd;
-        TIFF = libtiff;
-        Taglib = taglib;
-        TelepathyQt4 = telepathy_qt;
-        TunePimp = libtunepimp;
-        UDev = udev;
-        USB = libusb;
-        Xscreensaver = xscreensaver;
-        Xsltproc = libxslt;
-      }
-    );
-
-  qt5Only = tgt:
-    let qt4Deps = [ "KDE4" "Phonon" ];
-    in mapAttrs (name: if name == tgt then removePkgDeps qt4Deps else id);
-
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (qt5Only "kmix")
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-        (blacklist ["artikulate"]) # build failure, wrong boost?
-        (blacklist ["kde-dev-scripts" "kde-dev-utils"]) # docbook errors
-        (blacklist ["kdewebdev"]) # unknown build failure
-      ];
-
-  l10nPkgQt4 = orig:
-    let drvName = builtins.parseDrvName orig.name; in
-    mkDerivation {
-      name = "${drvName.name}-qt4-${drvName.version}";
-      inherit (orig) src;
-      buildInputs = [ kdeApps.kdelibs ];
-      nativeBuildInputs = with pkgs; [ cmake gettext perl ];
-      preConfigure = ''
-        cd 4/
-      '';
-    };
-
-  l10nPkgQt5 = orig:
-    let drvName = builtins.parseDrvName orig.name; in
-    mkDerivation {
-      name = "${drvName.name}-qt5-${drvName.version}";
-      inherit (orig) src;
-      buildInputs = with kf5; [ kdoctools ki18n ];
-      nativeBuildInputs = with pkgs; [ cmake kf5.extra-cmake-modules gettext perl ];
-      preConfigure = ''
-        cd 5/
-      '';
-    };
-
-  l10nPkg = name: orig: symlinkJoin orig.name [(l10nPkgQt4 orig) (l10nPkgQt5 orig)];
-
-  removeL10nPkgs = filterAttrs (n: v: !(hasPrefix "kde-l10n") n);
-
-  postResolve = super:
-    (removeL10nPkgs super) // {
-
-      ark = with pkgs; super.ark // {
-        buildInputs = (super.ark.buildInputs or []) ++ [ makeWrapper ];
-        postInstall = ''
-          wrapProgram $out/bin/ark --prefix PATH : "${unzipNLS}/bin"
-        '';
-      };
-
-      ffmpegthumbs = with pkgs; super.ffmpegthumbs // {
-        nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
-      };
-
-      kalzium = with pkgs; super.kalzium // {
-        nativeBuildInputs = super.kalzium.nativeBuildInputs ++ [pkgconfig];
-      };
-
-      kde-runtime = with pkgs; super.kde-runtime // {
-        buildInputs =
-          super.kde-runtime.buildInputs ++ [libcanberra];
-        nativeBuildInputs =
-          super.kde-runtime.nativeBuildInputs ++ [pkgconfig];
-        NIX_CFLAGS_COMPILE =
-          (super.kde-runtime.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
-        meta = { priority = 10; };
-      };
-
-      kde-workspace = with pkgs; super.kde-workspace // {
-        buildInputs = with xlibs;
-          super.kde-workspace.buildInputs
-          ++
-          [
-            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms
-            xcbutilrenderutil
-          ];
-        nativeBuildInputs =
-          super.kde-workspace.nativeBuildInputs
-          ++ [ pkgconfig ];
-        meta = { priority = 10; };
-      };
-
-      kdelibs = with pkgs; super.kdelibs // {
-        buildInputs =
-          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz ];
-
-        nativeBuildInputs =
-          super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];
-
-        NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-        propagatedBuildInputs =
-          super.kdelibs.propagatedBuildInputs ++ [ qt4 soprano phonon strigi ];
-
-        propagatedNativeBuildInputs =
-          super.kdelibs.propagatedNativeBuildInputs
-          ++ [ automoc4 cmake perl shared_mime_info ];
-
-        patches = [ ./kdelibs/polkit-install.patch ];
-
-        cmakeFlags = [
-          "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-          "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-          "-DHUPNP_ENABLED=ON"
-          "-DWITH_SOLID_UDISKS2=ON"
-          "-DKDE_DEFAULT_HOME=.kde"
-        ];
-      };
-
-      kdepim = with pkgs; super.kdepim // {
-        buildInputs =
-          super.kdepim.buildInputs ++ [ gpgme libassuan ];
-        nativeBuildInputs =
-          super.kdepim.nativeBuildInputs ++ [ pkgconfig ];
-      };
-
-      kdepimlibs = with pkgs; super.kdepimlibs // {
-        nativeBuildInputs =
-          super.kdepimlibs.nativeBuildInputs ++ [ pkgconfig ];
-      };
-
-      kdesdk-thumbnailers = with pkgs; super.kdesdk-thumbnailers // {
-        nativeBuildInputs =
-          super.kdesdk-thumbnailers.nativeBuildInputs
-          ++ [gettext];
-      };
-
-      kgpg = with pkgs; super.kgpg // {
-        buildInputs = super.kgpg.buildInputs ++ [boost];
-      };
-
-      kmix = with pkgs; super.kmix // {
-        nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
-        cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
-      };
-
-      kmousetool = with pkgs; super.kmousetool // {
-        buildInputs = with xlibs;
-          super.kmousetool.buildInputs
-          ++ [libXtst libXt];
-      };
-
-      kremotecontrol = with pkgs; super.kremotecontrol // {
-        buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst];
-      };
-
-      krfb = super.krfb // {
-        buildInputs =
-          super.krfb.buildInputs
-          ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
-      };
-
-      libkdcraw = with pkgs; super.libkdcraw // {
-        buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
-        nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];
-      };
-
-      libkexiv2 = with pkgs; super.libkexiv2 // {
-        buildInputs = super.libkexiv2.buildInputs ++ [exiv2 scope.KDE4];
-      };
-
-      libkface = with pkgs; super.libkface // {
-        buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
-      };
-
-      libkipi = with pkgs; super.libkipi // {
-        buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
-      };
-
-      libksane = with pkgs; super.libksane // {
-        buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
-      };
-
-    };
-
-  l10nManifest =
-    filterAttrs
-      (n: v: hasPrefix "kde-l10n" n)
-      (importManifest ./manifest.nix { inherit mirror; });
-
-  kdeApps = generateCollection ./. {
-    inherit mkDerivation;
-    inherit mirror preResolve postResolve renames scope;
-  };
-
-in kdeApps // (mapAttrs l10nPkg l10nManifest)
diff --git a/pkgs/applications/kde-apps-14.12/dependencies.nix b/pkgs/applications/kde-apps-14.12/dependencies.nix
deleted file mode 100644
index ee820b7ac743..000000000000
--- a/pkgs/applications/kde-apps-14.12/dependencies.nix
+++ /dev/null
@@ -1,1676 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  amor = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  analitza = {
-    buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ark = {
-    buildInputs = [ "BZip2" "KDE4" "LibArchive" "LibKonq" "LibLZMA" "QJSON" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  artikulate = {
-    buildInputs = [ "KDE4" "KDeclarative" "QtGStreamer" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  audiocd-kio = {
-    buildInputs = [ "Cdparanoia" "Flac" "KDE4" "Libkcddb" "Libkcompactdisc" "OggVorbis" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  blinken = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bomber = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bovo = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  cantor = {
-    buildInputs = [ "Analitza" "KDE4" "LibSpectre" "LuaJIT" "PythonLibs" "Qalculate" "R" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  cervisia = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  dolphin-plugins = {
-    buildInputs = [ "KDE4" "LibKonq" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  dragon = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ffmpegthumbs = {
-    buildInputs = [ "FFmpeg" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  filelight = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  granatier = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  gwenview = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KIO" "Kdcraw" "Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5OpenGL" "Qt5QUIET" "Qt5Script" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  jovie = {
-    buildInputs = [ "KDE4" "Qt4" "Speechd" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  juk = {
-    buildInputs = [ "KDE4" "Taglib" "TunePimp" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kaccessible = {
-    buildInputs = [ "KDE4" "Qt4" "Speechd" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kajongg = {
-    buildInputs = [ "KDE4" "Twisted" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kalgebra = {
-    buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Xml" "Readline" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kalzium = {
-    buildInputs = [ "KDE4" "KDEWIN32" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kamera = {
-    buildInputs = [ "Gphoto2" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kanagram = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5OPTIONAL_COMPONENTS" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapman = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapptemplate = {
-    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "RBKCONFIG_COMPILER4" "RBUIC4" "XSLTPROC_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kate = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5ItemModels" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5OPTIONAL_COMPONENTS" "KF5Parts" "KF5Plasma" "KF5Service" "KF5TextEditor" "KF5ThreadWeaver" "KF5Wallet" "KF5WindowSystem" "KF5XmlGui" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5Widgets" "SIP" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  katomic = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kblackbox = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kblocks = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbounce = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbreakout = {
-    buildInputs = [ "KDE4" "KDEGames" "KDeclarative" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbruch = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcachegrind = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcalc = {
-    buildInputs = [ "GMP" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcharselect = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcolorchooser = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcron = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-base-artwork = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-baseapps = {
-    buildInputs = [ "Baloo" "BalooWidgets" "GLIB2" "KActivities" "KDE4" "KFileMetaData" "LibTidy" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-dev-scripts = {
-    buildInputs = [ "ECM" "KDE4" "KF5DocTools" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-dev-utils = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ar = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-bg = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-bs = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ca = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ca_valencia = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-cs = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-da = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-de = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-el = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-en_gb = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-es = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-et = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-eu = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fi = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ga = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-gl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-he = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hi = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hu = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ia = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-id = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-is = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-it = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ja = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-kk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-km = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ko = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-lt = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-lv = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-mr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nb = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nds = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nn = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pt = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pt_br = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ro = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ru = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sv = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-tr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ug = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-uk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-wa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-zh_cn = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-zh_tw = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-runtime = {
-    buildInputs = [ "Alsa" "BZip2" "Exiv2" "GLIB2" "Gpgme" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "LibAttica" "LibGcrypt" "LibLZMA" "LibSSH" "NepomukCore" "NetworkManager" "OpenEXR" "PulseAudio" "QCA2" "QGpgme" "QNtrack" "SLP" "Samba" "SharedMimeInfo" "Soprano" ];
-    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "WINDRES_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kde-wallpapers = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-workspace = {
-    buildInputs = [ "Akonadi" "Boost" "DBusMenuQt" "Fontconfig" "Freetype" "GLIB2" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "NepomukCore" "OpenGL" "OpenGLES" "PCIUTILS" "PNG" "Prison" "PythonLibrary" "QImageBlitz" "QJSON" "Qalculate" "Qt4" "RAW1394" "Sensors" "Soprano" "Strigi" "UDev" "USB" "Wayland" "X11" "X11_XCB" "XCB" "Xmms" "ZLIB" "libgps" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeartwork = {
-    buildInputs = [ "Eigen3" "KDE4" "KDE4Workspace" "Kexiv2" "OpenGL" "Xscreensaver" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeedu-data = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-mobipocket = {
-    buildInputs = [ "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-strigi-analyzer = {
-    buildInputs = [ "KDE4" "OpenEXR" "Strigi" "TIFF" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-thumbnailers = {
-    buildInputs = [ "KDE4" "Kdcraw" "Kexiv2" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs = {
-    buildInputs = [ "ACL" "AGG" "ASPELL" "Automoc4" "Avahi" "BZip2" "Blitz" "BlueZ" "Carbon" "DBusMenuQt" "DNSSD" "DocBookXML" "DocBookXSL" "ENCHANT" "Eigen2" "FAM" "FFmpeg" "Flac" "Flex" "GIF" "GObject" "GSSAPI" "GStreamer" "Grantlee" "HSPELL" "HUNSPELL" "HUpnp" "IOKit" "JPEG" "Jasper" "KDE4" "KDE4Internal" "LCMS" "LibArt" "LibAttica" "LibXml2" "Libintl" "OpenEXR" "OpenSSL" "PCRE" "PNG" "QCA2" "QImageBlitz" "Qt4" "SharedDesktopOntologies" "SharedMimeInfo" "Soprano" "Sqlite" "Strigi" "UDev" "USB" "Xine" "Xmms" "ZLIB" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "LibXslt" "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdenetwork-filesharing = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdenetwork-strigi-analyzers = {
-    buildInputs = [ "Boost" "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdepim = {
-    buildInputs = [ "Akonadi" "Baloo" "Boost" "Git" "Grantlee" "KDE4" "KdepimLibs" "LibKGAPI2" "Prison" "QGpgme" "QJSON" "Sasl2" "Xsltproc" "ZLIB" ];
-    nativeBuildInputs = [ "DBLATEX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdepim-runtime = {
-    buildInputs = [ "AccountsQt" "Akonadi" "Boost" "KDE4" "KdepimLibs" "LibKFbAPI" "LibKGAPI2" "Libkolab" "Libkolabxml" "QJSON" "Qt4" "Sasl2" "SharedMimeInfo" "SignOnQt" "Xsltproc" ];
-    nativeBuildInputs = [ "_testrunner" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdepimlibs = {
-    buildInputs = [ "Akonadi" "Boost" "Gpgme" "KDE4" "Ldap" "LibXml2" "Libical" "Prison" "QJSON" "Sasl2" "SharedMimeInfo" "Xsltproc" ];
-    nativeBuildInputs = [ "LibXslt" "PERL_EXECUTABLE" "_testrunner" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdesdk-kioslaves = {
-    buildInputs = [ "KDE4" "SVN" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesdk-strigi-analyzers = {
-    buildInputs = [ "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesdk-thumbnailers = {
-    buildInputs = [ "GettextPO" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebdev = {
-    buildInputs = [ "KDE4" "KdepimLibs" "LibTidy" "RUBY" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdf = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdiamond = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kfloppy = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kfourinline = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgamma = {
-    buildInputs = [ "KDE4" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgeography = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kget = {
-    buildInputs = [ "Boost" "KDE4" "KDE4Workspace" "KTorrent" "LibMms" "NepomukCore" "NepomukWidgets" "QCA2" "QGpgme" "SharedDesktopOntologies" "Soprano" "Sqlite" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgoldrunner = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgpg = {
-    buildInputs = [ "Gpgme" "KDE4" "KdepimLibs" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khangman = {
-    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Svg" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kig = {
-    buildInputs = [ "BoostPython" "ECM" "KF5Archive" "KF5ConfigWidgets" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5IconThemes" "KF5ItemModels" "KF5KDELibs4Support" "KF5Parts" "KF5TextEditor" "KF5XmlGui" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kigo = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  killbots = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiriki = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiten = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjumpingcube = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klettres = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klickety = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klines = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmag = {
-    buildInputs = [ "KDE4" "QAccessibilityClient" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmahjongg = {
-    buildInputs = [ "KDE4" "KDEGames" "LibKMahjongg" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmines = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmix = {
-    buildInputs = [ "Alsa" "Canberra" "ECM" "GLIB2" "KDE4" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5XmlGui" "Phonon" "PulseAudio" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmousetool = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmouth = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmplot = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knavalbattle = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knetwalk = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kolf = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kollision = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kolourpaint = {
-    buildInputs = [ "KDE4" "QImageBlitz" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kompare = {
-    buildInputs = [ "KDE4" "LibKompareDiff2" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  konquest = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  konsole = {
-    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Konq" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Test" "Qt5Widgets" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kopete = {
-    buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "Qt5QUIET" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpat = {
-    buildInputs = [ "KDE4" "KDEGames" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kppp = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kqtquickcharts = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krdc = {
-    buildInputs = [ "KDE4" "LibNXCL" "LibVNCServer" "TelepathyQt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kremotecontrol = {
-    buildInputs = [ "KDE4" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kreversi = {
-    buildInputs = [ "KDE4" "KDEGames" "KDeclarative" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krfb = {
-    buildInputs = [ "KDE4" "KTp" "LibVNCServer" "TelepathyQt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kruler = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksaneplugin = {
-    buildInputs = [ "KDE4" "KSane" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kscd = {
-    buildInputs = [ "Alsa" "KDE4" "MusicBrainz3" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kshisen = {
-    buildInputs = [ "KDE4" "KDEGames" "LibKMahjongg" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksirk = {
-    buildInputs = [ "KDE4" "KDEGames" "QCA2" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksnakeduel = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksnapshot = {
-    buildInputs = [ "KDE4" "Kipi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kspaceduel = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksquares = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kstars = {
-    buildInputs = [ "AstrometryNet" "CFitsio" "Eigen3" "INDI" "KDE4" "OpenGL" "PyKDE4" "QJSON" "WCSLIB" "Xplanet" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksudoku = {
-    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksystemlog = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kteatime = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktimer = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktouch = {
-    buildInputs = [ "KDE4" "KDeclarative" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktuberling = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kturtle = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktux = {
-    buildInputs = [ "KDE4" "KDE4Workspace" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kubrick = {
-    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kuser = {
-    buildInputs = [ "KDE4" "KdepimLibs" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwalletmanager = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwordquiz = {
-    buildInputs = [ "KDE4" "LibKdeEdu" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkcddb = {
-    buildInputs = [ "KDE4" "MusicBrainz5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkcompactdisc = {
-    buildInputs = [ "Alsa" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdcraw = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdeedu = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdegames = {
-    buildInputs = [ "KDE4" "KDeclarative" "OpenAL" "SndFile" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkeduvocdocument = {
-    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkexiv2 = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkface = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkipi = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkmahjongg = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkomparediff2 = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libksane = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  lokalize = {
-    buildInputs = [ "HUNSPELL" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  lskat = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  marble = {
-    buildInputs = [ "KDE4" "Phonon" "Protobuf" "PyQt4" "PythonLibrary" "QextSerialPort" "Qt4" "Qt5Concurrent" "Qt5Core" "Qt5Designer" "Qt5Network" "Qt5PrintSupport" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" "QtLocation" "SIP" "SharedMimeInfo" "ZLIB" "libgps" "liblocation" "libshp" "libwlocate" "quazip" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  mplayerthumbs = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  okteta = {
-    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qca-qt5" "Qt5" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5QUIET" "Qt5Script" "Qt5ScriptTools" "Qt5Test" "Qt5Widgets" "Qt5Xml" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  okular = {
-    buildInputs = [ "ActiveApp" "CHM" "DjVuLibre" "EPub" "Freetype" "JPEG" "KActivities" "KDE4" "Kexiv2" "LibKScreen" "LibSpectre" "Poppler" "QCA2" "QImageBlitz" "QMobipocket" "TIFF" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen-icons = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  pairs = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  palapeli = {
-    buildInputs = [ "KDE4" "KDEGames" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "QVORONOI_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  parley = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Multimedia" "Qt5Svg" "Qt5Test" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  picmi = {
-    buildInputs = [ "KDE4" "KDEGames" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  poxml = {
-    buildInputs = [ "Gettext" "GettextPO" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  print-manager = {
-    buildInputs = [ "CUPS" "KDE4" "KDE4Internal" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  rocs = {
-    buildInputs = [ "Boost" "Grantlee" "KDE4" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  step = {
-    buildInputs = [ "Eigen2" "GSL" "KDE4" "Qalculate" "Qt4" ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  superkaramba = {
-    buildInputs = [ "KDE4" "PythonLibs" "QImageBlitz" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  svgpart = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sweeper = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  umbrello = {
-    buildInputs = [ "KDE4" "LibXml2" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  zeroconf-ioslave = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/applications/kde-apps-14.12/dependencies.sh b/pkgs/applications/kde-apps-14.12/dependencies.sh
deleted file mode 100755
index e00c7770ab8e..000000000000
--- a/pkgs/applications/kde-apps-14.12/dependencies.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch
deleted file mode 100644
index d2ecac663ec5..000000000000
--- a/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/applications/kde-apps-14.12/manifest.nix b/pkgs/applications/kde-apps-14.12/manifest.nix
deleted file mode 100644
index 88069b6702a7..000000000000
--- a/pkgs/applications/kde-apps-14.12/manifest.nix
+++ /dev/null
@@ -1,5665 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "pairs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fsaycjsmkm1g92j3syc2a8nwdgfgs99g-pairs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/pairs-14.12.1.tar.xz";
-      sha256 = "13byliibd6fwa8bsgka8hc64jkprmgsnqh9sks36w7ic22f32qhx";
-      name = "pairs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4ggxl3vnlngg1p6irixa42as7gyp3c8k-kgamma-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgamma-14.12.1.tar.xz";
-      sha256 = "1ad2c1l2lbc2pdybavnnj834ww82rbm91k0wjgz25xc3l3gkrg9i";
-      name = "kgamma-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n68cvnv9h371cx7q5jqfqs2bdj1rqvyi-ktux-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktux-14.12.1.tar.xz";
-      sha256 = "00x5jm26w1a214chdg1fkzki1z3h1dbw5qagal4lkcb98fi5sbcq";
-      name = "ktux-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n8ayxw5rwzlyc015ff1lzwnd2wa3ss4x-analitza-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/analitza-14.12.1.tar.xz";
-      sha256 = "0jgmjda5n5935v37jgaichk5hif67mzlyvxqmr19wwmbiqfbazx8";
-      name = "analitza-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hz00x8miy3gw4gm2ylw0v90d8xnxxqml-kubrick-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kubrick-14.12.1.tar.xz";
-      sha256 = "0c2ixhd3763pzy92z1ck638wggmq3h4jvnax5ralfhhvn9r2f5bj";
-      name = "kubrick-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fv5vdi5m80l7hzkhkidyk5rd1srghl8x-ksirk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksirk-14.12.1.tar.xz";
-      sha256 = "1sdd117xhn9jclqiczh1cr8apy0akwncmbj82gwm7i1qx31i55fx";
-      name = "ksirk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9wa79ygill8gb5n281cybrmj4zv627h9-katomic-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/katomic-14.12.1.tar.xz";
-      sha256 = "1mjzm4v80cva7kfakjpjkd4sw4fdcyin5f2srck7fl0pnqdpnhqz";
-      name = "katomic-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/w4b045lmp2viqrvifkm11n282l5khwbd-jovie-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/jovie-14.12.1.tar.xz";
-      sha256 = "1xkmybfgn6mbrp6lx8ri0dzmz1nsvg9cxlxan4n5bzwd3zjpycjd";
-      name = "jovie-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ky4vpsb0mm22raiq0r6jfxjsdr5c0vmv-kdeartwork-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdeartwork-14.12.1.tar.xz";
-      sha256 = "0jrdyy787wnqx31nrgmf7amhy5ix9w7anfnqrdn4w8yydpvghhqw";
-      name = "kdeartwork-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l5xwmjgcw6rbmmhy2m5z55hxcf9d12hv-kapman-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kapman-14.12.1.tar.xz";
-      sha256 = "0bkpcjdcax6b3dp236ybaakpxz5b1vkrmmxpczvg6hf2cqwmlsv5";
-      name = "kapman-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/aixz1c1q6rnpqxm805xdirlqg47kw1kr-libkomparediff2-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkomparediff2-14.12.1.tar.xz";
-      sha256 = "0fjqsa83sqd7gcpm818yirnm077g6q616rh9676dzwv0cmc334zx";
-      name = "libkomparediff2-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kx7kv61rc3ddz7gmm5k5cwp9zh3k70nk-kde-wallpapers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-wallpapers-14.12.1.tar.xz";
-      sha256 = "1q28rb8a4rw6v5wvwri3aslc8xwbn0324b07lnkvn58alpmdga8v";
-      name = "kde-wallpapers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c21hgh72czi1nqr3lci8lynvsd3qkvzh-ark-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ark-14.12.1.tar.xz";
-      sha256 = "1fimg9f4l373l31kr59fvvsavssvn3ljdrxrgnl6a66v1gwgjsdp";
-      name = "ark-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b867ygwgvr9g8j54s3gya7c2wpr9gwf8-kdesdk-thumbnailers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-thumbnailers-14.12.1.tar.xz";
-      sha256 = "1p3abcnidk07jgr9qn03zfnhqci27683gz25wy271v6gl7b0wp6c";
-      name = "kdesdk-thumbnailers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hp6x10injwcygbd5zqvkkg2k85n62drw-kde-l10n-wa-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-wa-14.12.1.tar.xz";
-      sha256 = "0aq5n0n0saqkllkwpf9a5scjpsv4bxzx89z2a048kh76i8h9zr5p";
-      name = "kde-l10n-wa-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j8x84jy2x4fw72a2mj7zgzkbd2v430np-kde-l10n-it-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-it-14.12.1.tar.xz";
-      sha256 = "13z9gmaziyvw112phzxc7893lz6wh8q92gb3fj3hmdmzj0vfqv4r";
-      name = "kde-l10n-it-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yccjbanz6ijsf5rdd0n53cwygbv5jm4m-kde-l10n-km-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-km-14.12.1.tar.xz";
-      sha256 = "0fdns3fifr4ypz5mi798xc18miwlb7lqz22f18gnrza22vnzwi09";
-      name = "kde-l10n-km-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mzfjypmyhmp3s7mnxk0mwf57s3l440c2-kde-l10n-pt-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt-14.12.1.tar.xz";
-      sha256 = "13pzz23zf9nnl3a65nrpmwlpnkvr490vfs7yfvvr5w0nrqfwzhp6";
-      name = "kde-l10n-pt-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pjdp04f6m3ghqr23lyzxw7w0fgg5i6ll-kde-l10n-ru-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ru-14.12.1.tar.xz";
-      sha256 = "1a5ygssdwkm9iqakl1w4pza70g1gwh7mzi6jzhbd4jsn740ykw0r";
-      name = "kde-l10n-ru-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4j1r5xz2fslwv0di0dn9x8n49hrxizg4-kde-l10n-de-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-de-14.12.1.tar.xz";
-      sha256 = "1iavp7xr2qv8i97sl1kpl9kasi21br91l3mdah382ayhaz5khnlb";
-      name = "kde-l10n-de-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dz1zi3jrw92cgci5zc8nia3xzq1zykdf-kde-l10n-uk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-uk-14.12.1.tar.xz";
-      sha256 = "1228lpwggkwz9rwnmrmrw4f72hcbng40g1q1bfhjzw078s7j6nxr";
-      name = "kde-l10n-uk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ylf7xmqdh9yrz37yaq4f8nddap1gfanc-kde-l10n-ja-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ja-14.12.1.tar.xz";
-      sha256 = "191whr3i7qkqj2wjzjqgagb1vs391x9sp688w56ynjjmh58vrvq1";
-      name = "kde-l10n-ja-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b6n06i5p82k6fq4p4rpl7bf0cyklazxb-kde-l10n-kk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-kk-14.12.1.tar.xz";
-      sha256 = "01ivq7g550i9ik18xnibn7xl5mmm237wrsksjm0xni18s89wwz8b";
-      name = "kde-l10n-kk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ysarksjh5lcm2yhbphrsqhyzmlp6qclr-kde-l10n-pl-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pl-14.12.1.tar.xz";
-      sha256 = "0ni41lp6l4l3pa1xf6kkim2k5qcvapm2g65nh5hryiwx9dpgkimv";
-      name = "kde-l10n-pl-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zpq7ayj7ihr1xw4ihcnckqvnagl28lk0-kde-l10n-sv-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sv-14.12.1.tar.xz";
-      sha256 = "1r84629cv7c0lkfxii0q133cl710rgiqp5iylb3w32h7c1ji4x19";
-      name = "kde-l10n-sv-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/g5pcas9cz1yq6qz9883l2djfpb77li8a-kde-l10n-ca-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca-14.12.1.tar.xz";
-      sha256 = "1xprgp7l1h7wkfjh6v3yya9xw3r60vhsyk3ly38vcwxy5b6fjigd";
-      name = "kde-l10n-ca-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/v6hb004qp3i0p4vp1yslnmz4clb66p8d-kde-l10n-da-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-da-14.12.1.tar.xz";
-      sha256 = "0b38wgm8f23l9ya9h67m6zm785fmqi7737xfphjmrjh2i13gxpbl";
-      name = "kde-l10n-da-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/33f2k043b8gi64mr4wwrs6pwp5b9bq7h-kde-l10n-he-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-he-14.12.1.tar.xz";
-      sha256 = "0ynvsrczdraf55gaiwbv9nzwy548zkkbdh475frqfmalzh9b7jww";
-      name = "kde-l10n-he-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7hlk5vyd3pl9rdp22ybsj868w6s7sfz0-kde-l10n-lv-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lv-14.12.1.tar.xz";
-      sha256 = "0x3rlallirrzgn8gfyssyvaj3zaji672n6hfacp2djpfzbfwqq6l";
-      name = "kde-l10n-lv-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b2v25j4hlsl7lqb77wk7sj1j5z9q7ldm-kde-l10n-hu-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hu-14.12.1.tar.xz";
-      sha256 = "061kyzz24f6bink3sm4p7q959977ril3m86lm8fa1ddnccw7ya46";
-      name = "kde-l10n-hu-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8a3pmbwm8k7g951yi5d3mv57y9vxn84z-kde-l10n-sr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sr-14.12.1.tar.xz";
-      sha256 = "16kcpilb4mp4cfgklc4dr6y389hlmzvwx8wp0y3i2w1r18nwd8m8";
-      name = "kde-l10n-sr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l4fy9j1aix7fyisan5f2pa4273misph2-kde-l10n-is-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-is-14.12.1.tar.xz";
-      sha256 = "14r5wrkr39cipx40hqqcx12cvv0vql829689yiy97ypcg4bqndma";
-      name = "kde-l10n-is-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vk6fz8gixl7wv6w20h4inn984839lkkk-kde-l10n-mr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-mr-14.12.1.tar.xz";
-      sha256 = "1nvaxd38c4f9kkhkrv4bb1aczi1iv1bp16kmm47s1y6kzb93zq9h";
-      name = "kde-l10n-mr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca_valencia-14.12.1.tar.xz";
-      sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq";
-      name = "kde-l10n-ca_valencia-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0f4agkrcrb1cn6sdgdpj1bwln6f2ra5i-kde-l10n-gl-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-gl-14.12.1.tar.xz";
-      sha256 = "1xjh19c7rjd5k3v3c7g0ljz1kz5vv3zhji4rm84j30z12cks3nhh";
-      name = "kde-l10n-gl-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3nk8pxfypvnwbcszm33fn3j7f0kmgdji-kde-l10n-cs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-cs-14.12.1.tar.xz";
-      sha256 = "1qg9y5173374fpf6yk4v8mlsqdjzp8inirp08qx0lh33jd6rpddb";
-      name = "kde-l10n-cs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/i5vsmw062i49ki35qqyi0ix6x5fl4jvg-kde-l10n-en_GB-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-en_GB-14.12.1.tar.xz";
-      sha256 = "04b7amh2247ksr414m3x7bc4p22xm6kxncsax9ggapx613flb2zc";
-      name = "kde-l10n-en_GB-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p2jc4kci6k5kn1ihy9yv5inp4p4g01n9-kde-l10n-sk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sk-14.12.1.tar.xz";
-      sha256 = "0ic2y081699mv16hpkb3ivdvd4ph51wz3md5bz65pfz404gn7krf";
-      name = "kde-l10n-sk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4kbdmqqmv1slh4z56rifg8sw0a9980m4-kde-l10n-ga-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ga-14.12.1.tar.xz";
-      sha256 = "0794p0dqa1nnkwwc2ipslzhaakcx3r4b6s03hf7m14r58wmvws28";
-      name = "kde-l10n-ga-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hdyxfm2wnigh8wb3ay8y8v7psjrbijy7-kde-l10n-sl-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sl-14.12.1.tar.xz";
-      sha256 = "0nv2yrk99dkvb49ww6l6za0czy89p1nsilm56f4mdgbvrgzwk9zp";
-      name = "kde-l10n-sl-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ln3d7jpln9kl947fhgknbhg0rh6lnxds-kde-l10n-nb-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nb-14.12.1.tar.xz";
-      sha256 = "0zj66ydg5pwlx3hwwdxz6i8m330wz0w2l2p4fvf4kjvy49cafrmd";
-      name = "kde-l10n-nb-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vw8kpmpiyrrqch5wb4164yv0jhkdkpkk-kde-l10n-ko-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ko-14.12.1.tar.xz";
-      sha256 = "08q0d0q2cm2bmdwwmyavzb07wlbnf5lpl071gjm146kzk0y1kmpg";
-      name = "kde-l10n-ko-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/87kmgghdnkmzvdbk611qmv2nav8m2f0p-kde-l10n-ro-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ro-14.12.1.tar.xz";
-      sha256 = "0xprq9jw94i38aaq1drkv1qpgf3rf75745zlagzb430jr1a285lb";
-      name = "kde-l10n-ro-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/h8wfla9jsbhfjvjfnca6yjwpcc90nb5m-kde-l10n-ug-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ug-14.12.1.tar.xz";
-      sha256 = "1am6yr3qq4l2wgpphxhqfj8ydndvjxmc3cl4gz6zlkddaw4pv5kr";
-      name = "kde-l10n-ug-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mja592hds8ajqsx96wb1zxph1n0pxqb0-kde-l10n-hr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hr-14.12.1.tar.xz";
-      sha256 = "0hjhzf77mckh9xqqxn54w47lsn3fwl2p4rfk22ijlliglrylpajv";
-      name = "kde-l10n-hr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9vay8airc00fg0d91lpp84l21akqxn27-kde-l10n-pa-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pa-14.12.1.tar.xz";
-      sha256 = "0sr6pygs0lk1ar2zn6966ngaf9vjfy207i1bgg6gr3559v5wkx8x";
-      name = "kde-l10n-pa-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/sx4w67x5xq87ragvsysg4jwcpvrk674p-kde-l10n-id-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-id-14.12.1.tar.xz";
-      sha256 = "018yvdp7l9qjaj7niyjas87dhna1xr0mikpdycw5dbwchpizlr53";
-      name = "kde-l10n-id-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l9cx18xxg7ly9nrsfi1lj9vxzg19h9sq-kde-l10n-bs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bs-14.12.1.tar.xz";
-      sha256 = "0ybh9wyhym05rlc3s0kl9lh07y96nyl3p4lifj13lcqi975mgnp9";
-      name = "kde-l10n-bs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/59bsq0cq07hc9apbfdmaa66jg5n8wlwg-kde-l10n-pt_BR-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt_BR-14.12.1.tar.xz";
-      sha256 = "1wbgns7pq0jxjffgvr6hgfg3san1k2c7wppsvn2cpjiph0v4azz9";
-      name = "kde-l10n-pt_BR-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9xiaf2c0lbxy65vrx6hdh884ky6h2s79-kde-l10n-bg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bg-14.12.1.tar.xz";
-      sha256 = "0m404hxz8dskbdsni021703vdn4lvwpf88hwrdrfnhcv06jazjiq";
-      name = "kde-l10n-bg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/m8ahg0qxpv2hskl9dl7dgch10adxfia5-kde-l10n-nds-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nds-14.12.1.tar.xz";
-      sha256 = "09r79l4ngcsnya6kqj5hj69xq00bf4ndxgkkplwiq137zqamqcfl";
-      name = "kde-l10n-nds-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mq5v891rzj692h61aak71g71iy963ayw-kde-l10n-zh_TW-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_TW-14.12.1.tar.xz";
-      sha256 = "1azwmzg47pk4b23hpnpic3c8phnfz4iy3n6lv50sz98b9whkmf0s";
-      name = "kde-l10n-zh_TW-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gprdva58d383n4ka677pdbpaz8l05w8i-kde-l10n-nn-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nn-14.12.1.tar.xz";
-      sha256 = "1xp44glwk6nnnavw0lrl7ssl5miqfd7b093chfz35g2g92nyaa3g";
-      name = "kde-l10n-nn-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jhv6zy04igavcq0dxsg9kk3vfh2063m9-kde-l10n-ia-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ia-14.12.1.tar.xz";
-      sha256 = "1kjjg4z4y0fh4kyzy9vzxlw47xkiirh207d7x0b94nksxzbqwg67";
-      name = "kde-l10n-ia-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hy0v61dnnmpbj84a4imvgxqx3y0fd5qg-kde-l10n-tr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-tr-14.12.1.tar.xz";
-      sha256 = "1kdxps75gv2vlf98f958llkk161z2y908bg1fdq4rgdh1n3bylkh";
-      name = "kde-l10n-tr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jmjbgfmqvcqd1sxdj0a7c73a9yqyzvpz-kde-l10n-ar-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ar-14.12.1.tar.xz";
-      sha256 = "121dblyh53fb3qirg7s9givqcn0xswdj2hrnqc8s2x2qas74v6a9";
-      name = "kde-l10n-ar-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b9dqgb7nsfgyzhr4vw7fnl287spyjigg-kde-l10n-zh_CN-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_CN-14.12.1.tar.xz";
-      sha256 = "0cyi0g55xln8smnlnhl0vfpi0jrihnfp3vrv6j2gz30zzfgkw9dp";
-      name = "kde-l10n-zh_CN-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0ycvh7sgyhjqffzq5ff5mjnv0y4f8pxy-kde-l10n-es-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-es-14.12.1.tar.xz";
-      sha256 = "11i4xmsigmi9mqbc5x9l96vsrfh6709fbbfpqa6b28a5jif9anmr";
-      name = "kde-l10n-es-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9rbki0767k1hirpx7530lqcw74bfy2b1-kde-l10n-et-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-et-14.12.1.tar.xz";
-      sha256 = "0c8vhbi1bi29krh1sway8z0536cn507i1lp8jffb4mk953mm5y9n";
-      name = "kde-l10n-et-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pq8r37pcg05p9rc5prcy9r2f5mby7m0z-kde-l10n-fr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fr-14.12.1.tar.xz";
-      sha256 = "1s2glywjbrr2q6ssmalblschrgny4rk3q3aws2ffrrlkanx0qyva";
-      name = "kde-l10n-fr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k0amn3lcd7xcssqh8fs46swa9jmksv9x-kde-l10n-fa-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fa-14.12.1.tar.xz";
-      sha256 = "0pj3klcdlash8wgvz75nw009jz63rblv038yhrh1qsidjw4vsl85";
-      name = "kde-l10n-fa-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/cqbsi6sr0mcl3pnzlk0w52disg2xgm1i-kde-l10n-lt-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lt-14.12.1.tar.xz";
-      sha256 = "0k4m1ixlnmmgbznhgvbmfss0c1fynd492sylcvbsrnqcawq3fqdz";
-      name = "kde-l10n-lt-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8pw7v2ccr5vgl6ic7dnlm5xcqgkbvxyr-kde-l10n-nl-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nl-14.12.1.tar.xz";
-      sha256 = "0m0hwib0v5j2bmgkgwjzhbhqnyk8gcm46969rr2qf51snrvynlax";
-      name = "kde-l10n-nl-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vplfymrx36jk65b0xjmzh2g4l9ky7dfm-kde-l10n-eu-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-eu-14.12.1.tar.xz";
-      sha256 = "0wcax8gnnk6rwpfl6ph8z5i013rmh08pr159nxpakdsvbcn5ma5v";
-      name = "kde-l10n-eu-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca@valencia-14.12.1.tar.xz";
-      sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq";
-      name = "kde-l10n-ca_valencia-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p9a3lyi934i4pc5p8433firhkcs0ybn3-kde-l10n-el-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-el-14.12.1.tar.xz";
-      sha256 = "022kr5cvlz8hxj3s74my680ghp23lj8amykzgr5z9i996q2hs6ps";
-      name = "kde-l10n-el-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9f3cb3yksriwphrnkmn1knrq0108ka4p-kde-l10n-fi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fi-14.12.1.tar.xz";
-      sha256 = "1sxs5z3dkx7hb8l7ilrhzvl2ip02fsb24iqgh0gadqwdfj46gwjn";
-      name = "kde-l10n-fi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pfswxr29nz9qylmb7n83cnap95khz248-kde-l10n-hi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hi-14.12.1.tar.xz";
-      sha256 = "0a5ilahwh6wpxg4mb3wqg079qfvcxg7zqblwyx6mdwh4d2ly5y1f";
-      name = "kde-l10n-hi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ychwcs2gn4mgmhza315nmf2z35c0ibb7-granatier-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/granatier-14.12.1.tar.xz";
-      sha256 = "0lifihkssp0g30kv3iigbpr9ghdwwykmzfiv4qwsxaxadil9qqlm";
-      name = "granatier-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c1n1s1hbj8q4smgxnd4kka9qidh0rvvw-kamera-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kamera-14.12.1.tar.xz";
-      sha256 = "1avmsy622rnyyvsx9zwspqx9g4mb5wzc74mvcjrivi3c3mcz2ng6";
-      name = "kamera-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/bl5csvnm20xxaqz5p7d3ymnkbd0df1p1-kfloppy-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kfloppy-14.12.1.tar.xz";
-      sha256 = "1ky8n0zk07d3cnap8f3zw5qck2kw4l0dql0fnbk3s58r982af2fd";
-      name = "kfloppy-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/v157pqk6clf9yn21cdbvxxvh0sn892rd-kdepimlibs-4.14.4.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepimlibs-4.14.4.tar.xz";
-      sha256 = "04c53ms91r8bpxgn305zzvagi30jli7217kvgdy4z4il6wnvns8r";
-      name = "kdepimlibs-4.14.4.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7amx4gdg85lw28amb0v3nd92hk71lphs-libkipi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkipi-14.12.1.tar.xz";
-      sha256 = "01bpjh40p5cwli018sgyn6jgis1l83icikabcw6vxkp8vsn3q6yg";
-      name = "libkipi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jyx0msd02v7iikj7czv3y8ckw79rahpa-khangman-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/khangman-14.12.1.tar.xz";
-      sha256 = "1574cdbq5lyq4hl84xwia5z15az4zzh6zvasxvaa5bz94cjkpyns";
-      name = "khangman-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0wy6dhhq6gn6h58vi324yiqa2f5ni5py-konsole-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/konsole-14.12.1.tar.xz";
-      sha256 = "0i7mccspglppz0sx2zqfn0861h6ibxkwrcscivqk7yxpq44nb58j";
-      name = "konsole-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yg7gb0aidvcxh4i1z0ja8nvs23vhdf22-killbots-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/killbots-14.12.1.tar.xz";
-      sha256 = "0i006gjysfbf9wn0qgbv47fvx8z4v49ikcaqg9y83pl72shnsa1j";
-      name = "killbots-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s16w00cgm430r315d2v2a041hivc5a1q-kturtle-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kturtle-14.12.1.tar.xz";
-      sha256 = "0sn74w413xx5y3kh0fqf7f47pklz4v22nnv6x11kpkcyx1xmghh9";
-      name = "kturtle-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j2qlvd878dlxkaps9v61dw9k1n6nmh4p-kajongg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kajongg-14.12.1.tar.xz";
-      sha256 = "0690jlsnj3s2l51nmx3an75q0m6xv0rssdmshrmbxgp2cqx5b455";
-      name = "kajongg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8v0k2n5pkvv6wg3q957zqclasmsw2a7c-bomber-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/bomber-14.12.1.tar.xz";
-      sha256 = "0g4cb3jwva9saddf9m2j4k3y1gybh2bv8dxzfb1xqy5cv20qlrfc";
-      name = "bomber-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c61iqdbq71kb6wvnzfq7436hni8anrrn-kruler-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kruler-14.12.1.tar.xz";
-      sha256 = "0rag54kg5jzgj32fnf4xmawb0hnk52rhjf7i2y5f3156x3iraxxx";
-      name = "kruler-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/r2c1gika9sw2m5i1mmj3b47n7g19715k-kmag-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmag-14.12.1.tar.xz";
-      sha256 = "1wlz3n3z9qcsqvs7rz3a76bh6rkrq0g9p797axcsfp7wzjfilj5c";
-      name = "kmag-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rqrykz2vvj59w1563dgcjpi8fmkwdnm5-kwalletmanager-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kwalletmanager-14.12.1.tar.xz";
-      sha256 = "16pd2iym8v9xxdmazn2i7vq61c9m805h9a7awy8wha8bfdinazvi";
-      name = "kwalletmanager-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/x147kkpbjm9mmdbapxs040cvb8fci9ab-krfb-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/krfb-14.12.1.tar.xz";
-      sha256 = "15kxapi1mwjpbj995k8rxla0h1wwvhd406pbwkpak3a9szljsv72";
-      name = "krfb-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ar6s1pn0lfgs1iw6q5akr0l5dcrd1x2a-libkcddb-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkcddb-14.12.1.tar.xz";
-      sha256 = "1vb8rmb1j0nh2dh8ch19v1qpdxhc4c0am7k11lld45kamg3az0gd";
-      name = "libkcddb-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dbf3r79p85w5v6jihmqndcb631kqpb7m-klettres-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klettres-14.12.1.tar.xz";
-      sha256 = "1bj5s3js6v3641s2kgrl6a5bgr25g9lgbvsfzqrp0pil2nx1g6h1";
-      name = "klettres-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xwj5di67f0swj1w0c2235vrbany8ffgn-klines-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klines-14.12.1.tar.xz";
-      sha256 = "1hxjqpc1z47dj1ryp116hdzkla4h1awnlmyzq7yjhki2viw32n3f";
-      name = "klines-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/aj1drn165rirvr5wjmqfnzsfknnb32gj-ksystemlog-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksystemlog-14.12.1.tar.xz";
-      sha256 = "15a92f873vybp3m9icjshbqs8nl6xm4cl9ca3cghmdlcqrn7f92x";
-      name = "ksystemlog-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y8p216blw2zrld7mj5c1ji9nwqhrbqsf-klickety-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klickety-14.12.1.tar.xz";
-      sha256 = "071y9khz57mrw12dvwxhs03jn56j06hw38hcf8d4r4wksbwr3j87";
-      name = "klickety-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5c1isv8y9s4k7153i5y41jdps6zsp8gl-lokalize-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/lokalize-14.12.1.tar.xz";
-      sha256 = "1ala2pfqh0a0kqxiyfpp11rcn805g6gcn0m9qjbmdqhl9wviij9h";
-      name = "lokalize-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/d315k9787k4c5ww7zp0341cybnwwsy2j-kdegraphics-thumbnailers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-thumbnailers-14.12.1.tar.xz";
-      sha256 = "198m7iw621azbcp4abv3izq5p29yz9s2apr6ivxpp1iqzpz2x70g";
-      name = "kdegraphics-thumbnailers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6v8hm7rgdvfkvakv1jfq3g7jk3zq7x3z-kde-base-artwork-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-base-artwork-14.12.1.tar.xz";
-      sha256 = "0zd298ii8a3lnfh6lxgw6nmf91kx3days1nqk5arilkbrf7b4952";
-      name = "kde-base-artwork-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xaibvsd6g0xnwpnayb0jxhah9hmb3xin-artikulate-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/artikulate-14.12.1.tar.xz";
-      sha256 = "021hyprapc6fjhls55yn69sndm13krfriwj1vmq5mvqxzr0aid2k";
-      name = "artikulate-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s6j8nymsygqkh4vfgkgqwcg6xigda53d-kaccessible-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kaccessible-14.12.1.tar.xz";
-      sha256 = "0gp49jxkscdqd35xqmzhr17smiwyxgx8xbr7hkvbm10dzn9kx6x7";
-      name = "kaccessible-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wxk5v878fibdxxd9m9f6phyc99a56psc-konquest-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/konquest-14.12.1.tar.xz";
-      sha256 = "006an4bpfsnzcpm086xjyryd1xlzw0yz2knbzkvsdf3jr9kpmnrr";
-      name = "konquest-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p3yhp4gg9pfbmnlb6jqk6xhaz2yllx9w-superkaramba-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/superkaramba-14.12.1.tar.xz";
-      sha256 = "10dlnn4knlvkz38c98613x9px85a8dhlfwpp4231r3v5va03xszj";
-      name = "superkaramba-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ga54jhkjav5i83vmir8j6l51d3gv1cs1-kdesdk-kioslaves-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-kioslaves-14.12.1.tar.xz";
-      sha256 = "06f8xxzldsqmch9acmfd95lr48rm94d6qll62bj5zi0bs5qjygbw";
-      name = "kdesdk-kioslaves-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xhdgix591fkzqdzw0pch0vv8wk2kkhz5-cantor-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/cantor-14.12.1.tar.xz";
-      sha256 = "100yscp21w7amqmwzh4zsk7kmyn5pf3swlkwipz857wi3wajkm75";
-      name = "cantor-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pvk5701kz79m2bn13n45ffwy0zjng838-kdegraphics-mobipocket-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-mobipocket-14.12.1.tar.xz";
-      sha256 = "0qa0bpfvgbq3x3wlgi1cp3v8xn1wayyjrc07ffdr63w1gfi10mg1";
-      name = "kdegraphics-mobipocket-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yd2zzjmb762dkjbkhjxdsnbg38k53f65-kde-runtime-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-runtime-14.12.1.tar.xz";
-      sha256 = "0cy2dhxw2cvbgqrknb3iy97rip2dcd7nrq3pj649mpq9a3r3cg17";
-      name = "kde-runtime-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hxk0628k5s042wcxwd1v7vy951bsjqxp-kiriki-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kiriki-14.12.1.tar.xz";
-      sha256 = "00j95hcyrnw2li2abkwqsd0dp8ph4wlqzy0d3gzfnkal19j2x2m2";
-      name = "kiriki-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6a5bi2hpxmry12zq6qkwk2hzlv5h7qkz-kwordquiz-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kwordquiz-14.12.1.tar.xz";
-      sha256 = "1c03ab89lnnin81lvq3mbcw2d10k3rjlk2fpplcbbnsryq35bivi";
-      name = "kwordquiz-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ykssldwmik1x7njph3rmzh9d14n7f0mi-kate-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kate-14.12.1.tar.xz";
-      sha256 = "0c3diy846drf5nihvhzhpsp8pl2kviyn6ian61myy2147smkany5";
-      name = "kate-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3k84f0vl6l7l65hmbbdlfp2zg348kcmi-parley-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/parley-14.12.1.tar.xz";
-      sha256 = "0awzpa9bl1j9gzy3596dhpsg3pqbmmdh87n52z7cjyk8sw0ikk19";
-      name = "parley-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/clfp83sn2pg1jr82j79szwkx0aysl9a3-libkdegames-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdegames-14.12.1.tar.xz";
-      sha256 = "0af15lbsjc7w5p3s3nxsb08cvyg7dncjmpw7z1vhgqykzmwpyp56";
-      name = "libkdegames-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ghjddljclnsn3z0rflrrxanbkzxn46m5-libkcompactdisc-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkcompactdisc-14.12.1.tar.xz";
-      sha256 = "10zpv05wmqs1lrby95d5bgvwiqcmkd3ndrdsr6cpayg2lw9nq86d";
-      name = "libkcompactdisc-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k78l2m24w71dbczia8bnwi3fhpqghj6b-kmplot-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmplot-14.12.1.tar.xz";
-      sha256 = "0p0iv3m2648vyr1imzwdfs73rc2q39nl8r7w31z5dhm65rq2zi27";
-      name = "kmplot-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/lpdpdbbbgfyib95cq1m1db5fdym6wjxz-kuser-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kuser-14.12.1.tar.xz";
-      sha256 = "1zgik2i9z0n58m3fm8g0kgjm9aqa6v1f3331r8nrjir9vd9vr8g7";
-      name = "kuser-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p1lzq3dbil7klabykd2995j65qwqfldd-kspaceduel-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kspaceduel-14.12.1.tar.xz";
-      sha256 = "1zihp0nc6gs4xymyykldjw22zrxm8qznjaya4z1fw07hwndijvia";
-      name = "kspaceduel-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/agnpfa5vjjfq79j3x2nf3nfwvvxjl28i-gwenview-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/gwenview-14.12.1.tar.xz";
-      sha256 = "04g3qkz1g27ph6ha1zrbqpr827vhx9n2nigr0dy95a61qw1m0jww";
-      name = "gwenview-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wfnbykydc5zl9d678mpw7hpc1nscynmg-oxygen-icons-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/oxygen-icons-14.12.1.tar.xz";
-      sha256 = "1z27id29s98h20dg27wr28w2qpb25ii1xsrgjk6r33nhj2y39jmg";
-      name = "oxygen-icons-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/q4fxwbxh1rl3icjzhcyij7wwbchc0xzn-kppp-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kppp-14.12.1.tar.xz";
-      sha256 = "0lvcanlskjgra2wn3k1j5jx9vy5k0g381ycg79fazkczsr8is5wf";
-      name = "kppp-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9ny33z3srhnwz8p9fd7i6klmm9y9j08k-kmouth-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmouth-14.12.1.tar.xz";
-      sha256 = "0a3fhlgy8z84n83v59safl71v29px9783dndlqgh1dk8lmki7dmd";
-      name = "kmouth-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/iwj5hwmm9p278b7yi510fh38710w96rr-kig-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kig-14.12.1.tar.xz";
-      sha256 = "0qs89kpms9ch2r9xj4scvjscn7b7bh5k1nxaln1z654mgp1rl4f8";
-      name = "kig-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/z8w5hn03zzpbpg7mjdmykylcbvhcd2ac-libkexiv2-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkexiv2-14.12.1.tar.xz";
-      sha256 = "0qpfccasra3ffq5iz7dpxpzcyk13ywjdaz32n1wfsylfv158w9sg";
-      name = "libkexiv2-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ixgf55ccq4gyyazhnbrrrg1qhpgh048s-kcron-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcron-14.12.1.tar.xz";
-      sha256 = "0czcxajsdx7xal9cvy9cd4drhvaivx68mhymj5k3n90cka7qda2x";
-      name = "kcron-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vjc105v5nsibh4pfvrvsjck78f2645lx-ksnapshot-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksnapshot-14.12.1.tar.xz";
-      sha256 = "02g48b3i7xglrgp1nxvpbsrq7kqg81s4mf6k9rhfn312n45g1arg";
-      name = "ksnapshot-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/543lrxwg6zz77yz58ihn3dvf9rhy3xzg-marble-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/marble-14.12.1.tar.xz";
-      sha256 = "13plghz8d5a8gdkq3nr7m0bvp2p0smqnj987bmsi1cldvliwiijl";
-      name = "marble-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2ssmxyy2vhlipyrh6cs5qgms20cicmhy-kpat-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kpat-14.12.1.tar.xz";
-      sha256 = "02bh34553r7k0vf7sb5nsr6zgmh1xfgyjfyfc22yvknpmz2zz8wb";
-      name = "kpat-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n8504ljfha2rq1r0lrpz0gyyh59rpjln-poxml-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/poxml-14.12.1.tar.xz";
-      sha256 = "1r0iqqszmqmjnkq41xv87sc601fm8s94ga9pn37alni7f7qddfrs";
-      name = "poxml-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/m7ia6872rxwbpx88zidqanf1wqni1az6-umbrello-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/umbrello-14.12.1.tar.xz";
-      sha256 = "0kr60kdfg2pl049n4rkksfs6160jijxdwymx60gj44h8w2dxrx6c";
-      name = "umbrello-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qlj342akja4fh4yp2fib4v4bm3kn2bmg-krdc-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/krdc-14.12.1.tar.xz";
-      sha256 = "0jqq60spxb64m9y37q2wd7w1z3h0c0hcjvd6wi694v0zhblg5622";
-      name = "krdc-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/39r333hqffzycjszw3wbash4p8cs4vrc-ktimer-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktimer-14.12.1.tar.xz";
-      sha256 = "1p4y1kx3w6rqwjnhpjx17246w8gp7l8q2212x7khs8karnfyvxh2";
-      name = "ktimer-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p9al8bnc7cy61ccnbmw5vzbvg36rq3yl-kremotecontrol-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kremotecontrol-14.12.1.tar.xz";
-      sha256 = "0rvf73bj6l7cgbjcpn2bgy00zpdw4sj5zcchgl42xldl75zzr6mc";
-      name = "kremotecontrol-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qsdvwqqp7pwbh2vdi5p3w56snysf94f8-kde-dev-utils-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-utils-14.12.1.tar.xz";
-      sha256 = "1wpiarm8h4y5yjrdrxkmndps06h08vql70n63aai8crdvgwixdqy";
-      name = "kde-dev-utils-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6ic12j8bm99jckl82p347717mrhl5v6r-knavalbattle-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/knavalbattle-14.12.1.tar.xz";
-      sha256 = "1jd4b2kmlknh1xz055xysasfs90810m8sg4iwyzqv2j5kj8i4x4l";
-      name = "knavalbattle-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/72jv9b0id1ql2pbz8vdcm77n7s7br3vk-libksane-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libksane-14.12.1.tar.xz";
-      sha256 = "0a4hp2d0h26nkggmkiswywlw0aj5wkk8c6s9wy2h7m7qcmyq4gk0";
-      name = "libksane-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j4y0bpk9zir6270cmxmfxn10bphgbdw8-libkdcraw-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdcraw-14.12.1.tar.xz";
-      sha256 = "0svalln7g862d6f5k76vdggqc1h1x9gagm6v56yzr9dypz81y40m";
-      name = "libkdcraw-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xl2fn6zcfr99ir7l10y8dd79ns4msgyp-blinken-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/blinken-14.12.1.tar.xz";
-      sha256 = "1fvgq57qhx305qxmhzm628p283dyk9nnp33q5vgcxxfw726mi5pq";
-      name = "blinken-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1v6hadh7m1i58hc62c6z2qs2ycsi02rw-step-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/step-14.12.1.tar.xz";
-      sha256 = "15wlgig9b932ck1hwdld0q8nh74rh820wj4nc6ifys83wv43jnzh";
-      name = "step-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0invqcgsx7scwmihagccpgdfq3aa52w8-kdegraphics-strigi-analyzer-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-strigi-analyzer-14.12.1.tar.xz";
-      sha256 = "03lajpwia7fmlnr9l0g44knwghz8b2i70i659nkvypw6qd89cccr";
-      name = "kdegraphics-strigi-analyzer-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rjsmd2babmjdbwvr5n5gv1f9wcag4iln-kde-baseapps-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-baseapps-14.12.1.tar.xz";
-      sha256 = "0l31842mmriirkcqsdmj7s31yjwr5im8di7z7dfjgjqy0j1q1jzc";
-      name = "kde-baseapps-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/h2hcdrv66b95ajbj5wrz1aspq4fr85pd-kde-dev-scripts-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-scripts-14.12.1.tar.xz";
-      sha256 = "0g3i26vm3n2jc69mpwy94b60ff9c6fsr4yrl1h4f3408f4g4sjj4";
-      name = "kde-dev-scripts-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8kf7fxqm2avmamkdidsglx7rvl30cj1n-kollision-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kollision-14.12.1.tar.xz";
-      sha256 = "1l2c34l95kj4f8y156yirc35vfb2yblnkkjq1bfkmiavsb6vzhd5";
-      name = "kollision-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/82jk65vx3xpg2ydn3fzg6v2w07xgihhc-kgoldrunner-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgoldrunner-14.12.1.tar.xz";
-      sha256 = "0sgr2034mr5gmmg81qp9sqjw2sn2cgdw8bl9dq2iid43czih5zbw";
-      name = "kgoldrunner-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y7m9zzkm4wz23myj568sdjpn86f6m4iy-kolf-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kolf-14.12.1.tar.xz";
-      sha256 = "0arxis9q9qzbv35qq52pl4j5xzqhdwypjhxwdiqammqksdnln8lw";
-      name = "kolf-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8ipl9g3hgm04x1xpvyy8ahlbvjq6birx-okular-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/okular-14.12.1.tar.xz";
-      sha256 = "1my3d91lm6wz8gh9g7pw4rrdxkc22vr9v02b22qqvxb2z8mdq5cb";
-      name = "okular-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jl34m0f1m497dpwnmmw2svy9ig9x7x5q-libkmahjongg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkmahjongg-14.12.1.tar.xz";
-      sha256 = "00s4akfgr33n1bg2bds1fxccnig9hybm95qq95ii6ky4jyjc6b78";
-      name = "libkmahjongg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ab28gj1xwh9calkkf87xqnh84x8cjq08-kbreakout-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbreakout-14.12.1.tar.xz";
-      sha256 = "1cvqjch9ymjii7xmlg1clscbv6245m5bnf77dxz6nkzsrcy4khbx";
-      name = "kbreakout-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8bfm6nbnd3clpdy108yab44vv7552c1i-kgpg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgpg-14.12.1.tar.xz";
-      sha256 = "0cfhmlp200dbhdkckf7xvfbfsz985zw7vp6vin4w378dzyw55lmb";
-      name = "kgpg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/lfsycaw8n7kjsbnkga24cfqmpr0rpff8-kscd-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kscd-14.12.1.tar.xz";
-      sha256 = "0ag9i649ah627b5xsacvz1q05pijfrbwrg34bpcc61px9zsgk18l";
-      name = "kscd-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5avv44x780sz0v874cl781k7camn6xcj-kcalc-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcalc-14.12.1.tar.xz";
-      sha256 = "0qsfllwhn1gd675k5fxbfcfflnn86cbh3nzn70bc2lmxmwrlzbj2";
-      name = "kcalc-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qbgn1hkh15gv93wbrfg2bh14zsfgxfva-kfourinline-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kfourinline-14.12.1.tar.xz";
-      sha256 = "0mhykajapvbcrasadyjjjz7sps3vmmw1hhijfjbswkb62ikmwc6k";
-      name = "kfourinline-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s1m8hz32vjf2v38p2rkznrx4mgn6rzr3-picmi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/picmi-14.12.1.tar.xz";
-      sha256 = "0nrg4qza4h99k59w92v3qy68xlkdslqrlqi62fg94i88rl9l6ypq";
-      name = "picmi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9mqr7imp19hgjl7bn5sbp2d3xmgrr3p1-kdewebdev-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdewebdev-14.12.1.tar.xz";
-      sha256 = "0iv2r5vxkk8bg8p2zpq2dqnq0vvwhmjls0gdg30gyc4w04a7jcqr";
-      name = "kdewebdev-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/nx62f1snc9d786yi1vsh0vzixkgrv9gr-kmines-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmines-14.12.1.tar.xz";
-      sha256 = "13f070kh0rfs5pmw3lnlwxwvx2ph2q8n1vm9lvr6kw1ablngiacm";
-      name = "kmines-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/syf2l3yk3wga82cyak82janjsjhgvbd5-filelight-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/filelight-14.12.1.tar.xz";
-      sha256 = "1dzcgric6rxhxhi84lgbsmkfk6s6b96px8019njnp744jys2ikv8";
-      name = "filelight-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5nkk3cqvi177qd3mq0n687r5swcrixfd-amor-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/amor-14.12.1.tar.xz";
-      sha256 = "0p0fgp3j6x1f83kxdvmkcy4ladhg206m261fbpa92zyxp2ylnl0a";
-      name = "amor-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6pbb85yp6xhd3x5w0a5ql6ms10yj1pj3-kdiamond-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdiamond-14.12.1.tar.xz";
-      sha256 = "12frpi62f4w86ygxa68dvx1nj8n7w7lsgizfdyc6lix6l5vfzn7x";
-      name = "kdiamond-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/89l402jmb83ji7xvkz82kz024l012yaz-kteatime-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kteatime-14.12.1.tar.xz";
-      sha256 = "0my0fjiblkkfy2148axc7gp1nsx5lr2y8zn6d2labai2f6dy1bpf";
-      name = "kteatime-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gjxwckkx3mikzkpxs7vzk830nj42fj6q-juk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/juk-14.12.1.tar.xz";
-      sha256 = "0wzjrk5w5y0f6bc98pr7xni1j8krdyjsk3agcwkhb4d4c0aa5gka";
-      name = "juk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kdk1frzcpvc11ln0vamc6m0m7h1xfnj5-mplayerthumbs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/mplayerthumbs-14.12.1.tar.xz";
-      sha256 = "0z9iw1syv61y4fb4dlr9n8w78ri7wpznys5bd5sn0hxbkwnavs6b";
-      name = "mplayerthumbs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/v34rq3l61yyxsml99xp18adg85ki53r1-kget-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kget-14.12.1.tar.xz";
-      sha256 = "1jr15bcc09pypihva7pjsq6rlj0kqqhqvprxdggmwa7fnyyjxrg4";
-      name = "kget-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8l4frnslphg2rbpmaikwi0j7w4hfw56r-libkface-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkface-14.12.1.tar.xz";
-      sha256 = "198z0n286qnngrln24s1dfghkddz5zy7qr8af0jkywxdj3j2ks3a";
-      name = "libkface-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ygwdm76ijc39y3blkfl7s6g21328dk1p-kcolorchooser-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcolorchooser-14.12.1.tar.xz";
-      sha256 = "1yw1cxg2caddncnhqyck1fh7g43svgcb8pb15wp5rz7qqs0p65mf";
-      name = "kcolorchooser-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2iwy70md4cqg461x92sbxwbfzmj4y1xz-dragon-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/dragon-14.12.1.tar.xz";
-      sha256 = "0wqmjb7zl883mcmx4x8ss0x64r79wrphfxkyva6sifcy596y2wxh";
-      name = "dragon-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5n1arbyl0fjp5b5xdlgyha4nwpxbczyz-kjumpingcube-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kjumpingcube-14.12.1.tar.xz";
-      sha256 = "1h7nypr5b8b5az7c2gszihlhq9k2dn92cabjmif9rlkrvl6nahcy";
-      name = "kjumpingcube-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fxh9hhx7z5bv151xrxw26h91pz09lw9z-kapptemplate-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kapptemplate-14.12.1.tar.xz";
-      sha256 = "00df6ckfaglnnxizzqmci10h8hiqjv0fgi8xb3x4d3aszb049k1y";
-      name = "kapptemplate-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/16zwzi9y1215imff1phggjza00j9y4br-ksquares-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksquares-14.12.1.tar.xz";
-      sha256 = "0b1av02srxfd9ji51f2pcb5phmlqdz2lzik1n97yzn6f0xh19h9y";
-      name = "ksquares-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gfficdhz1w80xmvn9842jx1fwpd81lqi-bovo-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/bovo-14.12.1.tar.xz";
-      sha256 = "08in3ppksxp7zdgrv5lvjxzlvc6srfjcicagqbj2r8nrfmngjlim";
-      name = "bovo-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pafvmq1gg81mjpwyf388k311qwf7pgcj-ksaneplugin-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksaneplugin-14.12.1.tar.xz";
-      sha256 = "00bsd58kfvhp36rbwsmbk3yqjx8gca3r42q5z3fvd0jpf7y8xxip";
-      name = "ksaneplugin-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n25f8hphjdbwbk9z488i4bjmfai5vzsx-rocs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/rocs-14.12.1.tar.xz";
-      sha256 = "033irmbjs6d8q7zdvz7vzx61d0gmgxb96cypwlwjmww1czgy9zcg";
-      name = "rocs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ikirdy65sp1w2w38p28nkzic0zhw5iyp-kompare-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kompare-14.12.1.tar.xz";
-      sha256 = "1js49gfffbv6nplr907dkcq3j6xi6h1276n0fbkpd7y31cca6mi7";
-      name = "kompare-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4zh8mah5lsisbnv07nas6wqv6xvsqzy4-kalzium-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kalzium-14.12.1.tar.xz";
-      sha256 = "180qq9h046hax0jl13iy9mzbzhn66y41p8cj5447qgrnjbdk5qa8";
-      name = "kalzium-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1pbw74v9j5r9x36b2r7yq5k8n9fbcvwz-ksudoku-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksudoku-14.12.1.tar.xz";
-      sha256 = "1majccia02g7icqh8pad3m91nj94j228s66v25szlwacg2zc86zr";
-      name = "ksudoku-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2ifpmknn9aw760hsz4j7cf7kc6x704hl-cervisia-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/cervisia-14.12.1.tar.xz";
-      sha256 = "1xgvk1qar2mg5awkwsc0wzyzmskgv9r6bgbczyy0fjjd9xh0mp75";
-      name = "cervisia-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3qpkmwxn855x58k5za6r67rniyzkj006-kcharselect-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcharselect-14.12.1.tar.xz";
-      sha256 = "0rb4dr7ygiks45c73nwab9wg9zdn1xgq93yhkpp23bkfq9ca7z4f";
-      name = "kcharselect-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mvjdshn07gw1jn31y7igfzrzdmkpw98d-kbruch-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbruch-14.12.1.tar.xz";
-      sha256 = "180gbax6lrn5qr1l7x1c3i0i2kh1by4j80bif66jxwra505by50z";
-      name = "kbruch-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y0pg73qfkvfdrk3r7xz7yfgzl2s24vg5-knetwalk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/knetwalk-14.12.1.tar.xz";
-      sha256 = "00b2zkiv3i99k6ri3xljas2fc2ihri84cmckgwrzvpxbdha8wpj8";
-      name = "knetwalk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7vjjf69hw3kkwxmnlxfcg44wh7yy1s5i-palapeli-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/palapeli-14.12.1.tar.xz";
-      sha256 = "1zdbhn7dfrzb18k3rjgm934gjib5kazkgblsl15jxlzw2yfy458i";
-      name = "palapeli-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mk87jrnhqgcarmc658k4f2fpm1181i3g-okteta-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/okteta-14.12.1.tar.xz";
-      sha256 = "1mw32cjj2kw36frki26nycwi48p1s0wi2v9h85v9dwgk6235i7d8";
-      name = "okteta-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1mbdk8jijasnkhrzavpv89mzbfrz9b6n-ksnakeduel-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksnakeduel-14.12.1.tar.xz";
-      sha256 = "14ryx9ydwi23lhf5xr5mn77ixzkirwdg43mrh2cc0rnq440mzalv";
-      name = "ksnakeduel-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/nky571v70dk45hy9jfvii63amga1qx55-kdelibs-4.14.4.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdelibs-4.14.4.tar.xz";
-      sha256 = "0h255hhl46r7ax9hm9sr7qddljwzfky2ssh695ml3svfwg52mihl";
-      name = "kdelibs-4.14.4.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6sfiw6s55wnsnsyh0sas9s3f8fbpwnw4-kdesdk-strigi-analyzers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-strigi-analyzers-14.12.1.tar.xz";
-      sha256 = "1bsf1dgb2039jjzqy6pr66yw08kxbn5xpna0bfmrbiw4pprlmbi4";
-      name = "kdesdk-strigi-analyzers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hcxrbw696pca5z4p95ws7373x55bi9lj-svgpart-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/svgpart-14.12.1.tar.xz";
-      sha256 = "18r6n6wh8yg5wmd5wyc8sf6k994ghfknanlp7l1pcqwqa6wfv6rx";
-      name = "svgpart-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dazj5495njhw8bdyizpx0af9r20bvj5a-kdenetwork-filesharing-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-filesharing-14.12.1.tar.xz";
-      sha256 = "0id8qmr432ygkfmcq3mfr3zv0w58393w0z5pd86k8nnkz43nh208";
-      name = "kdenetwork-filesharing-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/11nyk47q1i4qh92kdzw3l6gi5nqhja5b-ffmpegthumbs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ffmpegthumbs-14.12.1.tar.xz";
-      sha256 = "1q6ayhxrsq3y5yvrawsvr88pzl7vcz5ms6dq0sgd4mad83kwl5yj";
-      name = "ffmpegthumbs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5y3gdnaa0a8nhpd5a2abp3ixcdnmg9im-kmix-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmix-14.12.1.tar.xz";
-      sha256 = "1zk1c1m1zihb4wih2330a95gd1skakwsx0vccxp8np3nsh71z3fa";
-      name = "kmix-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6h2dlw28xi87axxdglbkjz2jyjl78ijv-audiocd-kio-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/audiocd-kio-14.12.1.tar.xz";
-      sha256 = "1wi3mwx9v7lh71ciar29c1bprwh2lgq46yq3kx5gq7wz20cx54hh";
-      name = "audiocd-kio-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/awrjks0ihywpqygz8aqwrxn53yd8sljb-lskat-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/lskat-14.12.1.tar.xz";
-      sha256 = "19q5qzfh1dczkdz612hw21849h438dhl21ghbfm5hi5m04vmn8rc";
-      name = "lskat-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kk2rlvdl5hm4b0ms3i5pvs1r6lh5ipbh-kmahjongg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmahjongg-14.12.1.tar.xz";
-      sha256 = "1pbq9f6zb96v98sz94kz979z5scpqzvc5fp4nxs2dg1rx1la8qxl";
-      name = "kmahjongg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.15.tar.xz" ".tar";
-    store = "/nix/store/pmn8vgwjdszsl46pra65vn5i7pxfj7g4-kde-workspace-4.11.15.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-workspace-4.11.15.tar.xz";
-      sha256 = "1y7df6mar72lzy1dan7v5wwgf2w669b0hkrdb6ai1s3whmqr611a";
-      name = "kde-workspace-4.11.15.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1l6fwf3bb28myf3k3hsiv27gk8ar6gz1-libkdeedu-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdeedu-14.12.1.tar.xz";
-      sha256 = "03jic27ghfz2gpbn2nb69qiiip4vgy3y4as8qx328cl39l5vh8d4";
-      name = "libkdeedu-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wvgsj2m324xic0rjr6kyi7pfwqnfpmzq-ktouch-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktouch-14.12.1.tar.xz";
-      sha256 = "07z1nkyc4hxjd39pczkv1z6dxdjn3334wnv778mdrf98lm77vjxd";
-      name = "ktouch-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wgjmvym6jg44xr5mzgw3pb77w1ya8s2h-kblocks-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kblocks-14.12.1.tar.xz";
-      sha256 = "0qk5g5karl29g4hbpl7lfgahv71as3mj6j604cpd2wiwma05qa2s";
-      name = "kblocks-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5ppmqjmqizw31x1yjnzmicybln433l9a-kqtquickcharts-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kqtquickcharts-14.12.1.tar.xz";
-      sha256 = "026am7l64m721vv3l79z6v3avxq94z1vrzx1ifwf8p001inf4ydy";
-      name = "kqtquickcharts-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1nwklpfvdggaxadjc3396j8qgwdl619h-sweeper-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/sweeper-14.12.1.tar.xz";
-      sha256 = "0c3kqnjwi5q24k7b05dr5mygd3ps0r1s9cbs49r9zikswz7gky1d";
-      name = "sweeper-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gcj1qvbh1m7hbbyfdsl1nypc07nzy0yn-kopete-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kopete-14.12.1.tar.xz";
-      sha256 = "1pkgzlq7scz0pvmn2dis128rh2hdfxhbg6imn4mwrizmlpaycb98";
-      name = "kopete-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/w5dhnrmkm982i7kw1j9j5rf09z22cka9-kbounce-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbounce-14.12.1.tar.xz";
-      sha256 = "1x726x5x6cpdnig0wmam7zzigj33afwswdmxxgspnpimkybwpy0f";
-      name = "kbounce-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/cxxfxxpmnk70i9cx0cgx7k6jdg32s73f-kanagram-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kanagram-14.12.1.tar.xz";
-      sha256 = "07lz09armwr4j594pn30d617ngxcn8n3yxikm79ck5020gx4wvgx";
-      name = "kanagram-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5jhzsqxdfzh1zw1d103np2rm34jdj945-zeroconf-ioslave-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/zeroconf-ioslave-14.12.1.tar.xz";
-      sha256 = "12ri1dbbzc9dwx2n843979yvh93a9yrzpprk9jdmjr1hkna8rgmy";
-      name = "zeroconf-ioslave-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zcxv7zv41p63pij7d37wdp4hcll77ldc-libkeduvocdocument-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkeduvocdocument-14.12.1.tar.xz";
-      sha256 = "0nqjcddjmapgadlkv97banjk5fh7p355hfxcbspksyndsgplz1hv";
-      name = "libkeduvocdocument-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dv7j6rb4688zzlp36l45f2h0vzykvybj-kmousetool-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmousetool-14.12.1.tar.xz";
-      sha256 = "0k38qj2hv9k846fba4sxdg1biplbdn5hfmfhx5qmc6g6h8xrs2dr";
-      name = "kmousetool-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dqi11m0gnkyrfppdlibvgv2gbycpjqm6-kolourpaint-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kolourpaint-14.12.1.tar.xz";
-      sha256 = "15vkd7i35myfi9m11p52g8x7dlkvf06fa400r9vbw321fza2gyjc";
-      name = "kolourpaint-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zl0qg5scvgmzsq6c7l4s2rs4dh6v243h-kgeography-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgeography-14.12.1.tar.xz";
-      sha256 = "04g2sw2r1i8kc85n9igk15kmk3hc8gdci52lxk4ca04bxcif7061";
-      name = "kgeography-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1cknwl7y4djaq1cwjj3g38k8w8gi6zwc-dolphin-plugins-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/dolphin-plugins-14.12.1.tar.xz";
-      sha256 = "0sjfm5ry54h56vbbch11js50a70pvwbkinyxxgyvs6g260ngpkx2";
-      name = "dolphin-plugins-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rbc1h7c1v7bdzgwxqw5xs2x19rn4z9q4-kreversi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kreversi-14.12.1.tar.xz";
-      sha256 = "1011262n5zh6hji7xxgq3k2hkgh0hqhpvk9krw22plda4nww2xwc";
-      name = "kreversi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/rwsx6c3s4nc7vkcfk0c39jbp7f5f0rvp-kdepim-runtime-4.14.4.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepim-runtime-4.14.4.tar.xz";
-      sha256 = "08axhahiqv77cr6ssvh1cadqjvv1064w5l94wxadnyq3vz8kl6kz";
-      name = "kdepim-runtime-4.14.4.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5caacq7s0yh79mqykwj5wydj3b5gyl83-kdf-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdf-14.12.1.tar.xz";
-      sha256 = "1cvd7ydk277crv1wiw7sn72mv9lf5pqk56gylfmzr63mr7dyj5iz";
-      name = "kdf-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8dl8yv38wpv199jjgw3kdl8rajxnnc77-kiten-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kiten-14.12.1.tar.xz";
-      sha256 = "0518zbvgn3w00b7lxfivrgrp8xrpb09rf9cf9zdxdl2z37gxmvmv";
-      name = "kiten-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1widcjdd8hzy1dnabg9px06yjc0k7ncf-kdenetwork-strigi-analyzers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-strigi-analyzers-14.12.1.tar.xz";
-      sha256 = "1xdb3hm7iad2wvbwqaa5bbqzgg6xdbbv68xfjajpx8k9cn20kh9r";
-      name = "kdenetwork-strigi-analyzers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k4y83g821js66c35bc6x2r8m1924vd4f-kcachegrind-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcachegrind-14.12.1.tar.xz";
-      sha256 = "01fa9b73ymym5qyd5lirb4cf6c37x02a1a9ls2qgzswflm557d49";
-      name = "kcachegrind-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/plbszpr250pr7x41578a4b5n329wgl4l-kstars-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kstars-14.12.1.tar.xz";
-      sha256 = "08px9765vl6hpmy39wyhlbm4d3y5wh82w33g2fppx4d9bxmpz166";
-      name = "kstars-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/shap58rcwhg13766v7zm28nxr6rn09gw-kdepim-4.14.4.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepim-4.14.4.tar.xz";
-      sha256 = "0jpbc84xv07j2qynkn4mhmwlldbmjg6v7dqc1028kfk7sbcahhf2";
-      name = "kdepim-4.14.4.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c4m2nwfbjwqgc9ydq6macg4zkmrsd7v6-ktuberling-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktuberling-14.12.1.tar.xz";
-      sha256 = "1ghymw6ljvkd9wi4j0f1n8gjkhxfkqvmb8n36lasrfr27v57z68v";
-      name = "ktuberling-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rnz72ryzp7mcxk83l71rw7br3k6hamr9-kblackbox-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kblackbox-14.12.1.tar.xz";
-      sha256 = "0cxyzlsvhw9rg3b9c558zbqr3ijbzyx5as9g92ald8w7qjja5jnv";
-      name = "kblackbox-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c3gmynlqgyhdx3nghhwgk8i85qqysjsj-kalgebra-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kalgebra-14.12.1.tar.xz";
-      sha256 = "0pn4scp7y7ih60jaq39kanwgsc2aslb41v9xw8322kk8q4gyc8g4";
-      name = "kalgebra-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/53ksfs7gxzr33sgdbfxk4ydjzzl2c7y3-kdeedu-data-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdeedu-data-14.12.1.tar.xz";
-      sha256 = "0hyqwkva7bgi43fgad4caz8q4pcb9kx5czpc3d8nksk5q28a1llg";
-      name = "kdeedu-data-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ggvs29ryi85ig0r9z3jq259kvyq1k1h0-kigo-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kigo-14.12.1.tar.xz";
-      sha256 = "100rrip6w08ld2xgwdm2dryk8qa92dssdz0a0iykgklddq6dvxr1";
-      name = "kigo-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p445xkdbm1dqqb3p2x10rag6xccidp9c-print-manager-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/print-manager-14.12.1.tar.xz";
-      sha256 = "1ad9a23cfivyzfgajg1bn10n2glp2ks8yqkl5f0xk5alyldzbir6";
-      name = "print-manager-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1hx5ws8bbzh0lnmjp0x8ln1s7rv3x62a-kshisen-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kshisen-14.12.1.tar.xz";
-      sha256 = "1b0csn1ngpcwcl8iwv02hy1gb6hk13453khzgya6ckixk5szcdy7";
-      name = "kshisen-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/w24lqbmni5n7w2xdmw1khzixg9f2p64m-lskat-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/lskat-14.12.2.tar.xz";
-      sha256 = "0c5zg0lkzcgf7ff1hqy6rh8cq5z4935p7rmm463pl933djpbl5bn";
-      name = "lskat-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1w6n38dac3mslyfl5blf1cas013m9h8g-kpat-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kpat-14.12.2.tar.xz";
-      sha256 = "1rhs752b3ncbpbmrc9zknww0dsihh3lvwvh629v1s6xc0vqvcar4";
-      name = "kpat-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/738qaln8qxvsdnqiy6adk9sh28rfjkgy-kdesdk-strigi-analyzers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-strigi-analyzers-14.12.2.tar.xz";
-      sha256 = "08db2nhkw265i2dfbka5q6vm7bxbjywk1p52hhjc57a2qvqfb5ww";
-      name = "kdesdk-strigi-analyzers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fl2nm7vv3k36vyf2wml8pv4sskh53ycr-zeroconf-ioslave-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/zeroconf-ioslave-14.12.2.tar.xz";
-      sha256 = "0jx35018amdcgmxi9c7alc4c80qywzakqdrzyq5i7jxjcl3y1ly0";
-      name = "zeroconf-ioslave-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jrmw028qjd86q4mjyasx64iyssaj7wk7-kmix-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmix-14.12.2.tar.xz";
-      sha256 = "1jx2mkrdx5jgrjr02snb199xradpxaw42dw8y7icbpmkihxmxry1";
-      name = "kmix-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g87b5njzgp7jrydvwvc2xwpnwv0p33kd-kmag-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmag-14.12.2.tar.xz";
-      sha256 = "0bcrr67v6h9vc69341b662z7dbgxm3yrazfkfsdlxp1ahqspl6w5";
-      name = "kmag-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/35izrbqhb52zlfs2x1qsjc0k1l2d1pkk-mplayerthumbs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/mplayerthumbs-14.12.2.tar.xz";
-      sha256 = "1kwpd3j64zm78qwn42q3kgipywdlcpvibng06x032yv6i8wmi6m1";
-      name = "mplayerthumbs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hqsma0ww8philxqp1hk22sk3lf711y4i-kbreakout-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbreakout-14.12.2.tar.xz";
-      sha256 = "12y03rbm13pg1c8xpgclklin5vjzsidyaiamhh5bqpqsxsqcnh5n";
-      name = "kbreakout-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cixkkb370365vic33rl9n9846ll44rqx-kreversi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kreversi-14.12.2.tar.xz";
-      sha256 = "05zkwswpy5sw9ab3gc012pgvl0wq8f2lb0qhdr96rvxgp8m273j5";
-      name = "kreversi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xmvafr9hszzwndqazdzsn9i90cwi0afs-jovie-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/jovie-14.12.2.tar.xz";
-      sha256 = "0yfn5n3n3knacvpr3cqiii0hldbxc6m09k1g53hlksay61s2r56v";
-      name = "jovie-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yhs96yv9mv61pp521mpay8i0dgqlmm1y-kde-l10n-sr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sr-14.12.2.tar.xz";
-      sha256 = "07f8x34q8bdcsvc3a76zpd0sjxnq5ja6ghl3d9a0a4ix0hyyv8zd";
-      name = "kde-l10n-sr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l2499bc6hfv5x284cs4bjvqbmbxr0aij-kde-l10n-hi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hi-14.12.2.tar.xz";
-      sha256 = "12ky5zmds18n2sgivrnpds8qjkd64397ia9h8h9s5s9l3cwgipb2";
-      name = "kde-l10n-hi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kpcnzwp6wg76slwd2zdmzmg09iydims6-kde-l10n-tr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-tr-14.12.2.tar.xz";
-      sha256 = "1d326cxhfx0434x45lq9wgn5csvmclgd6fmyqzwlax88vm57gg62";
-      name = "kde-l10n-tr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/p36g7i6w8hgsz3wdax3ldxzv3djmw258-kde-l10n-pl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pl-14.12.2.tar.xz";
-      sha256 = "0knjhk0941qf28l4izz2ssfri88s09k0vxd3d6xblg51r6m0b2sk";
-      name = "kde-l10n-pl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iyab41x341l7b1acprqv7azbdbxbd0lw-kde-l10n-km-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-km-14.12.2.tar.xz";
-      sha256 = "108pcxflcbhisixivg6153sm8rrbdrrh6rbvxib307dh1q1sl7ix";
-      name = "kde-l10n-km-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sqlfyy4bhzgnv75msvyv2m7sx8vwhb0g-kde-l10n-eu-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-eu-14.12.2.tar.xz";
-      sha256 = "0x8dihag23ljyw50qpg3bqyhfg8p4f6k1daz2102wkqdbwhzk1ch";
-      name = "kde-l10n-eu-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/63qi174y5jw1cs3q0wzb5jk4j64q4zqp-kde-l10n-nds-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nds-14.12.2.tar.xz";
-      sha256 = "1nyz71cpin9cqffjaca9wv9s5v9n358agb1ncamg5iqj176cxvrl";
-      name = "kde-l10n-nds-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/f4jmy4xgm9a50a4r6nlvjz61ihw3w14j-kde-l10n-et-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-et-14.12.2.tar.xz";
-      sha256 = "1a4kih4lb4sqwasvqhqj06r37rj00vjlhwihlr7jk8z373yg6kk3";
-      name = "kde-l10n-et-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/j4jf2n3bikb23kzg55i538jjhz7gn2jx-kde-l10n-ko-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ko-14.12.2.tar.xz";
-      sha256 = "0vv4xdis64nc66i81fnilnkl8max6wm07kzwiqahdnrbrza8vqab";
-      name = "kde-l10n-ko-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ha5w0palyj9b7ajwd5xdqppgjnx1vsv0-kde-l10n-kk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-kk-14.12.2.tar.xz";
-      sha256 = "0bvghaggmzm8a12gl2z6ykgf8qabiagjmmddiqihbnvdi27ia78c";
-      name = "kde-l10n-kk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9cjm0q29zj5p7if67m6ax4vp9bsp1xmq-kde-l10n-hu-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hu-14.12.2.tar.xz";
-      sha256 = "0s2h123kbylc9ijxv6yfj5l593zgy5ar843rn82jjpvfbq3qj11n";
-      name = "kde-l10n-hu-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca@valencia-14.12.2.tar.xz";
-      sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv";
-      name = "kde-l10n-ca_valencia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l1nsi3pqrb0wv2v650sa8xax75kpinxx-kde-l10n-fr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fr-14.12.2.tar.xz";
-      sha256 = "01lkgx857vmxl90si1b55gyz27iqdbk7qkn5v40n356zzaicrxva";
-      name = "kde-l10n-fr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qmf7y72b47pnq0b0gmxhw3slsgmy2awf-kde-l10n-sk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sk-14.12.2.tar.xz";
-      sha256 = "0diajsp56l6dg96m9nij834dmky1gh48wd8ji5zs37fvpmdc96r0";
-      name = "kde-l10n-sk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/var4wc2isqx94ay6lq8fnnynb1566sgm-kde-l10n-es-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-es-14.12.2.tar.xz";
-      sha256 = "01ha5db71rzkr3a0mlq80ag0fagivvjh26ck0y8da101lgl01i4r";
-      name = "kde-l10n-es-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3h7wyirznwm4zh6flqq1j2hacayvm423-kde-l10n-ca-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca-14.12.2.tar.xz";
-      sha256 = "1gcypc9l95iry45vh4pl1i7hwrdnm4lgnwnfnw1l7016lhgfjr8m";
-      name = "kde-l10n-ca-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca_valencia-14.12.2.tar.xz";
-      sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv";
-      name = "kde-l10n-ca_valencia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mi03yzrjslab56mj7qw22d2lzl2kk4pj-kde-l10n-cs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-cs-14.12.2.tar.xz";
-      sha256 = "0rb6wnw0944zpllm4cac063r7hl5rq28x3b5a6has0cz4mqk9jw9";
-      name = "kde-l10n-cs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9lw0j1h2pwvl1zpcl8cjba2xqc7lwkp9-kde-l10n-ar-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ar-14.12.2.tar.xz";
-      sha256 = "0nkv2pj4f3hjrv25l8kqm9cqv0j7h3crrzyqzq026zzz6znlq190";
-      name = "kde-l10n-ar-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ix18mmzjf395q3wj2qcbpm1z9jvywm4k-kde-l10n-nl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nl-14.12.2.tar.xz";
-      sha256 = "0izpvjmlh8yk1nnzpxa59n6lv4fk7575j8nwjapy0ynrknps4fff";
-      name = "kde-l10n-nl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xa7h417v8b57fzimvggiyfx7hys197kz-kde-l10n-de-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-de-14.12.2.tar.xz";
-      sha256 = "1y54csccymc7hpbsm8kjw4v9ypgvxqcqahwvan2x84fvn7p80inb";
-      name = "kde-l10n-de-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/44rprv2vwz090i48pnykzws4blyryxw8-kde-l10n-fa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fa-14.12.2.tar.xz";
-      sha256 = "04qxb6qaj1cb174m6svd83m34fv8hwws8v4a20igkh09b5bl3dsx";
-      name = "kde-l10n-fa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5051arszznb40q77d34zcwnaaxwv5wx1-kde-l10n-wa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-wa-14.12.2.tar.xz";
-      sha256 = "08il92kssd4d1zdkks4777pk8l2n3k4abv589x8rja4rlmpxrscq";
-      name = "kde-l10n-wa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hvcw01d444zkmyw1zpds2mnw7xmx4wca-kde-l10n-nb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nb-14.12.2.tar.xz";
-      sha256 = "1q461np49d0n0zhby9dd8knf7y3w9vi1r49bzlqwd1y4hb3alnms";
-      name = "kde-l10n-nb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xqqsvrfab53ybxfm0hq63bnlqpn6pz62-kde-l10n-uk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-uk-14.12.2.tar.xz";
-      sha256 = "0avr2c9drnkv7ndz9mqjayf6pivk6hbghmj6rli91lvqavjp6vlb";
-      name = "kde-l10n-uk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kc6d1lkncc3djfn8zybhz6xzz7nzickb-kde-l10n-ug-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ug-14.12.2.tar.xz";
-      sha256 = "17jizdwkfh3gfi9ykpszqw49fzswgps7xlbq9j8pjflyk36rya9i";
-      name = "kde-l10n-ug-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/35mka79zjlplbis7b6dhiz48wls25gc6-kde-l10n-zh_TW-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_TW-14.12.2.tar.xz";
-      sha256 = "0h3nfp51w7r601d6rpi55nzrmpywp3dalwqjwx4a6rnlawf3s2hr";
-      name = "kde-l10n-zh_TW-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qs4xzws3s0vamj17m98fxcqqvp8hyyw7-kde-l10n-fi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fi-14.12.2.tar.xz";
-      sha256 = "1q8j8v7i7lz3qk22adr1cj0bs6qw36540bj0vdzpa3390fn3i2ra";
-      name = "kde-l10n-fi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yz0rzw7m437glx49xdxp4zz7ic51g5nq-kde-l10n-el-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-el-14.12.2.tar.xz";
-      sha256 = "0wcbzs0s1nqafa0hi0abb17yw3jnxcq2mxyk4h5p9g7q7pkvh6s8";
-      name = "kde-l10n-el-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fcqsn91fsip4bi7y763y07i3ii4ji8zs-kde-l10n-bg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bg-14.12.2.tar.xz";
-      sha256 = "099af2qdxjy8whfaw0hzmlywb7l7bmpssga90xyahr7nh6l8vwnz";
-      name = "kde-l10n-bg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nbb6gg7pc3yzjxs3gj7l0363i5d1bq1h-kde-l10n-lt-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lt-14.12.2.tar.xz";
-      sha256 = "1lkjmcj77mmk6lvh1h51k8i9nn33b0q9vgbampj33qgax1d7a4mk";
-      name = "kde-l10n-lt-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/92dr7l2vrh1j4bxj2zy21prpfb1v9ba6-kde-l10n-pa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pa-14.12.2.tar.xz";
-      sha256 = "1fagcrjjm7s0kpkfflkjx6rbgzprf7qidpbgwzw3jjf501vfdpkn";
-      name = "kde-l10n-pa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2iqdi982l5gbh3ajibgznzxg6ryjn49p-kde-l10n-hr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hr-14.12.2.tar.xz";
-      sha256 = "11dabhhz676ria4nwvkx49igzm481fl9996j3p6rzd4kbhrksgq0";
-      name = "kde-l10n-hr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rfkj26fa9pi0mraxd8mgnh758dhp0m7n-kde-l10n-bs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bs-14.12.2.tar.xz";
-      sha256 = "1x4m0cksbiy25s8pynskmasy7kkzm8i8mp5dvsx3wsh0msf4pg1i";
-      name = "kde-l10n-bs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sw87zcl7ddd68wlws5689h7r7g5bbcgl-kde-l10n-ga-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ga-14.12.2.tar.xz";
-      sha256 = "0ayambdzdfnky6bwnk5ghnch18y4ran6inrb8v4i1c407zn74ydx";
-      name = "kde-l10n-ga-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/id89acc90qgfqjcidjfsx1sn62yk7c56-kde-l10n-zh_CN-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_CN-14.12.2.tar.xz";
-      sha256 = "0876r1bp36w0iljrlhlnxfizapvw0h2qmpjnf5s7vf5iisrvsbrb";
-      name = "kde-l10n-zh_CN-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rki0855bdgqwi8ajwmnl9jdm1hgn18xs-kde-l10n-ru-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ru-14.12.2.tar.xz";
-      sha256 = "0i2fb0fa1drg99m5k5d8sdv04g809c3dz507wlrb9bnmarapahhn";
-      name = "kde-l10n-ru-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xhqd4bxhv3p1mwr4j7h59858dc782ycs-kde-l10n-gl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-gl-14.12.2.tar.xz";
-      sha256 = "1mpzxlk93bf50ajk3m9ly19fdn34rnpznap6bad05zj9wczin9km";
-      name = "kde-l10n-gl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8p2ygqhbbzxmnrjjxyris3281bdklbm9-kde-l10n-da-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-da-14.12.2.tar.xz";
-      sha256 = "1lqs9fpp1dj8r0mpnjy8m7aa9jg8iv30k7wdpxpcf634m2p06911";
-      name = "kde-l10n-da-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gdrvx87d6y9q47alc0s2251dzm04wpdi-kde-l10n-sl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sl-14.12.2.tar.xz";
-      sha256 = "01yj9wh5zr72vgxman2j49ihhcyxr2yw820g2cz68bbqh829riiq";
-      name = "kde-l10n-sl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qcs4fdkjrkgva632nqyi1z24h517fvl7-kde-l10n-id-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-id-14.12.2.tar.xz";
-      sha256 = "1cc1yfps29fakra3xfnnzf6blqsydx4r9scsd0w0f8xxk3mr87j7";
-      name = "kde-l10n-id-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/klsqxbpagy7jj2ha51hqr7h9qpd4qg9s-kde-l10n-ja-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ja-14.12.2.tar.xz";
-      sha256 = "0i7x21yvj3ipg96jmfqs7kaixqa82f5s58mpi34vyypcc1ap4731";
-      name = "kde-l10n-ja-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lmg22mpi05l0944ihv9z72jg1i8xs2zc-kde-l10n-pt-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt-14.12.2.tar.xz";
-      sha256 = "123j4h4bhy0xdhazl18yccp17283k98s4f09f24r5b54yzw5cs0k";
-      name = "kde-l10n-pt-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pgw29ki339a22l9c7incm93qvmjhvwif-kde-l10n-mr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-mr-14.12.2.tar.xz";
-      sha256 = "02z4hq74gxgvcnx0za74zlyx01m407bc3219wiqb88ly5b6g59af";
-      name = "kde-l10n-mr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4p5v5j7l1j5xvz83jilwmmg22v5pl1y0-kde-l10n-he-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-he-14.12.2.tar.xz";
-      sha256 = "02lmsvdyw878hk55r5dqm065n3f1czgq0icspi25ibxgvhf0nmji";
-      name = "kde-l10n-he-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pzpmizw0hsfczli3wk7mihsad2ziwnjy-kde-l10n-it-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-it-14.12.2.tar.xz";
-      sha256 = "09sfiv36q40sy9w3nqld89lgmpd8kba6xav683a28a1i0ipsjjbc";
-      name = "kde-l10n-it-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/7gphdvwvll05pn6dn3wxydy66d4an0hc-kde-l10n-ia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ia-14.12.2.tar.xz";
-      sha256 = "03jkjrbgp59xiwrbj9hp55y3qhpcyg1gxwv0vcbvxaxpg1zg7s1x";
-      name = "kde-l10n-ia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6xryf5sf70rqzsp6zirfc85hbq8mq93q-kde-l10n-nn-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nn-14.12.2.tar.xz";
-      sha256 = "1wr73m10liqvd7fkq3gqh4y2ibwgm200cbk6dv58xr25jjh1ji2l";
-      name = "kde-l10n-nn-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zjdd8bp4639ylb7wr2h0a6zl4ka4hv5j-kde-l10n-ro-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ro-14.12.2.tar.xz";
-      sha256 = "0p4b7bngb3j2xsixk3s5wks7050famwbh00cgdpq8gd02i01iplc";
-      name = "kde-l10n-ro-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hm9hivcnjbbhxnr2k1p95lfa57y9qpa0-kde-l10n-is-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-is-14.12.2.tar.xz";
-      sha256 = "1fz1azj7z127zpf257hzavsd0r3k7j1gd3wgw5i9prr3n0xp589j";
-      name = "kde-l10n-is-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hp26lgcf3jrgcqsrai43kvimlpq9gs48-kde-l10n-en_GB-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-en_GB-14.12.2.tar.xz";
-      sha256 = "1vmgrbx31683j47na433h2sps961h5av1rkqrmspdpls32g3hjq4";
-      name = "kde-l10n-en_GB-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/y18jr4kswbh1qlhw83xyig9rri07yya3-kde-l10n-sv-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sv-14.12.2.tar.xz";
-      sha256 = "1a702cyyhg5dk9bmfxmpsyj4h9lk2hrm8rcdzwy6lmhvclgc4iqj";
-      name = "kde-l10n-sv-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bcssbybfddwdy45n5sfr8aw2a6xxpn27-kde-l10n-pt_BR-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt_BR-14.12.2.tar.xz";
-      sha256 = "0lvjzcpv6j4i3xavkcbjbz17mxzj59rqiq9gxhvqnk6wihzwr3d1";
-      name = "kde-l10n-pt_BR-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xszl4r8c43w086w15mf61lis5ar4ig24-kde-l10n-lv-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lv-14.12.2.tar.xz";
-      sha256 = "1i8xd2apf8gr657w8jzc2vj4s7izh1kpqnz1n75yk2b8gbr0aiqq";
-      name = "kde-l10n-lv-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5bknljgh37bx5v4c0vnmigasa3xq3cka-ktimer-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktimer-14.12.2.tar.xz";
-      sha256 = "15bar1j2var6i1jawq0nc4zkifl1qghciqyqavx39sm1cxphqirf";
-      name = "ktimer-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xmalh942dl6rygwk4jxpirabx2l8n0j4-ksirk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksirk-14.12.2.tar.xz";
-      sha256 = "0ab8vbk5640jaq6r0f0f5nidf0xx62lb140hq42flmid0hw6ls57";
-      name = "ksirk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hl424krxwgahhhykhwhq2lxmrjdvfrxh-kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-      sha256 = "1802iy6w5wchj2lj6b7yp32nj4pbh1pn44v2pvhafg0nj49rn0iv";
-      name = "kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sv2xx8whd4smmx447iaxg3akivyk74gs-cantor-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/cantor-14.12.2.tar.xz";
-      sha256 = "0hcxr28083qadm7b6pjqh959dvj79dvymkigxv851ainvspr82km";
-      name = "cantor-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ka3asqxgpas752w1h3agc2c1ka3brp19-libkdeedu-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdeedu-14.12.2.tar.xz";
-      sha256 = "0w7wkcr46fp3gidfgm4gp3q26vxp4szfbqmk4624ysrdi85aa6br";
-      name = "libkdeedu-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dw2kr8sgmcrw2p3vy1cqdq2jk93i7rmr-bomber-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/bomber-14.12.2.tar.xz";
-      sha256 = "12ff8rikxb1x7j4b5jg41ph5pgp60vn133npzalq5vsldmrgj3h9";
-      name = "bomber-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iifrjlqyrylq47kvmb7idgig4y05yp69-kopete-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kopete-14.12.2.tar.xz";
-      sha256 = "025pwhvcidszg4mv8hw8hya9xvgw08yvkzigxsk4pjn5vm49y16i";
-      name = "kopete-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/c1s7763fzbnnslcn95spcv0swp6gx3xb-oxygen-icons-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/oxygen-icons-14.12.2.tar.xz";
-      sha256 = "0dc0zkl7ivigcf5vf72gqnijm8p64bq4ibqkr02k8yv7yqq123wz";
-      name = "oxygen-icons-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ff917gin734l0i1w84xdq2s6hjkjjmwp-kmplot-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmplot-14.12.2.tar.xz";
-      sha256 = "1j7fnqi02pqwc0pgv0qgykm2hih5ncg7pbkwyskj5sds8xs86f55";
-      name = "kmplot-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jv7gpjyhacvmdvbdy5j34nrm06zk2aig-kmahjongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmahjongg-14.12.2.tar.xz";
-      sha256 = "0dc9majrsg2fgl8s8wqyhyjl3d40qf4m7wxx9m7076sa2h8hj4g9";
-      name = "kmahjongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/x3c14mkaxp4swyxaa7js7yq1rgrx7gvf-kolf-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kolf-14.12.2.tar.xz";
-      sha256 = "1yiq1sw6a74s8pq7cs4rl8rvawcb3rrw2kbwdgcaqvq0krgnlc8h";
-      name = "kolf-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/habi2k9mvpz6l5lj2i2yfig6ghxrkf5g-bovo-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/bovo-14.12.2.tar.xz";
-      sha256 = "0z20lywx4x4pqdbqqhz0m84vzml6kxn53sl17z0lgnf74zh0vqam";
-      name = "bovo-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qjs07i14179wq2gj40gcj99q0i7fgsmr-audiocd-kio-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/audiocd-kio-14.12.2.tar.xz";
-      sha256 = "1lix6yzradscrr79b4fj5lqs1f6wlrzyr0qwk5mvb9g326p8c4sr";
-      name = "audiocd-kio-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/byi9jaq7vijdfqzbqyyl8plk0mgb6cf2-kaccessible-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kaccessible-14.12.2.tar.xz";
-      sha256 = "1xq40cl7pqm65k9h3yvhn7zjb80z3lpqyp823wm6nz6qld4hr4bg";
-      name = "kaccessible-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/47visnxvfz3h8wa0485wiq5659y5li8k-konquest-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/konquest-14.12.2.tar.xz";
-      sha256 = "1h9ql9alyprh8ykfzfgj3nkch40hdp1vyfkshm5kaab15b657bgy";
-      name = "konquest-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ccx7yrjpgljpv0f61jlczmx738y7skpd-libkdegames-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdegames-14.12.2.tar.xz";
-      sha256 = "1pxq9gzw5m5i8d1v1d34mvmfr138hwfvq5z9pg2h9zw5y3hs9g7s";
-      name = "libkdegames-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/swpywmriiwy1npn7k3gcazisra9gfzqb-dragon-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/dragon-14.12.2.tar.xz";
-      sha256 = "0gd9zr9fj4r2789bi6f836y7m6df08p05vizdy04cf9s2hjkr9wy";
-      name = "dragon-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nsrq6d9bini4804hkkzsny91rfxcgp01-juk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/juk-14.12.2.tar.xz";
-      sha256 = "08brdx7hfm48hmhc0rg0r3c4brb3mkb0r23j2ps0y210pwarkwh0";
-      name = "juk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vjbvvbnqg3fjghc19159ikqm6yii6z30-cervisia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/cervisia-14.12.2.tar.xz";
-      sha256 = "120a8brfllk6jybn4zpyj0w5bpv2dvibcqbh37qh9ld2h6v9rrr2";
-      name = "cervisia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1nli1nsr1a3j7wprpjhwmmy418l6ibx4-kdesdk-kioslaves-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-kioslaves-14.12.2.tar.xz";
-      sha256 = "14vk4aqdwny4iidsvznfzss51k1376lp4v65bmqbpwf2kg6mis2s";
-      name = "kdesdk-kioslaves-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/cr9ncrb5lfgi7nyrdqlrh2c3xlj2a5rp-kdelibs-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdelibs-4.14.5.tar.xz";
-      sha256 = "1jizh61vz83za06mb23hhakx99jf2c59c02fz5kld9mnxzzl5fgm";
-      name = "kdelibs-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9vi7j77n4x5qpl4jphl3cc52cc34wymq-kmousetool-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmousetool-14.12.2.tar.xz";
-      sha256 = "06ifiay1mxcfb0bzzcf14xkvd4iwy9va37x3jm0xxhy9641cxq7i";
-      name = "kmousetool-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4v4hcxa9v1hykiypb159p0618nf0dij9-kalgebra-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kalgebra-14.12.2.tar.xz";
-      sha256 = "10iz0vjn8mscgkb0vra8ac0rbdyw45xzz5rydlkczr9w3hxnccyy";
-      name = "kalgebra-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ilynhcqbrfbhafhvmbag1j7nrkiicszs-granatier-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/granatier-14.12.2.tar.xz";
-      sha256 = "16v0pyjby6yyrqm64p4a0lkxf0bb50smkz680b1yp3mcc5nm22mw";
-      name = "granatier-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/64fb2pidpaccqzk5wddvvxma515fk6nl-klines-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klines-14.12.2.tar.xz";
-      sha256 = "10km97mbz9z816ki12jki46mb0h2829l24spiai9pk8mbvkyqx3w";
-      name = "klines-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1g8n4bq8p2dn5mvncb6a046kjmndgfpy-kmines-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmines-14.12.2.tar.xz";
-      sha256 = "04axmsgq3wcim5fs9jgwgbb9z7p0a96qxhm50s5dwk4lv6fhzzv9";
-      name = "kmines-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l32ji88v0j54mhvsqdg7ysqqalnwjx4p-superkaramba-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/superkaramba-14.12.2.tar.xz";
-      sha256 = "0y3ld6hpbjjqkpmrpbxmznv5vjdiyh3rw6dqbygap33qvw6b3d0d";
-      name = "superkaramba-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/67i12gxqd5p15vdl8b5a87xl28fn9aqv-kdiamond-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdiamond-14.12.2.tar.xz";
-      sha256 = "0g3al1p68q4ypdjrnq6sf738w84x3a2l71fpg7qb5kgpaixpspjj";
-      name = "kdiamond-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/inss9axxxz7szp7icfwsrms9jyc4c855-kigo-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kigo-14.12.2.tar.xz";
-      sha256 = "09b5hdfh46mi5qpgq0j02qw2wfrsach6lw9ydg0ybplyfvmp27l5";
-      name = "kigo-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5dh19ycmzai2k5xwgiwmpi05nn60k089-kdenetwork-filesharing-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-filesharing-14.12.2.tar.xz";
-      sha256 = "08parv67kilxh2nzgbmj3q9g6pzncjjr23rl6ylh3vv8p2vr2v5h";
-      name = "kdenetwork-filesharing-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/px8xd5vjs7y6g7h4vyyiksn818waffy0-kajongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kajongg-14.12.2.tar.xz";
-      sha256 = "1863hczxmzrwvkv2y7kj2anf56fpwih70plsa25mkmli6l5x120q";
-      name = "kajongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/670zy2wyah5qw0rp7kmzdv9q3hl2cl25-kdepimlibs-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepimlibs-4.14.5.tar.xz";
-      sha256 = "12p03dljr6sldl4pxww4gb18mrvdi61r85ippmljknr4sq26kd8m";
-      name = "kdepimlibs-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nqwz22sa222dkr9a6mmgyc2k9xahbv8h-ksystemlog-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksystemlog-14.12.2.tar.xz";
-      sha256 = "1j22944ham5x3y8qf7gka81nnq66f81lwrc65zmzvbf7vyj813kq";
-      name = "ksystemlog-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aw9ahw1ywy5m8k8j0a2l5qfg0n2n2yn6-kturtle-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kturtle-14.12.2.tar.xz";
-      sha256 = "087wfff2qpl2shxjwj30lna480skx8j1z4rlvkbyywc645gd0afb";
-      name = "kturtle-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6w3pnklzw2kd761dfg3ya4k0xawnyp27-kppp-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kppp-14.12.2.tar.xz";
-      sha256 = "1hdywnsvpybfc5hcja2msfdim9g37pgggkjp4kkahc9gv62z1m0i";
-      name = "kppp-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bbi9jdxjb1hm2cd6flh08h7ql90m9ppw-kde-base-artwork-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-base-artwork-14.12.2.tar.xz";
-      sha256 = "16jg0pm6wqqsl5g8hf55iacgxjh5x92shmf9263xpc1fiq29770c";
-      name = "kde-base-artwork-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iq6qjaw0n37gq49r4lmkjzyasvghcss5-artikulate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/artikulate-14.12.2.tar.xz";
-      sha256 = "09jvjal3r6bl77aby1wzbpyr4rxqmghc759yrg1rbqca1filzd5w";
-      name = "artikulate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dawjc253wxbw6624zjr0v2yrq9i47v75-libkdcraw-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdcraw-14.12.2.tar.xz";
-      sha256 = "0xj3dhyz7mf65dqiw2zz6mp3xmfaczmr7axhy0h6z1ynbyl1vkcm";
-      name = "libkdcraw-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zb2sqh3qjd53nmqhs9m24kag1f3dxiah-kdeartwork-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdeartwork-14.12.2.tar.xz";
-      sha256 = "1svw3ah03g751iy37i06kw4d6jzgc8yy9cjayf3xp80m37fpjlws";
-      name = "kdeartwork-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dmi1azffqm3c8gjk1d300a0a2jps2j4v-klickety-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klickety-14.12.2.tar.xz";
-      sha256 = "0rlp4bgzg7i892a89zrgaj0m1zwbb2g8ap9np3dpqljaf2la9rg3";
-      name = "klickety-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/f5ycj631mpfnyb8mngzxmvgngyk6lsw8-kspaceduel-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kspaceduel-14.12.2.tar.xz";
-      sha256 = "175n2jbx9m3yhsp10bj1fk9d2vfv2dlqd1qw7l3kmca5nr7ripzb";
-      name = "kspaceduel-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/49b5c3cm0ysi2w89a161ysmirpmckcls-kate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kate-14.12.2.tar.xz";
-      sha256 = "0n6b5jcyb428gx9xflsqjs1jhk51n12yxyfzl6cvg29vai453fff";
-      name = "kate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ddc07v0j09547gnspl7c7fgcrbvv0fk0-kgpg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgpg-14.12.2.tar.xz";
-      sha256 = "1ihxkcx162jp4b2qgpwa65iq90n1bz21l6fli1z530247h7vzlbw";
-      name = "kgpg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jvxwahcgixjygdvvyiprgwhi1c70cb5k-khangman-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/khangman-14.12.2.tar.xz";
-      sha256 = "0piyyqvfawgk3mbm51saigaswcpbk86my5v8mvha220sgzamnj9l";
-      name = "khangman-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/whd0iampjk6i5fm234gcsly38sxh5nb6-kgoldrunner-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgoldrunner-14.12.2.tar.xz";
-      sha256 = "1ijykdnfslp2vp3y0ji0bbf9zj83rbcywvg0kgiza963vzhf7rcw";
-      name = "kgoldrunner-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bvj41rw9x0014q6k67d2f6w8xqwpf9zi-kdesdk-thumbnailers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-thumbnailers-14.12.2.tar.xz";
-      sha256 = "1jyn507y7h2j8cb6nblc2lcf16ld9rn9cvi4xhj4sq9ccz0w7vz1";
-      name = "kdesdk-thumbnailers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kpv805bhwfkn95rnp8hzl42c26h8678l-amor-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/amor-14.12.2.tar.xz";
-      sha256 = "0wqh3csi0isfj3zpmsay5p38sbajfbrhkv6lms5nqr4k81kcpq55";
-      name = "amor-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jfkymr2flr7p986z1larn1i2qndrij8i-ktux-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktux-14.12.2.tar.xz";
-      sha256 = "1pml908z08y0ik4d0rncavrg26lqvchza113kxmyxc7ak95bwypd";
-      name = "ktux-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vn70b248ilfjrxv9sz30c4m1czb5n6fl-rocs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/rocs-14.12.2.tar.xz";
-      sha256 = "1nb0xq051081wps0i3g6p6vawj89vaa27di1hi2nhm1y0hx95m1j";
-      name = "rocs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fxn7qcaa57vxyc2qfnxycfv8hpvqn190-kcachegrind-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcachegrind-14.12.2.tar.xz";
-      sha256 = "17v1ap9jfzlk30xhx9m5456bqky4m0iywvq34r8zpwkbg4a49la9";
-      name = "kcachegrind-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bishs7m7snrvyrvcxhly4p4d148rmfxy-ktouch-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktouch-14.12.2.tar.xz";
-      sha256 = "1c7mi9cs17z72hg9v44yki85lqsnl96vgrckz5qcvca2b4w3bjd3";
-      name = "ktouch-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3l7a1yydrkd824xfjsxla8swzcv7r8rx-svgpart-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/svgpart-14.12.2.tar.xz";
-      sha256 = "1zkc6p8ycpm4pa2p9yq4ajkcnqi8m3mmv8ghdgi2q3a58fvf2zz5";
-      name = "svgpart-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xwq02smnzwz54i165vpgm8aaamcy02xp-kmouth-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmouth-14.12.2.tar.xz";
-      sha256 = "0qmh1kpl1asy5av976461i9fp81qan00jbqvfhi5dnli9zfrfmb9";
-      name = "kmouth-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vv15hxdzvvgj3xhw5pig0kbzm3206j72-kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-      sha256 = "1acfdcg0h9kb6171lqqrnihvgynrp0har6frq0igpkz475crmkid";
-      name = "kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g13aw9ppjbwj5rcyy46ccp9yw81bxa2d-kruler-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kruler-14.12.2.tar.xz";
-      sha256 = "08rwsmjbbaapgn98avagn8i3qmvw5fzq84snxy4a74dzf14aph5z";
-      name = "kruler-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lzky584al80dy5xrwvax7xs974p5s5xq-kollision-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kollision-14.12.2.tar.xz";
-      sha256 = "0v6hq3biiybrdd4lblzcadh5kpy21kjlkb5iqga95h7xxm6vd4dq";
-      name = "kollision-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g6zkyj2i5s910qb9snnabr4ivklvgajn-libkcompactdisc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkcompactdisc-14.12.2.tar.xz";
-      sha256 = "0xi1yrls8nsq9flll9250yfqx076p0xdxrywpiivx3yv64znjz7h";
-      name = "libkcompactdisc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fcm4sghdd7dl98zagm7xfg7lfcbhpi6p-kcharselect-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcharselect-14.12.2.tar.xz";
-      sha256 = "0fsmh3wsiz49wgc2l1p8caclhx03mmf4q7v7l72yf59c3pczh74c";
-      name = "kcharselect-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/r7gzmhlg6wlbhhxyx11n88pnd3qs1nbg-umbrello-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/umbrello-14.12.2.tar.xz";
-      sha256 = "1p9sdwalzi5j59xplzzd96m8dsvzc1r1isbljgj55h8pc3sn1am2";
-      name = "umbrello-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1dqlriz6zxb6ss4gq2ccswn6swzxk1fp-kapman-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kapman-14.12.2.tar.xz";
-      sha256 = "00qdq5fabm6pljclchiqi0wa3cxdfxbiqs5vw86190ki23qgqfkw";
-      name = "kapman-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hwhbjrqg3qycpsq6kxd17fmmic1iv1ls-marble-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/marble-14.12.2.tar.xz";
-      sha256 = "04khv00h3w0i6igp8b4zh0xyyl7a3aqhbszj2qlpydghr1ghz2js";
-      name = "marble-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/b17whbxz6q409ghxcxaia83v95adkdrg-knavalbattle-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/knavalbattle-14.12.2.tar.xz";
-      sha256 = "07a9z0s12v2f5irs3d93pqjsrwv4zs7sckgvsbgaklbxwar1p26n";
-      name = "knavalbattle-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/krcpms45cvn7dnv22rp9bdri7v76bcvd-klettres-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klettres-14.12.2.tar.xz";
-      sha256 = "0ca23y3d2s2m4mzqvw3jknsns0da3gzhqa7g4hicl35v4cbi8w7z";
-      name = "klettres-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/b247bpgxvgl1msrrfah432n99hi6h4h2-libkipi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkipi-14.12.2.tar.xz";
-      sha256 = "0dp3n4awc4glwlnygq8k6119hxl2lq0l66a8a2m84bhgf1xqn05j";
-      name = "libkipi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/djjlbx20jk6pv82jrk626k183hkn65qx-step-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/step-14.12.2.tar.xz";
-      sha256 = "1r11csc1hlkrydrznprdvq5sxnmhlpb1v08ns96bs27nxbz29zw4";
-      name = "step-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/n3w571knhskpnv263dv67vncy1h4613i-kompare-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kompare-14.12.2.tar.xz";
-      sha256 = "0ma1kwn7psrffs2fn80did8gmv3cr527lb40n1jrvksq15fcfl5k";
-      name = "kompare-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/r4q34i2lsi4dcpqvpqzc8c628l99nrh1-krdc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/krdc-14.12.2.tar.xz";
-      sha256 = "069gp9ahq78pl2ax77c4k0sfvb3g70gl9ph8ariarhh3f5lvzh25";
-      name = "krdc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/0wq7q4n2xxkw0vn49ajjv07b9yc316b8-kbounce-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbounce-14.12.2.tar.xz";
-      sha256 = "1iw6gwy01ri7kqc5qkk296rzbz3j1swhshxkv05vqpv69vwnfxpp";
-      name = "kbounce-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kbkrcfralyq2hal04r5qbsc9cw40yf2d-kolourpaint-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kolourpaint-14.12.2.tar.xz";
-      sha256 = "1r0xs4pisaqg53nc6zgn7bh95346wsb9756d9lq6zgp8jf2lcs4h";
-      name = "kolourpaint-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nb1lzzscqr6g5m770aw8zjqxmng6c23s-kiten-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kiten-14.12.2.tar.xz";
-      sha256 = "1y1anhvdmcflkmhya24my80c2hfpnhw8w1b2mqqr4xyjbl0plaqs";
-      name = "kiten-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/la8lyk56j0crfjfj1h9yjxgws3f9shbl-libkomparediff2-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkomparediff2-14.12.2.tar.xz";
-      sha256 = "122078hvi34zg183r8i2ni37xi00bzv7nr5251lhgh0fd45d565i";
-      name = "libkomparediff2-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/h9n5pglbgwqxiwdpxf0zrkyfcnqvjgyh-kscd-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kscd-14.12.2.tar.xz";
-      sha256 = "055fdr9l79xjcrl33sxmk82dsbchjjwgmd75dw0sbhwfxs99dvif";
-      name = "kscd-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ah46p15xxk89lrydhxzvyl83q3jjs5mr-kde-dev-scripts-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-scripts-14.12.2.tar.xz";
-      sha256 = "1fclm5wvz58565fx366sia4cjqrb2cr843skw4jpzhh4wb1v9v8i";
-      name = "kde-dev-scripts-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v5cdrabvrfx1dvjibhzj6a1m200p53ks-ark-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ark-14.12.2.tar.xz";
-      sha256 = "1aj7dshigv25qki93drpfwgzdycvvh3kl52a0im7g2k6aj1yjg6b";
-      name = "ark-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jgnxszypng4x7wlhz0rg8390bkh87lgf-kamera-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kamera-14.12.2.tar.xz";
-      sha256 = "16zjdx7b1nqh0nfbz0qplvqhl2jnl6l0jc3lfxifiqxsbzr9wlrr";
-      name = "kamera-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mfrl2pk66facvk13mm0609ign7ilympz-kapptemplate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kapptemplate-14.12.2.tar.xz";
-      sha256 = "18dpbvdhi8qpfxhrcjkk71cr4b7gf6achg24gn6i4rcq8bbbv07m";
-      name = "kapptemplate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nqh3y6b9y2zgrkb07yrs07sqcxqmwwsv-libkexiv2-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkexiv2-14.12.2.tar.xz";
-      sha256 = "0fjrvk2dcd4xzbs5v6nrabchkqbvf4qhljlc10797a378sdc8znp";
-      name = "libkexiv2-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cf4mzk51419c0v7ld561gb8jk496qgaw-kdegraphics-mobipocket-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-mobipocket-14.12.2.tar.xz";
-      sha256 = "1n2n2pd8ca5lnyv2r98jr4k9sm7lsvc5plw11xy28q829aayg8jj";
-      name = "kdegraphics-mobipocket-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yl49rnhq8zxyprh004g1qnqiw148x8kj-ksquares-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksquares-14.12.2.tar.xz";
-      sha256 = "11hznb7jdamq8hnbxggdj33jrhdnxzrhapc1rsj1ms546z01flnb";
-      name = "ksquares-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ahgf7lvgcy0fzg9wzwc0agi77bj652lx-kget-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kget-14.12.2.tar.xz";
-      sha256 = "1jadb5x8bn80gwviw73cq715sw9hzx8lpj33d19vv18l2sqyb449";
-      name = "kget-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cv1vcvvi2nfic2p51vv6jf1nc2dwv7jm-kde-baseapps-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-baseapps-14.12.2.tar.xz";
-      sha256 = "05j034g5h9cd2xw64h5zyjl8biq66p3b0z4z0z0i4min4hp52f7w";
-      name = "kde-baseapps-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2rxc1y0r19zx61g6n9kgfp1rzgbs44xw-kcolorchooser-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcolorchooser-14.12.2.tar.xz";
-      sha256 = "063ahsbzd1mfrkc45gjsnhj11v68x7d1a718lxsabkjjx59qpbck";
-      name = "kcolorchooser-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dg4a3cj0wssfw3z10bwqxqrkjk3dmqaj-okular-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/okular-14.12.2.tar.xz";
-      sha256 = "1ahw7a8i1hxa8hw0407f9x1s02zn659nprx9bfi1mvxhcn5zbwq8";
-      name = "okular-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/x89vahdh994ax46rl3mx3dxyigph3zq4-killbots-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/killbots-14.12.2.tar.xz";
-      sha256 = "1zvjwimbjld408hplb439f4k8rm6aanlvycpmf4fdiwrcg4zjq6c";
-      name = "killbots-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3d0583a63pwkq8sszvl172d69j648gnq-krfb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/krfb-14.12.2.tar.xz";
-      sha256 = "112bv9yyhg7zyhkqavjqgvkzbjm54hw4nfqrj3jmcwbjbnlzkkxm";
-      name = "krfb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6sm1200z80xxra4ibjmpgi5b626is1kc-kfloppy-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kfloppy-14.12.2.tar.xz";
-      sha256 = "0a738m6r54g4ibinxwh70d7sp736r8lr63ca8hx90a1yl5samr1b";
-      name = "kfloppy-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/i36hvnhadldbxl9yl9sgwzgbmip6nazh-kblackbox-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kblackbox-14.12.2.tar.xz";
-      sha256 = "1j9d33k8732dbwdnv85kr51jmjvnlcljya5q2zp6m97cy7xrf3n5";
-      name = "kblackbox-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hnk7d2fjhvzd1j1c0pjc4kqh3a4zv7bv-kalzium-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kalzium-14.12.2.tar.xz";
-      sha256 = "16ngwp9lf15l06yzazymrdbszkq9sx14wh4k8w1sydryl15xl77n";
-      name = "kalzium-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/a6cidm1dwqxq34q0wffn8b553xwg3sxv-libkface-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkface-14.12.2.tar.xz";
-      sha256 = "1mp19n7jhs9x74b8rlnrdc7ig1dx0v5pjvl6b4fmzfglk9akhh7v";
-      name = "libkface-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zi3aqkz4w4s4ldzscvwby1r6xkldxpdb-kremotecontrol-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kremotecontrol-14.12.2.tar.xz";
-      sha256 = "1sbzycb2b4s7v1lr6d7g4xqadwcxh5jlsl01jl3dpni83phxzk3q";
-      name = "kremotecontrol-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bpi59fwiqf4rn8xgkzkhyzr6ajv1d2la-kblocks-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kblocks-14.12.2.tar.xz";
-      sha256 = "0wcb6sgbr7gm9hh3gb31zmw6rqmflzis44ry1zb7yql0kf95y5ka";
-      name = "kblocks-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g4xg6d0syp06k3znj4xyiyv9ykiq64pf-ffmpegthumbs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ffmpegthumbs-14.12.2.tar.xz";
-      sha256 = "1261dkxyj07gjs6rk7wh8vkxk9554b675d68w4yfzf4agb8kdb8b";
-      name = "ffmpegthumbs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/0s00l7a87bg4qzbd43z7yp6pqff1icn4-kdepim-runtime-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepim-runtime-4.14.5.tar.xz";
-      sha256 = "00pmiifhf6km9v2hn3xiapr4vwrrijnvyjirprs99p8h39kifblc";
-      name = "kdepim-runtime-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1cdzh2b6wq0nmkvjx6spl70pj3538sl9-print-manager-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/print-manager-14.12.2.tar.xz";
-      sha256 = "02vz69aj56hx9jdckacjd7yzr1cmwmlqd7b3n92zmn9bx152sx86";
-      name = "print-manager-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vk3f3512rv381dpcwihmxgx4av3d92af-kdf-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdf-14.12.2.tar.xz";
-      sha256 = "14dgcrmny2gvi3m4y95di6w3gv1bld6pbj5i5qaphhxk5gl489a0";
-      name = "kdf-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rslsx2zc6zf7hls6l1m598a04r6l2h7k-kde-wallpapers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-wallpapers-14.12.2.tar.xz";
-      sha256 = "1q9p1ay2n4anr822wx7lc45hwwyyl1328ick704x6kd1rz1qwjiq";
-      name = "kde-wallpapers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2zkg1fh4kr78r8qg5nrn72k431vxd96z-kdegraphics-thumbnailers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-thumbnailers-14.12.2.tar.xz";
-      sha256 = "0kvqbdmjnrn5fx9ci9f4fnwk8b20d9cvxdb966cwrzz6x6rik7ww";
-      name = "kdegraphics-thumbnailers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pb6xr7b484aszpwr3pvd2pywliij31y0-sweeper-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/sweeper-14.12.2.tar.xz";
-      sha256 = "1k0brig6m5y5pv05lmpmc0m6wiz981jyx1brhy3ixv40bivm4cf6";
-      name = "sweeper-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6im1sz3rqm53siyfapz4p518vaa05nvz-picmi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/picmi-14.12.2.tar.xz";
-      sha256 = "1xnxsvpigsf4mjnxxp5w5nvp817az7c7p11z960z5f18adxg7frr";
-      name = "picmi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qprvh7y50d15356kdspb4cxqvm9xc30i-ksnakeduel-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksnakeduel-14.12.2.tar.xz";
-      sha256 = "1gw9sv67jnwcxsm4qw21hjbv3fbnxw6ibr4l8zrcccahlz3lc8x1";
-      name = "ksnakeduel-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yak0kczv35nhxbgr15mqr6zy9ncvg5jh-ksnapshot-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksnapshot-14.12.2.tar.xz";
-      sha256 = "15ka0h8bc7n5023ghwgxvq36bjaipimcs09nrg3z4nvdzds6xsfr";
-      name = "ksnapshot-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xz6x2nvcwz2k7df7p8s8wx42309a2rhd-kgamma-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgamma-14.12.2.tar.xz";
-      sha256 = "1lzvgdqh3i8klnj243rfak6sksnh3z10diki65zzl8wsjyagizq9";
-      name = "kgamma-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ydd7za8ax4jb54rap067rzkwfv2ars7y-okteta-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/okteta-14.12.2.tar.xz";
-      sha256 = "1xdyg54zzylj8s6zr4z5npi9pvqx3bjma68j3p7ymqvaa71a1c0n";
-      name = "okteta-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/99n02c3v71ycxvywrqn14zrsjgli2nkz-kgeography-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgeography-14.12.2.tar.xz";
-      sha256 = "10bzwbxg4k487700mnkmk642b5jzvpadcmd8y3h3af91syd0v7zp";
-      name = "kgeography-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6z45z434l9dw981lqixg0jw7mb2s1j47-knetwalk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/knetwalk-14.12.2.tar.xz";
-      sha256 = "102bd37i3z57xkq6rs7l2s4qlwayaky4qb07bh3c589g2s9nxl28";
-      name = "knetwalk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ypdsbibg2isd991n9bmdkgi5wi59ibnk-libkeduvocdocument-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkeduvocdocument-14.12.2.tar.xz";
-      sha256 = "1rf2signnpx7ik3p7vrvlkbv0g3m280pc1qz1fxzw2kjn9ais2r7";
-      name = "libkeduvocdocument-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/i5wnc7wqbmnac1awgd45iz9d91b7misv-kdeedu-data-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdeedu-data-14.12.2.tar.xz";
-      sha256 = "09ch89pghjipxsr9j50a58xww6cxhrkh9z7ns6bh5kg9b6hc47rq";
-      name = "kdeedu-data-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lix9qbdd1ganlhwap696qdcyhq3awjgz-parley-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/parley-14.12.2.tar.xz";
-      sha256 = "0kq0nm732x723f1yml0cq3w1p7ah5m3q0lj0pvrvg5z393a1ki14";
-      name = "parley-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/b3kdfd6nv23lziv5nf21g00wl7di3vz9-kdepim-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepim-4.14.5.tar.xz";
-      sha256 = "07bg60b96wg107sn49h4phks55z6h69kdsznpfr09dsxf53vl2sc";
-      name = "kdepim-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aip7i17kab1fcv43qx999cxwr8b05gdp-blinken-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/blinken-14.12.2.tar.xz";
-      sha256 = "1dkdgfmpccbpb4i4h34dg407q6h18mq7x4k2d66bly0pkwhkwkbw";
-      name = "blinken-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hc68363pfz7k528lcv6p8gfj4r3bi061-dolphin-plugins-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/dolphin-plugins-14.12.2.tar.xz";
-      sha256 = "0lc6l84p3ixk2wzj4hbxwgvsmin3kw8xw40b3jrq2w1y21zbvf3h";
-      name = "dolphin-plugins-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6ycc8cckv9ybw5fj6qwn53ccn5dghcz0-kwalletmanager-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kwalletmanager-14.12.2.tar.xz";
-      sha256 = "0bynykq9j6xh0a712934vyvq3yr94676xhdvf1iazky1cwwmiryi";
-      name = "kwalletmanager-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vd8smizcfqw4zsks5sbf03chbxk9dqiq-kfourinline-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kfourinline-14.12.2.tar.xz";
-      sha256 = "14s4lb9kygaa16sq4xfmmabv31kg3rw7dw7k2f4vwqqh3s1168yc";
-      name = "kfourinline-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rvr5bpfppyd168gfqimfavs9g4ys2412-ksudoku-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksudoku-14.12.2.tar.xz";
-      sha256 = "10c148lksrh49mfvlx7q5i7xxjanhngm2s9d7ifx5xyqlpik2zcv";
-      name = "ksudoku-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/j2pwfcwc6n5r8klnbxf0gpal2pinan7g-libkcddb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkcddb-14.12.2.tar.xz";
-      sha256 = "088hhnnm09xfqkc0j2l252qgl7nlqmsdbchbr5cninf8n9ivz99d";
-      name = "libkcddb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gz25xkmky3kpl4hw2x9ahzr5xp3113f9-libkmahjongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkmahjongg-14.12.2.tar.xz";
-      sha256 = "0min3bpd2h0lch4412ybryk1bn3rs2s4936kcjn6mn0412xyjvdf";
-      name = "libkmahjongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g7hglkwmv8kdw0cjly5pysb3i4piapkx-kcalc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcalc-14.12.2.tar.xz";
-      sha256 = "0vm861cd9y8ax7mfnv2aszip2z0grmjvhzp10x5f7gq1fhm1db64";
-      name = "kcalc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/m69i89q12sb8mpc1bhs0a2miyrkfnq7y-ksaneplugin-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksaneplugin-14.12.2.tar.xz";
-      sha256 = "1scgp9p2jb5vwwdvbgmsbr3mmijiq40m5x7nd9qx7scwn2wqjvq9";
-      name = "ksaneplugin-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cynl1ai536dqs4cnlji5db1jybpzh7s6-palapeli-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/palapeli-14.12.2.tar.xz";
-      sha256 = "1fg2ikq19g92bqfp3j27mawl284xqiwd1nr8dg94khbb111210r7";
-      name = "palapeli-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4qwqpcwraxr0a8wy81plb3l3ij3jh3s5-libksane-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libksane-14.12.2.tar.xz";
-      sha256 = "07nw3mjc645angwyllzff0hb7i7lp6wl3fw88zqd380w5j13a46h";
-      name = "libksane-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.16.tar.xz" ".tar";
-    store = "/nix/store/afz1vd72namq3xca96zx1c9l6n8jzk4p-kde-workspace-4.11.16.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-workspace-4.11.16.tar.xz";
-      sha256 = "11mzr55vr7x2yym4gdaj9bcvp2qpbs3vlbfmhs74r5n08vmsdq3s";
-      name = "kde-workspace-4.11.16.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/wbjy41ymgplkg26cm94k6vny2vjl6160-kqtquickcharts-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kqtquickcharts-14.12.2.tar.xz";
-      sha256 = "0v5ng9spcbv22lhpx4hzfg3n56wfrjdxg6nls6sw52zbq12lagqn";
-      name = "kqtquickcharts-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zl8sxjy6mp1z6r3dajvf5ly5zsiasxjd-lokalize-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/lokalize-14.12.2.tar.xz";
-      sha256 = "04jmsysvx6ysyl3126bq7xg76y7ppzjfd55j7q7i18nrkcgw4y4i";
-      name = "lokalize-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/0sf32n3kd0fyvp4sdyv5yk4abn8gy54w-kig-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kig-14.12.2.tar.xz";
-      sha256 = "0c137jnkzpzv43yf7crymghybgz70d6q6mlfww53if2119sznzd4";
-      name = "kig-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gscz4fvz0xh0szcs0jr95xiif4115vj2-kanagram-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kanagram-14.12.2.tar.xz";
-      sha256 = "1s2zn876b3css74r79acq6wys4qlq9xgb3z376xfl71rzadvisvf";
-      name = "kanagram-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mljg8qpz9axmnzw9jarzz82a4qarvbwn-katomic-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/katomic-14.12.2.tar.xz";
-      sha256 = "0ns6apxaild1iiix03vjzvz45ba442agn4aqkbgik9x9wdr9yr7l";
-      name = "katomic-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3mm64rsb14p9cyhw31jzvqbs6nppva9x-filelight-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/filelight-14.12.2.tar.xz";
-      sha256 = "047bki2gnwvflb57vij1576d12ml4ga9b1q44dz9rq97wwfbwqnj";
-      name = "filelight-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9whfiwhxk7v4cfj1s863w6i789kgcbpf-kcron-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcron-14.12.2.tar.xz";
-      sha256 = "02s782x69xrymv3wbjcfm52v246gn3illdga7g1rmhs7kmi6q7rg";
-      name = "kcron-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dj7svyjh962g9c3j2bgprhmmnyi45pbj-kuser-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kuser-14.12.2.tar.xz";
-      sha256 = "0p2qwv24qxzx637v5fjwzscvxa7j84j91s4c4gj5hq8939anx7q2";
-      name = "kuser-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8zydgf0ncr96fgvyya9rg32ahavxm4c0-kteatime-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kteatime-14.12.2.tar.xz";
-      sha256 = "1vq21jw50w56i9bwx91hlw6a2m46q83mz2mg11cdc1nxk5gm1359";
-      name = "kteatime-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/im52lp4p99k9fn2ja5hch6m6glmlk7da-analitza-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/analitza-14.12.2.tar.xz";
-      sha256 = "0sjlsh8x4qzyg59zkvmrd312qvbhmf17349l0b989xm0m1nwmqfx";
-      name = "analitza-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5rmimmbz973alzhx2xm4r80lf556v14c-kde-dev-utils-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-utils-14.12.2.tar.xz";
-      sha256 = "007w4761cv2wxqhkk7mz2pgk7zmvzkfbmy0biriy836vx99xjdky";
-      name = "kde-dev-utils-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/91wk4lximnfqs5ly2q340rqn87h84axl-kde-runtime-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-runtime-14.12.2.tar.xz";
-      sha256 = "0cs07gbx7v6ilrbp4bgl20h1yrbh07sbrrf167pyd4lfx5rz9cgk";
-      name = "kde-runtime-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/whl3f2bs6018bg3i10akdsjvky2wgvwd-pairs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/pairs-14.12.2.tar.xz";
-      sha256 = "0gs76fgyszs9lrvszi57vldx6avfyiz8hdg5axb7nmyikiqnislm";
-      name = "pairs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/adksl0r448kybmvhs10crw43isw90i3y-kiriki-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kiriki-14.12.2.tar.xz";
-      sha256 = "0r7i6fh9apjhxc7khqb4lachqr95ypiagk7cr52kwpl8bd9zcz2p";
-      name = "kiriki-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qz2v6fj2akwll4s904z638pzwpyf18yx-kwordquiz-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kwordquiz-14.12.2.tar.xz";
-      sha256 = "03isbq1dbq5w0pd8jpb93hp6z4nwi28q5ccszvldisfna5abpkjf";
-      name = "kwordquiz-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jhh4r8rqhcx1jbqycy1i0x5x4ivqgjhg-kjumpingcube-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kjumpingcube-14.12.2.tar.xz";
-      sha256 = "1a030z8bcxyj70in7g574p80hsm32b8s7mqnl3abmw4315dc43kf";
-      name = "kjumpingcube-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ahyi8a1vsdyr3zdkiljrwmjz73dxknwi-konsole-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/konsole-14.12.2.tar.xz";
-      sha256 = "06rrhmmx8sdq084wb2a2pgvmi43fkjbmjsikr695c548qp76yzig";
-      name = "konsole-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gm8jph57vbjm15f2w0k2qijghdm9v9yw-kdewebdev-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdewebdev-14.12.2.tar.xz";
-      sha256 = "0n4p7jflrrjq47wcy20avgjiz1c5qgwmw8nqxmaaxj8vnwk2vx37";
-      name = "kdewebdev-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/s6n79j8914ms33xvjrx74s22axlh20b3-kstars-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kstars-14.12.2.tar.xz";
-      sha256 = "0fwfpjmr4i9kh1f3360ahhk01m8zrkipvdj0wn16a3mxvghr6vki";
-      name = "kstars-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kqvqadr6n5n2200w3gr5h978y6376gbv-kubrick-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kubrick-14.12.2.tar.xz";
-      sha256 = "0r7w6787gc2kcvjgddr0lw0liihis4a5s8rim3ycjlmh60bfw2ac";
-      name = "kubrick-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2m09vphyfk4wfl4pzxns8lgh00nin1pa-kshisen-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kshisen-14.12.2.tar.xz";
-      sha256 = "110fv7iqbv63sw0q8m1fj0x45ivmmhw2v32sx7my0hvch4rxif1f";
-      name = "kshisen-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aq90r77wq4qs67j8dvw89zppbrj5rhgz-gwenview-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/gwenview-14.12.2.tar.xz";
-      sha256 = "0ky9f8v3473f7ic2gaymc89f6yqnpi6vsbwlnqgjfwbq8ry47w4n";
-      name = "gwenview-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/29vsbhggrymqqgvs490jxykrf6mhvmhg-kbruch-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbruch-14.12.2.tar.xz";
-      sha256 = "12gs4l5wazkym3krcfc0sjzx9kji6ca3blmprw7hfwk1yqgd36rk";
-      name = "kbruch-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ccqbkxaxm7swcm1qf9rkvjs6fgfiafay-ktuberling-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktuberling-14.12.2.tar.xz";
-      sha256 = "0y5icsgkypcr2z9w8zbhn9z877dak2kjf0if5ag1lpmjlj0y397h";
-      name = "ktuberling-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8i8lf5v6bi77ijr3b8xwny3yrapqnxrg-poxml-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/poxml-14.12.2.tar.xz";
-      sha256 = "0d2iqgpxxfzvi9aim2xsz96gjpy1zcjr0f5fsha0hns6m6mdp1lh";
-      name = "poxml-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wx9ll48ipram4w163143ixab3lcdn9iq-libkexiv2-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkexiv2-14.12.3.tar.xz";
-      sha256 = "1rj7ac318rxl995cz70vdivk065mpsxk3sw0zqj7y0a2cgg67qrl";
-      name = "libkexiv2-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2bqk35id2iwy0hx56a4fqlj9hmzwn6z-kbruch-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbruch-14.12.3.tar.xz";
-      sha256 = "0vrs1mn701jydqjzlshwjq2366c65qwiz2gf37l31ha0nk8lxcxh";
-      name = "kbruch-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/14cmjnxm524ik9dmjb5p08c9hpr0xzlv-kde-dev-scripts-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-scripts-14.12.3.tar.xz";
-      sha256 = "17xwh4gwbagzdyfxb0wbl6hplrza7mj82mf1dhz5b6p1jjlfji96";
-      name = "kde-dev-scripts-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/r9f281gb1312wvy0dg8g8g5gd4f29mlv-kdeartwork-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdeartwork-14.12.3.tar.xz";
-      sha256 = "14m5hb1rzki0h4fdpg5bm9s4bm6lfx2i939jncjvxik8l5rk8wkh";
-      name = "kdeartwork-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w8s7d4pm150c4m392plhax8y1aawr8c3-libkipi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkipi-14.12.3.tar.xz";
-      sha256 = "1k20q3f5vgvndny7zj90r6xxdvilh1qg9vksvqn1vydz9wn15by4";
-      name = "libkipi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/388ffmw8i1b8bwdkwyr697fhq5cwghg7-okteta-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/okteta-14.12.3.tar.xz";
-      sha256 = "1wlimwi9j5x9y0j4zsx6d4c8xl8k7sr4wclbm6bi42fk34w27f56";
-      name = "okteta-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0ar4zk7r20w3xgnvv79n6kcx3p0fjvai-analitza-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/analitza-14.12.3.tar.xz";
-      sha256 = "1xlv47lgybw0wkmws6fkgjzskdmyzgrwgsfkixi2jj9yh8wj7jpi";
-      name = "analitza-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/kbi014f4cakyzj22fviawpqzqkfdc2f8-kdepim-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepim-4.14.6.tar.xz";
-      sha256 = "1c1mcxj10cirxwkzb71y2sik0xk45j2a1yhkpl5lgs1k6xwivslv";
-      name = "kdepim-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2m3n25m9xjnig9q4vqbwg00li866lsg-kteatime-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kteatime-14.12.3.tar.xz";
-      sha256 = "0k35gmpkmsc7fqp31l7jf5as0f25lk8kqpj300alryyr9m5i960d";
-      name = "kteatime-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xgcvm6ic3xjzlbd8xblayybdjz5f8ah0-pairs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/pairs-14.12.3.tar.xz";
-      sha256 = "1460wvjl17vzak74x5wgnx44db1vv900whl45hm6fjjciqpanb77";
-      name = "pairs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1q3i7f47j4mx8nrm0hl5hjjljn478a35-kreversi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kreversi-14.12.3.tar.xz";
-      sha256 = "1l0pmaqwcdlzi48dcyywzlrswfr3jkywcpv93zdgxx9fba5iyhpj";
-      name = "kreversi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8wiir69l2blpqd1w4b7mcmylsm8j2q15-kcachegrind-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcachegrind-14.12.3.tar.xz";
-      sha256 = "1xgn2a3ahwnx00fish7n5djx2ci89shf8mjrrq8lkg3grka6cv6m";
-      name = "kcachegrind-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hcy2r6snkvxxmnkr93y8yb5nhrzvk8a2-kmouth-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmouth-14.12.3.tar.xz";
-      sha256 = "1awkwq4h89qp04fid6d6df03b7fj7rdk0vjs683rpkz52qq8xwny";
-      name = "kmouth-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7sxzmrmp6y6xn4nq7zfqbjg2cf8y4zhb-kcron-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcron-14.12.3.tar.xz";
-      sha256 = "0w33d82253yasrhzswmpccc75mrjyrick2s6s3gibskcy3c9rx5a";
-      name = "kcron-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q54chzx2w5p1ifvkh3dkmqwxz6q35m0m-kde-l10n-sk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sk-14.12.3.tar.xz";
-      sha256 = "0nfikvbf10gklcn33pmwamiix1rcgdxgxk84a360rkahafw3xb1l";
-      name = "kde-l10n-sk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yn6w6h0ypqv34595f10l0jd76v8r3mdh-kde-l10n-mr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-mr-14.12.3.tar.xz";
-      sha256 = "0wmkg9rwl60q354y4kz0qmbwbv892v12ybps2wj4mplwq333d03m";
-      name = "kde-l10n-mr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/6azx1w8qq6g0aqz3jgz971k12va1si42-kde-l10n-et-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-et-14.12.3.tar.xz";
-      sha256 = "1zpj0w3v1hwxpkfmba9k46w37qi41yndhm3ymdrgyl5xgfbajdrg";
-      name = "kde-l10n-et-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nx1jxyya8da77jg1l5jrlb46xwdn9fbp-kde-l10n-zh_TW-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_TW-14.12.3.tar.xz";
-      sha256 = "0qwykxa72c6pdzdd7kpwigrjv4l7d7kb1h06rwrcg9kk5q9hn31q";
-      name = "kde-l10n-zh_TW-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sajpc2529bhnd5p86sn0k35wyqj302ip-kde-l10n-ga-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ga-14.12.3.tar.xz";
-      sha256 = "17mqxz2dpqyi1ngi1p2ivxg1qixivlkhzzd1id7ihff1i50f5gdf";
-      name = "kde-l10n-ga-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m3gp02jxirgh246njwsslprfq627d13y-kde-l10n-hr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hr-14.12.3.tar.xz";
-      sha256 = "0zv3rvrfn5khmbd495iqnsr579m6igz3fr6h729wcwmizm03kl7p";
-      name = "kde-l10n-hr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ghlk4l1xill1v93qnv6sp4d9ybm2m2p1-kde-l10n-uk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-uk-14.12.3.tar.xz";
-      sha256 = "0jh17m47783vrv3c9wf7j67r937ni4xc670m758casjccwy9ldcb";
-      name = "kde-l10n-uk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/g4l10q0rg746928lmy4jfk63aa0y063r-kde-l10n-fa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fa-14.12.3.tar.xz";
-      sha256 = "1imx7nmxx9p8xi290llyhh2hcaax6y458hlz8sid6kq0cl7y5w79";
-      name = "kde-l10n-fa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lsw2ss8v9p5ryiszbfp46p1zqckqag5a-kde-l10n-pt-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt-14.12.3.tar.xz";
-      sha256 = "0wh5dgg53aic5n3h260f1908dfirp0k53hakn2kv53m3p572ck74";
-      name = "kde-l10n-pt-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ga5jirz4ggm0qacl4rzj4rlassiswls2-kde-l10n-ar-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ar-14.12.3.tar.xz";
-      sha256 = "1ybmp4id3y9xrxcx2grmv8w3412h1qmwzawrzixfiixazbg8jgfa";
-      name = "kde-l10n-ar-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rgsdz47748cn77nmnkysf1vhz5sgzwf5-kde-l10n-ca-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca-14.12.3.tar.xz";
-      sha256 = "14749nzfld9b97bk062d6pdpjdcfhga62n2yh1j1b0g5xqc1x0cp";
-      name = "kde-l10n-ca-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nja0qv4yh272pjvwbbzk75zzdjn75dgk-kde-l10n-cs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-cs-14.12.3.tar.xz";
-      sha256 = "1prhlp42vnpspj98kbdshv4liixhxak84xzr58mc8ij7whggi820";
-      name = "kde-l10n-cs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/avwqrqad41ryhdbx9dbr5m67nn6vqphw-kde-l10n-is-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-is-14.12.3.tar.xz";
-      sha256 = "17gw5isal9xk4iz5dr7qqvqx8j06nb2wzsxkkdxk5qgnqsxdn3d4";
-      name = "kde-l10n-is-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cmp30mff1j0jq0srvvlhl28jr3jhdrwb-kde-l10n-ia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ia-14.12.3.tar.xz";
-      sha256 = "0qgdy7b5gs04bszpp2byj9hx3mhy18y3l859si437i0jd3aa4b75";
-      name = "kde-l10n-ia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4x1jjabkfwy5yk0ig70pn72awx9f1c7y-kde-l10n-wa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-wa-14.12.3.tar.xz";
-      sha256 = "0h23mnlhd53cpayhi3kpz7abj7786cf41n41m43b09ln3bw8d8i9";
-      name = "kde-l10n-wa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z06s7w5m81vy7q7lm5vybpnlq75s69jz-kde-l10n-sv-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sv-14.12.3.tar.xz";
-      sha256 = "14n0i4g484rxs2qx73jb0jh0a138anhj55x49inq7s0cigq2y1k4";
-      name = "kde-l10n-sv-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y978vl8sv6l0ls2kh6hkcj77cnz3kcvh-kde-l10n-nn-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nn-14.12.3.tar.xz";
-      sha256 = "037z0c6zy5vbzbg0i1fnyi2b88by2r65a9vyihznr2k72yzgbl53";
-      name = "kde-l10n-nn-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/b15q4v2zmbc030xb1mdw746llfq2vq0y-kde-l10n-it-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-it-14.12.3.tar.xz";
-      sha256 = "0rmy7cnsbfgzmfhq3lvap7x0q1b97np2x1kz65qy1lkdwfvqlafg";
-      name = "kde-l10n-it-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/pzn66c19cgkxlwk4dc7p14pvsagh5bks-kde-l10n-pt_BR-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt_BR-14.12.3.tar.xz";
-      sha256 = "0p2lfgf29432x7srx6piyi73gbqnwfcb6mrbgb5cbrlxmhazd0x1";
-      name = "kde-l10n-pt_BR-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dykqy8mnwk56zyqscjsbc5l0v3caxcm9-kde-l10n-el-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-el-14.12.3.tar.xz";
-      sha256 = "1l9zjgq4mg1rsdk58csdm1bbvjfblh56isp275jm7fg05izc7idz";
-      name = "kde-l10n-el-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vfw1xmdblc7ryz4iyddkx04n6bpsmi1p-kde-l10n-ro-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ro-14.12.3.tar.xz";
-      sha256 = "1an38a8kq5b5xzjxflr4fpwq3ld6ryb36p2fv5ks3cgp14vs9bhc";
-      name = "kde-l10n-ro-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/i8h2ydglwf8j89g22ppja7waljid0an5-kde-l10n-fi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fi-14.12.3.tar.xz";
-      sha256 = "1v8kv7ack9l8w7pcy918vc5crhd43y35m1zkp87zdaqg9svsj893";
-      name = "kde-l10n-fi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/s3dxzagxplipcrfh3sz9vhxsbwlvd7v8-kde-l10n-sr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sr-14.12.3.tar.xz";
-      sha256 = "03ddq090ihma7y19l2ryjf69mbmqwigrxmhsyphkrpvkcch995vv";
-      name = "kde-l10n-sr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5r0zswdk5p3ais2gwwknzqh1y70v98rr-kde-l10n-da-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-da-14.12.3.tar.xz";
-      sha256 = "1nl2wvy1vg76rci4jkkgpp5ii49x6s348ps4mpj3ad46a1nxldfa";
-      name = "kde-l10n-da-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a9nqy8yh51xmprzq7g806hpp85djxci6-kde-l10n-es-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-es-14.12.3.tar.xz";
-      sha256 = "12bj9jp6l03skx8pn2b3hrbd598kg4zm4qj88nbf6l9mzjm2pjb0";
-      name = "kde-l10n-es-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zdrqq64485q0zz3m3mh11canxyn48i6x-kde-l10n-he-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-he-14.12.3.tar.xz";
-      sha256 = "0bsjnlnn703s5s3k8p68ic591zf2k6lcdizhm75dirrc2ydwld2p";
-      name = "kde-l10n-he-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nxiv4m0827jvvh9pl5adani2f83jd0pa-kde-l10n-ja-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ja-14.12.3.tar.xz";
-      sha256 = "05gl706zmw0jhw7ahdg61q0swy65459j6p6qzx4g6albrxqjr2ks";
-      name = "kde-l10n-ja-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y9sx89dk7qf8mdl18ga9s99kga8j50v1-kde-l10n-ug-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ug-14.12.3.tar.xz";
-      sha256 = "0pl9fs7gdsxafgiky7k2a6xz07xd02k3glpfd5wxa9ya6l0970nm";
-      name = "kde-l10n-ug-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3flzizssjcyxgsdp1diq0xw5is5xdxzr-kde-l10n-bs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bs-14.12.3.tar.xz";
-      sha256 = "19f6s5vylir9a695l0wx8fi63an2kgynmdpz3xadq197m1j8wd8d";
-      name = "kde-l10n-bs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/id2z95s1zn6v733fyh3wazrbfy40hyvx-kde-l10n-bg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bg-14.12.3.tar.xz";
-      sha256 = "1hp1sa8cxsgifr7vaw7iqf8bydcnb7qnz9nnac0a7sx95ypvjmlg";
-      name = "kde-l10n-bg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d51bwij9xq5wh9scl66y66g5cwd27dai-kde-l10n-zh_CN-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_CN-14.12.3.tar.xz";
-      sha256 = "1f5zqflfhw077zlhwdf3his89dq8g0c8blpd8rkh7sbbyqgxgcbx";
-      name = "kde-l10n-zh_CN-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wqrvb9c3daz3hc650q212j7j6aysxs52-kde-l10n-fr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fr-14.12.3.tar.xz";
-      sha256 = "09jriffxnkmlcwmwplspy9znbz5fa8ad06pkapl35337cisyrdqh";
-      name = "kde-l10n-fr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/477qqq2pd57y9wb83kj2yhclvr8r6ixr-kde-l10n-de-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-de-14.12.3.tar.xz";
-      sha256 = "1y71jjigz5qg3cz16j1vrikddw94zzg00kc6ziw2dxk6sx8j7vxi";
-      name = "kde-l10n-de-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bpw0gllnd9asq0qkzksrvfni25ai7kaj-kde-l10n-kk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-kk-14.12.3.tar.xz";
-      sha256 = "117125baj789y88l533jpgfggz5g4i0j19qrqybqql2hys7vhvib";
-      name = "kde-l10n-kk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/37lal5izk34xpsw4ba5i3fh7klr8s3sm-kde-l10n-eu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-eu-14.12.3.tar.xz";
-      sha256 = "15albwrdigyk9fzgvqd23njxks0ri72j2n5isbh218gcpp3k6z3b";
-      name = "kde-l10n-eu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/isl6qfzmn18flary4fdcz4nnfh4v8wpx-kde-l10n-lt-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lt-14.12.3.tar.xz";
-      sha256 = "0z8qpy7r22rijhyfaidxvmafbbpha90imx0zk1cg8d96qn5iz1ri";
-      name = "kde-l10n-lt-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/34jssw40n5qml1s21bsdqw3an7g02g4w-kde-l10n-pa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pa-14.12.3.tar.xz";
-      sha256 = "17ra2abhgbh1igd36rxkdx7n30qcmcbn85sy54zig8rdcznq4bjk";
-      name = "kde-l10n-pa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bydiajxpa21jawxl5yd2fhdy4ha9ad43-kde-l10n-tr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-tr-14.12.3.tar.xz";
-      sha256 = "1mwzryf00x2yaz6c4pm2459svs3hdjddms4xx3vv1r9aq7aavjqb";
-      name = "kde-l10n-tr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3s8gz9b9mhymdiq262w8f1skyvz25c0x-kde-l10n-nl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nl-14.12.3.tar.xz";
-      sha256 = "0jm7z2m5ngb1z1nx2g1vwgkzj46yzm0a37br5jba9yka9dmr15mw";
-      name = "kde-l10n-nl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d3i513r1568j9pvqznjr94ygmpgb8zp8-kde-l10n-ca_valencia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca@valencia-14.12.3.tar.xz";
-      sha256 = "1ybsw0r60gkxy3fshm2da5w4mlwfmanwjfwpjnwj40ydlgdi8by5";
-      name = "kde-l10n-ca_valencia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/90rfd4hdzch06plw672qfxzljqnk7x71-kde-l10n-id-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-id-14.12.3.tar.xz";
-      sha256 = "0kxss6f349mbhwafahwdv2zgfmsg5v9wp668q9xf0649d1h2w0ww";
-      name = "kde-l10n-id-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qb61jvp0gf8a76nkw1wqzq32mg2i926i-kde-l10n-lv-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lv-14.12.3.tar.xz";
-      sha256 = "11x1csh4f4mmkbhdmk0dibqvl8cddr8y3m9jyrgs980k7kd9617f";
-      name = "kde-l10n-lv-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x9jkn1ngspshcja4z0h4zrlmrqbfc1a0-kde-l10n-pl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pl-14.12.3.tar.xz";
-      sha256 = "17gbg4zb51alcp5g1bx6lbmbkzz0fzl8sbhswwc71yhkq4h9ifpc";
-      name = "kde-l10n-pl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zbrn541qzdcpsy20kf4mah7rqy64xwwv-kde-l10n-nds-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nds-14.12.3.tar.xz";
-      sha256 = "1mqhc2174g58180l13qygwifqxai78m7prvrd4nnmc22b86cb0i1";
-      name = "kde-l10n-nds-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7shjylawg8f357xm52zc2qxssqind29q-kde-l10n-km-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-km-14.12.3.tar.xz";
-      sha256 = "1244bjxs2kl7hmaj4v7bfw98vawcc5ipl73payn2ygxqiqmb2jgr";
-      name = "kde-l10n-km-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ab3swg0pgzwiihfn3vkqiw29gawrlfgf-kde-l10n-hu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hu-14.12.3.tar.xz";
-      sha256 = "1cjfy1wash2jvvr0l9s4am9s7ny1zvabbim536b6lmqhyk5bm452";
-      name = "kde-l10n-hu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/grsgaxij3fp3kqwlgfaqv0hzh0d6k3zf-kde-l10n-ko-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ko-14.12.3.tar.xz";
-      sha256 = "1chkk4zr7jqb0vbn3bhqpfvirpn5zqrih0124cyrfxmv4a19cz8v";
-      name = "kde-l10n-ko-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/27lgir5h7a95dgr1khc5gvk7rqmhvsnq-kde-l10n-hi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hi-14.12.3.tar.xz";
-      sha256 = "16pmyi73yfr885xv31rfwq9ingm4cfd2p04wvrxs056yimip2hgz";
-      name = "kde-l10n-hi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d1ydfg70nkp219vhcc6pi62kxv275121-kde-l10n-ru-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ru-14.12.3.tar.xz";
-      sha256 = "1x89kap46by47ra278r5inps9ab8mncfw76a2scpz7db9g0vfvf3";
-      name = "kde-l10n-ru-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xc5zsjaiyy9fzf8wdzz15g593xlkgzzb-kde-l10n-nb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nb-14.12.3.tar.xz";
-      sha256 = "14fgxrld2q9y7w50kn9952115fviyqb66sxvi2501b6kf3xnrpp1";
-      name = "kde-l10n-nb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m11758s3nr89b0rzfw492ljzwkqkn30i-kde-l10n-en_GB-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-en_GB-14.12.3.tar.xz";
-      sha256 = "1fbn5rih063wgmnzzsdq5dzmw4vx4cf8jpqd0zjdp4jcja7a7z7h";
-      name = "kde-l10n-en_GB-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rg1m42j06j7sp2sm33107krg0b655hzg-kde-l10n-gl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-gl-14.12.3.tar.xz";
-      sha256 = "0gm2z3va0lxnk9k3mnw0crlaf946cd2v1nygzbmc74r986aiyrla";
-      name = "kde-l10n-gl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yidz4dma1zm6rx4axqpk37irpvmf96a8-kde-l10n-sl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sl-14.12.3.tar.xz";
-      sha256 = "17vlwgsab5jq9r8vs5q7gwk77p9li8qk8d4997p75z9rmf95jx35";
-      name = "kde-l10n-sl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1p0y7hq9pqw8qjy9a5nyrjlirxkxayrs-kate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kate-14.12.3.tar.xz";
-      sha256 = "0czcni5wfw56ar0r5p05j1wrmah98qv1wca95l5mya8fb17wcmnc";
-      name = "kate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ad9jhnfb216r0x6dicjx3px17mqnxhzr-kolourpaint-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kolourpaint-14.12.3.tar.xz";
-      sha256 = "1rcln9nqqzhzb0qlkdx81k0zspyyf266s3sa12npil2g9n1yh12h";
-      name = "kolourpaint-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9g2fg6167fghd9v5nz92sadiyyac6zmv-kruler-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kruler-14.12.3.tar.xz";
-      sha256 = "0px10ilji6blpfyp44f66m53y5dhcw9s2534pwhbx9xfkal1pprj";
-      name = "kruler-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/gg40xflg0y9c38rcg1q1m352zknrvmci-ktimer-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktimer-14.12.3.tar.xz";
-      sha256 = "198gx9j0x556m1vbwmyfgvayjpbws380pmrz4m58ylsvg5mcgwib";
-      name = "ktimer-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z6ql801ixafs2n59gb6fa8z2zr8wq79h-ksquares-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksquares-14.12.3.tar.xz";
-      sha256 = "0fyqs9b4bsgnaadcc0zhvsljmm83mc8brz1gsc7iz4pm3dnz74fr";
-      name = "ksquares-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q5rjxayccrra40ahwj8g8q3splvw10sn-ksystemlog-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksystemlog-14.12.3.tar.xz";
-      sha256 = "0a29n39jyrlgfijn99v48z3za4nnz6bambakyri8j9da1zzwn6hy";
-      name = "ksystemlog-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bfj7740qpfw5i6cjml9xf9648s9vj7wh-kshisen-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kshisen-14.12.3.tar.xz";
-      sha256 = "0h5l3m6xxq91v2fzc8p213iglvc78shqa3q0bfy3xbrnd3c8gkm2";
-      name = "kshisen-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/l294adqj7slk00ns53dr6p28jzbjz29b-ksudoku-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksudoku-14.12.3.tar.xz";
-      sha256 = "1scyqlfwxgkdwh93h80wzp7a55vvy0j0zxi9fl0ihsjsh20iv0bm";
-      name = "ksudoku-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h4x11ry35314s0max9aqh47k1pyfr22l-libkomparediff2-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkomparediff2-14.12.3.tar.xz";
-      sha256 = "1829sxn3y906hsfj6hqllx0hhwk2qngw9lvrgkcyqygb99ngg2bx";
-      name = "libkomparediff2-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/18ywxpzrac8brdqp56vm3jbly49dis8f-kamera-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kamera-14.12.3.tar.xz";
-      sha256 = "1hrvc6l4q69npxyafznhg5i8mybg1c7z4iwp98q5rzsdw5zppvs8";
-      name = "kamera-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nkz7204dhnfjvjvqqp9id19l5xgzxzrx-kscd-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kscd-14.12.3.tar.xz";
-      sha256 = "1inl4sksyd27rp9g75h0900hs1hr6cb779zf92wsfflmk12gin7j";
-      name = "kscd-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dix33an8h17r8h03vnwml2fym44hrq5l-kdegraphics-mobipocket-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-mobipocket-14.12.3.tar.xz";
-      sha256 = "1ff6bbrhwa1jp3icz6mv9m9xl7f7b786yvg8dmc795wmm5hzr721";
-      name = "kdegraphics-mobipocket-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qnqwzdhg87x5dahx3avxcnys0j3k1qil-ksnapshot-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksnapshot-14.12.3.tar.xz";
-      sha256 = "13a5cri4dqn111p8q0idfgbahlx4ks2xjgvvgcwxd2srxifld825";
-      name = "ksnapshot-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/972ra01nd7jywn427qj5jz3gwibd2cyy-ksnakeduel-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksnakeduel-14.12.3.tar.xz";
-      sha256 = "0cjylhpsl33zgav8dyhrdl8qvi7yjafsf30drgjsc9jizhmn8hdz";
-      name = "ksnakeduel-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a3rr545r48ykp0rxfk2b643w683p0af0-filelight-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/filelight-14.12.3.tar.xz";
-      sha256 = "0am2qi6v2mr1rbl4jfjc4jaxg75511n2dvfr9zlsbhglfmzagmj8";
-      name = "filelight-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wfrkxk4f5hnvfwdraamqci3xap593sh5-step-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/step-14.12.3.tar.xz";
-      sha256 = "0pkj25jb7ydvghbx3187fjddsmck24k1kk4mms1hxp2i8xa11b1l";
-      name = "step-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/027r3fzd86qx6rfsc5lfas02cmn60283-kompare-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kompare-14.12.3.tar.xz";
-      sha256 = "1vjq7fdbdskhymwrl8i9945qbd0xaqgcrp95p8qpmafcc88nxvdl";
-      name = "kompare-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/kxpwjjlwa41agz76z15jbwb7b4s6x7ck-kblocks-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kblocks-14.12.3.tar.xz";
-      sha256 = "0y5f55z1i9fywfsspiyy467r2f11v7szwzhjrvacqf2g208mncwv";
-      name = "kblocks-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5j6v68g4gc7jvqrypk9s1m0grng8rpyn-knetwalk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/knetwalk-14.12.3.tar.xz";
-      sha256 = "1bakk8linrmgzn5zn79kj9bhfn43krpdahd989ba8ldfyz9d0hcc";
-      name = "knetwalk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/pgg1zvpidxgv1dacj7ncn62mizwjz0m9-killbots-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/killbots-14.12.3.tar.xz";
-      sha256 = "1b5chz21wxpmvi43iyr5gn2dh7azahamd8fwnjsdb49znyy5ab19";
-      name = "killbots-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m3sl4zcjky2smf0vky7lwvw8g79n2idw-kde-wallpapers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-wallpapers-14.12.3.tar.xz";
-      sha256 = "0cdaj33xim3rvq7ihwpv338g4s51xb36b6jszpfa9hnzxsxa146f";
-      name = "kde-wallpapers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/syx3k30s7j3s4v1hcb4azh176m4n7082-bomber-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/bomber-14.12.3.tar.xz";
-      sha256 = "0bhy5rjisq9f9ai36a0m9vhagdxj6jdyw0hlylpjl1ayy3qly1mc";
-      name = "bomber-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y1nrp3nf81v1v6khr86xdp9bjn7fnaya-kjumpingcube-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kjumpingcube-14.12.3.tar.xz";
-      sha256 = "16fgz0jicalls8c25p1hnd92rj3vwbbdli9wi1ljdv0f799h3z9w";
-      name = "kjumpingcube-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jahrwl1157161xh4dgjcnd0hnfq8x28c-kfourinline-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kfourinline-14.12.3.tar.xz";
-      sha256 = "026kvydxlrk7r91k9ffc27bsj0792shpziynh845ycbx9dy3nspk";
-      name = "kfourinline-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/l3zj17f3n998w3b3mf4v8jjib0a0p3yy-kwordquiz-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kwordquiz-14.12.3.tar.xz";
-      sha256 = "1r8ms2d59aa64wnmdv8psjn4bbypjzcpb982jpc6kfrwj391q2ig";
-      name = "kwordquiz-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y8lsccnmrc8r451j1b1igjxyrnvqpbys-palapeli-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/palapeli-14.12.3.tar.xz";
-      sha256 = "1wwnsvccshg2y55zcfpy2kvyplkjjbv96nacdfhln3yilbakwv1f";
-      name = "palapeli-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1nwhjxi7hmywfqiig8b60qaywwqircqh-libkdcraw-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdcraw-14.12.3.tar.xz";
-      sha256 = "0fw025nas8x70ji534j59d6vcsvqzr7yfcyls0yznlz5ppy4g9rz";
-      name = "libkdcraw-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9pj5rh11mpnr3grriz5x4c3ar5whn52g-sweeper-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/sweeper-14.12.3.tar.xz";
-      sha256 = "1y8yvjpd6v8s7xzgwkaa9sc4k715n53l01182j48lcyhfx6gbh98";
-      name = "sweeper-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cjd95qf5ppz9msqy2ggisilhhl4h0nvy-zeroconf-ioslave-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/zeroconf-ioslave-14.12.3.tar.xz";
-      sha256 = "0x858q6w1llcyy3933sqpdi53p8h2l1rbic1v1xyqbl4zdz9ixpp";
-      name = "zeroconf-ioslave-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cbndc9qfgqbksmfq1q00lhw1a6qz52wk-kalgebra-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kalgebra-14.12.3.tar.xz";
-      sha256 = "0pm2dshg73yc4h16sjm37j1003zs6hrp92lkr1679541z02m2f2l";
-      name = "kalgebra-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bfpnby19d3qgqhkw3fb102v8j4qh9vi0-kaccessible-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kaccessible-14.12.3.tar.xz";
-      sha256 = "02h56bykzpkvk17snm88mb8cxsy2nmhjz1by18rg4cc2gf61qk74";
-      name = "kaccessible-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/91s8bj9j78cmwj5ijb8536ykmnh3k1fg-kdepim-runtime-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepim-runtime-4.14.6.tar.xz";
-      sha256 = "1jnwgfy7052fzlz3mic7cy5jp1v5j81f28h205x56h6p7nswk29a";
-      name = "kdepim-runtime-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bm5pazc7ch4k130xj2ikmdcz69490xl6-kmix-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmix-14.12.3.tar.xz";
-      sha256 = "132k71ymd2pbbsbcw91haaalxljxzyirfw33ppk5w9d9m46h7gk8";
-      name = "kmix-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yw3v6jwj76v2savll4mwsvy8bh9n3iv9-kbreakout-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbreakout-14.12.3.tar.xz";
-      sha256 = "1kzwdz0njqggy6h208lllswaqsrwr7hid4pi1f69hnh9c27a1vbl";
-      name = "kbreakout-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vv1vfxq2dd88qhz563dbzmd8gisrhdb9-libkmahjongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkmahjongg-14.12.3.tar.xz";
-      sha256 = "0kizdr1xn58wxblkkq5swy4vqap24cdcxl092aswvi7ql85zn2hy";
-      name = "libkmahjongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8m2kvp5j83yw25smfh55ka4x73bp3sli-kmahjongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmahjongg-14.12.3.tar.xz";
-      sha256 = "08y03hszmnmf7wawrznhqhak00gd5mcrbfndb538j44k5am60ddb";
-      name = "kmahjongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/smk5qi7815a13m4c6xb7vzz18vz5n6qf-libkdeedu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdeedu-14.12.3.tar.xz";
-      sha256 = "0bja8qc2sbfq3ikhxk70fg72cj4hwbw4l7ag4zc9lq312jbzvkii";
-      name = "libkdeedu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mi979pdj5cm4sz1qbbdvzr75731xjfbx-kstars-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kstars-14.12.3.tar.xz";
-      sha256 = "1gg96zny1vgsm1cyzxqlp617ly862r6ywv21vr99fismrasj919z";
-      name = "kstars-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0661bdzswm2n96vgix2vq8rp48jg2a1d-granatier-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/granatier-14.12.3.tar.xz";
-      sha256 = "182z9lnvrxhfp1jp4lb33ij07bvzvi79xi3ncicyb9p015s9mlsg";
-      name = "granatier-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d6kz07a661dlyr950zmrirgsb52i8c5z-juk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/juk-14.12.3.tar.xz";
-      sha256 = "1zaw82px1qacfy612b9bxfgksyyvhlqrn0sv6p5dqzz01kg66xwy";
-      name = "juk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/24hs45qvjc6ixw77rjl226y0mldn14z0-kdepimlibs-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepimlibs-4.14.6.tar.xz";
-      sha256 = "03fnxg2as2rri27ajkzm2wjma25pqd97h91bxka07b3fwcqimvbh";
-      name = "kdepimlibs-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2x4jzjdy5k10dcn15q3jfnlbbaihbp2q-libkdegames-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdegames-14.12.3.tar.xz";
-      sha256 = "0dj39kzhix9h79mnw25535n0swpb04sdl1n4l9jnj306daf16g27";
-      name = "libkdegames-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/id1jxy17a8g7kwbhgk0h60f8rsvf1zz3-ktuberling-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktuberling-14.12.3.tar.xz";
-      sha256 = "0svfdfpvmwghv656rmip5y0c997pl6mlnq9ns88akqdjl45nywkm";
-      name = "ktuberling-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8myygl0hkb6l20xqj8wfynfx3zx45c9h-poxml-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/poxml-14.12.3.tar.xz";
-      sha256 = "1xw1dc9zc0wnn8h7dk115zapf8kgvm57nh2zrgmahy6ppza112bd";
-      name = "poxml-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/banw9x2cffxi8a0lal0x26v0c0vlypwi-kmag-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmag-14.12.3.tar.xz";
-      sha256 = "12aiyv848cdy0jkhbcj4ha3cg781ndjcffkl871ah7qy0sgcnkw9";
-      name = "kmag-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1361pwj0m3rxysay6njg9dz04in7k1sk-kde-runtime-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-runtime-14.12.3.tar.xz";
-      sha256 = "08ndk21mq547fw26gfa7vy88vxf78v8anbvjrym2k5f59fdx2aai";
-      name = "kde-runtime-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jns1ws94d4cklkzn7n9hk0a6zsbwyg6n-lokalize-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/lokalize-14.12.3.tar.xz";
-      sha256 = "0cy3zyzszbka19hy624rgxc07bh4hyfins4j2cwlivkszbssh8r2";
-      name = "lokalize-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y692wcc35c9dr5v9h1yjv33b0s87k3p3-kopete-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kopete-14.12.3.tar.xz";
-      sha256 = "1cdqcbafmmfq357n2kybzkfjwq926wb5lslpxbbpdnhiid23k8xp";
-      name = "kopete-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/31mxjkglzynxwi3h928n52mi6ldszww2-parley-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/parley-14.12.3.tar.xz";
-      sha256 = "0vzqsbr26l39akpch7f1xr1xwsdybszvd1f9rrdmy4rg9swc692v";
-      name = "parley-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w58yam9l13rjzh0cc4a16qkn9xzrl72m-svgpart-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/svgpart-14.12.3.tar.xz";
-      sha256 = "0jrhyb2ji2ii1pq7fmnyln12zhrqb9ahwpdq1x8ya56bws49qira";
-      name = "svgpart-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/i6l7hapmsfcga8b9agdi0ld2sss2maqy-kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-      sha256 = "1w8alhwkbffvwjfpja5pw881min6mv7vc1ag1qiblrzirsx4zhvh";
-      name = "kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m7vz5qmkwxbbs0f2251a0bbrl8g2jjw5-ffmpegthumbs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ffmpegthumbs-14.12.3.tar.xz";
-      sha256 = "1kni6fc1nb1n5zjqx736mlfcv08jp9nrchs7qkb2krzn4n5m0aji";
-      name = "ffmpegthumbs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5zhbmw2i3xb7axfyvq45qkp7dhf6xya0-kdesdk-kioslaves-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-kioslaves-14.12.3.tar.xz";
-      sha256 = "0w7ish8xpd7s26xmc9j9gxxy7b0lllv5px95g5dn4876qqcqpsks";
-      name = "kdesdk-kioslaves-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x2m1gbmqsq6zd48sbpmp2dz64d5m2nm5-kremotecontrol-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kremotecontrol-14.12.3.tar.xz";
-      sha256 = "0wy2jb9dx3bf8x22l0x7bqn8n45mn6jclnsb3saq7cns5905b68m";
-      name = "kremotecontrol-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7ckqs96cigik5syqj0ka0xk3m9ybphhx-kdenetwork-filesharing-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-filesharing-14.12.3.tar.xz";
-      sha256 = "1icg45a2qsv1n19gsfg7w3wa2ysa4rkbx3w8maq8c7x673qs5kcp";
-      name = "kdenetwork-filesharing-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m2p9ipvfj9cdznrc736fjhbvyj3g3yz1-audiocd-kio-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/audiocd-kio-14.12.3.tar.xz";
-      sha256 = "1103f1ic5niy0zs4zvz841aaa6r4q0x0db4apnyvwbx51zi7qzsb";
-      name = "audiocd-kio-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4anl6k756x5n7j58rafxyx04sgxjlc20-konsole-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/konsole-14.12.3.tar.xz";
-      sha256 = "0apz7dn9lza69fgnylhy3md47palj3qzjhpihfr0qsgn6gzg6f7a";
-      name = "konsole-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rv12zii0hdwh4fb5mv08nf0qid79miy5-mplayerthumbs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/mplayerthumbs-14.12.3.tar.xz";
-      sha256 = "01hisifj8j88wz31q4dhj0qinzz0yw9fz0lm16qp3yxv7r7p82cr";
-      name = "mplayerthumbs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/6lgsi6phi4p3lyh7qvw3bqkixfad0fl8-kde-dev-utils-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-utils-14.12.3.tar.xz";
-      sha256 = "0i6m5vs42c5mvznayh9rzjdp5rkcbl3aar909j3ir9kc3v3mi2ns";
-      name = "kde-dev-utils-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2ckqwp8l6cy1c35bvcbs4x26z1czsdc4-krdc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/krdc-14.12.3.tar.xz";
-      sha256 = "1q8s1wdmblfx8jj8acnkkyhx3rrn1ampskd9wx39jid8vznvkwpy";
-      name = "krdc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0hyjdsihgm0sn0gv2xsrijhqbgaqqn6z-klickety-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klickety-14.12.3.tar.xz";
-      sha256 = "1cz7aam2azgqilvz6jsbkfy3dpimh86f64vmkvlk3n42zkksp7hm";
-      name = "klickety-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sw2cca4mpa4y2dq1f0wjkqiqdxcjqkcn-kdiamond-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdiamond-14.12.3.tar.xz";
-      sha256 = "1cm793801nysqp90dcyvfvwxc9h212qrq3lhg7621h9fhq0946a5";
-      name = "kdiamond-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rb4li4dqgv2mw1w732pkhkxpvjxdb50g-ark-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ark-14.12.3.tar.xz";
-      sha256 = "0a6ggjg6x9kdlhm2n8l3dw4nn765lj78gn11yxgj37riq9yhg5xx";
-      name = "ark-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zpk335imsalsxqa7bfa6wcllxgcdipln-kfloppy-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kfloppy-14.12.3.tar.xz";
-      sha256 = "1b1zskwch7zz7iqfz3fa14q0bkrr2yjckr1h5fvn9k7q79x7xph6";
-      name = "kfloppy-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/c9z5wpwzpnvp5fiv5zbjg4fm8p8xrn7m-picmi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/picmi-14.12.3.tar.xz";
-      sha256 = "0vlyn2f2j1p4734rcmqyjh03h4a2m79z9swfmlahh12gq5ka81im";
-      name = "picmi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mfysg0babfpbzvpnh8b3a9kzk6n29ssh-konquest-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/konquest-14.12.3.tar.xz";
-      sha256 = "1il757w6xzvkaadangwfpkz14qx02wwdlflzffw9jis2lbz19qnh";
-      name = "konquest-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dn3vmyqlm2qsi52bhfl1cyafza31b6y9-kalzium-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kalzium-14.12.3.tar.xz";
-      sha256 = "1mnkhp5wlc3rmxyw4lli5smb419vzkv52aqpwakyncrz7nxkyk24";
-      name = "kalzium-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fi9lq4lqwclvr627x32q8lr4cwcxbgng-kde-base-artwork-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-base-artwork-14.12.3.tar.xz";
-      sha256 = "06v3javkhkchpjc3sv7x5mk2jgb1366mi18dzwg63h2ca8740wn1";
-      name = "kde-base-artwork-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2fq724w1bqmiz9hqqmhds1f0zj18k8dz-blinken-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/blinken-14.12.3.tar.xz";
-      sha256 = "0k4a5r4rq5brh5xv2lm6ldwfv1qy5wiqnj0ycp55p974isbdgqsb";
-      name = "blinken-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vqyn4qdsgnai9a9w944g0jqpmvzqg5b9-kcharselect-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcharselect-14.12.3.tar.xz";
-      sha256 = "1ycx0y82f4ah5fg9ki62fwnnhyly1sqs52zs4519hnmyqn7h7q1v";
-      name = "kcharselect-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x66xrvdlnwcs8g6l3f4iz9fvxhw61v28-umbrello-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/umbrello-14.12.3.tar.xz";
-      sha256 = "0f5qn6h89hj4n25p2nkcgqb0xk4qvlwi115n5qlsmbc3icj2j7cy";
-      name = "umbrello-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ah3xdqjxw5h29qmjc4wdb1c5i9zdsl40-kget-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kget-14.12.3.tar.xz";
-      sha256 = "04wf6qncq1xdfrp9j5cnhdii9hj83wjkp5i168flzi292sqyw9ia";
-      name = "kget-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/68ps9qh0w9mq4qawdzzjyy1h1y33wfqs-kuser-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kuser-14.12.3.tar.xz";
-      sha256 = "1xgd3g2fdanl28sar3mgcsnld69nczcdanvaqslil4vc7d8r1xim";
-      name = "kuser-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/60ipws592hnlygalmkzgzmlwnhmkvjg4-kigo-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kigo-14.12.3.tar.xz";
-      sha256 = "093bm60yaj8v8g6n7x4ysjbxph6xgh9ylarhdxsrjpmq268wql31";
-      name = "kigo-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zk9mrrc8vkzq41bx7sfyjc3lx73jzlqm-dolphin-plugins-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/dolphin-plugins-14.12.3.tar.xz";
-      sha256 = "16kxzpnfy8cxy8v1idwsisqq0p13n14zcid9a5n1sv02w91c02rj";
-      name = "dolphin-plugins-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z8kgww8c0mqwx6cfsfqm8yd58k71xvrl-katomic-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/katomic-14.12.3.tar.xz";
-      sha256 = "0rbhf8j8if5r20l1cryl4irgd8p94ikbsz6456y7v8fzv5mf6kgn";
-      name = "katomic-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jqamjiig020rvvyqwjarbxqj29ix93yi-rocs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/rocs-14.12.3.tar.xz";
-      sha256 = "14k5yx0vfpf0fllqi5f72vz2135qag6gb7hs7523jaavxkb23d1p";
-      name = "rocs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9vhmysfqpabx7cwrqsmkpgh4hinjqh39-libkcddb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkcddb-14.12.3.tar.xz";
-      sha256 = "1i8n63jpckc3fa27rcqyrf10cz8zsyjyvrpa7fgmggsf91k1c144";
-      name = "libkcddb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bz14zb6rlkwgmj0l8q9nffar2443zcaq-kdewebdev-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdewebdev-14.12.3.tar.xz";
-      sha256 = "17qy41gww688klpv2cgnk1r3cnd9sq72bsga82d7dnk0v6dinlxz";
-      name = "kdewebdev-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/iq7fn9lp4fh2s74lrb2r4v39n66c8a7v-krfb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/krfb-14.12.3.tar.xz";
-      sha256 = "0258ffj2wx25cycpw3cmvnw9ig874jpi6yw711w6d8nfy66ribpb";
-      name = "krfb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yv1ixn2gwc8vv32m3y5axy3dn1p3sbrv-kde-baseapps-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-baseapps-14.12.3.tar.xz";
-      sha256 = "1zcjbhnxzqxjn4xs6pwb8cvcnjypa4yh09jr4frd82nfhdsq7nyd";
-      name = "kde-baseapps-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7f8qlf08l8fwykz677xywlfdsf8j1pml-cantor-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/cantor-14.12.3.tar.xz";
-      sha256 = "106k9gp4r2241yh6np8mbq587chwkicxk7ssbpvvvg2m126idz9y";
-      name = "cantor-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/24zfmzbi9q832p6i91i71sms1vk3rfg2-kdelibs-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdelibs-4.14.6.tar.xz";
-      sha256 = "165xn2bv03j2g4j7m287add40kwhccvp2ci5hrar2xfd9sgl24xk";
-      name = "kdelibs-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xl12n09yvf5j7di78mrkxxhfnn6axijy-kubrick-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kubrick-14.12.3.tar.xz";
-      sha256 = "1g9ls282qy6s0xsaa50ck0gkiz980cx50zjjhq4yimlhp1gswmj0";
-      name = "kubrick-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hq79f56cq1gqw7nfxcfliqi4k8kjpkd5-kpat-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kpat-14.12.3.tar.xz";
-      sha256 = "1787qymlsxyi7dm2q8axpjl3n62qx9xv7diyg8627kkjm1a1xw9r";
-      name = "kpat-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/inai3p0228fmjcr8vkbnbhnvpznwvrgz-marble-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/marble-14.12.3.tar.xz";
-      sha256 = "1ylhc3278yqdcsli6yw7bnci6mdx01g0r97m78bs74l5biz4yql4";
-      name = "marble-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/szdzjvc2h3w5dpp154m0kqh5i0spk771-kcolorchooser-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcolorchooser-14.12.3.tar.xz";
-      sha256 = "1v8mgv5pjl3g6igxs92qd3zn8qr3qip046pb77856qhn3d9s4pqj";
-      name = "kcolorchooser-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rfk8bxw07690a9kncmcdmlqjx7qkrld2-libkface-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkface-14.12.3.tar.xz";
-      sha256 = "0zp48mlkqkjc6wk81kcf1q980196q0m153kzfjahi5w4vlslzgam";
-      name = "libkface-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2gc6778llzkl8qbzdl582ay45rwn6wn-kbounce-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbounce-14.12.3.tar.xz";
-      sha256 = "1hn09ghhmj2dk47vnkqkvrm87n50m506mmzq058cccjlfdah5iin";
-      name = "kbounce-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jplhnd96n48zih1mbf6bx96xl5b35kdp-kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-      sha256 = "135dcs9ppa8lv5va8bqmccfxj0hf5f65qprx7l02k74xj4k70yki";
-      name = "kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5aykxgy1by52pcfmv1z990kz6xpwjj18-kcalc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcalc-14.12.3.tar.xz";
-      sha256 = "0w5pl11vw0d2g3pnxb3ffig209r0bjg135163crnic9akfbfa9s5";
-      name = "kcalc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1lk25ql2cgisdm7yhjyn1ac416h8qdc0-lskat-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/lskat-14.12.3.tar.xz";
-      sha256 = "0k5wq5naj0ahmnwpvdrif2clzxjwr9jk6p40igakzanpp23i6p9k";
-      name = "lskat-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vvbs6wghnrbrq9yd9v647l227bzsiyaa-amor-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/amor-14.12.3.tar.xz";
-      sha256 = "1y9cia887lqbcs6nr08mbrxr8shb895wvxf5jg8w6iic6pwy516c";
-      name = "amor-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sxi3wlcwn3gbkmcama2vx4dg45xwm7sx-klines-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klines-14.12.3.tar.xz";
-      sha256 = "1xsrkbjdnw4icchbr5y7w64y6szfv8qdzndwd2bgrw0yvyjg5w7x";
-      name = "klines-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0al1vmsjw3a94arnw19k59gajw3kpxdd-kiriki-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kiriki-14.12.3.tar.xz";
-      sha256 = "11c76kq2pji07xfbyf2621h76sjx9pqdj3qqzydzbwdinxy0bgz0";
-      name = "kiriki-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4bw6lkbzy88kl09gk9sv494xw4a004a9-kgpg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgpg-14.12.3.tar.xz";
-      sha256 = "00qjgkgy1d8wygc298z3v7y37j47w16pjzp8ssnsdkmx88h1dp3i";
-      name = "kgpg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/97i8x4wydz1z4p2dfg2c04xvvblpdds0-kolf-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kolf-14.12.3.tar.xz";
-      sha256 = "12h4817ky9xwwrdqgba515dw87314ijci4lwqvcqmm7rq44qac8g";
-      name = "kolf-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/k35761pidfd258y0fjbcr1c22y5lwzhf-superkaramba-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/superkaramba-14.12.3.tar.xz";
-      sha256 = "1q6qpmwyics1mb44l55vy5wyjd0d5mbsm780kj4y9l6mp98b47c0";
-      name = "superkaramba-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h55lr5qacws82h167r142367mldrq50z-kapman-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kapman-14.12.3.tar.xz";
-      sha256 = "1i3ci8qpx8njr250pgkz7zlfihyi3k6vc2vnw7dcv09qfby466qb";
-      name = "kapman-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y0xl8ckan6cwmz35mvzsjv35a55s45s9-khangman-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/khangman-14.12.3.tar.xz";
-      sha256 = "1y11jwsb1ba55hc2sx0adffvrck1mrn43wna16zkrh1sxk7fk8r5";
-      name = "khangman-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rdh9ivzb5i8xilvp5v05k6szxv9nhv40-libksane-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libksane-14.12.3.tar.xz";
-      sha256 = "162bi5d6kbx7zlb4waha82ldg2j40rwcg1gikfahkjsprm6npmh3";
-      name = "libksane-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h4if4axrpc0sdn6xmazgn2d5xhkbpr0x-kgoldrunner-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgoldrunner-14.12.3.tar.xz";
-      sha256 = "1kg9mskg3aj0bp8h8y5bfkapmw4iys42aw3sa7f8zfkqp993zsw8";
-      name = "kgoldrunner-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/30xn0rg0g32p4d00i9z4xs95lp504six-bovo-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/bovo-14.12.3.tar.xz";
-      sha256 = "021pmar0g7s0p7qrzimp2x54idy9pdg22y8mgi26xrk9n7i5yybp";
-      name = "bovo-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3ajn3gyhisbdny0q3qskhn6r9wkw0aly-kgamma-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgamma-14.12.3.tar.xz";
-      sha256 = "1ywpkg7zbh9xy50a53dmlz1rsli5gdc52l50v14gm1sdjl2sfjpm";
-      name = "kgamma-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fhr2zhxsxlc5fl15l9fil414jaxw98hz-kajongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kajongg-14.12.3.tar.xz";
-      sha256 = "0fdvwv5jbmc42wzc2j5y4adjqqwzq6hvl8b7nzaknphvpk7257hj";
-      name = "kajongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7q3rq4gjjkwxjlliqy76x14h45xxzhhf-kppp-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kppp-14.12.3.tar.xz";
-      sha256 = "00517rl2b5zaf42sziar2cj878dcii6jr1mx8jicq293f171krn7";
-      name = "kppp-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jdxf1cy03k03r51kqa1klb3ib5jvd8jy-kmplot-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmplot-14.12.3.tar.xz";
-      sha256 = "1fq8m07pgmcfp1cr7q0y90ngaj282nz1pw5mqdfjh9syfradli0i";
-      name = "kmplot-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wrk2mg2h2y34s0gysr095d713wim7brw-kdf-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdf-14.12.3.tar.xz";
-      sha256 = "1dd35frqxgqmhakc6f7xs6sck061271cnfym9bsd5q6fxv9s8vdp";
-      name = "kdf-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8wa0nvqryc7gzxfk2sgbsavk1q6p3jpi-knavalbattle-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/knavalbattle-14.12.3.tar.xz";
-      sha256 = "1jl5f2ndgnffhmgpcc4in6rryshph3p12d1xa2ixw36xyr45hcki";
-      name = "knavalbattle-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/macznkbfj12i3nfcks2fr29fy24vlda7-ksirk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksirk-14.12.3.tar.xz";
-      sha256 = "1h3dgp2j7lz13j16k1j5b7wyg0g4x08svw1v2pc15llakr39p88m";
-      name = "ksirk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ja14bgwgs1wp8831ipa39s9zhayjfqdl-print-manager-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/print-manager-14.12.3.tar.xz";
-      sha256 = "1n1m5w3p4r97y7jp76q35z8g39ipfaldkgbfbz47i89bc33zaxy5";
-      name = "print-manager-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/44frkjvk64qwj15g2pfh8a1ficag137d-artikulate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/artikulate-14.12.3.tar.xz";
-      sha256 = "1rv51nk2lqvxfgwsxyzq9cd1qq68nr6z7r5xis83smc4gnaczajh";
-      name = "artikulate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9pd7p5vl53w6i6m324km5xkp6v967l53-kdeedu-data-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdeedu-data-14.12.3.tar.xz";
-      sha256 = "1q1vw5dprvqj7yyg9w39ndy8nvnnhkbladylv0kyh1491ba2a3kb";
-      name = "kdeedu-data-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x30qa0vibvxxza1pqy9a4ddnj4w2xhcw-kturtle-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kturtle-14.12.3.tar.xz";
-      sha256 = "0hxnc8lfqrfs5njaym54kl4vf2q6jakgif90saxfm50irjbwlg34";
-      name = "kturtle-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/734ajz153q37a4pzyh464q9aip528d77-klettres-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klettres-14.12.3.tar.xz";
-      sha256 = "01irm9pgh46rghbmmwwrdb85ys2gv23h46qaicv4zp73bl6mhn5c";
-      name = "klettres-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bj1igafd6x86fay8syr6d573b05472mc-libkeduvocdocument-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkeduvocdocument-14.12.3.tar.xz";
-      sha256 = "060p8sh3rbbajykjw1z2ba3xnv1bq8ns86yfwx2lv2jyaqpkkgyk";
-      name = "libkeduvocdocument-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hbrdr0fizjfwyf4p317gwgii4ckxr9bx-libkcompactdisc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkcompactdisc-14.12.3.tar.xz";
-      sha256 = "0957qd9zzbnksi1zxw1av4zxwzi48pq80jpk5h1id7cdhlfrsxz7";
-      name = "libkcompactdisc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m37c7klxvf2nz3byv04b763sls4j6h8r-kdesdk-strigi-analyzers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-strigi-analyzers-14.12.3.tar.xz";
-      sha256 = "13q7cy274ibsisvchfagb5mh4iq2wpm12zriwn625ciajy1zbq1r";
-      name = "kdesdk-strigi-analyzers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5ibmcrrhacqq7qn5zfq7fp1y3qwj90jn-kiten-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kiten-14.12.3.tar.xz";
-      sha256 = "0iy508g6mp7gibzv3m59hjjcvl32h03pzfqj8k6pgq0jya0bqvvd";
-      name = "kiten-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q2v3p0k65zzhmzphawir64a3x8k7qmbn-kwalletmanager-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kwalletmanager-14.12.3.tar.xz";
-      sha256 = "1sbbgvwh8d5pv4p5z89gk29lz2snp4glinpa3y2dg9s9chnn0qj4";
-      name = "kwalletmanager-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hcpxv7a1j4r0pavak6zqps9kb4mlgj1a-kanagram-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kanagram-14.12.3.tar.xz";
-      sha256 = "0j8l5cx251wvb2s6xzdsx45cgwzpy8a97lbss8lhhfrqwqn62lh4";
-      name = "kanagram-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/v5rwasilq989vbmqqnj14cqq87gmvpsr-kspaceduel-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kspaceduel-14.12.3.tar.xz";
-      sha256 = "1z1p5wy39xkyplhdq8z3p61flnyzh03yhi28yc0f79iqx22psvjb";
-      name = "kspaceduel-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/amjyaqjvc88397nj2g54z6djs5rj5mgm-kig-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kig-14.12.3.tar.xz";
-      sha256 = "0vhamrasgazjn110ahh09a402vhsgqh8h5v1qqmvi49f6v44bxbb";
-      name = "kig-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4fzqz8h97hnn7v0q2gadc1mp4xhssl3x-jovie-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/jovie-14.12.3.tar.xz";
-      sha256 = "12ky24hkpqm0bhi9x8fm6bf0nfqclpr5yv7n054995k3irygz9lz";
-      name = "jovie-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/81d3gi968mqnzps5v56lfi4dzkq7vfkw-cervisia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/cervisia-14.12.3.tar.xz";
-      sha256 = "094x08jf21h5f0vjx28bqj207csh56rc293bs4sl8lg9d1h0gbax";
-      name = "cervisia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2wh0xa17ikpsbm0addwb502rvld07ici-dragon-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/dragon-14.12.3.tar.xz";
-      sha256 = "0fngv700yhlh0q73njwfl6szf9v57csyf0gpqf1hyl9wvv2mwswj";
-      name = "dragon-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a3lgzwlizzj1yp4n1v0k80h45rzml2bz-kqtquickcharts-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kqtquickcharts-14.12.3.tar.xz";
-      sha256 = "01017d0mww3ai4i8ik29kfwkakyp92ngrjm6704015i0wili09i0";
-      name = "kqtquickcharts-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/r5721x8a5aasszaw7hnj91iy90sy0007-kblackbox-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kblackbox-14.12.3.tar.xz";
-      sha256 = "1kmdxiy30cm3jrgi6kdg15rrwyyxgnrb51w3bfcgaqr48kz73id6";
-      name = "kblackbox-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xgnk2fv1a5q0xsy80xwn2p57vn10w3z7-kapptemplate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kapptemplate-14.12.3.tar.xz";
-      sha256 = "0gwx51df5qms1vy1b6csbllcjy5xs55xmscz4i2n75ba7dsw9ivy";
-      name = "kapptemplate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/409f1vaf4n42mhdyxmjw0vf670frpgwg-kgeography-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgeography-14.12.3.tar.xz";
-      sha256 = "098j76mk1lc7wjvwybvyb04zaysmmn9zl9y35r4yhr11lv2v2idf";
-      name = "kgeography-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h3c8xaj4wybcpndp90x5qfr9602l6cr2-ksaneplugin-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksaneplugin-14.12.3.tar.xz";
-      sha256 = "143j3ck5cy4678fx9d0jv3y8zvbkvjxc8kyx3n8hmm4plin54lah";
-      name = "ksaneplugin-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fsviwbz3j2lx8d9hnscq7i6ncm1svq2j-okular-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/okular-14.12.3.tar.xz";
-      sha256 = "07snh1z38s1ycwfsirkzh91dw13hkf0lq79das75qjjladv3v9d7";
-      name = "okular-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/062pw1fc4w3nsflchjnzr33agfr5zpaa-kdesdk-thumbnailers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-thumbnailers-14.12.3.tar.xz";
-      sha256 = "1vaw2p5y9q44yfcs34f501baga1rhswgawn2brglfada6y2b89jk";
-      name = "kdesdk-thumbnailers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.17.tar.xz" ".tar";
-    store = "/nix/store/hgca7dsswq9axlaalvs1ci8zh0sl8j4k-kde-workspace-4.11.17.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-workspace-4.11.17.tar.xz";
-      sha256 = "0pkn49wis90v8ky8hasa80x6ji59sswlb5ib3hzr67mk191vhlhx";
-      name = "kde-workspace-4.11.17.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/kap125hfflfrp7nb58b7vv3w2kp3r6wh-ktux-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktux-14.12.3.tar.xz";
-      sha256 = "0yg3a9wnn4rdbainypq8v6hw57flgsqsq8h8rzb6iy6hwnw8pc8p";
-      name = "ktux-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/li6azfrf8qsi5ai8vfrfq0md8cw581p7-kmousetool-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmousetool-14.12.3.tar.xz";
-      sha256 = "14n79dlfiyd3pz3gi6sg71nd2p5vp18sk99bh7qz1dyid27v6z08";
-      name = "kmousetool-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mlpp2nwbyg3dscicj50795c4bxbmzcqq-oxygen-icons-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/oxygen-icons-14.12.3.tar.xz";
-      sha256 = "0apfpfrpxjrnxf6c4bxxfhys9k7wif74yx9bbysrrndw4bvv0nx6";
-      name = "oxygen-icons-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3hpc3hmys0i16sh7aqmlw46flk6r110y-ktouch-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktouch-14.12.3.tar.xz";
-      sha256 = "1z084yi4s1i5nqir2izdaa5gca3216gqb00mr06044pc2h059j6h";
-      name = "ktouch-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lvsdhfw8c30z36yyjfcxprcw3ik3jb2s-kollision-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kollision-14.12.3.tar.xz";
-      sha256 = "1gfzya87q202az63dvrfpyf70khc27vh9nj5hriyql0kzyqy0xgf";
-      name = "kollision-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0vnr7sljdzsxpkdyzz08yspr6kcbj0vn-kdegraphics-thumbnailers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-thumbnailers-14.12.3.tar.xz";
-      sha256 = "023b1la31qc2b8rfmc3nxi29pd3jld6p2ivi1sdl1pybcillzpax";
-      name = "kdegraphics-thumbnailers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lrkq8yk3wr9gwivm2177vqv5y2sh7zcf-gwenview-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/gwenview-14.12.3.tar.xz";
-      sha256 = "14kwdayzffsc8nk20xl86gqspbvrwja9x8h2dc498cqag0l60hcw";
-      name = "gwenview-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qgxz0771xbp8zvqplrv3g8rc89025xqa-kmines-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmines-14.12.3.tar.xz";
-      sha256 = "1xbpdq8250srbg2c10iz44aa6i19srk4x0f0bcsjhc53r8680g0f";
-      name = "kmines-14.12.3.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/applications/kde-apps-14.12/manifest.sh b/pkgs/applications/kde-apps-14.12/manifest.sh
deleted file mode 100755
index 7e3038275b85..000000000000
--- a/pkgs/applications/kde-apps-14.12/manifest.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../.. -A autonix.manifest) \
-      http://download.kde.org/stable/applications/14.12.1/ \
-      http://download.kde.org/stable/applications/14.12.2/ \
-      http://download.kde.org/stable/applications/14.12.3/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/applications/kde-apps-14.12/renames.nix b/pkgs/applications/kde-apps-14.12/renames.nix
deleted file mode 100644
index 011cb77337b2..000000000000
--- a/pkgs/applications/kde-apps-14.12/renames.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Analitza5" = "analitza";
-"Backend" = "kde-workspace";
-"CTest" = "sweeper";
-"ECM" = "extra-cmake-modules";
-"Gpgmepp" = "kdepimlibs";
-"JDns" = "kopete";
-"KDE4Workspace" = "kde-workspace";
-"KDEGames" = "libkdegames";
-"KDeclarative" = "kdelibs";
-"KSane" = "libksane";
-"KdepimLibs" = "kdepimlibs";
-"LibKEduVocDocument" = "libkeduvocdocument";
-"LibKdeEdu" = "libkdeedu";
-"LibKompareDiff2" = "libkomparediff2";
-"Libkcddb" = "libkcddb";
-"Libkcompactdisc" = "libkcompactdisc";
-"Okular" = "okular";
-"QJDns" = "kopete";
-"QMobipocket" = "kdegraphics-mobipocket";
-}
diff --git a/pkgs/applications/kde-apps-14.12/setup-hook.sh b/pkgs/applications/kde-apps-14.12/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36f..000000000000
--- a/pkgs/applications/kde-apps-14.12/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7f15869cf36..05a849621b69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11034,15 +11034,10 @@ let
     boost = boost155;
   };
 
-  kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
-    kf5 = kf59;
-    kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
-  });
   kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {
     kf5 = kf59;
-    kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
-  kdeApps_stable = kdeApps_14_12;
+  kdeApps_stable = kdeApps_15_04;
   kdeApps_latest = kdeApps_15_04;
 
   keepnote = callPackage ../applications/office/keepnote {

From cefdbbcfb8034eeb6d4da41b5de0064fecdd7023 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 19 Apr 2015 20:50:03 -0500
Subject: [PATCH 0136/1143] add plasma-5.2.95

---
 pkgs/desktops/plasma-5.3/default.nix          | 166 ++++++++
 pkgs/desktops/plasma-5.3/dependencies.nix     | 300 ++++++++++++++
 pkgs/desktops/plasma-5.3/dependencies.sh      |  22 ++
 .../kwin-import-plugin-follow-symlinks.patch  |  13 +
 .../plasma-5.3/kwin/libinput-0.8.patch        |  25 ++
 .../libkscreen/libkscreen-backend-path.patch  | 130 ++++++
 pkgs/desktops/plasma-5.3/manifest.nix         | 337 ++++++++++++++++
 pkgs/desktops/plasma-5.3/manifest.sh          |   9 +
 .../plasma-desktop-hwclock.patch              |  24 ++
 .../plasma-desktop-zoneinfo.patch             |  18 +
 pkgs/desktops/plasma-5.3/renames.nix          |  23 ++
 pkgs/desktops/plasma-5.3/setup-hook.sh        |   1 +
 pkgs/desktops/plasma-5.3/startkde/default.nix |  34 ++
 pkgs/desktops/plasma-5.3/startkde/kdeglobals  |  11 +
 pkgs/desktops/plasma-5.3/startkde/startkde.in | 374 ++++++++++++++++++
 .../plasma-5.3/startkde/startupconfigkeys     |   5 +
 pkgs/top-level/all-packages.nix               |   5 +-
 17 files changed, 1496 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/plasma-5.3/default.nix
 create mode 100644 pkgs/desktops/plasma-5.3/dependencies.nix
 create mode 100755 pkgs/desktops/plasma-5.3/dependencies.sh
 create mode 100644 pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch
 create mode 100644 pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch
 create mode 100644 pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch
 create mode 100644 pkgs/desktops/plasma-5.3/manifest.nix
 create mode 100755 pkgs/desktops/plasma-5.3/manifest.sh
 create mode 100644 pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch
 create mode 100644 pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch
 create mode 100644 pkgs/desktops/plasma-5.3/renames.nix
 create mode 100644 pkgs/desktops/plasma-5.3/setup-hook.sh
 create mode 100644 pkgs/desktops/plasma-5.3/startkde/default.nix
 create mode 100644 pkgs/desktops/plasma-5.3/startkde/kdeglobals
 create mode 100644 pkgs/desktops/plasma-5.3/startkde/startkde.in
 create mode 100644 pkgs/desktops/plasma-5.3/startkde/startupconfigkeys

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
new file mode 100644
index 000000000000..ed89384e26ac
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -0,0 +1,166 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ autonix, kf5, pkgs, qt5, stdenv, debug ? false }:
+
+with stdenv.lib; with autonix;
+
+let kf5Orig = kf5; in
+
+let
+
+  kf5 = kf5Orig.override { inherit debug qt5; };
+
+  mirror = "mirror://kde";
+
+  renames =
+    builtins.removeAttrs
+      (import ./renames.nix {})
+      ["Backend" "CTest"];
+
+  scope =
+    # packages in this collection
+    (mapAttrs (dep: name: plasma5."${name}") renames) //
+    # packages from KDE Frameworks 5
+    kf5.scope //
+    # packages pinned to this version of Qt 5
+    {
+      LibBlueDevil = pkgs.libbluedevil;
+      PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
+      PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; };
+    } //
+    # packages from nixpkgs
+    (with pkgs;
+      {
+        inherit epoxy;
+        Epub = ebook_tools;
+        Exiv2 = exiv2;
+        FFmpeg = ffmpeg;
+        FONTFORGE_EXECUTABLE = fontforge;
+        Freetype = freetype;
+        GTK2 = gtk2;
+        GTK3 = gtk3;
+        Libinput = libinput;
+        LibSSH = libssh;
+        PulseAudio = pulseaudio;
+        Taglib = taglib;
+        USB = libusb;
+        Wayland = wayland;
+        Xapian = xapian;
+      }
+    );
+
+  preResolve = super:
+    fold (f: x: f x) super
+      [
+        (userEnvPkg "SharedMimeInfo")
+        (userEnvPkg "SharedDesktopOntologies")
+        (blacklist ["bluedevil"])
+      ];
+
+  postResolve = super:
+    (builtins.removeAttrs super ["breeze"]) // {
+
+      breeze-qt4 = with pkgs; super.breeze // {
+        name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
+        buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
+        nativeBuildInputs = [ cmake pkgconfig ];
+        cmakeFlags =
+          [
+            "-DUSE_KDE4=ON"
+            "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
+          ];
+      };
+
+      breeze-qt5 = with pkgs; super.breeze // {
+        name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version;
+        buildInputs = with kf5; with plasma5;
+          [
+            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration kguiaddons
+            frameworkintegration ki18n kwindowsystem qt5.base qt5.x11extras
+          ];
+        nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
+        cmakeFlags = [ "-DUSE_KDE4=OFF" ];
+      };
+
+      kde-gtk-config = with pkgs; super.kde-gtk-config // {
+        NIX_CFLAGS_COMPILE =
+          (super.kde-gtk-config.NIX_CFLAGS_COMPILE or "")
+          + " -I${cairo}/include/cairo"
+          + " -I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include"
+          + " -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"
+          + " -I${pango}/include/pango-1.0";
+      };
+
+      kwin = with pkgs; super.kwin // {
+        buildInputs = with xlibs;
+          super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
+        patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
+      };
+
+      libkscreen = with pkgs; super.libkscreen // {
+        buildInputs = with xlibs; super.libkscreen.buildInputs ++ [libXrandr];
+      };
+
+      plasma-desktop = with pkgs; super.plasma-desktop // {
+        buildInputs = with xlibs;
+          super.plasma-desktop.buildInputs ++
+          [ pkgs.libcanberra libxkbfile libXcursor libXft ];
+        patches = [
+          ./plasma-desktop/plasma-desktop-hwclock.patch
+          ./plasma-desktop/plasma-desktop-zoneinfo.patch
+        ];
+        preConfigure = ''
+          substituteInPlace kcms/dateandtime/helper.cpp \
+            --subst-var-by hwclock "${utillinux}/sbin/hwclock"
+        '';
+      };
+
+      plasma-workspace = with pkgs; super.plasma-workspace // {
+        buildInputs = with xlibs;
+          super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
+        postPatch = ''
+          substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
+            --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+        '';
+        postInstall = ''
+          # We use a custom startkde script
+          rm $out/bin/startkde
+        '';
+      };
+
+      powerdevil = with pkgs; super.powerdevil // {
+        buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr];
+      };
+
+      sddm-kcm = with pkgs; super.sddm-kcm // {
+        buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor];
+      };
+
+    };
+
+  plasma5 = generateCollection ./. {
+    inherit (kf5) mkDerivation;
+    inherit mirror preResolve postResolve renames scope;
+  };
+
+in
+  plasma5 // {
+    inherit kf5 scope;
+    startkde = pkgs.callPackage ./startkde {
+      inherit (kf5) kconfig kinit kservice;
+      inherit (plasma5) plasma-desktop plasma-workspace;
+      inherit qt5;
+    };
+  }
diff --git a/pkgs/desktops/plasma-5.3/dependencies.nix b/pkgs/desktops/plasma-5.3/dependencies.nix
new file mode 100644
index 000000000000..3a813402f2ce
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/dependencies.nix
@@ -0,0 +1,300 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+  baloo = {
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5DBusAddons" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" "Xapian" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  bluedevil = {
+    buildInputs = [ "ECM" "KDED" "KF5" "KF5BluezQt" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5Plasma" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Qml" "Qt5Widgets" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  bluez-qt = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickTest" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  breeze = {
+    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5KCMUtils" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-cli-tools = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-gtk-config = {
+    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdecoration = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeplasma-addons = {
+    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5NewStuff" "KF5Plasma" "KF5Purpose" "KF5QUIET" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Qml" "Qt5Quick" "Qt5Widgets" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kfilemetadata = {
+    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" "Taglib" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khelpcenter = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" "Qt5DBus" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khotkeys = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kinfocenter = {
+    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Package" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Widgets" "RAW1394" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kio-extras = {
+    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SLP" "Samba" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kmenuedit = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kscreen = {
+    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" "Qt5QuickWidgets" "Qt5Test" "Qt5X11Extras" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksshaskpass = {
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" "Qt5Core" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksysguard = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Qt5Core" "Qt5Widgets" "Sensors" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwayland = {
+    buildInputs = [ "ECM" "EGL" "Qt5" "Qt5COMPONENT" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Private" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5_check_private" "Wayland" "WaylandScanner" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwin = {
+    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "Threads" "UDev" "Wayland" "X11" "X11_XCB" "XCB" "XKB" "epoxy" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwrited = {
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkscreen = {
+    buildInputs = [ "Doxygen" "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5X11Extras" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libksysguard = {
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "KF5IconThemes" "Qt5Core" "Qt5Network" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  milou = {
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KF5Service" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  muon = {
+    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "QtOAuth" "packagekitqt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  oxygen = {
+    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KDecoration2" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  oxygen-fonts = {
+    buildInputs = [ "ECM" ];
+    nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-desktop = {
+    buildInputs = [ "Boost" "Canberra" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5Emoticons" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "Synaptics" "USB" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-mediacenter = {
+    buildInputs = [ "ECM" "KF5" "KF5Baloo" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5FileMetaData" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5PlasmaQuick" "KF5Service" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Xml" "Taglib" "mockcpp" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-nm = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Quick" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-sdk = {
+    buildInputs = [ "ActiveApp" "ECM" "KDevPlatform" "KF5" "KF5Archive" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Plasma" "KF5PlasmaQuick" "KF5Service" "KF5TextEditor" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "QGpgme" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKit" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "GIT_EXECUTABLE_FOUND" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-workspace = {
+    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NO_MODULE" "KF5NetworkManagerQt" "KF5NewStuff" "KF5NotifyConfig" "KF5Package" "KF5Plasma" "KF5PlasmaQuick" "KF5Prison" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KF5XmlRpcClient" "KWinDBusInterface" "Phonon4Qt5" "Qalculate" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5SysGuard" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-workspace-wallpapers = {
+    buildInputs = [ "ECM" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  polkit-kde-agent = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  powerdevil = {
+    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Auth" "KF5Config" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Screen" "KF5Solid" "LibKWorkspace" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "UDev" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  sddm-kcm = {
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Designer" "Qt5Gui" "Qt5Quick" "Qt5QuickWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  systemsettings = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  user-manager = {
+    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5KDELibs4Support" "PWQuality" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+}
diff --git a/pkgs/desktops/plasma-5.3/dependencies.sh b/pkgs/desktops/plasma-5.3/dependencies.sh
new file mode 100755
index 000000000000..e614efc54759
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/dependencies.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script rebuilds dependencies.nix.
+# You must run manifest.sh first to download the packages.
+
+# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
+# If you are working on the packages, this is probably what you want.
+
+# You can also pass the path to a source tree where you have built
+# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
+# probably what you want.
+
+manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch
new file mode 100644
index 000000000000..fd1f35d717e3
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
+index 26b44a9..d14e226 100644
+--- a/clients/aurorae/src/aurorae.cpp
++++ b/clients/aurorae/src/aurorae.cpp
+@@ -73,7 +73,7 @@ void AuroraeFactory::init()
+     // so let's try to locate our plugin:
+     QString pluginPath;
+     for (const QString &path : m_engine->importPathList()) {
+-        QDirIterator it(path, QDirIterator::Subdirectories);
++        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             it.next();
+             QFileInfo fileInfo = it.fileInfo();
diff --git a/pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch b/pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch
new file mode 100644
index 000000000000..d0b9658b3bfc
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch
@@ -0,0 +1,25 @@
+commit a93a2ab1918630c6d571b5a24379c15a0458d1fa
+Author: Martin Gräßlin <mgraesslin@kde.org>
+Date:   Wed Jan 28 16:20:57 2015 +0100
+
+    Disable libinput integration if >= 0.8 is found
+    
+    libinput 0.8 is incompatible causing the build to fail. As we are in
+    dependency freeze the only option is to disable the build.
+    
+    BUG: 342893
+    FIXED-IN: 5.2.1
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 550ef57..8d9c593 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES  URL "http://www.freedesktop.org/software
+                                         PURPOSE "Required for input handling on Wayland."
+                         )
+ set(HAVE_INPUT FALSE)
+-if (Libinput_FOUND AND UDEV_FOUND)
++if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8)
+     set(HAVE_INPUT TRUE)
+ endif()
+ 
diff --git a/pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch
new file mode 100644
index 000000000000..d5797924d233
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch
@@ -0,0 +1,130 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 460022f..422a708 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
+ 
++configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
++
+ set(libkscreen_SRCS
+     backendloader.cpp
+     config.cpp
+diff --git a/src/backendloader.cpp b/src/backendloader.cpp
+index b93e469..8aebc14 100644
+--- a/src/backendloader.cpp
++++ b/src/backendloader.cpp
+@@ -16,6 +16,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA       *
+  *************************************************************************************/
+ 
++#include "config-libkscreen.h"
+ #include "backendloader.h"
+ #include "debug_p.h"
+ #include "backends/abstractbackend.h"
+@@ -40,55 +41,54 @@ bool BackendLoader::init()
+     const QString backend = qgetenv("KSCREEN_BACKEND").constData();
+     const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
+ 
+-    const QStringList paths = QCoreApplication::libraryPaths();
+-    Q_FOREACH (const QString &path, paths) {
+-        const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
+-                       backendFilter,
+-                       QDir::SortFlags(QDir::QDir::NoSort),
+-                       QDir::NoDotAndDotDot | QDir::Files);
+-        const QFileInfoList finfos = dir.entryInfoList();
+-        Q_FOREACH (const QFileInfo &finfo, finfos) {
+-            // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
+-            if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
+-                continue;
+-            }
++    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
+ 
+-            // When on X11, skip the QScreen backend, instead use the XRandR backend,
+-            // if not specified in KSCREEN_BACKEND
+-            if (backend.isEmpty() &&
+-                    finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
+-                    QX11Info::isPlatformX11()) {
+-                continue;
+-            }
++    const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
++                   backendFilter,
++                   QDir::SortFlags(QDir::QDir::NoSort),
++                   QDir::NoDotAndDotDot | QDir::Files);
++    const QFileInfoList finfos = dir.entryInfoList();
++    Q_FOREACH (const QFileInfo &finfo, finfos) {
++        // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
++        if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
++            continue;
++        }
+ 
+-            // When not on X11, skip the XRandR backend, and fall back to QSCreen
+-            // if not specified in KSCREEN_BACKEND
+-            if (backend.isEmpty() &&
+-                    finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
+-                    !QX11Info::isPlatformX11()) {
+-                continue;
+-            }
++        // When on X11, skip the QScreen backend, instead use the XRandR backend,
++        // if not specified in KSCREEN_BACKEND
++        if (backend.isEmpty() &&
++                finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
++                QX11Info::isPlatformX11()) {
++            continue;
++        }
++
++        // When not on X11, skip the XRandR backend, and fall back to QSCreen
++        // if not specified in KSCREEN_BACKEND
++        if (backend.isEmpty() &&
++                finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
++                !QX11Info::isPlatformX11()) {
++            continue;
++        }
+ 
+-            QPluginLoader loader(finfo.filePath());
+-            loader.load();
+-            QObject *instance = loader.instance();
+-            if (!instance) {
++        QPluginLoader loader(finfo.filePath());
++        loader.load();
++        QObject *instance = loader.instance();
++        if (!instance) {
++            loader.unload();
++            continue;
++        }
++
++        s_backend = qobject_cast< AbstractBackend* >(instance);
++        if (s_backend) {
++            if (!s_backend->isValid()) {
++                qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
++                delete s_backend;
++                s_backend = 0;
+                 loader.unload();
+                 continue;
+             }
+-
+-            s_backend = qobject_cast< AbstractBackend* >(instance);
+-            if (s_backend) {
+-                if (!s_backend->isValid()) {
+-                    qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
+-                    delete s_backend;
+-                    s_backend = 0;
+-                    loader.unload();
+-                    continue;
+-                }
+-                qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
+-                return true;
+-            }
++            qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
++            return true;
+         }
+     }
+ 
+diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
+new file mode 100644
+index 0000000..a99f3d1
+--- /dev/null
++++ b/src/config-libkscreen.h.cmake
+@@ -0,0 +1,2 @@
++#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
++#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
diff --git a/pkgs/desktops/plasma-5.3/manifest.nix b/pkgs/desktops/plasma-5.3/manifest.nix
new file mode 100644
index 000000000000..239d333b7da2
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/manifest.nix
@@ -0,0 +1,337 @@
+# This file is generated automatically. DO NOT EDIT!
+{ stdenv, fetchurl, mirror }:
+[
+  {
+    name = stdenv.lib.nameFromURL "kio-extras-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/5j458wgrnmcapib0iy67w20skbw630zv-kio-extras-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kio-extras-5.2.95.tar.xz";
+      sha256 = "1mkncdz0gvd2jgmlpn45h11zwgh3czfd9zl9rdhp9knssf20hna4";
+      name = "kio-extras-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmenuedit-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/7112y2xbfmh0hlcg1s3whm57saibfzcf-kmenuedit-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kmenuedit-5.2.95.tar.xz";
+      sha256 = "065gpjbbj4gpbvrm32lbdjknap4s4q2m539dkn82zp17v8drvqpw";
+      name = "kmenuedit-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-sdk-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/4hjlkvs8pwfzdzy17mrcr0zwq9jskpqp-plasma-sdk-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-sdk-5.2.95.tar.xz";
+      sha256 = "1yg1n7s0lkfjw4ayrgysqsgyll1xpf3z59a8c1vx1czr2if46hfb";
+      name = "plasma-sdk-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sddm-kcm-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/lhlam20k8zhccqxx5a21c9x6gflx27x8-sddm-kcm-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/sddm-kcm-5.2.95.tar.xz";
+      sha256 = "1hw1b6gvdkfbsnwp32z1hwgpb9q11iancmmw7lx12bq0ichl297g";
+      name = "sddm-kcm-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "baloo-5.6.95.tar.xz" ".tar";
+    store = "/nix/store/1pig79610pk3fp964yj448729f6al15d-baloo-5.6.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/baloo-5.6.95.tar.xz";
+      sha256 = "17v30vlhyh4ax79yhqjvrq6g4zjnj0mayx7dlvjpmmwdnmgy6fxl";
+      name = "baloo-5.6.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/njcw3a7933qkq7rwfxd5fgzh8rbfmdcp-plasma-workspace-wallpapers-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-workspace-wallpapers-5.2.95.tar.xz";
+      sha256 = "12d9nxvs8d95qfv0lb4yf8w8x45kf441vwxch7p6j52vqb1v2p35";
+      name = "plasma-workspace-wallpapers-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/5bhbhnjfkml4ijpicyz5bc1h3m52708j-polkit-kde-agent-1-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/polkit-kde-agent-1-5.2.95.tar.xz";
+      sha256 = "1pr5na715hi6v3kfvbk66y91p425lwl05irym6y5cpqjsa57785d";
+      name = "polkit-kde-agent-1-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkscreen-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/m9vlln9609smnkpljkibd6y276zmbl00-libkscreen-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/libkscreen-5.2.95.tar.xz";
+      sha256 = "05g8nv5p1mq74gcwlfw65c5mal8wcdffv13gmhhb10yx6yzk7ygg";
+      name = "libkscreen-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "muon-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/3q7asdd3qs31vjkg7xs7pvpiwhd4kwsn-muon-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/muon-5.2.95.tar.xz";
+      sha256 = "06dsjsb721g5lal70b28rdc0av4cbrk5dslianmlhz7h0kzafs1g";
+      name = "muon-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksshaskpass-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/hpyk2ckwygc598swc0c6ncrj2y8r90cv-ksshaskpass-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/ksshaskpass-5.2.95.tar.xz";
+      sha256 = "08si6vj34zhgqsxnip8pb54bf1q4ycb5zdz4hzvf1wf51hp027gn";
+      name = "ksshaskpass-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "milou-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/wc0a3ifcp6q7vm36g1sbd4b2czjvcg96-milou-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/milou-5.2.95.tar.xz";
+      sha256 = "02s0iarwdavpg6qnrzq6b3yx6a5i2fwjb15b9gj7hzib9i17w0hv";
+      name = "milou-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/1i0l6rv69nxrvczh83as7xvj2lklqhkd-kde-gtk-config-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kde-gtk-config-5.2.95.tar.xz";
+      sha256 = "1hcrm6x46him9s19ffj6mp7qhllkl3x1k1q2c1b7cynf9y6l810w";
+      name = "kde-gtk-config-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "powerdevil-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/77avwmqzs7ghmafj33sbakxkl1v4b6y3-powerdevil-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/powerdevil-5.2.95.tar.xz";
+      sha256 = "15bml54l4daxd3shgf73s2y3qd05c0r9x8xib1axpmdjnl6501r8";
+      name = "powerdevil-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksysguard-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/9rn2l0n0p1r91nki26mxlc007h2zf60j-ksysguard-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/ksysguard-5.2.95.tar.xz";
+      sha256 = "0ddggn5vwdsylivcb5z91z446xiaqpm36cyakazri0ps9hddfi0n";
+      name = "ksysguard-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfilemetadata-5.6.95.tar.xz" ".tar";
+    store = "/nix/store/qg0wk3g6d2rrs7sz0vqy47ik2d23zipd-kfilemetadata-5.6.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kfilemetadata-5.6.95.tar.xz";
+      sha256 = "1k3x0yj0clqcadkz50fqyx61s6kvqibks26nklj39rh1yy0d09yj";
+      name = "kfilemetadata-5.6.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwrited-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/90h7q76s7ij8w7sxjwb439kagrny2k3h-kwrited-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kwrited-5.2.95.tar.xz";
+      sha256 = "1ria0h7s7iqjnvrz7dfcfrd4lv7rb82csz4vklxd0s5bzqj92kv3";
+      name = "kwrited-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/hdjfwdx493wnqr8afn10hnbxrpkl8drr-kdeplasma-addons-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kdeplasma-addons-5.2.95.tar.xz";
+      sha256 = "0jcqilb4apxzp9ajfvy4rn1wplabbwhbkra4mn0c1f1qgy5jxzmy";
+      name = "kdeplasma-addons-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khotkeys-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/aq9vv31hqsvnkg5qj86mwaw75izh7f9g-khotkeys-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/khotkeys-5.2.95.tar.xz";
+      sha256 = "1ap8y1sa9qqbb1lc42k8m4ir9bmlghj936qrhsa6nni9ncgn7v58";
+      name = "khotkeys-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "user-manager-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/xskwg62jba6ryx6d9cf7fc4hhngn6m72-user-manager-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/user-manager-5.2.95.tar.xz";
+      sha256 = "02s8ral3brpc1sn9xnmrfyw3bcn0rdaacz8p91qahz0kjf142yvn";
+      name = "user-manager-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bluez-qt-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/fa4c2x5l6wr586yzzmh3h90g26yas3m0-bluez-qt-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/bluez-qt-5.2.95.tar.xz";
+      sha256 = "07bc8f06yd9zciydag4hj894c38pv4zhcrlmfgp4lidnnk9lsxab";
+      name = "bluez-qt-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdecoration-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/ksqsjrr3fdfamjq50r5jy1i5p14ikn29-kdecoration-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kdecoration-5.2.95.tar.xz";
+      sha256 = "08yzrqbwrpxc0armigpv7wrwp7bz3wgccwzi4py6lywv8wsrrmq7";
+      name = "kdecoration-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/hpn2p07q203zfqrx7qyg04rxawd6yrrs-oxygen-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/oxygen-5.2.95.tar.xz";
+      sha256 = "14bklqcwdyjjlhy99a9jfrs52qznydvi3ybkxgrxas7g0xy1rsrw";
+      name = "oxygen-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "systemsettings-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/bh2s68dmixjk8422ha4m69czz9704rni-systemsettings-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/systemsettings-5.2.95.tar.xz";
+      sha256 = "1zl027qlg15myiad1953b9y5110fsw2xs5sv4l29ri3f27v5rhps";
+      name = "systemsettings-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/m690wwl3whdpxhqq4g81kwy4i5wzcldk-kde-cli-tools-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kde-cli-tools-5.2.95.tar.xz";
+      sha256 = "052az8w1iaaiv14kjrsjndgsxbrj3167z0zcpsj78bgw61apawkd";
+      name = "kde-cli-tools-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-desktop-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/bj2dmd96l9bgdi1xxqqaz8c558yxjscz-plasma-desktop-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-desktop-5.2.95.tar.xz";
+      sha256 = "1zyzqhmmy5sf8xxnknv5z36fzn0497girqvkx58kvb9zdwq4d1bl";
+      name = "plasma-desktop-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-mediacenter-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/ypk31w9vglrqpif9r8v6hlq6ia77ywpj-plasma-mediacenter-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-mediacenter-5.2.95.tar.xz";
+      sha256 = "1n0yqkxvlic8b75gb233inig383skzcfz751ylh86ppsfqjaf5jn";
+      name = "plasma-mediacenter-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-nm-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/pa12m99mmwxif2br46qghx7ypvwaxqs1-plasma-nm-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-nm-5.2.95.tar.xz";
+      sha256 = "0p6syjavn7w8vhpx0hvxis99qqcwmh4cng0svfqmxqpmwb9iwfca";
+      name = "plasma-nm-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/dcxsc6givwv0jmjaan0xx69ldz2w1sz5-oxygen-fonts-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/oxygen-fonts-5.2.95.tar.xz";
+      sha256 = "04yv8msnfxaph7dlvx618xlvfh8r9qgw004ixs7k5ckw6w16xz3s";
+      name = "oxygen-fonts-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kinfocenter-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/6nrza8pv196d8zlljbi3p8hy5mxn83fm-kinfocenter-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kinfocenter-5.2.95.tar.xz";
+      sha256 = "0h99pnsh0zsp3xhr3chda9km9n91raf8sxrycsrhjsg4vjah2lav";
+      name = "kinfocenter-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwin-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/imir1ak0asfxs3kg48kzj3jafpjinxlp-kwin-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kwin-5.2.95.tar.xz";
+      sha256 = "0pircn5h061zjw50gm6bx1kr7z3hrk81rvp328yp7gfqanwxzbr2";
+      name = "kwin-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bluedevil-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/60vbb1qwya5k3r0zyx0x7bsvc0c800k4-bluedevil-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/bluedevil-5.2.95.tar.xz";
+      sha256 = "1qappzwqdl83mvhj5d643pjfr8l39zdqpfnk4bb56b62hxfmmp3z";
+      name = "bluedevil-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-workspace-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/4jdgvnr5mmdnhpvg0v9rri29vrc03pry-plasma-workspace-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-workspace-5.2.95.tar.xz";
+      sha256 = "1q1y03brfhc7qgzpa9vai6891pd6hnfj0p0x5shn4irkh5lh5yrg";
+      name = "plasma-workspace-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kscreen-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/wxvnimhl5j9ak9gmc1s1di7mprcyzh35-kscreen-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kscreen-5.2.95.tar.xz";
+      sha256 = "1k76rixy2s4wiyl4rg05hxblq79j5flb1safdr78872jp9b772bg";
+      name = "kscreen-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khelpcenter-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/v7pjw4wnvx7gffdsqp4fbdhxk3anf8na-khelpcenter-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/khelpcenter-5.2.95.tar.xz";
+      sha256 = "1xm6220bs4iq55ia6yfyl6jawwivjy9y4pcqyl1m34lsjrnbvywc";
+      name = "khelpcenter-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwayland-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/llgf9py7y03gg2grcwjkyicp306vd3qz-kwayland-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/kwayland-5.2.95.tar.xz";
+      sha256 = "1019m668p1ngfx8vv0wg41yhz7dprwy1125a8rdzqgpkspfj63h4";
+      name = "kwayland-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksysguard-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/bpdp5g0znahl58j75b511ywa5042pya2-libksysguard-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/libksysguard-5.2.95.tar.xz";
+      sha256 = "1cszlh2w8fkb66fpjq0ni7d2hd1yjc9z46hh39fdih3pfwwb4hhx";
+      name = "libksysguard-5.2.95.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "breeze-5.2.95.tar.xz" ".tar";
+    store = "/nix/store/jvf0gxiq28sdkk0nvhn71n2hmwhxavwb-breeze-5.2.95.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/unstable/plasma/5.2.95/breeze-5.2.95.tar.xz";
+      sha256 = "16a0qsi1z5sk7s8jmvc808bk29mxkl2f5qvls8j8pcpb9mp8czr3";
+      name = "breeze-5.2.95.tar.xz";
+    };
+  }
+]
diff --git a/pkgs/desktops/plasma-5.3/manifest.sh b/pkgs/desktops/plasma-5.3/manifest.sh
new file mode 100755
index 000000000000..f253ea27c0bf
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/manifest.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build ../../.. -A autonix.manifest) \
+    "${KDE_MIRROR}/unstable/plasma/5.2.95/" \
+    -A '*.tar.xz'
diff --git a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch
new file mode 100644
index 000000000000..53bd43d38e2c
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch
@@ -0,0 +1,24 @@
+diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
+index cec5ab8..fc4a6b9 100644
+--- a/kcms/dateandtime/helper.cpp
++++ b/kcms/dateandtime/helper.cpp
+@@ -48,10 +48,6 @@
+ #include <sys/stat.h>
+ #endif
+ 
+-// We cannot rely on the $PATH environment variable, because D-Bus activation
+-// clears it. So we have to use a reasonable default.
+-static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
+-
+ int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
+ {
+     int ret = 0;
+@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
+ 
+ void ClockHelper::toHwclock()
+ {
+-    QString hwclock = KStandardDirs::findExe("hwclock", exePath);
++    QString hwclock = "@hwclock@";
+     if (!hwclock.isEmpty()) {
+         KProcess::execute(hwclock, QStringList() << "--systohc");
+     }
diff --git a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch
new file mode 100644
index 000000000000..e924207054d1
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch
@@ -0,0 +1,18 @@
+diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
+index fc4a6b9..7b64d05 100644
+--- a/kcms/dateandtime/helper.cpp
++++ b/kcms/dateandtime/helper.cpp
+@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
+ 
+     val = selectedzone;
+ #else
+-    QString tz = "/usr/share/zoneinfo/" + selectedzone;
++    // NixOS-specific path
++    QString tz = "/etc/zoneinfo/" + selectedzone;
++    if (!QFile::exists(tz)) {
++      // Standard Linux path
++      tz = "/usr/share/zoneinfo/" + selectedzone;
++    }
+ 
+     if (QFile::exists(tz)) { // make sure the new TZ really exists
+         QFile::remove("/etc/localtime");
diff --git a/pkgs/desktops/plasma-5.3/renames.nix b/pkgs/desktops/plasma-5.3/renames.nix
new file mode 100644
index 000000000000..e099edd8d83a
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/renames.nix
@@ -0,0 +1,23 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+"Backend" = "powerdevil";
+"CTest" = "kdeplasma-addons";
+"ECM" = "extra-cmake-modules";
+"KDecoration2" = "kdecoration";
+"KF5ActivitiesExperimentalStats" = "plasma-desktop";
+"KF5Baloo" = "baloo";
+"KF5BluezQt" = "bluez-qt";
+"KF5FileMetaData" = "kfilemetadata";
+"KF5Screen" = "libkscreen";
+"KF5SysGuard" = "libksysguard";
+"KF5Wayland" = "kwayland";
+"KHotKeysDBusInterface" = "khotkeys";
+"KRunnerAppDBusInterface" = "plasma-workspace";
+"KSMServerDBusInterface" = "plasma-workspace";
+"KWinDBusInterface" = "kwin";
+"LibKWorkspace" = "plasma-workspace";
+"LibTaskManager" = "plasma-workspace";
+"OxygenFont" = "oxygen-fonts";
+"ScreenSaverDBusInterface" = "plasma-workspace";
+}
diff --git a/pkgs/desktops/plasma-5.3/setup-hook.sh b/pkgs/desktops/plasma-5.3/setup-hook.sh
new file mode 100644
index 000000000000..a8d9b7e0e36f
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/desktops/plasma-5.3/startkde/default.nix b/pkgs/desktops/plasma-5.3/startkde/default.nix
new file mode 100644
index 000000000000..624c5d239d5d
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/startkde/default.nix
@@ -0,0 +1,34 @@
+# We provide our own version of the startkde script in its entirety, rather than
+# patching the version provided by kde-workspace, because it requires such
+# extensive patching.
+
+{ stdenv, bash, dbus, gnused, gnugrep, kconfig, kinit, kservice, plasma-desktop
+, plasma-workspace, qt5, socat, xorg }:
+
+let startkde = ./startkde.in; in
+
+stdenv.mkDerivation {
+  name = "startkde-0.1";
+  phases = "installPhase";
+
+  inherit bash gnused gnugrep kconfig kinit kservice socat;
+  inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+  qt5tools = qt5.tools;
+  dbus_tools = dbus.tools;
+  plasmaWorkspace = plasma-workspace;
+  plasmaDesktop = plasma-desktop;
+  startupconfigkeys = ./startupconfigkeys;
+  kdeglobals = ./kdeglobals;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    substituteAll ${startkde} $out/bin/startkde
+    chmod +x $out/bin/startkde
+  '';
+
+  meta = {
+    description = "Custom startkde script for Nixpkgs";
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    license = with stdenv.lib.licenses; [ gpl2Plus ];
+  };
+}
diff --git a/pkgs/desktops/plasma-5.3/startkde/kdeglobals b/pkgs/desktops/plasma-5.3/startkde/kdeglobals
new file mode 100644
index 000000000000..bfa610712ede
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/startkde/kdeglobals
@@ -0,0 +1,11 @@
+[General]
+XftAntialias=true
+XftHintStyle=hintmedium
+XftSubPixel=none
+desktopFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+fixed=Oxygen Mono,9,-1,5,50,0,0,0,0,0
+font=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+menuFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+smallestReadableFont=Oxygen-Sans,8,-1,5,50,0,0,0,0,0
+taskbarFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
\ No newline at end of file
diff --git a/pkgs/desktops/plasma-5.3/startkde/startkde.in b/pkgs/desktops/plasma-5.3/startkde/startkde.in
new file mode 100644
index 000000000000..0825a0733f43
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/startkde/startkde.in
@@ -0,0 +1,374 @@
+#!@bash@/bin/bash -x
+#
+#  NIXOS KDE STARTUP SCRIPT
+#
+
+# The KDE icon cache is supposed to update itself
+# automatically, but it uses the timestamp on the icon
+# theme directory as a trigger.  Since in Nix the
+# timestamp is always the same, this doesn't work.  So as
+# a workaround, nuke the icon cache on login.  This isn't
+# perfect, since it may require logging out after
+# installing new applications to update the cache.
+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
+rm -fv $HOME/.cache/icon-cache.kcache
+
+# Qt writes a weird ‘libraryPath’ line to
+# ~/.config/Trolltech.conf that causes the KDE plugin
+# paths of previous KDE invocations to be searched.
+# Obviously using mismatching KDE libraries is potentially
+# disastrous, so here we nuke references to the Nix store
+# in Trolltech.conf.  A better solution would be to stop
+# Qt from doing this wackiness in the first place.
+if [ -e $HOME/.config/Trolltech.conf ]; then
+    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+fi
+
+if test "x$1" = x--failsafe; then
+    KDE_FAILSAFE=1 # General failsafe flag
+    KWIN_COMPOSE=N # Disable KWin's compositing
+    export KWIN_COMPOSE KDE_FAILSAFE
+fi
+
+# When the X server dies we get a HUP signal from xinit. We must ignore it
+# because we still need to do some cleanup.
+trap 'echo GOT SIGHUP' HUP
+
+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+unset DYLD_FORCE_FLAT_NAMESPACE
+
+# Check if a KDE session already is running and whether it's possible to connect to X
+@plasmaWorkspace@/bin/kcheckrunning
+kcheckrunning_result=$?
+if test $kcheckrunning_result -eq 0 ; then
+  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
+	exit 1
+elif test $kcheckrunning_result -eq 2 ; then
+	echo "\$DISPLAY is not set or cannot connect to the X server."
+  exit 1
+fi
+
+# Boot sequence:
+#
+# kdeinit is used to fork off processes which improves memory usage
+# and startup time.
+#
+# * kdeinit starts klauncher first.
+# * Then kded is started. kded is responsible for keeping the sycoca
+#   database up to date. When an up to date database is present it goes
+#   into the background and the startup continues.
+# * Then kdeinit starts kcminit. kcminit performs initialisation of
+#   certain devices according to the user's settings
+#
+# * Then ksmserver is started which takes control of the rest of the startup sequence
+
+# We need to create config folder so we can write startupconfigkeys
+configDir=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation)
+mkdir -p "$configDir"
+
+# This is basically setting defaults so we can use them with kstartupconfig5
+cat @startupconfigkeys@ >$configDir/startupconfigkeys
+
+# preload the user's locale on first start
+plasmalocalerc=$configDir/plasma-localerc
+test -f $plasmalocalerc || {
+cat >$plasmalocalerc <<EOF
+[Formats]
+LANG=$LANG
+EOF
+}
+
+# export LC_* variables set by kcmshell5 formats into environment
+# so it can be picked up by QLocale and friends.
+exportformatssettings=$configDir/plasma-locale-settings.sh
+[ -f $exportformatssettings ] && . $exportformatssettings
+
+# Write a default kdeglobals file to set up the font
+kdeglobalsfile=$configDir/kdeglobals
+[ -f $kdeglobalsfile ] || cat @kdeglobals@ >$kdeglobalsfile
+
+@plasmaWorkspace@/bin/kstartupconfig5
+returncode=$?
+if test $returncode -ne 0; then
+    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 exited with $returncode"
+    exit 1
+fi
+[ -r $configDir/startupconfig ] && . $configDir/startupconfig
+
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
+export XCURSOR_PATH
+
+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+
+    @plasmaDesktop@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+    if test $? -eq 10; then
+        XCURSOR_THEME=default
+        export XCURSOR_THEME
+    elif test -n "$kcminputrc_mouse_cursortheme"; then
+        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
+        export XCURSOR_THEME
+    fi
+    if test -n "$kcminputrc_mouse_cursorsize"; then
+        XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
+        export XCURSOR_SIZE
+    fi
+fi
+
+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+# from some users that they're confused and don't know what to do. This is
+# especially necessary on slow machines, where starting KDE takes one or two
+# minutes until anything appears on the screen.
+#
+# If the user has overwritten fonts, the cursor font may be different now
+# so don't move this up.
+#
+@xsetroot@/bin/xsetroot -cursor_name left_ptr
+
+dl=$DESKTOP_LOCKED
+unset DESKTOP_LOCKED # Don't want it in the environment
+
+# Make sure that D-Bus is running
+# D-Bus autolaunch is broken
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
+fi
+if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
+    : # ok
+else
+    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+    exit 1
+fi
+
+ksplash_pid=
+if test -z "$dl"; then
+  # the splashscreen and progress indicator
+  case "$ksplashrc_ksplash_engine" in
+    KSplashQML)
+      ksplash_pid=`@plasmaWorkspace@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+      ;;
+    None)
+      ;;
+    *)
+      ;;
+  esac
+fi
+
+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
+# (where <config locations> correspond to the system and user's configuration
+# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
+# and /etc/xdg/ on Linux)
+#
+# This is where you can define environment variables that will be available to
+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
+# or eval `gpg-agent --daemon`.
+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
+#
+# (see end of this file).
+# For anything else (that doesn't set env vars, or that needs a window manager),
+# better use the Autostart folder.
+
+scriptpath=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
+
+# Add /env/ to the directory to locate the scripts to be sourced
+for prefix in `echo $scriptpath`; do
+  for file in "$prefix"/env/*.sh; do
+    test -r "$file" && . "$file"
+  done
+done
+
+# Set the path for Qt plugins provided by KDE
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir`
+# TODO: Do we really need this?
+QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+export QT_PLUGIN_PATH
+
+# Activate the kde font directories.
+#
+# There are 4 directories that may be used for supplying fonts for KDE.
+#
+# There are two system directories. These belong to the administrator.
+# There are two user directories, where the user may add her own fonts.
+#
+# The 'override' versions are for fonts that should come first in the list,
+# i.e. if you have a font in your 'override' directory, it will be used in
+# preference to any other.
+#
+# The preference order looks like this:
+# user override, system override, X, user, system
+#
+# Where X is the original font database that was set up before this script
+# runs.
+
+usr_odir=$HOME/.fonts/kde-override
+usr_fdir=$HOME/.fonts
+
+if test -n "$KDEDIRS"; then
+  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
+  sys_odir=$kdedirs_first/share/fonts/override
+  sys_fdir=$kdedirs_first/share/fonts
+else
+  sys_odir=$KDEDIR/share/fonts/override
+  sys_fdir=$KDEDIR/share/fonts
+fi
+
+# We run mkfontdir on the user's font dirs (if we have permission) to pick
+# up any new fonts they may have installed. If mkfontdir fails, we still
+# add the user's dirs to the font path, as they might simply have been made
+# read-only by the administrator, for whatever reason.
+
+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
+
+# Ask X11 to rebuild its font list.
+@xset@/bin/xset fp rehash
+
+# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+if test -n "$GS_LIB" ; then
+    GS_LIB=$usr_fdir:$GS_LIB
+    export GS_LIB
+else
+    GS_LIB=$usr_fdir
+    export GS_LIB
+fi
+
+echo 'startkde: Starting up...'  1>&2
+
+
+# Mark that full KDE session is running (e.g. Konqueror preloading works only
+# with full KDE running). The KDE_FULL_SESSION property can be detected by
+# any X client connected to the same X session, even if not launched
+# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
+# however guarantees that the application is launched in the same environment
+# like the KDE session and that e.g. KDE utilities/libraries are available.
+# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
+# The matching tests are:
+#   For $KDE_FULL_SESSION:
+#     if test -n "$KDE_FULL_SESSION"; then ... whatever
+#   For KDE_FULL_SESSION property:
+#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+#     if test $? -eq 0; then ... whatever
+#
+# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
+# of the user running the KDE session. It should be rarely needed (e.g.
+# after sudo to prevent desktop-wide functionality in the new user's kded).
+#
+# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number.
+# Note that this didn't exist in KDE3, which can be detected by its absense and
+# the presence of KDE_FULL_SESSION.
+#
+KDE_FULL_SESSION=true
+export KDE_FULL_SESSION
+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+
+KDE_SESSION_VERSION=5
+export KDE_SESSION_VERSION
+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+
+KDE_SESSION_UID=`id -ru`
+export KDE_SESSION_UID
+
+XDG_CURRENT_DESKTOP=KDE
+export XDG_CURRENT_DESKTOP
+
+# At this point all the environment is ready, let's send it to kwalletd if running
+if test -n "$PAM_KWALLET_LOGIN" ; then
+    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+fi
+
+# At this point all environment variables are set, let's send it to the DBus
+# session server to update the activation environment
+@plasmaWorkspace@/lib/libexec/ksyncdbusenv
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not sync environment to dbus.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
+  exit 1
+fi
+
+# We set LD_BIND_NOW to increase the efficiency of kdeinit.
+# kdeinit unsets this variable before loading applications.
+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not start kdeinit5.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5."
+  exit 1
+fi
+
+# (NixOS) We run kbuildsycoca5 before starting the user session because things
+# may be missing or moved if they have run nixos-rebuild and it may not be
+# possible for them to start Konsole to run it manually!
+@kservice@/bin/kbuildsycoca5
+
+# finally, give the session control to the session manager
+# see kdebase/ksmserver for the description of the rest of the startup sequence
+# if the KDEWM environment variable has been set, then it will be used as KDE's
+# window manager instead of kwin.
+# if KDEWM is not set, ksmserver will ensure kwin is started.
+# kwrapper5 is used to reduce startup time and memory usage
+# kwrapper5 does not return useful error codes such as the exit code of ksmserver.
+# We only check for 255 which means that the ksmserver process could not be
+# started, any problems thereafter, e.g. ksmserver failing to initialize,
+# will remain undetected.
+test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+# If the session should be locked from the start (locked autologin),
+# lock now and do the rest of the KDE startup underneath the locker.
+KSMSERVEROPTIONS=""
+test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+@kinit@/bin/kwrapper5 @plasmaWorkspace@/bin/ksmserver $KDEWM $KSMSERVEROPTIONS
+if test $? -eq 255; then
+  # Startup error
+  echo 'startkde: Could not start ksmserver.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver."
+fi
+
+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+
+if test x"$wait_drkonqi"x = x"true"x ; then
+    # wait for remaining drkonqi instances with timeout (in seconds)
+    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+    wait_drkonqi_counter=0
+    while @qt5tools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+        sleep 5
+        wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+        if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+            # ask remaining drkonqis to die in a graceful way
+            @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
+                @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit"
+            done
+            break
+        fi
+    done
+fi
+
+echo 'startkde: Shutting down...'  1>&2
+# just in case
+test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+
+# Clean up
+@kinit@/bin/kdeinit5_shutdown
+
+echo 'startkde: Running shutdown scripts...'  1>&2
+
+# Run scripts found in <config locations>/plasma-workspace/shutdown
+for prefix in `echo "$scriptpath"`; do
+  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
+    test -x "$prefix$file" && "$prefix$file"
+  done
+done
+
+unset KDE_FULL_SESSION
+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
+unset KDE_SESSION_VERSION
+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
+unset KDE_SESSION_UID
+
+echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/plasma-5.3/startkde/startupconfigkeys b/pkgs/desktops/plasma-5.3/startkde/startupconfigkeys
new file mode 100644
index 000000000000..0fc92cff8a53
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/startkde/startupconfigkeys
@@ -0,0 +1,5 @@
+kcminputrc Mouse cursorTheme 'breeze_cursors'
+kcminputrc Mouse cursorSize ''
+ksplashrc KSplash Theme Breeze
+ksplashrc KSplash Engine KSplashQML
+kcmfonts General forceFontDPI 0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05a849621b69..eebe86edbf50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13234,7 +13234,10 @@ let
   plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
     kf5 = kf59;
   });
-  plasma5_latest = plasma52;
+  plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 {
+    kf5 = kf59;
+  });
+  plasma5_latest = plasma53;
   plasma5_stable = plasma52;
 
   kde5 = kf5_stable // plasma5_stable // kdeApps_stable;

From e229dbdb4ea0d4bb9d2ff03448deb0ed168cf8ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2015 23:01:50 +0200
Subject: [PATCH 0137/1143] systemd: Drop dependency on sysvtools

---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index a55d71a3c08c..f18cc6fa6130 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
-, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools
+, glib, kbd, libxslt, coreutils, libgcrypt
 , kexectools, libmicrohttpd, linuxHeaders
 , pythonPackages ? null, pythonSupport ? false
 }:
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
           --replace /sbin/swapoff ${utillinux}/sbin/swapoff \
           --replace /bin/echo ${coreutils}/bin/echo \
           --replace /bin/cat ${coreutils}/bin/cat \
-          --replace /sbin/sulogin ${sysvtools}/sbin/sulogin \
+          --replace /sbin/sulogin ${utillinux}/sbin/sulogin \
           --replace /sbin/kexec ${kexectools}/sbin/kexec
       done
 

From cf07760a2cfc92b347be9159661bd104a034c7cc Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 21 Apr 2015 04:21:41 +0200
Subject: [PATCH 0138/1143] geoip: add geoipWithDatabase for shell use

This installs (by default) geolite-legacy as the default database for geoiplookup
---
 pkgs/development/libraries/geoip/default.nix | 13 +++++++++++--
 pkgs/top-level/all-packages.nix              |  5 +++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 99a566cf1955..77ea6b6a0165 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -1,15 +1,24 @@
-{ stdenv, fetchurl }:
+# in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP
+# e.g. geolite-legacy
+{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? null }:
 
 let version = "1.6.2"; in
 
 stdenv.mkDerivation {
-  name = "geoip-${version}";
+  name = "${drvName}-${version}";
 
   src = fetchurl {
     url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz";
     sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
   };
 
+  postInstall = ''
+    DB=${toString geoipDatabase}
+    if [ -n "$DB" ]; then
+      ln -s $DB/share/GeoIP $out/share/GeoIP
+    fi
+  '';
+
   meta = {
     description = "Geolocation API";
     maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94b6d67908be..8fb89a81ce2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5767,6 +5767,11 @@ let
 
   geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
 
+  geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
+    drvName = "geoip-tools";
+    geoipDatabase = geolite-legacy;
+  };
+
   geoip = callPackage ../development/libraries/geoip { };
 
   geoipjava = callPackage ../development/libraries/java/geoipjava { };

From daadb2098adb1fb2ae2ba10355932b8844237547 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Apr 2015 00:48:48 -0700
Subject: [PATCH 0139/1143] nettle: 3.0 -> 3.1

---
 pkgs/development/libraries/nettle/default.nix | 4 ++--
 pkgs/development/libraries/nettle/generic.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index a6aae14e5c30..799433b12f93 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.0";
+  version = "3.1";
 
   src = fetchurl {
     url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    sha256 = "04yrpjz33vrj6j0zxc153b00f93i8hs41syr1ryp7sr64fyw0lcn";
+    sha256 = "1ly9kz5fgc8ilykz07crqwgjsfn4p2s6565gj1aq0w4fr179v1gn";
   };
 })
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 76629c80b967..6044f978402c 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (rec {
   patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
               ./cygwin.patch;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Cryptographic library";
 
     longDescription = ''
@@ -48,12 +48,12 @@ stdenv.mkDerivation (rec {
         I/O.
      '';
 
-     license = stdenv.lib.licenses.gpl2Plus;
+     license = licenses.gpl2Plus;
 
      homepage = http://www.lysator.liu.se/~nisse/nettle/;
 
-     maintainers = [ ];
-     platforms = stdenv.lib.platforms.all;
+     maintainers = with maintainers; [ wkennington ];
+     platforms = platforms.all;
   };
 }
 

From ffdd51cd12f01a32c94c2cace207be6333e1d958 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Apr 2015 22:43:41 -0700
Subject: [PATCH 0140/1143] p11-kit: 0.20.2 -> 0.23.1

---
 .../development/libraries/p11-kit/default.nix | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 0ecbc109d39d..d67e751ca542 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,22 +1,27 @@
 { stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }:
 
 stdenv.mkDerivation rec {
-  name = "p11-kit-0.20.2";
+  name = "p11-kit-0.23.1";
 
   src = fetchurl {
     url = "${meta.homepage}releases/${name}.tar.gz";
-    sha256 = "0z7gwmsj9hcmpk3ai2lwla59y3h9jc13xmqk5rijnv645zcm3v84";
+    sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5";
   };
 
-  postInstall = "rm -frv $out/share/gtk-doc";
-
-  configureFlags = "--without-libtasn1";
-
   buildInputs = [ pkgconfig libffi libtasn1 libiconv ];
 
-  meta = {
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--without-trust-paths"
+  ];
+
+  installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
+
+  meta = with stdenv.lib; {
     homepage = http://p11-glue.freedesktop.org/;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ urkud wkennington ];
+    license = license.mit;
   };
 }

From 23cef804cc7b62a9f8abc8788990d29a005d1e26 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Apr 2015 22:54:06 -0700
Subject: [PATCH 0141/1143] libidn: 1.29 -> 1.30

---
 pkgs/development/libraries/libidn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 5aea194e39d9..44aa546fe00d 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.29";
+  name = "libidn-1.30";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c";
+    sha256 = "0lxh5r1z8gsk4jxx3rv8aasjv8p53j4y04kvfn2w30a0syagrf9r";
   };
 
   doCheck = ! stdenv.isDarwin;

From 6b9d2efcb1915141cdddc816cc235ce8f98ae127 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 20 Apr 2015 17:50:39 -0700
Subject: [PATCH 0142/1143] unbound: 1.5.1 -> 1.5.3

---
 pkgs/tools/networking/unbound/default.nix     | 18 ++---
 .../linux-pre-3.15-unbound-1.5.1.patch        | 66 -------------------
 2 files changed, 6 insertions(+), 78 deletions(-)
 delete mode 100644 pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index e15947332681..e356d6d65376 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,31 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "1v00k4b6m9wk0533s2jpg4rv9lhplh7zdp6vx2yyrmrbzc4jgy0g";
+    sha256 = "1jly2apag4yg649w3flaq73wdrcfyxnhx5py9j73y7adxmswigbn";
   };
 
-  buildInputs = [openssl expat libevent];
-
-  patches = [
-    # This patch fixes unbound 1.5.1 on linux versions previous to 3.15 which
-    # do not implement IP_PMTUDISC_OMIT.
-    #
-    # It should be discarded when this support makes it into a released
-    # version.
-    ./linux-pre-3.15-unbound-1.5.1.patch
-  ];
+  buildInputs = [ openssl expat libevent ];
 
   configureFlags = [
     "--with-ssl=${openssl}"
     "--with-libexpat=${expat}"
     "--with-libevent=${libevent}"
     "--localstatedir=/var"
+    "--sysconfdir=/etc"
   ];
 
+  installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
+
   meta = {
     description = "Validating, recursive, and caching DNS resolver";
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch b/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch
deleted file mode 100644
index 619568078999..000000000000
--- a/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./services/listen_dnsport.c	2014-12-10 10:59:31.726514857 +0100
-+++ ./services/listen_dnsport.c	2014-12-10 11:08:45.009071300 +0100
-@@ -368,29 +368,47 @@
-  * (and also uses the interface mtu to determine the size of the packets).
-  * So there won't be any EMSGSIZE error.  Against DNS fragmentation attacks.
-  * FreeBSD already has same semantics without setting the option. */
--#    if defined(IP_PMTUDISC_OMIT)
--		int action = IP_PMTUDISC_OMIT;
--#    else
--		int action = IP_PMTUDISC_DONT;
--#    endif
-+		int omit_set = 0;
-+		int action;
-+#   if defined(IP_PMTUDISC_OMIT)
-+		action = IP_PMTUDISC_OMIT;
- 		if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, 
- 			&action, (socklen_t)sizeof(action)) < 0) {
--			log_err("setsockopt(..., IP_MTU_DISCOVER, "
--#    if defined(IP_PMTUDISC_OMIT)
--				"IP_PMTUDISC_OMIT"
-+
-+			if (errno != EINVAL) {
-+				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_OMIT...) failed: %s",
-+					strerror(errno));
-+
-+#    ifndef USE_WINSOCK
-+				close(s);
- #    else
--				"IP_PMTUDISC_DONT"
-+				closesocket(s);
- #    endif
--				"...) failed: %s",
--				strerror(errno));
-+				*noproto = 0;
-+				*inuse = 0;
-+				return -1;
-+			}
-+		}
-+		else
-+		{
-+		    omit_set = 1;
-+		}
-+#   endif
-+		if (omit_set == 0) {
-+   			action = IP_PMTUDISC_DONT;
-+			if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER,
-+				&action, (socklen_t)sizeof(action)) < 0) {
-+				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_DONT...) failed: %s",
-+					strerror(errno));
- #    ifndef USE_WINSOCK
--			close(s);
-+				close(s);
- #    else
--			closesocket(s);
-+				closesocket(s);
- #    endif
--			*noproto = 0;
--			*inuse = 0;
--			return -1;
-+				*noproto = 0;
-+				*inuse = 0;
-+				return -1;
-+			}
- 		}
- #  elif defined(IP_DONTFRAG)
- 		int off = 0;

From 610aad4cb8bd12e0f223d6f149b3835a882ec3ef Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 20 Apr 2015 21:12:16 -0700
Subject: [PATCH 0143/1143] trousers: Propagate openssl

---
 pkgs/tools/security/trousers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 70f11c39d6fc..471782ce8f32 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v";
   };
 
-  buildInputs = [ openssl ];
+  propagatedBuildInputs = [ openssl ];
 
   patches = [ ./allow-non-tss-config-file-owner.patch ];
 

From 775c412e573fa405da130b93363c8f8bc1d9e0b3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Apr 2015 00:49:15 -0700
Subject: [PATCH 0144/1143] gnutls: Add 3.4

---
 pkgs/development/libraries/gnutls/3.4.nix     | 12 +++++++
 pkgs/development/libraries/gnutls/generic.nix | 36 ++++++-------------
 .../gnutls/guile-gnulib-includes.patch        | 17 ---------
 .../libraries/gnutls/install-fix.patch        | 27 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 5 files changed, 56 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/development/libraries/gnutls/3.4.nix
 delete mode 100644 pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
 create mode 100644 pkgs/development/libraries/gnutls/install-fix.patch

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
new file mode 100644
index 000000000000..f768e03f1841
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "3.4.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
+    sha256 = "0mhym25ns3fhjd82p6g0aafhzbfkanryqbxvjy9mi25n2xpr1b95";
+  };
+
+  patches = [ ./install-fix.patch ];
+})
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 9c1c2e1b7d86..6f71623b50f1 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
-, guileBindings, guile, perl, gmp
+{ fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound, trousers
 
 # Version dependent args
-, version, src
+, version, src, patches ? []
 , ...}:
 
 assert guileBindings -> guile != null;
@@ -10,37 +10,23 @@ assert guileBindings -> guile != null;
 stdenv.mkDerivation rec {
   name = "gnutls-${version}";
 
-  inherit src;
+  inherit src patches;
 
-  patches =
-    # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
-    stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch
-    ;
-
-  # Note: GMP is a dependency of Nettle, whose public headers include
-  # GMP headers, hence the hack.
-  configurePhase = ''
-    ./configure --prefix="$out"                                 \
-      --disable-dependency-tracking --enable-fast-install       \
-      --without-p11-kit                                         \
-      --with-lzo --with-libtasn1-prefix="${libtasn1}"           \
-      --with-libnettle-prefix="${nettle}"                       \
-      CPPFLAGS="-I${gmp}/include"                               \
-      ${stdenv.lib.optionalString guileBindings
-          "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""}
-  '';
+  configureFlags = [
+    "--disable-dependency-tracking"
+    "--enable-fast-install"
+  ] ++ stdenv.lib.optional guileBindings
+    [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
 
   # Build of the Guile bindings is not parallel-safe.  See
   # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ zlib lzo lzip ]
+  buildInputs = [ gmp zlib lzo lzip nettle libtasn1 libidn p11_kit unbound trousers ]
     ++ stdenv.lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig ];
-
-  propagatedBuildInputs = [ nettle libtasn1 ];
+  nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
 
   # XXX: Gnulib's `test-select' fails on FreeBSD:
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
diff --git a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
deleted file mode 100644
index 1624d1f7ab9d..000000000000
--- a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 699ae6ef085c699dd5f3fb460b0f8a2408cc2860
-Author: Simon Josefsson <simon@josefsson.org>
-Date:   Thu Aug 9 15:24:11 2012 +0200
-
-    Add gnulib -I's to guile-snarf command.
-
---- gnutls-3.0.22/guile/src/Makefile.in	2012-08-04 20:52:39.000000000 +0200
-+++ gnutls-3.0.22/guile/src/Makefile.in	2012-08-11 21:55:20.000000000 +0200
-@@ -1564,7 +1564,7 @@ AM_CPPFLAGS = \
- # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be
- # included here, even though we'd really want `$(GUILE_CPPFLAGS)'.
- snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	       $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
-+	       $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS)
- 
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/pkgs/development/libraries/gnutls/install-fix.patch b/pkgs/development/libraries/gnutls/install-fix.patch
new file mode 100644
index 000000000000..48ed2da24c0c
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/install-fix.patch
@@ -0,0 +1,27 @@
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8e793d3..68de757 100644
+--- a/doc/manpages/Makefile.am
++++ b/doc/manpages/Makefile.am
+@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3
+@@ -1101,7 +1098,7 @@ compare-makefile:
+ 	@echo "******************************************************************************"
+ 	@echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
+ 	@echo "******************************************************************************"
+-	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
++	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
+ 	MANS=""; \
+ 	for i in $$FUNCS; do \
+ 		MANS="$$MANS\nAPIMANS += $$i.3"; \
+--
+libgit2 0.21.4
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eebe86edbf50..b1a3d772c354 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5950,10 +5950,16 @@ let
     nettle = nettle27;
   };
 
+  gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
+    guileBindings = config.gnutls.guile or false;
+  };
+
   gnutls32_with_guile = lowPrio (gnutls32.override { guileBindings = true; });
 
   gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; });
 
+  gnutls34_with_guile = lowPrio (gnutls34.override { guileBindings = true; });
+
   gpac = callPackage ../applications/video/gpac { };
 
   gpgme = callPackage ../development/libraries/gpgme {

From 35f1e07647fe26737ed6ed6f91043d9b237a7799 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 20 Apr 2015 21:39:09 -0700
Subject: [PATCH 0145/1143] gnutls: Make 34 the default

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1a3d772c354..4778a3865bb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5938,7 +5938,7 @@ let
 
   gnu-efi = callPackage ../development/libraries/gnu-efi { };
 
-  gnutls = gnutls33;
+  gnutls = gnutls34;
 
   gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
     guileBindings = config.gnutls.guile or false;

From dfa24f75850d72c6ac730d3c3a3e83bcc58020dc Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Tue, 21 Apr 2015 19:31:49 +0200
Subject: [PATCH 0146/1143] Fix hash of eclipse_sdk_442_hash 32bit

---
 pkgs/applications/editors/eclipse/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 8964d6c64800..0373791dccaa 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -298,7 +298,7 @@ in {
         };
       "i686-linux" = fetchurl {
           url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz;
-          sha256 = "9f4238ce9f887a1a57bbc6c6898e43357d14a6d74f59385327813c5e82aa735d";
+          sha256 = "1hacyjjwhhxi7r3xyhpqgjqpd5r0irw9bfkalz5s5l6shb0lq4i7";
         };
     };
   };

From b1b4092ad5d12ee17e934c35fdd84119fce060ad Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 15 Apr 2015 13:22:39 +0000
Subject: [PATCH 0147/1143] rustcMaster: Update from 2015-04-13 -> 2015-04-15

---
 pkgs/development/compilers/rustc/head.nix     |  6 +++---
 .../compilers/rustc/patches/head.patch        | 20 ++++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 99012ba6d94d..00e87f30e2cd 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,9 +2,9 @@
 callPackage ./makeRustcDerivation.nix {
   shortVersion = "1.0.0-dev";
   isRelease = false;
-  # src rev for master on 2015/04/13
-  srcRev = "0cf99c3e06e84d20d68da649c888d63c72f33971";
-  srcSha = "0brnzsbxmidjnmvi36sz582k3kw6wk813y2y837zpmyxg9fjah0l";
+  # src rev for master on 2015-04-15
+  srcRev = "a691f1eefea586f154700be6ee1b991158f82b7f";
+  srcSha = "1afypvxahhwhva9rssagm2q08wgidv6xcjrx85lqwzy6abyl1hsz";
   snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
   snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
   snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch
index 3cbf8717cd1d..cd2320e84dfe 100644
--- a/pkgs/development/compilers/rustc/patches/head.patch
+++ b/pkgs/development/compilers/rustc/patches/head.patch
@@ -15,7 +15,7 @@ index ca59b1c..65ee7bf 100755
  # do not fail if one of the above fails, as all we need is a working rustc!
  exit 0
 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index ed44bf8..2b84627 100644
+index 9f5751c..c98828f 100644
 --- a/src/librustc_back/archive.rs
 +++ b/src/librustc_back/archive.rs
 @@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
@@ -28,10 +28,10 @@ index ed44bf8..2b84627 100644
      let mut cmd = Command::new(ar);
  
 diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index 3087a8e..578448f 100644
+index ad77735..1764f71 100644
 --- a/src/librustc_trans/back/link.rs
 +++ b/src/librustc_trans/back/link.rs
-@@ -352,8 +352,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
+@@ -360,8 +360,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
  
  pub fn get_cc_prog(sess: &Session) -> String {
      match sess.opts.cg.linker {
@@ -41,3 +41,17 @@ index 3087a8e..578448f 100644
 +        None => "@ccPath@".to_string(),
      }
  }
+ 
+diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
+index 8b5e6f8..480ad79 100644
+--- a/src/test/run-pass/issue-20797.rs
++++ b/src/test/run-pass/issue-20797.rs
+@@ -97,7 +97,7 @@ impl<S: Strategy> Iterator for Subpaths<S> {
+ }
+ 
+ fn _foo() {
+-    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/home")).unwrap();
++    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/tmp")).unwrap();
+ }
+ 
+ fn main() {}

From c55c7e1c1e09dfa57e1a44d08c777f995493d2c9 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 20 Apr 2015 14:25:14 +0200
Subject: [PATCH 0148/1143] fetchgit: Add support for specifying branch name

This is useful when `leaveDotGit = true` and some other derivation
expects some branch name to exist.

Previously, `nix-prefetch-git` always created a branch with a
hard-coded name (`fetchgit`).
---
 pkgs/build-support/fetchgit/builder.sh       |  3 ++-
 pkgs/build-support/fetchgit/default.nix      |  3 ++-
 pkgs/build-support/fetchgit/nix-prefetch-git | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index 71374d1f2383..64eea4ae1000 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -9,6 +9,7 @@ header "exporting $url (rev $rev) into $out"
 $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
   ${leaveDotGit:+--leave-dotGit} \
   ${deepClone:+--deepClone} \
-  ${fetchSubmodules:+--fetch-submodules}
+  ${fetchSubmodules:+--fetch-submodules} \
+  ${branchName:+--branch-name "$branchName"}
 
 stopNest
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index bb89a8f55329..e5ad7200cecf 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -13,6 +13,7 @@
 in
 { url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? deepClone
 , fetchSubmodules ? true, deepClone ? false
+, branchName ? null
 , name ? urlToName url rev
 }:
 
@@ -51,7 +52,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = if sha256 == "" then md5 else sha256;
 
-  inherit url rev leaveDotGit fetchSubmodules deepClone;
+  inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
 
   GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt";
 
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 486fd3acafb7..b45ce81f8801 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -8,6 +8,7 @@ deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE
 leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT
 fetchSubmodules=
 builder=
+branchName=$NIX_PREFETCH_GIT_BRANCH_NAME
 
 if test -n "$deepClone"; then
     deepClone=true
@@ -31,6 +32,7 @@ for arg; do
             --url) argfun=set_url;;
             --rev) argfun=set_rev;;
             --hash) argfun=set_hashType;;
+            --branch-name) argfun=set_branchName;;
             --deepClone) deepClone=true;;
             --no-deepClone) deepClone=false;;
             --leave-dotGit) leaveDotGit=true;;
@@ -108,7 +110,7 @@ checkout_hash(){
     fi
 
     git fetch ${builder:+--progress} origin || return 1
-    git checkout -b fetchgit $hash || return 1
+    git checkout -b $branchName $hash || return 1
 }
 
 # Fetch only a branch/tag and checkout it.
@@ -131,7 +133,7 @@ checkout_ref(){
     if test -n "$ref"; then
         # --depth option is ignored on http repository.
         git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1
-        git checkout -b fetchgit FETCH_HEAD || return 1
+        git checkout -b $branchName FETCH_HEAD || return 1
     else
         return 1
     fi
@@ -251,7 +253,7 @@ clone_user_rev() {
             fi;;
     esac
 
-    local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)
+    local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/$branchName) | tail -n1)
     echo "git revision is $full_revision"
     echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2
     echo "Commit date is $(cd $dir && git show --no-patch --pretty=%ci $full_revision)"
@@ -268,6 +270,10 @@ clone_user_rev() {
     fi
 }
 
+if test -z "$branchName"; then
+    branchName=fetchgit
+fi
+
 if test -n "$builder"; then
     test -n "$out" -a -n "$url" -a -n "$rev" || usage
     mkdir $out

From 7d67efa3f23f7d5c494c90b79a63756a3917be6e Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@numergy.com>
Date: Fri, 10 Oct 2014 16:59:37 +0200
Subject: [PATCH 0149/1143] Add support for building cargo'ed Rust programs

---
 pkgs/build-support/fetchgit/nix-prefetch-git  |   2 +-
 pkgs/build-support/rust/default.nix           |  52 ++++++++
 pkgs/build-support/rust/fetch-builder.sh      |  17 +++
 pkgs/build-support/rust/fetch-cargo-deps      | 119 ++++++++++++++++++
 pkgs/build-support/rust/fetchcargo.nix        |  19 +++
 .../tools/build-managers/cargo/common.nix     |  12 +-
 .../tools/build-managers/cargo/default.nix    |  32 +++++
 .../tools/build-managers/cargo/setup-hook.sh  |   6 +
 .../tools/build-managers/cargo/snapshot.nix   |  11 +-
 pkgs/development/tools/rust/racer/default.nix |  12 +-
 pkgs/top-level/all-packages.nix               |  27 +++-
 pkgs/top-level/rust-packages.nix              |  19 +++
 12 files changed, 310 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/build-support/rust/default.nix
 create mode 100644 pkgs/build-support/rust/fetch-builder.sh
 create mode 100755 pkgs/build-support/rust/fetch-cargo-deps
 create mode 100644 pkgs/build-support/rust/fetchcargo.nix
 create mode 100644 pkgs/development/tools/build-managers/cargo/default.nix
 create mode 100644 pkgs/development/tools/build-managers/cargo/setup-hook.sh
 create mode 100644 pkgs/top-level/rust-packages.nix

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index b45ce81f8801..ceedf313f28e 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -224,7 +224,7 @@ make_deterministic_repo(){
         fi
     done
 
-    # Do a full repack. Must run single-threaded, or else we loose determinism.
+    # Do a full repack. Must run single-threaded, or else we lose determinism.
     git config pack.threads 1
     git repack -A -d -f
     rm -f .git/config
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
new file mode 100644
index 000000000000..a02163f73faf
--- /dev/null
+++ b/pkgs/build-support/rust/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, cacert, git, rustc, cargo, rustRegistry }:
+{ name, src, depsSha256, buildInputs ? [], ... } @ args:
+
+let
+  fetchDeps = import ./fetchcargo.nix {
+    inherit stdenv cacert git rustc cargo rustRegistry;
+  };
+
+  cargoDeps = fetchDeps {
+    inherit name src;
+    sha256 = depsSha256;
+  };
+
+in stdenv.mkDerivation (args // {
+  inherit cargoDeps rustRegistry;
+
+  buildInputs = [ git cargo rustc ] ++ buildInputs;
+
+  configurePhase = args.configurePhase or "true";
+
+  postUnpack = ''
+    echo "Using rust registry from $rustRegistry"
+    (
+        cd $sourceRoot
+        ln -s $rustRegistry ./cargo-rust-registry
+        cargo clean
+        cargo fetch
+    )
+  '' + (args.postUnpack or "");
+
+  # TODO: Probably not the best way to do this, but it should work for now
+  prePatch = ''
+    for dir in ../deps/registry/src/*/pkg-config-*; do
+        [ -d "$dir" ] || continue
+
+        substituteInPlace "$dir/src/lib.rs" \
+            --replace '"/usr"' '"/nix/store/"'
+    done
+  '' + (args.prePatch or "");
+
+  buildPhase = args.buildPhase or ''
+    echo "Running cargo build"
+    cargo build --release
+  '';
+
+  installPhase = args.installPhase or ''
+    mkdir -p $out/bin
+    for f in $(find target/release -maxdepth 1 -type f); do
+      cp $f $out/bin
+    done;
+  '';
+})
diff --git a/pkgs/build-support/rust/fetch-builder.sh b/pkgs/build-support/rust/fetch-builder.sh
new file mode 100644
index 000000000000..faa17e653289
--- /dev/null
+++ b/pkgs/build-support/rust/fetch-builder.sh
@@ -0,0 +1,17 @@
+source $stdenv/setup
+
+# cargo-fetch needs to write to Cargo.lock, even to do nothing. We
+# create a fake checkout with symlinks and and editable Cargo.lock.
+mkdir copy
+cd copy
+for f in $(ls $src); do
+  ln -s $src/"$f" .
+done
+rm Cargo.lock
+cp $src/Cargo.lock .
+chmod +w Cargo.lock
+
+$fetcher . $out
+
+cd ..
+rm -rf copy
diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
new file mode 100755
index 000000000000..d6579fe94bda
--- /dev/null
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -0,0 +1,119 @@
+#! /bin/sh -eu
+
+set -o pipefail
+
+src=$(realpath $1)
+out=$(realpath $2)
+
+echo "Fetching $src to $out"
+
+mkdir $out
+
+# Configure cargo to fetch from a local copy of the crates.io registry
+#
+# Unfortunately, `cargo fetch` will create an output directory named after a
+# hash of the registry index URL.
+#
+# This makes things difficult for us because we don't want our output to change
+# just because the path to the registry changed, otherwise we'd have to update
+# all deps' SHA256 hashes whenever we simply update the registry to a newer
+# commit.
+#
+# Also, since cargo doesn't seem to support relative URLs in the format
+# file://../path, we use a hack to make sure the registry index path/URL is
+# always the same: we'll create a symlink in the current working directory to
+# the real registry path, while pointing cargo to the following fixed absolute
+# path:
+#
+# file:///proc/self/cwd/symlink-name
+
+ln -s $rustRegistry $src/cargo-rust-registry
+
+# TODO: replace /proc/self/cwd hack with normal relative path. Probably
+# needs cargo fix.
+cat <<EOF > $out/config
+[registry]
+index = "file:///proc/self/cwd/cargo-rust-registry"
+EOF
+
+export CARGO_HOME=$out
+cd $src
+cargo fetch --verbose
+
+# TODO: check that Cargo.lock exists, and hasn't changed
+# TODO: this should be done by cargo itself
+
+# Make it deterministic
+
+# The registry index changes all the time, so it's not deterministic
+rm -rf $out/registry/index
+
+# Make git DBs deterministic
+# TODO: test with git submodules
+[[ ! -d $out/git/checkouts ]] || (cd $out/git/checkouts && for name in *; do
+    cd "$out/git/checkouts/$name"
+    revs=""
+    for branch in *; do
+        cd "$branch"
+        rev="$(git rev-parse HEAD)"
+        revs="$revs $rev"
+        cd ..
+    done
+
+    (
+        # The following code was adapted from nix-prefetch-git
+
+        cd "$out/git/db/$name"
+
+        export GIT_DIR=.
+
+        # Remove all remote branches
+        git branch -r | while read branch; do
+            git branch -rD "$branch" >&2
+        done
+
+        # Remove tags that don't point to any HEAD
+        git tag | while read tag; do
+            rev="$(git rev-parse $tag)"
+            if [[ $revs != *" $rev"* ]]; then
+                git tag -d "$tag" >&2
+            fi
+        done
+
+        # Remove branches that don't point to any HEAD
+        branchrefs=()
+        eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)"
+
+        for branchref in "${branchrefs[@]}"; do
+            echo "Examining $branchref"
+            rev="$(git rev-parse "$branchref")"
+            echo "Has rev $rev"
+            echo "List of revs: $revs"
+            if [[ $revs != *" $rev"* ]]; then
+                echo "Deleting $branchref"
+                git update-ref -d "$branchref" >&2
+            fi
+        done
+
+        echo "$revs" | while read rev; do
+            echo "git branch b_$rev $rev"
+            git branch b_$rev $rev
+        done
+
+        # Remove files that have timestamps or otherwise have non-deterministic
+        # properties.
+        rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config
+
+        # Do a full repack. Must run single-threaded, or else we lose determinism.
+        git config pack.threads 1
+        git repack -A -d -f
+        rm -f config
+
+        # Garbage collect unreferenced objects.
+        git gc --prune=all
+    )
+done)
+
+# Remove unneeded outputs
+[[ ! -d $out/registry/src ]] || rm -rf $out/registry/src
+[[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
new file mode 100644
index 000000000000..cd5d69e06d0d
--- /dev/null
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -0,0 +1,19 @@
+{ stdenv, cacert, git, rustc, cargo, rustRegistry }:
+{ name ? "cargo-deps", src, sha256 }:
+
+stdenv.mkDerivation {
+  name = "${name}-fetch";
+  buildInputs = [ rustc cargo git ];
+  builder = ./fetch-builder.sh;
+  fetcher = ./fetch-cargo-deps;
+  inherit src rustRegistry;
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = sha256;
+
+  SSL_CERT_FILE = "${cacert}/etc/ca-bundle.crt";
+
+  impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ];
+  preferLocalBuild = true;
+}
diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
index f0d8f92dfaa3..d993681b28f8 100644
--- a/pkgs/development/tools/build-managers/cargo/common.nix
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -3,6 +3,16 @@
 {
   inherit version;
 
+  name = "cargo-${version}";
+
+  postInstall = ''
+    rm "$out/lib/rustlib/components" \
+       "$out/lib/rustlib/install.log" \
+       "$out/lib/rustlib/rust-installer-version" \
+       "$out/lib/rustlib/uninstall.sh" \
+       "$out/lib/rustlib/manifest-cargo"
+  '';
+
   platform = if stdenv.system == "i686-linux"
     then "i686-unknown-linux-gnu"
     else if stdenv.system == "x86_64-linux"
@@ -20,5 +30,5 @@
     platforms = platforms.linux;
   };
 
-  name = "cargo-${version}";
+  setupHook = ./setup-hook.sh;
 }
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
new file mode 100644
index 000000000000..5f21ab1235d3
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
+, cmake, zlib }:
+
+with ((import ./common.nix) { inherit stdenv; version = "2015-04-14"; });
+
+with rustPlatform;
+
+buildRustPackage rec {
+  inherit name version meta setupHook;
+
+  src = fetchgit {
+    url = "https://github.com/rust-lang/cargo.git";
+    rev = "d49b44358ed800351647571144257d35ac0886cf";
+    sha256 = "1kaims28237mvp1qpw2cfgb3684jr54ivkdag0lw8iv9xap4i35y";
+    leaveDotGit = true;
+  };
+
+  depsSha256 = "1yi39asmnrya8w83jrjxym658cf1a5ffp8ym8502rqqvx30y0yx4";
+
+  buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
+
+  configurePhase = ''
+    ./configure --prefix=$out --local-cargo=${cargo}/bin/cargo
+  '';
+
+  buildPhase = "make";
+
+  installPhase = ''
+    make install
+    ${postInstall}
+  '';
+}
diff --git a/pkgs/development/tools/build-managers/cargo/setup-hook.sh b/pkgs/development/tools/build-managers/cargo/setup-hook.sh
new file mode 100644
index 000000000000..91a7f0f5bc8e
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/setup-hook.sh
@@ -0,0 +1,6 @@
+if [[ -n "$cargoDeps" ]]; then
+   echo "Using cargo deps from $cargoDeps"
+   cp -r $cargoDeps deps
+   chmod +w deps -R
+   export CARGO_HOME=$(realpath deps)
+fi
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index 64aeb0736c17..cc950af3f50d 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -19,11 +19,8 @@ let snapshotHash = if stdenv.system == "i686-linux"
     snapshotName = "cargo-nightly-${platform}.tar.gz";
 in
 
-
 stdenv.mkDerivation {
-  inherit name;
-  inherit version;
-  inherit meta;
+  inherit name version meta setupHook;
 
   src = fetchurl {
     url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
@@ -35,10 +32,8 @@ stdenv.mkDerivation {
   installPhase = ''
     mkdir -p "$out"
     ./install.sh "--prefix=$out"
-    rm "$out/lib/rustlib/components" \
-       "$out/lib/rustlib/install.log" \
-       "$out/lib/rustlib/rust-installer-version" \
-       "$out/lib/rustlib/uninstall.sh"
+
+    ${postInstall}
   '' + (if stdenv.isLinux then ''
     patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
              --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 341088dc0f2d..c22ee64b7423 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -1,6 +1,8 @@
-{stdenv, fetchgit, rustc, cargo, makeWrapper }:
+{stdenv, fetchgit, rustPlatform, makeWrapper }:
 
-stdenv.mkDerivation rec {
+with rustPlatform;
+
+buildRustPackage rec {
   #TODO add emacs support
   name = "racer-git-2015-04-12";
   src = fetchgit {
@@ -9,11 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn";
   };
 
-  buildInputs = [ rustc cargo makeWrapper ];
+  depsSha256 = "0x1rq012k04ci18w5fll56jn011f1yyprs38pb3r223bag94ivsy";
 
-  buildPhase = ''
-    CARGO_HOME="$NIX_BUILD_TOP/.cargo" cargo build --release
-  '';
+  buildInputs = [ makeWrapper ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a3c5228f871..8e820c4dde5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4337,6 +4337,24 @@ let
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
   rustc = rustcBeta;
 
+  rustPlatform = rustStable;
+
+  rustStable = recurseIntoAttrs (makeRustPlatform rustc cargo rustStable);
+  rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable);
+
+  # rust platform to build cargo itself (with cargoSnapshot)
+  rustCargoPlatform = makeRustPlatform rustcMaster cargoSnapshot rustCargoPlatform;
+
+  makeRustPlatform = rustc: cargo: self:
+    let
+      callPackage = newScope self;
+    in {
+      inherit rustc cargo;
+
+      rustRegistry = callPackage ./rust-packages.nix { };
+
+      buildRustPackage = callPackage ../build-support/rust { };
+    };
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {
@@ -4938,6 +4956,11 @@ let
 
   byacc = callPackage ../development/tools/parsing/byacc { };
 
+  cargo = callPackage ../development/tools/build-managers/cargo {
+    # cargo needs to be built with rustCargoPlatform, which uses cargoSnapshot
+    rustPlatform = rustCargoPlatform;
+  };
+
   cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
 
   casperjs = callPackage ../development/tools/casperjs { };
@@ -5263,8 +5286,8 @@ let
   premake = premake4;
 
   racerRust = callPackage ../development/tools/rust/racer {
-    rustc = rustcMaster;
-    cargo = cargoSnapshot;
+    # racerRust still uses unstable features from the standard library
+    rustPlatform = rustUnstable;
   };
 
   radare = callPackage ../development/tools/analysis/radare {
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
new file mode 100644
index 000000000000..2ad93feec0b3
--- /dev/null
+++ b/pkgs/top-level/rust-packages.nix
@@ -0,0 +1,19 @@
+# This file defines the source of Rust / cargo's crates registry
+#
+# buildRustPackage will automatically download dependencies from the registry
+# version that we define here. If you're having problems downloading / finding
+# a Rust library, try updating this to a newer commit.
+
+{ fetchgit }:
+
+fetchgit {
+  url = git://github.com/rust-lang/crates.io-index.git;
+
+  # 2015-04-20
+  rev = "c7112fed5f973e438bb600946016c5083e66b1c9";
+  sha256 = "0vyrz7d6zvh79hx5fg557g93r9qm40wx1g4hx7304lina4smk30h";
+
+  # cargo needs the 'master' branch to exist
+  leaveDotGit = true;
+  branchName = "master";
+}

From 5e8a4477390332e4315397a21a919d63af94595a Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Apr 2015 20:17:05 +0200
Subject: [PATCH 0150/1143] cargo: Build optimized binary

---
 pkgs/development/tools/build-managers/cargo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 5f21ab1235d3..dadc3a093dc7 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -20,7 +20,7 @@ buildRustPackage rec {
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 
   configurePhase = ''
-    ./configure --prefix=$out --local-cargo=${cargo}/bin/cargo
+    ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo
   '';
 
   buildPhase = "make";

From d648be67246e771126defb34989ecb9f88292c64 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Apr 2015 20:34:26 +0200
Subject: [PATCH 0151/1143] buildRustPackage: Add check phase and enable it by
 default

Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
---
 pkgs/build-support/rust/default.nix                     | 9 ++++++++-
 pkgs/development/tools/build-managers/cargo/default.nix | 4 ++++
 pkgs/development/tools/rust/racer/default.nix           | 4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index a02163f73faf..45d706b8c562 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -39,10 +39,17 @@ in stdenv.mkDerivation (args // {
   '' + (args.prePatch or "");
 
   buildPhase = args.buildPhase or ''
-    echo "Running cargo build"
+    echo "Running cargo build --release"
     cargo build --release
   '';
 
+  checkPhase = args.checkPhase or ''
+    echo "Running cargo test"
+    cargo test
+  '';
+
+  doCheck = args.doCheck or true;
+
   installPhase = args.installPhase or ''
     mkdir -p $out/bin
     for f in $(find target/release -maxdepth 1 -type f); do
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index dadc3a093dc7..894b77b96e32 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -25,6 +25,10 @@ buildRustPackage rec {
 
   buildPhase = "make";
 
+  # Disable check phase as there are lots of failures (some probably due to
+  # trying to access the network).
+  doCheck = false;
+
   installPhase = ''
     make install
     ${postInstall}
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index c22ee64b7423..baa29f356edc 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -15,6 +15,10 @@ buildRustPackage rec {
 
   buildInputs = [ makeWrapper ];
 
+  preCheck = ''
+    export RUST_SRC_PATH="${rustc.src}/src"
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     cp -p target/release/racer $out/bin/

From 42f44e9e58dc6a36ba01c88c1c6170c2861f62de Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Apr 2015 10:49:22 +0200
Subject: [PATCH 0152/1143] p11-kit: fix license

---
 pkgs/development/libraries/p11-kit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index d67e751ca542..eefed304134f 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://p11-glue.freedesktop.org/;
     platforms = platforms.all;
     maintainers = with maintainers; [ urkud wkennington ];
-    license = license.mit;
+    license = licenses.mit;
   };
 }

From cebe937b1e58625cc69e6c17463badcc3d353524 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Apr 2015 14:22:36 -0700
Subject: [PATCH 0153/1143] gnutls: Fix propagated inputs

---
 pkgs/development/libraries/gnutls/generic.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 6f71623b50f1..3c1db4d7fafe 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -23,8 +23,10 @@ stdenv.mkDerivation rec {
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ gmp zlib lzo lzip nettle libtasn1 libidn p11_kit unbound trousers ]
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit ]
     ++ stdenv.lib.optional guileBindings guile;
+  # The paths for these libraries are not specified in the .la and .pc files
+  propagatedBuildInputs = [ zlib gmp trousers unbound ];
 
   nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
 

From 02cda2133fc8bb6330853acdaf39f3e50747af62 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Apr 2015 15:37:51 -0700
Subject: [PATCH 0154/1143] opensmtpd: 5.4.4p1 -> 5.4.5p1

---
 pkgs/servers/mail/opensmtpd/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index d2c19a2a00b1..b796e12e9f4a 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, libasr, libevent, zlib, openssl, db, bison, pam }:
+{ stdenv, fetchurl, autoconf, automake, libtool, bison
+, libasr, libevent, zlib, openssl, db, pam
+}:
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "5.4.4p1";
+  version = "5.4.5p1";
 
-  buildInputs = [ libasr libevent zlib openssl db bison pam ];
+  nativeBuildInputs = [ autoconf automake libtool bison ];
+  buildInputs = [ libasr libevent zlib openssl db pam ];
 
   src = fetchurl {
     url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "1gcfdmpkk892wnnhwc2nb559bwl3k892w7saj4q8m6jfll53660i";
+    sha256 = "15sicrpqsgg72igdckkwpmbgrapcjbfjsdrvm0zl8z13kgp6r4ks";
   };
 
   configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
     "--with-mantype=doc"
     "--with-pam"
     "--without-bsd-auth"
@@ -21,6 +26,11 @@ stdenv.mkDerivation rec {
     "--with-ca-file=/etc/ssl/certs/ca-bundle.crt"
   ];
 
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
+  ];
+
   meta = {
     homepage = https://www.opensmtpd.org/;
     description = ''

From e42c17ee9709c8fddbaee7d79c0d13f330443582 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 23 Apr 2015 02:43:11 +0200
Subject: [PATCH 0155/1143] buildRustPackage: Fix Cargo.lock being ignored

It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.

Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.

To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.

Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.

To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
---
 pkgs/build-support/rust/default.nix               | 15 +++++++++++----
 pkgs/build-support/rust/fetch-cargo-deps          | 15 +++++++++++++--
 pkgs/build-support/rust/fetchcargo.nix            |  4 ++--
 .../tools/build-managers/cargo/default.nix        | 10 +++++++++-
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 45d706b8c562..6a5e4b86194f 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,5 +1,5 @@
 { stdenv, cacert, git, rustc, cargo, rustRegistry }:
-{ name, src, depsSha256, buildInputs ? [], ... } @ args:
+{ name, src, depsSha256, buildInputs ? [], cargoUpdateHook ? "", ... } @ args:
 
 let
   fetchDeps = import ./fetchcargo.nix {
@@ -7,12 +7,12 @@ let
   };
 
   cargoDeps = fetchDeps {
-    inherit name src;
+    inherit name src cargoUpdateHook;
     sha256 = depsSha256;
   };
 
 in stdenv.mkDerivation (args // {
-  inherit cargoDeps rustRegistry;
+  inherit cargoDeps rustRegistry cargoUpdateHook;
 
   buildInputs = [ git cargo rustc ] ++ buildInputs;
 
@@ -23,8 +23,15 @@ in stdenv.mkDerivation (args // {
     (
         cd $sourceRoot
         ln -s $rustRegistry ./cargo-rust-registry
-        cargo clean
+
+        substituteInPlace Cargo.lock \
+            --replace "registry+https://github.com/rust-lang/crates.io-index" \
+                      "registry+file:///proc/self/cwd/cargo-rust-registry"
+
+        eval "$cargoUpdateHook"
+
         cargo fetch
+        cargo clean
     )
   '' + (args.postUnpack or "");
 
diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index d6579fe94bda..f0a21e673cd9 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -1,6 +1,8 @@
-#! /bin/sh -eu
+#! /bin/sh
 
-set -o pipefail
+source $stdenv/setup
+
+set -euo pipefail
 
 src=$(realpath $1)
 out=$(realpath $2)
@@ -38,6 +40,15 @@ EOF
 
 export CARGO_HOME=$out
 cd $src
+
+set +u
+substituteInPlace Cargo.lock \
+    --replace "registry+https://github.com/rust-lang/crates.io-index" \
+              "registry+file:///proc/self/cwd/cargo-rust-registry"
+set -u
+
+eval "$cargoUpdateHook"
+
 cargo fetch --verbose
 
 # TODO: check that Cargo.lock exists, and hasn't changed
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index cd5d69e06d0d..7ebd02a485d7 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,12 +1,12 @@
 { stdenv, cacert, git, rustc, cargo, rustRegistry }:
-{ name ? "cargo-deps", src, sha256 }:
+{ name ? "cargo-deps", src, sha256, cargoUpdateHook ? "" }:
 
 stdenv.mkDerivation {
   name = "${name}-fetch";
   buildInputs = [ rustc cargo git ];
   builder = ./fetch-builder.sh;
   fetcher = ./fetch-cargo-deps;
-  inherit src rustRegistry;
+  inherit src rustRegistry cargoUpdateHook;
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 894b77b96e32..3235157b015f 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -15,7 +15,15 @@ buildRustPackage rec {
     leaveDotGit = true;
   };
 
-  depsSha256 = "1yi39asmnrya8w83jrjxym658cf1a5ffp8ym8502rqqvx30y0yx4";
+  cargoUpdateHook = ''
+    # Updating because version 2.1.4 has an invalid Cargo.toml
+    cargo update -p libressl-pnacl-sys --precise 2.1.5
+
+    # Updating because version 0.1.3 has a build failure with recent rustc
+    cargo update -p threadpool --precise 0.1.4
+  '';
+
+  depsSha256 = "12d2v4b85qabagrypvqiam2iybd4jwcg0sky0gqarfhjh2dhwfm6";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 

From 0cde1dc52425f12be6f7311737abe98813e43c29 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 23 Apr 2015 15:14:34 +0200
Subject: [PATCH 0156/1143] cargo: Remove setupHook

Instead, move that code into buildRustPackage.

The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
---
 pkgs/build-support/rust/default.nix                       | 6 ++++++
 pkgs/development/tools/build-managers/cargo/common.nix    | 2 --
 pkgs/development/tools/build-managers/cargo/default.nix   | 2 +-
 pkgs/development/tools/build-managers/cargo/setup-hook.sh | 6 ------
 pkgs/development/tools/build-managers/cargo/snapshot.nix  | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/cargo/setup-hook.sh

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 6a5e4b86194f..37175114d81e 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -19,6 +19,12 @@ in stdenv.mkDerivation (args // {
   configurePhase = args.configurePhase or "true";
 
   postUnpack = ''
+    echo "Using cargo deps from $cargoDeps"
+    cp -r $cargoDeps deps
+    chmod +w deps -R
+
+    export CARGO_HOME=$(realpath deps)
+
     echo "Using rust registry from $rustRegistry"
     (
         cd $sourceRoot
diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
index d993681b28f8..84158e65a4d8 100644
--- a/pkgs/development/tools/build-managers/cargo/common.nix
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -29,6 +29,4 @@
     license = [ licenses.mit licenses.asl20 ];
     platforms = platforms.linux;
   };
-
-  setupHook = ./setup-hook.sh;
 }
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 3235157b015f..0e70cb9232b1 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -6,7 +6,7 @@ with ((import ./common.nix) { inherit stdenv; version = "2015-04-14"; });
 with rustPlatform;
 
 buildRustPackage rec {
-  inherit name version meta setupHook;
+  inherit name version meta;
 
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo.git";
diff --git a/pkgs/development/tools/build-managers/cargo/setup-hook.sh b/pkgs/development/tools/build-managers/cargo/setup-hook.sh
deleted file mode 100644
index 91a7f0f5bc8e..000000000000
--- a/pkgs/development/tools/build-managers/cargo/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ -n "$cargoDeps" ]]; then
-   echo "Using cargo deps from $cargoDeps"
-   cp -r $cargoDeps deps
-   chmod +w deps -R
-   export CARGO_HOME=$(realpath deps)
-fi
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index cc950af3f50d..a76fb4601e8b 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -20,7 +20,7 @@ let snapshotHash = if stdenv.system == "i686-linux"
 in
 
 stdenv.mkDerivation {
-  inherit name version meta setupHook;
+  inherit name version meta;
 
   src = fetchurl {
     url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";

From b993c2113c8191ca9b454abfc79d02196b6a2bd0 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 23 Apr 2015 16:37:52 +0200
Subject: [PATCH 0157/1143] buildRustPackage: Add a mechanism to patch registry
 deps

... in a more generic way.

With this commit, if you need to patch a registry package to make it
work with Nix, you just need to add a script to patch-registry-deps
in the same style as the `pkg-config` script.
---
 pkgs/build-support/rust/default.nix           | 20 +++++++++++++------
 .../rust/patch-registry-deps/pkg-config       |  8 ++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/build-support/rust/patch-registry-deps/pkg-config

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 37175114d81e..2a890a0d232b 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -14,6 +14,8 @@ let
 in stdenv.mkDerivation (args // {
   inherit cargoDeps rustRegistry cargoUpdateHook;
 
+  patchRegistryDeps = ./patch-registry-deps;
+
   buildInputs = [ git cargo rustc ] ++ buildInputs;
 
   configurePhase = args.configurePhase or "true";
@@ -41,14 +43,20 @@ in stdenv.mkDerivation (args // {
     )
   '' + (args.postUnpack or "");
 
-  # TODO: Probably not the best way to do this, but it should work for now
   prePatch = ''
-    for dir in ../deps/registry/src/*/pkg-config-*; do
-        [ -d "$dir" ] || continue
+    # Patch registry dependencies, using the scripts in $patchRegistryDeps
+    (
+        cd ../deps/registry/src/*
 
-        substituteInPlace "$dir/src/lib.rs" \
-            --replace '"/usr"' '"/nix/store/"'
-    done
+        set -euo pipefail
+
+        for script in $patchRegistryDeps/*; do
+          # Run in a subshell so that directory changes and shell options don't
+          # affect any following commands
+
+          ( . $script)
+        done
+    )
   '' + (args.prePatch or "");
 
   buildPhase = args.buildPhase or ''
diff --git a/pkgs/build-support/rust/patch-registry-deps/pkg-config b/pkgs/build-support/rust/patch-registry-deps/pkg-config
new file mode 100644
index 000000000000..2acf489851e9
--- /dev/null
+++ b/pkgs/build-support/rust/patch-registry-deps/pkg-config
@@ -0,0 +1,8 @@
+for dir in pkg-config-*; do
+    [ -d "$dir" ] || continue
+
+    echo "Patching pkg-config registry dep"
+
+    substituteInPlace "$dir/src/lib.rs" \
+        --replace '"/usr"' '"/nix/store/"'
+done

From bafde0fb6f43f82061dbd69857a9c7a9c49d1d27 Mon Sep 17 00:00:00 2001
From: Ellis whitehead <ellis@ellisw.net>
Date: Thu, 23 Apr 2015 17:52:22 +0200
Subject: [PATCH 0158/1143] patch Qt 5.4.1 to use XDG_CONFIG_DIRS in QSettings

---
 .../qt-5/5.4/0013-xdg_config_dirs.patch       | 42 +++++++++++++++++++
 .../development/libraries/qt-5/5.4/qtbase.nix |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch

diff --git a/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch b/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch
new file mode 100644
index 000000000000..63066658f0f6
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch
@@ -0,0 +1,42 @@
+diff --git a/qsettings.cpp b/qsettings.cpp
+index 35b3ed4..210dfeb 100644
+--- a/qsettings.cpp
++++ b/qtbase/src/corelib/io/qsettings.cpp
+@@ -1174,6 +1174,24 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
+     if (!application.isEmpty())
+         confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
+     confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
++
++#if !defined(Q_OS_WIN)
++    // Add directories specified in $XDG_CONFIG_DIRS
++    const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
++    if (!pathEnv.isEmpty()) {
++        const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
++        if (!pathEntries.isEmpty()) {
++            int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
++            for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
++                const QString& path = pathEntries.at(k);
++                if (!application.isEmpty())
++                    confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
++                confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
++            }
++        }
++    }
++#endif
++
+ #else
+     QString confName = getPath(format, QSettings::UserScope) + org;
+     if (!application.isEmpty())
+diff --git a/qsettings_p.h b/qsettings_p.h
+index a28b583..b2a240d 100644
+--- a/qsettings_p.h
++++ b/qtbase/src/corelib/io/qsettings_p.h
+@@ -244,7 +244,7 @@ public:
+         F_Organization = 0x1,
+         F_User = 0x0,
+         F_System = 0x2,
+-        NumConfFiles = 4
++        NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
+ #else
+         SandboxConfFile = 0,
+         NumConfFiles = 1
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index bc342f605bcd..746889f279d7 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation {
       (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; })
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
+      ./0013-xdg_config_dirs.patch
     ];
 
   preConfigure = ''

From d6093505cc59c7cf5540afd044dea9ab8d5c1e9b Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 23 Apr 2015 20:15:47 +0200
Subject: [PATCH 0159/1143] buildRustPackage: Get rid of /proc/self/cwd hack

This makes buildRustPackage portable to non-Linux platforms.

Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
---
 pkgs/build-support/rust/default.nix           |  37 +++--
 pkgs/build-support/rust/fetch-cargo-deps      | 127 ++++++++++++------
 .../tools/build-managers/cargo/default.nix    |   2 +-
 pkgs/development/tools/rust/racer/default.nix |   2 +-
 4 files changed, 114 insertions(+), 54 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 2a890a0d232b..ddf2fce3cae5 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -11,8 +11,16 @@ let
     sha256 = depsSha256;
   };
 
+  # The following is the directory name cargo creates when the registry index
+  # URL is file:///dev/null
+  #
+  # It's OK to use /dev/null as the URL because by the time we do this, cargo
+  # won't attempt to update the registry anymore, so the URL is more or less
+  # irrelevant
+  registryIndexDirName = "-ba82b75dd6681d6f";
+
 in stdenv.mkDerivation (args // {
-  inherit cargoDeps rustRegistry cargoUpdateHook;
+  inherit cargoDeps rustRegistry;
 
   patchRegistryDeps = ./patch-registry-deps;
 
@@ -22,21 +30,26 @@ in stdenv.mkDerivation (args // {
 
   postUnpack = ''
     echo "Using cargo deps from $cargoDeps"
-    cp -r $cargoDeps deps
+
+    cp -r "$cargoDeps" deps
     chmod +w deps -R
 
-    export CARGO_HOME=$(realpath deps)
+    cat <<EOF > deps/config
+    [registry]
+    index = "file:///dev/null"
+    EOF
 
     echo "Using rust registry from $rustRegistry"
+
+    ln -s "$rustRegistry" "deps/registry/index/${registryIndexDirName}"
+
+    export CARGO_HOME="$(realpath deps)"
+
+    # Retrieved the Cargo.lock file which we saved during the fetch
+    mv deps/Cargo.lock $sourceRoot/
+
     (
         cd $sourceRoot
-        ln -s $rustRegistry ./cargo-rust-registry
-
-        substituteInPlace Cargo.lock \
-            --replace "registry+https://github.com/rust-lang/crates.io-index" \
-                      "registry+file:///proc/self/cwd/cargo-rust-registry"
-
-        eval "$cargoUpdateHook"
 
         cargo fetch
         cargo clean
@@ -46,10 +59,10 @@ in stdenv.mkDerivation (args // {
   prePatch = ''
     # Patch registry dependencies, using the scripts in $patchRegistryDeps
     (
-        cd ../deps/registry/src/*
-
         set -euo pipefail
 
+        cd ../deps/registry/src/*
+
         for script in $patchRegistryDeps/*; do
           # Run in a subshell so that directory changes and shell options don't
           # affect any following commands
diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index f0a21e673cd9..c7799fb1b1f6 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -12,52 +12,108 @@ echo "Fetching $src to $out"
 mkdir $out
 
 # Configure cargo to fetch from a local copy of the crates.io registry
-#
-# Unfortunately, `cargo fetch` will create an output directory named after a
-# hash of the registry index URL.
-#
-# This makes things difficult for us because we don't want our output to change
-# just because the path to the registry changed, otherwise we'd have to update
-# all deps' SHA256 hashes whenever we simply update the registry to a newer
-# commit.
-#
-# Also, since cargo doesn't seem to support relative URLs in the format
-# file://../path, we use a hack to make sure the registry index path/URL is
-# always the same: we'll create a symlink in the current working directory to
-# the real registry path, while pointing cargo to the following fixed absolute
-# path:
-#
-# file:///proc/self/cwd/symlink-name
 
-ln -s $rustRegistry $src/cargo-rust-registry
+echo "Using rust registry from $rustRegistry"
 
-# TODO: replace /proc/self/cwd hack with normal relative path. Probably
-# needs cargo fix.
 cat <<EOF > $out/config
 [registry]
-index = "file:///proc/self/cwd/cargo-rust-registry"
+index = "file://$rustRegistry"
 EOF
 
 export CARGO_HOME=$out
 cd $src
 
+if [[ ! -f Cargo.lock ]]; then
+    echo "ERROR: The Cargo.lock file doesn't exist"
+    echo
+    echo "Cargo.lock is needed to make sure that depsSha256 doesn't change"
+    echo "when the registry is updated."
+
+    exit 1
+fi
+
+# We need to do the following string replacement so that 'cargo fetch'
+# doesn't ignore the versions specified in Cargo.lock
 set +u
 substituteInPlace Cargo.lock \
     --replace "registry+https://github.com/rust-lang/crates.io-index" \
-              "registry+file:///proc/self/cwd/cargo-rust-registry"
+              "registry+file://$rustRegistry"
 set -u
 
+# Do any possible 'cargo update -p <pkgName> --precise <version>' ad-hoc updates
 eval "$cargoUpdateHook"
 
+# Do the fetch
 cargo fetch --verbose
 
-# TODO: check that Cargo.lock exists, and hasn't changed
-# TODO: this should be done by cargo itself
+# Now that we have fetched everything, let's make the output deterministic
 
-# Make it deterministic
+# Cargo uses the following directory structure for fetched data, where
+# $indexHash is a hash of the registry index URL:
+#
+#
+# /config:
+#
+#     Cargo config file. We'll delete this because it's not deterministic,
+#     and instead recreate it just before running 'cargo build'.
+#
+# /registry/cache/$indexHash/:
+#
+#     This is where tarballs of registry package dependencies are kept
+#     We'll need to keep this, but make sure $indexHash is a fixed name.
+#
+# /registry/index/$indexHash/:
+#
+#     A copy of the registry index is kept here. We can delete this, and
+#     instead, just before running 'cargo build', we'll symlink this
+#     directory to our static copy of the registry in the Nix store.
+#
+# /registry/src/$indexHash/{pkgName-pkgVersion}/:
+#
+#     Here cargo keeps extracted sources of the cached tarballs.
+#     We'll just delete this because cargo will re-populate them from the
+#     tarballs.
+#
+# /git/db/{domain-hash}/:
+#
+#     Here cargo keeps the `.git` directories of git dependencies.
+#     We'll need to keep these, but make them deterministic.
+#
+# /git/checkouts/{domain-hash}/{branchName}/:
+#
+#     Here cargo keeps checked-out sources of the git dependencies.
+#     We can delete this, because cargo will re-populate them from the above
+#     `.git` directories.
+#
+# Let's start
+
+# Remove cargo config file, which points to the ever-changing registry
+rm $out/config
+
+# Save the Cargo.lock file into the output, so that we don't have to do another
+# 'cargo update' during the build (which would try to access the network) for
+# any ad-hoc package updates (through $cargoUpdateHook).
+#
+# We need to replace the rustRegistry URL with something deterministic.
+# Since the URL won't actually be accessed anymore, it's fine to use /dev/null.
+
+set +u
+substituteInPlace Cargo.lock \
+    --replace "registry+file://$rustRegistry" \
+              "registry+file:///dev/null"
+set -u
+mv Cargo.lock $out/
+
+# The following is the $indexHash cargo uses for the registry index when
+# its URL is file:///dev/null, which is the registry index URL we use to make
+# sure our output is deterministic.
+
+registryIndexDirName="-ba82b75dd6681d6f"
+mv $out/registry/cache/* $out/registry/cache/$registryIndexDirName
 
 # The registry index changes all the time, so it's not deterministic
-rm -rf $out/registry/index
+# We'll symlink it before running 'cargo build'
+rm -rf $out/registry/index/*
 
 # Make git DBs deterministic
 # TODO: test with git submodules
@@ -83,31 +139,22 @@ rm -rf $out/registry/index
             git branch -rD "$branch" >&2
         done
 
-        # Remove tags that don't point to any HEAD
+        # Remove all tags
         git tag | while read tag; do
-            rev="$(git rev-parse $tag)"
-            if [[ $revs != *" $rev"* ]]; then
-                git tag -d "$tag" >&2
-            fi
+            git tag -d "$tag" >&2
         done
 
-        # Remove branches that don't point to any HEAD
+        # Remove all local branches
         branchrefs=()
         eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)"
 
         for branchref in "${branchrefs[@]}"; do
-            echo "Examining $branchref"
-            rev="$(git rev-parse "$branchref")"
-            echo "Has rev $rev"
-            echo "List of revs: $revs"
-            if [[ $revs != *" $rev"* ]]; then
-                echo "Deleting $branchref"
-                git update-ref -d "$branchref" >&2
-            fi
+            git update-ref -d "$branchref" >&2
         done
 
+        # Create ad-hoc branches for the revs we need
         echo "$revs" | while read rev; do
-            echo "git branch b_$rev $rev"
+            echo "Creating git branch b_$rev $rev"
             git branch b_$rev $rev
         done
 
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 0e70cb9232b1..05e07b4afa2b 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -23,7 +23,7 @@ buildRustPackage rec {
     cargo update -p threadpool --precise 0.1.4
   '';
 
-  depsSha256 = "12d2v4b85qabagrypvqiam2iybd4jwcg0sky0gqarfhjh2dhwfm6";
+  depsSha256 = "1gj3mnjj17h5p0r1jcm3m3pm3p3l1rbfdz3l7v1cykng78dsabnq";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index baa29f356edc..4887736a8591 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -11,7 +11,7 @@ buildRustPackage rec {
     sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn";
   };
 
-  depsSha256 = "0x1rq012k04ci18w5fll56jn011f1yyprs38pb3r223bag94ivsy";
+  depsSha256 = "13rnxr5inrfnmg5mg2vap17fd2jp32g2a70pfi1sshi6vjr8kpap";
 
   buildInputs = [ makeWrapper ];
 

From 79c15cdec27688eb0c01195746a49bf7f355c84b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 23 Apr 2015 14:59:41 -0700
Subject: [PATCH 0160/1143] samba: Pin to gnutls33 for now

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4778a3865bb1..cb0e614d7e50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8565,6 +8565,7 @@ let
     pythonPackages = python2Packages;
     kerberos = heimdal;
     libgcrypt = libgcrypt_1_6;
+    gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;
     libaio = if stdenv.isDarwin then null else libaio;

From 916b20ae3695682d6af8b1bfdc8c24936815f248 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 23 Apr 2015 20:42:06 +0200
Subject: [PATCH 0161/1143] rustRegistry: Fix "Target OID..." cargo failure.

For some reason, `cargo` doesn't like git repositories downloaded with
`fetchgit`. It will sometimes fail with the error message "Target OID for
the reference doesn't exist on the repository".

To workaround this, we'll just have to create a new git repo from
scratch...
---
 pkgs/top-level/rust-packages.nix | 49 +++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 2ad93feec0b3..2f2465a2b179 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -4,16 +4,45 @@
 # version that we define here. If you're having problems downloading / finding
 # a Rust library, try updating this to a newer commit.
 
-{ fetchgit }:
+{ runCommand, fetchgit, git }:
 
-fetchgit {
-  url = git://github.com/rust-lang/crates.io-index.git;
+let
+  version = "2015-04-20";
 
-  # 2015-04-20
-  rev = "c7112fed5f973e438bb600946016c5083e66b1c9";
-  sha256 = "0vyrz7d6zvh79hx5fg557g93r9qm40wx1g4hx7304lina4smk30h";
+  src = fetchgit {
+      url = git://github.com/rust-lang/crates.io-index.git;
 
-  # cargo needs the 'master' branch to exist
-  leaveDotGit = true;
-  branchName = "master";
-}
+      rev = "c7112fed5f973e438bb600946016c5083e66b1c9";
+      sha256 = "0vyrz7d6zvh79hx5fg557g93r9qm40wx1g4hx7304lina4smk30h";
+
+      # cargo needs the 'master' branch to exist
+      leaveDotGit = true;
+      branchName = "master";
+  };
+
+in
+
+runCommand "rustRegistry-${version}-${builtins.substring 0 7 src.rev}" {} ''
+  # For some reason, cargo doesn't like fetchgit's git repositories, not even
+  # if we clone them (tested with registry rev
+  # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message:
+  #
+  # "Target OID for the reference doesn't exist on the repository"
+  #
+  # So we'll just have to create a new git repository from scratch with the
+  # contents downloaded with fetchgit...
+
+  mkdir -p $out
+
+  cp -r ${src}/* $out/
+
+  cd $out
+
+  git="${git}/bin/git"
+
+  $git init
+  $git config --local user.email "example@example.com"
+  $git config --local user.name "example"
+  $git add .
+  $git commit -m 'Rust registry commit'
+''

From a5c0a06ee59f6a51594c9138a5f467f69b465b9c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 24 Apr 2015 01:01:33 +0200
Subject: [PATCH 0162/1143] rustRegistry: Update

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 2f2465a2b179..8cbc4a73d28f 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,13 +7,13 @@
 { runCommand, fetchgit, git }:
 
 let
-  version = "2015-04-20";
+  version = "2015-04-23";
 
   src = fetchgit {
       url = git://github.com/rust-lang/crates.io-index.git;
 
-      rev = "c7112fed5f973e438bb600946016c5083e66b1c9";
-      sha256 = "0vyrz7d6zvh79hx5fg557g93r9qm40wx1g4hx7304lina4smk30h";
+      rev = "965b634156cc5c6f10c7a458392bfd6f27436e7e";
+      sha256 = "1hbl3g1d6yz6x2fm76dxmcn8rdrmri4l9n6flvv0pkn4hsid7zw1";
 
       # cargo needs the 'master' branch to exist
       leaveDotGit = true;

From 2275f6626c93efcf40bfb4544547a5af773b669d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Apr 2015 10:58:13 +0200
Subject: [PATCH 0163/1143] webkitgtk-2.4: patch to fix build, rename file

Extracted from #7357 to avoid merge problems.
---
 .../webkitgtk/{2.4.6.nix => 2.4.nix}          |   2 +-
 .../webkitgtk-2.4-gmutexlocker.patch          | 276 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 278 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/webkitgtk/{2.4.6.nix => 2.4.nix} (94%)
 create mode 100644 pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch

diff --git a/pkgs/development/libraries/webkitgtk/2.4.6.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
similarity index 94%
rename from pkgs/development/libraries/webkitgtk/2.4.6.nix
rename to pkgs/development/libraries/webkitgtk/2.4.nix
index b4645f508180..c2ec686deae8 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.6.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg";
   };
 
-  patches = [ ./webcore-svg-libxml-cflags.patch ];
+  patches = [ ./webcore-svg-libxml-cflags.patch ./webkitgtk-2.4-gmutexlocker.patch ];
 
   CC = "cc";
 
diff --git a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
new file mode 100644
index 000000000000..1acfb87bfbcb
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
@@ -0,0 +1,276 @@
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig	2015-04-13 18:39:20.763864030 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2015-04-13 18:43:29.756164227 +0200
+@@ -118,7 +118,7 @@
+     WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
+     WebKitVideoSinkPrivate* priv = sink->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+     GstBuffer* buffer = priv->buffer;
+     priv->buffer = 0;
+     priv->timeoutId = 0;
+@@ -140,7 +140,7 @@
+     WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
+     WebKitVideoSinkPrivate* priv = sink->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+ 
+     if (priv->unlocked)
+         return GST_FLOW_OK;
+@@ -279,7 +279,7 @@
+ 
+ static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
+ {
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+ 
+     if (priv->buffer) {
+         gst_buffer_unref(priv->buffer);
+@@ -305,7 +305,7 @@
+     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+ 
+     {
+-        GMutexLocker lock(priv->bufferMutex);
++        WebCore::GMutexLocker lock(priv->bufferMutex);
+         priv->unlocked = false;
+     }
+ 
+@@ -330,7 +330,7 @@
+ {
+     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+     priv->unlocked = false;
+     return TRUE;
+ }
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig	2015-04-13 18:36:44.258046776 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2015-04-13 18:44:10.004374397 +0200
+@@ -316,7 +316,7 @@
+ #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+ PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
+ {
+-    GMutexLocker lock(m_bufferMutex);
++    WebCore::GMutexLocker lock(m_bufferMutex);
+     if (!m_buffer)
+         return nullptr;
+ 
+@@ -366,7 +366,7 @@
+     g_return_if_fail(GST_IS_BUFFER(buffer));
+ 
+     {
+-        GMutexLocker lock(m_bufferMutex);
++        WebCore::GMutexLocker lock(m_bufferMutex);
+         gst_buffer_replace(&m_buffer, buffer);
+     }
+ 
+@@ -398,7 +398,7 @@
+     if (!m_player->visible())
+         return;
+ 
+-    GMutexLocker lock(m_bufferMutex);
++    WebCore::GMutexLocker lock(m_bufferMutex);
+     if (!m_buffer)
+         return;
+ 
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig	2015-04-13 18:37:20.083233858 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-04-13 18:44:37.753519299 +0200
+@@ -346,7 +346,7 @@
+ 
+     switch (propID) {
+     case PROP_IRADIO_MODE: {
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         priv->iradioMode = g_value_get_boolean(value);
+         break;
+     }
+@@ -364,7 +364,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     switch (propID) {
+     case PROP_IRADIO_MODE:
+         g_value_set_boolean(value, priv->iradioMode);
+@@ -417,7 +417,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     bool seeking = priv->seekID;
+ 
+@@ -476,7 +476,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     priv->startID = 0;
+     priv->corsAccessCheck = CORSNoCheck;
+@@ -573,7 +573,7 @@
+         return ret;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     switch (transition) {
+     case GST_STATE_CHANGE_READY_TO_PAUSED:
+         GST_DEBUG_OBJECT(src, "READY->PAUSED");
+@@ -604,7 +604,7 @@
+         gst_query_parse_duration(query, &format, NULL);
+ 
+         GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
+             gst_query_set_duration(query, format, src->priv->size);
+             result = TRUE;
+@@ -612,7 +612,7 @@
+         break;
+     }
+     case GST_QUERY_URI: {
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         gst_query_set_uri(query, src->priv->uri);
+         result = TRUE;
+         break;
+@@ -653,7 +653,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
+     gchar* ret;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     ret = g_strdup(src->priv->uri);
+     return ret;
+ }
+@@ -668,7 +668,7 @@
+         return FALSE;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     g_free(priv->uri);
+     priv->uri = 0;
+@@ -704,7 +704,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->needDataID)
+         return FALSE;
+@@ -725,7 +725,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Need more data: %u", length);
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (priv->needDataID || !priv->paused) {
+         return;
+     }
+@@ -739,7 +739,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->enoughDataID)
+         return FALSE;
+@@ -760,7 +760,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Have enough data");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (priv->enoughDataID || priv->paused) {
+         return;
+     }
+@@ -774,7 +774,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->seekID)
+         return FALSE;
+@@ -792,7 +792,7 @@
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+     GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (offset == priv->offset && priv->requestedOffset == priv->offset)
+         return TRUE;
+ 
+@@ -811,7 +811,7 @@
+ void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
+ {
+     ASSERT(player);
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     src->priv->player = player;
+ }
+ 
+@@ -841,7 +841,7 @@
+ 
+     mapGstBuffer(buffer);
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     priv->buffer = adoptGRef(buffer);
+     locker.unlock();
+ 
+@@ -867,7 +867,7 @@
+         return;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     priv->corsAccessCheck = corsAccessCheck;
+ 
+@@ -966,7 +966,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
+ 
+@@ -1035,7 +1035,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Have EOS");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (!priv->seekID) {
+         locker.unlock();
+         gst_app_src_end_of_stream(priv->appsrc);
+@@ -1194,7 +1194,7 @@
+ 
+     GST_ERROR_OBJECT(src, "Request was blocked");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     uri.reset(g_strdup(src->priv->uri));
+     locker.unlock();
+ 
+@@ -1208,7 +1208,7 @@
+ 
+     GST_ERROR_OBJECT(src, "Cannot show URL");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     uri.reset(g_strdup(src->priv->uri));
+     locker.unlock();
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb0e614d7e50..44ef8c823481 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7747,7 +7747,7 @@ let
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
-  webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.6.nix {
+  webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };

From 2c0db9ffbe9738212ff0efd65665416815575e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Apr 2015 09:59:52 +0200
Subject: [PATCH 0164/1143] webkitgtk-2.4: security update, fix and parallel
 build

NEWS claims security fixes:
CVE-2014-1344, CVE-2014-1384, CVE-2014-1385, CVE-2014-1386,
CVE-2014-1387, CVE-2014-1388, CVE-2014-1389, CVE-2014-1390.
Otherwise NEWS seems safe, basically only containing bugfixes.

Parallel building should work now, thanks to make update :-)
tested with 8 threads, once webkitgtk24x and webkitgtk2.
---
 pkgs/development/libraries/webkitgtk/2.4.nix  | 18 ++++--
 .../libraries/webkitgtk/bug140241.patch       | 59 +++++++++++++++++++
 2 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/webkitgtk/bug140241.patch

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index c2ec686deae8..5c868838c998 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
+{ stdenv, fetchurl, autoreconfHook, perl, python, ruby, bison, gperf, flex
 , pkgconfig, which, gettext, gobjectIntrospection
 , gtk2, gtk3, wayland, libwebp, enchant, sqlite
 , libxml2, libsoup, libsecret, libxslt, harfbuzz
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.4.6";
+  version = "2.4.8";
 
   meta = with stdenv.lib; {
     description = "Web content rendering engine, GTK+ port";
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg";
+    sha256 = "08xxqsxpa63nzgbsz63vrdxdxgpysyiy7jdcjb57k1hprdcibwb8";
   };
 
-  patches = [ ./webcore-svg-libxml-cflags.patch ./webkitgtk-2.4-gmutexlocker.patch ];
+  patches = [ ./webkitgtk-2.4-gmutexlocker.patch ./bug140241.patch ];
 
   CC = "cc";
 
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
     patchShebangs Tools/gtk
   '';
 
+  # patch *.in between autoreconf and configure
+  postAutoreconf = "patch -p1 < ${./webcore-svg-libxml-cflags.patch}";
+
   configureFlags = with stdenv.lib; [
     "--disable-geolocation"
     (optionalString enableIntrospection "--enable-introspection")
@@ -43,7 +46,7 @@ stdenv.mkDerivation rec {
   dontAddDisableDepTrack = true;
 
   nativeBuildInputs = [
-    perl python ruby bison gperf flex
+    autoreconfHook/*bug140241.patch*/ perl python ruby bison gperf flex
     pkgconfig which gettext gobjectIntrospection
   ];
 
@@ -58,5 +61,8 @@ stdenv.mkDerivation rec {
     (if withGtk2 then gtk2 else gtk3)
   ];
 
-  #enableParallelBuilding = true; # build problems on Hydra
+  # Probably OK now, see:
+  # https://bugs.webkit.org/show_bug.cgi?id=79498
+  enableParallelBuilding = true;
 }
+
diff --git a/pkgs/development/libraries/webkitgtk/bug140241.patch b/pkgs/development/libraries/webkitgtk/bug140241.patch
new file mode 100644
index 000000000000..8d8c1bae0be2
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/bug140241.patch
@@ -0,0 +1,59 @@
+@@ -, +, @@ 
+        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=140241
+        Reviewed by NOBODY (OOPS!).
+        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
+        just when WebKit2 is enabled and we are not building for X11.
+        * GNUmakefile.list.am:
+---
+ Source/WebCore/ChangeLog           | 12 ++++++++++++
+ Source/WebCore/GNUmakefile.list.am |  8 ++++++++
+ 2 files changed, 20 insertions(+)
+--- a/Source/WebCore/ChangeLog	
++++ a/Source/WebCore/ChangeLog	
+@@ -1,3 +1,15 @@ 
++2015-01-16  Tomas Popela  <tpopela@redhat.com>
++
++        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
++        https://bugs.webkit.org/show_bug.cgi?id=140241
++
++        Reviewed by NOBODY (OOPS!).
++
++        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
++        just when WebKit2 is enabled and we are not building for X11.
++
++        * GNUmakefile.list.am:
++
+ 2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
+ 
+         Crash in WebCore::Node::getFlag
+--- a/Source/WebCore/GNUmakefile.list.am	
++++ a/Source/WebCore/GNUmakefile.list.am	
+@@ -6254,9 +6254,13 @@ endif # END USE_GLX
+ endif # END TARGET_X11
+ 
+ if TARGET_WAYLAND
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ endif # END TARGET_WAYLAND
+ 
+ if TARGET_X11_OR_WAYLAND
+@@ -6305,9 +6309,13 @@ webcoregtk_sources += \
+ endif # END TARGET_WIN32
+ 
+ if TARGET_QUARTZ
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ platformgtk_sources += \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp

From 6b6183125ecbec7c56de5443234f0f0c00a51f5a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sat, 25 Apr 2015 11:36:38 +0200
Subject: [PATCH 0165/1143] gnutls, trousers: fix .la and .pc files, remove
 propagated build inputs

cc @vcunat @wkennington
---
 pkgs/development/libraries/gnutls/generic.nix | 12 +++++++++---
 pkgs/tools/security/trousers/default.nix      |  9 +++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 3c1db4d7fafe..930713f59873 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -23,10 +23,8 @@ stdenv.mkDerivation rec {
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit ]
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp trousers unbound ]
     ++ stdenv.lib.optional guileBindings guile;
-  # The paths for these libraries are not specified in the .la and .pc files
-  propagatedBuildInputs = [ zlib gmp trousers unbound ];
 
   nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
 
@@ -34,6 +32,14 @@ stdenv.mkDerivation rec {
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
   doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
 
+  # Fixup broken libtool and pkgconfig files
+  preFixup = ''
+    sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
+        -e 's,-lz,-L${zlib}/lib -lz,' \
+        -e 's,-lgmp,-L${gmp}/lib -lgmp,' \
+        -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc
+  '';
+
   meta = with stdenv.lib; {
     description = "The GNU Transport Layer Security Library";
 
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 471782ce8f32..38ff4acc43bd 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "trousers-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v";
   };
 
-  propagatedBuildInputs = [ openssl ];
+  buildInputs = [ openssl pkgconfig ];
 
   patches = [ ./allow-non-tss-config-file-owner.patch ];
 
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE";
   NIX_LDFLAGS = "-lgcc_s";
 
+  # Fix broken libtool file
+  preFixup = ''
+    sed 's,-lcrypto,-L${openssl}/lib -lcrypto,' -i $out/lib/libtspi.la
+  '';
+
   meta = with stdenv.lib; {
     description = "Trusted computing software stack";
     homepage    = http://trousers.sourceforge.net/;

From d4a0cd2a940e7f65c9e93565dfb4d5eb117f7fb9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 8 Apr 2015 10:53:54 +0200
Subject: [PATCH 0166/1143] Add gettextWithExpat function

---
 pkgs/development/libraries/gettext/expat.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/gettext/expat.nix

diff --git a/pkgs/development/libraries/gettext/expat.nix b/pkgs/development/libraries/gettext/expat.nix
new file mode 100644
index 000000000000..fc6116b39160
--- /dev/null
+++ b/pkgs/development/libraries/gettext/expat.nix
@@ -0,0 +1,10 @@
+{ runCommand, gettext, expat, makeWrapper }:
+
+runCommand "gettext-expat-${gettext.name}" { buildInputs = [ makeWrapper ]; } ''
+  mkdir $out
+  cp -rf ${gettext}/* $out/
+  chmod a+w $out/bin
+  for p in $out/bin/*; do
+    wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat}/lib
+  done
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44ef8c823481..93b7e339cbec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5790,6 +5790,10 @@ let
   gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { };
   gettext_0_19 = callPackage ../development/libraries/gettext { };
 
+  gettextWithExpat = gettext: callPackage ../development/libraries/gettext/expat.nix {
+    inherit gettext;
+  };
+
   gd = callPackage ../development/libraries/gd { };
 
   gdal = callPackage ../development/libraries/gdal { };

From 38d6aec3f630b4ef012f902482ef0ad5a5170844 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 8 Apr 2015 17:45:41 +0200
Subject: [PATCH 0167/1143] network-manager: update to 1.0

---
 .../network-manager-applet/default.nix        | 31 ++--------
 .../networking/network-manager/default.nix    | 33 +++++-----
 .../network-manager/libnl-3.2.25.patch        | 61 -------------------
 .../network-manager/openconnect.nix           | 10 +--
 .../networking/network-manager/openvpn.nix    | 14 +++--
 .../tools/networking/network-manager/pptp.nix | 13 ++--
 .../tools/networking/network-manager/vpnc.nix | 15 +++--
 7 files changed, 45 insertions(+), 132 deletions(-)
 delete mode 100644 pkgs/tools/networking/network-manager/libnl-3.2.25.patch

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 56c0dd1363a2..54b349c425ca 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
-, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring 
+, libnotify, libsecret, dbus_glib, polkit, isocodes
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
-, makeWrapper, networkmanager_openvpn, networkmanager_vpnc
-, networkmanager_openconnect, networkmanager_pptp, networkmanager_l2tp
-, udev, hicolor_icon_theme, dconf }:
+, makeWrapper, udev, hicolor_icon_theme, dconf }:
 
 let
   pn = "network-manager-applet";
-  major = "0.9";
+  major = "1.0";
   version = networkmanager.version;
 in
 
@@ -16,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
-    sha256 = "1jz0vawfixzm892m6plrzhsybgdxwv96pfwld9p85lb7wshykzj6";
+    sha256 = "0liia390bhkl09lvk2rplcwhmfbxpjffa1xszfawc0h00v9fivaz";
   };
 
   buildInputs = [
@@ -32,27 +30,6 @@ stdenv.mkDerivation rec {
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
   ];
 
-  postInstall = ''
-    mkdir -p $out/etc/NetworkManager/VPN
-    ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name
-    ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name
-    ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name
-    ln -s ${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name $out/etc/NetworkManager/VPN/nm-pptp-service.name
-    ln -s ${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name $out/etc/NetworkManager/VPN/nm-l2tp-service.name
-    mkdir -p $out/lib/NetworkManager
-    ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/
-    ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/
-    ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/
-    ln -s ${networkmanager_pptp}/lib/NetworkManager/* $out/lib/NetworkManager/
-    ln -s ${networkmanager_l2tp}/lib/NetworkManager/* $out/lib/NetworkManager/
-    mkdir -p $out/libexec
-    ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/
-    ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/
-    ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/
-    ln -s ${networkmanager_pptp}/libexec/* $out/libexec/
-    ln -s ${networkmanager_l2tp}/libexec/* $out/libexec/
-  '';
-
   preFixup = ''
     wrapProgram "$out/bin/nm-applet" \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 505f42d2f3d5..c39d1a9f5ba6 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,19 +1,22 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
 , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
-, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll
-, gobjectIntrospection, modemmanager, openresolv }:
+, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
+, gobjectIntrospection, modemmanager, openresolv, libndp }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "0.9.8.10";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
-    sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86";
+    url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz";
+    sha256 = "0isrv1875whysnrf3fd1cz96xwd54nvj1rijk3fmx5qccznayris";
   };
 
   preConfigure = ''
     substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
+    substituteInPlace src/ppp-manager/nm-ppp-manager.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
+    substituteInPlace src/devices/nm-device.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
+    configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
   '';
 
   # Right now we hardcode quite a few paths at build time. Probably we should
@@ -21,12 +24,13 @@ stdenv.mkDerivation rec {
   # remove unneeded build-time dependencies.
   configureFlags = [
     "--with-distro=exherbo"
-    "--with-dhclient=${dhcp}/sbin/dhclient"
+    "--with-dhclient=${dhcp}/bin/dhclient"
     # Upstream prefers dhclient, so don't add dhcpcd to the closure
     #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"
     "--with-dhcpcd=no"
-    "--with-iptables=${iptables}/sbin/iptables"
-    "--with-udev-dir=\${out}/lib/udev"
+    "--with-pppd=${ppp}/bin/pppd"
+    "--with-iptables=${iptables}/bin/iptables"
+    #"--with-udev-dir=$(out)/lib/udev"
     "--with-resolvconf=${openresolv}/sbin/resolvconf"
     "--sysconfdir=/etc" "--localstatedir=/var"
     "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
@@ -37,21 +41,13 @@ stdenv.mkDerivation rec {
     "--with-modem-manager-1"
   ];
 
-  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection modemmanager ];
+  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp
+                  xz bluez5 gobjectIntrospection modemmanager readline ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  patches =
-    [ ( substituteAll {
-        src = ./nixos-purity.patch;
-        inherit avahi dnsmasq ppp bind;
-        glibc = stdenv.cc.libc;
-      })
-      ./libnl-3.2.25.patch
-    ];
-
   preInstall =
     ''
       installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" )
@@ -66,7 +62,6 @@ stdenv.mkDerivation rec {
 
       # rename to network-manager to be in style
       mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service 
-      echo "Alias=NetworkManager.service" >> $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
 
       # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
       # aliases ourselves.
diff --git a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch b/pkgs/tools/networking/network-manager/libnl-3.2.25.patch
deleted file mode 100644
index 17c2966b7064..000000000000
--- a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
-index ba8053e..5ac39d3 100644
---- a/src/nm-netlink-monitor.c
-+++ b/src/nm-netlink-monitor.c
-@@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg)
- static int
- event_msg_recv (struct nl_msg *msg, void *arg)
- {
--	struct nl_sock *nlh = arg;
--	struct nlmsghdr *hdr = nlmsg_hdr (msg);
- 	struct ucred *creds = nlmsg_get_creds (msg);
--	const struct sockaddr_nl *snl;
--	guint32 local_port;
--	gboolean accept_msg = FALSE;
--
--	/* Only messages sent from the kernel */
--	if (!creds || creds->uid != 0) {
--		nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d",
--		            creds ? creds->uid : -1);
--		return NL_SKIP;
--	}
--
--	snl = nlmsg_get_src (msg);
--	g_assert (snl);
--
--	/* Accept any messages from the kernel */
--	if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0)
--		accept_msg = TRUE;
- 
--	/* And any multicast message directed to our netlink PID, since multicast
--	 * currently requires CAP_ADMIN to use.
--	 */
--	local_port = nl_socket_get_local_port (nlh);
--	if ((hdr->nlmsg_pid == local_port) && snl->nl_groups)
--		accept_msg = TRUE;
--
--	if (accept_msg == FALSE) {
--		nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)",
--		            hdr->nlmsg_pid,
--		            local_port,
--		            (hdr->nlmsg_flags & NLM_F_MULTI));
--		return NL_SKIP;
-+	if (!creds || creds->pid || creds->uid || creds->gid) {
-+		if (creds)
-+			nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)",
-+			            creds->pid, creds->uid, creds->gid);
-+		else
-+			nm_log_dbg (LOGD_HW, "netlink: received message without credentials");
-+		return NL_STOP;
- 	}
- 
- 	return NL_OK;
-@@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh,
- {
- 	int err;
- 
--	nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data);
-+	nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL);
- 
- 	if (valid_func)
- 		nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data);
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index cc6532bac719..79e122447328 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager
+{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-openconnect";
-  version = "0.9.8.4";
+  version = networkmanager.version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1dl7wcmibrzf9qnpchgk9fxfhw0j2hzzzqmylkm2c41iv81xrd4r";
+    url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";
+    sha256 = "0przs8hzvb6wrf4gc0p9063x67qp9503396aknqq5f79xzw25wq6";
   };
 
-  buildInputs = [ openconnect networkmanager ]
+  buildInputs = [ openconnect networkmanager libsecret ]
     ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index bb837dc6b8f1..e48f4f32bf19 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager
+{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-openvpn";
-  version = "0.9.8.4";
+  version = networkmanager.version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "11v63s1f3bsa7pmkvr7x65rsigh48wfqzsnixrwc3wqslsv5535g";
+    url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";
+    sha256 = "1w0v3xah0wg467jy0fd3188zla8q4l1iq0zdy28bcdipin693bfh";
   };
 
-  buildInputs = [ openvpn networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
+  buildInputs = [ openvpn networkmanager libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring
+                                        gnome3.networkmanagerapplet ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
   configureFlags = [
     "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"
     "--disable-static"
+    "--localstatedir=/" # needed for the management socket under /run/NetworkManager
   ];
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
index 6928db809a85..782935045335 100644
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll
-, withGnome ? true, gnome3 }:
+, libsecret, withGnome ? true, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-pptp";
-  version = "0.9.8.4";
+  version = networkmanager.version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1s6wmznd6azvg028x8y3syniqy9j7nmx5j71w2wc6mk0f9pqzflp";
+    url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";
+    sha256 = "0xpflw6vp1ahvpz7mnnldqvk455wz2j7dahd9lxqs95frmjmq390";
   };
 
-  buildInputs = [ networkmanager pptp ppp ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
+  buildInputs = [ networkmanager pptp ppp libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring
+                                        gnome3.networkmanagerapplet ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
index 809970ff0fd6..8e2bb2bbfc3d 100644
--- a/pkgs/tools/networking/network-manager/vpnc.nix
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager
+{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-vpnc";
-  # TODO: version doesn't match due to bad release
-  #version = networkmanager.version;
-  version = "0.9.8.6";
+  version = networkmanager.version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1mmbm3q27b3dbbs4vs976cxif8jdcs92j3ajdbgykrnl2gbnqc20";
+    url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";
+    sha256 = "154q6lcy99h00kyivjhsv21a2i4cw4ff35cbvh062bfd68wl3l2y";
   };
 
-  buildInputs = [ vpnc networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
+  buildInputs = [ vpnc networkmanager libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring
+                                        gnome3.networkmanagerapplet ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 

From db3b86560f11437e260ae6d6661c69fb5bb36c75 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 10 Apr 2015 17:02:57 +0200
Subject: [PATCH 0168/1143] GNOME 3.16.1, closes #7357

---
 nixos/modules/services/desktops/geoclue2.nix  |   2 +
 .../services/networking/networkmanager.nix    |  33 +-
 .../services/x11/desktop-managers/gnome3.nix  |  18 +-
 .../services/x11/display-managers/gdm.nix     |   4 +-
 .../services/x11/display-managers/lightdm.nix |   2 +-
 nixos/tests/gnome3_16.nix                     |  34 ++
 .../core/gdm/disable_x_access_control.patch   |   6 +-
 .../3.12/core/gnome-bluetooth/default.nix     |  22 ++
 .../gnome-icon-theme-symbolic/default.nix     |   2 +
 pkgs/desktops/gnome-3/3.12/default.nix        |  19 +-
 .../gnome-3/3.16/apps/bijiben/default.nix     |  42 +++
 .../gnome-3/3.16/apps/evolution/default.nix   |  55 ++++
 .../gnome-3/3.16/apps/file-roller/default.nix |  33 ++
 .../gnome-3/3.16/apps/gedit/default.nix       |  39 +++
 .../gnome-3/3.16/apps/glade/default.nix       |  36 +++
 .../gnome-3/3.16/apps/gnome-boxes/default.nix |  46 +++
 .../3.16/apps/gnome-clocks/default.nix        |  40 +++
 .../3.16/apps/gnome-documents/default.nix     |  51 +++
 .../gnome-3/3.16/apps/gnome-music/default.nix |  44 +++
 .../3.16/apps/gnome-photos/default.nix        |  47 +++
 .../3.16/apps/nautilus-sendto/default.nix     |  22 ++
 .../gnome-3/3.16/apps/pomodoro/default.nix    |  49 +++
 .../gnome-3/3.16/apps/seahorse/default.nix    |  42 +++
 .../3.16/core/adwaita-icon-theme/default.nix  |  23 ++
 .../gnome-3/3.16/core/baobab/default.nix      |  38 +++
 .../gnome-3/3.16/core/caribou/default.nix     |  31 ++
 .../gnome-3/3.16/core/dconf/default.nix       |  30 ++
 .../gnome-3/3.16/core/empathy/default.nix     |  57 ++++
 .../gnome-3/3.16/core/eog/default.nix         |  31 ++
 .../gnome-3/3.16/core/epiphany/default.nix    |  53 ++++
 .../3.16/core/epiphany/libxml_depend.patch    |  10 +
 .../gnome-3/3.16/core/evince/default.nix      |  69 ++++
 .../core/evolution-data-server/default.nix    |  36 +++
 .../gnome-3/3.16/core/folks/default.nix       |  43 +++
 .../gnome-3/3.16/core/gconf/default.nix       |  30 ++
 .../gnome-3/3.16/core/gcr/default.nix         |  29 ++
 .../3.16/core/gdm/3.16-wip/default.nix        |  40 +++
 .../3.16-wip/disable_x_access_control.patch   |  15 +
 .../3.16/core/gdm/3.16-wip/sessions_dir.patch |  17 +
 .../3.16/core/gdm/3.16-wip/xserver_path.patch |  83 +++++
 .../gnome-3/3.16/core/gdm/default.nix         |  42 +++
 .../core/gdm/disable_x_access_control.patch   |  13 +
 .../gnome-3/3.16/core/gdm/sessions_dir.patch  |  17 +
 .../gnome-3/3.16/core/gdm/xserver_path.patch  |  15 +
 .../3.16/core/geocode-glib/default.nix        |  21 ++
 .../gnome-3/3.16/core/gjs/default.nix         |  23 ++
 .../3.16/core/gnome-backgrounds/default.nix   |  17 +
 .../3.16/core/gnome-bluetooth/default.nix     |  22 ++
 .../3.16/core/gnome-calculator/default.nix    |  36 +++
 .../3.16/core/gnome-common/default.nix        |  23 ++
 .../3.16/core/gnome-contacts/default.nix      |  53 ++++
 .../3.16/core/gnome-contacts/gio_unix.patch   |  10 +
 .../core/gnome-control-center/default.nix     |  60 ++++
 .../vpn_plugins_path.patch                    |  19 ++
 .../3.16/core/gnome-desktop/default.nix       |  30 ++
 .../3.16/core/gnome-dictionary/default.nix    |  38 +++
 .../3.16/core/gnome-disk-utility/default.nix  |  41 +++
 .../3.16/core/gnome-font-viewer/default.nix   |  37 +++
 .../3.16/core/gnome-keyring/default.nix       |  41 +++
 .../gnome-3/3.16/core/gnome-menus/default.nix |  24 ++
 .../core/gnome-online-accounts/default.nix    |  38 +++
 .../3.16/core/gnome-online-miners/default.nix |  37 +++
 .../3.16/core/gnome-screenshot/default.nix    |  37 +++
 .../3.16/core/gnome-session/default.nix       |  31 ++
 .../core/gnome-settings-daemon/default.nix    |  36 +++
 .../core/gnome-shell-extensions/default.nix   |  26 ++
 .../gnome-3/3.16/core/gnome-shell/default.nix |  61 ++++
 .../3.16/core/gnome-system-log/default.nix    |  37 +++
 .../core/gnome-system-monitor/default.nix     |  38 +++
 .../3.16/core/gnome-terminal/default.nix      |  35 +++
 .../core/gnome-themes-standard/default.nix    |  16 +
 .../3.16/core/gnome-user-docs/default.nix     |  20 ++
 .../3.16/core/gnome-user-share/default.nix    |  53 ++++
 .../3.16/core/grilo-plugins/default.nix       |  27 ++
 .../gnome-3/3.16/core/grilo/default.nix       |  31 ++
 .../gsettings-desktop-schemas/default.nix     |  25 ++
 .../gnome-3/3.16/core/gsound/default.nix      |  22 ++
 .../3.16/core/gtksourceview/default.nix       |  27 ++
 .../core/gtksourceview/nix_share_path.patch   |  11 +
 .../gnome-3/3.16/core/gucharmap/default.nix   |  38 +++
 .../gnome-3/3.16/core/libcroco/default.nix    |  18 ++
 .../gnome-3/3.16/core/libgdata/default.nix    |  33 ++
 .../gnome-3/3.16/core/libgee/default.nix      |  26 ++
 .../core/libgee/fix_introspection_paths.patch |  13 +
 .../3.16/core/libgnome-keyring/default.nix    |  26 ++
 .../gnome-3/3.16/core/libgnomekbd/default.nix |  24 ++
 .../gnome-3/3.16/core/libgweather/default.nix |  22 ++
 .../gnome-3/3.16/core/libgxps/default.nix     |  20 ++
 .../gnome-3/3.16/core/libpeas/default.nix     |  32 ++
 .../gnome-3/3.16/core/libzapojit/default.nix  |  16 +
 .../gnome-3/3.16/core/mutter/default.nix      |  35 +++
 .../gnome-3/3.16/core/nautilus/default.nix    |  30 ++
 .../3.16/core/nautilus/extension_dir.patch    |  24 ++
 .../gnome-3/3.16/core/rest/default.nix        |  19 ++
 .../gnome-3/3.16/core/sushi/default.nix       |  38 +++
 .../3.16/core/totem-pl-parser/default.nix     |  20 ++
 .../gnome-3/3.16/core/totem/default.nix       |  48 +++
 .../gnome-3/3.16/core/tracker/default.nix     |  56 ++++
 .../gnome-3/3.16/core/vino/default.nix        |  33 ++
 .../0.38.0.nix => 3.16/core/vte/default.nix}  |  11 +-
 .../core/vte/expose_select_text.0.38.0.patch  |   0
 .../gnome-3/3.16/core/yelp-tools/default.nix  |  24 ++
 .../gnome-3/3.16/core/yelp-xsl/default.nix    |  23 ++
 .../gnome-3/3.16/core/yelp/default.nix        |  36 +++
 .../gnome-3/3.16/core/zenity/default.nix      |  24 ++
 pkgs/desktops/gnome-3/3.16/default.nix        | 297 ++++++++++++++++++
 .../gnome-3/3.16/desktop/rarian/default.nix   |  16 +
 .../gnome-3/3.16/devtools/anjuta/default.nix  |  28 ++
 .../gnome-3/3.16/devtools/gdl/default.nix     |  24 ++
 .../gnome-3/3.16/misc/geary/default.nix       |  52 +++
 .../3.16/misc/geary/disable_valadoc.patch     |  24 ++
 .../gnome-3/3.16/misc/gexiv2/default.nix      |  28 ++
 .../gnome-3/3.16/misc/gfbgraph/default.nix    |  23 ++
 .../gnome-3/3.16/misc/gitg/default.nix        |  47 +++
 .../3.16/misc/gnome-tweak-tool/default.nix    |  45 +++
 .../gnome-tweak-tool/find_gsettings.patch     |  22 ++
 .../gnome-3/3.16/misc/goffice/0.8.nix         |  37 +++
 .../gnome-3/3.16/misc/goffice/default.nix     |  36 +++
 .../gnome-3/3.16/misc/goffice/pcre_info.patch |  13 +
 .../gnome-3/3.16/misc/gpaste/default.nix      |  44 +++
 .../gnome-3/3.16/misc/gtkhtml/default.nix     |  24 ++
 .../gnome-3/3.16/misc/libgda/default.nix      |  30 ++
 .../3.16/misc/libgit2-glib/default.nix        |  23 ++
 .../gnome-3/3.16/misc/libmediaart/default.nix |  22 ++
 .../libraries/appstream-glib/default.nix      |  28 ++
 pkgs/development/libraries/atk/default.nix    |   4 +-
 .../development/libraries/clutter-gst/3.0.nix |  26 ++
 .../development/libraries/clutter-gtk/1.4.nix |  26 ++
 .../development/libraries/clutter-gtk/1.6.nix |  23 ++
 pkgs/development/libraries/clutter/1.22.nix   |  52 +++
 .../development/libraries/clutter/default.nix |   2 +-
 pkgs/development/libraries/cogl/1.20.nix      |  57 ++++
 pkgs/development/libraries/gcab/default.nix   |  18 ++
 pkgs/development/libraries/gegl/3.0.nix       |  28 ++
 pkgs/development/libraries/geoclue/2.0.nix    |   2 +
 .../libraries/glib-networking/default.nix     |   6 +-
 pkgs/development/libraries/glibmm/default.nix |   4 +-
 .../gobject-introspection/default.nix         |   6 +-
 pkgs/development/libraries/gtk+/3.16.nix      |  69 ++++
 pkgs/development/libraries/gtkmm/3.16.nix     |  42 +++
 pkgs/development/libraries/gvfs/default.nix   |  13 +-
 .../libraries/libchamplain/default.nix        |   6 +-
 .../libraries/libxkbcommon/default.nix        |   4 +-
 .../libraries/webkitgtk/default.nix           |   6 +-
 .../network-manager-applet/default.nix        |   4 +-
 pkgs/top-level/all-packages.nix               |  33 +-
 146 files changed, 4428 insertions(+), 68 deletions(-)
 create mode 100644 nixos/tests/gnome3_16.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/eog/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/evince/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/folks/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/rest/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/totem/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/vino/default.nix
 rename pkgs/desktops/gnome-3/{3.12/core/vte/0.38.0.nix => 3.16/core/vte/default.nix} (86%)
 rename pkgs/desktops/gnome-3/{3.12 => 3.16}/core/vte/expose_select_text.0.38.0.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
 create mode 100644 pkgs/development/libraries/appstream-glib/default.nix
 create mode 100644 pkgs/development/libraries/clutter-gst/3.0.nix
 create mode 100644 pkgs/development/libraries/clutter-gtk/1.4.nix
 create mode 100644 pkgs/development/libraries/clutter-gtk/1.6.nix
 create mode 100644 pkgs/development/libraries/clutter/1.22.nix
 create mode 100644 pkgs/development/libraries/cogl/1.20.nix
 create mode 100644 pkgs/development/libraries/gcab/default.nix
 create mode 100644 pkgs/development/libraries/gegl/3.0.nix
 create mode 100644 pkgs/development/libraries/gtk+/3.16.nix
 create mode 100644 pkgs/development/libraries/gtkmm/3.16.nix

diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 6bdd5edff1f5..0e041fdbfbcf 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -34,6 +34,8 @@ with lib;
 
     services.dbus.packages = [ pkgs.geoclue2 ];
 
+    systemd.packages = [ pkgs.geoclue2 ];
+
   };
 
 }
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index f00c5d1f701d..60f380f024ba 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -98,13 +98,23 @@ in {
         '';
       };
 
+      # Ugly hack for using the correct gnome3 packageSet
+      basePackages = mkOption {
+        type = types.attrsOf types.path;
+        default = { inherit networkmanager modemmanager wpa_supplicant
+                            networkmanager_openvpn networkmanager_vpnc
+                            networkmanager_openconnect
+                            networkmanager_pptp networkmanager_l2tp; };
+        internal = true;
+      };
+
       packages = mkOption {
         type = types.listOf types.path;
         default = [ ];
         description = ''
           Extra packages that provide NetworkManager plugins.
         '';
-        apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list;
+        apply = list: (attrValues cfg.basePackages) ++ list;
       };
 
       appendNameservers = mkOption {
@@ -164,7 +174,7 @@ in {
 
     boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
 
-    environment.etc = [
+    environment.etc = with cfg.basePackages; [
       { source = ipUpScript;
         target = "NetworkManager/dispatcher.d/01nixos-ip-up";
       }
@@ -195,14 +205,7 @@ in {
         target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
       }) cfg.dispatcherScripts;
 
-    environment.systemPackages = cfg.packages ++ [
-        networkmanager_openvpn
-        networkmanager_vpnc
-        networkmanager_openconnect
-        networkmanager_pptp
-        networkmanager_l2tp
-        modemmanager
-        ];
+    environment.systemPackages = cfg.packages;
 
     users.extraGroups = singleton {
       name = "networkmanager";
@@ -238,15 +241,7 @@ in {
 
     security.polkit.extraConfig = polkitConf;
 
-    # openvpn plugin has only dbus interface
-    services.dbus.packages = cfg.packages ++ [
-        networkmanager_openvpn
-        networkmanager_vpnc
-        networkmanager_openconnect
-        networkmanager_pptp
-        networkmanager_l2tp
-        modemmanager
-        ];
+    services.dbus.packages = cfg.packages;
 
     services.udev.packages = cfg.packages;
   };
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 6398a15bfcc8..c951f3eae77a 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -21,7 +21,7 @@ let
     destination = "/share/applications/mimeapps.list";
     text = ''
       [Default Applications]
-      inode/directory=nautilus.desktop
+      inode/directory=nautilus.desktop;org.gnome.Nautilus.desktop
     '';
   };
 
@@ -80,6 +80,7 @@ in {
     services.telepathy.enable = mkDefault true;
     networking.networkmanager.enable = mkDefault true;
     services.upower.enable = config.powerManagement.enable;
+    hardware.bluetooth.enable = mkDefault true;
 
     fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
 
@@ -108,7 +109,7 @@ in {
           # Override default mimeapps
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
 
-          # Let gnome-control-center find gnome-shell search providers
+          # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility.
           export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
 
           # Let nautilus find extensions
@@ -120,6 +121,9 @@ in {
           # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
           ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
 
+          # Find the mouse
+          export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+
           ${gnome3.gnome_session}/bin/gnome-session&
           waitPID=$!
         '';
@@ -138,11 +142,11 @@ in {
         gnome3.dconf
         gnome3.gnome-backgrounds
         gnome3.gnome_control_center
-        gnome3.gnome_icon_theme
         gnome3.gnome-menus
         gnome3.gnome_settings_daemon
         gnome3.gnome_shell
         gnome3.gnome_themes_standard
+        gnome3.defaultIconTheme
       ] ++ cfg.sessionPath ++ (removePackagesByName [
         gnome3.baobab
         gnome3.empathy
@@ -154,6 +158,7 @@ in {
         gnome3.totem
         gnome3.vino
         gnome3.yelp
+        gnome3.gnome-bluetooth
         gnome3.gnome-calculator
         gnome3.gnome-contacts
         gnome3.gnome-font-viewer
@@ -175,6 +180,13 @@ in {
         gnome3.nautilus-sendto
       ] config.environment.gnome3.excludePackages);
 
+    # Use the correct gnome3 packageSet
+    networking.networkmanager.basePackages =
+      { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
+        inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
+                         networkmanager_openconnect networkmanager_pptp
+                         networkmanager_l2tp; };
+
     # Needed for themes and backgrounds
     environment.pathsToLink = [ "/share" ];
 
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index a7ebafa28b38..6c3c52730863 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -58,14 +58,14 @@ in
           # Find the mouse
           XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
         };
-        execCmd = "exec ${gdm}/sbin/gdm";
+        execCmd = "exec ${gdm}/bin/gdm";
       };
 
     # Because sd_login_monitor_new requires /run/systemd/machines
     systemd.services.display-manager.wants = [ "systemd-machined.service" ];
     systemd.services.display-manager.after = [ "systemd-machined.service" ];
 
-    systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou ];
+    systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ];
 
     services.dbus.packages = [ gdm ];
 
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 6a7b810261da..139013cff50a 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -19,7 +19,7 @@ let
     '';
 
   theme = pkgs.gnome3.gnome_themes_standard;
-  icons = pkgs.gnome3.gnome_icon_theme;
+  icons = pkgs.gnome3.defaultIconTheme;
 
   # The default greeter provided with this expression is the GTK greeter.
   # Again, we need a few things in the environment for the greeter to run with
diff --git a/nixos/tests/gnome3_16.nix b/nixos/tests/gnome3_16.nix
new file mode 100644
index 000000000000..23a66aba50c5
--- /dev/null
+++ b/nixos/tests/gnome3_16.nix
@@ -0,0 +1,34 @@
+import ./make-test.nix {
+  name = "gnome3";
+
+  machine =
+    { config, pkgs, ... }:
+
+    { imports = [ ./common/user-account.nix ];
+
+      services.xserver.enable = true;
+
+      services.xserver.displayManager.auto.enable = true;
+      services.xserver.displayManager.auto.user = "alice";
+      services.xserver.desktopManager.gnome3.enable = true;
+
+      environment.gnome3.packageSet = pkgs.gnome3_16;
+
+      virtualisation.memorySize = 512;
+    };
+
+  testScript =
+    ''
+      $machine->waitForX;
+      $machine->sleep(15);
+
+      # Check that logging in has given the user ownership of devices.
+      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+
+      $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
+      $machine->waitForWindow(qr/Terminal/);
+      $machine->sleep(20);
+      $machine->screenshot("screen");
+    '';
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
index 74d054f8c888..5985dbe0e017 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
@@ -1,7 +1,7 @@
-diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
+diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
 index 1afe48e..e3d1ec2 100644
---- a/daemon/gdm-slave.c
-+++ b/daemon/gdm-slave.c
+--- a/daemon/gdm-display.c
++++ b/daemon/gdm-display.c
 @@ -291,9 +291,10 @@ gdm_slave_connect_to_x11_display (GdmSlave *slave)
 
                  gdm_error_trap_push ();
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
new file mode 100644
index 000000000000..fae47476898d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
+, udev, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-bluetooth-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0rsw27yj6887axk7s2vwpsr0pmic0wdskl7sx8rk4kns7b0ifs88";
+  };
+
+  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
+                               gsettings_desktop_schemas itstool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
+    description = "Application that let you manage Bluetooth in the GNOME destkop";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
index 7b9e2097befb..066951c63a68 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gnome3.gnome_icon_theme ];
 
+  propagatedUserEnvPkgs = [ gnome3.gnome_icon_theme ];
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index ac5427d0e40d..dce75eb2176d 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -16,6 +16,11 @@ rec {
   orbit = ORBit2;
   inherit (pkgs) libsoup;
 
+  version = "3.12";
+
+# Simplify the nixos module and gnome packages
+  defaultIconTheme = gnome_icon_theme_symbolic;
+
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
   baobab = callPackage ./core/baobab { };
@@ -52,6 +57,8 @@ rec {
 
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
 
+  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
+
   gnome-contacts = callPackage ./core/gnome-contacts { };
 
   gnome_control_center = callPackage ./core/gnome-control-center { };
@@ -158,10 +165,12 @@ rec {
     inherit gnome3;
   };
 
+  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
+    inherit gnome3;
+  };
+
   networkmanagerapplet = pkgs.networkmanagerapplet.override {
-    inherit gnome3 gsettings_desktop_schemas glib_networking
-      networkmanager_openvpn networkmanager_pptp networkmanager_vpnc
-      networkmanager_openconnect;
+    inherit gnome3 gsettings_desktop_schemas glib_networking;
   };
 
   rest = callPackage ./core/rest { };
@@ -178,10 +187,6 @@ rec {
 
   vte = callPackage ./core/vte { };
 
-  vte_038 = callPackage ./core/vte/0.38.0.nix { }; # To be moved in gnome 3.14 when available
-
-  vte-select-text = vte_038.override { selectTextPatch = true; };
-
   vino = callPackage ./core/vino { };
 
   yelp = callPackage ./core/yelp {
diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
new file mode 100644
index 000000000000..3bce034507ac
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, evolution_data_server, evolution, sqlite
+, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils
+, clutter_gtk, libuuid, webkitgtk, zeitgeist
+, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "bijiben-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/bijiben/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0ndb7bv03rqxh4an44xd4cwxxp5z1wywk9xazmab01jsa0a0zx7r";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig glib intltool itstool libxml2
+                  clutter_gtk libuuid webkitgtk gnome3.tracker
+                  gnome3.gnome_online_accounts zeitgeist desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  evolution_data_server evolution sqlite
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/bijiben" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Bijiben;
+    description = "Note editor designed to remain simple to use";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
new file mode 100644
index 000000000000..af60d8906735
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
+, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite
+, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
+
+let
+  majVer = gnome3.version;
+in stdenv.mkDerivation rec {
+  name = "evolution-${majVer}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution/${majVer}/${name}.tar.xz";
+    sha256 = "1lm877rrcfy98mpp4iq7m9p8r1nr9kir916n4qin2ygas9zx0qlb";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  propagatedBuildInputs = [ gnome3.gtkhtml ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg db icu
+                  gnome3.evolution_data_server libsecret libical gcr
+                  webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
+                  libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  nss nspr libnotify procps highlight gnome3.libgweather
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
+                     "--disable-libcryptui" ];
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Evolution;
+    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
new file mode 100644
index 000000000000..d36162e13c2a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
+, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "file-roller-${version}";
+
+  majVersion = gnome3.version;
+  version = "${majVersion}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
+    sha256 = "12c6lpvc3mi1q10nas64kfcjw2arv3z4955zdfgf4c5wy4dczqyh";
+  };
+
+  # TODO: support nautilus
+  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
+
+  buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/file-roller" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/FileRoller;
+    description = "Archive manager for the GNOME desktop environment";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
new file mode 100644
index 000000000000..172c817f6f92
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, intltool, fetchurl, enchant, isocodes
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libsoup, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "gedit-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gedit/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0bs0vf773l0k7f4zxqlyb8z772s5dcn7ww0073hs7z3hj0l3lzrc";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg libsoup
+                  gnome3.libpeas gnome3.gtksourceview libxml2
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gedit" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Gedit;
+    description = "Official text editor of the GNOME desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
new file mode 100644
index 000000000000..22b896c3337a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, python
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libxml2, docbook_xsl
+, gnome3, librsvg, gdk_pixbuf, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "glade-3.16.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
+    sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
+                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg libxslt
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/glade" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Glade;
+    description = "User interface designer for GTK+ applications";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
new file mode 100644
index 000000000000..3b30cdbbcfb7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
+, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
+, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
+, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
+, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio
+}:
+
+# TODO: ovirt (optional)
+
+stdenv.mkDerivation rec {
+  name = "gnome-boxes-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-boxes/${gnome3.version}/${name}.tar.xz";
+    sha256 = "03a8x1bnbchsh2bs86gnwvddnwbf643wp5nrhyvg9j86d57axvs1";
+  };
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  buildInputs = [
+    makeWrapper pkgconfig intltool itstool libvirt-glib glib
+    gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
+    libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
+    gdbm cyrus_sasl gnome3.adwaita-icon-theme
+    librsvg hicolor_icon_theme desktop_file_utils
+  ];
+
+  preFixup = ''
+    for prog in "$out/bin/"*; do
+        wrapProgram "$prog" \
+            --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+            --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple GNOME 3 application to access remote or virtual systems";
+    homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
new file mode 100644
index 000000000000..8bdfcfd9f887
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, intltool, fetchurl, libgweather, libnotify
+, pkgconfig, gtk3, glib, hicolor_icon_theme, gsound
+, makeWrapper, itstool, libcanberra_gtk3, libtool
+, gnome3, librsvg, gdk_pixbuf, geoclue2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-clocks-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-clocks/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1k7khghaq7y3j0r3kn9q7dwgi1875bfn4iy0sr1ls14m1p2bl10q";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+                  gnome3.gsettings_desktop_schemas makeWrapper
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
+                  libgweather libnotify libtool gsound
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-clocks" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Clocks;
+    description = "Clock application designed for GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
new file mode 100644
index 000000000000..50fff0cd1d2e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, intltool, fetchurl, evince, gjs
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libxslt, webkitgtk
+, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
+, gobjectIntrospection, json_glib
+, gmp, desktop_file_utils }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-documents-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-documents/${gnome3.version}/${name}.tar.xz";
+    sha256 = "154ssnyq4lwq2rsy3l5kqk8x1qjvn2j5gqm23i0aiw7qsbx5phrs";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
+                  docbook_xsl desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper gmp
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg evince
+                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
+                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
+                  gnome3.gnome_desktop gnome3.libzapojit json_glib
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup =
+    ''
+    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
+
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+        --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Documents;
+    description = "Document manager application designed to work with GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
new file mode 100644
index 000000000000..31ee8a7230c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
+, python3, libxml2, python3Packages, libnotify
+, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
+, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-music-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-music/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1pyj192kva0swad6w2kaj5shcwpgiflyda6zmsiaximsgzc4as8i";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg python3
+                  gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
+                  python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-music" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Music;
+    description = "Music player and management application for the GNOME desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
new file mode 100644
index 000000000000..fba1a541812c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, intltool, fetchurl, exempi, libxml2
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, gegl, babl, lcms2
+, desktop_file_utils, gmp, libmediaart
+, gnome3, librsvg, gdk_pixbuf, libexif }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-photos-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-photos/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0jv3b5nd4sazyq2k132rdjizfg24sj6i63ls1m6x2qqqf8grxznj";
+  };
+
+  # doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
+                  gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg exempi
+                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
+                  gnome3.gnome_online_accounts gnome3.gnome_desktop
+                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Photos;
+    description = "Photos is an application to access, organize and share your photos with GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
new file mode 100644
index 000000000000..5a85e00e4e45
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
+, gobjectIntrospection, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "nautilus-sendto-${version}";
+
+  version = "3.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
+    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
+  };
+
+  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
new file mode 100644
index 000000000000..bce514364ce7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
+  dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3, gtk3, gst_plugins_base,
+  glib, gobjectIntrospection, hicolor_icon_theme
+}:
+
+stdenv.mkDerivation rec {
+  rev = "0.10.3";
+  name = "gnome-shell-pomodoro-${rev}-61df3fa";
+
+  src = fetchFromGitHub {
+      owner = "codito";
+      repo = "gnome-shell-pomodoro";
+      rev = "${rev}";
+      sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship";
+  };
+
+  configureScript = ''./autogen.sh'';
+
+  buildInputs = [
+    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
+    makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
+    gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
+  ];
+
+  preBuild = ''
+    sed -i \
+        -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
+        -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3.gnome_desktop}\1|' \
+        vapi/Makefile
+  '';
+
+  preFixup = ''
+    wrapProgram $out/bin/gnome-pomodoro \
+        --prefix XDG_DATA_DIRS : \
+        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/codito/gnome-shell-pomodoro;
+    description =
+      "Personal information management application that provides integrated " + 
+      "mail, calendaring and address book functionality";
+    maintainers = with maintainers; [ DamienCassou ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
new file mode 100644
index 000000000000..cebbce78177d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, intltool, fetchurl, vala
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, gnupg, libsoup
+, gnome3, librsvg, gdk_pixbuf, gpgme
+, libsecret, avahi, p11_kit }:
+
+let
+  majVer = "3.14";
+in stdenv.mkDerivation rec {
+  name = "seahorse-${majVer}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/seahorse/${majVer}/${name}.tar.xz";
+    sha256 = "14syy2qxxrim220aj64mbp76jbrrc6wmdwc4lfl4sngsh84qjah9";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
+                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme
+                  libsecret avahi libsoup p11_kit vala gnome3.gcr
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/seahorse" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Seahorse;
+    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
new file mode 100644
index 000000000000..a445ff73608b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3
+, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "adwaita-icon-theme-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.version}/${name}.tar.xz";
+    sha256 = "a3c8ad3b099ca571b423811a20ee9a7a43498cfa04d299719ee43cd7af6f6eb1";
+  };
+
+  # For convenience, we can specify adwaita-icon-theme only in packages
+  propagatedBuildInputs = [ hicolor_icon_theme ];
+
+  buildInputs = [ gdk_pixbuf librsvg ];
+  
+  nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
new file mode 100644
index 000000000000..87c21e3eb010
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, vala, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "baobab-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/baobab/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1wnf3yd3qi0xsmm37s6pk23qh095pk1fv9nhqjya1p9svwrh9r0z";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/baobab" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Baobab;
+    description = "Graphical application to analyse disk usage in any Gnome environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
new file mode 100644
index 000000000000..b75b055fc3f3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
+, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }:
+
+let
+  majorVersion = "0.4";
+in
+stdenv.mkDerivation rec {
+  name = "caribou-${majorVersion}.18.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz";
+    sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf";
+  };
+
+  buildInputs = with gnome3;
+    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x
+      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
+
+  propagatedBuildInputs = [ gnome3.libgee libxklavier ];
+
+  preBuild = ''
+    patchShebangs .
+    substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
new file mode 100644
index 000000000000..141d1413f6f1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
+, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+
+let
+  majorVersion = "0.24";
+in
+stdenv.mkDerivation rec {
+  name = "dconf-${version}";
+  version = "${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz";
+    sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2";
+  };
+
+  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/dconf-editor" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+
+    rm $out/lib/gio/modules/giomodule.cache
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
new file mode 100644
index 000000000000..ab5ea0cbccaf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
+, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
+, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
+, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
+, telepathy_logger, libnotify, clutter, libsoup, gnutls
+, evolution_data_server
+, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
+, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee  }:
+
+# TODO: enable more features
+
+let
+  majorVersion = "3.12";
+in
+stdenv.mkDerivation rec {
+  name = "empathy-${majorVersion}.8";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz";
+    sha256 = "10z6ksia6yx7vg0wsdbk4w6vjgfg3cg3n04jf9bj2vr7kr5zvs7w";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
+                            gnome_online_accounts shared_mime_info ];
+  propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
+                            telepathy_mission_control ];
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+                  libxml2 libxslt icu file makeWrapper
+                  telepathy_glib clutter_gtk clutter-gst cogl
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
+                  libnotify clutter libsoup gnutls libgee p11_kit
+                  libcanberra_gtk3 telepathy_farstream farstream
+                  gnome3.adwaita-icon-theme hicolor_icon_theme 
+                  gnome3.gsettings_desktop_schemas file libtool librsvg ];
+
+  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
+                         "-I${dbus_libs}/include/dbus-1.0"
+                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Empathy;
+    description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
+    maintainers = with maintainers; [ lethalman ];
+    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
new file mode 100644
index 000000000000..093bab63fe44
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
+, shared_mime_info, makeWrapper, librsvg, libexif }:
+
+
+stdenv.mkDerivation rec {
+  name = "eog-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/eog/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1ry10wvd2zq7vv4rf1qz0x1b77sdzaqlxyjbw3a0lccp4f2x2y99";
+  };
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
+      gsettings_desktop_schemas shared_mime_info adwaita-icon-theme gnome_desktop libexif ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/eog" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.adwaita-icon-theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
+    platforms = platforms.linux;
+    description = "GNOME image viewer";
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
new file mode 100644
index 000000000000..b03fbd4e9c14
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
+, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
+, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
+, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
+, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }:
+
+stdenv.mkDerivation rec {
+  name = "epiphany-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/epiphany/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1bicv1rfi697hk12p5n3jmcgjc81bwicjsmppdfjmvj94r4iniz8";
+  };
+
+  # Tests need an X display
+  configureFlags = [ "--disable-static --disable-tests" ];
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  nativeBuildInputs = [ pkgconfig file ];
+
+  configureScript = "./autogen.sh";
+
+  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
+                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
+                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg which gnome_common
+                  gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  patches = [ ./libxml_depend.patch ];
+
+  patchFlags = [ "-p0" ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Epiphany;
+    description = "WebKit based web browser for GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
new file mode 100644
index 000000000000..89e3694a02d9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2015-04-08 18:53:52.284580835 +0200
++++ configure.ac	2015-04-08 18:55:55.697225280 +0200
+@@ -113,6 +113,7 @@
+ PKG_CHECK_MODULES(WEB_EXTENSION, [
+                   webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED
+                   libsecret-1 >= $LIBSECRET_REQUIRED
++                  libxml-2.0 >= $LIBXML_REQUIRED
+                   ])
+ AC_SUBST(WEB_EXTENSION_CFLAGS)
+ AC_SUBST(WEB_EXTENSION_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
new file mode 100644
index 000000000000..aa75b55358b5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
@@ -0,0 +1,69 @@
+{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
+, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
+, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
+, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
+, gobjectIntrospection
+}:
+
+stdenv.mkDerivation rec {
+  name = "evince-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evince/${gnome3.version}/${name}.tar.xz";
+    sha256 = "016d9i83srv49saslmjl7v02n7sc6d7v6h68y06y9rfgbk8f4f2i";
+  };
+
+  buildInputs = [
+    pkgconfig intltool perl perlXMLParser libxml2
+    glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
+    itstool gnome3.adwaita-icon-theme
+    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
+    poppler ghostscriptX djvulibre libspectre
+    makeWrapper libsecret librsvg gnome3.adwaita-icon-theme
+  ];
+
+  configureFlags = [
+    "--disable-nautilus" # Do not use nautilus
+    "--enable-introspection"
+  ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  preConfigure = with stdenv.lib;
+    optionalString doCheck ''
+      for file in test/*.py; do
+        echo "patching $file"
+        sed '1s,/usr,${python},' -i "$file"
+      done
+    '' + optionalString (recentListSize != null) ''
+      sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
+      sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
+    '';
+
+  preFixup = ''
+    # Tell Glib/GIO about the MIME info directory, which is used
+    # by `g_file_info_get_content_type ()'.
+    wrapProgram "$out/bin/evince" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+
+  '';
+
+  doCheck = false; # would need pythonPackages.dogTail, which is missing
+
+  meta = with stdenv.lib; {
+    homepage = http://www.gnome.org/projects/evince/;
+    description = "GNOME's document viewer";
+
+    longDescription = ''
+      Evince is a document viewer for multiple document formats.  It
+      currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
+      of Evince is to replace the multiple document viewers that exist
+      on the GNOME Desktop with a single simple application.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.vcunat ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
new file mode 100644
index 000000000000..7193b8454681
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, python
+, intltool, libsoup, libxml2, libsecret, icu, sqlite
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
+
+
+stdenv.mkDerivation rec {
+  name = "evolution-data-server-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution-data-server/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0lgb8jvn8kx50692gg1m9klvwm7msvk4f7wm0yl7rj880wbxzvh4";
+  };
+
+  buildInputs = with gnome3;
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
+      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite ]
+    ++ stdenv.lib.optional valaSupport vala;
+
+  propagatedBuildInputs = [ libsecret nss nspr libical db ];
+
+  # uoa irrelevant for now
+  configureFlags = [ "--disable-uoa" ]
+                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
+
+  preFixup = ''
+    for f in "$out/libexec/"*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
new file mode 100644
index 000000000000..5f3954f14f35
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
@@ -0,0 +1,43 @@
+{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
+, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
+, telepathy_glib, evolution_data_server, libsecret, db }:
+
+# TODO: enable more folks backends
+
+let
+  majorVersion = "0.11";
+in
+stdenv.mkDerivation rec {
+  name = "folks-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
+    sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz";
+  };
+
+  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
+  # dbus_daemon needed for tests
+  buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
+                  vala libsecret libxml2 libsoup nspr nss intltool db ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  configureFlags = "--disable-fatal-warnings";
+
+  NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
+                        "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
+
+  enableParallelBuilding = true;
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Folks";
+
+    homepage = https://wiki.gnome.org/Projects/Folks;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
new file mode 100644
index 000000000000..47dae0486e93
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2
+, intltool, polkit, orbit }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "3.2";
+  versionMinor = "6";
+  moduleName   = "GConf";
+
+  origName = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  name = "gconf-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
+    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
+  };
+
+  buildInputs = [ libxml2 polkit gnome3.gtk orbit ];
+  propagatedBuildInputs = [ glib dbus_glib  ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  # ToDo: ldap reported as not found but afterwards reported as supported
+
+  meta = with stdenv.lib; {
+    homepage = http://projects.gnome.org/gconf/;
+    description = "A system for storing application preferences";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
new file mode 100644
index 000000000000..b3acdee072df
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
+, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
+, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "gcr-3.14.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gcr/3.14/${name}.tar.xz";
+    sha256 = "2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d";
+  };
+
+  buildInputs = [
+    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt
+    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
+  ];
+
+  #doCheck = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gcr-viewer" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
new file mode 100644
index 000000000000..450914ce7459
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
+, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gdm-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0qg2qxlfdvi1081r8bbid5hg7vqlpm91996ck2z7fq6kczy4hvdv";
+  };
+
+  # Only needed to make it build
+  preConfigure = ''
+    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
+    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
+    substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
+ '';
+
+  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
+                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
+  buildInputs = [ pkgconfig glib itstool libxml2 intltool
+                  accountsservice gnome3.dconf systemd
+                  gobjectIntrospection libX11 gtk
+                  libcanberra_gtk3 pam libtool ];
+
+  #enableParallelBuilding = true; # problems compiling
+
+  # Disable Access Control because our X does not support FamilyServerInterpreted yet
+  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GDM;
+    description = "A program that manages graphical display servers and handles graphical user logins";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
new file mode 100644
index 000000000000..7691a9e86f0f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
@@ -0,0 +1,15 @@
+--- gdm-3.16.0/daemon/gdm-display.c.orig	2015-04-08 13:53:14.370274369 +0200
++++ gdm-3.16.0/daemon/gdm-display.c	2015-04-08 13:53:36.287520435 +0200
+@@ -1706,9 +1706,10 @@
+ 
+                 gdm_error_trap_push ();
+ 
+-                for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
++                /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
+                         XAddHost (self->priv->x11_display, &host_entries[i]);
+-                }
++                }*/
++                XDisableAccessControl(self->priv->x11_display);
+ 
+                 XSync (self->priv->x11_display, False);
+                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
new file mode 100644
index 000000000000..b8fbad4d731d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
@@ -0,0 +1,17 @@
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index f759d2d..d154716 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -373,9 +373,12 @@ get_system_session_dirs (void)
+ #ifdef ENABLE_WAYLAND_SUPPORT
+                 DATADIR "/wayland-sessions/",
+ #endif
++                NULL,
+                 NULL
+         };
+ 
++        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
++
+         return search_dirs;
+ }
+ 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
new file mode 100644
index 000000000000..b451d129391a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
@@ -0,0 +1,83 @@
+--- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
++++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
+@@ -322,7 +322,11 @@
+ fallback:
+ #endif
+ 
+-        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++        if (g_getenv("GDM_X_SERVER") != NULL) {
++            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
++        } else {
++            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++        }
+ }
+ 
+ static gboolean
+--- gdm-3.16.0/daemon/gdm-x-session.c.orig	2015-04-15 18:44:16.875743928 +0200
++++ gdm-3.16.0/daemon/gdm-x-session.c	2015-04-16 13:34:02.335708638 +0200
+@@ -207,6 +207,8 @@
+         char     *display_fd_string = NULL;
+         char     *vt_string = NULL;
+         char     *display_number;
++        int nixos_argc = 0;
++        char **nixos_argv = NULL;
+         gsize     display_number_size;
+ 
+         auth_file = prepare_auth_file ();
+@@ -236,7 +238,15 @@
+ 
+         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
+ 
+-        g_ptr_array_add (arguments, X_SERVER);
++        if (g_getenv("GDM_X_SERVER") != NULL) {
++                int i = 0;
++                g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
++                for (i = 0; i < nixos_argc; i++) {
++                        g_ptr_array_add (arguments, nixos_argv[i]);
++                }
++        } else {
++                g_ptr_array_add (arguments, X_SERVER);
++        }
+ 
+         if (vt_string != NULL) {
+                 g_ptr_array_add (arguments, vt_string);
+@@ -259,12 +269,12 @@
+         g_ptr_array_add (arguments, "-noreset");
+         g_ptr_array_add (arguments, "-keeptty");
+ 
+-        g_ptr_array_add (arguments, "-verbose");
++        /*g_ptr_array_add (arguments, "-verbose");
+         if (state->debug_enabled) {
+                 g_ptr_array_add (arguments, "7");
+         } else {
+                 g_ptr_array_add (arguments, "3");
+-        }
++        }*/
+ 
+         if (state->debug_enabled) {
+                 g_ptr_array_add (arguments, "-core");
+@@ -275,6 +285,9 @@
+                                                    (const char * const *) arguments->pdata,
+                                                    &error);
+         g_free (display_fd_string);
++        if (nixos_argv) {
++                 g_strfreev (nixos_argv);
++        }
+         g_clear_object (&launcher);
+         g_ptr_array_free (arguments, TRUE);
+ 
+--- gdm-3.16.0/daemon/gdm-session.c.orig	2015-04-16 14:19:01.392802683 +0200
++++ gdm-3.16.0/daemon/gdm-session.c	2015-04-16 14:20:36.012296764 +0200
+@@ -2359,6 +2359,12 @@
+         gchar *desktop_names;
+         const char *locale;
+ 
++        if (g_getenv ("GDM_X_SERVER") != NULL) {
++                gdm_session_set_environment_variable (self,
++                                                      "GDM_X_SERVER",
++                                                      g_getenv ("GDM_X_SERVER"));
++        }
++
+         gdm_session_set_environment_variable (self,
+                                               "GDMSESSION",
+                                               get_session_name (self));
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
new file mode 100644
index 000000000000..43a3d450ac72
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
+, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gdm-3.14.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gdm/3.14/${name}.tar.xz";
+    sha256 = "0c2rvgcrf4s0nkxb19hf9pgh9c5pm6pginsq21dxj6hnjqabc3p2";
+  };
+
+  # Only needed to make it build
+  preConfigure = ''
+    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+  '';
+
+  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes"
+                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
+  buildInputs = [ pkgconfig glib itstool libxml2 intltool
+                  accountsservice gnome3.dconf systemd
+                  gobjectIntrospection libX11 gtk
+                  libcanberra_gtk3 pam libtool ];
+
+  #enableParallelBuilding = true; # problems compiling
+
+  preBuild = ''
+    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
+    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
+  '';
+
+  # Disable Access Control because our X does not support FamilyServerInterpreted yet
+  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GDM;
+    description = "A program that manages graphical display servers and handles graphical user logins";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
new file mode 100644
index 000000000000..e100e013b786
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
@@ -0,0 +1,13 @@
+--- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200
++++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200
+@@ -369,8 +369,9 @@
+                 gdm_error_trap_push ();
+ 
+                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
+-                        XAddHost (slave->priv->server_display, &host_entries[i]);
++                        //XAddHost (slave->priv->server_display, &host_entries[i]);
+                 }
++                XDisableAccessControl(slave->priv->server_display);
+ 
+                 XSync (slave->priv->server_display, False);
+                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
new file mode 100644
index 000000000000..b8fbad4d731d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
@@ -0,0 +1,17 @@
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index f759d2d..d154716 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -373,9 +373,12 @@ get_system_session_dirs (void)
+ #ifdef ENABLE_WAYLAND_SUPPORT
+                 DATADIR "/wayland-sessions/",
+ #endif
++                NULL,
+                 NULL
+         };
+ 
++        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
++
+         return search_dirs;
+ }
+ 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
new file mode 100644
index 000000000000..412daee9f270
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
@@ -0,0 +1,15 @@
+--- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
++++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
+@@ -322,7 +322,11 @@
+ fallback:
+ #endif
+ 
+-        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++        if (g_getenv("GDM_X_SERVER") != NULL) {
++            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
++        } else {
++            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++        }
+ }
+ 
+ static gboolean
diff --git a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
new file mode 100644
index 000000000000..8c546394bd21
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
@@ -0,0 +1,21 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
+
+
+stdenv.mkDerivation rec {
+  name = "geocode-glib-${gnome3.version}.0";
+
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/geocode-glib/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1cbfv0kds6b6k0cl7q47xpj3x1scwcd7m68zl1rf7i4hmhw4hpqj";
+  };
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig glib libsoup json_glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
new file mode 100644
index 000000000000..2bb4364a19e4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
+
+let
+  majorVersion = "1.42";
+in
+stdenv.mkDerivation rec {
+  name = "gjs-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz";
+    sha256 = "0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13";
+  };
+
+  buildInputs = with gnome3;
+    [ gobjectIntrospection pkgconfig glib pango ];
+
+  propagatedBuildInputs = [ spidermonkey_24 ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
new file mode 100644
index 000000000000..d48e23417221
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-backgrounds-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0fx0pjz356v4w462i9a3z9r26khxqmj0zhp7wfl5scyq07fzkqvn";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
new file mode 100644
index 000000000000..ab8f380f672a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
+, udev, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-bluetooth-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
+    sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
+  };
+
+  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
+                               gsettings_desktop_schemas itstool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
+    description = "Application that let you manage Bluetooth in the GNOME destkop";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
new file mode 100644
index 000000000000..c2eb745a7e5e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libxml2
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-calculator-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-calculator/${gnome3.version}/${name}.tar.xz";
+    sha256 = "068mnwkxliwafcfk70cz85fqna76vjj7kgsm4yqs4c1fd72gphmv";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  libxml2 gnome3.gtksourceview mpfr gmp
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-calculator" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
+    description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
new file mode 100644
index 000000000000..b5c99849afe5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, which, gnome3, autoconf, automake }:
+
+let
+  majVer = "3.14";
+in stdenv.mkDerivation rec {
+  name = "gnome-common-${majVer}.0";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/gnome-common/${majVer}/${name}.tar.xz";
+    sha256 = "0b1676g4q44ah73c5gwl1kg88pc93pnq1pa9kwl43d0vg0pj802c";
+  };
+
+  patches = [(fetchurl {
+    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
+    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
+  })];
+
+  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
new file mode 100644
index 000000000000..0983fd266357
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, intltool, fetchurl, evolution_data_server, db
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
+, libchamplain, clutter_gtk, geocode_glib
+, bash, makeWrapper, itstool, folks, libnotify, libxml2
+, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
+, libsoup, vala, dbus_glib, automake115x, autoconf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-contacts-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-contacts/${gnome3.version}/${name}.tar.xz";
+    sha256 = "09syi67ijdx9dhsx9c740mf3fhs6z3kaijdr3fyj8gd80h7a3hym";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
+
+  # force build from vala
+  preBuild = ''
+   touch src/*.vala
+  '';
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
+                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
+                  folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
+                  libxml2 libsoup gnome3.gnome_online_accounts nspr nss
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  libchamplain clutter_gtk geocode_glib
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  vala automake115x autoconf db ];
+
+  preFixup = ''
+    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  patches = [ ./gio_unix.patch ];
+
+  patchFlags = "-p0";
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Contacts;
+    description = "Contacts is GNOME's integrated address book";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
new file mode 100644
index 000000000000..f1b3d3c94ac2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2015-04-09 18:45:50.581232289 +0200
++++ configure.ac	2015-04-09 18:45:59.744280137 +0200
+@@ -54,6 +54,7 @@
+ 	     champlain-0.12
+ 	     clutter-gtk-1.0
+ 	     geocode-glib-1.0 >= 3.15.3
++	     gio-unix-2.0
+ 	     "
+ PKG_CHECK_MODULES(CONTACTS, [$pkg_modules])
+ 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
new file mode 100644
index 000000000000..f442bd889736
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -0,0 +1,60 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
+, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig
+, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
+, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
+, cracklib, python, krb5, networkmanagerapplet, networkmanager
+, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
+, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
+
+# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
+# TODO: bluetooth, wacom, printers
+
+stdenv.mkDerivation rec {
+  name = "gnome-control-center-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-control-center/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07vvmnqjjcc0cblpr6cdmg3693hihpjrq3q30mm3q68pdyfzbjgf";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = with gnome3;
+    [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
+      libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
+      gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
+      accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
+      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
+      gdk_pixbuf gnome3.adwaita-icon-theme librsvg clutter clutter_gtk
+      hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.vino udev
+      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
+
+  preBuild = ''
+    substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
+    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
+
+    # hack to make test-endianess happy
+    mkdir -p $out/share/locale
+    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
+  '';
+
+  patches = [ ./vpn_plugins_path.patch ];
+
+  preFixup = with gnome3; ''
+    wrapProgram $out/bin/gnome-control-center \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    for i in $out/share/applications/*; do
+      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Single sign-on framework for GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
new file mode 100644
index 000000000000..e25105a303f4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
@@ -0,0 +1,19 @@
+diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
+index 7dc23c2..fcb1384 100644
+--- a/panels/network/connection-editor/vpn-helpers.c
++++ b/panels/network/connection-editor/vpn-helpers.c
+@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
+ 		if (!so_path)
+ 			goto next;
+ 
+-		/* Remove any path and extension components, then reconstruct path
+-		 * to the SO in LIBDIR
+-		 */
+-		so_name = g_path_get_basename (so_path);
+-		g_free (so_path);
+-		so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
+-		g_free (so_name);
+-
+ 		module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+ 		if (!module) {
+ 			g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
new file mode 100644
index 000000000000..fc721f936489
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
+, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
+, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+
+  majorVersion = gnome3.version;
+  minorVersion = "1";
+  name = "gnome-desktop-${majorVersion}.${minorVersion}";
+
+  # this should probably be setuphook for glib
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
+    sha256 = "0v7md6csbnv55j4kns2q0zjl4040zwf3ld6lc3qvik40fkzzbrjb";
+  };
+
+  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
+                  xkeyboard_config isocodes itstool wayland
+                  gtk3 glib intltool gnome_doc_utils libxkbfile
+                  gnome3.gsettings_desktop_schemas gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
new file mode 100644
index 000000000000..a99ddbc9eb45
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-dictionary-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-dictionary/${gnome3.version}/${name}.tar.xz";
+    sha256 = "17ha4pmnh9v98hxqy4pr3ri9wsck9njfjwd8qa0gycksmbyd1cag";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-dictionary" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Dictionary;
+    description = "Dictionary is the GNOME application to look up definitions";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
new file mode 100644
index 000000000000..54034798a494
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
+, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
+, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-disk-utility-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.version}/${name}.tar.xz";
+    sha256 = "14h92bznizq0k4qz7hn41axhhfjyw2ncnmbkf8kldi9x909fvpml";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  libxslt libtool libsecret libpwquality cracklib
+                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
+                  gdk_pixbuf gnome3.adwaita-icon-theme
+                  librsvg udisks2 gnome3.gnome_settings_daemon
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-disks" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
+    description = "A udisks graphical front-end";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
new file mode 100644
index 000000000000..60492c521646
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool
+, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-font-viewer-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0dnkpg1d71dbzazi5chg3vj8bbia2w6k0ji4vh2f4s0b9rvybgzc";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-font-viewer" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Program that can preview fonts and create thumbnails for fonts";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
new file mode 100644
index 000000000000..aacc62a30a9c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
+, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
+, docbook_xsl_ns, docbook_xsl, gnome3 }:
+
+let
+  majVer = gnome3.version;
+in stdenv.mkDerivation rec {
+  name = "gnome-keyring-${majVer}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-keyring/${majVer}/${name}.tar.xz";
+    sha256 = "1xg1xha3x3hzlmvdq2zm90hc61pj7pnf9yxxvgq4ynl5af6bp8qm";
+  };
+
+  buildInputs = with gnome3; [
+    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
+    pango gcr gdk_pixbuf atk p11_kit makeWrapper
+  ];
+
+  propagatedBuildInputs = [ glib libtasn1 libxslt ];
+
+  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
+
+  configureFlags = [
+    "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
+    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
+    "--with-pkcs11-modules=$$out/lib/pkcs11/"
+  ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-keyring" \
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    wrapProgram "$out/bin/gnome-keyring-daemon" \
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
new file mode 100644
index 000000000000..37d2ea1c0863
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-menus-${version}";
+  version = "3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
+    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
+  };
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  preBuild = "patchShebangs ./scripts";
+
+  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
+
+  meta = {
+    homepage = "http://www.gnome.org";
+    description = "Gnome menu specification";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
new file mode 100644
index 000000000000..8e0c17096420
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
+, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
+, telepathy_glib, intltool, dbus_libs, icu, autoreconfHook
+, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
+}:
+
+stdenv.mkDerivation rec {
+  name = "gnome-online-accounts-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+
+  enableParallelBuilding = true;
+
+  preAutoreconf = ''
+    sed '/disable-settings/d' -i configure.ac
+    sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am
+  '';
+
+  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
+                  libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook
+                  docbook_xsl_ns docbook_xsl ];
+
+  preFixup = ''
+    for f in "$out/libexec/"*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
new file mode 100644
index 000000000000..a44d31e9ccb1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
+, libsoup, json_glib, gmp, openssl, makeWrapper }:
+
+let
+  majVer = "3.14";
+in stdenv.mkDerivation rec {
+  name = "gnome-online-miners-${majVer}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-online-miners/${majVer}/${name}.tar.xz";
+    sha256 = "0bbak8srcrvnw18s4ls5mqaamx9nqdi93lij6yjs0a3q320k22xl";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
+                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
+                  gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
+                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    for f in $out/libexec/*; do
+      wrapProgram "$f" \
+        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
+    description = "A set of crawlers that go through your online content and index them locally in Tracker";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
new file mode 100644
index 000000000000..d571c90f8986
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-screenshot-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-screenshot/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0hjbay906xk31rbjmm1ihrhnysh9hf4xgxlkvxj2jlnypx4hvdrv";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-screenshot" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
+    description = "Utility used in the GNOME desktop environment for taking screenshots";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
new file mode 100644
index 000000000000..63fea43baedf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
+, libxslt, intltool, makeWrapper, systemd, xorg }:
+
+
+stdenv.mkDerivation rec {
+  name = "gnome-session-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-session/${gnome3.version}/${name}.tar.xz";
+    sha256 = "17d9zryq13ajmai6fqynpfgghms52sj9h756f086i7fxbr2nsm4v";
+  };
+
+  configureFlags = "--enable-systemd";
+
+  buildInputs = with gnome3;
+    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
+      gnome3.gnome_settings_daemon xorg.xtrans
+      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-session" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
new file mode 100644
index 000000000000..e4d2d80e9f47
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
+, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
+, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager
+, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-settings-daemon-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1l61h497v57g3iqfmyzjh15z4c4akky3xziymphswzigb1ssv3da";
+  };
+
+  # fatal error: gio/gunixfdlist.h: No such file or directory
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
+      libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio
+      libcanberra_gtk3 upower colord libgweather xkeyboard_config
+      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
+      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
+
+  preFixup = ''
+    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix PATH : "${glib}/bin" \
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
new file mode 100644
index 000000000000..abb7b882a2bf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, intltool, fetchurl, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool
+, gnome3, file }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-extensions-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0hd7jskwhrki0s9lmx6vc6rw9y689zp2h7zhlxk90hghy4nkvkc8";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
+                  makeWrapper file ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
+    description = "Modify and extend GNOME Shell functionality and behavior";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
new file mode 100644
index 000000000000..f7e3efd1dd90
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
@@ -0,0 +1,61 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
+, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
+, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
+, hicolor_icon_theme, sqlite, libgweather
+, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
+
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-shell/${gnome3.version}/${name}.tar.xz";
+    sha256 = "00gjdfaznpnspb4jmjc19axiz6snd9drvqmzpq4sw0xh1ysgpncv";
+  };
+
+  # Needed to find /etc/NetworkManager/VPN
+  configureFlags = [ "--sysconfdir=/etc" ];
+
+  buildInputs = with gnome3;
+    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
+      libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
+      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
+      libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
+      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
+      hicolor_icon_theme adwaita-icon-theme sqlite gnome3.gnome-bluetooth
+      libgweather # not declared at build time, but typelib is needed at runtime
+      gnome3.gnome-clocks # schemas needed
+      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
+
+  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
+
+  preBuild = ''
+    patchShebangs src/data-to-c.pl
+    substituteInPlace data/Makefile --replace " install-keysDATA" ""
+  '';
+
+  preFixup = with gnome3; ''
+    wrapProgram "$out/bin/gnome-shell" \
+      --prefix PATH : "${unzip}/bin" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
+      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+    echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
+  '';
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
new file mode 100644
index 000000000000..f0f2f829a33c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl, pkgconfig
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-system-log-3.9.90";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
+    sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-system-log" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
+    description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
new file mode 100644
index 000000000000..e1f4944f86cb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-system-monitor-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.version}/${name}.tar.xz";
+    sha256 = "14akcz4dwjnfx47gncyavjr82zc78a912v5gdp6h3z19bn5nx4q0";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
+                  gtkmm3 libgtop makeWrapper
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-system-monitor" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
+    description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
new file mode 100644
index 000000000000..4a07dbee129b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
+, gnome_doc_utils, intltool, libX11, which, libuuid, vala
+, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = gnome3.version;
+  versionMinor = "1";
+
+  name = "gnome-terminal-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
+    sha256 = "0nxlsz9hwajqfrblvqzc09599dra3van2znmcknnhjcfv3slvkkx";
+  };
+
+  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
+                  gnome3.dconf itstool makeWrapper gnome3.nautilus vala ];
+
+  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
+
+  # FIXME: enable for gnome3
+  configureFlags = [ "--disable-search-provider" "--disable-migration" ];
+
+  preFixup = ''
+    for f in "$out/libexec/gnome-terminal-server"; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
new file mode 100644
index 000000000000..6e98b9817c1e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-themes-standard-${gnome3.version}.0";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0kyrbfrgl6g6wm6zpllldz36fclvl8vwmn1snwk18kf7f6ncpsac";
+  };
+  
+  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
new file mode 100644
index 000000000000..969459aad319
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-user-docs-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-user-docs/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0cck9hnp9az6qan97cv2d5lxlnzfss38h73g1a6dbspl4bnghy4n";
+  };
+
+  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
+    description = "User and system administration help for the GNOME desktop";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.cc-by-30;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
new file mode 100644
index 000000000000..2f158be4e0dd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
+, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
+, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
+
+let
+  majVer = "3.14";
+in stdenv.mkDerivation rec {
+  name = "gnome-user-share-${majVer}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-user-share/${majVer}/${name}.tar.xz";
+    sha256 = "1s9fjzr161hy53i9ibk6aamc9af0cg8s151zj2fb6fxg67pv61bb";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  preConfigure = ''
+    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
+  '';
+
+  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
+                     "--with-modules-path=${apacheHttpd_2_2}/modules"
+                     "--disable-bluetooth"
+                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+                  makeWrapper file gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  nautilus libnotify libcanberra_gtk3 ];
+
+  postInstall = ''
+    mkdir -p $out/share/gsettings-schemas/$name
+    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
+    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/libexec/gnome-user-share" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
+    description = "Service that exports the contents of the Public folder in your home directory on the local network";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
new file mode 100644
index 000000000000..9076d5c58390
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
+, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
+, gmime, json_glib, avahi, tracker, itstool }:
+
+stdenv.mkDerivation rec {
+  name = "grilo-plugins-0.2.13";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
+    sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
+  };
+
+  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
+
+  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
+                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
+                  avahi gnome3.libmediaart tracker intltool itstool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+    description = "A collection of plugins for the Grilo framework";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
new file mode 100644
index 000000000000..a9be29f2b0ed
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib
+, libxml2, gnome3, gobjectIntrospection, libsoup }:
+
+stdenv.mkDerivation rec {
+  name = "grilo-0.2.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
+    sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m";
+  };
+
+  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
+
+  preConfigure = ''
+    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
+       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
+       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
+    done
+  '';
+
+  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
+                  gnome3.totem-pl-parser gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
new file mode 100644
index 000000000000..a13b17fe5e0e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
+  # just for passthru
+, gnome3, gtk3, gsettings_desktop_schemas }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = gnome3.version;
+  versionMinor = "1";
+  moduleName   = "gsettings-desktop-schemas";
+
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "0q9l9fr90pcb3s6crbxkj3wiwn7wp9zfpv7bdxkadj0hspd9zzkl";
+  };
+
+  buildInputs = [ glib gobjectIntrospection ];
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
new file mode 100644
index 000000000000..a9dbbb613161
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool }:
+
+let
+  majVer = "1.0";
+in stdenv.mkDerivation rec {
+  name = "gsound-${majVer}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz";
+    sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
+  };
+
+  buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GSound;
+    description = "Small library for playing system sounds";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
new file mode 100644
index 000000000000..0de89bc5dd65
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
+, libxml2Python, perl, intltool, gettext, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "gtksourceview-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtksourceview/${gnome3.version}/${name}.tar.xz";
+    sha256 = "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6";
+  };
+
+  propagatedBuildInputs = [ gtk3 ];
+
+  buildInputs = [ pkgconfig atk cairo glib pango
+                  libxml2Python perl intltool gettext ];
+
+  preBuild = ''
+    substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
+  ''; 
+
+  patches = [ ./nix_share_path.patch ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
new file mode 100644
index 000000000000..c87350167c25
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
@@ -0,0 +1,11 @@
+--- a/gtksourceview/gtksourceview-utils.c	2014-07-13 16:13:57.418687726 +0200
++++ b/gtksourceview/gtksourceview-utils.c	2014-07-13 16:14:20.550847767 +0200
+@@ -68,6 +68,8 @@
+ 							 basename,
+ 							 NULL));
+ 
++        g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
++
+ 	g_ptr_array_add (dirs, NULL);
+ 
+ 	return (gchar**) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
new file mode 100644
index 000000000000..454196df7a6b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3
+, glib, desktop_file_utils, bash, appdata-tools
+, makeWrapper, gnome3, file, itstool, libxml2 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.adwaita-icon-theme 
+
+stdenv.mkDerivation rec {
+  name = "gucharmap-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gucharmap/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1l26prbi5dmzxs62fz3vrhsif9jwqw4065qxp8hnc8bv34h59phw";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools
+                  gnome3.yelp_tools libxml2 file desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gucharmap" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Gucharmap;
+    description = "GNOME Character Map, based on the Unicode Character Database";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
new file mode 100644
index 000000000000..1875c1491f96
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
+
+stdenv.mkDerivation rec {
+  name = "libcroco-0.6.8";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
+    sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
+  };
+
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+
+  buildInputs = [ pkgconfig libxml2 glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
new file mode 100644
index 000000000000..bedbbee2dfe5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib
+, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
+
+let
+  majorVersion = "0.16";
+in
+stdenv.mkDerivation rec {
+  name = "libgdata-${majorVersion}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
+    sha256 = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827";
+  };
+
+  # TODO: need libuhttpmock
+  configureFlags = "--disable-tests";
+  
+  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
+
+  buildInputs = with gnome3;
+    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection 
+      liboauth gcr gnome_online_accounts p11_kit openssl ];
+
+  propagatedBuildInputs = [ json_glib ];
+      
+  meta = with stdenv.lib; {
+    description = "GData API library";
+    maintainers = with maintainers; [ raskin lethalman ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
new file mode 100644
index 000000000000..82536735b390
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
+let
+  ver_maj = "0.16";
+  ver_min = "1";
+in
+stdenv.mkDerivation rec {
+  name = "libgee-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
+    sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5";
+  };
+
+  doCheck = true;
+
+  patches = [ ./fix_introspection_paths.patch ];
+
+  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
new file mode 100644
index 000000000000..67003f451645
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
@@ -0,0 +1,13 @@
+--- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
++++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
+@@ -12085,8 +12085,8 @@
+        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
++       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
new file mode 100644
index 000000000000..c6c9323c010a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "libgnome-keyring-3.12.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
+    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
+  };
+
+  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = {
+    description = "Framework for managing passwords and other secrets";
+    homepage = http://live.gnome.org/GnomeKeyring;
+    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    inherit (glib.meta) platforms maintainers;
+
+    longDescription = ''
+      gnome-keyring is a program that keeps password and other secrets for
+      users. The library libgnome-keyring is used by applications to integrate
+      with the gnome-keyring system.
+    '';
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
new file mode 100644
index 000000000000..1156474e5a7c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "libgnomekbd-3.6.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
+    sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
+  };
+
+  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
+
+  preFixup = ''
+    wrapProgram $out/bin/gkbd-keyboard-display \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Keyboard management library";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
new file mode 100644
index 000000000000..571fc73e0398
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
+, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "libgweather-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgweather/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1zadscn3i86fy7xpqiyw14pvz4f5cdw50ir77wd0zfr72hk5a2fv";
+  };
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
+  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
new file mode 100644
index 000000000000..72d307f4f1a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
+, openssl, bzip2, acl, attr
+}:
+
+stdenv.mkDerivation rec {
+  name = "libgxps-0.2.2";
+
+  src = fetchurl {
+    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
+  };
+
+  buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
+
+  configureFlags = "--without-liblcms2";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
new file mode 100644
index 000000000000..e59d81f3c1d4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, intltool
+, glib, gtk3, gobjectIntrospection, python, pygobject3
+}:
+
+let
+  majorVersion = "1.12";
+in
+stdenv.mkDerivation rec {
+  name = "libpeas-${version}";
+  version = "${majorVersion}.1";
+
+  buildInputs =  [
+   intltool pkgconfig
+   glib gtk3 gobjectIntrospection python pygobject3
+  ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libpeas/${majorVersion}/${name}.tar.xz";
+    sha256 = "e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6";
+  };
+
+  preFixup = ''
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A GObject-based plugins engine";
+    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
new file mode 100644
index 000000000000..5a8117528b68
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
+
+stdenv.mkDerivation rec {
+  name = "libzapojit-0.0.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
+    sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
+  };
+
+  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
new file mode 100644
index 000000000000..3df5d9f55d9a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
@@ -0,0 +1,35 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
+, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }:
+
+
+stdenv.mkDerivation rec {
+  name = "mutter-${gnome3.version}.1.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07059jmwhc7zf2gww2xw94hhy4csjj2v30ivyzllbas2nvv88l3r";
+  };
+
+  # fatal error: gio/gunixfdlist.h: No such file or directory
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 
+
+  buildInputs = with gnome3;
+    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
+      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
+      gnome3.geocode_glib
+      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/mutter" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
new file mode 100644
index 000000000000..6d004ceb2a37
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
+, gtk, gnome3, libunique, intltool, gobjectIntrospection
+, libnotify, makeWrapper, exempi, librsvg, tracker }:
+
+stdenv.mkDerivation rec {
+  name = "nautilus-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/nautilus/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0y83adhfaq4ns01rdkqmrvdwj0ch2pb10hl43as98kqqzm0qxs3y";
+  };
+
+  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
+                  gnome3.gnome_desktop gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/nautilus" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  patches = [ ./extension_dir.patch ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
new file mode 100644
index 000000000000..317b82579924
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
@@ -0,0 +1,24 @@
+diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
+index 6273a76..4adcc8a 100644
+--- a/libnautilus-private/nautilus-module.c
++++ b/libnautilus-private/nautilus-module.c
+@@ -242,11 +242,17 @@ void
+ nautilus_module_setup (void)
+ {
+ 	static gboolean initialized = FALSE;
++	const gchar* extensiondir = NULL;
+ 
+ 	if (!initialized) {
+ 		initialized = TRUE;
+-		
+-		load_module_dir (NAUTILUS_EXTENSIONDIR);
++	
++		extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
++		if (extensiondir == NULL) {
++			extensiondir = NAUTILUS_EXTENSIONDIR;
++		}
++	
++		load_module_dir (extensiondir);
+ 
+ 		eel_debug_call_at_shutdown (free_module_objects);
+ 	}
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
new file mode 100644
index 000000000000..d1bfee5c14a3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "rest-0.7.92";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
+    sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec";
+  };
+
+  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
+
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
new file mode 100644
index 000000000000..9105dd8e7367
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
+, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
+, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
+, gdk_pixbuf, librsvg, hicolor_icon_theme, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "sushi-3.12.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz";
+    sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff";
+  };
+
+  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
+
+  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
+                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg
+                  gnome3.adwaita-icon-theme hicolor_icon_theme 
+                  libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram $out/libexec/sushi-start \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
+    description = "A quick previewer for Nautilus";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
new file mode 100644
index 000000000000..f1b3bfe53c13
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }:
+
+stdenv.mkDerivation rec {
+  name = "totem-pl-parser-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
+    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
+  };
+
+  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Videos;
+    description = "Simple GObject-based library to parse and save a host of playlist formats";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
new file mode 100644
index 000000000000..511a37e09a0b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, intltool, fetchurl, gst_all_1
+, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2, dbus_glib
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "totem-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/totem/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1qv6s7c06r6kdrd3jjqk8h79y8a7h8pjcx02rzp869jr7d9hkcb9";
+  };
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
+                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+                  gnome3.libpeas pygobject3 shared_mime_info dbus_glib
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gnome_desktop
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/totem" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Videos;
+    description = "Movie player for the GNOME desktop based on GStreamer";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
new file mode 100644
index 000000000000..2b11c22c5f39
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, intltool, fetchurl, libxml2, upower
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, vala, sqlite, libxslt
+, gnome3, librsvg, gdk_pixbuf, file, libnotify
+, evolution_data_server, gst_all_1, poppler
+, icu, taglib, libjpeg, libtiff, giflib, libcue
+, libvorbis, flac, exempi, networkmanager
+, libpng, libexif, libgsf, libuuid, bzip2 }:
+
+let
+  majorVersion = "1.4";
+in
+stdenv.mkDerivation rec {
+  name = "tracker-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz";
+    sha256 = "1ssisbix7ib3d6bgx9s675gx6ayy68jq2srhpzv038mkbaskaz68";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler";
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
+                  bzip2 gnome3.totem-pl-parser libxslt
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg sqlite
+                  upower libnotify evolution_data_server gnome3.libgee
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
+                  poppler icu taglib libjpeg libtiff giflib libvorbis
+                  exempi networkmanager libpng libexif libgsf libuuid
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  preConfigure = ''
+    substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
+  '';
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/Tracker;
+    description = "Desktop-neutral user information store, search tool and indexer";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
new file mode 100644
index 000000000000..c40820959182
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
+, hicolor_icon_theme, gnome3
+, libnotify, file, telepathy_glib, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "vino-${versionMajor}.${versionMinor}";
+  versionMajor = gnome3.version;
+  versionMinor = "0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
+    sha256 = "1icdc2y78xfg7czfiz05y9vsxkzzgrc0dpsrcxb41bg0sh9kd3b0";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  dbus_glib telepathy_glib file makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/libexec/vino-server" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
+    description = "GNOME desktop sharing server";
+    maintainers = with maintainers; [ lethalman iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
similarity index 86%
rename from pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix
rename to pkgs/desktops/gnome-3/3.16/core/vte/default.nix
index 548ca347a456..822522249062 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2
-, selectTextPatch ? false }:
+, gnutls, selectTextPatch ? false }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "0.38";
+  versionMajor = "0.40";
   versionMinor = "0";
   moduleName   = "vte";
 
@@ -10,12 +10,15 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "1llg2xnjpn630vd86ci8csbjjacj3ia6syck2bsq4kinr66z5zsw";
+    sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal";
   };
 
   patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.38.0.patch;
 
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ];
+  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib 
+                  gnome3.gtk3 ncurses vala libxml2 ];
+
+  propagatedBuildInputs = [ gnutls ];
 
   preConfigure = "patchShebangs .";
 
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.0.38.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.0.38.0.patch
rename to pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
new file mode 100644
index 000000000000..adf01c6df845
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
+
+let
+  majVer = gnome3.version;
+in stdenv.mkDerivation rec {
+  name = "yelp-tools-${majVer}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/yelp-tools/${majVer}/${name}.tar.xz";
+    sha256 = "177qzvj5w019isdp41qxqcys2kc4sq2x6dqhqn6l9ipib8a6rxml";
+  };
+
+  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
+    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
+    maintainers = with maintainers; [ iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
new file mode 100644
index 000000000000..3ade5f355d44
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, bash
+, itstool, libxml2, libxslt, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-xsl-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/yelp-xsl/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0jhpni4mmfvj3xf57rjm61nc8d0x66hz9gd1ywws5lh39g6fx59j";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp;
+    description = "Yelp's universal stylesheets for Mallard and DocBook";
+    maintainers = with maintainers; [ lethalman ];
+    license = [licenses.gpl2 licenses.lgpl2];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
new file mode 100644
index 000000000000..413042d752c5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
+, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/yelp/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0az2f1g8gz341i93zxnm6sabrqx416a348ylwfr8vzlg592am2r3";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
+                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
+                  librsvg gdk_pixbuf gnome3.adwaita-icon-theme
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/yelp" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp;
+    description = "The help viewer in Gnome";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
new file mode 100644
index 000000000000..72e8ee6a5937
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
+, gnome_doc_utils, intltool, libX11, which, itstool }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "3.14";
+  versionMinor = "0";
+
+  name = "zenity-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
+    sha256 = "0bw95d6ns67h0mw90qcbhxvhbglbpgd66vinvha7gwba8mnfqmvb";
+  };
+
+  buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
+
+  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
new file mode 100644
index 000000000000..a26b5263dcda
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -0,0 +1,297 @@
+{ callPackage, pkgs, self }:
+
+rec {
+  inherit (pkgs) libsoup glib gtk2;
+  inherit (pkgs.gnome2) ORBit2;
+  gtk3 = pkgs.gtk3_16;
+  gtkmm3 = pkgs.gtkmm3_16;
+  orbit = ORBit2;
+  gnome3 = self // { recurseForDerivations = false; };
+  clutter = pkgs.clutter_1_22;
+  clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; };
+  clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter; };
+  cogl = pkgs.cogl_1_20;
+  gtk = gtk3;
+  gtkmm = gtkmm3;
+  vala = pkgs.vala_0_26;
+  gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
+
+  # Due to gtk 3.12 -> 3.16 transition
+  libcanberra_gtk3 = pkgs.libcanberra_gtk3.override { inherit gtk; }; 
+  libcanberra = libcanberra_gtk3;
+  ibus = pkgs.ibus.override { inherit gnome3; };
+  colord-gtk = pkgs.colord-gtk.override { inherit gtk3; };
+  webkitgtk24x = pkgs.webkitgtk24x.override { inherit gtk3; };
+  webkitgtk = pkgs.webkitgtk.override { inherit gtk3; };
+  libwnck3 = pkgs.libwnck3.override { inherit gtk3; };
+  gtkspell3 = pkgs.gtkspell3.override { inherit gtk3; };
+  librsvg = pkgs.librsvg.override { inherit gtk3; };
+  iconnamingutils = pkgs.iconnamingutils.override { inherit librsvg; };
+  libchamplain = pkgs.libchamplain.override { inherit gtk3 clutter_gtk; };
+  djvulibre = pkgs.djvulibre.override { inherit librsvg; };
+
+  version = "3.16";
+
+# Simplify the nixos module and gnome packages
+  defaultIconTheme = adwaita-icon-theme;
+
+# Backward compatibility, must be removed in favor of defaultIconTheme
+  gnome_icon_theme = adwaita-icon-theme;
+  gnome_icon_theme_symbolic = adwaita-icon-theme;
+
+#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
+
+  adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };
+
+  baobab = callPackage ./core/baobab { };
+
+  caribou = callPackage ./core/caribou { };
+
+  dconf = callPackage ./core/dconf { };
+
+  empathy = callPackage ./core/empathy { 
+    webkitgtk = webkitgtk24x;
+    clutter-gst = pkgs.clutter-gst;
+  };
+
+  epiphany = callPackage ./core/epiphany { };
+
+  evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
+
+  evolution_data_server = callPackage ./core/evolution-data-server { };
+
+  gconf = callPackage ./core/gconf { };
+
+  geocode_glib = callPackage ./core/geocode-glib { };
+
+  gcr = callPackage ./core/gcr { }; # ToDo: tests fail
+
+  gdm = callPackage ./core/gdm { };
+
+  gjs = callPackage ./core/gjs { };
+
+  glib_networking = pkgs.glib_networking.override {
+    inherit gsettings_desktop_schemas;
+  };
+
+  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
+
+  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
+
+  gnome-contacts = callPackage ./core/gnome-contacts { };
+
+  gnome_control_center = callPackage ./core/gnome-control-center { };
+
+  gnome-calculator = callPackage ./core/gnome-calculator { };
+
+  gnome_common = callPackage ./core/gnome-common { };
+
+  gnome_desktop = callPackage ./core/gnome-desktop { };
+
+  gnome-dictionary = callPackage ./core/gnome-dictionary { };
+
+  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
+
+  gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
+
+  gnome-menus = callPackage ./core/gnome-menus { };
+
+  gnome_keyring = callPackage ./core/gnome-keyring { };
+
+  libgnome_keyring = callPackage ./core/libgnome-keyring { };
+
+  libgnomekbd = callPackage ./core/libgnomekbd { };
+
+  folks = callPackage ./core/folks { };
+
+  gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
+
+  gnome-online-miners = callPackage ./core/gnome-online-miners { };
+
+  gnome_session = callPackage ./core/gnome-session { };
+
+  gnome_shell = callPackage ./core/gnome-shell { };
+
+  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
+
+  gnome-screenshot = callPackage ./core/gnome-screenshot { };
+
+  gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
+
+  gnome-system-log = callPackage ./core/gnome-system-log { };
+
+  gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
+
+  gnome_terminal = callPackage ./core/gnome-terminal { };
+
+  gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
+
+  gnome-user-docs = callPackage ./core/gnome-user-docs { };
+
+  gnome-user-share = callPackage ./core/gnome-user-share { };
+
+  grilo = callPackage ./core/grilo { };
+
+  grilo-plugins = callPackage ./core/grilo-plugins { };
+
+  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
+
+  gsound = callPackage ./core/gsound { };
+
+  gtksourceview = callPackage ./core/gtksourceview { };
+
+  gucharmap = callPackage ./core/gucharmap { };
+
+  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
+
+  eog = callPackage ./core/eog { };
+
+  libcroco = callPackage ./core/libcroco {};
+
+  libgee = callPackage ./core/libgee { };
+
+  libgdata = callPackage ./core/libgdata { };
+
+  libgxps = callPackage ./core/libgxps { };
+
+  libpeas = callPackage ./core/libpeas {};
+
+  libgweather = callPackage ./core/libgweather { };
+
+  libzapojit = callPackage ./core/libzapojit { };
+
+  mutter = callPackage ./core/mutter { };
+
+  nautilus = callPackage ./core/nautilus { };
+
+  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
+    inherit gnome3;
+  };
+
+  networkmanager_pptp = pkgs.networkmanager_pptp.override {
+    inherit gnome3;
+  };
+
+  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
+    inherit gnome3;
+  };
+
+  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
+    inherit gnome3;
+  };
+
+  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
+    inherit gnome3;
+  };
+
+  networkmanagerapplet = pkgs.networkmanagerapplet.override {
+    inherit gnome3 gsettings_desktop_schemas glib_networking;
+  };
+
+  rest = callPackage ./core/rest { };
+
+  sushi = callPackage ./core/sushi {
+    webkitgtk = webkitgtk24x;
+    clutter-gst = pkgs.clutter-gst;
+  };
+
+  totem = callPackage ./core/totem { };
+
+  totem-pl-parser = callPackage ./core/totem-pl-parser { };
+
+  tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
+
+  vte = callPackage ./core/vte { };
+
+  vte-select-text = vte.override { selectTextPatch = true; };
+
+  vino = callPackage ./core/vino { };
+
+  yelp = callPackage ./core/yelp { 
+    webkitgtk = webkitgtk24x;
+  };
+
+  yelp_xsl = callPackage ./core/yelp-xsl { };
+
+  yelp_tools = callPackage ./core/yelp-tools { };
+
+  zenity = callPackage ./core/zenity { };
+
+
+#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
+
+  bijiben = callPackage ./apps/bijiben {
+    webkitgtk = webkitgtk24x;
+  };
+
+  evolution = callPackage ./apps/evolution {
+    webkitgtk = webkitgtk24x;
+  };
+
+  file-roller = callPackage ./apps/file-roller { };
+
+  gedit = callPackage ./apps/gedit { };
+
+  glade = callPackage ./apps/glade { };
+
+  gnome-boxes = callPackage ./apps/gnome-boxes {
+    gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
+    spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
+  };
+
+  gnome-clocks = callPackage ./apps/gnome-clocks { };
+
+  gnome-documents = callPackage ./apps/gnome-documents { };
+
+  gnome-music = callPackage ./apps/gnome-music { };
+
+  gnome-photos = callPackage ./apps/gnome-photos {
+    gegl = gegl_0_3;
+  };
+
+  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
+
+  # scrollkeeper replacement
+  rarian = callPackage ./desktop/rarian { };
+
+  seahorse = callPackage ./apps/seahorse { };
+
+  pomodoro = callPackage ./apps/pomodoro { };
+
+#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
+
+  anjuta = callPackage ./devtools/anjuta { };
+
+  gdl = callPackage ./devtools/gdl { };
+
+#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
+
+  geary = callPackage ./misc/geary { 
+    webkitgtk = webkitgtk24x;
+  };
+
+  gfbgraph = callPackage ./misc/gfbgraph { };
+
+  goffice = callPackage ./misc/goffice { };
+
+  gitg = callPackage ./misc/gitg { 
+    webkitgtk = webkitgtk24x;
+  };
+
+  libgda = callPackage ./misc/libgda { };
+
+  libgit2-glib = callPackage ./misc/libgit2-glib {
+    libgit2 = pkgs.libgit2.override { libssh2 = null; };
+  };
+
+  libmediaart = callPackage ./misc/libmediaart { };
+
+  gexiv2 = callPackage ./misc/gexiv2 { };
+
+  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
+
+  gpaste = callPackage ./misc/gpaste { };
+
+  gtkhtml = callPackage ./misc/gtkhtml { };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
new file mode 100644
index 000000000000..a1b38b21869a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
+
+stdenv.mkDerivation rec {
+  name = "rarian-0.8.1";
+  src = fetchurl {
+    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
+    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
+  };
+
+  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
new file mode 100644
index 000000000000..a55adf6d9759
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
+  itstool, python }:
+
+let
+  major = gnome3.version;
+  minor = "0";
+
+in stdenv.mkDerivation rec {
+  version = "${major}.${minor}";
+  name = "anjuta-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
+    sha256 = "b1aac2d4c35891b23c9bc3f168bf2845e02d0a438742478c98e450950d82b5e5";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
+    gnome3.libgda gnome3.gtksourceview intltool itstool python ];
+
+  meta = with stdenv.lib; {
+    description = "Software development studio";
+    homepage = http://anjuta.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
new file mode 100644
index 000000000000..9cad72de8f99
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
+
+let
+  major = gnome3.version;
+  minor = "0";
+
+in stdenv.mkDerivation rec {
+  version = "${major}.${minor}";
+  name = "gdl-${version}";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
+    sha256 = "4b903c28a8894a82b997a1732a443c8b1d6a510304b3c3b511023339ff5d01db";
+  };
+
+  buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
+
+  meta = with stdenv.lib; {
+    description = "Gnome docking library";
+    homepage = https://developer.gnome.org/gdl/;
+    license = [ licenses.gpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
new file mode 100644
index 000000000000..21f55a6d81e3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
+, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
+, libnotify, libcanberra, libsecret, gmime
+, libpthreadstubs, hicolor_icon_theme
+, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
+
+let
+  majorVersion = "0.8";
+in
+stdenv.mkDerivation rec {
+  name = "geary-${majorVersion}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
+    sha256 = "3cfa626168935acf49c9415fad54c7849f17fd833026cfd3c224ba0fb892d641";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
+                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime
+                  libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme
+                  gdk_pixbuf librsvg gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ];
+
+  preConfigure = ''
+    substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/gsettings-schemas/${name}/
+    mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/bin/geary" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  enableParallelBuilding = true;
+
+  patches = [ ./disable_valadoc.patch ];
+  patchFlags = "-p0";
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Geary;
+    description = "Mail client for GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
new file mode 100644
index 000000000000..e65c0dea7472
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
@@ -0,0 +1,24 @@
+--- src/CMakeLists.txt.orig	2014-05-23 14:41:20.809160364 +0200
++++ src/CMakeLists.txt	2014-05-23 14:41:29.240261581 +0200
+@@ -696,21 +696,6 @@
+         ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
+ )
+ 
+-# Valadoc
+-#################################################
+-foreach(pkg ${ENGINE_PACKAGES})
+-    list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
+-endforeach(pkg ${ENGINE_PACKAGES})
+-
+-include(FindValadoc)
+-add_custom_target(
+-    valadoc
+-    WORKING_DIRECTORY
+-        ${CMAKE_SOURCE_DIR}/src
+-    COMMAND
+-        ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
+-)
+-
+ ## Make clean: remove copied files
+ ##################################################
+ set_property(
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
new file mode 100644
index 000000000000..7d2c8cf0eb39
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }:
+
+let
+  majorVersion = "0.10";
+in
+stdenv.mkDerivation rec {
+  name = "gexiv2-${version}";
+  version = "${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
+    sha256 = "2fd21f0ed5125e51d02226e7f41be751cfa8ae411a8ed1a651e16b06d79047b2";
+  };
+  
+  preConfigure = ''
+    patchShebangs .
+  '';
+  
+  buildInputs = [ pkgconfig glib libtool m4 ];
+  propagatedBuildInputs = [ exiv2 ];
+  
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/gexiv2;
+    description = "GObject wrapper around the Exiv2 photo metadata library";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
new file mode 100644
index 000000000000..d36534f0d32f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, gnome3, libsoup, json_glib }:
+
+stdenv.mkDerivation rec {
+  name = "gfbgraph-0.2.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
+    sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4";
+  };
+
+  buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
+  propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "GLib/GObject wrapper for the Facebook Graph API";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
new file mode 100644
index 000000000000..998f1f5f735f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
+, json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection
+, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.adwaita-icon-theme 
+
+let
+  majorVersion = "3.14";
+in
+stdenv.mkDerivation rec {
+  name = "gitg-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gitg/${majorVersion}/${name}.tar.xz";
+    sha256 = "8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b";
+  };
+
+  preCheck = ''
+    substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+  doCheck = true;
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  propagatedUserEnvPkgs = [ shared_mime_info
+                            gnome3.gnome_themes_standard ];
+
+  buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
+                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
+                  gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gitg" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
+    description = "GNOME GUI client to view git repositories";
+    maintainers = with maintainers; [ iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
new file mode 100644
index 000000000000..2af75a7ffac3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, intltool, fetchurl, python, pygobject3, atk
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup
+, bash, makeWrapper, itstool, libxml2, python3Packages
+, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-tweak-tool-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0pc62qwxgjrgxdhn3qqdzxpx0prrn6c948hqj66w2dy8r0yrdiqw";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  makeFlags = [ "DESTDIR=/" ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  python pygobject3 libnotify gnome3.gnome_shell
+                  libsoup gnome3.gnome_settings_daemon gnome3.nautilus
+                  gnome3.gnome_desktop ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-tweak-tool" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
+  '';
+
+  patches = [ ./find_gsettings.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
+    description = "A tool to customize advanced GNOME 3 options";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
new file mode 100644
index 000000000000..3e68c04cb3ab
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
@@ -0,0 +1,22 @@
+diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
+index a00fe19..dce74b2 100644
+--- a/gtweak/gsettings.py
++++ b/gtweak/gsettings.py
+@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
+ 
+ class _GSettingsSchema:
+     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
+-        if not schema_dir:
+-            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
+         if not schema_filename:
+             schema_filename = schema_name + ".gschema.xml"
++        if not schema_dir:
++            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
++            for xdg_dir in GLib.get_system_data_dirs():
++                dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
++                if os.path.exists(os.path.join(dir, schema_filename)):
++                    schema_dir = dir
++                    break
+ 
+         schema_path = os.path.join(schema_dir, schema_filename)
+         if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
new file mode 100644
index 000000000000..02520a9f121a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
+, pango, libgsf, libxml2, libart, intltool, gettext
+, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.8.17";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
+    sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
+  };
+
+  # fix linking error: undefined reference to pcre_info
+  patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
+
+  buildInputs = [
+    pkgconfig libglade bzip2 libart intltool gettext
+    gconf libgnomeui pcre
+  ];
+
+  propagatedBuildInputs = [
+    # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
+    glib libgsf libxml2 gtk libglade libart cairo pango
+  ];
+
+  postInstall =
+    ''
+      # Get GnuCash to build.  Might be unnecessary if we upgrade pkgconfig.
+      substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
+    '';
+
+  doCheck = true;
+
+  meta = gnome3.goffice.meta // {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
new file mode 100644
index 000000000000..fd16d2d4985f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
+, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.10.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
+    sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
+    glib gtk3 libxml2 cairo pango libgsf
+  ];
+
+  buildInputs = [ libxslt librsvg ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = {
+    description = "A Glib/GTK+ set of document centric objects and utilities";
+
+    longDescription = ''
+      There are common operations for document centric applications that are
+      conceptually simple, but complex to implement fully: plugins, load/save
+      documents, undo/redo.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch
new file mode 100644
index 000000000000..cd4ef3c9fed7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch
@@ -0,0 +1,13 @@
+diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
+index bc4aae4..3adb696 100644
+--- a/goffice/utils/regutf8.c
++++ b/goffice/utils/regutf8.c
+@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ 		default: return GO_REG_BADPAT;
+ 		}
+ 	} else {
+-		gor->re_nsub = pcre_info (r, NULL, NULL);
++		gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
+ 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ 		return 0;
+ 	}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
new file mode 100644
index 000000000000..3975b84a05a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
+, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "${gnome3.version}";
+  name = "gpaste-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
+    sha256 = "1dj5pv87j9s32f778i5bdlmrg60i9cyh4411a66kxbqyfdrq7ys0";
+  };
+
+  buildInputs = [ intltool autoreconfHook pkgconfig vala glib
+                  gtk3 gnome3.gnome_control_center dbus.libs
+                  clutter pango appstream-glib makeWrapper ];
+
+  preConfigure = "intltoolize -f";
+
+  configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
+                     "--with-dbusservicesdir=$(out)/share/dbus-1/services" ];
+
+  enableParallelBuilding = true;
+
+  preFixup = 
+    let
+      libPath = stdenv.lib.makeLibraryPath
+        [ glib gtk3 clutter pango ];
+    in
+    ''
+      for i in $out/libexec/gpaste/*; do
+        wrapProgram $i \
+          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+      done
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Keruspe/GPaste;
+    description = "Clipboard management system with GNOME3 integration";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
new file mode 100644
index 000000000000..49d888a866be
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, intltool
+, gnome3, enchant, isocodes }:
+
+let
+  majorVersion = "4.8";
+in
+stdenv.mkDerivation rec {
+  name = "gtkhtml-${majorVersion}.5";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkhtml/${majorVersion}/${name}.tar.xz";
+    sha256 = "2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d";
+  };
+
+  buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas ];
+
+  propagatedBuildInputs = [ enchant isocodes ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
new file mode 100644
index 000000000000..3944644a4536
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }:
+
+let
+  major = "5.2";
+  minor = "2";
+
+in stdenv.mkDerivation rec {
+  version = "${major}.${minor}";
+  name = "libgda-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz";
+    sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4";
+  };
+
+  configureFlags = [
+    "--enable-gi-system-install=no"
+  ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ];
+
+  meta = with stdenv.lib; {
+    description = "Database access library";
+    homepage = http://www.gnome-db.org/;
+    license = [ licenses.lgpl2 licenses.gpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
new file mode 100644
index 000000000000..0bcf85e1d424
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
+, gtk_doc, gobjectIntrospection, libgit2, glib }:
+
+let
+  majorVersion = "0.0";
+in
+stdenv.mkDerivation rec {
+  name = "libgit2-glib-${majorVersion}.24";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgit2-glib/0.0/${name}.tar.xz";
+    sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8";
+  };
+
+  configureScript = "sh ./autogen.sh";
+
+  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
+                  gtk_doc gobjectIntrospection libgit2 glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
new file mode 100644
index 000000000000..5ac6b50198bd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection }:
+
+let
+  majorVersion = "1.9";
+in
+stdenv.mkDerivation rec {
+  name = "libmediaart-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
+    sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
+  };
+
+  buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    description = "Library tasked with managing, extracting and handling media art caches";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
new file mode 100644
index 000000000000..14fbcdf7342c
--- /dev/null
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, glib
+, gtk_doc, autoconf, automake, libtool, libarchive, libyaml
+, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
+}:
+
+stdenv.mkDerivation rec {
+  name = "appstream-glib-0.3.6";
+
+  src = fetchurl {
+    url = "https://github.com/hughsie/appstream-glib/archive/appstream_glib_0_3_6.tar.gz";
+    sha256 = "1zdxg9dk9vxw2cs04cswd138di3dysz0hxk4918750hh19s3859c";
+  };
+
+  buildInputs = [ glib libtool pkgconfig gtk_doc gettext intltool sqlite libsoup
+                  gcab attr acl docbook_xsl
+                  libarchive libyaml gtk3 autoconf automake gobjectIntrospection ];
+
+  configureScript = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Objects and helper methods to read and write AppStream metadata";
+    homepage    = https://github.com/hughsie/appstream-glib;
+    license     = licenses.lgpl21Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ lethalman ];
+  };
+
+}
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index ce7f92a20354..d5e442c738cc 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
 
 let
-  ver_maj = "2.12";
+  ver_maj = "2.16";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
-    sha256 = "13zijfcmx7sda83qkryzsmr9hw0r3b73xkagq9cmm733fhcl7a28";
+    sha256 = "0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9";
   };
 
   buildInputs = libintlOrEmpty;
diff --git a/pkgs/development/libraries/clutter-gst/3.0.nix b/pkgs/development/libraries/clutter-gst/3.0.nix
new file mode 100644
index 000000000000..617501130ca3
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gst/3.0.nix
@@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gst-3.0.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter-gst/3.0/${name}.tar.xz";
+    sha256 = "0ahn6m9ca78cgf7xad16sb50x4dx0fcn5ircllilkir84iri2466";
+  };
+
+  propagatedBuildInputs = [ clutter gtk3 glib cogl ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "GStreamer bindings for clutter";
+
+    homepage = http://www.clutter-project.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/clutter-gtk/1.4.nix b/pkgs/development/libraries/clutter-gtk/1.4.nix
new file mode 100644
index 000000000000..e493bab1bc75
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gtk/1.4.nix
@@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gtk-1.4.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
+    sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
+  };
+
+  propagatedBuildInputs = [ clutter gtk3 ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Clutter-GTK";
+
+    homepage = http://www.clutter-project.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/clutter-gtk/1.6.nix b/pkgs/development/libraries/clutter-gtk/1.6.nix
new file mode 100644
index 000000000000..9c4e7ae12713
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gtk/1.6.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gtk-1.6.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter-gtk/1.6/${name}.tar.xz";
+    sha256 = "883550b574a036363239442edceb61cf3f6bedc8adc97d3404278556dc82234d";
+  };
+
+  propagatedBuildInputs = [ clutter gtk3 ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Clutter-GTK";
+    homepage = http://www.clutter-project.org/;
+    license = stdenv.lib.licenses.lgpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/clutter/1.22.nix b/pkgs/development/libraries/clutter/1.22.nix
new file mode 100644
index 000000000000..e303d5f03392
--- /dev/null
+++ b/pkgs/development/libraries/clutter/1.22.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
+, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
+gobjectIntrospection 
+}:
+
+let
+  ver_maj = "1.22";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "clutter-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
+    sha256 = "5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs =
+    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
+      atk json_glib gobjectIntrospection
+    ];
+
+  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
+
+  #doCheck = true; # no tests possible without a display
+
+  meta = {
+    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
+
+    longDescription =
+      '' Clutter is free software library for creating fast, compelling,
+         portable, and dynamic graphical user interfaces.  It is a core part
+         of MeeGo, and is supported by the open source community.  Its
+         development is sponsored by Intel.
+
+         Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
+         on mobile and embedded platforms), but wraps an easy to use,
+         efficient, flexible API around GL's complexity.
+
+         Clutter enforces no particular user interface style, but provides a
+         rich, generic foundation for higher-level toolkits tailored to
+         specific needs.
+      '';
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+    homepage = http://www.clutter-project.org/;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 67de04050afe..37b2c73fe44e 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
     homepage = http://www.clutter-project.org/;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ];
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix
new file mode 100644
index 000000000000..1489f48c9b46
--- /dev/null
+++ b/pkgs/development/libraries/cogl/1.20.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
+, pangoSupport ? true, pango, cairo, gobjectIntrospection
+, gstreamerSupport ? true, gst_all_1 }:
+
+let
+  ver_maj = "1.20";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "cogl-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
+    sha256 = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  configureFlags = [
+    "--enable-introspection"
+    "--enable-gles1"
+    "--enable-gles2"
+    "--enable-kms-egl-platform"
+  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+
+  propagatedBuildInputs = with xorg; [
+      glib gdk_pixbuf gobjectIntrospection
+      mesa_noglu libXrandr libXfixes libXcomposite libXdamage
+    ]
+    ++ libintlOrEmpty
+    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
+                                               gst_all_1.gst-plugins-base ];
+
+  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
+
+  COGL_PANGO_DEP_CFLAGS
+    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
+      "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
+  #doCheck = true; # all tests fail (no idea why)
+
+  meta = with stdenv.lib; {
+    description = "A small open source library for using 3D graphics hardware for rendering";
+    maintainers = with maintainers; [ lovek323 ];
+
+    longDescription = ''
+      Cogl is a small open source library for using 3D graphics hardware for
+      rendering. The API departs from the flat state machine style of OpenGL
+      and is designed to make it easy to write orthogonal components that can
+      render without stepping on each other's toes.
+    '';
+
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
new file mode 100644
index 000000000000..5a8b1f2fcbc5
--- /dev/null
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, intltool, gobjectIntrospection, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "gcab-0.6";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gcab/0.6/${name}.tar.xz";
+    sha256 = "a0443b904bfa7227b5155bfcdf9ea9256b6e26930b8febe1c41f972f6f1334bb";
+  };
+
+  buildInputs = [ intltool gobjectIntrospection pkgconfig ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
new file mode 100644
index 000000000000..575e2d562aad
--- /dev/null
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
+, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib }:
+
+stdenv.mkDerivation rec {
+  name = "gegl-0.3.0-20140619";
+
+  src = fetchgit {
+    url = "https://git.gnome.org/browse/gegl";
+    sha256 = "1rjmv2y7z34zrnlqczmmh0bm724iszzdf6jpibszxnp3w0npwjrb";
+    rev = "0014eb1bad50244314ed09592fe57efa9322678c";
+  };
+
+  configureScript = "./autogen.sh";
+
+  # needs fonts otherwise  don't know how to pass them
+  configureFlags = "--disable-docs";
+
+  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool
+                  autoconf automake libtool which json_glib ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = { 
+    description = "Graph-based image processing framework";
+    homepage = http://www.gegl.org;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 88d9837d5975..88545bf732c2 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
      substituteInPlace configure --replace "-Werror" ""
   '';
 
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
   propagatedBuildInputs = [ dbus dbus_glib glib ];
 
   meta = {
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index ee7f39585efd..6f0394823a6e 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -2,15 +2,15 @@
 , gsettings_desktop_schemas }:
 
 let
-  ver_maj = "2.42";
-  ver_min = "1";
+  ver_maj = "2.44";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "glib-networking-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
-    sha256 = "c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0";
+    sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
   };
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 9e06ed664126..256660666019 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
 
 let
-  ver_maj = "2.42";
+  ver_maj = "2.44";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397";
+    sha256 = "1a1fczy7hcpn24fglyn4i79f4yjc8s50is70q03mb294bm1c02hv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 8263ee7071c9..200c0d4e01de 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -5,7 +5,7 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.40";
+  ver_maj = "1.42";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln";
+    sha256 = "3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7";
   };
 
   buildInputs = [ flex bison pkgconfig python ]
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage    = http://live.gnome.org/GObjectIntrospection;
-    maintainers = with maintainers; [ lovek323 urkud ];
+    maintainers = with maintainers; [ lovek323 urkud lethalman ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix
new file mode 100644
index 000000000000..84bea07602fd
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/3.16.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, pkgconfig, gettext, perl
+, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
+, xlibs, x11, wayland, libxkbcommon, epoxy
+, xineramaSupport ? stdenv.isLinux
+, cupsSupport ? stdenv.isLinux, cups ? null
+}:
+
+assert xineramaSupport -> xlibs.libXinerama != null;
+assert cupsSupport -> cups != null;
+
+let
+  ver_maj = "3.16";
+  ver_min = "2";
+  version = "${ver_maj}.${ver_min}";
+in
+stdenv.mkDerivation rec {
+  name = "gtk+3-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
+    sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0";
+  };
+
+  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
+
+  buildInputs = [ libxkbcommon epoxy ];
+  propagatedBuildInputs = with xlibs; with stdenv.lib;
+    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
+    ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
+    ++ optional stdenv.isDarwin x11
+    ++ optional xineramaSupport libXinerama
+    ++ optional cupsSupport cups;
+
+  # demos fail to install, no idea where's the problem
+  preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
+
+  enableParallelBuilding = true;
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  passthru = {
+    gtkExeEnvPostBuild = ''
+      rm $out/lib/gtk-3.0/3.0.0/immodules.cache
+      $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache
+    ''; # workaround for bug of nix-mode for Emacs */ '';
+  };
+
+  meta = {
+    description = "A multi-platform toolkit for creating graphical user interfaces";
+
+    longDescription = ''
+      GTK+ is a highly usable, feature rich toolkit for creating
+      graphical user interfaces which boasts cross platform
+      compatibility and an easy to use API.  GTK+ it is written in C,
+      but has bindings to many other popular programming languages
+      such as C++, Python and C# among others.  GTK+ is licensed
+      under the GNU LGPL 2.1 allowing development of both free and
+      proprietary software with GTK+ without any license fees or
+      royalties.
+    '';
+
+    homepage = http://www.gtk.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix
new file mode 100644
index 000000000000..bc3274688555
--- /dev/null
+++ b/pkgs/development/libraries/gtkmm/3.16.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
+
+let
+  ver_maj = "3.16";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "gtkmm-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
+    sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = {
+    description = "C++ interface to the GTK+ graphical user interface library";
+
+    longDescription = ''
+      gtkmm is the official C++ interface for the popular GUI library
+      GTK+.  Highlights include typesafe callbacks, and a
+      comprehensive set of widgets that are easily extensible via
+      inheritance.  You can create user interfaces either in code or
+      with the Glade User Interface designer, using libglademm.
+      There's extensive documentation, including API reference and a
+      tutorial.
+    '';
+
+    homepage = http://gtkmm.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 739b0ad3136a..dcdef696ffdf 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -5,15 +5,15 @@
 , gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }:
 
 let
-  ver_maj = "1.18";
-  version = "${ver_maj}.3";
+  ver_maj = "1.22";
+  version = "${ver_maj}.2";
 in
 stdenv.mkDerivation rec {
   name = "gvfs-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
-    sha256 = "0b27vidnrwh6yb2ga9a1k9qlrz6lrzsaz2hcxqbc1igivhb9g0hx";
+    sha256 = "8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libtool ];
@@ -35,8 +35,9 @@ stdenv.mkDerivation rec {
     wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  meta = {
-    description = "Virtual Filesystem support library" + stdenv.lib.optionalString gnomeSupport " (full GNOME support)";
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 9cdf9d411ccd..1a3c33eb80a7 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -2,11 +2,11 @@
 , clutter_gtk, libsoup /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
-  name = "libchamplain-0.12.2";
+  name = "libchamplain-0.12.10";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.2.tar.xz;
-    sha256 = "0bkyzm378gh6qs7grr2vgzrl4z1pi99yysy8iwzdqzs0bs3rfgyj";
+    url = "mirror://gnome/sources/libchamplain/0.12/${name}.tar.xz";
+    sha256 = "019b8scnx7d3wdylmpk9ihzh06w25b63x9cn8nhj6kjx82rcwlxz";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index e5682219dba1..8abacf6f1c87 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "libxkbcommon-0.4.2";
+  name = "libxkbcommon-0.4.3";
 
   src = fetchurl {
     url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha256 = "0mw9ljc5fbqbhnm884w7ns5pf6f2rqj9ww5xcaps9nzdgsq73z50";
+    sha1 = "2251adc7425c816ec7af4f1c3776a619a53293b6";
   };
 
   buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index f67e3f2468b4..545026108876 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.6.5";
+  version = "2.8.0";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "14vmqq6hr3jzphay49984kj22vlqhpsjmwh1krdm9k57rqbq0rdi";
+    sha256 = "05b8mkr1mv1w5vi5vyczzirgf5nr6qavrdwbcaiv0dghylwx5yh5";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];
@@ -47,5 +47,5 @@ stdenv.mkDerivation rec {
     libsoup gtk3
   ];
 
-  # enableParallelBuilding = true; # build problems on Hydra
+  enableParallelBuilding = true; # build problems on Hydra
 }
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 54b349c425ca..1ea61b0fea2b 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
 , libnotify, libsecret, dbus_glib, polkit, isocodes
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
-, makeWrapper, udev, hicolor_icon_theme, dconf }:
+, makeWrapper, udev, hicolor_icon_theme }:
 
 let
   pn = "network-manager-applet";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/nm-applet" \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
       --prefix PATH ":" "${gnome3.gconf}/bin"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93b7e339cbec..1c0bc08be131 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2093,7 +2093,7 @@ let
 
   networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
 
-  networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; };
+  networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
 
   newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
 
@@ -5420,6 +5420,8 @@ let
 
   appstream = callPackage ../development/libraries/appstream { };
 
+  appstream-glib = callPackage ../development/libraries/appstream-glib { };
+
   apr = callPackage ../development/libraries/apr { };
 
   aprutil = callPackage ../development/libraries/apr-util {
@@ -5552,10 +5554,19 @@ let
     cogl = cogl_1_18;
   };
 
+  clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix {
+    cogl = cogl_1_20;
+  };
+
   clutter-gst = callPackage ../development/libraries/clutter-gst { };
 
+  clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { };
+
   clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
   clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };
+  clutter_gtk_1_6 = callPackage ../development/libraries/clutter-gtk/1.6.nix {
+    clutter = clutter_1_22;
+  };
 
   cminpack = callPackage ../development/libraries/cminpack { };
 
@@ -5563,6 +5574,8 @@ let
 
   cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
 
+  cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { };
+
   coin3d = callPackage ../development/libraries/coin3d { };
 
   commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
@@ -5760,6 +5773,8 @@ let
 
   gav = callPackage ../games/gav { };
 
+  gcab = callPackage ../development/libraries/gcab { };
+
   gsb = callPackage ../games/gsb { };
 
   gdome2 = callPackage ../development/libraries/gdome2 {
@@ -5772,6 +5787,8 @@ let
 
   gegl = callPackage ../development/libraries/gegl { };
 
+  gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { };
+
   geoclue = callPackage ../development/libraries/geoclue {};
 
   geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
@@ -6025,10 +6042,17 @@ let
 
   gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
 
+  gtk3_16 = callPackage ../development/libraries/gtk+/3.16.nix {
+    gettext = gettextWithExpat gettext_0_19;
+  };
+
   gtk = pkgs.gtk2;
 
   gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
   gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
+  gtkmm3_16 = callPackage ../development/libraries/gtkmm/3.16.nix {
+    gtk3 = gtk3_16;
+  };
 
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
     gtksharp = gtk-sharp;
@@ -11978,7 +12002,7 @@ let
 
   termite = callPackage ../applications/misc/termite {
     gtk = gtk3;
-    vte = gnome3_12.vte-select-text;
+    vte = gnome3_16.vte-select-text;
    };
 
   tesseract = callPackage ../applications/graphics/tesseract { };
@@ -13003,6 +13027,11 @@ let
     callPackage = pkgs.newScope pkgs.gnome3_12;
   });
 
+  gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 {
+    callPackage = pkgs.newScope pkgs.gnome3_16;
+    self = pkgs.gnome3_16;
+  });
+
   gnome3 = gnome3_12;
 
   gnome = recurseIntoAttrs gnome2;

From 2a7a94d8351ee263421808e5908c15871803d0f1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 25 Apr 2015 07:31:45 -0500
Subject: [PATCH 0169/1143] kdeApps_15_04: fix source urls

---
 pkgs/applications/kde-apps-15.04/manifest.nix | 2052 ++++++++++++++++-
 pkgs/applications/kde-apps-15.04/manifest.sh  |    3 +-
 2 files changed, 2045 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix
index e02efe4785d1..09d89ef70458 100644
--- a/pkgs/applications/kde-apps-15.04/manifest.nix
+++ b/pkgs/applications/kde-apps-15.04/manifest.nix
@@ -379,6 +379,15 @@
       name = "kde-l10n-ar-15.04.0.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca_valencia-15.04.0.tar.xz";
+      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
+      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar";
     store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz";
@@ -604,15 +613,6 @@
       name = "kde-l10n-bg-15.04.0.tar.xz";
     };
   }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca@valencia-15.04.0.tar.xz";
-      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
-      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
-    };
-  }
   {
     name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.0.tar.xz" ".tar";
     store = "/nix/store/rkbbjy12la1p7l7vm5xk4hwy72f4piys-kde-l10n-eu-15.04.0.tar.xz";
@@ -2035,4 +2035,2038 @@
       name = "kjumpingcube-15.04.0.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kaccessible-15.04.0.tar.xz";
+      sha256 = "1q90ak7yxvvi5scxajb3d4nid2h7y7xfvdbqfd9a6w312r6lcvz8";
+      name = "kaccessible-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kuser-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4q0xn6h1mf6plwikl16v490hbcm1c3jf-kuser-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kuser-15.04.0.tar.xz";
+      sha256 = "0fgjfd76iiyp98013x9la61qxnw454kcrl7vpikg37hqaqbzmgkh";
+      name = "kuser-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiriki-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p393dfammjyxak0wm3vblzcb8n7r0gnw-kiriki-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kiriki-15.04.0.tar.xz";
+      sha256 = "0cg4iijyk96lwc48ifs5arip3y51wpb4fd4slgjbkhvg4fc859sa";
+      name = "kiriki-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/819bf5a5q4b4l0w9yi099capf9il9whz-kdepimlibs-4.14.7.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdepimlibs-4.14.7.tar.xz";
+      sha256 = "1cmqyx0shm0ss48pjh9jm9g9bghkkl6fg5wgw4yhs4dgz1nj9qn1";
+      name = "kdepimlibs-4.14.7.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "amor-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fmbdfhm9703yaq7x619d1s97il6prp7r-amor-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/amor-15.04.0.tar.xz";
+      sha256 = "167j2qqkivrc2pid11nmnllw2m2amr8d9jvafy54j3i7mcbs788k";
+      name = "amor-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knavalbattle-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/y9k66adhrcr1vxyzdvsx3zymkd7b4zaa-knavalbattle-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/knavalbattle-15.04.0.tar.xz";
+      sha256 = "0hgwx63g1lrzrszajya4va2pidh2xm1qy7b8iw5xi1yz1khn6cvd";
+      name = "knavalbattle-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiten-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zb4wpb0g4vbkrnwrk7d54l2dd88cz4b2-kiten-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kiten-15.04.0.tar.xz";
+      sha256 = "0lpvwm20zr7zq7p09igbacqhm7pv4bv7r701nijw5l9l4d58hq3y";
+      name = "kiten-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4i8v7c1a44idrlpdqc6yk41w6r34259x-kwalletmanager-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kwalletmanager-15.04.0.tar.xz";
+      sha256 = "0c5r6pfinb509a0mn2k31wksiya9b52pjm77bbaq60k1y39fsizc";
+      name = "kwalletmanager-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalzium-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6ivi9a4yilhb621zj0kz07yzbxa5wpxs-kalzium-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kalzium-15.04.0.tar.xz";
+      sha256 = "1x3vdi9h5px84cm7k1nbrlakkb13xrc25d6yw22pnfsf3v4n66f5";
+      name = "kalzium-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfloppy-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7w91cal36byklnn0mzzclgjj5hpjzb2j-kfloppy-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kfloppy-15.04.0.tar.xz";
+      sha256 = "1nmcdzd7zhr4vfxb8lgl7dxfs01wy81kcag36s43hg7mfs5xb0k4";
+      name = "kfloppy-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolf-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/76g0y1k03dlc50d5wfdgpb2grsy9p0qa-kolf-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kolf-15.04.0.tar.xz";
+      sha256 = "0nzqvq5y2mvh7x2lsq8prkyn99j8137hq5pyk5d9yhla4lpq2lr4";
+      name = "kolf-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "print-manager-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rmvqcnl3b77hxhcw7z22vx03pi1gk3gp-print-manager-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/print-manager-15.04.0.tar.xz";
+      sha256 = "0yn8dhvpxv5dxdn41c6rzar66gvlqmgb3m9f0rdrxzqmw9xidzrg";
+      name = "print-manager-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "poxml-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kinljjyys5d6s5rfyhl6jzmh8z5bm92d-poxml-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/poxml-15.04.0.tar.xz";
+      sha256 = "1cziw2ydylsx45s5hrg1bfwk8qv9jbvji3hyzwi6jqc72fpv9q5x";
+      name = "poxml-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblocks-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jjkr9khw6fzh7hb4xss9jx2qwz05jral-kblocks-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kblocks-15.04.0.tar.xz";
+      sha256 = "0q32xvajnv7x3fmhax1bmc4f7530cijisn48hpnpkm4g4mn68qb0";
+      name = "kblocks-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdf-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1wrgspd1n890ln1dffghslw86z2ynfz3-kdf-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdf-15.04.0.tar.xz";
+      sha256 = "18i9rbl210vj370n3irjy2ai4vrhg26ivfs37wl0zdvz4i81ncg7";
+      name = "kdf-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/krsghsp3cs3wmib774g36933smh1bldv-libkomparediff2-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkomparediff2-15.04.0.tar.xz";
+      sha256 = "0i9vyc4bfqj22a1v48f3gyfkxl3pi9smsg0lql1bs0x8rsn7iznd";
+      name = "libkomparediff2-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/659kk26hrkssc4xkyda1kwf41ri00csx-kde-dev-scripts-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-dev-scripts-15.04.0.tar.xz";
+      sha256 = "09r8wcln0m5akwjs939dbbz20kdqyxag91028vfmwzkw9r99604y";
+      name = "kde-dev-scripts-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/i8i89jlpkd3rmgyfbw8xbv67az4xkmjq-kdepim-4.14.7.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdepim-4.14.7.tar.xz";
+      sha256 = "0hnmpjrcv0qcyn6hagpayza2bjkyd2v8y02rriifq9q99j7rwyj0";
+      name = "kdepim-4.14.7.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/xdmcjjrfxhwwigf32sbafbakczc9jfyd-kde-l10n-km-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-km-15.04.0.tar.xz";
+      sha256 = "1rv7pp35sgqppqs320pnlpqrjs0ljix9dd92fl2jrfpag15fi887";
+      name = "kde-l10n-km-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0kz1fd8ha3m8r5kmqa9phr607ayry1ds-kde-l10n-es-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-es-15.04.0.tar.xz";
+      sha256 = "0bjh1x3snldbmfvdamgid23cxv1sn3qwsdpy92h1djb49zbm51a0";
+      name = "kde-l10n-es-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/brvc7zjfmcvif2y8n4zrmlva72v243md-kde-l10n-fi-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fi-15.04.0.tar.xz";
+      sha256 = "0xh66i7wgapi6bhig712mlq8dkaml9dpzsj43dic58xw8bx4n6s4";
+      name = "kde-l10n-fi-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h0hfrfigk06zqqgl0crsah3sqgh05syp-kde-l10n-nn-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nn-15.04.0.tar.xz";
+      sha256 = "1d2yvvl6rralsw77vg6hmbi84dswf116dpab7r5039nqgxnr8k81";
+      name = "kde-l10n-nn-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/r2mbi7gj1a4f71cp6xgjxfkbmx1qzzrp-kde-l10n-it-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-it-15.04.0.tar.xz";
+      sha256 = "1izidgcrzyvxka143cpnvrcnf2ddzp8384sjw6bvw32wsxi3v0mp";
+      name = "kde-l10n-it-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kxaxpwzy0bs1675by3qhhvj1hlvvig7a-kde-l10n-pt_BR-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt_BR-15.04.0.tar.xz";
+      sha256 = "0s6pc40ig83zjqbgqwhfkxzhp9wcrgac6hs5qhcxbs3awfmxi5hn";
+      name = "kde-l10n-pt_BR-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mxmsybkjr2pr2xwfrxciwf6jjn2mp1vj-kde-l10n-kk-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-kk-15.04.0.tar.xz";
+      sha256 = "0czb1dmrdciim910bnazvsvi7lcvq27bj055f36w6y6l1zgvv8c3";
+      name = "kde-l10n-kk-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cj9bhf10x4rcvcia97l9qhjnzll979ls-kde-l10n-fr-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fr-15.04.0.tar.xz";
+      sha256 = "0g94wik9q6c9w5x851k76qfk0fknv6ga497vwqka1h4yrmdmc1vl";
+      name = "kde-l10n-fr-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pyl52lwdrvfi3xpby5yyi93204jp3mjx-kde-l10n-he-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-he-15.04.0.tar.xz";
+      sha256 = "0hpnn6rci0bavl6hqs6v2ylz26sjyf5siwi2klfc3fsw6a04in43";
+      name = "kde-l10n-he-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rn2hih1b8fdbjahg1va76kn7cdjq05g9-kde-l10n-nb-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nb-15.04.0.tar.xz";
+      sha256 = "1mz3bcm92745zr6gn7q85p72l57sh19bcvvkpg40c63k34xpwpan";
+      name = "kde-l10n-nb-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8mvkdlcf0azzq8y5g1r2bbq15z92b8df-kde-l10n-fa-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fa-15.04.0.tar.xz";
+      sha256 = "1jmwjlbnlciy4k9szqi7vjwjpx94faixjg2mmg42cjfx5as9ws5x";
+      name = "kde-l10n-fa-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/01ryc8gdgvjawaki8qaw5dpbyibvng63-kde-l10n-nl-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nl-15.04.0.tar.xz";
+      sha256 = "0a3c7fkw0cczdd5733c7klfsffpi5ah1i6alqknm15y534bsigzc";
+      name = "kde-l10n-nl-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g71kfpca8y88a0dmcrphban2vjvyr85m-kde-l10n-cs-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-cs-15.04.0.tar.xz";
+      sha256 = "1bl0w1qhk05xqniv1piik9gkj5nlcsb90bpxlvj0sd5ivcqxma53";
+      name = "kde-l10n-cs-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/afq8qa9cr7yli1djasn7xs9fg781b3dd-kde-l10n-ko-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ko-15.04.0.tar.xz";
+      sha256 = "181gzqhg6lc5z045l05zxz4zrc6hx36fmb91v62sfn2w70dc6jmd";
+      name = "kde-l10n-ko-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0whvwp9h1lrnqcf68qihaq5mlz73lm5b-kde-l10n-is-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-is-15.04.0.tar.xz";
+      sha256 = "050fdym6mlj1m1m594jglhjcxwk8dx4hc6p1428ldc19m4b9q06c";
+      name = "kde-l10n-is-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fd72fjmwlgy7znmi7gz71qzd6fb9w5k7-kde-l10n-zh_CN-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_CN-15.04.0.tar.xz";
+      sha256 = "0klkxznhfc5sfrlnz80fqf06lzk8g411cz2v0wpd2wjafk1pyf56";
+      name = "kde-l10n-zh_CN-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g1nxxpcihfcb0kwk0bm53acvv8b0yfgh-kde-l10n-hi-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hi-15.04.0.tar.xz";
+      sha256 = "12qgzwiy0igz7i352dwk5ipsxhia0spi74ibk70xr7irr9axgidr";
+      name = "kde-l10n-hi-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/knj0hcr1dirq6rlhmw9dg1vl5ag52h6k-kde-l10n-ja-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ja-15.04.0.tar.xz";
+      sha256 = "1b8741fzhimf3bch6mc9hzdj040y50gf7fgd7ja5n5ipi0ma2drf";
+      name = "kde-l10n-ja-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lg8jgickpm35z3mfypigxhngq4r93c2h-kde-l10n-mr-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-mr-15.04.0.tar.xz";
+      sha256 = "0v2mcmrpqz31yix7z7kcjcfpwpghsifnvwmdf1k1lif0a9mq5qq1";
+      name = "kde-l10n-mr-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yq2f4v4vfafxk8j1j1v97jbh39bklnag-kde-l10n-pl-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pl-15.04.0.tar.xz";
+      sha256 = "002nladxsgh9pamcaibsx7z7dcvcpbii9dyql8v3845wqjpgj8wk";
+      name = "kde-l10n-pl-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1i36fnf4018v9zc0awz7raqbv7269cay-kde-l10n-ug-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ug-15.04.0.tar.xz";
+      sha256 = "094x3jnaby75q1j7q6c79y0sw63hsqqvw1qv0dzjgghky7qs584s";
+      name = "kde-l10n-ug-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0svv0vq2dl7cm4wihdsp459m404jvimk-kde-l10n-pt-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt-15.04.0.tar.xz";
+      sha256 = "177b455rgdrm021lvwlx6xgbnk3mh38l6080i2v52rzjm6bmchsy";
+      name = "kde-l10n-pt-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h1i1cg1qhsxfiffalx4j4bar3nbwjpjr-kde-l10n-gl-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-gl-15.04.0.tar.xz";
+      sha256 = "0l27hrsd1pbk3w0lgz34zspmc6b4cs4y0p8i6y1sq51sd5p8qwd4";
+      name = "kde-l10n-gl-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vsqwvz9r39nypa1hcxnn3figzyngpf6v-kde-l10n-ar-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ar-15.04.0.tar.xz";
+      sha256 = "04djbcdq3z4iysbvdiai2qd7wm9zx5fp400k3zsw36150g93ar7q";
+      name = "kde-l10n-ar-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-uk-15.04.0.tar.xz";
+      sha256 = "0n01ypzyqr8k30hakahpm68430bgr207yv5mbw2parzj3xbwzpbl";
+      name = "kde-l10n-uk-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fn45av76smcp2bj01aphy1m49na74jlz-kde-l10n-el-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-el-15.04.0.tar.xz";
+      sha256 = "0xxfqc1hzf3nbvja8c6aq6axpwx64ifqz32nxw4171valjj1faqv";
+      name = "kde-l10n-el-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ijscp8qiliavdzda0k4vzgmfp30a065q-kde-l10n-eo-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eo-15.04.0.tar.xz";
+      sha256 = "12j9ggkgjbz229iwzpb19hjnl6zy2fvgkk68mh133ij3ik70i3bd";
+      name = "kde-l10n-eo-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lm8d1vbsplg0r6z7ksir7z9nqjy7c0pj-kde-l10n-hr-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hr-15.04.0.tar.xz";
+      sha256 = "0a0p1bspv849zdja86rw7lvg60h6rgl1g5hc4zajmq9sviknsy3k";
+      name = "kde-l10n-hr-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bm9c9n9jln8aadmjmqhjqh67vd2d3126-kde-l10n-lt-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lt-15.04.0.tar.xz";
+      sha256 = "1l899bj9zw5db9wf6zhd6f9mpyynwagk907q8ws2xh6nlgrs9ydx";
+      name = "kde-l10n-lt-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bp31anbdx5f3blgdnhl205vrqw9jgfx0-kde-l10n-de-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-de-15.04.0.tar.xz";
+      sha256 = "1hd0pz2n0l1hs5dy8426n53w8d0a4mys7m7wyihs0a7akf76cy4s";
+      name = "kde-l10n-de-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0a57w09ilczqr5dwwz8x8qvgqq4wbzpj-kde-l10n-ia-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ia-15.04.0.tar.xz";
+      sha256 = "03wir3y5hz3fnkqqv97bcjv4rc768f953y8dqsc362a61zidw70l";
+      name = "kde-l10n-ia-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/whhz3930c4q5n50v7n9xbzc6l4xblf3m-kde-l10n-tr-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-tr-15.04.0.tar.xz";
+      sha256 = "0h1997x62ycisnfnbawjfqfwblh6fhqqscns79f7d7krxhfyq7cr";
+      name = "kde-l10n-tr-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/22fjrzh19zha3ldbwkb7l64gnnq60i5h-kde-l10n-zh_TW-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_TW-15.04.0.tar.xz";
+      sha256 = "077pr968z7d8ldnv87vsfn9j13llx3qqw9gwc041c9av73vp4ccg";
+      name = "kde-l10n-zh_TW-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/16bpvmlzzw1cqjmrlvznd5751p1fsi18-kde-l10n-sr-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sr-15.04.0.tar.xz";
+      sha256 = "0yicfyaj6zckk0x9skw9q3qnh0f0vz6pmahgh1pd5ayl3sqs8dhk";
+      name = "kde-l10n-sr-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zv04hsibpg539rzkg1g7h2nfm946pz8h-kde-l10n-lv-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lv-15.04.0.tar.xz";
+      sha256 = "1r2fahydjybk5zparmn4wjciys5kjsjps2mkhlk1x5k9aa0wimjg";
+      name = "kde-l10n-lv-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/04hs3q4dknk3b305zqibxskqnzm4f6r0-kde-l10n-hu-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hu-15.04.0.tar.xz";
+      sha256 = "010d3x7l1kadp3wj2v9jg0bjd9d3xw2q3ql7i21705s2zi2any7k";
+      name = "kde-l10n-hu-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5n06i2kass6wqnl6ql28s1ryrbj2399y-kde-l10n-nds-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nds-15.04.0.tar.xz";
+      sha256 = "0asgj3dkbjgcabl4qrz3i8dv0i0348dg6q0fk1sgicm4257y0a7l";
+      name = "kde-l10n-nds-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ai53nz76fbqj1adsl4lb0byvvcn8bg2v-kde-l10n-sl-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sl-15.04.0.tar.xz";
+      sha256 = "0jm6b37irpp0jabad4jpqlvpw6ir5ygc0cs49138hb58kcjwi54v";
+      name = "kde-l10n-sl-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p18pga44549fxqa0ksijc057dd5phbd6-kde-l10n-ro-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ro-15.04.0.tar.xz";
+      sha256 = "1lmjz5578b1xbgdgrrlgv6vyiara2n5595kd0pg70s1ixvd986as";
+      name = "kde-l10n-ro-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6grb8a1wydjjdkn2vkv2sj1dd8wp4317-kde-l10n-ca-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca-15.04.0.tar.xz";
+      sha256 = "16n29ja4d83g001js682ijibblhfwfb8pww561bcvda84qbvhham";
+      name = "kde-l10n-ca-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/izn9fzf1r2xyc57rj889rc6ziv9kjsiz-kde-l10n-ga-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ga-15.04.0.tar.xz";
+      sha256 = "1n8prxqxxr8r76ry0jaszsn446y8vdk9b629ypj8s4d0byz336bq";
+      name = "kde-l10n-ga-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pbaf3bd49drbap8bx58pgz85xllqvjhh-kde-l10n-pa-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pa-15.04.0.tar.xz";
+      sha256 = "18rqlh26qc4h7jbsa6jq27k5d1d5kwdbrd1slm8fcw67r6iw72ai";
+      name = "kde-l10n-pa-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/311y10ml4kxpkicjlja7k6wwm05yd75p-kde-l10n-et-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-et-15.04.0.tar.xz";
+      sha256 = "0hkh800rx03w5gvy1lc7fn0s5kldihcaml5ryvx0g1qrj5k61b3r";
+      name = "kde-l10n-et-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lld8r34x3lclrb30p8w0qr6gw117h923-kde-l10n-wa-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-wa-15.04.0.tar.xz";
+      sha256 = "0mivzilb2f3fp5wn2vc6c3z20n0l4cdpckyk43fdb4h9sys02xs3";
+      name = "kde-l10n-wa-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ajsr93ly7db9pwjjbrkvr5r4n0cx03fx-kde-l10n-bs-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bs-15.04.0.tar.xz";
+      sha256 = "0zw2q22lm73k04c3nb0596xd3hknfhc7gq9i4n7kj55sblv0mqzz";
+      name = "kde-l10n-bs-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/45bg2qd1nyjnnqi4yzpkkwcimlnr5fs5-kde-l10n-da-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-da-15.04.0.tar.xz";
+      sha256 = "1v07bazlq6420zkfy6m3jvwcyy2snz93967209204jnxkzf3ssk6";
+      name = "kde-l10n-da-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ack1f3vdjkjbzpdsai22ki3lncc5v6s9-kde-l10n-id-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-id-15.04.0.tar.xz";
+      sha256 = "10mr2d24akz5la2bz88y827dcv061sqrbi9awbiirgd2wqisnn8z";
+      name = "kde-l10n-id-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gcnmv26q44ya6jb2xwhm4kvp8aqr059l-kde-l10n-sk-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sk-15.04.0.tar.xz";
+      sha256 = "13v871ahfj3bwaj0ha6fm6gpn7x9qw9m5dz89mfg3h5vskqv7akl";
+      name = "kde-l10n-sk-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/v7ln63jsr0v32l86rqyg6fpinzpjpns0-kde-l10n-bg-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bg-15.04.0.tar.xz";
+      sha256 = "1p4y9rbxwwnghslwjk1m32a26h6pnssyj73ns1az3saqyfb85gkw";
+      name = "kde-l10n-bg-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca@valencia-15.04.0.tar.xz";
+      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
+      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rkbbjy12la1p7l7vm5xk4hwy72f4piys-kde-l10n-eu-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eu-15.04.0.tar.xz";
+      sha256 = "129k6m59x8f63f393jxx61s67f9gmaab9ilaqy2978d64l3z0bpv";
+      name = "kde-l10n-eu-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fzwxz4747hfpjisg7n5kc77gb92dm3c8-kde-l10n-en_GB-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-en_GB-15.04.0.tar.xz";
+      sha256 = "16c255j3klss711iqk41k1kcf5nn0lwg0qr74c1abvgrnpsm261h";
+      name = "kde-l10n-en_GB-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/49fv8h0b5lzf4cm5qc6baj9sk9k29pnz-kde-l10n-sv-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sv-15.04.0.tar.xz";
+      sha256 = "17z9yvw9mrjb7h3qa4zc18f5z2n6b0gr4y76s7jfnh8kpjgm1sgr";
+      name = "kde-l10n-sv-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/30j0lkfk4p7pwv4nyknvm1wbd93cfji7-kde-l10n-ru-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ru-15.04.0.tar.xz";
+      sha256 = "18l7wnfr1indy8im131lxd45da9x49ii1iavi8g1lzmqq0av097z";
+      name = "kde-l10n-ru-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcalc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4qsl43z86wq82bpspki2y4gfn8iy6xag-kcalc-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kcalc-15.04.0.tar.xz";
+      sha256 = "0rkvxbz9s5wqa054bf1xg3rza95plvnakydlny04iw5w8i33i5yc";
+      name = "kcalc-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkexiv2-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dnl3qi3ldzmf1yl7m8yzlgxyzvj6bm4k-libkexiv2-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkexiv2-15.04.0.tar.xz";
+      sha256 = "0zv8yjgwfdvkl2ss2gyv6bqbc3qgnz3hryhcjdyfa56kys6xz7n3";
+      name = "libkexiv2-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kigo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yvj9sxfh55nvnlvcz4b12iqqgnd3p33y-kigo-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kigo-15.04.0.tar.xz";
+      sha256 = "00ggvrs3mm5f2q6zkdsxbrhw8vgb0h4p4dk3v0agf3q4bqr86akr";
+      name = "kigo-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kopete-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9yn7mj3csimgx1r4q6bp9gknh5bqnw49-kopete-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kopete-15.04.0.tar.xz";
+      sha256 = "01wl7n535j9l21zbzjhix33rhr0i4rg2bb25zxwk6sc2ahbsqcp7";
+      name = "kopete-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qpc0c00mhc367aivilvkp329a4g6iqj4-kaccounts-integration-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kaccounts-integration-15.04.0.tar.xz";
+      sha256 = "1g2rn256wfl78ajxircaikq3hpj5nxfnk0294wz10srmg5a4hgji";
+      name = "kaccounts-integration-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdeedu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/wyk34ah7lc3vvrcq4ldik6brm2jk9fiv-libkdeedu-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkdeedu-15.04.0.tar.xz";
+      sha256 = "140ri9whmvxjlj2i0bdpyr07zwspyl5d1bh91vm8hv2zdgmxh1rl";
+      name = "libkdeedu-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "superkaramba-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1ck2s3vi0dksdlis3cghy8advap8y5a3-superkaramba-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/superkaramba-15.04.0.tar.xz";
+      sha256 = "05j93sa39m78vlxdy4haqj5913dyi6kab5sspi8ky0why17zmaav";
+      name = "superkaramba-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klines-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1zsl1wawlhzgyr53hfrn5dzqwii51ib8-klines-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/klines-15.04.0.tar.xz";
+      sha256 = "0c0saaybxjshwap5rydc0606xkwmzl696r41fhkvr26c077p09p4";
+      name = "klines-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cervisia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qmkqp9sgai9djwishibis5qckhl9dnrf-cervisia-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/cervisia-15.04.0.tar.xz";
+      sha256 = "097hayf2k2fv3d90jnhlh4iq4qvk3v0qg7ywchgipzsz0w6nayki";
+      name = "cervisia-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ark-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nms2hq3a33k03lmhh8y7swiggglcysxv-ark-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ark-15.04.0.tar.xz";
+      sha256 = "09jcz7x5rjazz8xvxy3kx32v21ig736m5gxyxhl48inxaypxxd21";
+      name = "ark-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "palapeli-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zsh3ssjxmxggzf54kw9f73kzpy7y3n9d-palapeli-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/palapeli-15.04.0.tar.xz";
+      sha256 = "1iql188gysjnhym1mj9h2cizydgd97pal37zkxljc9qhqb58wq3d";
+      name = "palapeli-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9qg39s2sb7r8sdy37hm185jn7dsv24q1-ksnakeduel-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ksnakeduel-15.04.0.tar.xz";
+      sha256 = "1i32mrc50isz0q0gzfkd0fz8in2hhc8d61q55dprq3ps28lgd77n";
+      name = "ksnakeduel-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kollision-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qxc07ckfn60wcyb8cs75dy2d8gbj211z-kollision-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kollision-15.04.0.tar.xz";
+      sha256 = "0ch3h3g0hgm52l13v6wdrvacabwkvzx537bhfib05prb9604vkn8";
+      name = "kollision-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kamera-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6l8pgg55qph99rmprrgz56vvv621zbjk-kamera-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kamera-15.04.0.tar.xz";
+      sha256 = "1mjpbcslba9wnxrvm4xg6kfy11msn7kvxln98ak55gvpfh7zhm5r";
+      name = "kamera-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klickety-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/iwlkabdklb3v1md6vdsjw8x09vv0kzzv-klickety-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/klickety-15.04.0.tar.xz";
+      sha256 = "0l8vk4gkfjs71xfzw9lg18g9xg4yf4l9jy1f9plikw9gfm7br90p";
+      name = "klickety-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolourpaint-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h5x9pzbiq62jgwfln5gx6agzcfyz2j3s-kolourpaint-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kolourpaint-15.04.0.tar.xz";
+      sha256 = "00vyblqgp7hqigid6xgj31b8jkqb8jlsvnbd2ci4zg7s778l10sz";
+      name = "kolourpaint-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zdqama1r97132n4ks422yzr4zhh6fjmq-kde-base-artwork-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-base-artwork-15.04.0.tar.xz";
+      sha256 = "1r3w4ab9vls7wyzy6g7ashnnixxid894ghqc5yzhpn4x999y65lp";
+      name = "kde-base-artwork-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "gwenview-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3wkajcx7p2wdzldbjb94brqlfqhdn54k-gwenview-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/gwenview-15.04.0.tar.xz";
+      sha256 = "0h8ndywh8w9wx0zisl1b9681d7zqx2d3ki40zxdgk4clyl34aijb";
+      name = "gwenview-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lgapni2v7qsl3wsi8wx0vwcav9almhs8-ktp-desktop-applets-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-desktop-applets-15.04.0.tar.xz";
+      sha256 = "1byv8dk864vwl4s5c18xjh3ckdzr9d7gq1mjrlaslxang7fr97cx";
+      name = "ktp-desktop-applets-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lqdl7ks619gxdhnaa9q0axni4pz3h5v5-kdesdk-kioslaves-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-kioslaves-15.04.0.tar.xz";
+      sha256 = "116xj9i3iwzbz41n3bka6xg0yq88iwzw066dy5dbs3yxbpmky19g";
+      name = "kdesdk-kioslaves-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dymdah33hpq9qn07qcz402ijmwc67bvd-kdenetwork-strigi-analyzers-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdenetwork-strigi-analyzers-15.04.0.tar.xz";
+      sha256 = "1zsa3ky6plfksm8k8hgd93d0awrsi5gqz3qbqfbzj3a2qic7nim6";
+      name = "kdenetwork-strigi-analyzers-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmix-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ql4a0i42ij33kd9y7qg4ng1a0p5j2sqs-kmix-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kmix-15.04.0.tar.xz";
+      sha256 = "0yj0byy98243c83bw938i1x8yxgbib8vr2s831hpmqi8h3v7xvyg";
+      name = "kmix-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktuberling-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7cp8mnviqns6ij94xxz3mpizdc1avln9-ktuberling-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktuberling-15.04.0.tar.xz";
+      sha256 = "1kqz1g0r3icgx3brd8qlln29mxcx9b54kvl8wdar04r8ckk0m733";
+      name = "ktuberling-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kturtle-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0a3rrj74sfwhqwjql88gqzw8qbmf8llr-kturtle-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kturtle-15.04.0.tar.xz";
+      sha256 = "00r3lzqa0sazccy28kmackqgqwcyqsl3mzjs7vpg4i76f0agfx4h";
+      name = "kturtle-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gszm27h7rghsvkvhyf15xnp5bgjj18in-kde-dev-utils-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-dev-utils-15.04.0.tar.xz";
+      sha256 = "1vvrrb4c94apc67fg3gpzgfmhylx6m7xfyq0y5kjxk8l91fl2bdi";
+      name = "kde-dev-utils-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktux-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cd126p5pizh2ha1jadg82csdzazlln49-ktux-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktux-15.04.0.tar.xz";
+      sha256 = "1j5h65vdigym6ldz7fpn2kidxphfl02l4afg0jmj55wrym1vvc0r";
+      name = "ktux-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/xbdr5s1xf4f58lpshppamii1j5rl5ll8-mplayerthumbs-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/mplayerthumbs-15.04.0.tar.xz";
+      sha256 = "12d60nkmfp16pgrfh5brl80n1y7crmdzk5k3ad313l4ani99z45r";
+      name = "mplayerthumbs-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblackbox-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/72rhcbzax6ahi3myznpi1fkh0x9cq6ay-kblackbox-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kblackbox-15.04.0.tar.xz";
+      sha256 = "1w55nzadmkgspngxwazm6nfdf3s72rw4l0absx1jhinln7mif8w8";
+      name = "kblackbox-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktouch-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0p1m96gmy2rw5pyy029j4257b32ziyvx-ktouch-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktouch-15.04.0.tar.xz";
+      sha256 = "16gd6rghz1caw88yh32728kcxj79688g4hw3dkmgkayb5wcwnwl0";
+      name = "ktouch-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dragon-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ha0s2dfbqb6gjgwq5451gbcgq6h3q16r-dragon-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/dragon-15.04.0.tar.xz";
+      sha256 = "0rzyra1xqjyrnx7926dql2fw9avy7rwx9x86v894xppcjqsyr3jx";
+      name = "dragon-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "katomic-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dzv478dhlwj11gpfd0k7npmyw8z09yfw-katomic-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/katomic-15.04.0.tar.xz";
+      sha256 = "0vbcv973ppijip8l1y2kkj93rjxbcj3xw6pypw50w3pg168s1ylv";
+      name = "katomic-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmousetool-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8ws0s6acsrrq7x0lvy61vy4sqhndbakm-kmousetool-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kmousetool-15.04.0.tar.xz";
+      sha256 = "005y7jp52f4x9193dxql8wwmimbylkazl671di2gfvrmcrh164n6";
+      name = "kmousetool-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "rocs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/palrbcvrwp2vxf67myadgcvr5wl8v3pq-rocs-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/rocs-15.04.0.tar.xz";
+      sha256 = "03ibi17331vcjzfc38agalbybn7k06favm0sgcyg68qribpcwmg1";
+      name = "rocs-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/b7716r5kxhznfdlp9cwp3vf2vhsv1r1c-kde-wallpapers-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-wallpapers-15.04.0.tar.xz";
+      sha256 = "0ckvbsdim0485h4f9sz1z0qgbb61n8l7ncwr80zm7vpnx46xzavm";
+      name = "kde-wallpapers-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdiamond-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p1f9xs4wkbdi9cmry7wc5686dxy2fvsg-kdiamond-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdiamond-15.04.0.tar.xz";
+      sha256 = "01ri6nj217dmg2xgm4ra4gdsabk28c8bkw6z69x5smbczjshdcr4";
+      name = "kdiamond-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkipi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jckns8avmk0k34k62f77bdrl9cbf01nr-libkipi-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkipi-15.04.0.tar.xz";
+      sha256 = "0c90y8f70k83pxxfx6mk6ar6zw7lf2l7mib526x8s7j534ya57ad";
+      name = "libkipi-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebdev-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/wlx7pxcwlq5f0w2hrlms5gfxfixzfzbc-kdewebdev-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdewebdev-15.04.0.tar.xz";
+      sha256 = "17gizsgvw5ihibsf8z2rmczzkqp1gp5jbyvvsairgzv1izryi6ah";
+      name = "kdewebdev-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3vyd044k6qmjnxc7sfig6q90g2dr58lf-kaccounts-providers-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kaccounts-providers-15.04.0.tar.xz";
+      sha256 = "1b5cp6winxa9slqaq6mrf4y4py1d7ps55088gs35qcwrzyna04l7";
+      name = "kaccounts-providers-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "marble-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7kh58mg7dnd0yr6nksbfki20rncdqm1w-marble-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/marble-15.04.0.tar.xz";
+      sha256 = "0d6i7wwf220790ld5qgd30gph9y71a75ybjjfg81k13a4jg0ndk4";
+      name = "marble-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rrdyv611nn7kbnkr1fnvn6xkd01k8zwb-libkcompactdisc-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkcompactdisc-15.04.0.tar.xz";
+      sha256 = "0nisrgpcgf4r83q7p82b8xfpzq96qjk8362i6dalsb0jcakia4c2";
+      name = "libkcompactdisc-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/fjrkx2vwb6m4kfl01sa4r23wbvmsmh05-kdepim-runtime-4.14.7.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdepim-runtime-4.14.7.tar.xz";
+      sha256 = "0ywg703sqidxif853gfmqriymkkp9xzkfxd863p1sw35n1zhfkam";
+      name = "kdepim-runtime-4.14.7.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/akq8y3wjkvbzwyzwxyd1vkmqygmc78p4-oxygen-icons-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/oxygen-icons-15.04.0.tar.xz";
+      sha256 = "1ysy82war9n1dm5nwj69aasz9abp2zf5dmw92gv8brzyrn8svn9d";
+      name = "oxygen-icons-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpat-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/af38swaxzd4yavh6iaxq3ha8xn3q9gmf-kpat-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kpat-15.04.0.tar.xz";
+      sha256 = "076jrjrs97353pw39gbanjf5s8l4cj8g2zapngyc1kwm6q0jry5w";
+      name = "kpat-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "juk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bbvywnmrg713gdmzxkndkcyjs7jmdazj-juk-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/juk-15.04.0.tar.xz";
+      sha256 = "160n9wpx0krf1nlpa3hbj0b1yblgq68mw3c9is2j41k0p2b7divi";
+      name = "juk-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kspaceduel-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zx8jk8s9mrfga1467a42hfdz0w144p66-kspaceduel-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kspaceduel-15.04.0.tar.xz";
+      sha256 = "0drb3628l47qp35h8vyz66ma6ph5v9sg2k9dp0fghrhwp1x983fv";
+      name = "kspaceduel-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "picmi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rrqb0hx0kb96y9x2j65vbyq12pk4m875-picmi-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/picmi-15.04.0.tar.xz";
+      sha256 = "0abas2qx83a35dghrr5gbsvgc0lg0vk0br18nizi82sbiawls24w";
+      name = "picmi-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "artikulate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/a4vr2g2m7hr6svmbdkg89na3zvsh4fg5-artikulate-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/artikulate-15.04.0.tar.xz";
+      sha256 = "1ghffybaq2p9jx7cppbji8jk0dbblw3mh3czfzfms92ahy9xzcbz";
+      name = "artikulate-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeartwork-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3yyj9dcqj7b2zjrz5w7j20h0pv10gnid-kdeartwork-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdeartwork-15.04.0.tar.xz";
+      sha256 = "0kwscj036gjvai5knw1jpxjacllza4y8wnlv24lp19f2s61jqq24";
+      name = "kdeartwork-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksquares-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ayr2hry1z8z3v8q8a4iamck9bsxy1pdw-ksquares-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ksquares-15.04.0.tar.xz";
+      sha256 = "15a605pc7jfsrsj1jj3lqy42z1bnw4pppx0hv51xlhiza00s2kww";
+      name = "ksquares-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4kb7k1cfzksinnw0d08nginvli44rwx8-zeroconf-ioslave-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/zeroconf-ioslave-15.04.0.tar.xz";
+      sha256 = "0fqqx0ji1v0cz87qb0kig9kkfdigmdfmz5qw1y2kx25mb0rp1g2i";
+      name = "zeroconf-ioslave-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "svgpart-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n8v8kbzq9vsghk0nc47rl49zqfz1w182-svgpart-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/svgpart-15.04.0.tar.xz";
+      sha256 = "0985jjy2mghs57sy53mkas5p9ya0makrkklq99s04rgl93f2akj1";
+      name = "svgpart-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bovo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/sigbrnva6hymkgnjd48aw65s7vrysi2g-bovo-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/bovo-15.04.0.tar.xz";
+      sha256 = "0iffvb4m9bszpxh8s8yrpyzawyflwcbkajib5h1lw8xsgi6vcqhc";
+      name = "bovo-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kig-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lv7d5hvgs42razrzhd3g60i1gpzb8w06-kig-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kig-15.04.0.tar.xz";
+      sha256 = "1v9p9f9dk3f2bfbwic1vf8ky5ziac4vx0vh8wxshzbjjb89kxkq6";
+      name = "kig-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8g1l1dd5cccy6ncaywfhpf1x2633dk37-ffmpegthumbs-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ffmpegthumbs-15.04.0.tar.xz";
+      sha256 = "0j0x8b0gcwyzx307rvhrx4k4g530lgyl5rzvdpkjqpga2qjg8q96";
+      name = "ffmpegthumbs-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "parley-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/piznlrz9g0kvy1262p87db03830mx6by-parley-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/parley-15.04.0.tar.xz";
+      sha256 = "1f6nmnjz84cm8yk53whjm7k471y2vj106m7q230xj1g56mb5adrc";
+      name = "parley-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lskat-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6bdihbmhk9vdr9mzj52alqhvav2x1lc5-lskat-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/lskat-15.04.0.tar.xz";
+      sha256 = "12mnvbisbaiychdgk6fb464lwvpjlkrwdz5101sdrw466c16a2a2";
+      name = "lskat-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgpg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fys5hj4c13arjjqrh4kn8vyk92zrgz25-kgpg-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kgpg-15.04.0.tar.xz";
+      sha256 = "1n37jh3zl4zb3dnb9lvjpni7gl6sb9s1jwmvf4jvqmqnlqny1b4f";
+      name = "kgpg-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kruler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/2c9221fqxkz6ajx8g2l7xnhcfj8iivki-kruler-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kruler-15.04.0.tar.xz";
+      sha256 = "1pnhram0g6hfi2k13xhixwpr9vx1dhkvivn1y1ydvwk26klala1w";
+      name = "kruler-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kscd-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9yidmqhziwp6sj4l0pzh1gvmhi5g1ny6-kscd-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kscd-15.04.0.tar.xz";
+      sha256 = "079sj1g5mn32b2l2l9qap55s5sr6bv44a9ncswibkr49vwq7va10";
+      name = "kscd-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdcraw-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5y5x3vr7zibkhk5pk7hz5ibkza56d54s-libkdcraw-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkdcraw-15.04.0.tar.xz";
+      sha256 = "0h7m6m27jsp4xh6ywrbxad3c413ipzfgz357ahffqcafdjw6yfx5";
+      name = "libkdcraw-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0z48pwb041r7sfwzvsxdqyw46bxy6d7d-ksaneplugin-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ksaneplugin-15.04.0.tar.xz";
+      sha256 = "1wh83c31x1n7vipi6m29hsinrpzwsvjnj3psg6s7bywnb6if2ir7";
+      name = "ksaneplugin-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lokalize-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5by08m2jgiap41wrk8kg7lc8b6q6ifwh-lokalize-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/lokalize-15.04.0.tar.xz";
+      sha256 = "1nikpfjnmm3ws2qd46zq6g5v64dbfa7pmbp8nw1sv7dcin3k42ll";
+      name = "lokalize-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "granatier-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/w9bkpa3frqgnh07gbaln9m15nhj0vdcj-granatier-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/granatier-15.04.0.tar.xz";
+      sha256 = "1s5jkwqzjlcd343sm6akzx56a48yvx7z9n3cww9gxrjl76q1a19c";
+      name = "granatier-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksudoku-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0ssavwdndi5h0mc3cjrgn1vpfz20wmdm-ksudoku-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ksudoku-15.04.0.tar.xz";
+      sha256 = "0bxcjqpkqr5zbjrx8drmjvjgnyjvpqbvmqgyfsidm8rgfg6mi3fz";
+      name = "ksudoku-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmplot-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/76appqh3cg62681baq1cy6fymadaq2c8-kmplot-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kmplot-15.04.0.tar.xz";
+      sha256 = "0fnvjixnp2iyjg0hgm6lkry407f0fh39kb184jzaakrp703m3jmi";
+      name = "kmplot-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcachegrind-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ys2xzw0hck8gp7g79m933580y7rix754-kcachegrind-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kcachegrind-15.04.0.tar.xz";
+      sha256 = "1q1z0w7c7j8ii97n4vcd80qi6hb7gsg6j9l3md37ls8c4qvhknx7";
+      name = "kcachegrind-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbreakout-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/x4rsvf3qzl921vgamzjxkvwjw971r917-kbreakout-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kbreakout-15.04.0.tar.xz";
+      sha256 = "039g4qmmkf3lq8jx5vgasvqx19k3xbvfkm0j9his61z021ldjxla";
+      name = "kbreakout-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapman-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/82vlfb4yna41mip5zpkal4kpy67w4kjv-kapman-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kapman-15.04.0.tar.xz";
+      sha256 = "0glc8hcjs89s5cxa77f12pzlnmvr74kiqhcrk7djz98pnqwlsn5v";
+      name = "kapman-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalgebra-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/346qqpdqx5hdzyvd4dlkag3ir951fjp7-kalgebra-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kalgebra-15.04.0.tar.xz";
+      sha256 = "07czg7i344qq93y95f46qvk3zpghkl3gcr8cd8wgc0v0b1mdmyfm";
+      name = "kalgebra-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "pairs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cd5q5wchjl2ncm44pwl156jks832y96z-pairs-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/pairs-15.04.0.tar.xz";
+      sha256 = "1d1va0b55fwivsvcz3izr680nl4zbyn44fdnirglw7q25278p7bh";
+      name = "pairs-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khangman-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/krpgzhpksq4kr9r78w9f6rk2q0963lwv-khangman-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/khangman-15.04.0.tar.xz";
+      sha256 = "0cnaih6xhg11wrg0c3v7lir2yknc4k6m490aw7bhraz98kfxr905";
+      name = "khangman-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konsole-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qb3gypyd97v9cakicf44q7xnwfmyqsyz-konsole-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/konsole-15.04.0.tar.xz";
+      sha256 = "10qgynn6x7cxyp6lgri0vggmzmcvckwvrg9mrycdnwwrsfabscrc";
+      name = "konsole-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "analitza-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/c9xwpgl8bdp582w91zrchhywr1j9xm9r-analitza-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/analitza-15.04.0.tar.xz";
+      sha256 = "03kaaa8kp92lsva5shzqb9497wmhksm79pc39ip5l50lqac9gr1l";
+      name = "analitza-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksane-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6qn668dc4yppjwyc1ms0698nkmxj4sxm-libksane-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libksane-15.04.0.tar.xz";
+      sha256 = "0rnja700hwjn4bvy06lijndic2zryn64kybvj71ip6knq3nx77x6";
+      name = "libksane-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbruch-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g1hbkl20wkzglhaabxizzhrl1xpkfiy2-kbruch-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kbruch-15.04.0.tar.xz";
+      sha256 = "1662hqqsf1rnfwrqwx5wpl0cvr9313sh8bla2sig8v2s8v2lyyi6";
+      name = "kbruch-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmouth-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dwkbfqj5a21hcryw42dwqw9lq1r4ld0d-kmouth-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kmouth-15.04.0.tar.xz";
+      sha256 = "1swvdrlcfxv312kncihvxba0cklmv47qyr2dbrkhb9s9v6jbiqb3";
+      name = "kmouth-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kppp-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8c2srwnwg41aypvjqzs08129wm391p2q-kppp-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kppp-15.04.0.tar.xz";
+      sha256 = "1ml5lc20jg05zfq9d274vqp7k7fh5369zshp073bi6zjj4cm7gss";
+      name = "kppp-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmag-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gi6kw8zlmpy8gjijr34620dzp858h657-kmag-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kmag-15.04.0.tar.xz";
+      sha256 = "0wmarmybn56mppwb33cjg96906hh4vbnwxqpw2441axn5vqmf90j";
+      name = "kmag-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.18.tar.xz" ".tar";
+    store = "/nix/store/b65xpr56hpmfinssggl4fq88lky5czlm-kde-workspace-4.11.18.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-workspace-4.11.18.tar.xz";
+      sha256 = "1rvi88flk8c1j6qdkxak3sy1yf646ql3zipxw2azchwzd4k54mzv";
+      name = "kde-workspace-4.11.18.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnapshot-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zim1ydmdxhwv0cypdviqdnn0nwz2d66q-ksnapshot-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ksnapshot-15.04.0.tar.xz";
+      sha256 = "1577ybwpa52lmv5pd0223pz5l3q4h3475fz5qp3sm1rwi0nzmawq";
+      name = "ksnapshot-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okteta-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8z78fks7wl0rf3077yrz8hzvqvmxn516-okteta-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/okteta-15.04.0.tar.xz";
+      sha256 = "0svgsy838dlc2krn2rzb65a6i0dfav4xlmi4174d23qhaikl1z42";
+      name = "okteta-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "step-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/argcpdljdar6ga3psyz4wzr3kmvkmf07-step-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/step-15.04.0.tar.xz";
+      sha256 = "1fl4zmj4k3g8c7bas7dj2n82qlbq8k5p3s5bflcillrz6pdd4s50";
+      name = "step-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n3b0rfacc8i5p5hlgal66zr9gjfrkda1-ktp-kded-module-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-kded-module-15.04.0.tar.xz";
+      sha256 = "0ijinvp48aixx8fjdc8fxpm8ilzsn9pkhsiinh47wiabyjb8rj3z";
+      name = "ktp-kded-module-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwordquiz-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yik5ibmcy9k87y41nk3b03w1j2p3012c-kwordquiz-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kwordquiz-15.04.0.tar.xz";
+      sha256 = "10rq7zdd8i8dgmjzxgn6139ixzm5kzwiswal0cmkd42wwbdn6fml";
+      name = "kwordquiz-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/xd5jr85rzdnsrw18ab811q6hcwq1f4vk-kdelibs-4.14.7.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdelibs-4.14.7.tar.xz";
+      sha256 = "1zhqvyx8gq7514mr0423z0gl1yn33snh53fj2ijkk4blhjga601q";
+      name = "kdelibs-4.14.7.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "killbots-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nshwyzk14mam2av602sqzcxnwjzpny6k-killbots-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/killbots-15.04.0.tar.xz";
+      sha256 = "0a9jn8i5hw3v7kr6vqagxkqvvjs6qsb23g2khaxgbw0x0cz5nqx4";
+      name = "killbots-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/55ksfn4hq342qbl8cm4jf8k8mmra096n-kdesdk-strigi-analyzers-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-strigi-analyzers-15.04.0.tar.xz";
+      sha256 = "0k00ip8ll1i96cazs78c6al1yjcnvpr1awb6g7yvvq019icjmzvn";
+      name = "kdesdk-strigi-analyzers-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/90s1naljnqa6r99nl2dpjsf8rjb3k7cp-ktp-send-file-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-send-file-15.04.0.tar.xz";
+      sha256 = "03i6irask1ccngwapirnc9vpk4nw7r82zl6jdnh7w9988c2wdl22";
+      name = "ktp-send-file-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n2vy60sdgnx3gb6fmmgd03d4jnn29nmz-dolphin-plugins-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/dolphin-plugins-15.04.0.tar.xz";
+      sha256 = "0a1f1si598cmqd0j9v6pz0w8s6286xg2wcfxzrmkr994bfkydd8c";
+      name = "dolphin-plugins-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksystemlog-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1wy9hsww32i53nv94bnzj83hfqw3x1ir-ksystemlog-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ksystemlog-15.04.0.tar.xz";
+      sha256 = "104yg6mjnhznsylpv8faqih9rpdxyp4667dagq7f1kfajy59jh1y";
+      name = "ksystemlog-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/x1qmhlskhz0ibs1pnxcb30bj1yk3f447-libkeduvocdocument-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkeduvocdocument-15.04.0.tar.xz";
+      sha256 = "0lqp2qfsdjkchnb5xrbj9hax2bf4ls1wk7pmb364qvkkhfia8qv4";
+      name = "libkeduvocdocument-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmines-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3vf7rffgww1k7byna7p05d0115p6924y-kmines-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kmines-15.04.0.tar.xz";
+      sha256 = "015xximi3xydkbygzlka7y8nmls3dc8jvr3dvvidl57gl1szmx73";
+      name = "kmines-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkgeomap-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/amqrx3hwvwrz8rgk3dljj11bvfpx4plm-libkgeomap-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkgeomap-15.04.0.tar.xz";
+      sha256 = "0yd17xa085rvxsnsah6ny7w88lbs7c1ilxrvbpsf2rvjkbl96giv";
+      name = "libkgeomap-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "umbrello-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5lahf10pz3vdh0dngi3fsmyn9g8cmk5v-umbrello-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/umbrello-15.04.0.tar.xz";
+      sha256 = "14lw9rnqv7bgni1rxwmgm4jnx2l2x5524wysqlhyp7np35mzdnlc";
+      name = "umbrello-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bomber-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7mf874dsxa6wj59zfr6s1n7399rvl7m9-bomber-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/bomber-15.04.0.tar.xz";
+      sha256 = "1hpss9jmjsjl2shm2y50s5js33rpn0gd20il6wq454wm0k0q7rpj";
+      name = "bomber-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "jovie-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/35zcglbjikb4ayp14d9l6hgs5myv5i6l-jovie-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/jovie-15.04.0.tar.xz";
+      sha256 = "1sa6agn9zp12n98v7i9rxng2yn25b4yf2s8q8rjb3qg93kmzzx4v";
+      name = "jovie-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9vacywnw3knldygpgxjghjbw2nfqdszn-ktp-auth-handler-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-auth-handler-15.04.0.tar.xz";
+      sha256 = "1hj3vc6wj768xdpr02v64p9wbrh1y61zg2fal3bk3fzrlz2yslg5";
+      name = "ktp-auth-handler-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kubrick-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9rjk1xbzbnc2qqrni0ng2spbzailrb25-kubrick-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kubrick-15.04.0.tar.xz";
+      sha256 = "1qxyymrqav9hwa2ldqqpr49aj5sqzmiin6c4rmbirxmaasmyqn6a";
+      name = "kubrick-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/l2lbbhnr6r0q1sf3rzzjnwina7gvlllg-kgoldrunner-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kgoldrunner-15.04.0.tar.xz";
+      sha256 = "1hsrjszck17gqnnpxzbdknj579n7xpmbq813a77736cmi95qr4h3";
+      name = "kgoldrunner-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "filelight-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pr78axnbpxwah326z7jqhq4cz1p7h7wr-filelight-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/filelight-15.04.0.tar.xz";
+      sha256 = "18vcm8f8wgl0hqlycljv7kbq8iip5vadrsyhr58pw60cr8h36n0s";
+      name = "filelight-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kajongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/13030n2xwx0rnbd0myy87pfzrd93rpkw-kajongg-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kajongg-15.04.0.tar.xz";
+      sha256 = "0aa2c2c4322lv4prwxkhanw0lbrv1145w6fz473f6ybfhg9isc7d";
+      name = "kajongg-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kw08x6m9wzrmhm6av38hz2nd18agxapj-ktp-contact-runner-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-contact-runner-15.04.0.tar.xz";
+      sha256 = "179q9707cxmd57iyadasdr9rvcqxwrahccc8vjylzh1x5p2arib8";
+      name = "ktp-contact-runner-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sweeper-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yz48bx3mdyvapyz52aa846f32102jh7w-sweeper-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/sweeper-15.04.0.tar.xz";
+      sha256 = "15amamnrg7d52l0agkw66k96xk0j5shk2667wc9p2jy6g96cw53c";
+      name = "sweeper-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfourinline-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/s96mhycwzwrv5w708mz6appsbf1vivz7-kfourinline-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kfourinline-15.04.0.tar.xz";
+      sha256 = "1wpcdzlpy8jdnlzzhys8n08pknk7ncq41dchs2ii3v30w1dnwln2";
+      name = "kfourinline-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0q8wks5hqas02y3j384lwqy2a1npvmch-ktp-common-internals-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-common-internals-15.04.0.tar.xz";
+      sha256 = "0y6jwqaxvkzjqdz4j3b4z5ybz4d3ci09x8apfr3h0q5pf4crkv8p";
+      name = "ktp-common-internals-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krdc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ch18h2226p60xnyjndy40r8fgwajd80p-krdc-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/krdc-15.04.0.tar.xz";
+      sha256 = "1ikm5a8lb65iljdvs16ipclkassjjdf7i49whcvz71rx8agp01hr";
+      name = "krdc-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/05dzvpk81hhrfp0yncmgnq8q8nlps3z3-kdeedu-data-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdeedu-data-15.04.0.tar.xz";
+      sha256 = "1r157dbi75ayxww57vhww3cjxv1z2y2mv54xh2cf3zfjv6kmp7lc";
+      name = "kdeedu-data-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1z4nb0mp0d654n7wmyddxslx82rh2y10-signon-kwallet-extension-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/signon-kwallet-extension-15.04.0.tar.xz";
+      sha256 = "1s3nm7vrwwgin278vif6w8yyi1vg9hk401swvlhwmn9305bxqm01";
+      name = "signon-kwallet-extension-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcron-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8qjk4ri8l2cvvqaf5qpmzwz33gx0n9kn-kcron-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kcron-15.04.0.tar.xz";
+      sha256 = "0srq463k37klfbvrclhrni1kbn2bxxsfzp8l8lbx4dz8p93fcvdp";
+      name = "kcron-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksirk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/hngc4aajjzr5qszkxi745fi8l28k8wp4-ksirk-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ksirk-15.04.0.tar.xz";
+      sha256 = "1rl2c1yjiiw3gy4kblxgf2lh2sd5bpwz36hi9kv1dvf00bwi1w0x";
+      name = "ksirk-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/br98dpkixyvcr4dwp6fqfcgzrvgqvps1-kdenetwork-filesharing-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdenetwork-filesharing-15.04.0.tar.xz";
+      sha256 = "1296rg0axk6gc765kv3wnqqb7mp45sqw8rvhz631ybbsvcy9vk6c";
+      name = "kdenetwork-filesharing-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okular-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8lzrv2slw0ck39i94w8ms8zm5vfx2x9v-okular-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/okular-15.04.0.tar.xz";
+      sha256 = "1xfj7hm8149xn5g9yy56zd93bjs38k10009l6d2xynvqcd2k5sl7";
+      name = "okular-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-runtime-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1zj95rkrgbp4s8khzd7hjdnz9ndib9q3-kde-runtime-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-runtime-15.04.0.tar.xz";
+      sha256 = "0dpbmg8w5b2hq3fw38v3fa4w45lm1p06sh72rscsz2mc2ly6bkxr";
+      name = "kde-runtime-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konquest-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p08rr4gqznxl4w3gfd7na11v8l1s8afq-konquest-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/konquest-15.04.0.tar.xz";
+      sha256 = "154vbny41axcckdi4dw928kvhfvw8j5b34l79dqa15lnsml92m6f";
+      name = "konquest-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g2j9js2pgakja03ljw9zl4xp9v2pn8l4-kde-baseapps-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-baseapps-15.04.0.tar.xz";
+      sha256 = "1xiv9qmv7x6djv7fg7khsqhzrnypr8dg1c3ximi9r32jvcfcda7q";
+      name = "kde-baseapps-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kreversi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h39cafz2080k7xih81jn5f7scfpvszdw-kreversi-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kreversi-15.04.0.tar.xz";
+      sha256 = "0z7rp0d52cgc8lsnjj0p0qh7fydgk1348ljymfmw8kr41848fag7";
+      name = "kreversi-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/17j3xfw2gjbvkb6k09ykyf8avx7fip38-kate-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kate-15.04.0.tar.xz";
+      sha256 = "1g4dh9d55mbdnxrxp8kyid52gg649rnd6xhv1di3k1zz6x5jjnr1";
+      name = "kate-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkface-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/f6n75hb70xfprv3rpa78n59icxglv3n8-libkface-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkface-15.04.0.tar.xz";
+      sha256 = "0hm3llyjprfhj5l7y97kyyk61cbis7hmlgpf3qfin958hmip7kds";
+      name = "libkface-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/frl8ikxyck6mv44rdwlca5dg64vlar20-kdesdk-thumbnailers-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-thumbnailers-15.04.0.tar.xz";
+      sha256 = "1y3wix763ndi3xfwpm3h3cfj3r446jkrslgn09bplm4x36jdd2wv";
+      name = "kdesdk-thumbnailers-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mxrd14q1c9hbw5lnpvk32s2jb18cjyrn-kremotecontrol-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kremotecontrol-15.04.0.tar.xz";
+      sha256 = "110bcp9b4y1mwpvd6r09zlrr54f1qdncxixliivclx9y0nrf9ljf";
+      name = "kremotecontrol-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmahjongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gaj2cqkjp0ynwsywrshpy7glfagz37ds-kmahjongg-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kmahjongg-15.04.0.tar.xz";
+      sha256 = "0agqvghlvw3n8xr15n44zjidxqghpmpzf5834n7d18yllnkmyqzz";
+      name = "kmahjongg-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5vsvkxwxycdr0qk54ksiyrlbdfqxc7qq-ktp-text-ui-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-text-ui-15.04.0.tar.xz";
+      sha256 = "0az6ziraqslcidjflljc25scrg1i2kgkppm93bd8y8zy4a2q1wns";
+      name = "ktp-text-ui-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kshisen-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jdmiqffbirvn2pzxx0vfia6v9mq9q1jx-kshisen-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kshisen-15.04.0.tar.xz";
+      sha256 = "011a3gqij509vl74v03s24in83i2qyylrpasi8cpx81hgbwd7zkd";
+      name = "kshisen-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krfb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/r0b24gfzlljxq2wxxs6pyfvgacarvp7n-krfb-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/krfb-15.04.0.tar.xz";
+      sha256 = "1j1mfjgza7zs3dsvm7aqr0w3lnia1svxrc47gd5imagqxzi5xb5i";
+      name = "krfb-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qqn7jza6dgshhapkvj97a4i4960dy5da-ktp-accounts-kcm-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-accounts-kcm-15.04.0.tar.xz";
+      sha256 = "1a45apf4vmjpsrbm98ym8k7qivmfaiwsdsf0f65vi91imlkfdd2x";
+      name = "ktp-accounts-kcm-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgeography-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/arp2vca2a13jqqc37cv5pa03s4aayg1y-kgeography-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kgeography-15.04.0.tar.xz";
+      sha256 = "1gm17z7a4dgmqds3gvwf1scgxb2js5xvaq4f74hr1042jq2br0dk";
+      name = "kgeography-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7iwcjypw2l9kkgm8l3dbchm47jziyjh0-kqtquickcharts-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kqtquickcharts-15.04.0.tar.xz";
+      sha256 = "08p53xa49hwgwcp1vgp1c0pghj2l5a2g71s0q30xn7vz7y91bi92";
+      name = "kqtquickcharts-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/28krw7dahfrcmwlbfqabzd6bmxqx9fia-kdegraphics-strigi-analyzer-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-strigi-analyzer-15.04.0.tar.xz";
+      sha256 = "02zpwqcfi0v0f53y4i2x1yn6d3nynlp8x7xb4ciacvmxzssh9g0i";
+      name = "kdegraphics-strigi-analyzer-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "blinken-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pr2d0pipsss9n5xdd9zrgv939smlrvwk-blinken-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/blinken-15.04.0.tar.xz";
+      sha256 = "1475yf37nlmnqq5sh2gc8x1nbkypxy560qmdyar3m5cs69r77679";
+      name = "blinken-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdegames-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/w7f148vp2gdz22fhs5g65qjzbl9h36kh-libkdegames-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkdegames-15.04.0.tar.xz";
+      sha256 = "1rwbr5pqn347rfhz56phswfzxmm37xpnw699si1612mkmmbl92ba";
+      name = "libkdegames-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jn27x6czz0lripamkjgkwga4cxyicmcm-kdegraphics-thumbnailers-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-thumbnailers-15.04.0.tar.xz";
+      sha256 = "1p0alpdmhl3fm1r27cqiz80w9r1zmwj7pmdxf4f6mv2pf5q7z5kw";
+      name = "kdegraphics-thumbnailers-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcharselect-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1xvdiwnp84qn7cvcissssf92w4nx8y7g-kcharselect-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kcharselect-15.04.0.tar.xz";
+      sha256 = "1jfh1kzcazb4b4wqv6mjy69h8fx78zzf7xk60vzaks07b4c7x9x7";
+      name = "kcharselect-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcddb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7in63wvw5njm2gqxqbsjvj8sh7j5zbsf-libkcddb-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkcddb-15.04.0.tar.xz";
+      sha256 = "1ldjfkppfhknln6hn3py8519p5jc63pf9apwx7h5jf3z6ci1k29p";
+      name = "libkcddb-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kstars-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vqrsgg7jlr6h8y6m2cp2fvv0jpbv8jvk-kstars-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kstars-15.04.0.tar.xz";
+      sha256 = "0mj6haknp9y03md9j007w5sf66529chififw0xy6a7bvnagaph2g";
+      name = "kstars-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kget-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cglfzvjxh6b61dyvla9q9g0qnw6rzlm9-kget-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kget-15.04.0.tar.xz";
+      sha256 = "0v4gfik9ddzpddknrj9vp2d2awn2bjzn74n173njf90pbfnql3y5";
+      name = "kget-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kanagram-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dh926v6zz23z9lqqqvhia5ilwxazd4lq-kanagram-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kanagram-15.04.0.tar.xz";
+      sha256 = "1iw2vp82ax93kbc7ffmh9wsgjp0a772vb2bxsmm5g5jcmjd8vcr4";
+      name = "kanagram-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kteatime-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mrdsmb6qaj32np3p3mcwi3sx38kmgvjj-kteatime-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kteatime-15.04.0.tar.xz";
+      sha256 = "0g1hhlqhag0lllm8s10ylw5a6qwgsmb5hj33l2knbifa2sdg4v0c";
+      name = "kteatime-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/44z86p3l3axqq54wnvbbjavifp6jrnxn-ktp-contact-list-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-contact-list-15.04.0.tar.xz";
+      sha256 = "08k2yplr67s66y4134n007kzsdxnrwgjhv09babprb4cbcm7pdgm";
+      name = "ktp-contact-list-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/a66l0r6622i36x7njknq4rw77wq1z8f1-ktp-filetransfer-handler-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-filetransfer-handler-15.04.0.tar.xz";
+      sha256 = "0z50v3bq4i618c1sh5fa67il4vhn8mk5c55wlhxc2q8srr85ii92";
+      name = "ktp-filetransfer-handler-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kompare-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lmbjfk56h71c44paw60x7wl6pd58yc0w-kompare-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kompare-15.04.0.tar.xz";
+      sha256 = "1pf693s580p208dbjj6d4w11i62bwfifjn3wmn2fd8fip3ajdgxh";
+      name = "kompare-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/54xdq0xdkmw2z3j0zhfxi6gjvm60g919-kdegraphics-mobipocket-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-mobipocket-15.04.0.tar.xz";
+      sha256 = "00m5i5jdnj92jnjm32ryh8dlf3fzl2mzybm5w5y1a82fq9l7j774";
+      name = "kdegraphics-mobipocket-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenlive-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dacxkxjxhz3afz4165nv4siyn6sb5jws-kdenlive-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kdenlive-15.04.0.tar.xz";
+      sha256 = "1ski64rqa1h1aqr16vwnvpqpww7vgfzbnlki3998k8gbc703q512";
+      name = "kdenlive-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktimer-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nab346b2rb5dwkj4gdnjm2pyhnzf0i4h-ktimer-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktimer-15.04.0.tar.xz";
+      sha256 = "014jfyx4lizq2bh5yx73zarn9mzp4lkyaxvml0m8i53zdnacnqvr";
+      name = "ktimer-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1rqzjg16kl3m8cc6pjf2cakhjx90kkhw-libkmahjongg-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/libkmahjongg-15.04.0.tar.xz";
+      sha256 = "1912k9h4j8rhly5x03anf4gzjs0aypbwh8ifvhn289gydccqfcyy";
+      name = "libkmahjongg-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-approver-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ijsjgpid0pnrq1d174gpbma6xfik9989-ktp-approver-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-approver-15.04.0.tar.xz";
+      sha256 = "0sfi4i071iini7bv9i7d4f952rnd5r89vqnhkqqrzbnmi9bh4rx4";
+      name = "ktp-approver-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cantor-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7rf8al4ncyxkhzg899mssimw3lwf0qy8-cantor-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/cantor-15.04.0.tar.xz";
+      sha256 = "0npl1p3gwflfl9rrvbi9ql28af6m1h2w46vkqh4ksp4d6jh9lx3p";
+      name = "cantor-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbounce-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9b915jv5dcm7kinwvj9yrxs72vbsravw-kbounce-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kbounce-15.04.0.tar.xz";
+      sha256 = "1jllvam65kjfanry4wl2yhhgi5hak0swiradyh15b73rb89w2lj2";
+      name = "kbounce-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zhlxa8x34g7yz6wwqnhn062d4yxgl214-kcolorchooser-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kcolorchooser-15.04.0.tar.xz";
+      sha256 = "0g51v8641712fyycm3d6pkx8mlxkpp832l5i77f557lgi3dqfnh8";
+      name = "kcolorchooser-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gcg36nagmfjc9w510pbihc44gz765nh6-audiocd-kio-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/audiocd-kio-15.04.0.tar.xz";
+      sha256 = "05by4zrd3s2rkv915dq3ri6rhq39sl9wkw46diajkwzqdg6ajbiz";
+      name = "audiocd-kio-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgamma-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zd7r3mali9j223lm28w0xx6fl4jkiyfd-kgamma-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kgamma-15.04.0.tar.xz";
+      sha256 = "17xfiaz751q38q29s20k6fffshd3jndydnj54q4bd5l08fwmxmq6";
+      name = "kgamma-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knetwalk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/65sm832j0rnm215vmd7gcrnnbj1gd2cj-knetwalk-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/knetwalk-15.04.0.tar.xz";
+      sha256 = "0ljwgb5sb8x2g2qrvnl1lzmk34zcg6g1qfyp6p74h8lbhfk1vbgl";
+      name = "knetwalk-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klettres-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bnd0dnbv8ybywwzaskjlx2dvdw3l9afc-klettres-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/klettres-15.04.0.tar.xz";
+      sha256 = "1kzcqj1w5dcmc54v96q3s6v4fj86kgc9vdllg7l98bv9d2zcxpph";
+      name = "klettres-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapptemplate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qg0q54wpsmr1y9dfa72y24fjr1faqd8y-kapptemplate-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kapptemplate-15.04.0.tar.xz";
+      sha256 = "01ldjxgsv422l9lay5yg5b9y0cbbwpfl8x41a1wvm9h2l4k0mn3r";
+      name = "kapptemplate-15.04.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g3mfvybxvh2rws76bdsvd7fcnkc3cjdh-kjumpingcube-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kjumpingcube-15.04.0.tar.xz";
+      sha256 = "0mj33yz2565px6ljlw6k0pgd2ljq9gsjx4x9jzq6wbcjg6vbiyah";
+      name = "kjumpingcube-15.04.0.tar.xz";
+    };
+  }
 ]
diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh
index a26fa4b80e28..3ef8c11c3a14 100755
--- a/pkgs/applications/kde-apps-15.04/manifest.sh
+++ b/pkgs/applications/kde-apps-15.04/manifest.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
 KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
 
 if [ $# -eq 0 ]; then
@@ -8,7 +9,7 @@ if [ $# -eq 0 ]; then
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../.. -A autonix.manifest) \
       "${KDE_MIRROR}/stable/applications/15.04.0/" \
-      -A '*.tar.xz'
+      $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
 
 else
 

From 6ca12344b39b0bd0274aca9f98a8790cab4e45d8 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 16:10:49 +0200
Subject: [PATCH 0170/1143] nixos: add confd module

---
 nixos/modules/module-list.nix         |  1 +
 nixos/modules/services/misc/confd.nix | 89 +++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 nixos/modules/services/misc/confd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 17717c5988dc..950bd59d9883 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -184,6 +184,7 @@
   ./services/misc/canto-daemon.nix
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/cgminer.nix
+  ./services/misc/confd.nix
   ./services/misc/dictd.nix
   ./services/misc/disnix.nix
   ./services/misc/docker-registry.nix
diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix
new file mode 100644
index 000000000000..7094bb460895
--- /dev/null
+++ b/nixos/modules/services/misc/confd.nix
@@ -0,0 +1,89 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.confd;
+
+  confdConfig = ''
+    backend = "${cfg.backend}"
+    confdir = "${cfg.confDir}"
+    interval = ${toString cfg.interval}
+    nodes = [ ${concatMapStringsSep "," (s: ''"${s}"'') cfg.nodes}, ]
+    prefix = "${cfg.prefix}"
+    log-level = "${cfg.logLevel}"
+    watch = ${if cfg.watch then "true" else "false"}
+  '';
+
+in {
+  options.services.confd = {
+    enable = mkEnableOption "Whether to enable confd service.";
+
+    backend = mkOption {
+      description = "Confd config storage backend to use.";
+      default = "etcd";
+      type = types.enum ["etcd" "consul" "redis" "zookeeper"];
+    };
+
+    interval = mkOption {
+      description = "Confd check interval.";
+      default = 10;
+      type = types.int;
+    };
+
+    nodes = mkOption {
+      description = "Confd list of nodes to connect to.";
+      default = [ "http://127.0.0.1:4001" ];
+      type = types.listOf types.str;
+    };
+
+    watch = mkOption {
+      description = "Confd, whether to watch etcd config for changes.";
+      default = true;
+      type = types.bool;
+    };
+
+    prefix = mkOption {
+      description = "The string to prefix to keys.";
+      default = "/";
+      type = types.path;
+    };
+
+    logLevel = mkOption {
+      description = "Confd log level.";
+      default = "info";
+      type = types.enum ["info" "debug"];
+    };
+
+    confDir = mkOption {
+      description = "The path to the confd configs.";
+      default = "/etc/confd";
+      type = types.path;
+    };
+
+    package = mkOption {
+      description = "Confd package to use.";
+      default = pkgs.goPackages.confd;
+      type = types.package;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.confd = {
+      description = "Confd Service.";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/confd";
+      };
+    };
+
+    environment.etc = {
+      "confd/confd.toml".text = confdConfig;
+    };
+
+    environment.systemPackages = [ cfg.package ];
+
+    services.etcd.enable = mkIf (cfg.backend == "etcd") (mkDefault true);
+  };
+}

From 5717d5e09e2517f99c737d2e3af7257f082e1b91 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Sat, 25 Apr 2015 14:01:36 -0700
Subject: [PATCH 0171/1143] curl: ldap and libidn support as `curlFull`

---
 pkgs/tools/networking/curl/default.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix        | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 08c00fc4b342..4fd30cc1fa1e 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,4 +1,6 @@
 { stdenv, fetchurl
+, idnSupport ? false, libidn ? null
+, ldapSupport ? false, openldap ? null
 , zlibSupport ? false, zlib ? null
 , sslSupport ? false, openssl ? null
 , scpSupport ? false, libssh2 ? null
@@ -6,6 +8,8 @@
 , c-aresSupport ? false, c-ares ? null
 }:
 
+assert idnSupport -> libidn != null;
+assert ldapSupport -> openldap != null;
 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 assert scpSupport -> libssh2 != null;
@@ -23,6 +27,8 @@ stdenv.mkDerivation rec {
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.
   propagatedBuildInputs = with stdenv.lib;
+    optional idnSupport libidn ++
+    optional ldapSupport openldap ++
     optional zlibSupport zlib ++
     optional gssSupport gss ++
     optional c-aresSupport c-ares ++
@@ -43,6 +49,9 @@ stdenv.mkDerivation rec {
   configureFlags = [
       ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
       ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
+      ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
+      ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
+      ( if idnSupport then "--with-libidn=${libidn}" else "--without-libidn" )
     ]
     ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
     ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c0bc08be131..7cf271ca16a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1050,6 +1050,12 @@ let
 
   cudatoolkit = cudatoolkit5;
 
+  curlFull = curl.override {
+    idnSupport = true;
+    ldapSupport = true;
+    gssSupport = true;
+  };
+
   curl = callPackage ../tools/networking/curl rec {
     fetchurl = fetchurlBoot;
     zlibSupport = true;

From df000d93e9e67e3f8dc6f4375411a94d2aa9c757 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 25 Apr 2015 18:38:05 -0700
Subject: [PATCH 0172/1143] nettle: 3.1 -> 3.1.1

---
 pkgs/development/libraries/nettle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 799433b12f93..6d5e36d726c2 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.1";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    sha256 = "1ly9kz5fgc8ilykz07crqwgjsfn4p2s6565gj1aq0w4fr179v1gn";
+    sha256 = "0k1x57zviysvi91lkk66cg8v819vywm5g5yqs22wppfqcifx5m2z";
   };
 })

From 5dd8538812c0b579b5c61192ff69512dc85d7b72 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 25 Apr 2015 18:41:18 -0700
Subject: [PATCH 0173/1143] mesa: 10.5.3 -> 10.5.4

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 8db89b60f181..2e94626411e3 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.5.3";
+  version = "10.5.4";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
   clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "18ibj4c8zmg738md8phmq3va40ycsjdilg76ylw35h7mwhdyw0c7";
+    sha256 = "00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm";
   };
 
   prePatch = "patchShebangs .";

From 55a64a5ddb099cf3af4115ee80bfd26553022533 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 26 Apr 2015 20:55:07 -0700
Subject: [PATCH 0174/1143] tcl/tk: Tie versioning together and propagate

---
 pkgs/development/interpreters/tcl/default.nix | 24 ++++++++++++-------
 pkgs/development/libraries/tk/default.nix     | 10 ++++----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index 913c73f01f36..aa3836399ba5 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@@ -1,10 +1,13 @@
 { stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "tcl-8.6.4";
+let
+  release = "8.6";
+in
+stdenv.mkDerivation rec {
+  name = "tcl-${version}";
+  version = "${release}.4";
 
   src = fetchurl {
-    url = mirror://sourceforge/tcl/tcl8.6.4-src.tar.gz;
+    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
     sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
   };
 
@@ -12,16 +15,19 @@ stdenv.mkDerivation {
 
   postInstall = ''
     make install-private-headers
-    ln -s $out/bin/tclsh8.6 $out/bin/tclsh
+    ln -s $out/bin/tclsh${release} $out/bin/tclsh
   '';
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "The Tcl scription language";
     homepage = http://www.tcl.tk/;
-    license = stdenv.lib.licenses.tcltk;
+    license = licenses.tcltk;
+    platforms = platforms.all;
   };
   
-  passthru = {
-    libdir = "lib/tcl8.5";
+  passthru = rec {
+    inherit release version;
+    libPrefix = "tcl${release}";
+    libdir = "lib/${libPrefix}";
   };
 }
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index e44514d5abf1..5f07befcfa54 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
 
 stdenv.mkDerivation {
-  name = "tk-8.6.4";
+  name = "tk-${tcl.version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk8.6.4-src.tar.gz";
+    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
     sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
   };
 
@@ -25,8 +25,10 @@ stdenv.mkDerivation {
 
   inherit tcl;
 
-  passthru = {
-    libPrefix = "tk8.6";
+  passthru = rec {
+    inherit (tcl) release version;
+    libPrefix = "tk${tcl.release}";
+    libdir = "lib/${libPrefix}";
   };
 
   meta = {

From d7c0e3eaf8967b844db1c23f19087c7bb9fd9798 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 26 Apr 2015 21:15:25 -0700
Subject: [PATCH 0175/1143] tcl: Make generic and add 8.5

---
 pkgs/development/interpreters/tcl/8.5.nix       | 11 +++++++++++
 pkgs/development/interpreters/tcl/8.6.nix       | 11 +++++++++++
 .../tcl/{default.nix => generic.nix}            | 17 ++++++++---------
 pkgs/top-level/all-packages.nix                 |  4 +++-
 4 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/interpreters/tcl/8.5.nix
 create mode 100644 pkgs/development/interpreters/tcl/8.6.nix
 rename pkgs/development/interpreters/tcl/{default.nix => generic.nix} (68%)

diff --git a/pkgs/development/interpreters/tcl/8.5.nix b/pkgs/development/interpreters/tcl/8.5.nix
new file mode 100644
index 000000000000..193ff4f93769
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/8.5.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  release = "8.5";
+  version = "${release}.18";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
+    sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3";
+  };
+})
diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix
new file mode 100644
index 000000000000..fd88c8e87166
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/8.6.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  release = "8.6";
+  version = "${release}.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
+    sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
+  };
+})
diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/generic.nix
similarity index 68%
rename from pkgs/development/interpreters/tcl/default.nix
rename to pkgs/development/interpreters/tcl/generic.nix
index aa3836399ba5..8b5722c79c8d 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchurl }:
-let
-  release = "8.6";
-in
+{ stdenv, fetchurl
+
+# Version specific stuff
+, release, version, src
+, ...
+}:
+
 stdenv.mkDerivation rec {
   name = "tcl-${version}";
-  version = "${release}.4";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
-    sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
-  };
+  inherit src;
 
   preConfigure = "cd unix";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a34e16b71bc0..6fb12b7526a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4791,7 +4791,9 @@ let
 
   sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
 
-  tcl = callPackage ../development/interpreters/tcl { };
+  tcl = tcl-8_6;
+  tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
+  tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
 
   xulrunner = callPackage ../development/interpreters/xulrunner {
     inherit (gnome) libIDL;

From ed22d756afc2d885b50d94196d7eebe4282a9661 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 26 Apr 2015 21:18:07 -0700
Subject: [PATCH 0176/1143] pine: Use the passthru version of tcl

---
 .../networking/mailreaders/alpine/default.nix             | 2 +-
 .../networking/mailreaders/realpine/default.nix           | 2 +-
 pkgs/top-level/all-packages.nix                           | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index 87e824a977d3..03c2c21aed05 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   };
   configureFlags = [
     "--with-ssl-include-dir=${openssl}/include/openssl"
-    "--with-tcl-lib=tcl8.5"
+    "--with-tcl-lib=${tcl.libPrefix}"
     ];
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix
index 11097672ae7f..c18359921581 100644
--- a/pkgs/applications/networking/mailreaders/realpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/realpine/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   };
   configureFlags = [
     "--with-ssl-include-dir=${openssl}/include/openssl"
-    "--with-tcl-lib=tcl8.5"
+    "--with-tcl-lib=${tcl.libPrefix}"
     ];
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fb12b7526a2..287c5160fe0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10125,8 +10125,12 @@ let
 
   alock = callPackage ../misc/screensavers/alock { };
 
-  alpine = callPackage ../applications/networking/mailreaders/alpine {};
-  realpine = callPackage ../applications/networking/mailreaders/realpine {};
+  alpine = callPackage ../applications/networking/mailreaders/alpine {
+    tcl = tcl-8_5;
+  };
+  realpine = callPackage ../applications/networking/mailreaders/realpine {
+    tcl = tcl-8_5;
+  };
 
   ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
 

From d8c949cc26ad81ef1535e87ab55978052d1b01c0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 26 Apr 2015 21:21:59 -0700
Subject: [PATCH 0177/1143] Make tcl and tk versions generic

---
 pkgs/applications/audio/vkeybd/default.nix           | 2 +-
 pkgs/applications/science/electronics/tkgate/1.x.nix | 2 +-
 pkgs/development/interpreters/pypy/default.nix       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix
index 279820a723fb..b7b0fba2d548 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/pkgs/applications/audio/vkeybd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation  rec {
     sed -e "s@/usr/local@$out@" -i Makefile
   '';
 
-  makeFlags = [ "TKLIB=-ltk8.5" "TCLLIB=-ltcl8.5" ];
+  makeFlags = [ "TKLIB=-l${tk.libPrefix}" "TCLLIB=-l${tcl.libPrefix}" ];
 
   postInstall = ''
     wrapProgram $out/bin/vkeybd --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix
index 30e882a7f38e..e9849d0460c8 100644
--- a/pkgs/applications/science/electronics/tkgate/1.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/1.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i config.h \
-      -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "8.5"|' \
+      -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "${tcl.release}"|' \
       -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \
       -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \
       \
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index f67c48c62d8d..10d03103b1b5 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -51,7 +51,7 @@ let
       # tkinter hints
       substituteInPlace lib_pypy/_tkinter/tklib.py \
         --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \
-        --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \
+        --replace "linklibs=['tcl', 'tk']" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \
         --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
 
       sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3.py

From 6a366d535a6cbb6f524063da3b3134b6cf3d7093 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 26 Apr 2015 21:30:28 -0700
Subject: [PATCH 0178/1143] eggdrop: Refactor

---
 pkgs/tools/networking/eggdrop/default.nix | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 13efc944bd04..cf7fb20df68b 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, tcl}:
+{ stdenv, fetchurl, tcl }:
 
-stdenv.mkDerivation {
-  name = "eggdrop-1.6.19+ctcpfix";
+stdenv.mkDerivation rec {
+  name = "eggdrop-${version}";
+  version = "1.6.21";
 
   src = fetchurl {
-    url = ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/eggdrop1.6.19+ctcpfix.tar.gz;
-    sha256 = "1lpa6sqwizn8y30i14559j3427vi743pmsxjq9g70x4m71hmshvi";
+    url = "ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/eggdrop${version}.tar.gz";
+    sha256 = "1galvbh9y4c3msrg1s9na0asm077mh1g2i2vsv1vczmfrbgq92vs";
   };
 
-  buildInputs = [tcl]; 
+  buildInputs = [ tcl ];
 
   preConfigure = ''
     prefix=$out/eggdrop
@@ -19,5 +20,13 @@ stdenv.mkDerivation {
     make config
   '';
 
-  configureFlags = "--with-tcllib=${tcl}/lib/libtcl8.5.so --with-tclinc=${tcl}/include/tcl.h";
+  configureFlags = [
+    "--with-tcllib=${tcl}/lib/lib${tcl.libPrefix}.so"
+    "--with-tclinc=${tcl}/include/tcl.h"
+  ];
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+  };
 }

From 00ab10de74bb8d67d426e6181cdad904e607c95a Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 27 Apr 2015 23:50:56 +0200
Subject: [PATCH 0179/1143] dvdisaster: Apply debian's patches to allow ROM
 type and encrypted DVDs

---
 pkgs/tools/cd-dvd/dvdisaster/default.nix      | 22 ++++++++++++++-----
 pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch     | 19 ++++++++++++++++
 pkgs/tools/cd-dvd/dvdisaster/encryption.patch | 21 ++++++++++++++++++
 3 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
 create mode 100644 pkgs/tools/cd-dvd/dvdisaster/encryption.patch

diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 1bdf363300b6..472ef056f1f1 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, which, gettext, intltool
 , glib, gtk2
+, enableSoftening ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -10,6 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "e9787dea39aeafa38b26604752561bc895083c17b588489d857ac05c58be196b";
   };
 
+  patches = stdenv.lib.optional enableSoftening [
+    ./encryption.patch
+    ./dvdrom.patch
+  ];
+
   postPatch = ''
     patchShebangs ./
   '';
@@ -22,11 +28,17 @@ stdenv.mkDerivation rec {
     glib gtk2
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://dvdisaster.net/;
-    description =
-      "Stores data on CD/DVD/BD in a way that it is fully recoverable even " +
-      "after some read errors have developed";
-    license = stdenv.lib.licenses.gpl2;
+    description = "data loss/scratch/aging protection for CD/DVD media";
+    longDescription = ''
+      dvdisaster provides a margin of safety against data loss on CD and
+      DVD media caused by scratches or aging media. It creates error correction
+      data which is used to recover unreadable sectors if the disc becomes
+      damaged at a later time.
+    '';
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
   };
 }
diff --git a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch b/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
new file mode 100644
index 000000000000..ce3f3de2bc03
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
@@ -0,0 +1,19 @@
+Author: Corey Wright <undefined@pobox.com>
+Description: Adds support for DVD-ROM medium-type.
+
+Index: dvdisaster/scsi-layer.c
+===================================================================
+--- dvdisaster.orig/scsi-layer.c	2012-03-06 11:10:17.147044691 +0900
++++ dvdisaster/scsi-layer.c	2012-03-06 11:10:30.927044292 +0900
+@@ -913,6 +913,11 @@
+ 	    break;
+ 	 }
+ 
++	 if(layer_type & 0x01)
++	 {  dh->typeDescr = g_strdup("DVD-ROM");
++	    break;
++	 }
++
+ 	 if(layer_type & 0x06) /* strange thing: (re-)writeable but neither plus nor dash */ 
+ 	 {  dh->typeDescr = g_strdup("DVD-ROM (fake)");
+ 	    dh->subType = DVD;
diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
new file mode 100644
index 000000000000..a9383cb13cfe
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
@@ -0,0 +1,21 @@
+Author: n/a
+Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
+
+Index: dvdisaster/scsi-layer.c
+===================================================================
+--- dvdisaster.orig/scsi-layer.c	2012-04-08 21:51:10.995588783 +0900
++++ dvdisaster/scsi-layer.c	2012-04-08 21:51:29.259678075 +0900
+@@ -2693,11 +2693,12 @@
+        	 return NULL;
+       }
+    }
+-
++/*
+    if(dh->mainType == DVD && query_copyright(dh))
+    {  CloseDevice(dh);
+       Stop(_("This software does not support encrypted media.\n"));
+    }
++*/
+ 
+    /* Create the bitmap of simulated defects */
+ 

From 1b3fb2709ea7fa5d1f5eb3c8346b946120815411 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 27 Apr 2015 23:51:46 +0200
Subject: [PATCH 0180/1143] dvdisaster: Add icons and desktop file

---
 pkgs/tools/cd-dvd/dvdisaster/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 472ef056f1f1..704c3643f3c8 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs ./
+    sed -i 's/dvdisaster48.png/dvdisaster/' contrib/dvdisaster.desktop
   '';
 
   # Explicit --docdir= is required for on-line help to work:
@@ -28,6 +29,16 @@ stdenv.mkDerivation rec {
     glib gtk2
   ];
 
+  postInstall = ''
+    mkdir -pv $out/share/applications
+    cp contrib/dvdisaster.desktop $out/share/applications/
+
+    for size in 16 24 32 48 64; do
+      mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps/
+      cp contrib/dvdisaster"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png
+    done
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://dvdisaster.net/;
     description = "data loss/scratch/aging protection for CD/DVD media";

From c600f5af25dbe95c1457e5bc4322ab284d4417cf Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 28 Apr 2015 02:35:43 +0200
Subject: [PATCH 0181/1143] gnome3: move definition of package sets into pkgs

---
 .../services/x11/desktop-managers/gnome3.nix  | 49 +------------------
 pkgs/desktops/gnome-3/3.12/default.nix        | 18 +++++++
 pkgs/desktops/gnome-3/3.16/default.nix        | 18 +++++++
 3 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index c951f3eae77a..d53f119c9558 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -132,53 +132,8 @@ in {
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
                                                 "${gnome3.glib_networking}/lib/gio/modules"
                                                 "${gnome3.gvfs}/lib/gio/modules" ];
-    environment.systemPackages =
-      [ pkgs.desktop_file_utils
-        gnome3.glib_networking
-        gnome3.gtk3 # for gtk-update-icon-cache
-        pkgs.ibus
-        pkgs.shared_mime_info # for update-mime-database
-        gnome3.gvfs
-        gnome3.dconf
-        gnome3.gnome-backgrounds
-        gnome3.gnome_control_center
-        gnome3.gnome-menus
-        gnome3.gnome_settings_daemon
-        gnome3.gnome_shell
-        gnome3.gnome_themes_standard
-        gnome3.defaultIconTheme
-      ] ++ cfg.sessionPath ++ (removePackagesByName [
-        gnome3.baobab
-        gnome3.empathy
-        gnome3.eog
-        gnome3.epiphany
-        gnome3.evince
-        gnome3.gucharmap
-        gnome3.nautilus
-        gnome3.totem
-        gnome3.vino
-        gnome3.yelp
-        gnome3.gnome-bluetooth
-        gnome3.gnome-calculator
-        gnome3.gnome-contacts
-        gnome3.gnome-font-viewer
-        gnome3.gnome-screenshot
-        gnome3.gnome-shell-extensions
-        gnome3.gnome-system-log
-        gnome3.gnome-system-monitor
-        gnome3.gnome_terminal
-        gnome3.gnome-user-docs
-
-        gnome3.bijiben
-        gnome3.evolution
-        gnome3.file-roller
-        gnome3.gedit
-        gnome3.gnome-clocks
-        gnome3.gnome-music
-        gnome3.gnome-tweak-tool
-        gnome3.gnome-photos
-        gnome3.nautilus-sendto
-      ] config.environment.gnome3.excludePackages);
+    environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
+      ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages);
 
     # Use the correct gnome3 packageSet
     networking.networkmanager.basePackages =
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index dce75eb2176d..670ceb105af3 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -1,6 +1,24 @@
 { callPackage, pkgs }:
 
 rec {
+  corePackages = with gnome3; [
+    pkgs.desktop_file_utils pkgs.ibus
+    pkgs.shared_mime_info # for update-mime-database
+    gtk3 # for gtk-update-icon-cache
+    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
+    gnome-menus gnome_settings_daemon gnome_shell
+    gnome_themes_standard defaultIconTheme
+  ];
+
+  optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
+    gucharmap nautilus totem vino yelp gnome-bluetooth
+    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
+    gnome-shell-extensions gnome-system-log gnome-system-monitor
+    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
+    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
+    nautilus-sendto
+  ];
+
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; };
 
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index a26b5263dcda..b07a1192fb13 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -1,6 +1,24 @@
 { callPackage, pkgs, self }:
 
 rec {
+  corePackages = with gnome3; [
+    pkgs.desktop_file_utils pkgs.ibus
+    pkgs.shared_mime_info # for update-mime-database
+    gtk3 # for gtk-update-icon-cache
+    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
+    gnome-menus gnome_settings_daemon gnome_shell
+    gnome_themes_standard defaultIconTheme
+  ];
+
+  optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
+    gucharmap nautilus totem vino yelp gnome-bluetooth
+    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
+    gnome-shell-extensions gnome-system-log gnome-system-monitor
+    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
+    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
+    nautilus-sendto
+  ];
+
   inherit (pkgs) libsoup glib gtk2;
   inherit (pkgs.gnome2) ORBit2;
   gtk3 = pkgs.gtk3_16;

From 19a62322ea9a024db3167e53781a27b4816edb0d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 28 Apr 2015 02:37:36 +0200
Subject: [PATCH 0182/1143] gnome3.16: dconf-editor is now a separate package

---
 .../3.16/core/dconf-editor/default.nix        | 28 +++++++++++++++++++
 .../gnome-3/3.16/core/dconf/default.nix       |  7 -----
 pkgs/desktops/gnome-3/3.16/default.nix        |  3 +-
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
new file mode 100644
index 000000000000..06c01d305f84
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
+, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+
+let
+  majorVersion = "3.16";
+in
+stdenv.mkDerivation rec {
+  name = "dconf-editor-${version}";
+  version = "${majorVersion}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/dconf-editor/${majorVersion}/${name}.tar.xz";
+    sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88";
+  };
+
+  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+                  intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/dconf-editor" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
index 141d1413f6f1..3f71165e7133 100644
--- a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
@@ -16,13 +16,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
                   intltool docbook_xsl docbook_xsl_ns makeWrapper ];
 
-  preFixup = ''
-    wrapProgram "$out/bin/dconf-editor" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-
-    rm $out/lib/gio/modules/giomodule.cache
-  '';
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.lethalman ];
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index b07a1192fb13..937d73b9421c 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -16,7 +16,7 @@ rec {
     gnome-shell-extensions gnome-system-log gnome-system-monitor
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto
+    nautilus-sendto dconf-editor
   ];
 
   inherit (pkgs) libsoup glib gtk2;
@@ -66,6 +66,7 @@ rec {
   caribou = callPackage ./core/caribou { };
 
   dconf = callPackage ./core/dconf { };
+  dconf-editor = callPackage ./core/dconf-editor { };
 
   empathy = callPackage ./core/empathy { 
     webkitgtk = webkitgtk24x;

From ce43dae0df758bfc762e9d2e89b0e0065f4c8c14 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Mon, 27 Apr 2015 21:38:42 -0400
Subject: [PATCH 0183/1143] Updated smartgithg to version `6.5.7`.

---
 pkgs/applications/version-management/smartgithg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 5bb201b60d00..1af0653fa812 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  the_version = "6_5_3";
+  the_version = "6_5_7";
 
 in
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://www.syntevo.com/download/smartgit/" +
           "smartgit-generic-${the_version}.tar.gz";
-    sha256 = "0hz1y29ipls58fizr27w6rbv7v7qbbc1h70xvjjd8c94k9ajmav9";
+    sha256 = "0db4dxp0dl173z9r8n25zdl1il240p751d2f77cw0nmyibik7q4l";
   };
 
   buildInputs = [

From 76a8089d96670fbb5dd35edaea7e83877c35a7ad Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Mon, 27 Apr 2015 22:55:54 -0400
Subject: [PATCH 0184/1143] Added standalone diagram-builder haskell package.

Simple wrapper over `haskellng`'s `diagram-builder`
package that allows for simpler install.
---
 .../graphics/diagrams-builder/default.nix     | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/graphics/diagrams-builder/default.nix

diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix
new file mode 100644
index 000000000000..fc7766b403c4
--- /dev/null
+++ b/pkgs/tools/graphics/diagrams-builder/default.nix
@@ -0,0 +1,43 @@
+/*
+  If user need access to more haskell package for building his
+  diagrams, he simply has to pass these package through the
+  extra packages function as follow in `config.nix`:
+  
+  ~~~
+  diagrams-builder.override {
+    extraPackages = self : [myHaskellPackage];
+  }
+  ­~~~
+*/
+
+{ stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }:
+let
+  # Used same technique as for the yiCustom package.
+  w = ghcWithPackages 
+    (self: [ diagrams-builder ] ++ extraPackages self);
+  wrappedGhc = w.override { ignoreCollisions = true; };
+  ghcVersion = w.version;
+in
+stdenv.mkDerivation {
+  name = "diagrams-builder";
+  buildInputs = [ makeWrapper ];
+  buildCommand = ''
+    makeWrapper \
+    "${diagrams-builder}/bin/diagrams-builder-svg" "$out/bin/diagrams-builder-svg" \
+      --set NIX_GHC ${wrappedGhc}/bin/ghc \
+      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
+
+    makeWrapper \
+    "${diagrams-builder}/bin/diagrams-builder-cairo" "$out/bin/diagrams-builder-cairo" \
+      --set NIX_GHC ${wrappedGhc}/bin/ghc \
+      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
+
+    makeWrapper \
+    "${diagrams-builder}/bin/diagrams-builder-ps" "$out/bin/diagrams-builder-ps" \
+    --set NIX_GHC ${wrappedGhc}/bin/ghc \
+    --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
+  '';
+  # Will be faster to build the wrapper locally then to fetch it from a binary cache.
+  preferLocalBuild = true;
+  meta = diagrams-builder.meta;
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95bd693a9f8f..a8e23ea89bd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -764,6 +764,10 @@ let
 
   ddate = callPackage ../tools/misc/ddate { };
 
+  diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
+    inherit (haskellngPackages) ghcWithPackages diagrams-builder;
+  };
+
   direnv = callPackage ../tools/misc/direnv { };
 
   discount = callPackage ../tools/text/discount { };

From a64e90bdef978cccb2b5056d3e2421aad6afec6f Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 27 Apr 2015 23:10:53 -0400
Subject: [PATCH 0185/1143] nixos: fix infinite recursion in isoImage.isoName

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index d9d7254aba25..c546b8df4744 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -105,7 +105,7 @@ in
   options = {
 
     isoImage.isoName = mkOption {
-      default = "${config.isoImage.isoName}.iso";
+      default = "${config.isoImage.isoBaseName}.iso";
       description = ''
         Name of the generated ISO image file.
       '';

From 0171593d449e30f470fd96d34cd13ef561a6dffb Mon Sep 17 00:00:00 2001
From: Sam Griffin <sam.griffin@gmail.com>
Date: Tue, 28 Apr 2015 01:38:40 -0400
Subject: [PATCH 0186/1143] updating bitcoin to 0.10.1

---
 pkgs/applications/altcoins/bitcoin.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 0e98e2342147..b888b587be9d 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -6,13 +6,14 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.10.0";
+  core_version = "0.10.1";
+  version = core_version;
 
   src = fetchurl {
-    url = [ "https://bitcoin.org/bin/bitcoin-core-0.10.0/bitcoin-${version}.tar.gz"
-            "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-0.10.0/bitcoin-${version}.tar.gz"
+    url = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
+            "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
           ];
-    sha256 = "a516cf6d9f58a117607148405334b35d3178df1ba1c59229609d2bcd08d30624";
+    sha256 = "287873f9ba4fd49cd4e4be7eba070d2606878f1690c5be0273164d37cbf3c138";
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib

From 83e4dfcf2f5467651ee472cdb6db12d7dfc7ee01 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 25 Apr 2015 17:22:00 -0500
Subject: [PATCH 0187/1143] plasma53: fix source URLs

---
 pkgs/desktops/plasma-5.3/manifest.nix | 74 +++++++++++++--------------
 pkgs/desktops/plasma-5.3/manifest.sh  |  3 +-
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/manifest.nix b/pkgs/desktops/plasma-5.3/manifest.nix
index 239d333b7da2..8520c3605adb 100644
--- a/pkgs/desktops/plasma-5.3/manifest.nix
+++ b/pkgs/desktops/plasma-5.3/manifest.nix
@@ -5,7 +5,7 @@
     name = stdenv.lib.nameFromURL "kio-extras-5.2.95.tar.xz" ".tar";
     store = "/nix/store/5j458wgrnmcapib0iy67w20skbw630zv-kio-extras-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kio-extras-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kio-extras-5.2.95.tar.xz";
       sha256 = "1mkncdz0gvd2jgmlpn45h11zwgh3czfd9zl9rdhp9knssf20hna4";
       name = "kio-extras-5.2.95.tar.xz";
     };
@@ -14,7 +14,7 @@
     name = stdenv.lib.nameFromURL "kmenuedit-5.2.95.tar.xz" ".tar";
     store = "/nix/store/7112y2xbfmh0hlcg1s3whm57saibfzcf-kmenuedit-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kmenuedit-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kmenuedit-5.2.95.tar.xz";
       sha256 = "065gpjbbj4gpbvrm32lbdjknap4s4q2m539dkn82zp17v8drvqpw";
       name = "kmenuedit-5.2.95.tar.xz";
     };
@@ -23,7 +23,7 @@
     name = stdenv.lib.nameFromURL "plasma-sdk-5.2.95.tar.xz" ".tar";
     store = "/nix/store/4hjlkvs8pwfzdzy17mrcr0zwq9jskpqp-plasma-sdk-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-sdk-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/plasma-sdk-5.2.95.tar.xz";
       sha256 = "1yg1n7s0lkfjw4ayrgysqsgyll1xpf3z59a8c1vx1czr2if46hfb";
       name = "plasma-sdk-5.2.95.tar.xz";
     };
@@ -32,7 +32,7 @@
     name = stdenv.lib.nameFromURL "sddm-kcm-5.2.95.tar.xz" ".tar";
     store = "/nix/store/lhlam20k8zhccqxx5a21c9x6gflx27x8-sddm-kcm-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/sddm-kcm-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/sddm-kcm-5.2.95.tar.xz";
       sha256 = "1hw1b6gvdkfbsnwp32z1hwgpb9q11iancmmw7lx12bq0ichl297g";
       name = "sddm-kcm-5.2.95.tar.xz";
     };
@@ -41,7 +41,7 @@
     name = stdenv.lib.nameFromURL "baloo-5.6.95.tar.xz" ".tar";
     store = "/nix/store/1pig79610pk3fp964yj448729f6al15d-baloo-5.6.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/baloo-5.6.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/baloo-5.6.95.tar.xz";
       sha256 = "17v30vlhyh4ax79yhqjvrq6g4zjnj0mayx7dlvjpmmwdnmgy6fxl";
       name = "baloo-5.6.95.tar.xz";
     };
@@ -50,7 +50,7 @@
     name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.95.tar.xz" ".tar";
     store = "/nix/store/njcw3a7933qkq7rwfxd5fgzh8rbfmdcp-plasma-workspace-wallpapers-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-workspace-wallpapers-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/plasma-workspace-wallpapers-5.2.95.tar.xz";
       sha256 = "12d9nxvs8d95qfv0lb4yf8w8x45kf441vwxch7p6j52vqb1v2p35";
       name = "plasma-workspace-wallpapers-5.2.95.tar.xz";
     };
@@ -59,7 +59,7 @@
     name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.95.tar.xz" ".tar";
     store = "/nix/store/5bhbhnjfkml4ijpicyz5bc1h3m52708j-polkit-kde-agent-1-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/polkit-kde-agent-1-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/polkit-kde-agent-1-5.2.95.tar.xz";
       sha256 = "1pr5na715hi6v3kfvbk66y91p425lwl05irym6y5cpqjsa57785d";
       name = "polkit-kde-agent-1-5.2.95.tar.xz";
     };
@@ -68,7 +68,7 @@
     name = stdenv.lib.nameFromURL "libkscreen-5.2.95.tar.xz" ".tar";
     store = "/nix/store/m9vlln9609smnkpljkibd6y276zmbl00-libkscreen-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/libkscreen-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/libkscreen-5.2.95.tar.xz";
       sha256 = "05g8nv5p1mq74gcwlfw65c5mal8wcdffv13gmhhb10yx6yzk7ygg";
       name = "libkscreen-5.2.95.tar.xz";
     };
@@ -77,7 +77,7 @@
     name = stdenv.lib.nameFromURL "muon-5.2.95.tar.xz" ".tar";
     store = "/nix/store/3q7asdd3qs31vjkg7xs7pvpiwhd4kwsn-muon-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/muon-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/muon-5.2.95.tar.xz";
       sha256 = "06dsjsb721g5lal70b28rdc0av4cbrk5dslianmlhz7h0kzafs1g";
       name = "muon-5.2.95.tar.xz";
     };
@@ -86,7 +86,7 @@
     name = stdenv.lib.nameFromURL "ksshaskpass-5.2.95.tar.xz" ".tar";
     store = "/nix/store/hpyk2ckwygc598swc0c6ncrj2y8r90cv-ksshaskpass-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/ksshaskpass-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/ksshaskpass-5.2.95.tar.xz";
       sha256 = "08si6vj34zhgqsxnip8pb54bf1q4ycb5zdz4hzvf1wf51hp027gn";
       name = "ksshaskpass-5.2.95.tar.xz";
     };
@@ -95,7 +95,7 @@
     name = stdenv.lib.nameFromURL "milou-5.2.95.tar.xz" ".tar";
     store = "/nix/store/wc0a3ifcp6q7vm36g1sbd4b2czjvcg96-milou-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/milou-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/milou-5.2.95.tar.xz";
       sha256 = "02s0iarwdavpg6qnrzq6b3yx6a5i2fwjb15b9gj7hzib9i17w0hv";
       name = "milou-5.2.95.tar.xz";
     };
@@ -104,7 +104,7 @@
     name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.95.tar.xz" ".tar";
     store = "/nix/store/1i0l6rv69nxrvczh83as7xvj2lklqhkd-kde-gtk-config-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kde-gtk-config-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kde-gtk-config-5.2.95.tar.xz";
       sha256 = "1hcrm6x46him9s19ffj6mp7qhllkl3x1k1q2c1b7cynf9y6l810w";
       name = "kde-gtk-config-5.2.95.tar.xz";
     };
@@ -113,7 +113,7 @@
     name = stdenv.lib.nameFromURL "powerdevil-5.2.95.tar.xz" ".tar";
     store = "/nix/store/77avwmqzs7ghmafj33sbakxkl1v4b6y3-powerdevil-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/powerdevil-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/powerdevil-5.2.95.tar.xz";
       sha256 = "15bml54l4daxd3shgf73s2y3qd05c0r9x8xib1axpmdjnl6501r8";
       name = "powerdevil-5.2.95.tar.xz";
     };
@@ -122,7 +122,7 @@
     name = stdenv.lib.nameFromURL "ksysguard-5.2.95.tar.xz" ".tar";
     store = "/nix/store/9rn2l0n0p1r91nki26mxlc007h2zf60j-ksysguard-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/ksysguard-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/ksysguard-5.2.95.tar.xz";
       sha256 = "0ddggn5vwdsylivcb5z91z446xiaqpm36cyakazri0ps9hddfi0n";
       name = "ksysguard-5.2.95.tar.xz";
     };
@@ -131,7 +131,7 @@
     name = stdenv.lib.nameFromURL "kfilemetadata-5.6.95.tar.xz" ".tar";
     store = "/nix/store/qg0wk3g6d2rrs7sz0vqy47ik2d23zipd-kfilemetadata-5.6.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kfilemetadata-5.6.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kfilemetadata-5.6.95.tar.xz";
       sha256 = "1k3x0yj0clqcadkz50fqyx61s6kvqibks26nklj39rh1yy0d09yj";
       name = "kfilemetadata-5.6.95.tar.xz";
     };
@@ -140,7 +140,7 @@
     name = stdenv.lib.nameFromURL "kwrited-5.2.95.tar.xz" ".tar";
     store = "/nix/store/90h7q76s7ij8w7sxjwb439kagrny2k3h-kwrited-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kwrited-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kwrited-5.2.95.tar.xz";
       sha256 = "1ria0h7s7iqjnvrz7dfcfrd4lv7rb82csz4vklxd0s5bzqj92kv3";
       name = "kwrited-5.2.95.tar.xz";
     };
@@ -149,7 +149,7 @@
     name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.95.tar.xz" ".tar";
     store = "/nix/store/hdjfwdx493wnqr8afn10hnbxrpkl8drr-kdeplasma-addons-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kdeplasma-addons-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kdeplasma-addons-5.2.95.tar.xz";
       sha256 = "0jcqilb4apxzp9ajfvy4rn1wplabbwhbkra4mn0c1f1qgy5jxzmy";
       name = "kdeplasma-addons-5.2.95.tar.xz";
     };
@@ -158,7 +158,7 @@
     name = stdenv.lib.nameFromURL "khotkeys-5.2.95.tar.xz" ".tar";
     store = "/nix/store/aq9vv31hqsvnkg5qj86mwaw75izh7f9g-khotkeys-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/khotkeys-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/khotkeys-5.2.95.tar.xz";
       sha256 = "1ap8y1sa9qqbb1lc42k8m4ir9bmlghj936qrhsa6nni9ncgn7v58";
       name = "khotkeys-5.2.95.tar.xz";
     };
@@ -167,7 +167,7 @@
     name = stdenv.lib.nameFromURL "user-manager-5.2.95.tar.xz" ".tar";
     store = "/nix/store/xskwg62jba6ryx6d9cf7fc4hhngn6m72-user-manager-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/user-manager-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/user-manager-5.2.95.tar.xz";
       sha256 = "02s8ral3brpc1sn9xnmrfyw3bcn0rdaacz8p91qahz0kjf142yvn";
       name = "user-manager-5.2.95.tar.xz";
     };
@@ -176,7 +176,7 @@
     name = stdenv.lib.nameFromURL "bluez-qt-5.2.95.tar.xz" ".tar";
     store = "/nix/store/fa4c2x5l6wr586yzzmh3h90g26yas3m0-bluez-qt-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/bluez-qt-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/bluez-qt-5.2.95.tar.xz";
       sha256 = "07bc8f06yd9zciydag4hj894c38pv4zhcrlmfgp4lidnnk9lsxab";
       name = "bluez-qt-5.2.95.tar.xz";
     };
@@ -185,7 +185,7 @@
     name = stdenv.lib.nameFromURL "kdecoration-5.2.95.tar.xz" ".tar";
     store = "/nix/store/ksqsjrr3fdfamjq50r5jy1i5p14ikn29-kdecoration-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kdecoration-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kdecoration-5.2.95.tar.xz";
       sha256 = "08yzrqbwrpxc0armigpv7wrwp7bz3wgccwzi4py6lywv8wsrrmq7";
       name = "kdecoration-5.2.95.tar.xz";
     };
@@ -194,7 +194,7 @@
     name = stdenv.lib.nameFromURL "oxygen-5.2.95.tar.xz" ".tar";
     store = "/nix/store/hpn2p07q203zfqrx7qyg04rxawd6yrrs-oxygen-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/oxygen-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/oxygen-5.2.95.tar.xz";
       sha256 = "14bklqcwdyjjlhy99a9jfrs52qznydvi3ybkxgrxas7g0xy1rsrw";
       name = "oxygen-5.2.95.tar.xz";
     };
@@ -203,7 +203,7 @@
     name = stdenv.lib.nameFromURL "systemsettings-5.2.95.tar.xz" ".tar";
     store = "/nix/store/bh2s68dmixjk8422ha4m69czz9704rni-systemsettings-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/systemsettings-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/systemsettings-5.2.95.tar.xz";
       sha256 = "1zl027qlg15myiad1953b9y5110fsw2xs5sv4l29ri3f27v5rhps";
       name = "systemsettings-5.2.95.tar.xz";
     };
@@ -212,7 +212,7 @@
     name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.95.tar.xz" ".tar";
     store = "/nix/store/m690wwl3whdpxhqq4g81kwy4i5wzcldk-kde-cli-tools-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kde-cli-tools-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kde-cli-tools-5.2.95.tar.xz";
       sha256 = "052az8w1iaaiv14kjrsjndgsxbrj3167z0zcpsj78bgw61apawkd";
       name = "kde-cli-tools-5.2.95.tar.xz";
     };
@@ -221,7 +221,7 @@
     name = stdenv.lib.nameFromURL "plasma-desktop-5.2.95.tar.xz" ".tar";
     store = "/nix/store/bj2dmd96l9bgdi1xxqqaz8c558yxjscz-plasma-desktop-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-desktop-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/plasma-desktop-5.2.95.tar.xz";
       sha256 = "1zyzqhmmy5sf8xxnknv5z36fzn0497girqvkx58kvb9zdwq4d1bl";
       name = "plasma-desktop-5.2.95.tar.xz";
     };
@@ -230,7 +230,7 @@
     name = stdenv.lib.nameFromURL "plasma-mediacenter-5.2.95.tar.xz" ".tar";
     store = "/nix/store/ypk31w9vglrqpif9r8v6hlq6ia77ywpj-plasma-mediacenter-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-mediacenter-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/plasma-mediacenter-5.2.95.tar.xz";
       sha256 = "1n0yqkxvlic8b75gb233inig383skzcfz751ylh86ppsfqjaf5jn";
       name = "plasma-mediacenter-5.2.95.tar.xz";
     };
@@ -239,7 +239,7 @@
     name = stdenv.lib.nameFromURL "plasma-nm-5.2.95.tar.xz" ".tar";
     store = "/nix/store/pa12m99mmwxif2br46qghx7ypvwaxqs1-plasma-nm-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-nm-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/plasma-nm-5.2.95.tar.xz";
       sha256 = "0p6syjavn7w8vhpx0hvxis99qqcwmh4cng0svfqmxqpmwb9iwfca";
       name = "plasma-nm-5.2.95.tar.xz";
     };
@@ -248,7 +248,7 @@
     name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.95.tar.xz" ".tar";
     store = "/nix/store/dcxsc6givwv0jmjaan0xx69ldz2w1sz5-oxygen-fonts-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/oxygen-fonts-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/oxygen-fonts-5.2.95.tar.xz";
       sha256 = "04yv8msnfxaph7dlvx618xlvfh8r9qgw004ixs7k5ckw6w16xz3s";
       name = "oxygen-fonts-5.2.95.tar.xz";
     };
@@ -257,7 +257,7 @@
     name = stdenv.lib.nameFromURL "kinfocenter-5.2.95.tar.xz" ".tar";
     store = "/nix/store/6nrza8pv196d8zlljbi3p8hy5mxn83fm-kinfocenter-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kinfocenter-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kinfocenter-5.2.95.tar.xz";
       sha256 = "0h99pnsh0zsp3xhr3chda9km9n91raf8sxrycsrhjsg4vjah2lav";
       name = "kinfocenter-5.2.95.tar.xz";
     };
@@ -266,7 +266,7 @@
     name = stdenv.lib.nameFromURL "kwin-5.2.95.tar.xz" ".tar";
     store = "/nix/store/imir1ak0asfxs3kg48kzj3jafpjinxlp-kwin-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kwin-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kwin-5.2.95.tar.xz";
       sha256 = "0pircn5h061zjw50gm6bx1kr7z3hrk81rvp328yp7gfqanwxzbr2";
       name = "kwin-5.2.95.tar.xz";
     };
@@ -275,7 +275,7 @@
     name = stdenv.lib.nameFromURL "bluedevil-5.2.95.tar.xz" ".tar";
     store = "/nix/store/60vbb1qwya5k3r0zyx0x7bsvc0c800k4-bluedevil-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/bluedevil-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/bluedevil-5.2.95.tar.xz";
       sha256 = "1qappzwqdl83mvhj5d643pjfr8l39zdqpfnk4bb56b62hxfmmp3z";
       name = "bluedevil-5.2.95.tar.xz";
     };
@@ -284,7 +284,7 @@
     name = stdenv.lib.nameFromURL "plasma-workspace-5.2.95.tar.xz" ".tar";
     store = "/nix/store/4jdgvnr5mmdnhpvg0v9rri29vrc03pry-plasma-workspace-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/plasma-workspace-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/plasma-workspace-5.2.95.tar.xz";
       sha256 = "1q1y03brfhc7qgzpa9vai6891pd6hnfj0p0x5shn4irkh5lh5yrg";
       name = "plasma-workspace-5.2.95.tar.xz";
     };
@@ -293,7 +293,7 @@
     name = stdenv.lib.nameFromURL "kscreen-5.2.95.tar.xz" ".tar";
     store = "/nix/store/wxvnimhl5j9ak9gmc1s1di7mprcyzh35-kscreen-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kscreen-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kscreen-5.2.95.tar.xz";
       sha256 = "1k76rixy2s4wiyl4rg05hxblq79j5flb1safdr78872jp9b772bg";
       name = "kscreen-5.2.95.tar.xz";
     };
@@ -302,7 +302,7 @@
     name = stdenv.lib.nameFromURL "khelpcenter-5.2.95.tar.xz" ".tar";
     store = "/nix/store/v7pjw4wnvx7gffdsqp4fbdhxk3anf8na-khelpcenter-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/khelpcenter-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/khelpcenter-5.2.95.tar.xz";
       sha256 = "1xm6220bs4iq55ia6yfyl6jawwivjy9y4pcqyl1m34lsjrnbvywc";
       name = "khelpcenter-5.2.95.tar.xz";
     };
@@ -311,7 +311,7 @@
     name = stdenv.lib.nameFromURL "kwayland-5.2.95.tar.xz" ".tar";
     store = "/nix/store/llgf9py7y03gg2grcwjkyicp306vd3qz-kwayland-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/kwayland-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/kwayland-5.2.95.tar.xz";
       sha256 = "1019m668p1ngfx8vv0wg41yhz7dprwy1125a8rdzqgpkspfj63h4";
       name = "kwayland-5.2.95.tar.xz";
     };
@@ -320,7 +320,7 @@
     name = stdenv.lib.nameFromURL "libksysguard-5.2.95.tar.xz" ".tar";
     store = "/nix/store/bpdp5g0znahl58j75b511ywa5042pya2-libksysguard-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/libksysguard-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/libksysguard-5.2.95.tar.xz";
       sha256 = "1cszlh2w8fkb66fpjq0ni7d2hd1yjc9z46hh39fdih3pfwwb4hhx";
       name = "libksysguard-5.2.95.tar.xz";
     };
@@ -329,7 +329,7 @@
     name = stdenv.lib.nameFromURL "breeze-5.2.95.tar.xz" ".tar";
     store = "/nix/store/jvf0gxiq28sdkk0nvhn71n2hmwhxavwb-breeze-5.2.95.tar.xz";
     src = fetchurl {
-      url = "${mirror}/kde/unstable/plasma/5.2.95/breeze-5.2.95.tar.xz";
+      url = "${mirror}/unstable/plasma/5.2.95/breeze-5.2.95.tar.xz";
       sha256 = "16a0qsi1z5sk7s8jmvc808bk29mxkl2f5qvls8j8pcpb9mp8czr3";
       name = "breeze-5.2.95.tar.xz";
     };
diff --git a/pkgs/desktops/plasma-5.3/manifest.sh b/pkgs/desktops/plasma-5.3/manifest.sh
index f253ea27c0bf..8a33a2b5b811 100755
--- a/pkgs/desktops/plasma-5.3/manifest.sh
+++ b/pkgs/desktops/plasma-5.3/manifest.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
 KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
 
 # The extra slash at the end of the URL is necessary to stop wget
 # from recursing over the whole server! (No, it's not a bug.)
 $(nix-build ../../.. -A autonix.manifest) \
     "${KDE_MIRROR}/unstable/plasma/5.2.95/" \
-    -A '*.tar.xz'
+    $MANIFEST_EXTRA_ARGS -A '*.tar.xz'

From 5f9fe6574b46e643edbffe49778e87073b30c151 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 25 Apr 2015 17:22:12 -0500
Subject: [PATCH 0188/1143] kf59.networkmanager-qt: propagate networkmanager
 dependency

---
 pkgs/development/libraries/kde-frameworks-5.9/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/kde-frameworks-5.9/default.nix b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
index 0f5504fe0573..397eec61a781 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
@@ -195,6 +195,10 @@ let
         patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
       };
 
+      networkmanager-qt = super.networkmanager-qt // {
+        propagatedBuildInputs = with pkgs; super.networkmanager-qt.propagatedBuildInputs ++ [ networkmanager ];
+      };
+
     };
 
   kf5 = generateCollection ./. {

From 674c128cc0b21f2a280381a685629f4845a2b664 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 25 Apr 2015 17:22:30 -0500
Subject: [PATCH 0189/1143] plasma53: fix build failures

---
 pkgs/desktops/plasma-5.3/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index ed89384e26ac..73db54495a5f 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -103,6 +103,10 @@ let
           + " -I${pango}/include/pango-1.0";
       };
 
+      kfilemetadata = super.kfilemetadata // {
+        buildInputs = with pkgs; super.kfilemetadata.buildInputs ++ [ attr ];
+      };
+
       kwin = with pkgs; super.kwin // {
         buildInputs = with xlibs;
           super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
@@ -148,6 +152,10 @@ let
         buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor];
       };
 
+      user-manager = super.user-manager // {
+        buildInputs = with pkgs; super.user-manager.buildInputs ++ [ libpwquality ];
+      };
+
     };
 
   plasma5 = generateCollection ./. {

From c2781ce7a44bf3603c841be1084019d9141fbe03 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 28 Apr 2015 10:20:40 -0500
Subject: [PATCH 0190/1143] kdeApps_15_04: add libkdegames name

---
 pkgs/applications/kde-apps-15.04/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 96f1aea68753..e08394f0bf02 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -30,6 +30,7 @@ let
       ["Backend" "CTest"])
     // {
       "KDE4" = "kdelibs";
+      "KF5KDEGames" = "libkdegames";
       "Kexiv2" = "libkexiv2";
       "Kdcraw" = "libkdcraw";
       "Kipi" = "libkipi";

From 43f67f265e580e50afe3c547e24ca765cd71a68e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 28 Apr 2015 11:09:11 -0500
Subject: [PATCH 0191/1143] plasma53: update to final release

---
 pkgs/desktops/plasma-5.3/default.nix  |   9 +
 pkgs/desktops/plasma-5.3/manifest.nix | 369 +++++++++++++-------------
 pkgs/desktops/plasma-5.3/manifest.sh  |   2 +-
 3 files changed, 190 insertions(+), 190 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 73db54495a5f..20818a5c8464 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -72,6 +72,13 @@ let
   postResolve = super:
     (builtins.removeAttrs super ["breeze"]) // {
 
+      bluez-qt = super.bluez-qt // {
+        preConfigure = ''
+          substituteInPlace CMakeLists.txt \
+            --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+        '';
+      };
+
       breeze-qt4 = with pkgs; super.breeze // {
         name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
         buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
@@ -152,9 +159,11 @@ let
         buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor];
       };
 
+      /*
       user-manager = super.user-manager // {
         buildInputs = with pkgs; super.user-manager.buildInputs ++ [ libpwquality ];
       };
+      */
 
     };
 
diff --git a/pkgs/desktops/plasma-5.3/manifest.nix b/pkgs/desktops/plasma-5.3/manifest.nix
index 8520c3605adb..22649b7581e0 100644
--- a/pkgs/desktops/plasma-5.3/manifest.nix
+++ b/pkgs/desktops/plasma-5.3/manifest.nix
@@ -2,336 +2,327 @@
 { stdenv, fetchurl, mirror }:
 [
   {
-    name = stdenv.lib.nameFromURL "kio-extras-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/5j458wgrnmcapib0iy67w20skbw630zv-kio-extras-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kscreen-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/hjhbxv0vrv64r22z5zr15av8c6kpa2q3-kscreen-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kio-extras-5.2.95.tar.xz";
-      sha256 = "1mkncdz0gvd2jgmlpn45h11zwgh3czfd9zl9rdhp9knssf20hna4";
-      name = "kio-extras-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kscreen-5.3.0.tar.xz";
+      sha256 = "1d9qlqszrkz8ia1k20xy645mngg3jwyc9mjvc27z5yx3l2bjdisq";
+      name = "kscreen-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmenuedit-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/7112y2xbfmh0hlcg1s3whm57saibfzcf-kmenuedit-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/di83lwabjyf21g6bbww68xf3k89zdih5-kde-cli-tools-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kmenuedit-5.2.95.tar.xz";
-      sha256 = "065gpjbbj4gpbvrm32lbdjknap4s4q2m539dkn82zp17v8drvqpw";
-      name = "kmenuedit-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kde-cli-tools-5.3.0.tar.xz";
+      sha256 = "12i74cq9kghcj7sfhxqdlqjd5n4lpxr8nvlzkh4n8pjrz1w3g9n7";
+      name = "kde-cli-tools-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-sdk-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/4hjlkvs8pwfzdzy17mrcr0zwq9jskpqp-plasma-sdk-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "bluez-qt-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/7lpwpw24aahx81dq78vbk203w6xpapar-bluez-qt-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/plasma-sdk-5.2.95.tar.xz";
-      sha256 = "1yg1n7s0lkfjw4ayrgysqsgyll1xpf3z59a8c1vx1czr2if46hfb";
-      name = "plasma-sdk-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/bluez-qt-5.3.0.tar.xz";
+      sha256 = "0zcqb8fiawprl2qz1lnf875dnkg7nlb6hghqqzp4l5hby20kxnq5";
+      name = "bluez-qt-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "sddm-kcm-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/lhlam20k8zhccqxx5a21c9x6gflx27x8-sddm-kcm-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-nm-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/hbvm05kcmpc7fncx4padzqx2gqvra88p-plasma-nm-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/sddm-kcm-5.2.95.tar.xz";
-      sha256 = "1hw1b6gvdkfbsnwp32z1hwgpb9q11iancmmw7lx12bq0ichl297g";
-      name = "sddm-kcm-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/plasma-nm-5.3.0.tar.xz";
+      sha256 = "1zldjrdr331shl4xk4yypr22lkav47bjsw4nzdia16x6nsh32yra";
+      name = "plasma-nm-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "baloo-5.6.95.tar.xz" ".tar";
-    store = "/nix/store/1pig79610pk3fp964yj448729f6al15d-baloo-5.6.95.tar.xz";
+    name = stdenv.lib.nameFromURL "libkscreen-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/cr0gg8a4asd3yyy5p0rx6r1m9ngww2f7-libkscreen-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/baloo-5.6.95.tar.xz";
-      sha256 = "17v30vlhyh4ax79yhqjvrq6g4zjnj0mayx7dlvjpmmwdnmgy6fxl";
-      name = "baloo-5.6.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/libkscreen-5.3.0.tar.xz";
+      sha256 = "1hdgj3l51i277ar9af02sz27bb811amr6b6n4fmcym7ss1r3vljd";
+      name = "libkscreen-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/njcw3a7933qkq7rwfxd5fgzh8rbfmdcp-plasma-workspace-wallpapers-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "powerdevil-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/zjanbhr6ynx98sra3ibg86ajf2mxpw4v-powerdevil-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/plasma-workspace-wallpapers-5.2.95.tar.xz";
-      sha256 = "12d9nxvs8d95qfv0lb4yf8w8x45kf441vwxch7p6j52vqb1v2p35";
-      name = "plasma-workspace-wallpapers-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/powerdevil-5.3.0.tar.xz";
+      sha256 = "1pr53yzmra17h7vhp7h9ywsbgk7cm7f2srbdg3ikp2i8a1gzkchm";
+      name = "powerdevil-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/5bhbhnjfkml4ijpicyz5bc1h3m52708j-polkit-kde-agent-1-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "libksysguard-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/k4ccrcbd33iknvamm1v56n2kz86hmcca-libksysguard-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/polkit-kde-agent-1-5.2.95.tar.xz";
-      sha256 = "1pr5na715hi6v3kfvbk66y91p425lwl05irym6y5cpqjsa57785d";
-      name = "polkit-kde-agent-1-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/libksysguard-5.3.0.tar.xz";
+      sha256 = "16b8xrkm1b53nwhcr91hiz0nc1bj9yjz3k4ccfmc6nhyjma3n24v";
+      name = "libksysguard-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkscreen-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/m9vlln9609smnkpljkibd6y276zmbl00-libkscreen-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/yws33kggkdqd5xpq065cbp0lzvgnn749-plasma-workspace-wallpapers-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/libkscreen-5.2.95.tar.xz";
-      sha256 = "05g8nv5p1mq74gcwlfw65c5mal8wcdffv13gmhhb10yx6yzk7ygg";
-      name = "libkscreen-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-wallpapers-5.3.0.tar.xz";
+      sha256 = "0kci4f445624x93k521zva08kggffxqwcg5safzhxxrwyfw65nja";
+      name = "plasma-workspace-wallpapers-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "muon-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/3q7asdd3qs31vjkg7xs7pvpiwhd4kwsn-muon-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-sdk-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/p02z3bzwd2zh62n9hj2mypvvsb0z0396-plasma-sdk-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/muon-5.2.95.tar.xz";
-      sha256 = "06dsjsb721g5lal70b28rdc0av4cbrk5dslianmlhz7h0kzafs1g";
-      name = "muon-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/plasma-sdk-5.3.0.tar.xz";
+      sha256 = "1vbi45f8clpzx2hqpnzw4wamwzm4016mzh4q6yhwgappqsgn3x9f";
+      name = "plasma-sdk-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksshaskpass-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/hpyk2ckwygc598swc0c6ncrj2y8r90cv-ksshaskpass-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-desktop-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/livypzdcyjjiqs50varb9m2fbky6gwhm-plasma-desktop-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/ksshaskpass-5.2.95.tar.xz";
-      sha256 = "08si6vj34zhgqsxnip8pb54bf1q4ycb5zdz4hzvf1wf51hp027gn";
-      name = "ksshaskpass-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/plasma-desktop-5.3.0.tar.xz";
+      sha256 = "0f8rs3p1cbvryg6z386kb9pb0ygbw7jqf63hnpcjkbg33rq14q9p";
+      name = "plasma-desktop-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "milou-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/wc0a3ifcp6q7vm36g1sbd4b2czjvcg96-milou-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kinfocenter-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/w3dl539dn5jczrc50dmsywv79m3iyqxx-kinfocenter-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/milou-5.2.95.tar.xz";
-      sha256 = "02s0iarwdavpg6qnrzq6b3yx6a5i2fwjb15b9gj7hzib9i17w0hv";
-      name = "milou-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kinfocenter-5.3.0.tar.xz";
+      sha256 = "02znnw11j37f084bcjp160sm5fs7kc251w07rxly49jdjyy6ddiw";
+      name = "kinfocenter-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/1i0l6rv69nxrvczh83as7xvj2lklqhkd-kde-gtk-config-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/v6wgn4l8brv3v4mdjgy0hfqxynwncy2p-polkit-kde-agent-1-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kde-gtk-config-5.2.95.tar.xz";
-      sha256 = "1hcrm6x46him9s19ffj6mp7qhllkl3x1k1q2c1b7cynf9y6l810w";
-      name = "kde-gtk-config-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/polkit-kde-agent-1-5.3.0.tar.xz";
+      sha256 = "0z1c354sjm218w30x2whiij43jamfh4lclwcr14bqk2s8i9njhir";
+      name = "polkit-kde-agent-1-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "powerdevil-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/77avwmqzs7ghmafj33sbakxkl1v4b6y3-powerdevil-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kdecoration-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/8zx7y39rrcnmfdjkp7g5xrb7xkwn6mp7-kdecoration-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/powerdevil-5.2.95.tar.xz";
-      sha256 = "15bml54l4daxd3shgf73s2y3qd05c0r9x8xib1axpmdjnl6501r8";
-      name = "powerdevil-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kdecoration-5.3.0.tar.xz";
+      sha256 = "1abwqd8cxf6gabc74pvhnqhwqkn8a7zszwf031ndicl3n3f93x3d";
+      name = "kdecoration-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksysguard-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/9rn2l0n0p1r91nki26mxlc007h2zf60j-ksysguard-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/6hivcczg1gp31ayfz802dxdr89zpaqym-kde-gtk-config-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/ksysguard-5.2.95.tar.xz";
-      sha256 = "0ddggn5vwdsylivcb5z91z446xiaqpm36cyakazri0ps9hddfi0n";
-      name = "ksysguard-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kde-gtk-config-5.3.0.tar.xz";
+      sha256 = "1s7jkrb3750aw0cn5v0g7pdsbkb5ncxfhfclw8lr1nqgi03lphcf";
+      name = "kde-gtk-config-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfilemetadata-5.6.95.tar.xz" ".tar";
-    store = "/nix/store/qg0wk3g6d2rrs7sz0vqy47ik2d23zipd-kfilemetadata-5.6.95.tar.xz";
+    name = stdenv.lib.nameFromURL "systemsettings-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/vzxxqpvapq8fnbf88ljhhnrpzl7vl6wf-systemsettings-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kfilemetadata-5.6.95.tar.xz";
-      sha256 = "1k3x0yj0clqcadkz50fqyx61s6kvqibks26nklj39rh1yy0d09yj";
-      name = "kfilemetadata-5.6.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/systemsettings-5.3.0.tar.xz";
+      sha256 = "0ryhm9d46r5691alnrrg88qxbdwm10y1k7jdk7czrnjm5jkg86vh";
+      name = "systemsettings-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwrited-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/90h7q76s7ij8w7sxjwb439kagrny2k3h-kwrited-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "muon-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/46mqwn6l763jq9qgvp9d6lg184760ff8-muon-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kwrited-5.2.95.tar.xz";
-      sha256 = "1ria0h7s7iqjnvrz7dfcfrd4lv7rb82csz4vklxd0s5bzqj92kv3";
-      name = "kwrited-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/muon-5.3.0.tar.xz";
+      sha256 = "0f9bnp2pf0npil189a0g3pn6bnb9nwqdclrk7scrk4xck7c66v0r";
+      name = "muon-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/hdjfwdx493wnqr8afn10hnbxrpkl8drr-kdeplasma-addons-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "milou-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/zdx8hxf5w0yqypjk08w5hfhkzngdy6pm-milou-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kdeplasma-addons-5.2.95.tar.xz";
-      sha256 = "0jcqilb4apxzp9ajfvy4rn1wplabbwhbkra4mn0c1f1qgy5jxzmy";
-      name = "kdeplasma-addons-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/milou-5.3.0.tar.xz";
+      sha256 = "089dvxpwiwa3sasah27n4yk8l3jbmi71p4080q8pslx6j4dhhmsq";
+      name = "milou-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khotkeys-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/aq9vv31hqsvnkg5qj86mwaw75izh7f9g-khotkeys-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kmenuedit-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/1hjwhla1d23gbmmigxmm4w2ahkayyfr8-kmenuedit-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/khotkeys-5.2.95.tar.xz";
-      sha256 = "1ap8y1sa9qqbb1lc42k8m4ir9bmlghj936qrhsa6nni9ncgn7v58";
-      name = "khotkeys-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kmenuedit-5.3.0.tar.xz";
+      sha256 = "0jzzl043jq9afknj1pc75ywmbs5ff4rjnbqgim5xgrbr08bsam9j";
+      name = "kmenuedit-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "user-manager-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/xskwg62jba6ryx6d9cf7fc4hhngn6m72-user-manager-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-workspace-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/sji2iki8crvy81q6mrc1dd3gibv88mrn-plasma-workspace-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/user-manager-5.2.95.tar.xz";
-      sha256 = "02s8ral3brpc1sn9xnmrfyw3bcn0rdaacz8p91qahz0kjf142yvn";
-      name = "user-manager-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-5.3.0.tar.xz";
+      sha256 = "05kk8vnhsny3k8pn27pjawdfxcjf4c6pcl2k7s43zim0khqv5xcm";
+      name = "plasma-workspace-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bluez-qt-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/fa4c2x5l6wr586yzzmh3h90g26yas3m0-bluez-qt-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/70mkx8jw7dhs1lvqgdjhcvr6y5y4bfck-oxygen-fonts-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/bluez-qt-5.2.95.tar.xz";
-      sha256 = "07bc8f06yd9zciydag4hj894c38pv4zhcrlmfgp4lidnnk9lsxab";
-      name = "bluez-qt-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/oxygen-fonts-5.3.0.tar.xz";
+      sha256 = "0wiqn91m5b421c46fbicmzhkp7lgzck0mrqn7ng0daw8aj6am94y";
+      name = "oxygen-fonts-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdecoration-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/ksqsjrr3fdfamjq50r5jy1i5p14ikn29-kdecoration-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kio-extras-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/g889cng2b9pwz2yhp3qyjyqzhs6h5jvx-kio-extras-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kdecoration-5.2.95.tar.xz";
-      sha256 = "08yzrqbwrpxc0armigpv7wrwp7bz3wgccwzi4py6lywv8wsrrmq7";
-      name = "kdecoration-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kio-extras-5.3.0.tar.xz";
+      sha256 = "0n6fb4cadp16m1ck11d2zp6lrsjmj1q4iav5gydg3i7bds9kwlhf";
+      name = "kio-extras-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/hpn2p07q203zfqrx7qyg04rxawd6yrrs-oxygen-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/3hdjzpgy699qpfxj17dq913nf8qw2wgg-oxygen-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/oxygen-5.2.95.tar.xz";
-      sha256 = "14bklqcwdyjjlhy99a9jfrs52qznydvi3ybkxgrxas7g0xy1rsrw";
-      name = "oxygen-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/oxygen-5.3.0.tar.xz";
+      sha256 = "0a55zncpa156rlkpg26j2gwl8ibc1fjb014sm4j07c3q85zd7n73";
+      name = "oxygen-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "systemsettings-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/bh2s68dmixjk8422ha4m69czz9704rni-systemsettings-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/qrhvjbik2vzxrln457kyl80yhpsk2byx-kdeplasma-addons-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/systemsettings-5.2.95.tar.xz";
-      sha256 = "1zl027qlg15myiad1953b9y5110fsw2xs5sv4l29ri3f27v5rhps";
-      name = "systemsettings-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kdeplasma-addons-5.3.0.tar.xz";
+      sha256 = "10h68sqm536j972mqn216b0304r2gpy76klgdr2d2pzqs0vwywll";
+      name = "kdeplasma-addons-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/m690wwl3whdpxhqq4g81kwy4i5wzcldk-kde-cli-tools-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "ksshaskpass-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/23bkyxca8ydz1g1zj8rlyd14xn073jlw-ksshaskpass-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kde-cli-tools-5.2.95.tar.xz";
-      sha256 = "052az8w1iaaiv14kjrsjndgsxbrj3167z0zcpsj78bgw61apawkd";
-      name = "kde-cli-tools-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/ksshaskpass-5.3.0.tar.xz";
+      sha256 = "1f7kn163hnxh47q6h73lqhzkzpjhlbhq670lkr89s5i7kxjnla54";
+      name = "ksshaskpass-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-desktop-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/bj2dmd96l9bgdi1xxqqaz8c558yxjscz-plasma-desktop-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/f3bwrgk52fj27b3bpgix8zy1vmwryh5f-plasma-mediacenter-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/plasma-desktop-5.2.95.tar.xz";
-      sha256 = "1zyzqhmmy5sf8xxnknv5z36fzn0497girqvkx58kvb9zdwq4d1bl";
-      name = "plasma-desktop-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/plasma-mediacenter-5.3.0.tar.xz";
+      sha256 = "1iw6v35mg6p8g7pxnqqm1sqs75kmk04jzaakmfs6xjn8h34s0kmp";
+      name = "plasma-mediacenter-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-mediacenter-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/ypk31w9vglrqpif9r8v6hlq6ia77ywpj-plasma-mediacenter-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "breeze-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/3d28b0pqh4qjgbff556q475fgkhx0f5r-breeze-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/plasma-mediacenter-5.2.95.tar.xz";
-      sha256 = "1n0yqkxvlic8b75gb233inig383skzcfz751ylh86ppsfqjaf5jn";
-      name = "plasma-mediacenter-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/breeze-5.3.0.tar.xz";
+      sha256 = "12drbw4j7bk0yd7g45j1w70v3jnm4z323zsad3lnnzw448lm9vck";
+      name = "breeze-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-nm-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/pa12m99mmwxif2br46qghx7ypvwaxqs1-plasma-nm-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "bluedevil-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/9wq45x6vk9kf9c01ba2xhsdibhaqq7hc-bluedevil-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/plasma-nm-5.2.95.tar.xz";
-      sha256 = "0p6syjavn7w8vhpx0hvxis99qqcwmh4cng0svfqmxqpmwb9iwfca";
-      name = "plasma-nm-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/bluedevil-5.3.0.tar.xz";
+      sha256 = "0bw03kkfzpcq6s2kx8zi66f308zc153m4ddknlvf5cnm7wvykx4q";
+      name = "bluedevil-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/dcxsc6givwv0jmjaan0xx69ldz2w1sz5-oxygen-fonts-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kfilemetadata-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/whv1mw43461l69j1qa2dp95953si4mcy-kfilemetadata-5.9.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/oxygen-fonts-5.2.95.tar.xz";
-      sha256 = "04yv8msnfxaph7dlvx618xlvfh8r9qgw004ixs7k5ckw6w16xz3s";
-      name = "oxygen-fonts-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kfilemetadata-5.9.0.tar.xz";
+      sha256 = "0rgcdpys13qpv11sqrfjxxp75dlchnffvvz7bi7vps1xypnvk4jw";
+      name = "kfilemetadata-5.9.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kinfocenter-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/6nrza8pv196d8zlljbi3p8hy5mxn83fm-kinfocenter-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "khelpcenter-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/7x373jrlqhj9jq6j3qcz9vimzzr3za5z-khelpcenter-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kinfocenter-5.2.95.tar.xz";
-      sha256 = "0h99pnsh0zsp3xhr3chda9km9n91raf8sxrycsrhjsg4vjah2lav";
-      name = "kinfocenter-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/khelpcenter-5.3.0.tar.xz";
+      sha256 = "1zk70bc2zmnh37qp2w7rh6lzid5hmavm7amyzllsksakj6ba40ki";
+      name = "khelpcenter-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwin-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/imir1ak0asfxs3kg48kzj3jafpjinxlp-kwin-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "khotkeys-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/ml95kbmiczriikch5jgk6iwljinsb28b-khotkeys-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kwin-5.2.95.tar.xz";
-      sha256 = "0pircn5h061zjw50gm6bx1kr7z3hrk81rvp328yp7gfqanwxzbr2";
-      name = "kwin-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/khotkeys-5.3.0.tar.xz";
+      sha256 = "19dy7v67l2xb1x1fqjwljg940gcc9jrvywx2xxvv2lfxgc1i0da4";
+      name = "khotkeys-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bluedevil-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/60vbb1qwya5k3r0zyx0x7bsvc0c800k4-bluedevil-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kwrited-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/rfhx33pghmghr0kxlwijc6lfwpzs8a91-kwrited-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/bluedevil-5.2.95.tar.xz";
-      sha256 = "1qappzwqdl83mvhj5d643pjfr8l39zdqpfnk4bb56b62hxfmmp3z";
-      name = "bluedevil-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kwrited-5.3.0.tar.xz";
+      sha256 = "0mv7nrlgwrb10dcf91mrnpjmrzwgdsylnd4b4grccc13c2f55lad";
+      name = "kwrited-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-workspace-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/4jdgvnr5mmdnhpvg0v9rri29vrc03pry-plasma-workspace-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kwayland-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/0bnhdabiq55i43gwcvpj52ysi2w0zvw0-kwayland-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/plasma-workspace-5.2.95.tar.xz";
-      sha256 = "1q1y03brfhc7qgzpa9vai6891pd6hnfj0p0x5shn4irkh5lh5yrg";
-      name = "plasma-workspace-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kwayland-5.3.0.tar.xz";
+      sha256 = "1ghxwhnk68nadj48r9cxl250ryylwqrarw26jvv7k7kxs6gqlncr";
+      name = "kwayland-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kscreen-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/wxvnimhl5j9ak9gmc1s1di7mprcyzh35-kscreen-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "sddm-kcm-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/wfp80cwqkxifmdgqv8p6mgc1k6gf5shd-sddm-kcm-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kscreen-5.2.95.tar.xz";
-      sha256 = "1k76rixy2s4wiyl4rg05hxblq79j5flb1safdr78872jp9b772bg";
-      name = "kscreen-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/sddm-kcm-5.3.0.tar.xz";
+      sha256 = "15x0ad6zlpdnc4z398ydpr5w0bfla3r5x6mkgakis0mx6vpyzwcc";
+      name = "sddm-kcm-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khelpcenter-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/v7pjw4wnvx7gffdsqp4fbdhxk3anf8na-khelpcenter-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "kwin-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/3mzgg28m89a0g0wlysil39g8lzzip46p-kwin-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/khelpcenter-5.2.95.tar.xz";
-      sha256 = "1xm6220bs4iq55ia6yfyl6jawwivjy9y4pcqyl1m34lsjrnbvywc";
-      name = "khelpcenter-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/kwin-5.3.0.tar.xz";
+      sha256 = "1mvgmjmxjmv0vl0xfxyqa43rh5n65p3z5zz1ban7lbp16sn6qkqn";
+      name = "kwin-5.3.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwayland-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/llgf9py7y03gg2grcwjkyicp306vd3qz-kwayland-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "baloo-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/kz17030nf6rifv84p2y08wrygbsl66xg-baloo-5.9.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/kwayland-5.2.95.tar.xz";
-      sha256 = "1019m668p1ngfx8vv0wg41yhz7dprwy1125a8rdzqgpkspfj63h4";
-      name = "kwayland-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/baloo-5.9.0.tar.xz";
+      sha256 = "1n6k6mznnjccqirr8371z0n0h2cpg6lk50n6dcx0cbqc5mfsckyn";
+      name = "baloo-5.9.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libksysguard-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/bpdp5g0znahl58j75b511ywa5042pya2-libksysguard-5.2.95.tar.xz";
+    name = stdenv.lib.nameFromURL "ksysguard-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/ixm26iv7hhgkss8carpln178df1p56xv-ksysguard-5.3.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/libksysguard-5.2.95.tar.xz";
-      sha256 = "1cszlh2w8fkb66fpjq0ni7d2hd1yjc9z46hh39fdih3pfwwb4hhx";
-      name = "libksysguard-5.2.95.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "breeze-5.2.95.tar.xz" ".tar";
-    store = "/nix/store/jvf0gxiq28sdkk0nvhn71n2hmwhxavwb-breeze-5.2.95.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/plasma/5.2.95/breeze-5.2.95.tar.xz";
-      sha256 = "16a0qsi1z5sk7s8jmvc808bk29mxkl2f5qvls8j8pcpb9mp8czr3";
-      name = "breeze-5.2.95.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.0/ksysguard-5.3.0.tar.xz";
+      sha256 = "0pz2v2lxcgn2jp0nzci1yrnxlcs3sf3a2bipaz31w5bhz128k7wi";
+      name = "ksysguard-5.3.0.tar.xz";
     };
   }
 ]
diff --git a/pkgs/desktops/plasma-5.3/manifest.sh b/pkgs/desktops/plasma-5.3/manifest.sh
index 8a33a2b5b811..befd14f0b12a 100755
--- a/pkgs/desktops/plasma-5.3/manifest.sh
+++ b/pkgs/desktops/plasma-5.3/manifest.sh
@@ -6,5 +6,5 @@ KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
 # The extra slash at the end of the URL is necessary to stop wget
 # from recursing over the whole server! (No, it's not a bug.)
 $(nix-build ../../.. -A autonix.manifest) \
-    "${KDE_MIRROR}/unstable/plasma/5.2.95/" \
+    "${KDE_MIRROR}/stable/plasma/5.3.0/" \
     $MANIFEST_EXTRA_ARGS -A '*.tar.xz'

From 690b3ffa64a4798c3d8b65423acc1e2eea7b9649 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 28 Apr 2015 11:09:42 -0500
Subject: [PATCH 0192/1143] remove plasma-5.2.2

---
 pkgs/desktops/plasma-5.2/default.nix          | 166 --------
 pkgs/desktops/plasma-5.2/dependencies.nix     | 284 -------------
 pkgs/desktops/plasma-5.2/dependencies.sh      |  22 --
 .../kwin-import-plugin-follow-symlinks.patch  |  13 -
 .../plasma-5.2/kwin/libinput-0.8.patch        |  25 --
 .../libkscreen/libkscreen-backend-path.patch  | 130 ------
 pkgs/desktops/plasma-5.2/manifest.nix         | 319 ---------------
 pkgs/desktops/plasma-5.2/manifest.sh          |  15 -
 .../plasma-desktop-hwclock.patch              |  24 --
 .../plasma-desktop-zoneinfo.patch             |  18 -
 pkgs/desktops/plasma-5.2/renames.nix          |  23 --
 pkgs/desktops/plasma-5.2/setup-hook.sh        |   1 -
 pkgs/desktops/plasma-5.2/startkde/default.nix |  34 --
 pkgs/desktops/plasma-5.2/startkde/kdeglobals  |  11 -
 pkgs/desktops/plasma-5.2/startkde/startkde.in | 374 ------------------
 .../plasma-5.2/startkde/startupconfigkeys     |   5 -
 pkgs/top-level/all-packages.nix               |   5 +-
 17 files changed, 1 insertion(+), 1468 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5.2/default.nix
 delete mode 100644 pkgs/desktops/plasma-5.2/dependencies.nix
 delete mode 100755 pkgs/desktops/plasma-5.2/dependencies.sh
 delete mode 100644 pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch
 delete mode 100644 pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch
 delete mode 100644 pkgs/desktops/plasma-5.2/manifest.nix
 delete mode 100755 pkgs/desktops/plasma-5.2/manifest.sh
 delete mode 100644 pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch
 delete mode 100644 pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch
 delete mode 100644 pkgs/desktops/plasma-5.2/renames.nix
 delete mode 100644 pkgs/desktops/plasma-5.2/setup-hook.sh
 delete mode 100644 pkgs/desktops/plasma-5.2/startkde/default.nix
 delete mode 100644 pkgs/desktops/plasma-5.2/startkde/kdeglobals
 delete mode 100644 pkgs/desktops/plasma-5.2/startkde/startkde.in
 delete mode 100644 pkgs/desktops/plasma-5.2/startkde/startupconfigkeys

diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix
deleted file mode 100644
index ed89384e26ac..000000000000
--- a/pkgs/desktops/plasma-5.2/default.nix
+++ /dev/null
@@ -1,166 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ autonix, kf5, pkgs, qt5, stdenv, debug ? false }:
-
-with stdenv.lib; with autonix;
-
-let kf5Orig = kf5; in
-
-let
-
-  kf5 = kf5Orig.override { inherit debug qt5; };
-
-  mirror = "mirror://kde";
-
-  renames =
-    builtins.removeAttrs
-      (import ./renames.nix {})
-      ["Backend" "CTest"];
-
-  scope =
-    # packages in this collection
-    (mapAttrs (dep: name: plasma5."${name}") renames) //
-    # packages from KDE Frameworks 5
-    kf5.scope //
-    # packages pinned to this version of Qt 5
-    {
-      LibBlueDevil = pkgs.libbluedevil;
-      PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
-      PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; };
-    } //
-    # packages from nixpkgs
-    (with pkgs;
-      {
-        inherit epoxy;
-        Epub = ebook_tools;
-        Exiv2 = exiv2;
-        FFmpeg = ffmpeg;
-        FONTFORGE_EXECUTABLE = fontforge;
-        Freetype = freetype;
-        GTK2 = gtk2;
-        GTK3 = gtk3;
-        Libinput = libinput;
-        LibSSH = libssh;
-        PulseAudio = pulseaudio;
-        Taglib = taglib;
-        USB = libusb;
-        Wayland = wayland;
-        Xapian = xapian;
-      }
-    );
-
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-        (blacklist ["bluedevil"])
-      ];
-
-  postResolve = super:
-    (builtins.removeAttrs super ["breeze"]) // {
-
-      breeze-qt4 = with pkgs; super.breeze // {
-        name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
-        buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
-        nativeBuildInputs = [ cmake pkgconfig ];
-        cmakeFlags =
-          [
-            "-DUSE_KDE4=ON"
-            "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
-          ];
-      };
-
-      breeze-qt5 = with pkgs; super.breeze // {
-        name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version;
-        buildInputs = with kf5; with plasma5;
-          [
-            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration kguiaddons
-            frameworkintegration ki18n kwindowsystem qt5.base qt5.x11extras
-          ];
-        nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
-        cmakeFlags = [ "-DUSE_KDE4=OFF" ];
-      };
-
-      kde-gtk-config = with pkgs; super.kde-gtk-config // {
-        NIX_CFLAGS_COMPILE =
-          (super.kde-gtk-config.NIX_CFLAGS_COMPILE or "")
-          + " -I${cairo}/include/cairo"
-          + " -I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include"
-          + " -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"
-          + " -I${pango}/include/pango-1.0";
-      };
-
-      kwin = with pkgs; super.kwin // {
-        buildInputs = with xlibs;
-          super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
-        patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
-      };
-
-      libkscreen = with pkgs; super.libkscreen // {
-        buildInputs = with xlibs; super.libkscreen.buildInputs ++ [libXrandr];
-      };
-
-      plasma-desktop = with pkgs; super.plasma-desktop // {
-        buildInputs = with xlibs;
-          super.plasma-desktop.buildInputs ++
-          [ pkgs.libcanberra libxkbfile libXcursor libXft ];
-        patches = [
-          ./plasma-desktop/plasma-desktop-hwclock.patch
-          ./plasma-desktop/plasma-desktop-zoneinfo.patch
-        ];
-        preConfigure = ''
-          substituteInPlace kcms/dateandtime/helper.cpp \
-            --subst-var-by hwclock "${utillinux}/sbin/hwclock"
-        '';
-      };
-
-      plasma-workspace = with pkgs; super.plasma-workspace // {
-        buildInputs = with xlibs;
-          super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
-        postPatch = ''
-          substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-            --replace kdostartupconfig5 $out/bin/kdostartupconfig5
-        '';
-        postInstall = ''
-          # We use a custom startkde script
-          rm $out/bin/startkde
-        '';
-      };
-
-      powerdevil = with pkgs; super.powerdevil // {
-        buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr];
-      };
-
-      sddm-kcm = with pkgs; super.sddm-kcm // {
-        buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor];
-      };
-
-    };
-
-  plasma5 = generateCollection ./. {
-    inherit (kf5) mkDerivation;
-    inherit mirror preResolve postResolve renames scope;
-  };
-
-in
-  plasma5 // {
-    inherit kf5 scope;
-    startkde = pkgs.callPackage ./startkde {
-      inherit (kf5) kconfig kinit kservice;
-      inherit (plasma5) plasma-desktop plasma-workspace;
-      inherit qt5;
-    };
-  }
diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.2/dependencies.nix
deleted file mode 100644
index cb23102aa1f7..000000000000
--- a/pkgs/desktops/plasma-5.2/dependencies.nix
+++ /dev/null
@@ -1,284 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  baloo = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" "Xapian" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bluedevil = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5WidgetsAddons" "LibBlueDevil" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  breeze = {
-    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-cli-tools = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-gtk-config = {
-    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdecoration = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeplasma-addons = {
-    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Widgets" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kfilemetadata = {
-    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" "Taglib" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khelpcenter = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" "Qt5DBus" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khotkeys = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinfocenter = {
-    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Widgets" "RAW1394" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio-extras = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SLP" "Samba" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kmenuedit = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kscreen = {
-    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" "Qt5QuickWidgets" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksshaskpass = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" "Qt5Core" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Qt5Core" "Qt5Widgets" "Sensors" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwayland = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Gui" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Wayland" "WaylandScanner" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwin = {
-    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwrited = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libbluedevil = {
-    buildInputs = [ "Doxygen" "Qt5" "Qt5Core" "Qt5DBus" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkscreen = {
-    buildInputs = [ "Doxygen" "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "KF5IconThemes" "Qt5Core" "Qt5Network" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libmm-qt = {
-    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  milou = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KF5Service" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  muon = {
-    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "QtOAuth" "packagekitqt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen = {
-    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen-fonts = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-desktop = {
-    buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5GlobalAccel" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-nm = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Quick" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-workspace = {
-    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-workspace-wallpapers = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  polkit-kde-agent = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  powerdevil = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sddm-kcm = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Designer" "Qt5Gui" "Qt5Quick" "Qt5QuickWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  systemsettings = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/desktops/plasma-5.2/dependencies.sh b/pkgs/desktops/plasma-5.2/dependencies.sh
deleted file mode 100755
index e614efc54759..000000000000
--- a/pkgs/desktops/plasma-5.2/dependencies.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script rebuilds dependencies.nix.
-# You must run manifest.sh first to download the packages.
-
-# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
-# If you are working on the packages, this is probably what you want.
-
-# You can also pass the path to a source tree where you have built
-# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
-# probably what you want.
-
-manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch
deleted file mode 100644
index fd1f35d717e3..000000000000
--- a/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
-index 26b44a9..d14e226 100644
---- a/clients/aurorae/src/aurorae.cpp
-+++ b/clients/aurorae/src/aurorae.cpp
-@@ -73,7 +73,7 @@ void AuroraeFactory::init()
-     // so let's try to locate our plugin:
-     QString pluginPath;
-     for (const QString &path : m_engine->importPathList()) {
--        QDirIterator it(path, QDirIterator::Subdirectories);
-+        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             it.next();
-             QFileInfo fileInfo = it.fileInfo();
diff --git a/pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch b/pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch
deleted file mode 100644
index d0b9658b3bfc..000000000000
--- a/pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit a93a2ab1918630c6d571b5a24379c15a0458d1fa
-Author: Martin Gräßlin <mgraesslin@kde.org>
-Date:   Wed Jan 28 16:20:57 2015 +0100
-
-    Disable libinput integration if >= 0.8 is found
-    
-    libinput 0.8 is incompatible causing the build to fail. As we are in
-    dependency freeze the only option is to disable the build.
-    
-    BUG: 342893
-    FIXED-IN: 5.2.1
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 550ef57..8d9c593 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES  URL "http://www.freedesktop.org/software
-                                         PURPOSE "Required for input handling on Wayland."
-                         )
- set(HAVE_INPUT FALSE)
--if (Libinput_FOUND AND UDEV_FOUND)
-+if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8)
-     set(HAVE_INPUT TRUE)
- endif()
- 
diff --git a/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch
deleted file mode 100644
index d5797924d233..000000000000
--- a/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 460022f..422a708 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
- 
-+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
-+
- set(libkscreen_SRCS
-     backendloader.cpp
-     config.cpp
-diff --git a/src/backendloader.cpp b/src/backendloader.cpp
-index b93e469..8aebc14 100644
---- a/src/backendloader.cpp
-+++ b/src/backendloader.cpp
-@@ -16,6 +16,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA       *
-  *************************************************************************************/
- 
-+#include "config-libkscreen.h"
- #include "backendloader.h"
- #include "debug_p.h"
- #include "backends/abstractbackend.h"
-@@ -40,55 +41,54 @@ bool BackendLoader::init()
-     const QString backend = qgetenv("KSCREEN_BACKEND").constData();
-     const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
- 
--    const QStringList paths = QCoreApplication::libraryPaths();
--    Q_FOREACH (const QString &path, paths) {
--        const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
--                       backendFilter,
--                       QDir::SortFlags(QDir::QDir::NoSort),
--                       QDir::NoDotAndDotDot | QDir::Files);
--        const QFileInfoList finfos = dir.entryInfoList();
--        Q_FOREACH (const QFileInfo &finfo, finfos) {
--            // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
--            if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
--                continue;
--            }
-+    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
- 
--            // When on X11, skip the QScreen backend, instead use the XRandR backend,
--            // if not specified in KSCREEN_BACKEND
--            if (backend.isEmpty() &&
--                    finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
--                    QX11Info::isPlatformX11()) {
--                continue;
--            }
-+    const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
-+                   backendFilter,
-+                   QDir::SortFlags(QDir::QDir::NoSort),
-+                   QDir::NoDotAndDotDot | QDir::Files);
-+    const QFileInfoList finfos = dir.entryInfoList();
-+    Q_FOREACH (const QFileInfo &finfo, finfos) {
-+        // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
-+        if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
-+            continue;
-+        }
- 
--            // When not on X11, skip the XRandR backend, and fall back to QSCreen
--            // if not specified in KSCREEN_BACKEND
--            if (backend.isEmpty() &&
--                    finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
--                    !QX11Info::isPlatformX11()) {
--                continue;
--            }
-+        // When on X11, skip the QScreen backend, instead use the XRandR backend,
-+        // if not specified in KSCREEN_BACKEND
-+        if (backend.isEmpty() &&
-+                finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
-+                QX11Info::isPlatformX11()) {
-+            continue;
-+        }
-+
-+        // When not on X11, skip the XRandR backend, and fall back to QSCreen
-+        // if not specified in KSCREEN_BACKEND
-+        if (backend.isEmpty() &&
-+                finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
-+                !QX11Info::isPlatformX11()) {
-+            continue;
-+        }
- 
--            QPluginLoader loader(finfo.filePath());
--            loader.load();
--            QObject *instance = loader.instance();
--            if (!instance) {
-+        QPluginLoader loader(finfo.filePath());
-+        loader.load();
-+        QObject *instance = loader.instance();
-+        if (!instance) {
-+            loader.unload();
-+            continue;
-+        }
-+
-+        s_backend = qobject_cast< AbstractBackend* >(instance);
-+        if (s_backend) {
-+            if (!s_backend->isValid()) {
-+                qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
-+                delete s_backend;
-+                s_backend = 0;
-                 loader.unload();
-                 continue;
-             }
--
--            s_backend = qobject_cast< AbstractBackend* >(instance);
--            if (s_backend) {
--                if (!s_backend->isValid()) {
--                    qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
--                    delete s_backend;
--                    s_backend = 0;
--                    loader.unload();
--                    continue;
--                }
--                qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
--                return true;
--            }
-+            qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
-+            return true;
-         }
-     }
- 
-diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
-new file mode 100644
-index 0000000..a99f3d1
---- /dev/null
-+++ b/src/config-libkscreen.h.cmake
-@@ -0,0 +1,2 @@
-+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
-+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix
deleted file mode 100644
index 4a0161770c8d..000000000000
--- a/pkgs/desktops/plasma-5.2/manifest.nix
+++ /dev/null
@@ -1,319 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kdecoration-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/cppfn3gd3ff2x6llz9gmnbg2plyhxkgb-kdecoration-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kdecoration-5.2.2.tar.xz";
-      sha256 = "1a4vaflzr1vz0v9pp4w1nxs1qpc1yixl0llj8mjx7f2aw03yjdil";
-      name = "kdecoration-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/k0i9hbdiqchd6c4802mgsj6ys0i20cq7-kdeplasma-addons-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kdeplasma-addons-5.2.2.tar.xz";
-      sha256 = "0zzzbpgllaj9kqfca9lqqgjmlybhfga5gazfwh4gmfd6vrvsv4zq";
-      name = "kdeplasma-addons-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "powerdevil-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/q64lvc2svj9ab9ghr7vxgs5y6ghnhv26-powerdevil-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/powerdevil-5.2.2.tar.xz";
-      sha256 = "07p7rxmfykf03m12mpmxi5whgnizvhxbks888zd4hzy42ln8byvd";
-      name = "powerdevil-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/vg1jxzylncp5nz0pp41mxc1a6djv9gx5-polkit-kde-agent-1-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/polkit-kde-agent-1-5.2.2.tar.xz";
-      sha256 = "18krrgcmgmw5ivmhn1i83gl2b90k1pimk91z6sqimcfabsm2207q";
-      name = "polkit-kde-agent-1-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "baloo-5.6.2.tar.xz" ".tar";
-    store = "/nix/store/ghvcq3c2q539avg2n1cm94zs0r4wkkc3-baloo-5.6.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/baloo-5.6.2.tar.xz";
-      sha256 = "14sq0fyy1792m8dqasr52syls2i8rbl2h333z6q9vjfp8zg1bgra";
-      name = "baloo-5.6.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libbluedevil-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/f4awl52gqj3w1lsy73v6pfazzb1rjmca-libbluedevil-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/libbluedevil-5.2.2.tar.xz";
-      sha256 = "1m0g8i6a40jxjfsf24g2x29xik0qwja80az8i6v42jqjigdxqgsz";
-      name = "libbluedevil-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksysguard-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/n78bf9pd2cxf0a8jh0snfl8dfqn59lv7-ksysguard-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/ksysguard-5.2.2.tar.xz";
-      sha256 = "0sz2zjbh9zm0v16n7nfskrx5q5g0p4szqxh3fxkwvjysafvbbm2j";
-      name = "ksysguard-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwin-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/pdjszd0xl49ak7g2sxs9gy0yxfkqyl7w-kwin-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kwin-5.2.2.tar.xz";
-      sha256 = "1h78nb9g7ynmsx9w9gi54xzn2v3pn88fc1s9hf7w6bjbj55nmxnc";
-      name = "kwin-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/5sjd1yal83dsp0sc5yb118w846ypqs3l-oxygen-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/oxygen-5.2.2.tar.xz";
-      sha256 = "1hkm02plbsmbypywr4f84j8bb4fy9pv91rh8j8g99pahyxqjjkzm";
-      name = "oxygen-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksysguard-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/qfim9g5jafl8c0pzd764i4y9mh2aziji-libksysguard-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/libksysguard-5.2.2.tar.xz";
-      sha256 = "0pa1lqccih6d0axv4k6dbm79jlqcy6alx6zp9npbms04w004fmav";
-      name = "libksysguard-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khotkeys-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/1acfqi39blv2phqn5ypsbjfwb4yy6ac9-khotkeys-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/khotkeys-5.2.2.tar.xz";
-      sha256 = "16g51xs0l2fzqd9vf7qy2kda8hlnknxmxbb30wl8fc566pss4xcj";
-      name = "khotkeys-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-nm-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/h2imh1yn683vahz76y2cxvc53c3zg61m-plasma-nm-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/plasma-nm-5.2.2.tar.xz";
-      sha256 = "1031l97b652v2rhzwkwrl1zjm2z0lgg12p88r4sfyp8xzbr5vvsd";
-      name = "plasma-nm-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libmm-qt-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/mpnx11ji4qfgfylm3fy18y0gfcfiyccs-libmm-qt-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/libmm-qt-5.2.2.tar.xz";
-      sha256 = "0z71fn5f5ch4g4bc2nvqx8lj63bw5lxf3axrb6zn4wqviy9345fd";
-      name = "libmm-qt-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkscreen-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/dshgq9mha8j254d0x1w0k6cp2xh12y0y-libkscreen-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/libkscreen-5.2.2.tar.xz";
-      sha256 = "0ymck8yb7kphp7nd7l2kfas420qjkqay4wwxav80ga8zb5m4v9ky";
-      name = "libkscreen-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/g72bj559sk724zyv63mwv97bdkybphwq-plasma-workspace-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/plasma-workspace-5.2.2.tar.xz";
-      sha256 = "0wh5m525f5bdcr9mygm9q9cjwnr46irjx1xdsn873v75nxm16x5i";
-      name = "plasma-workspace-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "muon-5.2.2-1.tar.xz" ".tar";
-    store = "/nix/store/kxgn4px54mw23g6zjafxx091vpx5vvw7-muon-5.2.2-1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/muon-5.2.2-1.tar.xz";
-      sha256 = "0nq0wi0fx69mrvc6aah8xvakjwsvx87ykfrarb0pd1cidjz7k698";
-      name = "muon-5.2.2-1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-extras-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/301jm0fc13y1fnaliifrczpb6i3vnq0q-kio-extras-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kio-extras-5.2.2.tar.xz";
-      sha256 = "18ypgzn7zib0z6gs32l1yzwcgkk7jzwrc66j7yl19nl3j8ijflab";
-      name = "kio-extras-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscreen-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/dr2k13fzyclv2zfq09s0mhi36mxp1byq-kscreen-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kscreen-5.2.2.tar.xz";
-      sha256 = "0mg34046p12102kc1kkvv7famxrx3m3zvgvhllbq29pzqrhgyq7c";
-      name = "kscreen-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "milou-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/whdyjzwz2f2ps9250w0w85rfc2nwakk8-milou-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/milou-5.2.2.tar.xz";
-      sha256 = "0j70v090i6qx1y92mhnasrwx6zlwj81nly6csk4zxbrqlk1mpzfr";
-      name = "milou-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfilemetadata-5.6.2.tar.xz" ".tar";
-    store = "/nix/store/giyrg1kmry1p29l2j39lqqahfrsnnx93-kfilemetadata-5.6.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kfilemetadata-5.6.2.tar.xz";
-      sha256 = "0nkb4nzpjhpy3b2ma9ikdl29lypqrn0qj1cjn4qvrrgviqd1lj89";
-      name = "kfilemetadata-5.6.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/xwld1167hfar6ndwyfpv4iykxkk4fx3l-oxygen-fonts-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/oxygen-fonts-5.2.2.tar.xz";
-      sha256 = "1xrzhg2255zz1hva210wnzsz537dxc2xlzbiqbzwknh3mpp7hb90";
-      name = "oxygen-fonts-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "breeze-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/0k4ljr8hp0xibwhykrqgf6md92f9p172-breeze-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/breeze-5.2.2.tar.xz";
-      sha256 = "0q44bq1j3ap0wj1v582sks87ji2w4m7armb7g9p7jxzjv07hsj2v";
-      name = "breeze-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sddm-kcm-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/znayhrzlj9j5pspb7364yql46g0yrkqp-sddm-kcm-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/sddm-kcm-5.2.2.tar.xz";
-      sha256 = "1wpafks11017m5hqprbr0qbv9wn2516nm9m5bxcs93c572f6dnkr";
-      name = "sddm-kcm-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmenuedit-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/29jgl4ygjk8770iqpdxnyfh7f4xaiv2w-kmenuedit-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kmenuedit-5.2.2.tar.xz";
-      sha256 = "0hwqjj247yjvxp923bqx3q78q6bav962crhrfs5phf3a22v1s5vw";
-      name = "kmenuedit-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/rdgh3m2w5bl5smc0hwcrhi04yh8x7g43-plasma-workspace-wallpapers-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/plasma-workspace-wallpapers-5.2.2.tar.xz";
-      sha256 = "15jw1cb4mgk5fqsmyq8wyl7xc36zyjpr1k585nxg8kqi9376rmlp";
-      name = "plasma-workspace-wallpapers-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinfocenter-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/a49lq7sggqarnbwcmgx82dvkb6z96zmi-kinfocenter-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kinfocenter-5.2.2.tar.xz";
-      sha256 = "0axh3glf25110ixqgiswlv4x4gj73j61spg4pb9gfvvsi53rcqkl";
-      name = "kinfocenter-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksshaskpass-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/zhpxalhlqyz0cwsx2s1b0bzrg7rs2y8m-ksshaskpass-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/ksshaskpass-5.2.2.tar.xz";
-      sha256 = "052apq5l34fa6ibwr9b67jkwj6d4calyv3b20n1556zmfy8skfpj";
-      name = "ksshaskpass-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwrited-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/aaa6yzg06wf0nrnbkhsfrlj1lln6jqsd-kwrited-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kwrited-5.2.2.tar.xz";
-      sha256 = "1fx162rsydmsqhfvg6mypb6xrnl3xvsgrzss25bi2w51w1wylg6h";
-      name = "kwrited-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "systemsettings-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/5qb2ifxfz5dp4xl6a0kdxf3yp7rc2bh5-systemsettings-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/systemsettings-5.2.2.tar.xz";
-      sha256 = "09217sradvh5ygf0k4sx4j73c7bs4svljmswpsag3b27mhmcr4cz";
-      name = "systemsettings-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwayland-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/w5w35h0d8bcilmyi246ilfkn3wlzbvh7-kwayland-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kwayland-5.2.2.tar.xz";
-      sha256 = "1ywp5b7v5x1lvnz330fgv8ss6ba6jcc59r75x96g15cpxj4np997";
-      name = "kwayland-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khelpcenter-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/wlzijg52dxs70i3a3ah95jwxp3c3ir82-khelpcenter-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/khelpcenter-5.2.2.tar.xz";
-      sha256 = "0r1jwf3zyqhg3ixg64ankb9k8pb2cm9k2ykjxs6zkdxrmzqczd87";
-      name = "khelpcenter-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bluedevil-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/b010icvzwl4m7pxcam4g75l5l68gni0r-bluedevil-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/bluedevil-5.2.2.tar.xz";
-      sha256 = "193jrrcqkz1v8dh6wmjipnnpcs17fawciy6q285ipxhas1ma93hs";
-      name = "bluedevil-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/5yc85mx30w54d25a8zivbw77s2vhlng8-kde-cli-tools-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kde-cli-tools-5.2.2.tar.xz";
-      sha256 = "0rx7xi5f4cx4y9kry56mjcqkk8sllw1rwv74hq81nyz6wlcq20zm";
-      name = "kde-cli-tools-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-desktop-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/k5fzvwdsv7s9na2a3rr2cxysh194rbmq-plasma-desktop-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/plasma-desktop-5.2.2.tar.xz";
-      sha256 = "04zid1d4qmw56210hricn2mf04pv28p2063lhax2z3wxynq0wjyl";
-      name = "plasma-desktop-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/fimbgb9rhzcqmbzhspvdfkl818frpklf-kde-gtk-config-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kde-gtk-config-5.2.2.tar.xz";
-      sha256 = "0hyhxm6crzrcdnf06aav4pg6dfvhag5lcxprhhm83cfcrxqi05qb";
-      name = "kde-gtk-config-5.2.2.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/desktops/plasma-5.2/manifest.sh b/pkgs/desktops/plasma-5.2/manifest.sh
deleted file mode 100755
index ec5e9f5ac3e2..000000000000
--- a/pkgs/desktops/plasma-5.2/manifest.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../.. -A autonix.manifest) \
-      http://download.kde.org/stable/plasma/5.2.2/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch
deleted file mode 100644
index 53bd43d38e2c..000000000000
--- a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index cec5ab8..fc4a6b9 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -48,10 +48,6 @@
- #include <sys/stat.h>
- #endif
- 
--// We cannot rely on the $PATH environment variable, because D-Bus activation
--// clears it. So we have to use a reasonable default.
--static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
--
- int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
- {
-     int ret = 0;
-@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
- 
- void ClockHelper::toHwclock()
- {
--    QString hwclock = KStandardDirs::findExe("hwclock", exePath);
-+    QString hwclock = "@hwclock@";
-     if (!hwclock.isEmpty()) {
-         KProcess::execute(hwclock, QStringList() << "--systohc");
-     }
diff --git a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch
deleted file mode 100644
index e924207054d1..000000000000
--- a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index fc4a6b9..7b64d05 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
- 
-     val = selectedzone;
- #else
--    QString tz = "/usr/share/zoneinfo/" + selectedzone;
-+    // NixOS-specific path
-+    QString tz = "/etc/zoneinfo/" + selectedzone;
-+    if (!QFile::exists(tz)) {
-+      // Standard Linux path
-+      tz = "/usr/share/zoneinfo/" + selectedzone;
-+    }
- 
-     if (QFile::exists(tz)) { // make sure the new TZ really exists
-         QFile::remove("/etc/localtime");
diff --git a/pkgs/desktops/plasma-5.2/renames.nix b/pkgs/desktops/plasma-5.2/renames.nix
deleted file mode 100644
index 5778a2bc8192..000000000000
--- a/pkgs/desktops/plasma-5.2/renames.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "powerdevil";
-"CTest" = "kdeplasma-addons";
-"ECM" = "extra-cmake-modules";
-"KDecoration2" = "kdecoration";
-"KF5Baloo" = "baloo";
-"KF5FileMetaData" = "kfilemetadata";
-"KF5ModemManagerQt" = "libmm-qt";
-"KF5Screen" = "libkscreen";
-"KF5SysGuard" = "libksysguard";
-"KF5Wayland" = "kwayland";
-"KF5XmlRpcClientPrivate" = "plasma-workspace";
-"KHotKeysDBusInterface" = "khotkeys";
-"KRunnerAppDBusInterface" = "plasma-workspace";
-"KSMServerDBusInterface" = "plasma-workspace";
-"KWinDBusInterface" = "kwin";
-"LibKWorkspace" = "plasma-workspace";
-"LibTaskManager" = "plasma-workspace";
-"OxygenFont" = "oxygen-fonts";
-"ScreenSaverDBusInterface" = "plasma-workspace";
-}
diff --git a/pkgs/desktops/plasma-5.2/setup-hook.sh b/pkgs/desktops/plasma-5.2/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36f..000000000000
--- a/pkgs/desktops/plasma-5.2/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/desktops/plasma-5.2/startkde/default.nix b/pkgs/desktops/plasma-5.2/startkde/default.nix
deleted file mode 100644
index 624c5d239d5d..000000000000
--- a/pkgs/desktops/plasma-5.2/startkde/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# We provide our own version of the startkde script in its entirety, rather than
-# patching the version provided by kde-workspace, because it requires such
-# extensive patching.
-
-{ stdenv, bash, dbus, gnused, gnugrep, kconfig, kinit, kservice, plasma-desktop
-, plasma-workspace, qt5, socat, xorg }:
-
-let startkde = ./startkde.in; in
-
-stdenv.mkDerivation {
-  name = "startkde-0.1";
-  phases = "installPhase";
-
-  inherit bash gnused gnugrep kconfig kinit kservice socat;
-  inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-  qt5tools = qt5.tools;
-  dbus_tools = dbus.tools;
-  plasmaWorkspace = plasma-workspace;
-  plasmaDesktop = plasma-desktop;
-  startupconfigkeys = ./startupconfigkeys;
-  kdeglobals = ./kdeglobals;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    substituteAll ${startkde} $out/bin/startkde
-    chmod +x $out/bin/startkde
-  '';
-
-  meta = {
-    description = "Custom startkde script for Nixpkgs";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    license = with stdenv.lib.licenses; [ gpl2Plus ];
-  };
-}
diff --git a/pkgs/desktops/plasma-5.2/startkde/kdeglobals b/pkgs/desktops/plasma-5.2/startkde/kdeglobals
deleted file mode 100644
index bfa610712ede..000000000000
--- a/pkgs/desktops/plasma-5.2/startkde/kdeglobals
+++ /dev/null
@@ -1,11 +0,0 @@
-[General]
-XftAntialias=true
-XftHintStyle=hintmedium
-XftSubPixel=none
-desktopFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-fixed=Oxygen Mono,9,-1,5,50,0,0,0,0,0
-font=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-menuFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-smallestReadableFont=Oxygen-Sans,8,-1,5,50,0,0,0,0,0
-taskbarFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
\ No newline at end of file
diff --git a/pkgs/desktops/plasma-5.2/startkde/startkde.in b/pkgs/desktops/plasma-5.2/startkde/startkde.in
deleted file mode 100644
index 0825a0733f43..000000000000
--- a/pkgs/desktops/plasma-5.2/startkde/startkde.in
+++ /dev/null
@@ -1,374 +0,0 @@
-#!@bash@/bin/bash -x
-#
-#  NIXOS KDE STARTUP SCRIPT
-#
-
-# The KDE icon cache is supposed to update itself
-# automatically, but it uses the timestamp on the icon
-# theme directory as a trigger.  Since in Nix the
-# timestamp is always the same, this doesn't work.  So as
-# a workaround, nuke the icon cache on login.  This isn't
-# perfect, since it may require logging out after
-# installing new applications to update the cache.
-# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-rm -fv $HOME/.cache/icon-cache.kcache
-
-# Qt writes a weird ‘libraryPath’ line to
-# ~/.config/Trolltech.conf that causes the KDE plugin
-# paths of previous KDE invocations to be searched.
-# Obviously using mismatching KDE libraries is potentially
-# disastrous, so here we nuke references to the Nix store
-# in Trolltech.conf.  A better solution would be to stop
-# Qt from doing this wackiness in the first place.
-if [ -e $HOME/.config/Trolltech.conf ]; then
-    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-fi
-
-if test "x$1" = x--failsafe; then
-    KDE_FAILSAFE=1 # General failsafe flag
-    KWIN_COMPOSE=N # Disable KWin's compositing
-    export KWIN_COMPOSE KDE_FAILSAFE
-fi
-
-# When the X server dies we get a HUP signal from xinit. We must ignore it
-# because we still need to do some cleanup.
-trap 'echo GOT SIGHUP' HUP
-
-# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
-unset DYLD_FORCE_FLAT_NAMESPACE
-
-# Check if a KDE session already is running and whether it's possible to connect to X
-@plasmaWorkspace@/bin/kcheckrunning
-kcheckrunning_result=$?
-if test $kcheckrunning_result -eq 0 ; then
-  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
-	exit 1
-elif test $kcheckrunning_result -eq 2 ; then
-	echo "\$DISPLAY is not set or cannot connect to the X server."
-  exit 1
-fi
-
-# Boot sequence:
-#
-# kdeinit is used to fork off processes which improves memory usage
-# and startup time.
-#
-# * kdeinit starts klauncher first.
-# * Then kded is started. kded is responsible for keeping the sycoca
-#   database up to date. When an up to date database is present it goes
-#   into the background and the startup continues.
-# * Then kdeinit starts kcminit. kcminit performs initialisation of
-#   certain devices according to the user's settings
-#
-# * Then ksmserver is started which takes control of the rest of the startup sequence
-
-# We need to create config folder so we can write startupconfigkeys
-configDir=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation)
-mkdir -p "$configDir"
-
-# This is basically setting defaults so we can use them with kstartupconfig5
-cat @startupconfigkeys@ >$configDir/startupconfigkeys
-
-# preload the user's locale on first start
-plasmalocalerc=$configDir/plasma-localerc
-test -f $plasmalocalerc || {
-cat >$plasmalocalerc <<EOF
-[Formats]
-LANG=$LANG
-EOF
-}
-
-# export LC_* variables set by kcmshell5 formats into environment
-# so it can be picked up by QLocale and friends.
-exportformatssettings=$configDir/plasma-locale-settings.sh
-[ -f $exportformatssettings ] && . $exportformatssettings
-
-# Write a default kdeglobals file to set up the font
-kdeglobalsfile=$configDir/kdeglobals
-[ -f $kdeglobalsfile ] || cat @kdeglobals@ >$kdeglobalsfile
-
-@plasmaWorkspace@/bin/kstartupconfig5
-returncode=$?
-if test $returncode -ne 0; then
-    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 exited with $returncode"
-    exit 1
-fi
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
-
-XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
-export XCURSOR_PATH
-
-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
-
-    @plasmaDesktop@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-    if test $? -eq 10; then
-        XCURSOR_THEME=default
-        export XCURSOR_THEME
-    elif test -n "$kcminputrc_mouse_cursortheme"; then
-        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
-        export XCURSOR_THEME
-    fi
-    if test -n "$kcminputrc_mouse_cursorsize"; then
-        XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
-        export XCURSOR_SIZE
-    fi
-fi
-
-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-# from some users that they're confused and don't know what to do. This is
-# especially necessary on slow machines, where starting KDE takes one or two
-# minutes until anything appears on the screen.
-#
-# If the user has overwritten fonts, the cursor font may be different now
-# so don't move this up.
-#
-@xsetroot@/bin/xsetroot -cursor_name left_ptr
-
-dl=$DESKTOP_LOCKED
-unset DESKTOP_LOCKED # Don't want it in the environment
-
-# Make sure that D-Bus is running
-# D-Bus autolaunch is broken
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
-fi
-if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
-    : # ok
-else
-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
-    exit 1
-fi
-
-ksplash_pid=
-if test -z "$dl"; then
-  # the splashscreen and progress indicator
-  case "$ksplashrc_ksplash_engine" in
-    KSplashQML)
-      ksplash_pid=`@plasmaWorkspace@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
-      ;;
-    None)
-      ;;
-    *)
-      ;;
-  esac
-fi
-
-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
-# (where <config locations> correspond to the system and user's configuration
-# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
-# and /etc/xdg/ on Linux)
-#
-# This is where you can define environment variables that will be available to
-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
-# or eval `gpg-agent --daemon`.
-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
-#
-# (see end of this file).
-# For anything else (that doesn't set env vars, or that needs a window manager),
-# better use the Autostart folder.
-
-scriptpath=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
-
-# Add /env/ to the directory to locate the scripts to be sourced
-for prefix in `echo $scriptpath`; do
-  for file in "$prefix"/env/*.sh; do
-    test -r "$file" && . "$file"
-  done
-done
-
-# Set the path for Qt plugins provided by KDE
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir`
-# TODO: Do we really need this?
-QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
-export QT_PLUGIN_PATH
-
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
-else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
-test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
-test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
-test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-@xset@/bin/xset fp rehash
-
-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
-if test -n "$GS_LIB" ; then
-    GS_LIB=$usr_fdir:$GS_LIB
-    export GS_LIB
-else
-    GS_LIB=$usr_fdir
-    export GS_LIB
-fi
-
-echo 'startkde: Starting up...'  1>&2
-
-
-# Mark that full KDE session is running (e.g. Konqueror preloading works only
-# with full KDE running). The KDE_FULL_SESSION property can be detected by
-# any X client connected to the same X session, even if not launched
-# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
-# however guarantees that the application is launched in the same environment
-# like the KDE session and that e.g. KDE utilities/libraries are available.
-# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
-# The matching tests are:
-#   For $KDE_FULL_SESSION:
-#     if test -n "$KDE_FULL_SESSION"; then ... whatever
-#   For KDE_FULL_SESSION property:
-#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
-#     if test $? -eq 0; then ... whatever
-#
-# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
-# of the user running the KDE session. It should be rarely needed (e.g.
-# after sudo to prevent desktop-wide functionality in the new user's kded).
-#
-# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number.
-# Note that this didn't exist in KDE3, which can be detected by its absense and
-# the presence of KDE_FULL_SESSION.
-#
-KDE_FULL_SESSION=true
-export KDE_FULL_SESSION
-@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-
-KDE_SESSION_VERSION=5
-export KDE_SESSION_VERSION
-@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-
-KDE_SESSION_UID=`id -ru`
-export KDE_SESSION_UID
-
-XDG_CURRENT_DESKTOP=KDE
-export XDG_CURRENT_DESKTOP
-
-# At this point all the environment is ready, let's send it to kwalletd if running
-if test -n "$PAM_KWALLET_LOGIN" ; then
-    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-fi
-
-# At this point all environment variables are set, let's send it to the DBus
-# session server to update the activation environment
-@plasmaWorkspace@/lib/libexec/ksyncdbusenv
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not sync environment to dbus.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
-  exit 1
-fi
-
-# We set LD_BIND_NOW to increase the efficiency of kdeinit.
-# kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not start kdeinit5.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5."
-  exit 1
-fi
-
-# (NixOS) We run kbuildsycoca5 before starting the user session because things
-# may be missing or moved if they have run nixos-rebuild and it may not be
-# possible for them to start Konsole to run it manually!
-@kservice@/bin/kbuildsycoca5
-
-# finally, give the session control to the session manager
-# see kdebase/ksmserver for the description of the rest of the startup sequence
-# if the KDEWM environment variable has been set, then it will be used as KDE's
-# window manager instead of kwin.
-# if KDEWM is not set, ksmserver will ensure kwin is started.
-# kwrapper5 is used to reduce startup time and memory usage
-# kwrapper5 does not return useful error codes such as the exit code of ksmserver.
-# We only check for 255 which means that the ksmserver process could not be
-# started, any problems thereafter, e.g. ksmserver failing to initialize,
-# will remain undetected.
-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
-# If the session should be locked from the start (locked autologin),
-# lock now and do the rest of the KDE startup underneath the locker.
-KSMSERVEROPTIONS=""
-test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
-@kinit@/bin/kwrapper5 @plasmaWorkspace@/bin/ksmserver $KDEWM $KSMSERVEROPTIONS
-if test $? -eq 255; then
-  # Startup error
-  echo 'startkde: Could not start ksmserver.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver."
-fi
-
-wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
-
-if test x"$wait_drkonqi"x = x"true"x ; then
-    # wait for remaining drkonqi instances with timeout (in seconds)
-    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-    wait_drkonqi_counter=0
-    while @qt5tools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-        sleep 5
-        wait_drkonqi_counter=$((wait_drkonqi_counter+5))
-        if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
-            # ask remaining drkonqis to die in a graceful way
-            @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
-                @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit"
-            done
-            break
-        fi
-    done
-fi
-
-echo 'startkde: Shutting down...'  1>&2
-# just in case
-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-
-# Clean up
-@kinit@/bin/kdeinit5_shutdown
-
-echo 'startkde: Running shutdown scripts...'  1>&2
-
-# Run scripts found in <config locations>/plasma-workspace/shutdown
-for prefix in `echo "$scriptpath"`; do
-  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
-    test -x "$prefix$file" && "$prefix$file"
-  done
-done
-
-unset KDE_FULL_SESSION
-@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
-unset KDE_SESSION_VERSION
-@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
-unset KDE_SESSION_UID
-
-echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys b/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys
deleted file mode 100644
index 0fc92cff8a53..000000000000
--- a/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys
+++ /dev/null
@@ -1,5 +0,0 @@
-kcminputrc Mouse cursorTheme 'breeze_cursors'
-kcminputrc Mouse cursorSize ''
-ksplashrc KSplash Theme Breeze
-ksplashrc KSplash Engine KSplashQML
-kcmfonts General forceFontDPI 0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 287c5160fe0d..5ae7f033c06d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13429,14 +13429,11 @@ let
 
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
-  plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
-    kf5 = kf59;
-  });
   plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 {
     kf5 = kf59;
   });
   plasma5_latest = plasma53;
-  plasma5_stable = plasma52;
+  plasma5_stable = plasma53;
 
   kde5 = kf5_stable // plasma5_stable // kdeApps_stable;
 

From ecd30ec9ca4fcbdee11bc17f5d029ea4bafcc477 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Tue, 28 Apr 2015 19:15:57 +0200
Subject: [PATCH 0193/1143] gcc-arm-embedded: Update to latest version.

---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bdf26fea90d..6035fef7edd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3707,9 +3707,9 @@ let
     sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
   };
   gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
-    version = "4.9-2014q4-20141203";
-    releaseType = "major";
-    sha256 = "a440bcf68e36b291697567816e756877cd3b5782298e3e3c44eb0812a471980f";
+    version = "4.9-2015q1-20150306";
+    releaseType = "update";
+    sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154";
   };
   gcc-arm-embedded = gcc-arm-embedded-4_9;
 

From 4256ab778a0cc50c88cbd0366c2f126edb06fc30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 28 Apr 2015 22:35:39 +0200
Subject: [PATCH 0194/1143] fetchhg: pass proxyvars to hg

---
 pkgs/build-support/fetchhg/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 4675cbe6ec80..26426ce7d83e 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -6,13 +6,17 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   buildInputs = [mercurial];
 
+  impureEnvVars = [
+    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
+  ];
+
   # Nix <= 0.7 compatibility.
   id = md5;
 
   outputHashAlgo = if md5 != null then "md5" else "sha256";
   outputHashMode = "recursive";
   outputHash = if md5 != null then md5 else sha256;
-  
+
   inherit url rev;
   preferLocalBuild = true;
 }

From 63c00f27460ab465443c2a9d041b31ae0c03ba3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 28 Apr 2015 22:36:56 +0200
Subject: [PATCH 0195/1143] fetchFrom{Savannah,RepoOrCz,GitLab}: added fetchgit
 migration helpers

---
 pkgs/top-level/all-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bdf26fea90d..cbf5a7aa4ab2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -375,12 +375,31 @@ let
     inherit sha256;
   };
 
+  # gitorious example
   fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name;
     url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz";
     inherit sha256;
   };
 
+  # cgit example, snapshot support is optional in cgit
+  fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
+    inherit name sha256;
+    url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
+  };
+
+  # gitlab example
+  fetchFromGitLab = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
+    inherit name sha256;
+    url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}";
+  };
+
+  # gitweb example, snapshot support is optional in gitweb
+  fetchFromRepoOrCz = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
+    inherit name sha256;
+    url = "http://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz";
+  };
+
   resolveMirrorURLs = {url}: fetchurl {
     showURLs = true;
     inherit url;

From b9b8e3acbae451f6a4d95b2faf2ddfd588f224b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 28 Apr 2015 22:41:40 +0200
Subject: [PATCH 0196/1143] {grub2,ceph,libs3,socket_wrapper,nss_wrapper}.src:
 use mirrors, https and fetchFromSavannah to enable better availability for
 proxied users

---
 pkgs/development/libraries/libs3/default.nix          | 9 +++++----
 pkgs/development/libraries/nss_wrapper/default.nix    | 9 ++++-----
 pkgs/development/libraries/socket_wrapper/default.nix | 9 ++++-----
 pkgs/tools/filesystems/ceph/0.94.nix                  | 2 +-
 pkgs/tools/misc/grub/2.0x.nix                         | 8 ++++----
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
index 551f65c2971c..3d8699918e16 100644
--- a/pkgs/development/libraries/libs3/default.nix
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, curl, libxml2 }:
+{ stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
   name = "libs3-2015-01-09";
 
-  src = fetchgit {
-    url = "git://github.com/bji/libs3.git";
+  src = fetchFromGitHub {
+    owner = "bji";
+    repo = "libs3";
     rev = "4d21fdc0857b88c964649b321057d7105d1e4da3";
-    sha256 = "058sixppk078mdn9ii3swg87nbpgl86llz9mdhj5km5m53a7dnjw";
+    sha256 = "1c33h8lzlpmsbkymd2dac9g8hqhd6j6yzdjrhha8bcqyys6vcpy3";
   };
 
   buildInputs = [ curl libxml2 ];
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index b0595e61e65d..278834190bbf 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "nss_wrapper-1.0.3";
 
-  src = fetchgit {
-    url = "git://git.samba.org/nss_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "1jka6d873vhvfr7k378xvgxmbpka87w33iq6b91ynwg36pz53ifw";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18";
   };
 
   buildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 1344ad18d09f..d682b10141ec 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "socket_wrapper-1.1.3";
 
-  src = fetchgit {
-    url = "git://git.samba.org/socket_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "0b3sfjy7418gg52qkdblfi5x57g4m44n7434xhacz9isyl5m52vn";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "04xfa4yhcaj63ymagmlx77fakrx3wb8ss42m15pmwjaiyi2xndx3";
   };
 
   buildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 0fc2b60748ab..a14259184a57 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -4,7 +4,7 @@ callPackage ./generic.nix (args // rec {
   version = "0.94.1";
 
   src = fetchgit {
-    url = "git://github.com/ceph/ceph.git";
+    url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
     sha256 = "0rrl10vda4xv22al2c5ccd8v8drs26186dvkrxndvqz8p9999cjx";
   };
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 47eb90eb11e1..501c6820df23 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
+{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper
 , zfs ? null
 , efiSupport ? false
@@ -41,10 +41,10 @@ assert zfsSupport -> zfs != null;
 stdenv.mkDerivation rec {
   name = "grub-${version}";
 
-  src = fetchgit {
-    url = "git://git.savannah.gnu.org/grub.git";
+  src = fetchFromSavannah {
+    repo = "grub";
     rev = "70b002de55abbfd6b2d2f2ea4408078d93c9e0de";
-    sha256 = "1170413b4d9kwqwgi1dcsnbwn8mb3snbid858wyfv84910kbrs2d";
+    sha256 = "1bhm1yxjmckzn45v70lzmz0qpj5prhb4iyiyqqw8rvyykcixw5qk";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

From d941d4c26e8efb8f20207b97d33f707b694cfe5b Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Wed, 29 Apr 2015 11:58:52 +1200
Subject: [PATCH 0197/1143] Update tor-browser to 4.5

---
 pkgs/tools/security/tor/torbrowser.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index b605f3eb3308..67d8b1105681 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.0.8";
+  version = "4.5";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "d8e1ff1865542eb358834bd6f095a2bfa2a991a30ca5188a5752883636a31a36" else
-      "152186ff31425660675c082af1759ef6cc65f618b6e49e25385c7ccacfe70061";
+      "15scfjzpbih7pzpqh4jd7jmc9g93sx2myfs6ykr70f5hbc7qhwmg" else
+      "0lrvhka3z9bh0snplsnxshs8i9iww187ipfn7f96hp5rxgl30p49";
   };
 
   patchPhase = ''

From afa51d31f5af60af61ec109f97be295b8828df39 Mon Sep 17 00:00:00 2001
From: dnhgff <null@dnhgff.space>
Date: Tue, 28 Apr 2015 17:37:27 -0700
Subject: [PATCH 0198/1143] ghcjs: bump ghcjs-boot commit

see https://github.com/ghcjs/ghcjs-boot/pull/17 for justification (ghcjs-boot
won't build anymore on the previous commit :()
---
 pkgs/development/compilers/ghcjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 4c75861cbec2..8206bb19e4fa 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -45,8 +45,8 @@ let
   libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "8bf1a2c665d42a66354f17220c7dfb1c8b44c0ea"; # 7.10 branch
-    sha256 = "18bm6sfa9c9kwsmv3lz6j27ng6jl0ck3ifgqbwwa8myfy7fw4il7";
+    rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch
+    sha256 = "63b69a1d131cf3c7088e0f28d14750c81361dcc276fa113ad80dcccf73df5343";
     fetchSubmodules = true;
   };
   shims = fetchgit {

From faa9354de70850dd573126ca7658d948c4ccf04a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 28 Apr 2015 15:35:21 -0700
Subject: [PATCH 0199/1143] zlib: Add platforms

---
 pkgs/development/libraries/zlib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 8a79806bf938..162bae54d377 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation (rec {
   meta = with stdenv.lib; {
     description = "Lossless data-compression library";
     license = licenses.zlib;
+    platforms = platforms.all;
   };
 } // (if stdenv.isDarwin then {
   postInstall = ''

From 287ec76b8fb2f670b068266d77edc8714d0d06df Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 28 Apr 2015 15:35:41 -0700
Subject: [PATCH 0200/1143] libxml2: Refactor and fix library propagation

---
 .../development/libraries/libxml2/default.nix | 70 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 153096ee45c0..0d70a6502feb 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,49 +1,63 @@
-{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }:
+{ stdenv, fetchurl, findXMLCatalogs
 
-assert pythonSupport -> python != null;
+# Optional Dependencies
+, icu ? null, python ? null, readline ? null, zlib ? null, xz ? null
+}:
 
 #TODO: share most stuff between python and non-python builds, perhaps via multiple-output
 
 let
-  version = "2.9.2";
-in
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
 
-stdenv.mkDerivation (rec {
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optIcu = shouldUsePkg icu;
+  optPython = shouldUsePkg python;
+  optReadline = shouldUsePkg readline;
+  optZlib = shouldUsePkg zlib;
+  optXz = shouldUsePkg xz;
+
+  sitePackages = if optPython == null then null else
+    "\${out}/lib/${python.libPrefix}/site-packages";
+in
+stdenv.mkDerivation rec {
   name = "libxml2-${version}";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${name}.tar.gz";
     sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
   };
 
-  buildInputs = stdenv.lib.optional pythonSupport python
-    # Libxml2 has an optional dependency on liblzma.  However, on impure
-    # platforms, it may end up using that from /usr/lib, and thus lack a
-    # RUNPATH for that, leading to undefined references for its users.
-    ++ (stdenv.lib.optional stdenv.isFreeBSD xz);
+  buildInputs = [ optIcu optPython optReadline optZlib optXz ];
+  propagatedBuildInputs = [ findXMLCatalogs ];
 
-  propagatedBuildInputs = [ zlib findXMLCatalogs ];
-
-  passthru = { inherit pythonSupport version; };
+  configureFlags = [
+    (mkWith (optIcu != null)      "icu"                optIcu)
+    (mkWith (optPython != null)   "python"             optPython)
+    (mkWith (optPython != null)   "python-install-dir" sitePackages)
+    (mkWith (optReadline != null) "readline"           optReadline)
+    (mkWith (optZlib != null)     "zlib"               optZlib)
+    (mkWith (optXz != null)       "lzma"               optXz)
+  ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
-    license = "bsd";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ eelco wkennington ];
   };
 
-} // stdenv.lib.optionalAttrs pythonSupport {
-  configureFlags = "--with-python=${python}";
-
-  # this is a pair of ugly hacks to make python stuff install into the right place
-  preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"'';
-  installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"'';
-
-} // stdenv.lib.optionalAttrs (!pythonSupport) {
-  configureFlags = "--with-python=no"; # otherwise build impurity bites us
-})
-
+  passthru = {
+    inherit version;
+    pythonSupport = python != null;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ae7f033c06d..d8b5141358c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6996,11 +6996,11 @@ let
   libxmi = callPackage ../development/libraries/libxmi { };
 
   libxml2 = callPackage ../development/libraries/libxml2 {
-    pythonSupport = false;
+    python = null;
   };
 
   libxml2Python = lowPrio (libxml2.override {
-    pythonSupport = true;
+    inherit python;
   });
 
   libxmlxx = callPackage ../development/libraries/libxmlxx { };

From 171275c7f97a26400a34c4be5425b2ec72cc19ed Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 28 Apr 2015 16:29:18 -0700
Subject: [PATCH 0201/1143] mariadb: Add zlib dependency removed from
 propagation under libxml2

---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 7afa2e4da6b4..239dfc6fcaa9 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ncurses, openssl, pcre, boost, judy, bison, libxml2
+{ stdenv, fetchurl, cmake, ncurses, zlib, openssl, pcre, boost, judy, bison, libxml2
 , libaio, libevent, groff, jemalloc, perl, fixDarwinDylibNames
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww";
   };
 
-  buildInputs = [ cmake ncurses openssl pcre libxml2 boost judy bison libevent ]
+  buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]
     ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ];
 

From 040565152169e8ae572498a28810a8e027aa9dd3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 28 Apr 2015 16:33:27 -0700
Subject: [PATCH 0202/1143] mariadb: Propagate library paths in mysql_config

---
 pkgs/servers/sql/mariadb/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 239dfc6fcaa9..119af71619d0 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -90,6 +90,11 @@ stdenv.mkDerivation rec {
     mv $out/lib $lib
     mv $out/include $lib
 
+    # Fix the mysql_config
+    sed -i $out/bin/mysql_config \
+      -e 's,-lz,-L${zlib}/lib -lz,g' \
+      -e 's,-lssl,-L${openssl}/lib -lssl,g'
+
     # Add mysql_config to libs since configure scripts use it
     mkdir -p $lib/bin
     cp $out/bin/mysql_config $lib/bin

From c6bee4b4bba8dce5e4dd1ec9541eb2590ebf7fc0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 28 Apr 2015 17:14:11 -0700
Subject: [PATCH 0203/1143] sysbench: Update to 2015-04-22

---
 pkgs/development/tools/misc/sysbench/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index e4c2b474d46f..ffc8200db78e 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchurl, mysql, libxslt, zlib, autoreconfHook }:
+{ stdenv, fetchgit, libmysql, libxslt, zlib, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "sysbench-0.4.12";
+  name = "sysbench-2015-04-22";
 
-  buildInputs = [ autoreconfHook mysql.lib libxslt zlib ];
+  buildInputs = [ autoreconfHook libmysql libxslt zlib ];
 
-  src = fetchurl {
-    url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz;
-    sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3";
+  src = fetchgit {
+    url = git://github.com/akopytov/sysbench.git;
+    rev = "2b3042883090c9cf8cb9be2b24d3590cdcee112f";
+    sha256 = "0di6jc9ybnqk3pqg45lks2c9003l74xz4g619haw36fvbi28aql6";
   };
 
   preAutoreconf = ''

From 60d6eb7a9a43fef931b001efdf06a8856e535ce1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 28 Apr 2015 21:12:34 -0700
Subject: [PATCH 0204/1143] cracklib: 2.9.2 -> 2.9.4

---
 pkgs/development/libraries/cracklib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 506bb0d70719..e394c9db4ce3 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libintlOrEmpty, zlib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "cracklib-2.9.2";
+  name = "cracklib-2.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/cracklib/${name}.tar.gz";
-    sha256 = "1xarjwga2bc4hys4fkspcp1cph699ag8gg6gmv8rjgj43llrkj61";
+    sha256 = "0n49prh5rffl33bxy8qf46cqm6mswdlqpmm6iqi490w0p6s6da7j";
   };
 
   buildInputs = [ libintlOrEmpty zlib gettext ];

From 5f149c80f25d733bcefbabc85c1163a3492596c2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 28 Apr 2015 21:18:06 -0700
Subject: [PATCH 0205/1143] gpgme: 1.5.3 -> 1.5.4

---
 pkgs/development/libraries/gpgme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 2e51f70e91d2..d4913ef21f6e 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,11 +11,11 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.5.3";
+  name = "gpgme-1.5.4";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d";
+    sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v";
   };
 
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];

From 4d60f8f1bd196ed4aca83bdcec830d9bf004f6b0 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Tue, 28 Apr 2015 22:07:09 -0700
Subject: [PATCH 0206/1143] package Dirt

Dirt is used with the Tidal audio programming library (already packaged).
I tested by building and running locally.
---
 pkgs/applications/audio/dirt/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/audio/dirt/default.nix

diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
new file mode 100644
index 000000000000..b5436fde7e9f
--- /dev/null
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }:
+
+stdenv.mkDerivation rec {
+  name = "dirt-git";
+  src = fetchFromGitHub {
+    repo = "Dirt";
+    owner = "tidalcycles";
+    rev = "cfc5e85318defda7462192b5159103c823ce61f7";
+    sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
+  };
+  buildInputs = [ libsndfile libsamplerate liblo jack2 ];
+  configurePhase = ''
+    export DESTDIR=$out
+  '';
+
+  meta = {
+    description = "An unimpressive thingie for playing bits of samples with some level of accuracy";
+    homepage = "https://github.com/tidalcycles/Dirt";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c108c8915e7..76c39a11261f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10392,6 +10392,8 @@ let
 
   distrho = callPackage ../applications/audio/distrho {};
 
+  dirt = callPackage ../applications/audio/dirt {};
+
   djvulibre = callPackage ../applications/misc/djvulibre { };
 
   djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };

From f64d767130152c7bc8136efcc589d7fc28a6d9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 29 Apr 2015 14:20:50 +0800
Subject: [PATCH 0207/1143] libxmp: Update to 4.3.8

---
 pkgs/development/libraries/libxmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index 7b4d3d6287aa..4bc9e8ed1c4a 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxmp-4.2.7";
+  name = "libxmp-4.3.8";
 
   meta = with stdenv.lib; {
     description = "Extended module player library";
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
-    sha256 = "1isv8498869w8wc18lagi1p40z4blx684r21j9cligkfyrmri536";
+    sha256 = "0h06091hlpgc6ds4pjmfq8sx4snw7av3nhny180q4pwfyasjb6ny";
   };
 }

From a5f2cbff0a161482830842a393c142ff7d24e8aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 29 Apr 2015 14:22:28 +0800
Subject: [PATCH 0208/1143] xmp: Update to 4.0.10

---
 pkgs/applications/audio/xmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix
index 7f21d389cf5f..6bec03bd71b0 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/pkgs/applications/audio/xmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libxmp }:
 
 stdenv.mkDerivation rec {
-  name = "xmp-4.0.7";
+  name = "xmp-4.0.10";
 
   meta = with stdenv.lib; {
     description = "Extended module player";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz";
-    sha256 = "0qgzzaxhshz5l7s21x89xb43pbbi0zap6a4lk4s7gjp1qca2agcw";
+    sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n";
   };
 
   buildInputs = [ pkgconfig alsaLib libxmp ];

From 310da1b4dad2b9d4ae0b4411194dd1ce7c0a22df Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 29 Apr 2015 08:19:47 +0200
Subject: [PATCH 0209/1143] chromium/update: Remove reference to <nixpkgs>.

We shouldn't make assumptions on what is set by NIX_PATH in order to
make it easier to rename that Nix path reference.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../applications/networking/browsers/chromium/source/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index cfa5f1e009b8..27af85de5465 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -1,7 +1,7 @@
 { system ? builtins.currentSystem }:
 
 let
-  inherit (import <nixpkgs> {
+  inherit (import ../../../../../../. {
     inherit system;
   }) lib writeText stdenv;
 

From 543ec3cf469df5d551eb93e3cc0306581c580401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Wed, 29 Apr 2015 08:50:48 +0100
Subject: [PATCH 0210/1143] boot: bump from rc8 to rc14

---
 pkgs/development/tools/build-managers/boot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index ccc7e326fd77..6ae4da408c0e 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0-rc8";
+  version = "2.0.0-rc14";
   name = "boot-${version}";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
-    sha256 = "1jqj04f33prb6nqsv7mffwdnz47ppi3szsbdzphjx8xzz394nl7j";
+    sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0";
   };
 
   inherit jdk;

From 51b1297c8a3fdb9d1abdc98ebbc85e3679373c21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 29 Apr 2015 10:09:07 +0200
Subject: [PATCH 0211/1143] glibc: fix libgcc_s.so

It used to be a symlink, but now it is a link script. It's crucial to get
proper linking, specially on amrv5tel, where libgcc contains lot of code
related to the limited instruction set of the platform.

Without this fix, g++ shared lib linking was broken, because a "-lgcc" was
not propagated wherever "-lgcc_s" was required. The g++ spec only mentions
"-lgcc_s" and the "-lgcc" is introduced with the libgcc_s.so link script,
only available in the glibc path after this fix.

As a reminder, we put libgcc* in the glibc output to avoid having a
runtime dependency on the gcc path only because of the everywhere linked
libgcc. This problem was specially visible in platforms like armv5tel,
where most programs end up linked to libgcc. Platforms with a more rich
instruction set may rarely end up requiring a link to libgcc.
---
 pkgs/development/libraries/glibc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index f60df4a30d67..ccf6d2c0686e 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -36,7 +36,8 @@ in
       if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
           mkdir -p $out/lib
           cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
-          ln -s libgcc_s.so.1 $out/lib/libgcc_s.so
+          # the .so It used to be a symlink, but now it is a script
+          cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so
       fi
     '';
 

From 2f2c50d9f4e11e99fca5b5300b68035fa7556345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 29 Apr 2015 10:10:28 +0200
Subject: [PATCH 0212/1143] uid_wrapper.src: use mirrors to enable better
 availability for proxied users

---
 pkgs/development/libraries/uid_wrapper/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index b19d404bee2f..07fffeff20d6 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "uid_wrapper-1.1.0";
 
-  src = fetchgit {
-    url = "git://git.samba.org/uid_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "1wb71lliw56pmks3vm9m3ndf8hqnyw9iyppy1nyl80msi4ssq5jj";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn";
   };
 
   buildInputs = [ cmake pkgconfig ];

From eadb3a51ff475d741465921aca2ef5c2dbad604a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Wed, 29 Apr 2015 11:23:40 +0200
Subject: [PATCH 0213/1143] Fix sorting: dirt comes before distrho

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76c39a11261f..07a230a5fee5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10390,10 +10390,10 @@ let
 
   diffuse = callPackage ../applications/version-management/diffuse { };
 
-  distrho = callPackage ../applications/audio/distrho {};
-
   dirt = callPackage ../applications/audio/dirt {};
 
+  distrho = callPackage ../applications/audio/distrho {};
+
   djvulibre = callPackage ../applications/misc/djvulibre { };
 
   djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };

From a38672dea22d424105a0e21ae4b71e051f657c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 29 Apr 2015 11:27:30 +0200
Subject: [PATCH 0214/1143] release: fix eval by lib.tests -> lib-tests

See discussion on commit
https://github.com/NixOS/nixpkgs/commit/de0f122b016c88#commitcomment-10937080
---
 pkgs/top-level/release.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cb469e613056..e156f336ffa2 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -23,7 +23,7 @@ let
     { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; };
 
       manual = import ../../doc;
-      lib.tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
+      lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
 
       unstable = pkgs.releaseTools.aggregate
         { name = "nixpkgs-${jobs.tarball.version}";
@@ -31,7 +31,7 @@ let
           constituents =
             [ jobs.tarball
               jobs.manual
-              jobs.lib.tests
+              jobs.lib-tests
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
               jobs.stdenv.x86_64-darwin

From 8978ff3840e8ceb52441ea50cb068adf8b6f63fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 29 Apr 2015 11:47:18 +0200
Subject: [PATCH 0215/1143] unstable job: glib-tested seems ready (succeeding
 often)

This reverts commit a35d4a9d4e2d4435e53fdfd1698f2118828c773f.
---
 pkgs/top-level/release.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e156f336ffa2..361b9ab6cc32 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -40,10 +40,8 @@ let
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
               jobs.thunderbird.i686-linux
-              /* not ready yet
               jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
               jobs.glib-tested.i686-linux
-              */
             ];
         };
 

From ad0bd73775954d4ecc7f83874ac813eff6d83866 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 29 Apr 2015 09:55:20 +0000
Subject: [PATCH 0216/1143] Work around infinite recursion issue in nixops.

---
 nixos/modules/virtualisation/google-compute-config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 9e6be93b6d98..f6bca1aa8579 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, modulesPath, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ];
+  imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ];
 }

From 9b27a88b66d318035943dbd70082ab4bd43412f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Apr 2015 18:38:18 +0200
Subject: [PATCH 0217/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/5f6d964cbaae84478f73a185e89cafc169362cfd
 with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b

---
 .../haskell-modules/hackage-packages.nix      | 289 ++++++++++++------
 1 file changed, 200 insertions(+), 89 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8628d5a16982..04293b81fe70 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1007,6 +1007,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "BCMtools" = callPackage
+    ({ mkDerivation, base, binary, bytestring, bytestring-lexing
+     , colour, conduit, conduit-extra, data-binary-ieee754
+     , data-default-class, matrices, optparse-applicative, resourcet
+     , split, transformers, unordered-containers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "BCMtools";
+       version = "0.1.0";
+       sha256 = "1rql6xxa6lddb2ngvbnicz6gsd17m5l7yqxfpm242s1crhqmxajg";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base binary bytestring bytestring-lexing colour conduit
+         conduit-extra data-binary-ieee754 data-default-class matrices
+         optparse-applicative resourcet split transformers
+         unordered-containers vector zlib
+       ];
+       description = "Big Contact Map Tools";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "BNFC" = callPackage
     ({ mkDerivation, alex, array, base, containers, deepseq, directory
      , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process
@@ -3910,12 +3932,12 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, containers, kan-extensions, ListLike }:
+    ({ mkDerivation, base, containers, ListLike }:
      mkDerivation {
        pname = "Earley";
-       version = "0.6.0";
-       sha256 = "0fqiiqrmrnb7zmk61bjnc98y30jvrd0yqflsk8mcnkfahbhhsc5w";
-       buildDepends = [ base containers kan-extensions ListLike ];
+       version = "0.7.0";
+       sha256 = "1jjyrf56crk4zxp7kw148969hjvl5hj248xv3495xb188s610y72";
+       buildDepends = [ base containers ListLike ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14679,8 +14701,8 @@ self: {
      }:
      mkDerivation {
        pname = "UISF";
-       version = "0.3.0.1";
-       sha256 = "0qfhcc0ii7nncfsyxvafwbrx8j6jjdc0jrj56g8jm8vmzsa082kp";
+       version = "0.3.0.2";
+       sha256 = "0i5kw450yk44kh25xbqzjwnjipzh81i20vk8il9ic2fh4d79va46";
        buildDepends = [
          arrows base containers deepseq GLFW OpenGL stm transformers
        ];
@@ -17376,21 +17398,20 @@ self: {
      }) {};
 
   "aeson-t" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec2, text
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec, text
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-t";
-       version = "0.0.4";
-       sha256 = "0y4mbn1xb288amgy8j6p5x9ih873qwiwrialfchc8ryg0n8syp8r";
+       version = "0.0.5";
+       sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd";
        buildDepends = [
          aeson base bytestring text unordered-containers vector
        ];
        testDepends = [
-         aeson aeson-qq base bytestring hspec2 text unordered-containers
+         aeson aeson-qq base bytestring hspec text unordered-containers
          vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/begriffs/aeson-t";
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
@@ -21094,8 +21115,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.0.1";
-       sha256 = "0x5q3aqsqi10plrwdpcprpvc9fd6vq0ar4f4am5kv5zs1h0yjvfd";
+       version = "0.4.0.2";
+       sha256 = "1pss2rkd1s4dmnym5w2sanhqgz2pv1n9zyq4n8jy8ihc4zgrcscp";
        buildDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -21778,8 +21799,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.4";
-       sha256 = "0bd424ls3kfqx2y7fzcmhssss3r3bhra8bzmllx1slb1x04apgn6";
+       version = "0.0.5";
+       sha256 = "17291lzz09d5rpz62395jfqkwc06sp8pwd8wq04wycsk0hizz32i";
        buildDepends = [
          aeson attoparsec base base16-bytestring bytestring containers
          cryptohash inflections influxdb MonadRandom mtl network
@@ -22052,8 +22073,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-kinesis-client";
-       version = "0.4.0.0";
-       sha256 = "1jmm83pciv4mfknwj9z57kbq4siikfad21xhysnhwrpm2maqswa4";
+       version = "0.4.0.1";
+       sha256 = "1ky05hq0fs500jbf840ap6ji4vq26vn50w5cz8nqfz416jdjgx7r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -22064,7 +22085,6 @@ self: {
          resourcet stm stm-chans stm-queue-extras text transformers
          unordered-containers
        ];
-       jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -22146,8 +22166,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-route53";
-       version = "0.1.1";
-       sha256 = "1nzxs6ff0nh6ncswfnx2gxxmx2by0xxzfpmlkk1cnd9xkz7c8n0k";
+       version = "0.1.2";
+       sha256 = "0qg0fzw5kb3xvldxc2sx7xgkwgspyscvs83sv3nrw91qjp6ypi18";
        buildDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
@@ -25151,6 +25171,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bitcoin-types" = callPackage
+    ({ mkDerivation, base, base58string, binary, bytestring, hexstring
+     , hspec, text
+     }:
+     mkDerivation {
+       pname = "bitcoin-types";
+       version = "0.9.0";
+       sha256 = "1y2v4cm00pmysi051z37rsxis0i97bjk5zvybmpxal9g4k8mlbi5";
+       buildDepends = [
+         base base58string binary bytestring hexstring text
+       ];
+       testDepends = [ base base58string bytestring hexstring hspec ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Provides consistent low-level types used commonly among Bitcoin implementations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bitly-cli" = callPackage
     ({ mkDerivation, base, Bitly, directory, filepath, regexpr }:
      mkDerivation {
@@ -27877,8 +27914,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.2.1";
-       sha256 = "0rhabhbcxl3gsq4wdkxd4mswrb8rqfmq6crcc70hm75fjxfmr3sz";
+       version = "0.3.3.0";
+       sha256 = "0bvd7qf206slg4ckjc7bjjfrgdxsq3kmb9rp8qp7lfc81ccnr09j";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -31949,12 +31986,12 @@ self: {
      }) {};
 
   "cmark" = callPackage
-    ({ mkDerivation, base, HUnit, text }:
+    ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.3.1";
-       sha256 = "18z50pbxxir4ca7v6zpkdv3anadg2z1lwhllilag3a592ka3hdrb";
-       buildDepends = [ base text ];
+       version = "0.3.2";
+       sha256 = "0xf34i09m9a3mf6mzn48v6pdbkagsv5c0wmr64ih8d43n2figazk";
+       buildDepends = [ base bytestring text ];
        testDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
@@ -32137,8 +32174,8 @@ self: {
      }:
      mkDerivation {
        pname = "cndict";
-       version = "0.5.4";
-       sha256 = "1jza2s9qmmzg4qgq8wpslj71ybbs3b8lk81jfqp70j3dq1zvzhba";
+       version = "0.5.5";
+       sha256 = "0l2fknpg07r5hp2as3irqqa7zik9p8n3jyi74a2b3d001d54gc7z";
        buildDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
@@ -41822,8 +41859,8 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.6.0.0";
-       sha256 = "17dbhnwdn89wqm0s8j9zfydi7g6x1wlf1bnjv39qrp7qyr8mm2k5";
+       version = "0.6.0.1";
+       sha256 = "1dx1f647849v5mlsp862x7cmwiygiph9y1fgdfg1xnfshlx6r4qp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -42379,6 +42416,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dove" = callPackage
+    ({ mkDerivation, acl2, base }:
+     mkDerivation {
+       pname = "dove";
+       version = "0.0.0";
+       sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd";
+       buildDepends = [ acl2 base ];
+       description = "The Dove verification language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dow" = callPackage
     ({ mkDerivation, array, base, directory, elerea, GLFW
      , mersenne-random, OpenGL
@@ -43151,8 +43199,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-graph";
-       version = "0.1.0.7";
-       sha256 = "1jpl8prd18ka8ypkf2ni8i6arfmv9x3d75r7327aalayj3vzap3d";
+       version = "0.1.0.8";
+       sha256 = "1lh7wlzmm1nsbzy7ahkcajyfkg4v2vbyp0992570w32bn7nl4b5k";
        buildDepends = [
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
@@ -46742,12 +46790,12 @@ self: {
      }) {};
 
   "fasta" = callPackage
-    ({ mkDerivation, base, containers, parsec, split, text }:
+    ({ mkDerivation, base, containers, parsec, pipes, split, text }:
      mkDerivation {
        pname = "fasta";
-       version = "0.5.3.0";
-       sha256 = "060y8sqbklf7wr8kl2c935cxakykj705f1bbn72c4zcwfdrf5jz4";
-       buildDepends = [ base containers parsec split text ];
+       version = "0.5.4.0";
+       sha256 = "15ff6l8kv6pivl8l9apfpsnn5arwgbhzxi8h4chr05qvanlycvfg";
+       buildDepends = [ base containers parsec pipes split text ];
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -47666,17 +47714,17 @@ self: {
      }) {};
 
   "filediff" = callPackage
-    ({ mkDerivation, base, data-default, data-memocombinators
-     , directory, either, mtl, tasty, tasty-hunit, text, time
-     , transformers, Zora
+    ({ mkDerivation, base, bytestring, data-default
+     , data-memocombinators, directory, either, mtl, rainbow, tasty
+     , tasty-hunit, text, time, transformers, Zora
      }:
      mkDerivation {
        pname = "filediff";
-       version = "0.1.0.7";
-       sha256 = "1anjfh549ah2m8k5ibdgc578pi5phyycxj1avky38w499dadgwfi";
+       version = "0.1.0.8";
+       sha256 = "1wsinnmc5dw4r9wk3ijx9zlzwf0rqsknl6mql28lja2r1m2s2jc3";
        buildDepends = [
-         base data-default data-memocombinators directory either mtl tasty
-         tasty-hunit text time transformers Zora
+         base bytestring data-default data-memocombinators directory either
+         mtl rainbow tasty tasty-hunit text time transformers Zora
        ];
        testDepends = [
          base directory either mtl tasty tasty-hunit text time transformers
@@ -70081,22 +70129,21 @@ self: {
 
   "http-client" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, clock, containers
-     , cookie, data-default-class, deepseq, directory, exceptions
-     , filepath, ghc-prim, hspec, http-types, mime-types, monad-control
-     , network, network-uri, publicsuffixlist, random, streaming-commons
-     , text, time, transformers, zlib
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ghc-prim, hspec, http-types, mime-types, monad-control, network
+     , network-uri, random, streaming-commons, text, time, transformers
+     , zlib
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.11.1";
-       sha256 = "122h9g6nk17nwxrwqwni75gfbc221s1jvjjlmq6sh9ksgsyh09b4";
+       version = "0.4.11.2";
+       sha256 = "074qh0yj3i4q6m88jccp59vpv5prdwglrrcglsr5k89g06hx4xb2";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
-         case-insensitive clock containers cookie data-default-class deepseq
+         case-insensitive containers cookie data-default-class deepseq
          exceptions filepath ghc-prim http-types mime-types network
-         network-uri publicsuffixlist random streaming-commons text time
-         transformers
+         network-uri random streaming-commons text time transformers
        ];
        testDepends = [
          async base base64-bytestring blaze-builder bytestring
@@ -79864,19 +79911,20 @@ self: {
   "libconfig" = callPackage
     ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config
      , deepseq, doctest, doctest-prop, hashable, lens, profunctors, text
-     , text-binary, transformers
+     , text-binary, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "libconfig";
-       version = "0.2.0.0";
-       sha256 = "1z03vnqhm6iiz964rmhvzm15hdx7mmck06yawf0sy4h5ljwrq94a";
+       version = "0.3.0.0";
+       sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12";
        buildDepends = [
          base binary cereal cereal-text deepseq hashable profunctors text
-         text-binary transformers
+         text-binary transformers transformers-compat
        ];
        testDepends = [ base doctest doctest-prop lens ];
        buildTools = [ c2hs ];
        extraLibraries = [ config ];
+       homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
      }) { config = null;};
@@ -81281,15 +81329,21 @@ self: {
      }) {};
 
   "list-t-html-parser" = callPackage
-    ({ mkDerivation, base-prelude, either, html-tokenizer, list-t
-     , mtl-prelude, text
+    ({ mkDerivation, base-prelude, case-insensitive, conversion
+     , conversion-text, either, hspec, html-entities, html-tokenizer
+     , list-t, list-t-attoparsec, list-t-text, mtl-prelude, text
      }:
      mkDerivation {
        pname = "list-t-html-parser";
-       version = "0.2.1.0";
-       sha256 = "0vf58ji73vc8hgbq2bd7p2ls7syk33qy5pp92kx5byr5j38zzar3";
+       version = "0.2.2.0";
+       sha256 = "07fd7nzlhwvhzj4g84wmsm48rj1748m0cbglv0wc2w1rsbsikwl0";
        buildDepends = [
-         base-prelude either html-tokenizer list-t mtl-prelude text
+         base-prelude case-insensitive either html-entities html-tokenizer
+         list-t mtl-prelude text
+       ];
+       testDepends = [
+         base-prelude conversion conversion-text hspec html-tokenizer
+         list-t-attoparsec list-t-text text
        ];
        homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
@@ -81335,8 +81389,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-text";
-       version = "0.1.0.2";
-       sha256 = "05vz6r9r5903wm9spmy6zsql8jzzqj1dv94yfnfhiwkkmgjsvv5z";
+       version = "0.2.0.1";
+       sha256 = "1ylb4fs5gbphny281gwd0j0k26ayqcqmc79qarcfpfm6j4washng";
        buildDepends = [ base-prelude bytestring list-t mtl-prelude text ];
        testDepends = [
          base base-prelude bytestring hspec list-t QuickCheck
@@ -84322,12 +84376,15 @@ self: {
      }) { eng = null;  mat = null;  mx = null;};
 
   "matrices" = callPackage
-    ({ mkDerivation, base, binary, primitive, vector }:
+    ({ mkDerivation, base, primitive, tasty, tasty-hunit
+     , tasty-quickcheck, vector
+     }:
      mkDerivation {
        pname = "matrices";
-       version = "0.4.0";
-       sha256 = "1whajm8cqr724dz6aqnjbki77c40xr1sy16pks15rq56j7f2av2v";
-       buildDepends = [ base binary primitive vector ];
+       version = "0.4.1";
+       sha256 = "16xx6cdz90an0ifpvkpmchiqhijgxmi1cn5qq4171jhi87sswm7z";
+       buildDepends = [ base primitive vector ];
+       testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ];
        description = "native matrix based on vector";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91943,20 +92000,20 @@ self: {
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
      , either, errors, ghc-prim, hspec, hspec-expectations, http-client
      , http-types, lens, mtl, optparse-applicative, text, time
-     , transformers, unordered-containers, utf8-string, wreq, xmlhtml
+     , transformers, unordered-containers, utf8-string, wreq-sb, xmlhtml
      , yaml
      }:
      mkDerivation {
        pname = "octohat";
-       version = "0.1.4.1";
-       sha256 = "1cc7np4kb03160fbn2bwkbl0xgcnizcgr3yvq8pp47p31k965x54";
+       version = "0.1.4.2";
+       sha256 = "0say5682zqv4ss6q9v4p171vprdl6aa7aaack1y0526qq7gj05l2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base base-compat base16-bytestring base64-bytestring
          bytestring containers cryptohash dotenv either errors ghc-prim
          http-client http-types lens mtl optparse-applicative text time
-         transformers unordered-containers utf8-string wreq xmlhtml yaml
+         transformers unordered-containers utf8-string wreq-sb xmlhtml yaml
        ];
        testDepends = [
          base base-compat dotenv hspec hspec-expectations text transformers
@@ -102413,15 +102470,15 @@ self: {
 
   "redis" = callPackage
     ({ mkDerivation, base, bytestring, concurrent-extra, containers
-     , MonadCatchIO-mtl, mtl, network, old-time, utf8-string
+     , exceptions, mtl, network, old-time, utf8-string
      }:
      mkDerivation {
        pname = "redis";
-       version = "0.13.0.1";
-       sha256 = "0djwih122pp7y0c1lx7ab7n80ra1488hrwgf0iq20gywk8an9wfq";
+       version = "0.14";
+       sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094";
        buildDepends = [
-         base bytestring concurrent-extra containers MonadCatchIO-mtl mtl
-         network old-time utf8-string
+         base bytestring concurrent-extra containers exceptions mtl network
+         old-time utf8-string
        ];
        homepage = "http://hub.darcs.net/ganesh/redis";
        description = "A driver for Redis key-value database";
@@ -104611,8 +104668,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.16";
-       sha256 = "1x4kw64mjp4900qnmvakrd7vfqg14h35k0jzai5qh6y88rr3qaf1";
+       version = "0.0.17";
+       sha256 = "01jz3bg6zjrvkrs7mvwvyyzq94j57cgmghzp9rsdlia2r6bd6lcz";
        buildDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -110508,8 +110565,8 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
-       version = "0.1.0.0";
-       sha256 = "183kqvkp0s55bqm5gr7kiq9lk9qpm3ijwnansl6lpdxclcg9gm8y";
+       version = "0.1.1.0";
+       sha256 = "154jzdxhq5nvr78wlk26fzjs9n2piw8h92dq4n1rqz4wqjkhyg9s";
        buildDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
@@ -113056,8 +113113,8 @@ self: {
     ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.2.0";
-       sha256 = "1a3dmmq1dcz5sanj0cisddk313f89sil89xxbk2l9sjprc1fwrv7";
+       version = "0.2.3.0";
+       sha256 = "0170v4wjdpwf5s1bil9jj6magaa3fv05zz8b6zd4s6ca8cgw4lc4";
        buildDepends = [ base binary cereal ghc-prim linear ];
        testDepends = [ base doctest ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
@@ -114103,12 +114160,16 @@ self: {
      }) {};
 
   "stackage" = callPackage
-    ({ mkDerivation, base, stackage-cli, stackage-update }:
+    ({ mkDerivation, base, stackage-cli, stackage-install
+     , stackage-update, stackage-upload
+     }:
      mkDerivation {
        pname = "stackage";
-       version = "0.7.0.0";
-       sha256 = "0fw910zvm4vgm41jrsfr76x1c5alwvm85m0k9x0hyrwxnd5ci4dj";
-       buildDepends = [ base stackage-cli stackage-update ];
+       version = "0.7.1.0";
+       sha256 = "02z5gkhymgiz7n0mm7j3p10ysi58d9rcz9d2pxakf0hmdsc37xx7";
+       buildDepends = [
+         base stackage-cli stackage-install stackage-update stackage-upload
+       ];
        homepage = "https://www.stackage.org/";
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
@@ -114176,6 +114237,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stackage-install" = callPackage
+    ({ mkDerivation, async, base, bytestring, directory, filepath
+     , http-client, http-client-tls, process, stm
+     }:
+     mkDerivation {
+       pname = "stackage-install";
+       version = "0.1.0.1";
+       sha256 = "1ryl2b3hd4kbrn4k1brsqqwq14sv0dhsl89zskgmzwrxg32p2m94";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         async base bytestring directory filepath http-client
+         http-client-tls process stm
+       ];
+       homepage = "https://github.com/fpco/stackage-install";
+       description = "Secure download of packages for cabal-install";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-types" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
      , hashable, semigroups, text, unordered-containers, vector
@@ -118562,6 +118642,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "templater" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, hspec-attoparsec, HUnit
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "templater";
+       version = "0.0.2.0";
+       sha256 = "10dar9n4ccskv163zh3h756mp9ccx04ifgjwnsf8cnab22lng5mb";
+       buildDepends = [ attoparsec base text ];
+       testDepends = [
+         base hspec hspec-attoparsec HUnit QuickCheck text
+       ];
+       homepage = "https://github.com/geraud/templater";
+       description = "Simple string templater";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tempodb" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , HsOpenSSL, HTTP, http-streams, io-streams, mtl, old-locale, text
@@ -119574,6 +119671,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-position" = callPackage
+    ({ mkDerivation, base, QuickCheck, regex-applicative }:
+     mkDerivation {
+       pname = "text-position";
+       version = "0.1.0.0";
+       sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8";
+       buildDepends = [ base regex-applicative ];
+       testDepends = [ base QuickCheck regex-applicative ];
+       jailbreak = true;
+       homepage = "http://rel4tion.org/projects/text-position/";
+       description = "Handling positions in text and position-tagging it";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "text-printer" = callPackage
     ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups
      , test-framework, test-framework-quickcheck2, text, text-latin1
@@ -129675,8 +129786,8 @@ self: {
      }:
      mkDerivation {
        pname = "witherable";
-       version = "0.1.2.2";
-       sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7";
+       version = "0.1.2.3";
+       sha256 = "1281npwsmj9vzw3l5bb8pzywgm5dk4y723zsq5dk0b0ri58m3hcz";
        buildDepends = [
          base containers hashable transformers unordered-containers vector
        ];

From b88fc6c90e7f8d32fa24d8e51d099c16c36d59d7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Wed, 29 Apr 2015 13:15:17 +0200
Subject: [PATCH 0218/1143] update vagrant to 1.7.2

---
 pkgs/development/tools/vagrant/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 44cb5fef90e4..84bfcce541ac 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 let
-  version = "1.6.5";
+  version = "1.7.2";
   rake = buildRubyGem {
     inherit ruby;
     name = "rake-10.3.2";
@@ -19,19 +19,19 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
-        sha256 = "12m2mnpnfzqv2s4j58cnzg4h4i5nkk5nb4irsvmm3i9a0dnsziz2";
+        sha256 = "0s1rwzpcp0nc7v04fvbd5vsqfm79q2v23sr9ahniw09lf5c1qzwx";
       }
     else
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
-        sha256 = "1d4w0ni6mkb378v6rd7b188fw38vi8qql7pkwzsykr6389krbkbq";
+        sha256 = "1yj8iyhsgj6j3r7p3ppmsz01j6vnxqb18rjhsbp2sz45kbfs1wxz";
       };
 
   meta = with stdenv.lib; {
     description = "A tool for building complete development environments";
     homepage    = http://vagrantup.com;
     license     = licenses.mit;
-    maintainers = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 globin ];
     platforms   = platforms.linux;
   };
 
@@ -93,12 +93,12 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     # 'hide' the template file from shebang-patching
-    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
-    chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh
+    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+    chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 
   postFixup = ''
-    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
-    chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh
+    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+    chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 }

From 456da7fededf36efc592795b9106150f2033dd47 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Tue, 28 Apr 2015 18:56:29 +0200
Subject: [PATCH 0219/1143] apache pig: new package

---
 .../networking/cluster/pig/default.nix        | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/pig/default.nix

diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix
new file mode 100644
index 000000000000..a5666fc8f321
--- /dev/null
+++ b/pkgs/applications/networking/cluster/pig/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, makeWrapper, hadoop, jre, bash }:
+
+stdenv.mkDerivation rec {
+
+  name = "pig-0.14.0";
+
+  src = fetchurl {
+    url = "mirror://apache/pig/${name}/${name}.tar.gz";
+    sha256 = "183in34cj93ny3lhqyq76g9pjqgw1qlwakk5v6x847vrlkfndska";
+
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out
+    mv * $out
+
+    # no need for the windows batch script
+    rm $out/bin/pig.cmd $out/bin/pig.py
+
+    for n in $out/{bin,sbin}"/"*; do
+      wrapProgram $n \
+        --prefix PATH : "${jre}/bin:${bash}/bin" \
+        --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://pig.apache.org/";
+    description = "High-level language for Apache Hadoop";
+    license = licenses.asl20;
+
+    longDescription = ''
+      Apache Pig is a platform for analyzing large data sets that consists of a
+      high-level language for expressing data analysis programs, coupled with
+      infrastructure for evaluating these programs. The salient property of Pig
+      programs is that their structure is amenable to substantial parallelization,
+      which in turns enables them to handle very large data sets.
+    '';
+
+    platforms = platforms.linux;
+    maintainers = [ maintainers.skeidel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bdf26fea90d..931155c4a15c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11524,6 +11524,8 @@ let
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
+  pig = callPackage ../applications/networking/cluster/pig { };
+
   shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; };
 
   smplayer = callPackage ../applications/video/smplayer { };

From 552ea209d0862e4fd5e28573cfa0e1512f78d747 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Apr 2015 16:07:36 +0200
Subject: [PATCH 0220/1143] php: Update to 5.4.40

---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 02137e5823ef..c94199b7ab13 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd }:
 callPackage ./makePhpDerivation.nix {
-  phpVersion = "5.4.39";
-  sha = "0znpd6pgri5vah4j4wwamhqc60awila43bhh699p973hir9pdsvw";
+  phpVersion = "5.4.40";
+  sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628";
   apacheHttpd = apacheHttpd;
 }

From 182acabbae644182ee6dafc9779e63abd7991f8c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Apr 2015 16:09:30 +0200
Subject: [PATCH 0221/1143] Don't use camelCase in file names

---
 pkgs/development/interpreters/php/5.4.nix                       | 2 +-
 pkgs/development/interpreters/php/5.5.nix                       | 2 +-
 pkgs/development/interpreters/php/5.6.nix                       | 2 +-
 .../interpreters/php/{makePhpDerivation.nix => generic.nix}     | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/interpreters/php/{makePhpDerivation.nix => generic.nix} (100%)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index c94199b7ab13..7133b1e0824f 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,5 +1,5 @@
 { callPackage, apacheHttpd }:
-callPackage ./makePhpDerivation.nix {
+callPackage ./generic.nix {
   phpVersion = "5.4.40";
   sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628";
   apacheHttpd = apacheHttpd;
diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix
index 842f12a89105..fdc1ab79c769 100644
--- a/pkgs/development/interpreters/php/5.5.nix
+++ b/pkgs/development/interpreters/php/5.5.nix
@@ -1,5 +1,5 @@
 { callPackage, apacheHttpd  }:
-callPackage ./makePhpDerivation.nix {
+callPackage ./generic.nix {
   phpVersion = "5.5.21";
   sha = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2";
   apacheHttpd = apacheHttpd;
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
index 2f4a3165f437..5f69e46189fa 100644
--- a/pkgs/development/interpreters/php/5.6.nix
+++ b/pkgs/development/interpreters/php/5.6.nix
@@ -1,5 +1,5 @@
 { callPackage, apacheHttpd  }:
-callPackage ./makePhpDerivation.nix {
+callPackage ./generic.nix {
   phpVersion = "5.6.6";
   sha = "0k5vml94p5809bk2d5a8lhzf3h7f1xgs75b9qy6ikj70cndmqqh9";
   apacheHttpd = apacheHttpd;
diff --git a/pkgs/development/interpreters/php/makePhpDerivation.nix b/pkgs/development/interpreters/php/generic.nix
similarity index 100%
rename from pkgs/development/interpreters/php/makePhpDerivation.nix
rename to pkgs/development/interpreters/php/generic.nix

From ff88f4bcda606d9a47f807b773749280998e64ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 29 Apr 2015 18:48:21 +0200
Subject: [PATCH 0222/1143] nixos-install: correctly detect stdin

---
 nixos/modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 097631eda9c9..b1f4772d5705 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -263,7 +263,7 @@ export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix
 
 
 # Ask the user to set a root password.
-if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 1 ] ; then
+if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then
     echo "setting root password..."
     chroot $mountPoint /var/setuid-wrappers/passwd
 fi

From 9870ba196830ef03501c092f903919ea769b37ca Mon Sep 17 00:00:00 2001
From: William Giokas <1007380@gmail.com>
Date: Wed, 29 Apr 2015 09:58:04 -0700
Subject: [PATCH 0223/1143] git-remote-hg: remove dbus, install built docs

dbus is unused in this package, no reason to include it in the
expression anywhere.
---
 .../git-and-tools/git-remote-hg/default.nix                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index a60d7d2a49ba..588c7acff7c8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, mercurial, makeWrapper,
-  asciidoc, xmlto, dbus, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2
+  asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2
 }:
 
 stdenv.mkDerivation rec {
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ mercurial.python mercurial makeWrapper
-    asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt libxml2
+    asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2
   ];
 
   doCheck = false;
 
-  installFlags = "HOME=\${out}";
+  installFlags = "HOME=\${out} install-doc";
 
   postInstall = ''
     wrapProgram $out/bin/git-remote-hg \

From 9a535b90238938e38bdb0498e9f2558ace782a4f Mon Sep 17 00:00:00 2001
From: Bram Duvigneau <bram@bramd.nl>
Date: Wed, 29 Apr 2015 23:02:09 +0200
Subject: [PATCH 0224/1143] Added BRLTTY package

---
 nixos/modules/module-list.nix              |  1 +
 nixos/modules/services/hardware/brltty.nix | 42 ++++++++++++++++++++++
 pkgs/tools/misc/brltty/default.nix         | 33 +++++++++++++++++
 pkgs/top-level/all-packages.nix            |  3 ++
 4 files changed, 79 insertions(+)
 create mode 100644 nixos/modules/services/hardware/brltty.nix
 create mode 100644 pkgs/tools/misc/brltty/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 61cc551f4358..e1af98f0da64 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -152,6 +152,7 @@
   ./services/hardware/actkbd.nix
   ./services/hardware/amd-hybrid-graphics.nix
   ./services/hardware/bluetooth.nix
+  ./services/hardware/brltty.nix
   ./services/hardware/freefall.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix
new file mode 100644
index 000000000000..d6c05a3d620c
--- /dev/null
+++ b/nixos/modules/services/hardware/brltty.nix
@@ -0,0 +1,42 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.brltty;
+  
+  stateDir = "/run/brltty";
+
+  pidFile = "${stateDir}/brltty.pid";
+
+in {
+
+  options = {
+
+    services.brltty.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Whether to enable the BRLTTY daemon.";
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.brltty = {
+      description = "Braille console driver";
+      preStart = ''
+        mkdir -p ${stateDir}
+      '';
+      serviceConfig = {
+        ExecStart = "${pkgs.brltty}/bin/brltty --pid-file=${pidFile}";
+        Type = "forking";
+        PIDFile = pidFile;
+      };
+      before = [ "sysinit.target" ];
+      wantedBy = [ "sysinit.target" ];
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
new file mode 100644
index 000000000000..4201fb25f98a
--- /dev/null
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez }:
+
+assert alsaSupport -> alsaLib != null;
+
+stdenv.mkDerivation rec {
+  name = "brltty-5.2";
+  
+  src = fetchurl {
+    url = "http://brltty.com/archive/${name}.tar.gz";
+    sha256 = "1zaab5pxkqrv081n23p3am445d30gk0km4azqdirvcpw9z15q0cz";
+  };
+  
+  buildInputs = [ pkgconfig alsaLib bluez ]
+    ++ stdenv.lib.optional alsaSupport alsaLib;
+  
+  meta = {
+    description = "Access software for a blind person using a braille display";
+    longDescription = ''
+      BRLTTY is a background process (daemon) which provides access to the Linux/Unix
+      console (when in text mode) for a blind person using a refreshable braille display.
+      It drives the braille display, and provides complete screen review functionality.
+      Some speech capability has also been incorporated. 
+    '';
+    homepage = http://www.brltty.com/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bramd ];
+    platforms = stdenv.lib.platforms.all;
+  };
+  
+  patchPhase = ''
+    substituteInPlace configure --replace /sbin/ldconfig ldconfig
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 332811bcafe0..3855dc8b4a9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -715,6 +715,9 @@ let
 
   brasero = callPackage ../tools/cd-dvd/brasero { };
 
+  brltty = callPackage ../tools/misc/brltty {
+    alsaSupport = (!stdenv.isDarwin);
+  };
   bro = callPackage ../applications/networking/ids/bro { };
 
   bsod = callPackage ../misc/emulators/bsod { };

From 70241a53d011468a8aa75ea860aaf980901a2e55 Mon Sep 17 00:00:00 2001
From: Bram Duvigneau <bram@bramd.nl>
Date: Wed, 29 Apr 2015 23:30:18 +0200
Subject: [PATCH 0225/1143] Added Bram Duvigneau to maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f0e87507ceb6..8f148ba91c40 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -41,6 +41,7 @@
   bodil = "Bodil Stokke <nix@bodil.org>";
   boothead = "Ben Ford <ben@perurbis.com>";
   bosu = "Boris Sukholitko <boriss@gmail.com>";
+  bramd = "Bram Duvigneau <bram@bramd.nl>";
   bstrik = "Berno Strik <dutchman55@gmx.com>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
   campadrenalin = "Philip Horger <campadrenalin@gmail.com>";

From 6a34c8fbac60f84621949d0194813b3d944077e0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Apr 2015 14:31:33 -0700
Subject: [PATCH 0226/1143] kernel: 3.10.75 -> 3.10.76

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index ff9f2f382430..68e5c940ca9e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.75";
+  version = "3.10.76";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "00wqcmya2ky9f1djlq99mcq8fyvpabnjnp5cn61japlgk8p7r60q";
+    sha256 = "0v4blm026fg4hk5ddh25b1fjhnk2yak2hpj4cz4wiq7yr84dr8p5";
   };
 
   features.iwlwifi = true;

From 04144651373694bad842ce76f2d2a935409d2557 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Apr 2015 14:31:44 -0700
Subject: [PATCH 0227/1143] kernel: 4.0 -> 4.0.1

---
 pkgs/os-specific/linux/kernel/linux-4.0.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index b63aa7e9932f..161861d6f067 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0";
-  modDirVersion = "4.0.0";
+  version = "4.0.1";
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14argl6ywkggdvgiycfx4jl2d7290f631ly59wfggj4vjx27sbqg";
+    sha256 = "1ggj26p1bm5v5kaviz6brfkjk32f8rib1mh61ns77gjlx5vsvc7z";
   };
 
   features.iwlwifi = true;

From dfd7b26e3a18fdaef0b2326467465d28dccd3e66 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Apr 2015 14:31:41 -0700
Subject: [PATCH 0228/1143] kernel: 3.19.5 -> 3.19.6

---
 pkgs/os-specific/linux/kernel/linux-3.19.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix
index 79302819d7c9..293b0abf9f34 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.19.5";
+  version = "3.19.6";
   # Remember to update grsecurity!
   extraMeta.branch = "3.19";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0s2yiyk1ks0z2fj8a8g56hkp6mfyvh9c34m1jpixhg9zck9xjdix";
+    sha256 = "1kqn796vwkmhj2qkv56nj7anpmxx1hxv47cf44fcmx9n1afry8j4";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 998717b1f5d4..73ae3a2c6eb8 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.19.5";
-      revision  = "201504190814";
+    { kversion  = "3.19.6";
+      revision  = "201504290821";
       branch    = "test";
-      sha256    = "0wj9bximhs41b11hh113mishmc1ya8bncc0v91cbrivx5y5hjpz0";
+      sha256    = "0nya84cpj2cgncchywfysvmzx5m3wl034f6p7zfxj9l6jhjdcd6q";
     };
 
   grsec_fix_path =

From 084d1143e63f86e585c1076538154f1335e06b2a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Apr 2015 14:31:39 -0700
Subject: [PATCH 0229/1143] kernel: 3.14.39 -> 3.14.40

---
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 188eb6f699c1..8b134e740064 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.39";
+  version = "3.14.40";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0zgfiqlvmprbn55k9ijf6db027mxlcww76y47g4g7vcj5qrpq6rd";
+    sha256 = "1w5j53ny5vahp1ipj16x0ahjb5yj6q859jsdshblymvwrbkcr29a";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 73ae3a2c6eb8..2bb8fb570003 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.39";
-      revision  = "201504190814";
+    { kversion  = "3.14.40";
+      revision  = "201504290821";
       branch    = "stable";
-      sha256    = "0pjq0ggifh6hp5y62dl0ydskpmsmzj1cxxjaaqs6fpwn5ndsdji7";
+      sha256    = "0382ydr1dshjmwggx5a6ywrdr7qv52w178ify60qw59lrphbdkls";
     };
 
   grsecurity_unstable = grsecPatch

From 948884ef11b7fa6b375e46c13a39356085be9636 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Sat, 18 Apr 2015 21:35:01 -0400
Subject: [PATCH 0230/1143] SDL2: pass explicit --without-x flag to configure

Fixes build on Darwin for me, possibly necessary on other systems as
well
---
 pkgs/development/libraries/SDL2/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 68f40cad2598..ade6bc620e4f 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -19,6 +19,7 @@ let
         --disable-oss --disable-x11-shared
         --disable-pulseaudio-shared --disable-alsa-shared
         ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
+        ${if (!x11Support) then "--without-x" else ""}
       '';
 in
 stdenv.mkDerivation rec {

From e2011fa80d357b7df14df1f8250740fdfdf1b7ba Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Sun, 19 Apr 2015 19:32:06 -0400
Subject: [PATCH 0231/1143] Enable some SDL libraries on Darwin

---
 pkgs/development/libraries/SDL2_gfx/default.nix   | 2 +-
 pkgs/development/libraries/SDL2_image/default.nix | 2 +-
 pkgs/development/libraries/SDL_gfx/default.nix    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index bc4b1a778fc2..66913fc01597 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.bjg ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index 73b5ba8d929a..55b465226d8d 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "SDL image library";
     homepage = "http://www.libsdl.org/projects/SDL_image/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 3a7fa7072849..7bff348b7543 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.bjg ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 27f50a486cd3b3f3fee38fc68f851d189b9fe519 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Sun, 19 Apr 2015 19:35:29 -0400
Subject: [PATCH 0232/1143] Remove unnecesary darwin stdenv conditional

---
 pkgs/top-level/all-packages.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 332811bcafe0..ea85eb72d542 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7546,11 +7546,6 @@ let
     alsaSupport = (!stdenv.isDarwin);
     x11Support = true;
     pulseaudioSupport = (!stdenv.isDarwin);
-
-    # resolve the unrecognized -fpascal-strings option error
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
   };
 
   SDL_gfx = callPackage ../development/libraries/SDL_gfx { };

From b37d5864d61b4b7fec38d77a4f929a3001298a30 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 29 Apr 2015 17:37:39 -0400
Subject: [PATCH 0233/1143] SDL: libcap is Linux only

---
 pkgs/development/libraries/SDL/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 1e32a5985060..f23955228f75 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
-  in [ libcap ]
+  in stdenv.lib.optional stdenv.isLinux libcap
     ++ (stdenv.lib.optional notMingw audiofile);
 
   nativeBuildInputs = [ pkgconfig ] ++

From 50fb7b312ba24ebba6c03da3dda54cb23b56c7b8 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 29 Apr 2015 23:57:31 +0200
Subject: [PATCH 0234/1143] tig-2.1.1: version bump

---
 .../version-management/git-and-tools/tig/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index c8973e4a6600..4c8430ed5c5f 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tig-2.1";
+  name = "tig-2.1.1";
 
   src = fetchurl {
     url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz";
-    sha256 = "1c1w6w39a1dwx4whrg0ga1mhrlz095hz875z7ajn6xgmhkv8fqih";
+    sha256 = "0bw5wivswwh7vx897q8xc2cqgkqhdzk8gh6fnav2kf34sngigiah";
   };
 
   buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://jonas.nitro.dk/tig/";
     description = "Text-mode interface for git";
-    maintainers = with maintainers; [ garbas bjornfor iElectric ];
+    maintainers = with maintainers; [ garbas bjornfor iElectric qknight ];
     license = licenses.gpl2;
     platforms = platforms.unix;
   };

From 4cae83bb70b45916063b280289b81a87d0387ba4 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 28 Apr 2015 20:54:01 +0200
Subject: [PATCH 0235/1143] gprof2dot: Add new package

gprof2dot is a Python script to convert the output from many profilers
into a dot graph.
---
 .../tools/profiling/gprof2dot/default.nix     | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/tools/profiling/gprof2dot/default.nix

diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/tools/profiling/gprof2dot/default.nix
new file mode 100644
index 000000000000..38315116eeb7
--- /dev/null
+++ b/pkgs/development/tools/profiling/gprof2dot/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonPackage {
+  name = "gprof2dot-2015-04-27";
+
+  src = fetchFromGitHub {
+    owner = "jrfonseca";
+    repo = "gprof2dot";
+    rev = "6fbb81559609c12e7c64ae5dce7d102a414a7514";
+    sha256 = "1fff7w6dm6lld11hp2ij97f85ma1154h62dvchq19c5jja3zjw3c";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/jrfonseca/gprof2dot";
+    description = "Python script to convert the output from many profilers into a dot graph";
+    license = licenses.lgpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 332811bcafe0..166847e6b026 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1553,6 +1553,11 @@ let
 
   grails = callPackage ../development/web/grails { jdk = null; };
 
+  gprof2dot = callPackage ../development/tools/profiling/gprof2dot {
+    # Using pypy provides significant performance improvements (~2x)
+    pythonPackages = pypyPackages;
+  };
+
   graphviz = callPackage ../tools/graphics/graphviz { };
 
   graphviz-nox = callPackage ../tools/graphics/graphviz {

From f1b1e556c41aa8b5a9f15690005019a32941c999 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 29 Apr 2015 17:44:48 -0500
Subject: [PATCH 0236/1143] source-code-pro: new source

---
 pkgs/data/fonts/source-code-pro/default.nix | 50 +++++++--------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index dc5bcb5b9a79..b3761bc0b5b2 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -1,42 +1,26 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version="1.017";
-    name="SourceCodePro";
-    url="mirror://sourceforge/sourcecodepro.adobe/${name}_FontsOnly-${version}.zip";
-    hash="07xjfxin883a3g3admdddxxqyzigihbsnmik0zpjii09cdlb8dl1";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "source-code-pro-${version}";
+  version = "1.017";
+
+  src = fetchurl {
+    url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R.tar.gz";
+    sha256="03q4a0f142c6zlngv6kjaik52y0yzwq5z5qj3j0fvvcbfy9sanjr";
   };
 
-  name = "source-code-pro-${sourceInfo.version}";
-  inherit buildInputs;
+  phases = "unpackPhase installPhase";
 
-  phaseNames = ["doUnpack" "installFonts"];
-
-  doUnpack = a.fullDepEntry (''
-    unzip ${src}
-    cd ${sourceInfo.name}*/OTF/
-  '') ["addInputs"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \;
+  '';
 
   meta = {
     description = "A set of monospaced OpenType fonts designed for coding environments";
-    maintainers = with a.lib.maintainers; [ relrod ];
-    platforms = with a.lib.platforms; all;
+    maintainers = with stdenv.lib.maintainers; [ relrod ];
+    platforms = with stdenv.lib.platforms; all;
     homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/";
-    license = a.lib.licenses.ofl;
+    license = stdenv.lib.licenses.ofl;
   };
-}) x
+}

From dbde0d3edc2caee953fab56ce1c69162aa6d3b56 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 29 Apr 2015 17:45:00 -0500
Subject: [PATCH 0237/1143] source-sans-pro: new source

---
 pkgs/data/fonts/source-sans-pro/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index eccddc8f14c0..83b6a3f2d578 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "source-sans-pro-1.050";
+  name = "source-sans-pro-2.010";
   src = fetchurl {
-    url = "mirror://sourceforge/sourcesans.adobe/SourceSansPro_FontsOnly-1.050.zip";
-    sha256 = "002z7kx8jxp5pfrilqaxbwbr5yp9fl3zsp0imawmf5wqagpzayf3";
+    url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz";
+    sha256 = "1s3rgia6x9fxc2pvlwm203grqkb49px6q0xnh8kbqxqsgna615p2";
   };
 
-  buildInputs = [ unzip ];
-
   phases = "unpackPhase installPhase";
 
   installPhase = ''

From 713844317ec5f169a15fbb2a91e9cb4bad0a3f89 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 29 Apr 2015 17:45:13 -0500
Subject: [PATCH 0238/1143] source-serif-pro: new source

---
 pkgs/data/fonts/source-serif-pro/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
index 00ebf22d469f..0ccb0299a364 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/pkgs/data/fonts/source-serif-pro/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "source-serif-pro-1.014";
-  src = fetchurl {
-    url = "mirror://sourceforge/sourceserifpro.adobe/SourceSerifPro_FontsOnly-1.014.zip";
-    sha256 = "1agack195jqq4g2hmga6f9nwg44garii1g3jpbrdlrwr97rwvqsh";
+stdenv.mkDerivation rec {
+  name = "source-serif-pro-${version}";
+  version = "1.017";
+
+  src = fetchurl rec {
+    url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.tar.gz";
+    sha256 = "04h24iywjl4fd08x22ypdb3sm979wjfq4wk95r3rk8w376spakrg";
   };
 
-  buildInputs = [ unzip ];
-
   phases = "unpackPhase installPhase";
 
   installPhase = ''

From 2a5cac91e3fc083424f4dd0da8f369a3b9e8bfbc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 29 Apr 2015 17:45:35 -0500
Subject: [PATCH 0239/1143] libimobiledevice: update to 1.2.0

---
 .../development/libraries/libimobiledevice/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index a05d176554e9..c1519ca5b830 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
-  libtasn1, libplist, readline }:
+{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, libgcrypt,
+  libtasn1, libplist, readline, libusbmuxd, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libimobiledevice-1.0.7";
+  name = "libimobiledevice-1.2.0";
 
   nativeBuildInputs = [ python libplist.swig pkgconfig ];
   buildInputs = [ readline ];
-  propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ];
+  propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
 
   patchPhase = ''sed -e 's@1\.3\.21@@' -i configure'';
   passthru.swig = libplist.swig;
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.bz2";
-    sha256 = "15jznqc52yfwkbw19hgv3r1qd4gcymakbfkyizmr6v4n0sn27n0f";
+    sha256 = "0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq";
   };
 
   meta = {

From e3ff2793fb80de70625c779a2e75d82d0efee411 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 29 Apr 2015 17:45:57 -0500
Subject: [PATCH 0240/1143] add libusbmuxd-1.0.10

---
 .../development/libraries/libusbmuxd/default.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                  |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/libusbmuxd/default.nix

diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
new file mode 100644
index 000000000000..edc3d3df9cb4
--- /dev/null
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, libplist }:
+
+stdenv.mkDerivation rec {
+  name = "libusbmuxd-1.0.10";
+  src = fetchurl {
+    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libplist ];
+
+  meta = {
+    homepage = "http://www.libimobiledevice.org";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eee693fcc7cd..5f6e9eb994e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6961,6 +6961,8 @@ let
 
   libusb1 = callPackage ../development/libraries/libusb1 { };
 
+  libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
+
   libunwind = if stdenv.isDarwin
     then callPackage ../development/libraries/libunwind/native.nix {}
     else callPackage ../development/libraries/libunwind { };

From 487310e921f509dc70e5632a87bf227300ee7480 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 29 Apr 2015 17:46:14 -0500
Subject: [PATCH 0241/1143] usbmuxd: update to 1.1.0

---
 pkgs/tools/misc/usbmuxd/default.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
index b95dfde98500..accd3b8070ad 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, fetchurl, cmake, libplist, libusb1, pkgconfig }:
+{ stdenv, fetchurl, libplist, libusb1, pkgconfig, libimobiledevice }:
 
 stdenv.mkDerivation rec {
-  name = "usbmuxd-1.0.7";
+  name = "usbmuxd-${version}";
+  version = "1.1.0";
 
   src = fetchurl {
-    url = "http://marcansoft.com/uploads/usbmuxd/${name}.tar.bz2";
-    sha256 = "09swwr6x46qxmwylrylnyqh4pznr0swla9gijggwxxw8dw82r840";
+    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    sha256 = "0bdlc7a8plvglqqx39qqampqm6y0hcdws76l9dffwl22zss4i29y";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-  propagatedBuildInputs = [ libusb1 libplist ];
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ libusb1 libplist libimobiledevice ];
 
-  patchPhase =
-    ''
-    sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt
-    sed -e 's,/bin/echo,echo,g' -i Modules/describe.sh
-    '';
+  preConfigure = ''
+    configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d"
+    configureFlags="$configureFlags --with-systemdsystemunitdir=$out/lib/systemd/system"
+  '';
 
-
-  cmakeFlags = ''-DLIB_SUFFIX='';
   meta = {
     homepage = http://marcansoft.com/blog/iphonelinux/usbmuxd/;
     description = "USB Multiplex Daemon (for talking to iPhone or iPod)";

From 7f9ccc628403ed88844a4436da3b2944be5560a4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 29 Apr 2015 17:46:34 -0500
Subject: [PATCH 0242/1143] libplist: update to 1.12

---
 pkgs/development/libraries/libplist/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 95da6dfb7499..0b9b7bd2f54e 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, cmake, libxml2, swig2, python, glib }:
+{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libplist-1.3";
+  name = "libplist-1.12";
 
-  nativeBuildInputs = [ cmake swig2 ];
+  nativeBuildInputs = [ pkgconfig swig2 ];
 
-  patches = [ ./swig.patch ];
+  #patches = [ ./swig.patch ];
 
   propagatedBuildInputs = [ libxml2 glib python ];
 
   passthru.swig = swig2;
 
   src = fetchurl {
-    url = "http://github.com/downloads/JonathanBeck/libplist/${name}.tar.bz2";
-    sha256 = "1c5nwp9jbsp5kx8avmmsr5g7qdngnqlplh2sjbygmhydb6n8lb4q";
+    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    sha256 = "1gj4nv0bvdm5y2sqm2vj2rn44k67ahw3mh6q614qq4nyngfdxzqf";
   };
 
   meta = {

From 0cce6c3aeac71f16aa0a32f48209c02764c1a595 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Apr 2015 16:00:26 -0700
Subject: [PATCH 0243/1143] libtasn1: 4.4 -> 4.5

---
 pkgs/development/libraries/libtasn1/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index a0e53cf90587..6423a788287d 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-4.4";
+  name = "libtasn1-4.5";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "0p8c5s1gm3z3nn4s9qc6gs18grbk45mx44byqw2l2qzynjqrsd7q";
+    sha256 = "0p8c5s1gm3z3nn4s9qc6gs18grbk45mx44byqw2l2qzynjqrsd7a";
   };
 
   buildInputs = [ perl texinfo ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    maintainers = [ ];
+    maintainers = with maintainers; [ wkennington ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From cc1b3a7d8a82a47cf644b59ccc552a9688ff46f9 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Wed, 29 Apr 2015 19:09:56 -0400
Subject: [PATCH 0244/1143] Fixed issue with smartgithg download url prefix.

Was using the `download` infix instead of
`downloads`.
---
 pkgs/applications/version-management/smartgithg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 1af0653fa812..f2a2fadae8c7 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   name = "smartgithg-${the_version}";
 
   src = fetchurl {
-    url = "http://www.syntevo.com/download/smartgit/" +
+    url = "http://www.syntevo.com/downloads/smartgit/" +
           "smartgit-generic-${the_version}.tar.gz";
     sha256 = "0db4dxp0dl173z9r8n25zdl1il240p751d2f77cw0nmyibik7q4l";
   };

From 22faf646f1f71695557f74d8144a5743c484b3c9 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Tue, 28 Apr 2015 00:18:00 -0400
Subject: [PATCH 0245/1143] Improvements to the clementine package.

 -  Pass the gstreamer plugins as a list attribute instead of
    individual attributes.
     +  This should allow for greater customization (e.g.: a
          user can add / remove plugins by overriding
          the plugin list attribute).

    This is the same technique as used for wrapping chrome
    with gstreamer plugins.

 -  Moved integration of gstreamer plugins, spotify
    library and clementine into a wrapper derivation.
     +  This should allow a user to change the gstreamer
          plugin set and activate / deactivate the spotify
          plugin without triggering a whole rebuild of the
          clementine sources (which is pretty long).
---
 .../applications/audio/clementine/default.nix | 110 +++++++++++-------
 pkgs/top-level/all-packages.nix               |   1 +
 2 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 857aa2edaf5e..f3d0eb3f8347 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,60 +1,88 @@
 { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
-, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst_ffmpeg
 , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
 , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
-, sparsehash, config, makeWrapper }:
+, sparsehash, config, makeWrapper, gst_plugins }:
 
-let withSpotify = config.clementine.spotify or false;
-in
-stdenv.mkDerivation {
-  name = "clementine-1.2.3";
+let 
+  version = "1.2.3";
 
-  src = fetchurl {
-    url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
-    sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
+  withSpotify = config.clementine.spotify or false;
+
+  wrappedExeName = "clementine";
+
+  wrapped = stdenv.mkDerivation {
+    name = "clementine-wrapped-${version}";
+
+    src = fetchurl {
+      url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
+      sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
+    };
+
+    patches = [ ./clementine-1.2.1-include-paths.patch ];
+
+    buildInputs = [
+      boost
+      cmake
+      fftw
+      gettext
+      glew
+      gst_plugins_base
+      gstreamer
+      gvfs
+      libcdio
+      libgpod
+      liblastfm
+      libmtp
+      libplist
+      pkgconfig
+      protobuf
+      qca2
+      qjson
+      qt4
+      sparsehash
+      sqlite
+      taglib
+      usbmuxd
+    ];
+
+    enableParallelBuilding = true;
   };
 
-  patches = [ ./clementine-1.2.1-include-paths.patch ];
+in
+
+stdenv.mkDerivation {
+  name = "clementine-${version}";
+
+  src = ./.;
+
 
   buildInputs = [
-    boost
-    cmake
-    fftw
-    gettext
-    glew
-    gst_plugins_base
-    gst_plugins_good
-    gst_plugins_ugly
-    gst_ffmpeg
-    gstreamer
-    gvfs
-    libcdio
-    libgpod
-    liblastfm
-    libmtp
-    libplist
+    wrapped
     makeWrapper
-    pkgconfig
-    protobuf
-    qca2
-    qjson
-    qt4
-    sparsehash
-    sqlite
-    taglib
-    usbmuxd
-  ] ++ stdenv.lib.optional withSpotify libspotify;
+  ] ++ gst_plugins
+    ++ stdenv.lib.optional withSpotify libspotify;
 
-  enableParallelBuilding = true;
+  installPhase = ''
+    mkdir -p $out
+    cp -a ${wrapped}/* $out
+    chmod -R u+w-t $out
 
-  postInstall = ''
-    wrapProgram $out/bin/clementine \
-      --set GST_PLUGIN_SYSTEM_PATH "$GST_PLUGIN_SYSTEM_PATH"
+    wrapProgram "$out/bin/${wrappedExeName}" \
+        --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
   '';
 
+  preferLocalBuild = true;
+  dontPatchELF = true;
+  dontStrip = true;
+
   meta = with stdenv.lib; {
     homepage = "http://www.clementine-player.org";
-    description = "A multiplatform music player";
+    description = "A multiplatform music player"
+      + " ("
+      + concatStrings (optionals (withSpotify) ["with spotify, "])
+      + "with gstreamer plugins: "
+      + concatStrings (intersperse ", " (map (x: x.name) gst_plugins))
+      + ")";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.ttuegel ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95bd693a9f8f..91d5d332d45c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -976,6 +976,7 @@ let
 
   clementine = callPackage ../applications/audio/clementine {
     boost = boost156;
+    gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ];
   };
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };

From 6119355c9cecbdc8f49abf0b7b4502c78a931d83 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Wed, 29 Apr 2015 21:45:57 -0400
Subject: [PATCH 0246/1143] Simplify standalone `diagrams-builder` expression.

---
 .../graphics/diagrams-builder/default.nix     | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix
index fc7766b403c4..a12e5dbb8bb3 100644
--- a/pkgs/tools/graphics/diagrams-builder/default.nix
+++ b/pkgs/tools/graphics/diagrams-builder/default.nix
@@ -11,32 +11,33 @@
 */
 
 { stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }:
+
 let
+
   # Used same technique as for the yiCustom package.
-  w = ghcWithPackages 
+  wrappedGhc = ghcWithPackages 
     (self: [ diagrams-builder ] ++ extraPackages self);
-  wrappedGhc = w.override { ignoreCollisions = true; };
-  ghcVersion = w.version;
+  ghcVersion = wrappedGhc.version;
+
+  exeWrapper = backend : ''
+    makeWrapper \
+    "${diagrams-builder}/bin/diagrams-builder-${backend}" "$out/bin/diagrams-builder-${backend}" \
+      --set NIX_GHC ${wrappedGhc}/bin/ghc \
+      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
+  '';
+  
+  backends = ["svg" "cairo" "ps"];
+
 in
+
 stdenv.mkDerivation {
   name = "diagrams-builder";
+
   buildInputs = [ makeWrapper ];
-  buildCommand = ''
-    makeWrapper \
-    "${diagrams-builder}/bin/diagrams-builder-svg" "$out/bin/diagrams-builder-svg" \
-      --set NIX_GHC ${wrappedGhc}/bin/ghc \
-      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
 
-    makeWrapper \
-    "${diagrams-builder}/bin/diagrams-builder-cairo" "$out/bin/diagrams-builder-cairo" \
-      --set NIX_GHC ${wrappedGhc}/bin/ghc \
-      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
+  buildCommand = with stdenv.lib; 
+    concatStrings (intersperse "\n" (map exeWrapper backends));
 
-    makeWrapper \
-    "${diagrams-builder}/bin/diagrams-builder-ps" "$out/bin/diagrams-builder-ps" \
-    --set NIX_GHC ${wrappedGhc}/bin/ghc \
-    --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
-  '';
   # Will be faster to build the wrapper locally then to fetch it from a binary cache.
   preferLocalBuild = true;
   meta = diagrams-builder.meta;

From 49fa00cded7bd3da0aa76cd2eb58e197084b820d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 30 Apr 2015 06:20:54 +0200
Subject: [PATCH 0247/1143] networkd: Fix disabled networkd units.

In f8dbe5f, the default value for networking unit "enabled" option
suddenly flipped to false. I have no idea of whether this happened by
accident, but I'm setting it to true again, because it essentially
breaks systemd networking support and we have systemd.network.enable to
have a "turn the world off" switch.

And of course, because the mentioned commit obviously wasn't done with
even a run of the simplest run of one of the network VM tests, we now
get an evaluation error if we switch useNetworkd to true.

Fixes the core issue of #7505.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/system/boot/networkd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 0221374ab835..e83aa6e2e2d6 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -132,7 +132,7 @@ let
   commonNetworkOptions = {
 
     enable = mkOption {
-      default = false;
+      default = true;
       type = types.bool;
       description = ''
         Whether to manage network configuration using <command>systemd-network</command>.

From 4cdb4a4fef93b54dd41aab93d333c703df4d5803 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 30 Apr 2015 06:44:25 +0200
Subject: [PATCH 0248/1143] networkd: Fix evaluation of systemd.network units.

During the refactor of the networkd stuff in f8dbe5f, a lot of the
options are now needed by systemd.nix as well as networkd.nix but
weren't moved by that commit as well.

For now, this fixes all networkd VM tests except for the macvlan one and
thus it should fix #7505 for at least DHCP-based configuration.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/system/boot/networkd.nix        |  5 ++
 nixos/modules/system/boot/systemd-lib.nix     | 63 +++++++++++++++++++
 .../system/boot/systemd-unit-options.nix      | 51 +--------------
 nixos/modules/system/boot/systemd.nix         | 18 ------
 4 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index e83aa6e2e2d6..b183c0f32366 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -482,6 +482,11 @@ let
     };
   };
 
+  commonMatchText = def: ''
+    [Match]
+    ${attrsToSection def.matchConfig}
+  '';
+
   linkToUnit = name: def:
     { inherit (def) enable;
       text = commonMatchText def +
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index e8cfd3395cb0..873fff15d384 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -25,6 +25,69 @@ rec {
           ln -s /dev/null $out/${shellEscape name}
         '';
 
+  boolValues = [true false "yes" "no"];
+
+  digits = map toString (range 0 9);
+
+  isByteFormat = s:
+    let
+      l = reverseList (stringToCharacters s);
+      suffix = head l;
+      nums = tail l;
+    in elem suffix (["K" "M" "G" "T"] ++ digits)
+      && all (num: elem num digits) nums;
+
+  assertByteFormat = name: group: attr:
+    optional (attr ? ${name} && ! isByteFormat attr.${name})
+      "Systemd ${group} field `${name}' must be in byte format [0-9]+[KMGT].";
+
+  hexChars = stringToCharacters "0123456789abcdefABCDEF";
+
+  isMacAddress = s: stringLength s == 17
+    && flip all (splitString ":" s) (bytes:
+      all (byte: elem byte hexChars) (stringToCharacters bytes)
+    );
+
+  assertMacAddress = name: group: attr:
+    optional (attr ? ${name} && ! isMacAddress attr.${name})
+      "Systemd ${group} field `${name}' must be a valid mac address.";
+
+
+  assertValueOneOf = name: values: group: attr:
+    optional (attr ? ${name} && !elem attr.${name} values)
+      "Systemd ${group} field `${name}' cannot have value `${attr.${name}}'.";
+
+  assertHasField = name: group: attr:
+    optional (!(attr ? ${name}))
+      "Systemd ${group} field `${name}' must exist.";
+
+  assertRange = name: min: max: group: attr:
+    optional (attr ? ${name} && !(min <= attr.${name} && max >= attr.${name}))
+      "Systemd ${group} field `${name}' is outside the range [${toString min},${toString max}]";
+
+  assertOnlyFields = fields: group: attr:
+    let badFields = filter (name: ! elem name fields) (attrNames attr); in
+    optional (badFields != [ ])
+      "Systemd ${group} has extra fields [${concatStringsSep " " badFields}].";
+
+  checkUnitConfig = group: checks: v:
+    let errors = concatMap (c: c group v) checks; in
+    if errors == [] then true
+      else builtins.trace (concatStringsSep "\n" errors) false;
+
+  toOption = x:
+    if x == true then "true"
+    else if x == false then "false"
+    else toString x;
+
+  attrsToSection = as:
+    concatStrings (concatLists (mapAttrsToList (name: value:
+      map (x: ''
+          ${name}=${toOption x}
+        '')
+        (if isList value then value else [value]))
+        as));
+
   generateUnits = type: units: upstreamUnits: upstreamWants:
     pkgs.runCommand "${type}-units" { preferLocalBuild = true; } ''
       mkdir -p $out
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 785634cbf66a..57831a5e6ef3 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -1,58 +1,9 @@
 { config, lib }:
 
 with lib;
+with import ./systemd-lib.nix { inherit config lib pkgs; };
 
 let
-
-  boolValues = [true false "yes" "no"];
-
-  assertValueOneOf = name: values: group: attr:
-    optional (attr ? ${name} && !elem attr.${name} values)
-      "Systemd ${group} field `${name}' cannot have value `${attr.${name}}'.";
-
-  assertHasField = name: group: attr:
-    optional (!(attr ? ${name}))
-      "Systemd ${group} field `${name}' must exist.";
-
-  assertOnlyFields = fields: group: attr:
-    let badFields = filter (name: ! elem name fields) (attrNames attr); in
-    optional (badFields != [ ])
-      "Systemd ${group} has extra fields [${concatStringsSep " " badFields}].";
-
-  assertRange = name: min: max: group: attr:
-    optional (attr ? ${name} && !(min <= attr.${name} && max >= attr.${name}))
-      "Systemd ${group} field `${name}' is outside the range [${toString min},${toString max}]";
-
-  digits = map toString (range 0 9);
-
-  isByteFormat = s:
-    let
-      l = reverseList (stringToCharacters s);
-      suffix = head l;
-      nums = tail l;
-    in elem suffix (["K" "M" "G" "T"] ++ digits)
-      && all (num: elem num digits) nums;
-
-  assertByteFormat = name: group: attr:
-    optional (attr ? ${name} && ! isByteFormat attr.${name})
-      "Systemd ${group} field `${name}' must be in byte format [0-9]+[KMGT].";
-
-  hexChars = stringToCharacters "0123456789abcdefABCDEF";
-
-  isMacAddress = s: stringLength s == 17
-    && flip all (splitString ":" s) (bytes:
-      all (byte: elem byte hexChars) (stringToCharacters bytes)
-    );
-
-  assertMacAddress = name: group: attr:
-    optional (attr ? ${name} && ! isMacAddress attr.${name})
-      "Systemd ${group} field `${name}' must be a valid mac address.";
-
-  checkUnitConfig = group: checks: v:
-    let errors = concatMap (c: c group v) checks; in
-    if errors == [] then true
-      else builtins.trace (concatStringsSep "\n" errors) false;
-
   checkService = checkUnitConfig "Service" [
     (assertValueOneOf "Type" [
       "simple" "forking" "oneshot" "dbus" "notify" "idle"
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 78aac7fe96f1..0f210d506881 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -276,19 +276,6 @@ let
     };
   };
 
-  toOption = x:
-    if x == true then "true"
-    else if x == false then "false"
-    else toString x;
-
-  attrsToSection = as:
-    concatStrings (concatLists (mapAttrsToList (name: value:
-      map (x: ''
-          ${name}=${toOption x}
-        '')
-        (if isList value then value else [value]))
-        as));
-
   commonUnitText = def: ''
       [Unit]
       ${attrsToSection def.unitConfig}
@@ -369,11 +356,6 @@ let
         '';
     };
 
-  commonMatchText = def: ''
-      [Match]
-      ${attrsToSection def.matchConfig}
-    '';
-
 in
 
 {

From 85c0aac675784298b55d2463870dd25d6b108ced Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.nixos@leenaa.rs>
Date: Thu, 30 Apr 2015 09:49:45 +0200
Subject: [PATCH 0249/1143] New release of Blink

---
 .../instant-messengers/blink/default.nix      |  4 ++--
 pkgs/top-level/python-packages.nix            | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 00a881c0c676..c4cfc0b67760 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "blink-${version}";
-  version = "1.2.2";
+  version = "1.3.0";
   
   src = fetchurl {
     url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
-    sha256 = "0z7bhfz2775cm7c7s794s5ighp5q7fb6jn8dw025m49vlgqzr78c";
+    sha256 = "388a0ca72ad99087cd87b78a4c449f9c079117920bfc50d7843853b8f942d045";
   };
 
   patches = [ ./pythonpath.patch ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03e120dbea12..c8ad9b0ba885 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -492,11 +492,11 @@ let
 
   application = buildPythonPackage rec {
     name = "python-application-${version}";
-    version = "1.4.1";
+    version = "1.5.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/python-application/${name}.tar.gz";
-      sha256 = "3ae188e9dfd4bd63c9b43aebbf1d9de5df03fb5ac01e72f3bff5b41007570275";
+      sha256 = "9bc00c2c639bf633e2c5e08d4bf1bb5d7edaad6ccdd473692f0362df08f8aafc";
     };
   };
 
@@ -2919,11 +2919,11 @@ let
 
   eventlib = buildPythonPackage rec {
     name = "python-eventlib-${version}";
-    version = "0.2.0";
+    version = "0.2.1";
 
     src = pkgs.fetchurl {
       url = "http://download.ag-projects.com/SipClient/${name}.tar.gz";
-      sha256 = "0fld5lb85ql4a5bgc38sdxi5pgzqljysp1p8f7abxnd6vymh4rgi";
+      sha256 = "25224794420f430946fe46932718b521a6264903fe8c0ed3563dfdb844c623e7";
     };
 
     propagatedBuildInputs = with self; [ greenlet ];
@@ -7058,11 +7058,11 @@ let
 
   msrplib = buildPythonPackage rec {
     name = "python-msrplib-${version}";
-    version = "0.15.0";
+    version = "0.17.0";
 
     src = pkgs.fetchurl {
-      url = "http://download.ag-projects.com/SipClient/${name}.tar.gz";
-      sha256 = "1sm03jcz663xkbhfmrk7rr5l3wlkydn8xs56fvqjxyapx0m5sw6f";
+      url = "http://download.ag-projects.com/MSRP/${name}.tar.gz";
+      sha256 = "fe6ee541fbb4380a5708d08f378724dbc93438ff35c0cd0400e31b070fce73c4";
     };
 
     propagatedBuildInputs = with self; [ eventlib application gnutls ];
@@ -11450,14 +11450,14 @@ let
 
   sipsimple = buildPythonPackage rec {
     name = "sipsimple-${version}";
-    version = "2.3.1";
+    version = "2.4.0";
     disabled = isPy3k;
 
     configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile";
 
     src = pkgs.fetchurl {
       url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz";
-      sha256 = "1n3g1zg3zgdybikdla0qdqvpa06vn1ka2asr61lb8kk6xbvqkljv";
+      sha256 = "f66543c680f22aa3cf86f55373a01a2bb699366a1be5e257c417d018696b6840";
     };
 
     propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ];
@@ -13059,11 +13059,11 @@ let
 
   xcaplib = buildPythonPackage rec {
     name = "python-xcaplib-${version}";
-    version = "1.0.17";
+    version = "1.1.0";
 
     src = pkgs.fetchurl {
-      url = "http://download.ag-projects.com/SipClient/${name}.tar.gz";
-      sha256 = "1bf8n9ghmgxz8kjgnwy4y7ajijy5hi7viabgh0pvzkhz9gfvck86";
+      url = "http://download.ag-projects.com/XCAP/${name}.tar.gz";
+      sha256 = "2f8ea6fe7d005104ef1d854aa87bd8ee85ca242a70cde42f409f8e5557f864b3";
     };
 
     propagatedBuildInputs = with self; [ eventlib application ];

From dd6ddfaf0c31812c344995de8afcd93b4e97f2f4 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 30 Apr 2015 12:08:54 +0200
Subject: [PATCH 0250/1143] dvdisaster: Fix description

---
 pkgs/tools/cd-dvd/dvdisaster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 704c3643f3c8..101d69c0903b 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -41,9 +41,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://dvdisaster.net/;
-    description = "data loss/scratch/aging protection for CD/DVD media";
+    description = "Data loss/scratch/aging protection for CD/DVD media";
     longDescription = ''
-      dvdisaster provides a margin of safety against data loss on CD and
+      Dvdisaster provides a margin of safety against data loss on CD and
       DVD media caused by scratches or aging media. It creates error correction
       data which is used to recover unreadable sectors if the disc becomes
       damaged at a later time.

From 5204bdfba6cbb559043e35d07872d48ad4a03018 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 28 Apr 2015 22:00:56 +0200
Subject: [PATCH 0251/1143] geolite-legacy: support XZ-compressed databases

---
 pkgs/data/misc/geolite-legacy/builder.sh  |  3 ++-
 pkgs/data/misc/geolite-legacy/default.nix | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh
index 1886d144e480..bf8c9812e924 100644
--- a/pkgs/data/misc/geolite-legacy/builder.sh
+++ b/pkgs/data/misc/geolite-legacy/builder.sh
@@ -16,4 +16,5 @@ for var in "${!src@}"; do
 	cp "$src" "$dest"
 done
 
-gunzip -v *.gz
+gzip -dv *.gz
+xz -dv *.xz
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index cf8e7ab47aea..ac8582e2018c 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -3,7 +3,7 @@
 let
   fetchDB = name: sha256: fetchurl {
     inherit sha256;
-    url = "https://geolite.maxmind.com/download/geoip/database/${name}.dat.gz";
+    url = "https://geolite.maxmind.com/download/geoip/database/${name}";
   };
 
   # Annoyingly, these files are updated without a change in URL. This means that
@@ -13,20 +13,21 @@ in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
-  srcGeoIP = fetchDB "GeoLiteCountry/GeoIP"
+  srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
     "15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k";
-  srcGeoIPv6 = fetchDB "GeoIPv6"
+  srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
     "0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i";
-  srcGeoLiteCity = fetchDB "GeoLiteCity"
-    "0lc696axcdgz7xrh9p6ac5aa7nlxfgngwyabjwqiwazz3wcmw05a";
-  srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6"
+  srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
+    "1z40kfjwn90fln7nfnk5pwcn1wl9imw5jz6bcdy8yr552m2n31y7";
+  srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
     "1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv";
-  srcGeoIPASNum = fetchDB "asnum/GeoIPASNum"
+  srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
     "0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms";
-  srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6"
+  srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
     "04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc";
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "GeoLite Legacy IP geolocation databases";
     homepage = https://geolite.maxmind.com/download/geoip;
     license = with licenses; cc-by-sa-30;

From 8ce7626dc728253d93759c2571d403380c0ed28b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 29 Apr 2015 21:30:56 +0200
Subject: [PATCH 0252/1143] fatrace 0.9 -> 0.10

---
 pkgs/os-specific/linux/fatrace/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index c6e52934a774..95c615111ff3 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, python3}:
 
+let version = "0.10"; in
 stdenv.mkDerivation rec {
-  version = "0.9";
   name = "fatrace-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "c028d822ffde68805e5d1f62c4e2d0f4b3d4ae565802cc9468c82b25b92e68cd";
+    url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
+    sha256 = "0q0cv2bsgf76wypz18v2acgj1crcdqhrhlsij3r53glsyv86xyra";
   };
 
   buildInputs = [ python3 ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   makeFlagsArray = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Report system-wide file access events";
     homepage = https://launchpad.net/fatrace/;
     license = with licenses; gpl3Plus;

From dbbc1b337982a5b0ee06ac61e7d642fa89115880 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 29 Apr 2015 21:39:45 +0200
Subject: [PATCH 0253/1143] fatrace: fix power-usage-report

---
 pkgs/os-specific/linux/fatrace/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 95c615111ff3..39c606f3fb54 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python3}:
+{ stdenv, fetchurl, python3, which }:
 
 let version = "0.10"; in
 stdenv.mkDerivation rec {
@@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0q0cv2bsgf76wypz18v2acgj1crcdqhrhlsij3r53glsyv86xyra";
   };
 
-  buildInputs = [ python3 ];
+  buildInputs = [ python3 which ];
+
+  postPatch = ''
+    substituteInPlace power-usage-report \
+      --replace "'which'" "'${which}/bin/which'"
+  '';
 
   makeFlagsArray = "PREFIX=$(out)";
 

From 2a29cf9eaae252a4e15057dc5813c4d8f1d8642f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 29 Apr 2015 21:43:49 +0200
Subject: [PATCH 0254/1143] mcelog 116 -> 117

That was quick.
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 342e29a6d2e0..a5f6242f84fd 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "116"; in
+let version = "117"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0nr3b924ardz9c1skna8finrjq22ac2vihp3zck9jixc9d5mvrmf";
+    sha256 = "0szc5s0bag16ypna336spwb5fagwbxaparn0h78w73wv05kcvwqw";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From 3b611e3a0af0cf9abbc821c22fc450e04dc7a296 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 29 Apr 2015 21:58:17 +0200
Subject: [PATCH 0255/1143] mksh: clarify that it's Free

---
 pkgs/shells/mksh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index ba510e8907a6..e951c24e6a04 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       systems.
     '';
     homepage = "https://www.mirbsd.org/mksh.htm";
-    license = "custom";
+    license = with stdenv.lib.licenses; free;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
   };

From dc5c8ce819313fc4112d0401002f4776cfbb5cc5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 30 Apr 2015 12:50:27 +0200
Subject: [PATCH 0256/1143] eduke32 20130303-3542 -> 20150420-5160

---
 pkgs/games/eduke32/default.nix | 68 +++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index cc47f9482404..e7a420b894a1 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -1,68 +1,70 @@
-{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}:
+{ stdenv, fetchurl, flac, gtk, libvorbis, libvpx, makeDesktopItem, mesa, nasm
+, pkgconfig, SDL2, SDL2_mixer }:
 
-stdenv.mkDerivation rec {
-  name = "eduke32-20130303-3542";
+let
+  date = "20150420";
+  rev = "5160";
+  version = "${date}-${rev}";
+in stdenv.mkDerivation rec {
+  name = "eduke32-${version}";
 
   src = fetchurl {
-    url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2;
-    sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc";
+    url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}/eduke32_src_${version}.tar.xz";
+    sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v";
   };
 
-  buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ]
+  buildInputs = [ flac gtk libvorbis libvpx mesa pkgconfig SDL2 SDL2_mixer ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
 
-  NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
-  NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s";
+  postPatch = ''
+    substituteInPlace build/src/glbuild.c \
+      --replace libGL.so	${mesa}/lib/libGL.so \
+      --replace libGLU.so	${mesa}/lib/libGLU.so
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${SDL2}/include/SDL";
+  NIX_LDFLAGS = "-L${SDL2}/lib";
+
+  makeFlags = "LINKED_GTK=1 SDLCONFIG=${SDL2}/bin/sdl2-config VC_REV=${rev}";
 
   desktopItem = makeDesktopItem {
     name = "eduke32";
     exec = "eduke32-wrapper";
     comment = "Duke Nukem 3D port";
-    desktopName = "EDuke32";
+    desktopName = "Enhanced Duke Nukem 3D";
     genericName = "Duke Nukem 3D port";
     categories = "Application;Game;";
   };
 
-  preConfigure = ''
-    sed -i -e "s|/usr/bin/sdl-config|${SDL}/bin/sdl-config|" build/Makefile.shared
-  '';
-
-  buildPhase = ''
-    make OPTLEVEL=0 USE_LIBPNG=0
-  '';
-
   installPhase = ''
-    # Install binaries
-    mkdir -p $out/bin
-    cp eduke32 mapster32 $out/bin
-
     # Make wrapper script
-    cat > $out/bin/eduke32-wrapper <<EOF
+    cat > eduke32-wrapper <<EOF
     #!/bin/sh
 
-    if [ "$EDUKE32_DATA_DIR" = "" ]
-    then
+    if [ "$EDUKE32_DATA_DIR" = "" ]; then
         EDUKE32_DATA_DIR=/var/lib/games/eduke32
     fi
-    if [ "$EDUKE32_GRP_FILE" = "" ]
-    then
+    if [ "$EDUKE32_GRP_FILE" = "" ]; then
         EDUKE32_GRP_FILE=\$EDUKE32_DATA_DIR/DUKE3D.GRP
     fi
 
     cd \$EDUKE32_DATA_DIR
-    eduke32 -g \$EDUKE32_GRP_FILE
+    exec $out/bin/eduke32 -g \$EDUKE32_GRP_FILE
     EOF
-    chmod 755 $out/bin/eduke32-wrapper
+
+    # Install binaries
+    mkdir -p $out/bin
+    install -Dm755 eduke32{,-wrapper} mapster32 $out/bin
 
     # Install desktop item
-    mkdir -p $out/share/applications
-    cp ${desktopItem}/share/applications/* $out/share/applications
+    cp -rv ${desktopItem}/share $out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "Enhanched port of Duke Nukem 3D for various platforms";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = with licenses; gpl2Plus;
     homepage = http://eduke32.com;
-    maintainers = [ stdenv.lib.maintainers.sander ];
+    maintainers = with maintainers; [ nckx sander ];
   };
 }

From 0f3586e917e4d772f380429b61668690b0ea676e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 30 Apr 2015 10:48:09 -0400
Subject: [PATCH 0257/1143] Add isl-0.14.1

---
 pkgs/development/libraries/isl/0.14.1.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/isl/0.14.1.nix

diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix
new file mode 100644
index 000000000000..dc13bbae9892
--- /dev/null
+++ b/pkgs/development/libraries/isl/0.14.1.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "isl-0.14.1";
+
+  src = fetchurl {
+    url = "http://isl.gforge.inria.fr/${name}.tar.xz";
+    sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8";
+  };
+
+  buildInputs = [ gmp ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.kotnet.org/~skimo/isl/;
+    license = stdenv.lib.licenses.lgpl21;
+    description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab48e4e367aa..a2a12e51924d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1771,6 +1771,7 @@ let
 
   isl = callPackage ../development/libraries/isl { };
   isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { };
+  isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { };
 
   isync = callPackage ../tools/networking/isync { };
 

From 90ebf5b952d4cb7042eb827fb554d379b6427402 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 30 Apr 2015 10:48:35 -0400
Subject: [PATCH 0258/1143] Add gcc-5.1.0

---
 pkgs/development/compilers/gcc/5.1/builder.sh | 255 +++++++++
 .../development/compilers/gcc/5.1/default.nix | 526 ++++++++++++++++++
 .../compilers/gcc/5.1/gfortran-driving.patch  |  20 +
 .../compilers/gcc/5.1/gnat-cflags.patch       |  33 ++
 .../gcc/5.1/java-jvgenmain-link.patch         |  17 +
 .../compilers/gcc/5.1/libstdc++-target.patch  |  32 ++
 .../compilers/gcc/5.1/no-sys-dirs.patch       |  28 +
 pkgs/top-level/all-packages.nix               |  19 +
 8 files changed, 930 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/5.1/builder.sh
 create mode 100644 pkgs/development/compilers/gcc/5.1/default.nix
 create mode 100644 pkgs/development/compilers/gcc/5.1/gfortran-driving.patch
 create mode 100644 pkgs/development/compilers/gcc/5.1/gnat-cflags.patch
 create mode 100644 pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch
 create mode 100644 pkgs/development/compilers/gcc/5.1/libstdc++-target.patch
 create mode 100644 pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch

diff --git a/pkgs/development/compilers/gcc/5.1/builder.sh b/pkgs/development/compilers/gcc/5.1/builder.sh
new file mode 100644
index 000000000000..dd77c67a023e
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5.1/builder.sh
@@ -0,0 +1,255 @@
+source $stdenv/setup
+
+
+export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
+mkdir $NIX_FIXINC_DUMMY
+
+
+if test "$staticCompiler" = "1"; then
+    EXTRA_LDFLAGS="-static"
+else
+    EXTRA_LDFLAGS=""
+fi
+
+# GCC interprets empty paths as ".", which we don't want.
+if test -z "$CPATH"; then unset CPATH; fi
+if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi
+echo "\$CPATH is \`$CPATH'"
+echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'"
+
+if test "$noSysDirs" = "1"; then
+
+    if test -e $NIX_CC/nix-support/orig-libc; then
+
+        # Figure out what extra flags to pass to the gcc compilers
+        # being generated to make sure that they use our glibc.
+        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
+        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
+
+        # Use *real* header files, otherwise a limits.h is generated
+        # that does not include Glibc's limits.h (notably missing
+        # SSIZE_MAX, which breaks the build).
+        export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include
+
+        # The path to the Glibc binaries such as `crti.o'.
+        glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"
+
+    else
+        # Hack: support impure environments.
+        extraFlags="-isystem /usr/include"
+        extraLDFlags="-L/usr/lib64 -L/usr/lib"
+        glibc_libdir="/usr/lib"
+        export NIX_FIXINC_DUMMY=/usr/include
+    fi
+
+    extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags"
+    extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
+
+    # BOOT_CFLAGS defaults to `-g -O2'; since we override it below,
+    # make sure to explictly add them so that files compiled with the
+    # bootstrap compiler are optimized and (optionally) contain
+    # debugging information (info "(gccinstall) Building").
+    if test -n "$dontStrip"; then
+        extraFlags="-O2 -g $extraFlags"
+    else
+        # Don't pass `-g' at all; this saves space while building.
+        extraFlags="-O2 $extraFlags"
+    fi
+
+    EXTRA_FLAGS="$extraFlags"
+    for i in $extraLDFlags; do
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i"
+    done
+
+    if test -n "$targetConfig"; then
+        # Cross-compiling, we need gcc not to read ./specs in order to build
+        # the g++ compiler (after the specs for the cross-gcc are created).
+        # Having LIBRARY_PATH= makes gcc read the specs from ., and the build
+        # breaks. Having this variable comes from the default.nix code to bring
+        # gcj in.
+        unset LIBRARY_PATH
+        unset CPATH
+        if test -z "$crossStageStatic"; then
+            EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include"
+            EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib"
+        fi
+    else
+        if test -z "$NIX_CC_CROSS"; then
+            EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"
+            EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS"
+            EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"
+        else
+            # This the case of cross-building the gcc.
+            # We need special flags for the target, different than those of the build
+            # Assertion:
+            test -e $NIX_CC_CROSS/nix-support/orig-libc
+
+            # Figure out what extra flags to pass to the gcc compilers
+            # being generated to make sure that they use our glibc.
+            extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"
+            extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"
+
+            # Use *real* header files, otherwise a limits.h is generated
+            # that does not include Glibc's limits.h (notably missing
+            # SSIZE_MAX, which breaks the build).
+            NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include
+
+            # The path to the Glibc binaries such as `crti.o'.
+            glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)"
+            glibc_libdir="$glibc_dir/lib"
+            configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include"
+
+            extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags"
+            extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
+
+            EXTRA_TARGET_CFLAGS="$extraFlags"
+            for i in $extraLDFlags; do
+                EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i"
+            done
+        fi
+    fi
+
+    # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
+    # the startfiles.
+    # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx
+    # for the startfiles.
+    makeFlagsArray+=( \
+        NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
+        SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
+        CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+        CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+        CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
+        CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
+        FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
+        LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+        LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \
+        )
+
+    if test -z "$targetConfig"; then
+        makeFlagsArray+=( \
+            BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+            BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
+            )
+    fi
+
+    if test -n "$targetConfig" -a "$crossStageStatic" == 1; then
+        # We don't want the gcc build to assume there will be a libc providing
+        # limits.h in this stagae
+        makeFlagsArray+=( \
+            LIMITS_H_TEST=false \
+            )
+    else
+        makeFlagsArray+=( \
+            LIMITS_H_TEST=true \
+            )
+    fi
+fi
+
+if test -n "$targetConfig"; then
+    # The host strip will destroy some important details of the objects
+    dontStrip=1
+fi
+
+providedPreConfigure="$preConfigure";
+preConfigure() {
+    if test -n "$newlibSrc"; then
+        tar xvf "$newlibSrc" -C ..
+        ln -s ../newlib-*/newlib newlib
+        # Patch to get armvt5el working:
+        sed -i -e 's/ arm)/ arm*)/' newlib/configure.host
+    fi
+
+    # Bug - they packaged zlib
+    if test -d "zlib"; then
+        # This breaks the build without-headers, which should build only
+        # the target libgcc as target libraries.
+        # See 'configure:5370'
+        rm -Rf zlib
+    fi
+
+    if test -f "$NIX_CC/nix-support/orig-libc"; then
+        # Patch the configure script so it finds glibc headers.  It's
+        # important for example in order not to get libssp built,
+        # because its functionality is in glibc already.
+        glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include"
+        sed -i \
+            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
+            gcc/configure
+    fi
+
+    if test -n "$crossMingw" -a -n "$crossStageStatic"; then
+        mkdir -p ../mingw
+        # --with-build-sysroot expects that:
+        cp -R $libcCross/include ../mingw
+        configureFlags="$configureFlags --with-build-sysroot=`pwd`/.."
+    fi
+
+    # Eval the preConfigure script from nix expression.
+    eval "$providedPreConfigure"
+
+    # Perform the build in a different directory.
+    mkdir ../build
+    cd ../build
+    configureScript=../$sourceRoot/configure
+}
+
+
+postConfigure() {
+    # Don't store the configure flags in the resulting executables.
+    sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile
+}
+
+
+preInstall() {
+    # Make ‘lib64’ a symlink to ‘lib’.
+    if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
+        mkdir -p $out/lib
+        ln -s lib $out/lib64
+    fi
+}
+
+
+postInstall() {
+    # Remove precompiled headers for now.  They are very big and
+    # probably not very useful yet.
+    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+
+    # Remove `fixincl' to prevent a retained dependency on the
+    # previous gcc.
+    rm -rf $out/libexec/gcc/*/*/install-tools
+    rm -rf $out/lib/gcc/*/*/install-tools
+
+    # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
+    rm -rf $out/bin/gccbug
+    # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
+    for i in $out/libexec/gcc/*/*/*; do
+        if PREV_RPATH=`patchelf --print-rpath $i`; then
+            patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i
+        fi
+    done
+
+    # Get rid of some "fixed" header files
+    rm -rf $out/lib/gcc/*/*/include/root
+
+    # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
+    for i in $out/bin/*-gcc*; do
+        if cmp -s $out/bin/gcc $i; then
+            ln -sfn gcc $i
+        fi
+    done
+
+    for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
+        if cmp -s $out/bin/g++ $i; then
+            ln -sfn g++ $i
+        fi
+    done
+
+    # Disable RANDMMAP on grsec, which causes segfaults when using
+    # precompiled headers.
+    # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31
+    paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus}
+
+    eval "$postInstallGhdl"
+}
+
+genericBuild
diff --git a/pkgs/development/compilers/gcc/5.1/default.nix b/pkgs/development/compilers/gcc/5.1/default.nix
new file mode 100644
index 000000000000..1c61d57729df
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5.1/default.nix
@@ -0,0 +1,526 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false
+, langObjC ? stdenv.isDarwin
+, langObjCpp ? stdenv.isDarwin
+, langJava ? false
+, langAda ? false
+, langVhdl ? false
+, langGo ? false
+, profiledCompiler ? false
+, staticCompiler ? false
+, enableShared ? true
+, texinfo ? null
+, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, gmp, mpfr, libmpc, gettext, which
+, libelf                      # optional, for link-time optimizations (LTO)
+, isl ? null # optional, for the Graphite optimization framework.
+, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null, pkgconfig ? null
+, gtk ? null, libart_lgpl ? null
+, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
+, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, x11Support ? langJava
+, gnatboot ? null
+, enableMultilib ? false
+, enablePlugin ? true             # whether to support user-supplied plug-ins
+, name ? "gcc"
+, cross ? null
+, binutilsCross ? null
+, libcCross ? null
+, crossStageStatic ? true
+, gnat ? null
+, libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
+, stripped ? true
+, gnused ? null
+}:
+
+assert langJava     -> zip != null && unzip != null
+                       && zlib != null && boehmgc != null
+                       && perl != null;  # for `--enable-java-home'
+assert langAda      -> gnatboot != null;
+assert langVhdl     -> gnat != null;
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "5.1.0";
+
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+
+    enableParallelBuilding = true;
+
+    patches = [ ]
+      ++ optional (cross != null) ./libstdc++-target.patch
+      ++ optional noSysDirs ./no-sys-dirs.patch
+      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
+      # target libraries and tools.
+      ++ optional langAda ./gnat-cflags.patch
+      ++ optional langFortran ./gfortran-driving.patch;
+
+    javaEcj = fetchurl {
+      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+      # `configure' time.
+
+      # XXX: Eventually we might want to take it from upstream.
+      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
+      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
+    };
+
+    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
+    # binary distribution here to allow the whole chain to be bootstrapped.
+    javaAntlr = fetchurl {
+      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
+    };
+
+    xlibs = [
+      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
+      xproto renderproto xextproto inputproto randrproto
+    ];
+
+    javaAwtGtk = langJava && x11Support;
+
+    /* Platform flags */
+    platformFlags = let
+        gccArch = stdenv.platform.gcc.arch or null;
+        gccCpu = stdenv.platform.gcc.cpu or null;
+        gccAbi = stdenv.platform.gcc.abi or null;
+        gccFpu = stdenv.platform.gcc.fpu or null;
+        gccFloat = stdenv.platform.gcc.float or null;
+        gccMode = stdenv.platform.gcc.mode or null;
+        withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+        withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+        withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode;
+
+    /* Cross-gcc settings */
+    crossMingw = cross != null && cross.libc == "msvcrt";
+    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossConfigureFlags = let
+        gccArch = stdenv.cross.gcc.arch or null;
+        gccCpu = stdenv.cross.gcc.cpu or null;
+        gccAbi = stdenv.cross.gcc.abi or null;
+        gccFpu = stdenv.cross.gcc.fpu or null;
+        gccFloat = stdenv.cross.gcc.float or null;
+        gccMode = stdenv.cross.gcc.mode or null;
+        withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+        withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+        withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        "--target=${cross.config}" +
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode +
+        (if crossMingw && crossStageStatic then
+          " --with-headers=${libcCross}/include" +
+          " --with-gcc" +
+          " --with-gnu-as" +
+          " --with-gnu-ld" +
+          " --with-gnu-ld" +
+          " --disable-shared" +
+          " --disable-nls" +
+          " --disable-debug" +
+          " --enable-sjlj-exceptions" +
+          " --enable-threads=win32" +
+          " --disable-win32-registry"
+          else if crossStageStatic then
+          " --disable-libssp --disable-nls" +
+          " --without-headers" +
+          " --disable-threads " +
+          " --disable-libmudflap " +
+          " --disable-libgomp " +
+          " --disable-libquadmath" +
+          " --disable-shared" +
+          " --disable-libatomic " +  # libatomic requires libc
+          " --disable-decimal-float" # libdecnumber requires libc
+          else
+          (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+           else                " --with-headers=${libcCross}/include") +
+          # Ensure that -print-prog-name is able to find the correct programs.
+          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
+            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
+            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+          )) +
+          " --enable-__cxa_atexit" +
+          " --enable-long-long" +
+          (if crossMingw then
+            " --enable-threads=win32" +
+            " --enable-sjlj-exceptions" +
+            " --enable-hash-synchronization" +
+            " --disable-libssp" +
+            " --disable-nls" +
+            " --with-dwarf2" +
+            # I think noone uses shared gcc libs in mingw, so we better do the same.
+            # In any case, mingw32 g++ linking is broken by default with shared libs,
+            # unless adding "-lsupc++" to any linking command. I don't know why.
+            " --disable-shared" +
+            # To keep ABI compatibility with upstream mingw-w64
+            " --enable-fully-dynamic-string"
+            else (if cross.libc == "uclibc" then
+              # In uclibc cases, libgomp needs an additional '-ldl'
+              # and as I don't know how to pass it, I disable libgomp.
+              " --disable-libgomp" else "") +
+            " --enable-threads=posix" +
+            " --enable-nls" +
+            " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
+          );
+    stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
+    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+
+  bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
+
+in
+
+# We need all these X libraries when building AWT with GTK+.
+assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
+
+stdenv.mkDerivation ({
+  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp";
+  };
+
+  inherit patches;
+
+  postPatch =
+    if (stdenv.isGNU
+        || (libcCross != null                  # e.g., building `gcc.crossDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
+        || (crossGNU && libcCross != null))
+    then
+      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
+      # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
+      let
+        libc = if libcCross != null then libcCross else stdenv.glibc;
+        gnu_h = "gcc/config/gnu.h";
+        extraCPPDeps =
+             libc.propagatedBuildInputs
+          ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
+          ++ stdenv.lib.optional (libpthread != null) libpthread;
+        extraCPPSpec =
+          concatStrings (intersperse " "
+                          (map (x: "-I${x}/include") extraCPPDeps));
+        extraLibSpec =
+          if libpthreadCross != null
+          then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+          else "-L${libpthread}/lib";
+      in
+        '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
+
+           echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
+        ''
+    else if cross != null || stdenv.cc.libc != null then
+      # On NixOS, use the right path to the dynamic linker instead of
+      # `/lib/ld*.so'.
+      let
+        libc = if libcCross != null then libcCross else stdenv.cc.libc;
+      in
+        '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
+           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+           do
+             grep -q LIBC_DYNAMIC_LINKER "$header" || continue
+             echo "  fixing \`$header'..."
+             sed -i "$header" \
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
+           done
+        ''
+    else null;
+
+  inherit noSysDirs staticCompiler langJava crossStageStatic
+    libcCross crossMingw;
+
+  nativeBuildInputs = [ texinfo which gettext ]
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig);
+
+  buildInputs = [ gmp mpfr libmpc libelf ]
+    ++ (optional (isl != null) isl)
+    ++ (optional (zlib != null) zlib)
+    ++ (optionals langJava [ boehmgc zip unzip ])
+    ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
+    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals langAda [gnatboot])
+    ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
+    ;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+
+  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+    export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+    export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+    export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+    export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
+  '';
+
+  dontDisableStatic = true;
+
+  configureFlags = "
+    ${if stdenv.isSunOS then
+      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
+      # On Illumos/Solaris GNU as is preferred
+      " --with-gnu-as --without-gnu-ld "
+      else ""}
+    --enable-lto
+    ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
+    ${if enableShared then "" else "--disable-shared"}
+    ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
+    ${optionalString (isl != null) "--with-isl=${isl}"}
+    ${if langJava then
+      "--with-ecj-jar=${javaEcj} " +
+
+      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
+      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
+      "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre "
+      else ""}
+    ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+    ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
+    --with-gmp=${gmp}
+    --with-mpfr=${mpfr}
+    --with-mpc=${libmpc}
+    ${if libelf != null then "--with-libelf=${libelf}" else ""}
+    --disable-libstdcxx-pch
+    --without-included-gettext
+    --with-system-zlib
+    --enable-static
+    --enable-languages=${
+      concatStrings (intersperse ","
+        (  optional langC        "c"
+        ++ optional langCC       "c++"
+        ++ optional langFortran  "fortran"
+        ++ optional langJava     "java"
+        ++ optional langAda      "ada"
+        ++ optional langVhdl     "vhdl"
+        ++ optional langGo       "go"
+        ++ optional langObjC     "objc"
+        ++ optional langObjCpp   "obj-c++"
+        ++ optionals crossDarwin [ "objc" "obj-c++" ]
+        )
+      )
+    }
+    ${if (stdenv ? glibc && cross == null)
+      then " --with-native-system-header-dir=${stdenv.glibc}/include"
+      else ""}
+    ${if langAda then " --enable-libada" else ""}
+    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
+    ${if cross != null then crossConfigureFlags else ""}
+    ${if !bootstrap then "--disable-bootstrap" else ""}
+    ${if cross == null then platformFlags else ""}
+  ";
+
+  targetConfig = if cross != null then cross.config else null;
+
+  buildFlags = if bootstrap then
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap")
+    else "";
+
+  installTargets =
+    if stripped
+    then "install-strip"
+    else "install";
+
+  crossAttrs = let
+    xgccArch = stdenv.cross.gcc.arch or null;
+    xgccCpu = stdenv.cross.gcc.cpu or null;
+    xgccAbi = stdenv.cross.gcc.abi or null;
+    xgccFpu = stdenv.cross.gcc.fpu or null;
+    xgccFloat = stdenv.cross.gcc.float or null;
+    xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
+    xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
+    xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
+    xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
+    xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
+  in {
+    AR = "${stdenv.cross.config}-ar";
+    LD = "${stdenv.cross.config}-ld";
+    CC = "${stdenv.cross.config}-gcc";
+    CXX = "${stdenv.cross.config}-gcc";
+    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
+    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
+    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
+    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
+    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    # If we are making a cross compiler, cross != null
+    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    dontStrip = true;
+    configureFlags = ''
+      ${if enableMultilib then "" else "--disable-multilib"}
+      ${if enableShared then "" else "--disable-shared"}
+      ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
+      ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+      ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
+      --with-gmp=${gmp.crossDrv}
+      --with-mpfr=${mpfr.crossDrv}
+      --disable-libstdcxx-pch
+      --without-included-gettext
+      --with-system-zlib
+      --enable-languages=${
+        concatStrings (intersperse ","
+          (  optional langC        "c"
+          ++ optional langCC       "c++"
+          ++ optional langFortran  "fortran"
+          ++ optional langJava     "java"
+          ++ optional langAda      "ada"
+          ++ optional langVhdl     "vhdl"
+          ++ optional langGo       "go"
+          )
+        )
+      }
+      ${if langAda then " --enable-libada" else ""}
+      --target=${stdenv.cross.config}
+      ${xwithArch}
+      ${xwithCpu}
+      ${xwithAbi}
+      ${xwithFpu}
+      ${xwithFloat}
+    '';
+    buildFlags = "";
+  };
+
+
+  # Needed for the cross compilation to work
+  AR = "ar";
+  LD = "ld";
+  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";
+
+  # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find
+  # the library headers and binaries, regarless of the language being
+  # compiled.
+
+  # Note: When building the Java AWT GTK+ peer, the build system doesn't
+  # honor `--with-gmp' et al., e.g., when building
+  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just
+  # add them to $CPATH and $LIBRARY_PATH in this case.
+  #
+  # Likewise, the LTO code doesn't find zlib.
+
+  CPATH = concatStrings
+            (intersperse ":" (map (x: x + "/include")
+                                  (optionals (zlib != null) [ zlib ]
+                                   ++ optionals langJava [ boehmgc ]
+                                   ++ optionals javaAwtGtk xlibs
+                                   ++ optionals javaAwtGtk [ gmp mpfr ]
+                                   ++ optional (libpthread != null) libpthread
+                                   ++ optional (libpthreadCross != null) libpthreadCross
+
+                                   # On GNU/Hurd glibc refers to Mach & Hurd
+                                   # headers.
+                                   ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )
+                                        libcCross.propagatedBuildInputs)));
+
+  LIBRARY_PATH = concatStrings
+                   (intersperse ":" (map (x: x + "/lib")
+                                         (optionals (zlib != null) [ zlib ]
+                                          ++ optionals langJava [ boehmgc ]
+                                          ++ optionals javaAwtGtk xlibs
+                                          ++ optionals javaAwtGtk [ gmp mpfr ]
+                                          ++ optional (libpthread != null) libpthread)));
+
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
+    else null;
+
+  EXTRA_TARGET_LDFLAGS =
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
+    else null;
+
+  passthru =
+    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+
+  inherit enableParallelBuilding enableMultilib;
+
+  inherit (stdenv) is64bit;
+
+  meta = {
+    homepage = http://gcc.gnu.org/;
+    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    description = "GNU Compiler Collection, version ${version}"
+      + (if stripped then "" else " (with debugging info)");
+
+    longDescription = ''
+      The GNU Compiler Collection includes compiler front ends for C, C++,
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
+      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+
+      GCC development is a part of the GNU Project, aiming to improve the
+      compiler used in the GNU system including the GNU/Linux variant.
+    '';
+
+    maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ];
+
+    # gnatboot is not available out of linux platforms, so we disable the darwin build
+    # for the gnat (ada compiler).
+    platforms =
+      stdenv.lib.platforms.linux ++
+      stdenv.lib.platforms.freebsd ++
+      optionals (langAda == false) stdenv.lib.platforms.darwin;
+  };
+}
+
+// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+  makeFlags = [ "all-gcc" "all-target-libgcc" ];
+  installTargets = "install-gcc install-target-libgcc";
+}
+
+# Strip kills static libs of other archs (hence cross != null)
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+
+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
+)
diff --git a/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch b/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch
new file mode 100644
index 000000000000..70708886b405
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch
@@ -0,0 +1,20 @@
+This patch fixes interaction with Libtool.
+See <http://thread.gmane.org/gmane.comp.gcc.patches/258777>, for details.
+
+--- a/gcc/fortran/gfortranspec.c
++++ b/gcc/fortran/gfortranspec.c
+@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n"));
+     {
+       fprintf (stderr, _("Driving:"));
+       for (i = 0; i < g77_newargc; i++)
++	{
++	  if (g77_new_decoded_options[i].opt_index == OPT_l)
++	    /* Make sure no white space is inserted after `-l'.  */
++	    fprintf (stderr, " -l%s",
++		     g77_new_decoded_options[i].canonical_option[1]);
++	  else
+ 	fprintf (stderr, " %s",
+ 		 g77_new_decoded_options[i].orig_option_with_args_text);
++	}
+       fprintf (stderr, "\n");
+     }
diff --git a/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch b/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch
new file mode 100644
index 000000000000..bf2acf065e9b
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch
@@ -0,0 +1,33 @@
+diff --git a/libada/Makefile.in b/libada/Makefile.in
+index f5057a0..337e0c6 100644
+--- a/libada/Makefile.in
++++ b/libada/Makefile.in
+@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
+ WARN_CFLAGS = @warn_cflags@
+ 
+ TARGET_LIBGCC2_CFLAGS=
+-GNATLIBCFLAGS= -g -O2
++GNATLIBCFLAGS= -g -O2 $(CFLAGS)
+ GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
+ 	-DIN_RTS @have_getipinfo@
+ 
+--- a/gcc/ada/gcc-interface/Makefile.in
++++ b/gcc/ada/gcc-interface/Makefile.in
+@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
+ SOME_ADAFLAGS =-gnata
+ FORCE_DEBUG_ADAFLAGS = -g
+ GNATLIBFLAGS = -gnatpg -nostdinc
+-GNATLIBCFLAGS = -g -O2
++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
+ # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
+ # should be autodetected during the configuration of libada and passed down to
+ # here, but we need something for --disable-libada and hope for the best.
+@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
+ # Link flags used to build gnat tools.  By default we prefer to statically
+ # link with libgcc to avoid a dependency on shared libgcc (which is tricky
+ # to deal with as it may conflict with the libgcc provided by the system).
+-GCC_LINK_FLAGS=-static-libgcc
++GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)
+ 
+ # End of variables for you to override.
+ 
diff --git a/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch
new file mode 100644
index 000000000000..2612e8bfbbbc
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch
@@ -0,0 +1,17 @@
+The `jvgenmain' executable must be linked against `vec.o', among others,
+since it uses its vector API.
+
+--- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
++++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
+@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
+ 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
+ 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
+ 
+-jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
++jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
+ 	rm -f $@
+-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
+ 
+ #
+ # Build hooks:
diff --git a/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch b/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch
new file mode 100644
index 000000000000..fb622b395806
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch
@@ -0,0 +1,32 @@
+Patch to make the target libraries 'configure' scripts find the proper CPP.
+I noticed that building the mingw32 cross compiler.
+Looking at the build script for mingw in archlinux, I think that only nixos
+needs this patch. I don't know why.
+diff --git a/Makefile.in b/Makefile.in
+index 93f66b6..d691917 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
+ 	AR="$(AR_FOR_TARGET)"; export AR; \
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
++	CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
+ RAW_CXX_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \
+ 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+-	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
++	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
++	CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
+ 
+ NORMAL_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \
+-	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
++	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
++	CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
+ 
+ # Where to find GMP
+ HOST_GMPLIBS = @gmplibs@
diff --git a/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch
new file mode 100644
index 000000000000..36df51904acf
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch
@@ -0,0 +1,28 @@
+diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c
+--- gcc-4.8.3-orig/gcc/cppdefault.c	2013-01-10 21:38:27.000000000 +0100
++++ gcc-4.8.3/gcc/cppdefault.c	2014-08-18 16:20:32.893944536 +0200
+@@ -35,6 +35,8 @@
+ # undef CROSS_INCLUDE_DIR
+ #endif
+ 
++#undef LOCAL_INCLUDE_DIR
++
+ const struct default_include cpp_include_defaults[]
+ #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
+diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c
+--- gcc-4.8.3-orig/gcc/gcc.c	2014-03-23 12:30:57.000000000 +0100
++++ gcc-4.8.3/gcc/gcc.c	2014-08-18 13:19:32.689201690 +0200
+@@ -1162,10 +1162,10 @@
+ /* Default prefixes to attach to command names.  */
+ 
+ #ifndef STANDARD_STARTFILE_PREFIX_1
+-#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
++#define STANDARD_STARTFILE_PREFIX_1 ""
+ #endif
+ #ifndef STANDARD_STARTFILE_PREFIX_2
+-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
++#define STANDARD_STARTFILE_PREFIX_2 ""
+ #endif
+ 
+ #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2a12e51924d..43c99b4008c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3618,6 +3618,25 @@ let
       else null;
   }));
 
+  gcc51 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5.1 {
+    inherit noSysDirs;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
+
+    isl = isl_0_14;
+  }));
+
   gfortran = gfortran48;
 
   gfortran48 = wrapCC (gcc48.cc.override {

From 4b0a59b3fe08c884109b8b2d390fd3ff9b2684cf Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Thu, 30 Apr 2015 16:48:57 +0200
Subject: [PATCH 0259/1143] pkgs: added ArangoDB 2.5.2

---
 pkgs/servers/nosql/arangodb/default.nix | 33 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/nosql/arangodb/default.nix

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
new file mode 100644
index 000000000000..847d56b1f0aa
--- /dev/null
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, openssl, zlib, python, gyp, bash, go, readline }:
+
+stdenv.mkDerivation rec {
+  version = "2.5.2";
+  name    = "arangodb-${version}";
+
+  src = fetchgit {
+    url = https://github.com/arangodb/arangodb.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "04l9palmh0jwbylapsss7d1s0h54wb6kng30zqsl3dq9l91ii6s0";
+  };
+
+  buildInputs = [
+    openssl zlib python gyp go readline
+  ];
+
+  configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ];
+
+  patchPhase = ''
+    substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash
+    substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash
+    '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/arangodb/arangodb";
+    description = "A native multi-model database with flexible data models for documents, graphs, and key-values";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.flosse ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab48e4e367aa..889e5a7ff8be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -544,6 +544,10 @@ let
 
   arandr = callPackage ../tools/X11/arandr { };
 
+  arangodb = callPackage ../servers/nosql/arangodb {
+    inherit (pythonPackages) gyp;
+  };
+
   arcanist = callPackage ../development/tools/misc/arcanist {};
 
   arduino = arduino-core.override { withGui = true; };

From c9c972b872288a204361ff2bc991618fab03b240 Mon Sep 17 00:00:00 2001
From: Hendrik Bunke <h.bunke@zbw.eu>
Date: Thu, 30 Apr 2015 17:08:29 +0200
Subject: [PATCH 0260/1143] vimPlugins: vim-nerdtree-tabs, vim-buffergator

---
 pkgs/misc/vim-plugins/default.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 226f9375fd43..60d67b38a44a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -439,6 +439,21 @@ rec {
     };
   };
 
+  vim-buffergator = buildVimPlugin {
+    name = "vim-buffergator-2015-03-31";
+    src = fetchFromGitHub {
+      owner = "jeetsukumaran";
+      repo = "vim-buffergator";
+      rev = "77cfdd127f";
+      sha256 = "11r9845kplwahf2d41whs2lg3bzy0dahs0mvmdbckp7ckq3gd3y4";
+      };
+     meta = with stdenv.lib; {
+      description = "Vim plugin to list, select and switch between buffers";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ hbunke ];
+     };
+  };
+
   vim-jinja = buildVimPlugin {
     name = "vim-jinja-git-2014-06-11";
     src = fetchFromGitHub {
@@ -453,6 +468,21 @@ rec {
     };
   };
 
+  vim-nerdtree-tabs = buildVimPlugin {
+    name = "vim-nerdtree-tabs-2014-09-25";
+    src = fetchFromGitHub {
+      owner = "jistr";
+      repo = "vim-nerdtree-tabs";
+      rev = "0decec122e";
+      sha256 = "0m51vpxq0d3mxy9i18hczsbqsqi7vlzwgjnpryb8gb5wmy999d6l";
+    };
+    meta = with stdenv.lib; {
+      description = "NERDTree and tabs together in Vim, painlessly";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ hbunke ];
+    };
+  };
+
   vimproc = buildVimPlugin {
     name = "vimproc-git-2015-02-23";
     src = fetchgit {

From 66b66e8302ac5f0c2b8f2aabfc87bbb9b6d70603 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 30 Apr 2015 11:10:19 -0500
Subject: [PATCH 0261/1143] openconnect: depend on zlib

---
 pkgs/tools/networking/openconnect.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix
index c523e0004d7f..d53af5c9e40d 100644
--- a/pkgs/tools/networking/openconnect.nix
+++ b/pkgs/tools/networking/openconnect.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2 } :
+{ stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2, zlib } :
 
 stdenv.mkDerivation rec {
   name = "openconnect-5.02";
@@ -22,5 +22,5 @@ stdenv.mkDerivation rec {
     "--without-openssl-version-check"
   ];
 
-  propagatedBuildInputs = [ vpnc openssl libxml2 ];
+  propagatedBuildInputs = [ vpnc openssl libxml2 zlib ];
 }

From bf7ad2d84fc8244a61fd65b69a2dda0640c54df1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 30 Apr 2015 17:05:14 +0200
Subject: [PATCH 0262/1143] meta.description fixups

Mostly scripted substitutions with a couple of subjective enhancements.
---
 .../editors/emacs-modes/rudel/default.nix     |  2 +-
 pkgs/applications/editors/zed/default.nix     |  2 +-
 pkgs/applications/misc/krename/default.nix    |  2 +-
 pkgs/applications/misc/pwsafe/default.nix     |  2 +-
 .../networking/browsers/netsurf/libCSS.nix    |  2 +-
 .../browsers/netsurf/libParserUtils.nix       |  2 +-
 .../networking/browsers/netsurf/libnsbmp.nix  |  2 +-
 .../networking/browsers/netsurf/libnsgif.nix  |  2 +-
 .../browsers/netsurf/libwapcaplet.nix         |  2 +-
 pkgs/applications/office/calligra/default.nix | 11 +++++-
 .../science/logic/yices/default.nix           |  2 +-
 .../git-and-tools/stgit/default.nix           |  2 +-
 pkgs/applications/window-managers/i3/lock.nix |  2 +-
 .../window-managers/i3/status.nix             |  2 +-
 pkgs/data/documentation/zeal/default.nix      |  2 +-
 pkgs/data/fonts/powerline-fonts/default.nix   |  2 +-
 pkgs/desktops/e19/econnman.nix                |  2 +-
 pkgs/desktops/kde-4.14/kdeedu/artikulate.nix  |  2 +-
 .../compilers/elm/elm-compiler.nix            |  2 +-
 pkgs/development/compilers/ghcjs/default.nix  |  2 +-
 pkgs/development/compilers/gwt/2.4.0.nix      |  2 +-
 pkgs/development/compilers/scala/2.10.nix     |  2 +-
 pkgs/development/compilers/scala/2.9.nix      |  2 +-
 pkgs/development/compilers/yap/default.nix    |  2 +-
 .../coq-modules/bedrock/default.nix           |  2 +-
 pkgs/development/coq-modules/fiat/default.nix |  2 +-
 .../development/coq-modules/flocq/default.nix |  2 +-
 pkgs/development/coq-modules/paco/default.nix |  2 +-
 pkgs/development/coq-modules/tlc/default.nix  |  2 +-
 pkgs/development/coq-modules/ynot/default.nix |  2 +-
 pkgs/development/libraries/assimp/default.nix |  2 +-
 pkgs/development/libraries/fcgi/default.nix   |  2 +-
 pkgs/development/libraries/fox/fox-1.6.nix    |  2 +-
 pkgs/development/libraries/giflib/5.0.nix     |  2 +-
 pkgs/development/libraries/giflib/5.1.nix     |  2 +-
 pkgs/development/libraries/lame/default.nix   |  2 +-
 .../libraries/libtomcrypt/default.nix         |  2 +-
 .../libraries/npapi-sdk/default.nix           |  2 +-
 .../libraries/physics/geant4/default.nix      |  4 +--
 .../libraries/physics/geant4/g4py/default.nix |  2 +-
 .../libraries/qmltermwidget/default.nix       |  2 +-
 pkgs/development/libraries/urt/default.nix    |  2 +-
 .../lisp-modules/lisp-packages.nix            |  2 +-
 .../ocaml-modules/gmetadom/default.nix        |  2 +-
 .../ocaml-modules/ocaml-text/default.nix      |  2 +-
 .../ocaml-modules/ulex/0.8/default.nix        |  2 +-
 .../ocaml-modules/ulex/default.nix            |  2 +-
 .../tools/misc/checkbashisms/default.nix      |  2 +-
 .../tools/ocaml/camlidl/default.nix           |  2 +-
 .../tools/parsing/hammer/default.nix          | 16 +++++----
 pkgs/games/super-tux-kart/default.nix         |  2 +-
 pkgs/misc/emulators/cdemu/base.nix            | 10 +++---
 pkgs/os-specific/linux/fusionio/util.nix      |  2 +-
 pkgs/os-specific/linux/hal-flash/default.nix  |  2 +-
 pkgs/servers/mail/exim/default.nix            |  4 +--
 pkgs/servers/nosql/hyperdex/busybee.nix       |  2 +-
 pkgs/servers/nosql/hyperdex/default.nix       |  2 +-
 pkgs/servers/nosql/hyperdex/replicant.nix     |  2 +-
 pkgs/servers/sql/monetdb/default.nix          |  2 +-
 pkgs/tools/backup/store-backup/default.nix    |  2 +-
 .../tools/filesystems/yandex-disk/default.nix |  2 +-
 pkgs/tools/networking/airfield/default.nix    |  2 +-
 pkgs/tools/networking/bwm-ng/default.nix      |  2 +-
 pkgs/tools/security/aide/default.nix          |  2 +-
 pkgs/tools/text/html2text/default.nix         |  2 +-
 pkgs/top-level/python-packages.nix            | 36 +++++++++----------
 66 files changed, 106 insertions(+), 95 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix
index 787f5df6eb04..f830b16da981 100644
--- a/pkgs/applications/editors/emacs-modes/rudel/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation
 
   meta = {
     homepage = "http://rudel.sourceforge.net/";
-    description = "Rudel is a collaborative editing environment for GNU Emacs";
+    description = "A collaborative editing environment for GNU Emacs";
     license = "GPL";
   };
 }
diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix
index e46cb66de56a..0d4b9fd1dab5 100644
--- a/pkgs/applications/editors/zed/default.nix
+++ b/pkgs/applications/editors/zed/default.nix
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Zed is a fully offline-capable, open source, keyboard-focused, text and code editor for power users";
+    description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users";
     license = stdenv.lib.licenses.mit;
     homepage = http://zedapp.org/;
     maintainers = [ stdenv.lib.maintainers.matejc ];
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 75d8e5ecb89b..ff98bb5186a7 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.krename.net;
-    description = "KRename is a powerful batch renamer for KDE";
+    description = "A powerful batch renamer for KDE";
     inherit (kdelibs.meta) platforms;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index a1538c69932e..3faf127d88db 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Password Safe is a password database utility";
+    description = "A password database utility";
 
     longDescription = ''
       Password Safe is a password database utility. Like many other
diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
index ede053aeca3f..99192fda113a 100644
--- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig libParserUtils libwapcaplet];
 
   meta = { 
-    description = "libCSS is a CSS parser and selection engine, written in C"; # used by netsurf
+    description = "A CSS parser and selection engine, written in C"; # used by netsurf
     homepage = http://www.netsurf-browser.org/projects/libcss/;
     license = stdenv.lib.licenses.mit;
     maintainers = [args.lib.maintainers.marcweber];
diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
index 32bede76e432..3c2b7693be7f 100644
--- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig];
 
   meta = { 
-    description = "LibParserUtils is a library for building efficient parsers, written in C";
+    description = "A library for building efficient parsers, written in C";
     homepage = http://www.netsurf-browser.org/projects/libparserutils/;
     license = stdenv.lib.licenses.mit;
     maintainers = [args.lib.maintainers.marcweber];
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
index d370002543ce..083850bb5450 100644
--- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [];
 
   meta = { 
-    description = "Libnsbmp is a decoding library for BMP and ICO image file formats"; # used by netsurf
+    description = "A decoding library for BMP and ICO image file formats"; # used by netsurf
     homepage = http://www.netsurf-browser.org/projects/libnsbmp/;
     license = stdenv.lib.licenses.mit;
     maintainers = [args.lib.maintainers.marcweber];
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
index a4502d2354de..5e2acb4f313f 100644
--- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [];
 
   meta = {
-    description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf
+    description = "A decoding library for gif image file formats"; # used by netsurf
     homepage = http://www.netsurf-browser.org/projects/libnsgif/;
     license = stdenv.lib.licenses.mit;
     maintainers = [args.lib.maintainers.marcweber];
diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
index 5aa15d7b80d0..a4cd09d1d860 100644
--- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildInputs = [];
 
   meta = { 
-    description = "LibWapcaplet is a string internment library, written in C";
+    description = "A string internment library, written in C";
     homepage = http://www.netsurf-browser.org/projects/libwapcaplet/;
     license = stdenv.lib.licenses.mit;
     maintainers = [args.lib.maintainers.marcweber];
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 00f27bfc93c8..0b28d13e4e55 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -32,7 +32,16 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
   meta = {
-    description = "Calligra Suite is a set of applications written to help you to accomplish your work. Calligra includes efficient and capable office components: Words for text processing,  Sheets for computations, Stage for presentations, Plan for planning, Flow for flowcharts, Kexi for database creation, Krita for painting and raster drawing, and Karbon for vector graphics.";
+    description = "A suite of productivity applications";
+    longDescription = ''
+      Calligra Suite is a set of applications written to help
+      you to accomplish your work. Calligra includes efficient
+      and capable office components: Words for text processing,
+      Sheets for computations, Stage for presentations, Plan for
+      planning, Flow for flowcharts, Kexi for database creation,
+      Krita for painting and raster drawing, and Karbon for
+      vector graphics.
+    '';
     homepage = http://calligra.org;
     maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
     inherit (kdelibs.meta) platforms;
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index e181ecfd0e11..4e3b9b2a76b1 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Yices is a high-performance theorem prover and SMT solver";
+    description = "A high-performance theorem prover and SMT solver";
     homepage    = "http://yices.csl.sri.com";
     license     = stdenv.lib.licenses.unfreeRedistributable;
     platforms   = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index d4b74390c4cc..f6966f92eb2f 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://procode.org/stgit/";
-    description = "StGit is a patch manager implemented on top of Git";
+    description = "A patch manager implemented on top of Git";
     license = "GPL";
 
     maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index b9d5ac168b25..91fff3335ec2 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "i3lock is a simple screen locker like slock";
+    description = "A simple screen locker like slock";
     homepage = http://i3wm.org/i3lock/;
     maintainers = with maintainers; [ garbas malyn ];
     license = licenses.bsd3;
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 99562ebd6624..97b200e340e2 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   installFlags = "PREFIX=\${out}";
 
   meta = {
-    description = "i3 is a tiling window manager";
+    description = "A tiling window manager";
     homepage = http://i3wm.org;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 622171b33e35..c495ac0a9293 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "Zeal is a simple offline API documentation browser";
+    description = "A simple offline API documentation browser";
     longDescription = ''
       Zeal is a simple offline API documentation browser inspired by Dash (OS X
       app), available for Linux and Windows.
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 0d3d9c104d46..2f528a619e72 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/powerline/fonts;
-    description = "Patched fonts for Powerline users.";
+    description = "Patched fonts for Powerline users";
     longDescription = ''
       Pre-patched and adjusted fonts for usage with the Powerline plugin.
     '';
diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix
index 8eaebaf0af38..08d7a8c3e735 100644
--- a/pkgs/desktops/e19/econnman.nix
+++ b/pkgs/desktops/e19/econnman.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Econnman is a user interface for the connman network connection manager";
+    description = "A user interface for the connman network connection manager";
     homepage = http://enlightenment.org/;
     maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
index b1828766f220..8674a774443f 100644
--- a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
@@ -3,6 +3,6 @@ kde {
   buildInputs = [ kdelibs qt_gstreamer1 ];
 
   meta = {
-    description = "Artikulate is a pronunciation learning program for KDE.";
+    description = "A pronunciation learning program for KDE";
   };
 }
diff --git a/pkgs/development/compilers/elm/elm-compiler.nix b/pkgs/development/compilers/elm/elm-compiler.nix
index 87a0b660d2ad..9cf8eda2d9a3 100644
--- a/pkgs/development/compilers/elm/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/elm-compiler.nix
@@ -27,7 +27,7 @@ cabal.mkDerivation (self: {
   ];
   meta = {
     homepage = "http://elm-lang.org";
-    description = "Values to help with elm-package, elm-make, and elm-lang.org.";
+    description = "Values to help with elm-package, elm-make, and elm-lang.org";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 8206bb19e4fa..54604f548fa7 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -122,7 +122,7 @@ in mkDerivation (rec {
   };
 
   homepage = "https://github.com/ghcjs/ghcjs";
-  description = "GHCJS is a Haskell to JavaScript compiler that uses the GHC API";
+  description = "A Haskell to JavaScript compiler that uses the GHC API";
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
   maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix
index f0dc9378c4f0..588861ee42de 100644
--- a/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/pkgs/development/compilers/gwt/2.4.0.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://code.google.com/webtoolkit/;
-    description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications";
+    description = "A development toolkit for building and optimizing complex browser-based applications";
   };
 }
diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
index b518a9a0e0ec..ab13e0ba7dc3 100644
--- a/pkgs/development/compilers/scala/2.10.nix
+++ b/pkgs/development/compilers/scala/2.10.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Scala is a general purpose programming language";
+    description = "A general purpose programming language";
     longDescription = ''
       Scala is a general purpose programming language designed to express
       common programming patterns in a concise, elegant, and type-safe way.
diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix
index de5db1eff996..c98e2e75c171 100644
--- a/pkgs/development/compilers/scala/2.9.nix
+++ b/pkgs/development/compilers/scala/2.9.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Scala is a general purpose programming language";
+    description = "A general purpose programming language";
     longDescription = ''
       Scala is a general purpose programming language designed to express
       common programming patterns in a concise, elegant, and type-safe way.
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index f9b587c05049..2482f2ac1316 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
-    description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";
+    description = "A ISO-compatible high-performance Prolog compiler";
     license = stdenv.lib.licenses.artistic2;
 
     maintainers = [ stdenv.lib.maintainers.simons ];
diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix
index 478f74058bdf..92a3d16963b6 100644
--- a/pkgs/development/coq-modules/bedrock/default.nix
+++ b/pkgs/development/coq-modules/bedrock/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://plv.csail.mit.edu/bedrock/;
-    description = "Bedrock is a library that turns Coq into a tool much like classical verification systems";
+    description = "A library that turns Coq into a tool much like classical verification systems";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
   };
diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix
index 9f020de15345..92b69319e0bc 100644
--- a/pkgs/development/coq-modules/fiat/default.nix
+++ b/pkgs/development/coq-modules/fiat/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://plv.csail.mit.edu/fiat/;
-    description = "Fiat is a library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications";
+    description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
   };
diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index 89555c2e13da..05267d6bf6c2 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://flocq.gforge.inria.fr/;
-    description = "Flocq (Floats for Coq) is a floating-point formalization for the Coq system";
+    description = "A floating-point formalization for the Coq system";
     license = licenses.lgpl3;
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix
index c885d14aa3f2..98d447d21d38 100644
--- a/pkgs/development/coq-modules/paco/default.nix
+++ b/pkgs/development/coq-modules/paco/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://plv.mpi-sws.org/paco/;
-    description = "Paco is a Coq library implementing parameterized coinduction";
+    description = "A Coq library implementing parameterized coinduction";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
   };
diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix
index e47ffbdd4562..b98ff613f9d9 100644
--- a/pkgs/development/coq-modules/tlc/default.nix
+++ b/pkgs/development/coq-modules/tlc/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://www.chargueraud.org/softs/tlc/;
-    description = "TLC is a general purpose Coq library that provides an alternative to Coq's standard library";
+    description = "A general purpose Coq library that provides an alternative to Coq's standard library";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
   };
diff --git a/pkgs/development/coq-modules/ynot/default.nix b/pkgs/development/coq-modules/ynot/default.nix
index 555945068b1a..d83e2c5c7909 100644
--- a/pkgs/development/coq-modules/ynot/default.nix
+++ b/pkgs/development/coq-modules/ynot/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://ynot.cs.harvard.edu/;
-    description = "Ynot is a library for writing and verifying imperative programs";
+    description = "A library for writing and verifying imperative programs";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
   };
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 229db910ffd2..70447d9f8853 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildInputs = [ unzip cmake boost ];
 
   meta = with stdenv.lib; {
-    description = "Open Asset Import Library is a library to import various 3D model formats";
+    description = "A library to import various 3D model formats";
     homepage = http://assimp.sourceforge.net/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ emery ];
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index f75c21170840..6808ea52adff 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   postInstall = "ln -s . $out/include/fastcgi";
 
   meta = with stdenv.lib; {
-    description = "FastCGI  is a language independent, scalable, open extension to CG";
+    description = "A language independent, scalable, open extension to CG";
     homepage = http://www.fastcgi.com/;
     license = "FastCGI see LICENSE.TERMS";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 604fe3c2fdf0..e966388b2ad9 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     branch = "1.6";
-    description = "FOX is a C++ based class library for building Graphical User Interfaces";
+    description = "A C++ based class library for building Graphical User Interfaces";
     longDescription = ''
         FOX stands for Free Objects for X.
         It is a C++ based class library for building Graphical User Interfaces.
diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix
index 49e3fc40ba66..95038284cd60 100644
--- a/pkgs/development/libraries/giflib/5.0.nix
+++ b/pkgs/development/libraries/giflib/5.0.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
   meta = {
-    description = "giflib is a library for reading and writing gif images";
+    description = "A library for reading and writing gif images";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix
index dcd52fc93f46..0bccb857d350 100644
--- a/pkgs/development/libraries/giflib/5.1.nix
+++ b/pkgs/development/libraries/giflib/5.1.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
   meta = {
-    description = "giflib is a library for reading and writing gif images";
+    description = "A library for reading and writing gif images";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index abf05f4c1385..562e292791ab 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "LAME is a high quality MPEG Audio Layer III (MP3) encoder";
+    description = "A high quality MPEG Audio Layer III (MP3) encoder";
     homepage    = http://lame.sourceforge.net;
     license     = licenses.lgpl2;
     maintainers = with maintainers; [ codyopel ];
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index 4a3196e44b88..e960f5ef57f3 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://libtom.org/?page=features&newsitems=5&whatfile=crypt";
-    description = "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit";
+    description = "A fairly comprehensive, modular and portable cryptographic toolkit";
   };
 }
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix
index 57b1b3af2d1c..c2799d039cc1 100644
--- a/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/pkgs/development/libraries/npapi-sdk/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    description = "NPAPI-SDK is a bundle of NPAPI headers by Mozilla";
+    description = "A bundle of NPAPI headers by Mozilla";
 
     homepage = https://code.google.com/p/npapi-sdk/;
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 1e1fc7ea3b8f..872576d9fb02 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -92,7 +92,7 @@ let
       '';
 
       meta = {
-        description = "A toolkit for the simulation of the passage of particles through matter.";
+        description = "A toolkit for the simulation of the passage of particles through matter";
         longDescription = ''
           Geant4 is a toolkit for the simulation of the passage of particles through matter.
           Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
@@ -129,7 +129,7 @@ let
       '';
 
       meta = {
-        description = "Data files for the Geant4 toolkit.";
+        description = "Data files for the Geant4 toolkit";
         homepage = http://www.geant4.org;
         license = stdenv.lib.licenses.g4sl;
         maintainers = [ ];
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index f90b2e6c4aee..e023b1220910 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -45,7 +45,7 @@ let
       '';
 
       meta = {
-        description = "Python bindings and utilities for Geant4.";
+        description = "Python bindings and utilities for Geant4";
         longDescription = ''
           Geant4 is a toolkit for the simulation of the passage of particles through matter.      
           Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index d011114bfd20..9078796fee62 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "This project is a QML port of qtermwidget";
+    description = "A QML port of qtermwidget";
     homepage = "https://github.com/Swordifish90/qmltermwidget";
     license = with stdenv.lib.licenses; [ gpl2 ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/urt/default.nix b/pkgs/development/libraries/urt/default.nix
index 8570af2b2834..090ca28d7c45 100644
--- a/pkgs/development/libraries/urt/default.nix
+++ b/pkgs/development/libraries/urt/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.cs.utah.edu/gdc/projects/urt/;
-    description = "The Utah Raster Toolkit is a library for dealing with raster images";
+    description = "A library for dealing with raster images";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index d7bd2348244e..7d4c88e5c9e0 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -98,7 +98,7 @@ let lispPackages = rec {
   clx-truetype = buildLispPackage rec {
     baseName = "clx-truetype";
     version = "git-20141112";
-    description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension";
+    description = "A pure Common Lisp solution for antialiased TrueType font rendering using CLX and the XRender extension";
     deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf];
     # Source type: git
     src = pkgs.fetchgit {
diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix
index f1ec69143b07..f0a9387a537e 100644
--- a/pkgs/development/ocaml-modules/gmetadom/default.nix
+++ b/pkgs/development/ocaml-modules/gmetadom/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://gmetadom.sourceforge.net/;
-    description = "GMetaDOM is a collection of librares, each library providing a DOM implementation";
+    description = "A collection of librares, each library providing a DOM implementation";
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
   };
diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
index 44b30b368b32..c82785e4aa94 100644
--- a/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://ocaml-text.forge.ocamlcore.org/";
-    description = "OCaml-Text is a library for dealing with ``text'', i.e. sequence of unicode characters, in a convenient way. ";
+    description = "A library for convenient text manipulation";
     license = stdenv.lib.licenses.bsd3;
     platforms = ocaml.meta.platforms;
   };
diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix
index 77ffa7528981..eddc71aeace2 100644
--- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.cduce.org/download.html;
-    description = "ulex is a lexer generator for Unicode and OCaml";
+    description = "A lexer generator for Unicode and OCaml";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
   };
diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix
index 123641ba1ac0..28950078f39e 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.cduce.org/download.html;
-    description = "ulex is a lexer generator for Unicode and OCaml";
+    description = "A lexer generator for Unicode and OCaml";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 9c48227c9a83..1585b126961b 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://sourceforge.net/projects/checkbaskisms/;
-    description = "Performs basic checks on shell scripts for the presence of non portable syntax";
+    description = "Check shell scripts for non-portable syntax";
     license = stdenv.lib.licenses.gpl2;
   };
 
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index dee605ced570..7a980c69c183 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "CamlIDL is a stub code generator and COM binding for Objective Caml";
+    description = "A stub code generator and COM binding for Objective Caml";
     homepage = "${webpage}";
     license = "LGPL";
     maintainers = [ stdenv.lib.maintainers.roconnor ];
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix
index f04d773c374b..5392f14926b8 100644
--- a/pkgs/development/tools/parsing/hammer/default.nix
+++ b/pkgs/development/tools/parsing/hammer/default.nix
@@ -15,13 +15,15 @@ stdenv.mkDerivation rec {
   installPhase = "scons prefix=$out install";
 
   meta = with stdenv.lib; {
-    description = "Hammer is a parsing library";
-    longDescription = "Hammer is a parsing library. Like many modern parsing libraries,
-	       it provides a parser combinator interface for writing grammars
-	       as inline domain-specific languages, but Hammer also provides a
-	       variety of parsing backends. It's also bit-oriented rather than
-	       character-oriented, making it ideal for parsing binary data such
-	       as images, network packets, audio, and executables.";
+    description = "A bit-oriented parser combinator library";
+    longDescription = ''
+      Hammer is a parsing library. Like many modern parsing libraries,
+      it provides a parser combinator interface for writing grammars
+      as inline domain-specific languages, but Hammer also provides a
+      variety of parsing backends. It's also bit-oriented rather than
+      character-oriented, making it ideal for parsing binary data such
+      as images, network packets, audio, and executables.
+    '';
     homepage = https://github.com/UpstandingHackers/hammer;
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index db42572de5eb..f3574d137d39 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "SuperTuxKart is a Free 3D kart racing game";
+    description = "A Free 3D kart racing game";
     longDescription = ''
       SuperTuxKart is a Free 3D kart racing game, with many tracks,
       characters and items for you to try, similar in spirit to Mario
diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix
index 58727f10ef19..d7c91169ed3d 100644
--- a/pkgs/misc/emulators/cdemu/base.nix
+++ b/pkgs/misc/emulators/cdemu/base.nix
@@ -16,8 +16,8 @@ in stdenv.mkDerivation ({
   configurePhase = ''
     cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON
   '';
-  meta = {
-    description = "A Software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system";
+  meta = with stdenv.lib; {
+    description = "A suite of tools for emulating optical drives and discs";
     longDescription = ''
       CDEmu consists of:
 
@@ -29,9 +29,9 @@ in stdenv.mkDerivation ({
 
       Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
     '';
-    homepage = "http://cdemu.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = http://cdemu.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
     maintainers = [ "Rok Mandeljc <mrok AT users DOT sourceforge DOT net>" ];
   };
 } // drvParams)
diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix
index 16f1ef73dba5..e2f8d423a61d 100644
--- a/pkgs/os-specific/linux/fusionio/util.nix
+++ b/pkgs/os-specific/linux/fusionio/util.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://fusionio.com;
-    description = "Fusionio command line utilities.";
+    description = "Fusionio command line utilities";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     broken = stdenv.system != "x86_64-linux";
diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix
index 1ac67f199172..f61318e1b6bb 100644
--- a/pkgs/os-specific/linux/hal-flash/default.nix
+++ b/pkgs/os-specific/linux/hal-flash/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/cshorler/hal-flash;
-    description = "libhal stub library to satisfy the Flash Player DRM requirements.";
+    description = "libhal stub library to satisfy the Flash Player DRM requirements";
     longDescription =
       ''
         Stub library based loosely upon libhal.[ch] from the hal-0.5.14
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 3dd0463b604f..856d4f61c54d 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://exim.org/";
-    description = "A mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems";
+    homepage = http://exim.org/;
+    description = "A mail transfer agent (MTA)";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.tv ];
diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix
index 19482db6f5a6..9fdbbf064b05 100644
--- a/pkgs/servers/nosql/hyperdex/busybee.nix
+++ b/pkgs/servers/nosql/hyperdex/busybee.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   preConfigure = "autoreconf -i";
 
   meta = with stdenv.lib; {
-    description = "BusyBee is a high-performance messaging layer.";
+    description = "A high-performance messaging layer";
     homepage = https://github.com/rescrv/busybee;
     license = licenses.bsd3;
   };
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix
index 44cc0752088a..7ed3661b87ff 100644
--- a/pkgs/servers/nosql/hyperdex/default.nix
+++ b/pkgs/servers/nosql/hyperdex/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   preConfigure = "autoreconf -fi";
 
   meta = with stdenv.lib; {
-    description = "HyperDex is a scalable, searchable key-value store";
+    description = "A scalable, searchable key-value store";
     homepage = http://hyperdex.org;
     license = licenses.bsd3;
   };
diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix
index c064aa419cde..69146b586723 100644
--- a/pkgs/servers/nosql/hyperdex/replicant.nix
+++ b/pkgs/servers/nosql/hyperdex/replicant.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   preConfigure = "autoreconf -i";
   
   meta = with stdenv.lib; {
-    description = "A system for maintaining replicated state machines.";
+    description = "A system for maintaining replicated state machines";
     homepage = https://github.com/rescrv/Replicant;
     license = licenses.bsd3;
   };
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 2293e2ab3161..ebc0cffb3aa2 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -34,7 +34,7 @@ composableDerivation.composableDerivation {} {
   '';
 
   meta = { 
-    description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
+    description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
     homepage = http://monetdb.cwi.nl/;
     license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html 
   };
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index c986adeafdcc..84351e19210f 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Storebackup is a backup suite that stores files on other disks";
+    description = "A backup suite that stores files on other disks";
     homepage = http://savannah.nongnu.org/projects/storebackup;
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index eb308f9de4ff..a64b7f550033 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://help.yandex.com/disk/cli-clients.xml;
-    description = "Yandex.Disk is a free cloud file storage service";
+    description = "A free cloud file storage service";
     maintainers = with stdenv.lib.maintainers; [smironov];
     platforms = ["i686-linux" "x86_64-linux"];
     license = stdenv.lib.licenses.unfree;
diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix
index 38c802f3c08f..aad3b769fe28 100644
--- a/pkgs/tools/networking/airfield/default.nix
+++ b/pkgs/tools/networking/airfield/default.nix
@@ -29,7 +29,7 @@ in nodePackages.buildNodePackage rec {
   passthru.names = ["Airfield"];
 
   meta = {
-    description = "Airfield is a web-interface for hipache-proxy";
+    description = "A web-interface for hipache-proxy";
     license = licenses.mit;
     homepage = https://github.com/emblica/airfield;
     maintainers = with maintainers; [offline];
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index c7376ad47b42..62dea1e6cd4f 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses ];
 
   meta = with stdenv.lib; {
-    description = "Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor";
+    description = "A small and simple console-based live network and disk io bandwidth monitor";
     homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix
index c1b6fe197a15..d190dff842ba 100644
--- a/pkgs/tools/security/aide/default.nix
+++ b/pkgs/tools/security/aide/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "http://aide.sourceforge.net/";
-    description = "Advanced Intrusion Detection Environment (AIDE) is a file and directory integrity checker";
+    description = "A file and directory integrity checker";
     license = licenses.free;
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix
index 8fd0bea2254c..4f2eeb4be205 100644
--- a/pkgs/tools/text/html2text/default.nix
+++ b/pkgs/tools/text/html2text/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "A command line utility, written in C++, that converts HTML documents into plain text";
+    description = "Convert HTML to plain text";
     homepage = http://www.mbayer.de/html2text/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03e120dbea12..9a490b4a56a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -533,7 +533,7 @@ let
     };
 
     meta = with pkgs.stdenv.lib; {
-      description = "Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed";
+      description = "A Python library that lets you schedule your Python code to be executed";
       homepage = http://pypi.python.org/pypi/APScheduler/;
       license = licenses.mit;
     };
@@ -776,7 +776,7 @@ let
     buildInputs = [ pkgs.lzma ];
 
     meta = {
-      describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files.";
+      describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files";
       homepage = https://github.com/peterjc/backports.lzma;
       license = stdenv.lib.licenses.bsd3;
     };
@@ -914,7 +914,7 @@ let
     };
 
     meta = {
-      description = "CalDAVCLientLibrary is a Python library and tool for CalDAV";
+      description = "A Python library and tool for CalDAV";
 
       longDescription = ''
         CalDAVCLientLibrary is a Python library and tool for CalDAV.
@@ -1687,7 +1687,7 @@ let
     };
 
     meta = with stdenv.lib; {
-      description = "This module implements a very fast JSON encoder/decoder for Python.";
+      description = "A very fast JSON encoder/decoder for Python";
       homepage    = "http://ag-projects.com/";
       license     = licenses.lgpl2;
       platforms   = platforms.all;
@@ -2929,7 +2929,7 @@ let
     propagatedBuildInputs = with self; [ greenlet ];
 
     meta = with stdenv.lib; {
-      description = "Eventlib bindings for python.";
+      description = "Eventlib bindings for python";
       homepage    = "http://ag-projects.com/";
       license     = licenses.lgpl2;
       platforms   = platforms.all;
@@ -4684,7 +4684,7 @@ let
     buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ];
 
     meta = with stdenv.lib; {
-      description = "Simple Python implementation of the Git file formats and protocols.";
+      description = "Simple Python implementation of the Git file formats and protocols";
       homepage = http://samba.org/~jelmer/dulwich/;
       license = licenses.gpl2Plus;
       maintainers = [ maintainers.koral ];
@@ -4704,7 +4704,7 @@ let
     propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ];
 
     meta = with stdenv.lib; {
-      description = "Push and pull from a Git server using Mercurial.";
+      description = "Push and pull from a Git server using Mercurial";
       homepage = http://hg-git.github.com/;
       maintainers = [ maintainers.koral ];
     };
@@ -6526,7 +6526,7 @@ let
     #'';
 
     meta = {
-      description = "python-magic is a python interface to the libmagic file type identification library";
+      description = "A python interface to the libmagic file type identification library";
       homepage = https://github.com/ahupp/python-magic;
     };
   };
@@ -9265,7 +9265,7 @@ let
 
     meta = {
       homepage = "https://launchpad.net/pygpgme";
-      description = "A Python wrapper for the GPGME library.";
+      description = "A Python wrapper for the GPGME library";
       license = licenses.lgpl21;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
@@ -9417,7 +9417,7 @@ let
 
     meta = with stdenv.lib; {
       description = "JSON Web Token implementation in Python";
-      longDescription = "A Python implementation of JSON Web Token draft 01.";
+      longDescription = "A Python implementation of JSON Web Token draft 01";
       homepage = https://github.com/progrium/pyjwt;
       downloadPage = https://github.com/progrium/pyjwt/releases;
       license = licenses.mit;
@@ -9505,7 +9505,7 @@ let
 
     meta = {
       homepage = http://pyparsing.wikispaces.com/;
-      description = "The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions.";
+      description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
     };
   };
 
@@ -11079,7 +11079,7 @@ let
     };
 
     meta = {
-      description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python";
+      description = "A simple, fast, extensible JSON encoder/decoder for Python";
 
       longDescription = ''
         simplejson is compatible with Python 2.4 and later with no
@@ -14350,7 +14350,7 @@ let
     LD_LIBRARY_PATH = "${pkgs.cairo}/lib";
 
     meta = {
-      description = "Graphite-web, without the interface. Just the rendering HTTP API.";
+      description = "Graphite-web, without the interface. Just the rendering HTTP API";
       homepage = https://github.com/brutasse/graphite-api;
       license = licenses.asl20;
     };
@@ -14603,7 +14603,7 @@ let
     buildInputs = with self; [ requests gevent ];
 
     meta = {
-      description = "GRequests allows you to use Requests with Gevent to make asynchronous HTTP Requests easily.";
+      description = "Asynchronous HTTP requests";
       homepage = https://github.com/kennethreitz/grequests;
       license = "bsd";
       maintainers = [ stdenv.lib.maintainers.matejc ];
@@ -14714,7 +14714,7 @@ let
     '';
     buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ];
     meta = {
-      description = "Python bindings for EFL and Elementary.";
+      description = "Python bindings for EFL and Elementary";
       homepage = http://enlightenment.org/;
       maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ];
       platforms = stdenv.lib.platforms.linux;
@@ -14995,7 +14995,7 @@ let
     };
 
     meta = {
-      description = "Thumbor is a smart imaging service. It enables on-demand crop, resizing and flipping of images.";
+      description = "A smart imaging service";
       homepage = https://github.com/globocom/thumbor/wiki;
       license = licenses.mit;
     };
@@ -15144,7 +15144,7 @@ let
 
     meta = {
       homepage = "https://github.com/erikrose/parsimonious";
-      description = "Fast arbitrary-lookahead packrat parser written in pure Python.";
+      description = "Fast arbitrary-lookahead packrat parser written in pure Python";
       license = licenses.mit;
     };
   };
@@ -15162,7 +15162,7 @@ let
 
     meta = {
       homepage = "https://networkx.github.io/";
-      description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks.";
+      description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks";
       license = licenses.bsd3;
     };
   };

From 33984cfeeea43a738ea0a09924d246edffdd8047 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 30 Apr 2015 16:44:45 +0000
Subject: [PATCH 0263/1143] Add logentries agent 1.4.13

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a490b4a56a2..59196a23a162 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6336,6 +6336,26 @@ let
   };
 
 
+  le = buildPythonPackage rec {
+    name = "le-${version}";
+    version = "1.4.13";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "logentries";
+      repo = "le";
+      rev = "v${version}";
+      sha256 = "12l6fqavykjinq286i9pgbbbrv5lq2mmiji91g0m05lfdx9pg4y1";
+    };
+
+    propagatedBuildInputs = with self; [ simplejson ];
+
+    meta = {
+      homepage = "https://github.com/logentries/le";
+      description = "Logentries agent";
+    };
+  };
+
+
   libcloud = buildPythonPackage (rec {
     name = "libcloud-0.14.1";
 

From e37dbea9423cc65f6edae362fb7043f50cf27373 Mon Sep 17 00:00:00 2001
From: Bram Duvigneau <bram@bramd.nl>
Date: Fri, 1 May 2015 00:08:32 +0200
Subject: [PATCH 0264/1143] Document the brltty servicve in release notes

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index cdbd074e7828..6b2cf55bb8d3 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -15,9 +15,9 @@
 
 <para>Following new services were added since the last release:
 
-<!--<itemizedlist>
-
-</itemizedlist>-->
+<itemizedlist>
+<listitem><para><literal>brltty</literal></para></listitem>
+</itemizedlist>
 </para>
 
 <para>When upgrading from a previous release, please be aware of the

From a704233a87d22121d6ad38bd1e4a61d9e9cc7c25 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 30 Apr 2015 18:54:40 -0400
Subject: [PATCH 0265/1143] Add ats-extsolve (formerly patsolve)

---
 .../compilers/ats-extsolve/default.nix        |  35 +++++
 .../compilers/ats-extsolve/misc-fixes.patch   | 136 ++++++++++++++++++
 pkgs/development/compilers/ats2/default.nix   |   2 +
 pkgs/development/compilers/ats2/setup-hook.sh |   1 +
 pkgs/top-level/all-packages.nix               |   1 +
 5 files changed, 175 insertions(+)
 create mode 100644 pkgs/development/compilers/ats-extsolve/default.nix
 create mode 100644 pkgs/development/compilers/ats-extsolve/misc-fixes.patch
 create mode 100644 pkgs/development/compilers/ats2/setup-hook.sh

diff --git a/pkgs/development/compilers/ats-extsolve/default.nix b/pkgs/development/compilers/ats-extsolve/default.nix
new file mode 100644
index 000000000000..9cd6d3adb324
--- /dev/null
+++ b/pkgs/development/compilers/ats-extsolve/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, ats2, python, z3, pkgconfig, json_c }:
+
+stdenv.mkDerivation {
+  name = "ats-extsolve-0pre6a9b752";
+
+  buildInputs = [ python z3 ats2 pkgconfig json_c ];
+
+  src = fetchurl {
+    url = "https://github.com/githwxi/ATS-Postiats-contrib/archive/6a9b752efb8af1e4f77213f9e81fc2b7fa050877.tar.gz";
+    sha256 = "1zz4fqjm1rdvpm0m0sdck6vx55iiqlk2p8z078fca2q9xyxqjkqd";
+  };
+
+  postUnpack = ''
+    export PATSHOMERELOC="$PWD/$sourceRoot";
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PATSHOMERELOC"
+  '';
+
+  patches = [ ./misc-fixes.patch ];
+
+  preBuild = "cd projects/MEDIUM/ATS-extsolve";
+
+  buildFlags = [ "setup" "patsolve" ];
+
+  installPhase = ''
+    install -d -m755 $out/bin
+    install -m755 patsolve $out/bin
+  '';
+
+  meta = {
+    platforms = ats2.meta.platforms;
+    homepage = http://www.illtyped.com/projects/patsolve;
+    description = "External Constraint-Solving for ATS2";
+    maintainer = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/development/compilers/ats-extsolve/misc-fixes.patch b/pkgs/development/compilers/ats-extsolve/misc-fixes.patch
new file mode 100644
index 000000000000..8775bb83ba4c
--- /dev/null
+++ b/pkgs/development/compilers/ats-extsolve/misc-fixes.patch
@@ -0,0 +1,136 @@
+From bfc7216250e666a59e304f3b7518f8b0bccccbae Mon Sep 17 00:00:00 2001
+From: Shea Levy <shea@shealevy.com>
+Date: Thu, 30 Apr 2015 16:50:47 -0400
+Subject: [PATCH] Add missing case in fprint_s2rt
+
+---
+ projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats b/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats
+index a841b5f..5bc28d7 100644
+--- a/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats
++++ b/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats
+@@ -113,6 +113,7 @@ case+ s2t0 of
+ | S2RTfun (args, ret) => fprint (out, "S2RTfun()")
+ | S2RTtup () => fprint (out, "S2RTtup()")
+ | S2RTerr () => fprint (out, "S2RTerr()")
++| S2RTuninterp (str) => fprint! (out, "S2RTuninterp(", str, ")")
+ //
+ | S2RTignored () => fprint (out, "S2RTignored()")
+ //
+From 9d4c7669d0d3bc8725648684391a2962ed5a922e Mon Sep 17 00:00:00 2001
+From: Shea Levy <shea@shealevy.com>
+Date: Thu, 30 Apr 2015 17:13:35 -0400
+Subject: [PATCH] ATS-extsolve: Get rid of verbose . overload
+
+---
+ projects/MEDIUM/ATS-extsolve/solving/solver.dats | 2 +-
+ projects/MEDIUM/ATS-extsolve/solving/solver.sats | 6 ------
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver.dats b/projects/MEDIUM/ATS-extsolve/solving/solver.dats
+index 8446cd5..f2f77b4 100644
+--- a/projects/MEDIUM/ATS-extsolve/solving/solver.dats
++++ b/projects/MEDIUM/ATS-extsolve/solving/solver.dats
+@@ -250,7 +250,7 @@ end // end of [c3nstr_solve_main]
+ implement c3nstr_solve (c3t, scripts, verbose) = let
+   var env : smtenv
+   val _ = smtenv_nil (env)
+-  val () = env.verbose (verbose)
++  val () = smtenv_set_verbose(env, verbose)
+   val () = 
+       case+ scripts of 
+           | list_nil () => ()
+diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver.sats b/projects/MEDIUM/ATS-extsolve/solving/solver.sats
+index e43a028..dae452c 100644
+--- a/projects/MEDIUM/ATS-extsolve/solving/solver.sats
++++ b/projects/MEDIUM/ATS-extsolve/solving/solver.sats
+@@ -39,14 +39,8 @@ fun smtenv_load_scripts (env: &smtenv, scripts: List0(string)): void
+ 
+ fun smtenv_get_solver (env: &smtenv): solver
+ 
+-fun smtenv_get_verbose (env: &smtenv): bool
+-
+-overload .verbose with smtenv_get_verbose
+-
+ fun smtenv_set_verbose (env: &smtenv, verbose: bool): void
+ 
+-overload .verbose with smtenv_set_verbose
+-
+ fun formula_cst (s2c: s2cst): formula
+ 
+ (* ****** ****** *)
+From e3473a8d9dc7c56cda1111a439db7123254d00b4 Mon Sep 17 00:00:00 2001
+From: Shea Levy <shea@shealevy.com>
+Date: Thu, 30 Apr 2015 18:09:33 -0400
+Subject: [PATCH 1/2] solver_smt.dats: Don't use mapfree on linear list of
+ non-linear values
+
+---
+ projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats b/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats
+index 04055b9..b49602d 100644
+--- a/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats
++++ b/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats
+@@ -348,7 +348,7 @@ in
+         //
+         val () = assertloc (length(pairs) > 0)
+         //
+-        implement list_vt_mapfree$fopr<@(s2exp,s2exp)><formula>(x) = let
++        implement list_vt_map$fopr<@(s2exp,s2exp)><formula>(x) = let
+           val (pf, fpf | Env) = $UN.ptr1_vtake{smtenv}(addr@ env)
+           val met = formula_make (!Env, x.0)
+           val bound = formula_make (!Env, x.1)
+@@ -362,7 +362,8 @@ in
+         end
+         //
+         val assertions =
+-          list_vt_mapfree<(s2exp,s2exp)><formula> (pairs)
++          list_vt_map<(s2exp,s2exp)><formula> (pairs)
++        val () = list_vt_free(pairs)
+         //
+         implement 
+         list_vt_fold$init<formula><formula> (x) = x
+
+From 50de956561e6bf43190d7efb385bb6da658f1637 Mon Sep 17 00:00:00 2001
+From: Shea Levy <shea@shealevy.com>
+Date: Thu, 30 Apr 2015 18:18:56 -0400
+Subject: [PATCH 2/2] ats-extsolve/main.dats: Don't use mapfree on linear list
+ of non-linear values
+
+---
+ projects/MEDIUM/ATS-extsolve/main.dats | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/projects/MEDIUM/ATS-extsolve/main.dats b/projects/MEDIUM/ATS-extsolve/main.dats
+index ac30ca0..930697d 100644
+--- a/projects/MEDIUM/ATS-extsolve/main.dats
++++ b/projects/MEDIUM/ATS-extsolve/main.dats
+@@ -34,7 +34,7 @@ dynload "commarg.dats"
+ 
+ (* ****** ****** *)
+ 
+-overload mapfree with list_vt_mapfree
++overload map with list_vt_map
+ overload filter with list_vt_filter
+ 
+ (* ****** ****** *)
+@@ -56,12 +56,13 @@ implement main0 (argc, argv) = let
+       | Script (s) => true
+       | _ =>> false
+   implement
+-  list_vt_mapfree$fopr<commarg><string> (x) =
++  list_vt_map$fopr<commarg><string> (x) =
+     case- x of
+       | Script (s) => s
+   //
+   val scriptargs = filter (list_vt_copy (args))
+-  val scripts = mapfree<commarg><string> (scriptargs)
++  val scripts = map<commarg><string> (scriptargs)
++  val () = list_vt_free (scriptargs)
+   //
+   implement
+   list_find$pred<commarg> (x) =
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 304d5c284aea..8345a353f3f9 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     description = "Functional programming language with dependent types";
     homepage    = "http://www.ats-lang.org";
diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/pkgs/development/compilers/ats2/setup-hook.sh
new file mode 100644
index 000000000000..67647b1edf69
--- /dev/null
+++ b/pkgs/development/compilers/ats2/setup-hook.sh
@@ -0,0 +1 @@
+export PATSHOME=@out@/lib/ats2-postiats-@version@
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3f0d172705b..356ef9bb6902 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3375,6 +3375,7 @@ let
 
   ats = callPackage ../development/compilers/ats { };
   ats2 = callPackage ../development/compilers/ats2 { };
+  ats-extsolve = callPackage ../development/compilers/ats-extsolve { };
 
   avra = callPackage ../development/compilers/avra { };
 

From 53ab1f7d3ca355a16569bb77bb950b89e8fcf01b Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 30 Apr 2015 21:14:16 -0400
Subject: [PATCH 0266/1143] mbpfan: new package

Daemon that uses input from coretemp module and sets the fan speed using
the applesmc module
---
 pkgs/os-specific/linux/mbpfan/default.nix | 30 +++++++++++++++++++++++
 pkgs/os-specific/linux/mbpfan/fixes.patch | 29 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/os-specific/linux/mbpfan/default.nix
 create mode 100644 pkgs/os-specific/linux/mbpfan/fixes.patch

diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
new file mode 100644
index 000000000000..75099e95f90b
--- /dev/null
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub, gnugrep, kmod }:
+
+stdenv.mkDerivation rec {
+  name = "mbpfan-${version}";
+  version = "1.9.0";
+  src = fetchFromGitHub {
+    owner = "dgraziotin";
+    repo = "mbpfan";
+    rev = "v${version}";
+    sha256 = "15nm1d0a0c0lzxqngrpn2qpsydsmglnn6d20djl7brpsq26j24h9";
+  };
+  patches = [ ./fixes.patch ];
+  postPatch = ''
+    substituteInPlace src/main.c \
+      --replace '@GREP@' '${gnugrep}/bin/grep' \
+      --replace '@LSMOD@' '${kmod}/bin/lsmod'
+  '';
+  installPhase = ''
+    mkdir -p $out/bin $out/etc
+    cp bin/mbpfan $out/bin
+    cp mbpfan.conf $out/etc
+  '';
+  meta = with lib; {
+    description = "Daemon that uses input from coretemp module and sets the fan speed using the applesmc module";
+    homepage = "https://github.com/dgraziotin/mbpfan";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/os-specific/linux/mbpfan/fixes.patch b/pkgs/os-specific/linux/mbpfan/fixes.patch
new file mode 100644
index 000000000000..548cce05c358
--- /dev/null
+++ b/pkgs/os-specific/linux/mbpfan/fixes.patch
@@ -0,0 +1,29 @@
+diff --git a/src/main.c b/src/main.c
+index e8af708..6cfee17 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -71,7 +71,7 @@ void check_requirements()
+       * Check for coretemp and applesmc modules
+       * Credits: -http://stackoverflow.com/questions/12978794
+       */
+-    FILE *fd = popen("lsmod | grep coretemp", "r");
++    FILE *fd = popen("@LSMOD@ | @GREP@ coretemp", "r");
+     char buf[16];
+ 
+     if (!(fread (buf, 1, sizeof (buf), fd) > 0)) {
+@@ -87,7 +87,7 @@ void check_requirements()
+ 
+     pclose(fd);
+ 
+-    fd = popen("lsmod | grep applesmc", "r");
++    fd = popen("@LSMOD@ | @GREP@ applesmc", "r");
+ 
+     if (!(fread (buf, 1, sizeof (buf), fd) > 0)) {
+         DIR* dir = opendir(APPLESMC_PATH);
+@@ -145,4 +145,4 @@ int main(int argc, char *argv[])
+     void (*fan_control)() = mbpfan;
+     go_daemon(fan_control);
+     exit(EXIT_SUCCESS);
+-}
+\ No newline at end of file
++}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 356ef9bb6902..9936330936c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9512,6 +9512,8 @@ let
 
   lvm2 = callPackage ../os-specific/linux/lvm2 { };
 
+  mbpfan = callPackage ../os-specific/linux/mbpfan { };
+
   mdadm = callPackage ../os-specific/linux/mdadm { };
 
   mingetty = callPackage ../os-specific/linux/mingetty { };

From d83399dcd906d93edbbca9bd4e0ae46227cb8473 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 30 Apr 2015 21:15:19 -0400
Subject: [PATCH 0267/1143] mgpfan: new service

---
 nixos/modules/module-list.nix          |   1 +
 nixos/modules/services/misc/mbpfan.nix | 106 +++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 nixos/modules/services/misc/mbpfan.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e1af98f0da64..d182359b5cff 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -196,6 +196,7 @@
   ./services/misc/gitolite.nix
   ./services/misc/gpsd.nix
   ./services/misc/ihaskell.nix
+  ./services/misc/mbpfan.nix
   ./services/misc/mediatomb.nix
   ./services/misc/mesos-master.nix
   ./services/misc/mesos-slave.nix
diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
new file mode 100644
index 000000000000..2767520d78f7
--- /dev/null
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -0,0 +1,106 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mbpfan;
+
+in {
+  options.services.mbpfan = {
+    enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable the mbpfan daemon.
+      '';
+    };
+
+    package = mkOption {
+      default = pkgs.mbpfan;
+      description = ''
+        The package used for the mbpfan daemon.
+      '';
+    };
+
+    minFanSpeed = mkOption {
+      type = types.int;
+      default = 2000;
+      description = ''
+        The minimum fan speed.
+      '';
+    };
+
+    maxFanSpeed = mkOption {
+      type = types.int;
+      default = 6200;
+      description = ''
+        The maximum fan speed.
+      '';
+    };
+
+    lowTemp = mkOption {
+      type = types.int;
+      default = 63;
+      description = ''
+        The low temperature.
+      '';
+    };
+
+    highTemp = mkOption {
+      type = types.int;
+      default = 66;
+      description = ''
+        The high temperature.
+      '';
+    };
+
+    maxTemp = mkOption {
+      type = types.int;
+      default = 86;
+      description = ''
+        The maximum temperature.
+      '';
+    };
+
+    pollingInterval = mkOption {
+      type = types.int;
+      default = 7;
+      description = ''
+        The polling interval.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    boot.kernelModules = [ "coretemp" "applesmc" ];
+
+    security.setuidPrograms = [ "mbpfan" ];
+
+    environment = {
+      etc."mbpfan.conf".text = ''
+        [general]
+        min_fan_speed = ${toString cfg.minFanSpeed}
+        max_fan_speed = ${toString cfg.maxFanSpeed}
+        low_temp = ${toString cfg.lowTemp}
+        high_temp = ${toString cfg.highTemp}
+        max_temp = ${toString cfg.maxTemp}
+        polling_interval = ${toString cfg.pollingInterval}
+      '';
+      systemPackages = [ cfg.package ];
+    };
+
+    systemd.services.mbpfan = {
+      description = "A fan manager daemon for MacBook Pro";
+      wantedBy = [ "sysinit.target" ];
+      after = [ "syslog.target" "sysinit.target" ];
+      restartTriggers = [ config.environment.etc."mbpfan.conf".source ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${cfg.package}/bin/mbpfan -fv";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        PIDFile = "/var/run/mbpfan.pid";
+        Restart = "always";
+      };
+    };
+  };
+}

From 5835d577e7f4074fd637931cb03b5f6a22511a8d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 11:42:43 -0700
Subject: [PATCH 0268/1143] tcl/tk: Refactor and add maintainers

---
 pkgs/development/interpreters/tcl/generic.nix |  5 ++++-
 pkgs/development/libraries/tk/default.nix     | 16 ++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 8b5722c79c8d..cfa4bb48c197 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  preConfigure = "cd unix";
+  preConfigure = ''
+    cd unix
+  '';
 
   postInstall = ''
     make install-private-headers
@@ -22,6 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.tcl.tk/;
     license = licenses.tcltk;
     platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
   
   passthru = rec {
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index 5f07befcfa54..a847f848a02a 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -14,9 +14,13 @@ stdenv.mkDerivation {
     ln -s $out/bin/wish* $out/bin/wish
   '';
 
-  configureFlags = "--with-tcl=${tcl}/lib";
+  preConfigure = ''
+    cd unix
+  '';
 
-  preConfigure = "cd unix";
+  configureFlags = [
+    "--with-tcl=${tcl}/lib"
+  ];
 
   buildInputs = [ pkgconfig tcl libXft ]
     ++ stdenv.lib.optional stdenv.isDarwin fontconfig;
@@ -31,11 +35,11 @@ stdenv.mkDerivation {
     libdir = "lib/${libPrefix}";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
     homepage = http://www.tcl.tk/;
-    license = stdenv.lib.licenses.tcltk;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.tcltk;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ lovek323 wkennington ];
   };
 }

From c46e1049aaae1ebf1d1072b9f6296ab46becc476 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 11:43:04 -0700
Subject: [PATCH 0269/1143] expect: Refactor and add maintainer

---
 pkgs/tools/misc/expect/default.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index bfb369933889..c91d418d870e 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -13,25 +13,14 @@ stdenv.mkDerivation {
   buildInputs = [ tcl ];
   nativeBuildInputs = [ makeWrapper ];
 
-  #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";
-
-  # http://wiki.linuxfromscratch.org/lfs/ticket/2126
-  #preBuild = ''
-  #  substituteInPlace exp_inter.c --replace tcl.h tclInt.h
-  #'';
-
   patchPhase = ''
-    substituteInPlace configure --replace /bin/stty "$(type -tP stty)"
-    sed -e '1i\#include <tclInt.h>' -i exp_inter.c
-    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-  '' + stdenv.lib.optionalString stdenv.isFreeBSD ''
-    ln -s libexpect.so.1 libexpect545.so
+    sed -i "s,/bin/stty,$(type -p stty),g" configure
   '';
 
   configureFlags = [
     "--with-tcl=${tcl}/lib"
     "--with-tclinclude=${tcl}/include"
-    "--exec-prefix=$(out)"
+    "--exec-prefix=\${out}"
   ];
 
   postInstall = ''
@@ -42,8 +31,11 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool for automating interactive applications";
     homepage = http://expect.nist.gov/;
+    license = "Expect";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }

From 6a5bf4f04e02ad50e2554bf75c3b1fde71269417 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 11:48:19 -0700
Subject: [PATCH 0270/1143] check: Add metadata

---
 pkgs/development/libraries/check/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index 5273e88763a8..c07ed57a2550 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   # Test can randomly fail: http://hydra.nixos.org/build/7243912
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Unit testing framework for C";
 
     longDescription =
@@ -26,6 +26,8 @@ stdenv.mkDerivation {
 
     homepage = http://check.sourceforge.net/;
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }

From f537943f271daec8970ebf8e0706f71cf0088027 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 11:48:44 -0700
Subject: [PATCH 0271/1143] dejagnu: Add metadata

---
 pkgs/development/tools/misc/dejagnu/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 193e5eab627d..0c2cc7203299 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ":" "${expect}/bin"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Framework for testing other programs";
 
     longDescription = ''
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.gnu.org/software/dejagnu/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }

From c06df0b0641bdce639d6224fea3e3e9153b16e63 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 15:31:11 -0700
Subject: [PATCH 0272/1143] gpm: Refactor

---
 pkgs/servers/gpm/default.nix    | 26 ++++++++++++++------------
 pkgs/top-level/all-packages.nix |  4 +++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 011b0b8ff497..a9fac485f905 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, ncurses, texinfo }:
+{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo
+
+# Optional Dependencies
+, ncurses ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "gpm-1.20.7";
@@ -8,31 +12,29 @@ stdenv.mkDerivation rec {
     sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
   };
 
-  buildInputs = [ automake autoconf libtool flex bison ncurses texinfo ];
+  nativeBuildInputs = [ automake autoconf libtool flex bison texinfo ];
+  buildInputs = [ ncurses ];
 
   preConfigure = ''
     ./autogen.sh
-    sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
   '';
 
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
+    (if ncurses == null then "--without-curses" else "--with-curses")
   ];
 
-  # Its configure script does not allow --disable-static
-  # Disabling this, we make cross-builds easier, because having
-  # cross-built static libraries we either have to disable stripping
-  # or fixing the gpm users, because there -lgpm will fail.
+  # Provide libgpm.so for compatability
   postInstall = ''
-    rm -f $out/lib/*.a
-    ln -s $out/lib/libgpm.so.2 $out/lib/libgpm.so
+    ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.nico.schottelius.org/software/gpm/;
     description = "A daemon that provides mouse support on the Linux console";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ eelco wkennington ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f6e9eb994e3..aee77e849ec8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9100,7 +9100,9 @@ let
 
   gfxtablet = callPackage ../os-specific/linux/gfxtablet {};
 
-  gpm = callPackage ../servers/gpm { };
+  gpm = callPackage ../servers/gpm {
+    ncurses = null;  # Keep curses disabled for lack of value
+  };
 
   gradm = callPackage ../os-specific/linux/gradm {
     flex = flex_2_5_35;

From ee78173b213059e6c885dc0c4d3bf4da7d3cb229 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 18:04:37 -0700
Subject: [PATCH 0273/1143] ncurses: Modernize build

---
 .../development/libraries/ncurses/default.nix | 123 ++++++++++++------
 pkgs/development/libraries/ncurses/patch-ac   |  40 ------
 pkgs/top-level/all-packages.nix               |   4 +-
 3 files changed, 86 insertions(+), 81 deletions(-)
 delete mode 100644 pkgs/development/libraries/ncurses/patch-ac

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index a4b8c8d4567c..e1f912ae50b4 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -1,14 +1,25 @@
-{ lib, stdenv, fetchurl, unicode ? true }:
+{ stdenv, fetchurl
+
+# Optional Dependencies
+, gpm ? null
+
+# Extra Options
+, unicode ? true
+}:
 
 let
-  /* C++ bindings fail to build on `i386-pc-solaris2.11' with GCC 3.4.3:
-     <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6395191>.
-     It seems that it could be worked around by #including <wchar.h> in the
-     right place, according to
-     <http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
-     but this is left as an exercise to the reader.
-     So disable them for now.  */
-  cxx = !stdenv.isSunOS;
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  buildShared = !stdenv.isDarwin;
+
+  optGpm = shouldUsePkg gpm;
 in
 stdenv.mkDerivation rec {
   name = "ncurses-5.9";
@@ -18,12 +29,33 @@ stdenv.mkDerivation rec {
     sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
   };
 
-  patches = [ ./patch-ac ./clang.patch ];
+  patches = [ ./clang.patch ];
 
-  configureFlags = ''
-    --with-shared --without-debug --enable-pc-files --enable-symlinks
-    ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
-  '';
+  buildInputs = [ gpm ];
+
+  configureFlags = [
+    (mkWith   true        "cxx"         null)
+    (mkWith   true        "cxx-binding" null)
+    (mkWith   false       "ada"         null)
+    (mkWith   true        "manpages"    null)
+    (mkWith   true        "progs"       null)
+    (mkWith   doCheck     "tests"       null)
+    (mkWith   true        "curses-h"    null)
+    (mkEnable true        "pc-files"    null)
+    (mkWith   buildShared "shared"      null)
+    (mkWith   true        "normal"      null)
+    (mkWith   false       "debug"       null)
+    (mkWith   false       "termlib"     null)
+    (mkWith   false       "ticlib"      null)
+    (mkWith   optGpm      "gpm"         null)
+    (mkEnable true        "overwrite"   null)
+    (mkEnable true        "database"    null)
+    (mkWith   true        "xterm-new"   null)
+    (mkEnable true        "symlinks"    null)
+    (mkEnable unicode     "widec"       null)
+    (mkEnable true        "ext-colors"  null)
+    (mkEnable true        "ext-mouse"   null)
+  ];
 
   # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
   # directory doesn't exist, the configure script will disable installation of
@@ -32,7 +64,6 @@ stdenv.mkDerivation rec {
   # the place we want to put *.pc files from other packages anyway. So we must
   # tell it explicitly where to install with PKG_CONFIG_LIBDIR.
   preConfigure = ''
-    export configureFlags="$configureFlags --includedir=$out/include"
     export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
   '';
@@ -41,33 +72,48 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preBuild =
-    # On Darwin, we end up using the native `sed' during bootstrap, and it
-    # fails to run this command, which isn't needed anyway.
-    lib.optionalString (!stdenv.isDarwin)
-      ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
+  doCheck = false;
 
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).
   postInstall = if unicode then ''
-    ${if cxx then "chmod 644 $out/lib/libncurses++w.a" else ""}
-    for lib in curses ncurses form panel menu; do
-      if test -e $out/lib/lib''${lib}w.a; then
-        rm -f $out/lib/lib$lib.so
-        echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so
-        ln -svf lib''${lib}w.a $out/lib/lib$lib.a
-        ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5
-        ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc
-      fi
-    done;
+    # Create a non-abi versioned config
+    cfg=$(basename $out/bin/ncurses*-config)
+    ln -svf $cfg $out/bin/ncursesw-config
+    ln -svf $cfg $out/bin/ncurses-config
+
+    # Allow for end users who #include <ncurses?w/*.h>
     ln -svf . $out/include/ncursesw
-    ln -svf ncursesw5-config $out/bin/ncurses5-config
-  '' else "";
+    ln -svf . $out/include/ncurses
 
-  postFixup = lib.optionalString stdenv.isDarwin "rm $out/lib/*.so";
+    # Create non-unicode compatability
+    libs="$(find $out/lib -name \*w.a | sed 's,.*lib\(.*\)w.a.*,\1,g')"
+    for lib in $libs; do
+      if [ -e "$out/lib/lib''${lib}w.so" ]; then
+        echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so
+      fi
+      ln -svf lib''${lib}w.a $out/lib/lib$lib.a
+      ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc
+    done
 
-  meta = {
+    # Create curses compatability
+    echo "INPUT(-lncursesw)" > $out/lib/libcursesw.so
+    echo "INPUT(-lncursesw)" > $out/lib/libcurses.so
+    ln -svf libncurses
+  '' else ''
+    # Create a non-abi versioned config
+    cfg=$(basename $out/bin/ncurses*-config)
+    ln -svf $cfg $out/bin/ncurses-config
+
+    # Allow for end users who #include <ncurses/*.h>
+    ln -svf . $out/include/ncurses
+
+    # Create curses compatability
+    echo "INPUT(-lncurses)" > $out/lib/libcurses.so
+  '';
+
+  meta = with stdenv.lib; {
     description = "Free software emulation of curses in SVR4 and more";
 
     longDescription = ''
@@ -86,9 +132,10 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/ncurses/;
 
-    license = lib.licenses.mit;
-
-    maintainers = [ ];
-    platforms = lib.platforms.all;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
+
+  passthru.ldflags = if unicode then "-lncursesw" else "-lncurses";
 }
diff --git a/pkgs/development/libraries/ncurses/patch-ac b/pkgs/development/libraries/ncurses/patch-ac
deleted file mode 100644
index 73578f8a3675..000000000000
--- a/pkgs/development/libraries/ncurses/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.18 2011/11/01 14:47:46 hans Exp $
-
---- ncurses-5.9/configure.orig	2011-02-21 01:40:36.000000000 +0000
-+++ ncurses-5.9/configure
-@@ -7096,6 +7096,13 @@ sco*) #(vi
- 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
- 	;;
- solaris2.1[0-9]) #(vi
-+	case "$GCC_VERSION" in 
-+		4.[67].*)
-+			cf_XOPEN_SOURCE=600
-+			cf_add_cflags=-std=c99
-+			CPPFLAGS="$CPPFLAGS -std=c99"
-+			;;
-+	esac
- 	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	;;
- solaris2.[1-9]) #(vi
-@@ -9640,12 +9647,7 @@ case ".$MANPAGE_RENAMES" in #(vi
- .no) #(vi
-   ;;
- .|.yes)
--  # Debian 'man' program?
--  if test -f /etc/debian_version ; then
--    MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
--  else
-     MANPAGE_RENAMES=no
--  fi
-   ;;
- esac
- 
-@@ -18449,7 +18444,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
- 
--CPPFLAGS="$CPPFLAGS -I. -I../include"
-+CPPFLAGS="-I. -I../include $CPPFLAGS"
- if test "$srcdir" != "."; then
- 	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
- fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aee77e849ec8..1a560cdb97fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7222,9 +7222,7 @@ let
 
   nanomsg = callPackage ../development/libraries/nanomsg { };
 
-  ncurses = callPackage ../development/libraries/ncurses {
-    unicode = system != "i686-cygwin";
-  };
+  ncurses = callPackage ../development/libraries/ncurses { };
 
   neon = callPackage ../development/libraries/neon {
     compressionSupport = true;

From 27b435487ccf34c60cb2552066ed1262cf69e683 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 18:19:29 -0700
Subject: [PATCH 0274/1143] irssi: Fix ncurses linking

---
 pkgs/applications/networking/irc/irssi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 47754db1f2d5..b8940bcd96e0 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];
   
-  NIX_LDFLAGS = "-lncurses";
+  NIX_LDFLAGS = ncurses.ldflags;
   
   configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes";
 

From f48fe899c3058d771168500a40bb8c7a7ea39941 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 18:23:25 -0700
Subject: [PATCH 0275/1143] Simplify some builds with curses compatability

---
 pkgs/applications/editors/elvis/default.nix  | 4 ----
 pkgs/applications/editors/nvi/default.nix    | 4 ++--
 pkgs/development/tools/misc/sipp/default.nix | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix
index 0850dd0e7be0..8774b1b461fc 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/pkgs/applications/editors/elvis/default.nix
@@ -10,10 +10,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses ];
 
-  patchPhase = ''
-    sed -i s/-lcurses/-lncurses/ configure
-  '';
-
   preConfigure = ''
     mkdir -p $out/share/man/man1
   '';
diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix
index ee9b775453c2..89762d5bc333 100644
--- a/pkgs/applications/editors/nvi/default.nix
+++ b/pkgs/applications/editors/nvi/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   # nvi tries to write to a usual tmp directory (/var/tmp),
   # so we will force it to use /tmp.
   patchPhase = ''
-    sed -i -e s/-lcurses/-lncurses/ \
+    sed -i build/configure \
       -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \
-      -e s@/var/tmp@@ build/configure
+      -e s@/var/tmp@@
   '';
 
   configurePhase = ''
diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix
index d3373e9f4a61..266a9824ed2a 100644
--- a/pkgs/development/tools/misc/sipp/default.nix
+++ b/pkgs/development/tools/misc/sipp/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     export ac_cv_lib_curses_initscr=yes
     export ac_cv_lib_pthread_pthread_mutex_init=yes
-    sed -i "s@-lcurses@-lncurses@g" ./configure
     sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
     ./configure --prefix=$out --with-pcap
   '';

From bc4347bfd78944eacbf5e3abb44ad11b86e412cc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 18:50:26 -0700
Subject: [PATCH 0276/1143] iproute: 3.19.0 -> 4.0.0

---
 pkgs/os-specific/linux/iproute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index a5bf8ccc1622..53812a712862 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "iproute2-3.19.0";
+  name = "iproute2-4.0.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "1c6pgysxfqs5qkd4kpwkbdhw3xydhjnskrz1q2k2nvqndv1ziyg2";
+    sha256 = "0616cg6liyysfddf6d8i4vyndd9b0hjmfw35icq8p18b0nqnxl2w";
   };
 
   patch = [ ./vpnc.patch ];

From 4c01e6d91993b6de128795f4fbdd25f6227fb870 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 1 May 2015 09:14:35 +0200
Subject: [PATCH 0277/1143] calibre: update from 2.26.0 to 2.27.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 991cc65c94d2..13738cdafe58 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.26.0";
+  name = "calibre-2.27.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0340cdxbdwvckmz3zygwx1wbn62wxap0545nsimpfq4ln7dcxrfw";
+    sha256 = "13id1r2q6alw4wzb4z0njkyr6lsmzs2fjp3cflqavx3qk25darv5";
   };
 
   inherit python;

From 8591db4b10e50ad3b61b1708787e4de314424d5d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 1 May 2015 07:22:03 -0500
Subject: [PATCH 0278/1143] libtasn1: fix evaluation and hash

---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 6423a788287d..2ae5a79b9586 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "0p8c5s1gm3z3nn4s9qc6gs18grbk45mx44byqw2l2qzynjqrsd7a";
+    sha256 = "1nhvnznhg2aqfrfjxc8v008hjlzkh5831jsfahqk89qrw7fbbcw9";
   };
 
   buildInputs = [ perl texinfo ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with stdenv.lib.maintainers; [ wkennington ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From 78a877bef1e7914b8a5506a5cb33cd70b9c5f3f5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 1 May 2015 20:10:20 +0200
Subject: [PATCH 0279/1143] Delete redundant docutils expression

`development/tools/documentation/docutils` is also provided
by `pythonPackages`; use that instead.
---
 .../tools/documentation/docutils/default.nix  | 27 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 pkgs/development/tools/documentation/docutils/default.nix

diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix
deleted file mode 100644
index cd01cf059d6f..000000000000
--- a/pkgs/development/tools/documentation/docutils/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
-
-  version = a.lib.attrByPath ["version"] "0.11" a;
-  buildInputs = with a; [
-    python pil makeWrapper
-  ];
-in
-rec {
-  src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz";
-    sha256 = "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s";
-  };
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
-      
-  name = "python-docutils-" + version;
-  meta = {
-    description = "Processor of ReStructured Text";
-  };
-}
-  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..ce16006fa836 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5150,9 +5150,7 @@ let
       binutils = binutils;
     };
 
-  docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {
-    inherit python pil makeWrapper;
-  };
+  docutils = pythonPackages.docutils;
 
   doxygen = callPackage ../development/tools/documentation/doxygen {
     qt4 = null;

From ba50d4840063bcc8cd662c48262c90102ec7132a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 1 May 2015 17:11:00 -0400
Subject: [PATCH 0280/1143] mbpfan: service improvements

* add verbosity setting
* don't set mbpfan as a setuid program
---
 nixos/modules/services/misc/mbpfan.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
index 2767520d78f7..3fb5f684b761 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.mbpfan;
+  verbose = if cfg.verbose then "v" else "";
 
 in {
   options.services.mbpfan = {
@@ -69,13 +70,19 @@ in {
         The polling interval.
       '';
     };
+
+    verbose = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        If true, sets the log level to verbose.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
     boot.kernelModules = [ "coretemp" "applesmc" ];
 
-    security.setuidPrograms = [ "mbpfan" ];
-
     environment = {
       etc."mbpfan.conf".text = ''
         [general]
@@ -96,7 +103,7 @@ in {
       restartTriggers = [ config.environment.etc."mbpfan.conf".source ];
       serviceConfig = {
         Type = "simple";
-        ExecStart = "${cfg.package}/bin/mbpfan -fv";
+        ExecStart = "${cfg.package}/bin/mbpfan -f${verbose}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         PIDFile = "/var/run/mbpfan.pid";
         Restart = "always";

From c5081bd6032feeacc82cdcab32f93cd0685d7e20 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 11:16:58 -0700
Subject: [PATCH 0281/1143] btrfsprogs: 3.19.1 -> 4.0

---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index d1e0e8e430b5..9286d58482fd 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "3.19.1"; in
+let version = "4.0"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1nw8rsc0dc5k6hrg03m1c65n4d0f7rfs1fjv96xqhqg0wykn5214";
+    sha256 = "07ss0spfkb6dkvcwmkljy6bbyf437abwzngip141a1mhq6ng370p";
   };
 
   buildInputs = [

From 9d4e9aa79e220a3810de6d4c9547f1b53fc1bf6e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 11:19:59 -0700
Subject: [PATCH 0282/1143] apr: 1.5.1 -> 1.5.2

---
 pkgs/development/libraries/apr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 3810a47fac3f..08fd1fe4d5f3 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.5.1";
+  name = "apr-1.5.2";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "1b4qw686bwjn19iyb0lg918q23xxd6s2gnyczhjq992d3m1vwjp9";
+    sha256 = "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];

From 9d5a3e62cf1b5baa91ba2c1958a2118211af06ac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 11:24:07 -0700
Subject: [PATCH 0283/1143] curl: 7.42.0 -> 7.42.1

---
 pkgs/tools/networking/curl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 8e4bbad7f4b7..3bb1c20ae885 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -12,11 +12,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.42.0";
+  name = "curl-7.42.1";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "13yhcqfksy2vwc4sjv97nv3cbd2pb2a8lnvv8g46qp1gail7sm9j";
+    sha256 = "11y8racpj6m4j9w7wa9sifmqvdgf22nk901sfkbxzhhy75rmk472";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains

From 1d150637683b7cfcfcc3bfe8d4b4dda2afadb735 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 14:37:10 -0700
Subject: [PATCH 0284/1143] rtmpdump: Use openssl by default

---
 pkgs/tools/video/rtmpdump/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 55240be19a44..552023278b6a 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, zlib
-, gnutlsSupport ? true, gnutls ? null
-, opensslSupport ? false, openssl ? null
+, gnutlsSupport ? false, gnutls ? null
+, opensslSupport ? true, openssl ? null
 }:
 
 # Must have an ssl library enabled

From 21fea99191905bb7ccb2412b41061e23dae62a38 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 14:36:51 -0700
Subject: [PATCH 0285/1143] Fix some meta

---
 pkgs/development/libraries/c-ares/default.nix  | 10 ++++------
 pkgs/development/libraries/jansson/default.nix |  6 ++++--
 pkgs/development/libraries/zlib/default.nix    |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 58e7c17f2495..678c7e151122 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -8,13 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A C library for asynchronous DNS requests";
-
     homepage = http://c-ares.haxx.se;
-
-    license = stdenv.lib.licenses.mit;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ shlevy ];
   };
 }
diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index 7b78c39924fd..f0f9cc65cb2b 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1mvq9p85khsl818i4vbszyfab0fd45mdrwrxjkzw05mk1xcyc1br";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.digip.org/jansson/";
     description = "C library for encoding, decoding and manipulating JSON data";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 8a79806bf938..162bae54d377 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation (rec {
   meta = with stdenv.lib; {
     description = "Lossless data-compression library";
     license = licenses.zlib;
+    platforms = platforms.all;
   };
 } // (if stdenv.isDarwin then {
   postInstall = ''

From cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 14:35:56 -0700
Subject: [PATCH 0286/1143] nghttp2: Add derivation

---
 .../development/libraries/nghttp2/default.nix | 72 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/development/libraries/nghttp2/default.nix

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
new file mode 100644
index 000000000000..b72abb57e8f2
--- /dev/null
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchurl, pkgconfig
+
+# Optinal Dependencies
+, openssl ? null, libev ? null, zlib ? null, jansson ? null, boost ? null
+, libxml2 ? null, jemalloc ? null
+
+# Extra argument
+, prefix ? ""
+}:
+
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  isLib = prefix == "lib";
+
+  optOpenssl = if isLib then null else shouldUsePkg openssl;
+  optLibev = if isLib then null else shouldUsePkg libev;
+  optZlib = if isLib then null else shouldUsePkg zlib;
+
+  hasApp = optOpenssl != null && optLibev != null && optZlib != null;
+
+  optJansson = if isLib then null else shouldUsePkg jansson;
+  #optBoost = if isLib then null else shouldUsePkg boost;
+  optBoost = null; # Currently detection is broken
+  optLibxml2 = if !hasApp then null else shouldUsePkg libxml2;
+  optJemalloc = if !hasApp then null else shouldUsePkg jemalloc;
+in
+stdenv.mkDerivation rec {
+  name = "${prefix}nghttp2-${version}";
+  version = "0.7.13";
+
+  # Don't use fetchFromGitHub since this needs a bootstrap curl
+  src = fetchurl {
+    url = "http://pub.wak.io/nixos/tarballs/nghttp2-0.7.13.tar.xz";
+    sha256 = "1nz14hmfhsxljmf7f3763q9kpn9prfdivrvdr7c74x72s75bzwli";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ]
+    ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ];
+
+  configureFlags = [
+    (mkEnable false                 "werror"          null)
+    (mkEnable false                 "debug"           null)
+    (mkEnable true                  "threads"         null)
+    (mkEnable hasApp                "app"             null)
+    (mkEnable (optJansson != null)  "hpack-tools"     null)
+    (mkEnable (optBoost != null)    "asio-lib"        null)
+    (mkEnable false                 "examples"        null)
+    (mkEnable false                 "python-bindings" null)
+    (mkEnable false                 "failmalloc"      null)
+    (mkWith   (optLibxml2 != null)  "libxml2"         null)
+    (mkWith   (optJemalloc != null) "jemalloc"        null)
+    (mkWith   false                 "spdylay"         null)
+    (mkWith   false                 "cython"          null)
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://nghttp2.org/;
+    description = "an implementation of HTTP/2 in C";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..7a1116126a96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7218,6 +7218,12 @@ let
 
   newt = callPackage ../development/libraries/newt { };
 
+  nghttp2 = callPackage ../development/libraries/nghttp2 { };
+  libnghttp2 = nghttp2.override {
+    prefix = "lib";
+    fetchurl = fetchurlBoot;
+  };
+
   nix-plugins = callPackage ../development/libraries/nix-plugins {
     nix = pkgs.nixUnstable;
   };

From d74901170af61063f6c23f70bde18beefb145aea Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 13:56:07 -0700
Subject: [PATCH 0287/1143] pkgconfig: Allow for use in curl

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66dc7b95a89e..852ef121a2ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5333,7 +5333,9 @@ let
      cross_renaming: we should make all programs use pkgconfig as
      nativeBuildInput after the renaming.
      */
-  pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { });
+  pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig {
+    fetchurl = fetchurlBoot;
+  });
   pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
 
   prelink = callPackage ../development/tools/misc/prelink { };

From 5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 14:38:31 -0700
Subject: [PATCH 0288/1143] curl: Modernize build

---
 .../linux/make-bootstrap-tools-cross.nix      |  10 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix    |  10 +-
 pkgs/tools/networking/curl/default.nix        | 172 ++++++++++++------
 pkgs/top-level/all-packages.nix               |  14 +-
 4 files changed, 121 insertions(+), 85 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 013aa12d9564..9cc5d4700878 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -92,11 +92,7 @@ rec {
     aclSupport = false;
   })).crossDrv;
   
-  curlMinimal = (pkgs.curl.override {
-    zlibSupport = false;
-    sslSupport = false;
-    scpSupport = false;
-  }).crossDrv;
+  curl-light = pkgs.curl-light.crossDrv;
   
   busyboxMinimal = (pkgs.busybox.override {
     # TBD: uClibc is broken.
@@ -170,8 +166,8 @@ rec {
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
-        cp ${curlMinimal}/bin/curl $out/bin
-        cp -d ${curlMinimal}/lib/libcurl* $out/lib
+        cp ${curl-light}/bin/curl $out/bin
+        cp -d ${curl-light}/lib/libcurl* $out/lib
 
         cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep
         
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 3ad81476c2e9..f9943fc5f199 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,12 +10,6 @@ rec {
     aclSupport = false;
   });
 
-  curlMinimal = curl.override {
-    zlibSupport = false;
-    sslSupport = false;
-    scpSupport = false;
-  };
-
   busyboxMinimal = busybox.override {
     useUclibc = true;
     enableStatic = true;
@@ -83,8 +77,8 @@ rec {
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
-        cp ${curlMinimal}/bin/curl $out/bin
-        cp -d ${curlMinimal}/lib/libcurl* $out/lib
+        cp ${curl-light}/bin/curl $out/bin
+        cp -d ${curl-light}/lib/libcurl* $out/lib
 
         cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 28f28c9a4f93..f8b3ad9355ad 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,81 +1,133 @@
-{ stdenv, fetchurl
-, idnSupport ? false, libidn ? null
-, ldapSupport ? false, openldap ? null
-, zlibSupport ? false, zlib ? null
-, sslSupport ? false, openssl ? null
-, scpSupport ? false, libssh2 ? null
-, gssSupport ? false, gss ? null
-, c-aresSupport ? false, c-ares ? null
+{ stdenv, fetchurl, pkgconfig
+
+# Optional Dependencies
+, zlib ? null, openssl ? null, libssh2 ? null, libnghttp2 ? null, c-ares ? null
+, gss ? null, rtmpdump ? null, openldap ? null, libidn ? null
+
+# Extra arguments
+, suffix ? ""
 }:
 
-assert idnSupport -> libidn != null;
-assert ldapSupport -> openldap != null;
-assert zlibSupport -> zlib != null;
-assert sslSupport -> openssl != null;
-assert scpSupport -> libssh2 != null;
-assert c-aresSupport -> c-ares != null;
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
 
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  isLight = suffix == "light";
+  isFull = suffix == "full";
+  nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}";
+
+  # Normal Depedencies
+  optZlib = if isLight then null else shouldUsePkg zlib;
+  optOpenssl = if isLight then null else shouldUsePkg openssl;
+  optLibssh2 = if isLight then null else shouldUsePkg libssh2;
+  optLibnghttp2 = if isLight then null else shouldUsePkg libnghttp2;
+  optC-ares = if isLight then null else shouldUsePkg c-ares;
+
+  # Full dependencies
+  optGss = if !isFull then null else shouldUsePkg gss;
+  optRtmpdump = if !isFull then null else shouldUsePkg rtmpdump;
+  optOpenldap = if !isFull then null else shouldUsePkg openldap;
+  optLibidn = if !isFull then null else shouldUsePkg libidn;
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "curl-7.42.1";
+  name = "curl${nameSuffix}-${version}";
+  version = "7.42.1";
 
   src = fetchurl {
-    url = "http://curl.haxx.se/download/${name}.tar.bz2";
+    url = "http://curl.haxx.se/download/curl-${version}.tar.bz2";
     sha256 = "11y8racpj6m4j9w7wa9sifmqvdgf22nk901sfkbxzhhy75rmk472";
   };
 
-  # Zlib and OpenSSL must be propagated because `libcurl.la' contains
-  # "-lz -lssl", which aren't necessary direct build inputs of
-  # applications that use Curl.
-  propagatedBuildInputs = with stdenv.lib;
-    optional idnSupport libidn ++
-    optional ldapSupport openldap ++
-    optional zlibSupport zlib ++
-    optional gssSupport gss ++
-    optional c-aresSupport c-ares ++
-    optional sslSupport openssl ++
-    optional scpSupport libssh2;
+  # Use pkgconfig only when necessary
+  nativeBuildInputs = optional (!isLight) pkgconfig;
+  buildInputs = [
+    optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares
+    optGss optRtmpdump optOpenldap optLibidn
+  ];
 
-  # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
-  preConfigure = ''
-    sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
-    rm src/tool_hugehelp.c
-  '';
-
-  # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
+  # Make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
   postConfigure = ''
-    echo  '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
+    echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
   '';
 
   configureFlags = [
-      ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
-      ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
-      ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
-      ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
-      ( if idnSupport then "--with-libidn=${libidn}" else "--without-libidn" )
-    ]
-    ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
-    ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}";
+    (mkEnable true                    "http"              null)
+    (mkEnable true                    "ftp"               null)
+    (mkEnable true                    "file"              null)
+    (mkEnable (optOpenldap != null)   "ldap"              null)
+    (mkEnable (optOpenldap != null)   "ldaps"             null)
+    (mkEnable true                    "rtsp"              null)
+    (mkEnable true                    "proxy"             null)
+    (mkEnable true                    "dict"              null)
+    (mkEnable true                    "telnet"            null)
+    (mkEnable true                    "tftp"              null)
+    (mkEnable true                    "pop3"              null)
+    (mkEnable true                    "imap"              null)
+    (mkEnable true                    "smb"               null)
+    (mkEnable true                    "smtp"              null)
+    (mkEnable true                    "gopher"            null)
+    (mkEnable (!isLight)              "manual"            null)
+    (mkEnable true                    "libcurl_option"    null)
+    (mkEnable false                   "libgcc"            null) # TODO: Enable on gcc
+    (mkWith   (optZlib != null)       "zlib"              null)
+    (mkEnable true                    "ipv4"              null)
+    (mkWith   (optGss != null)        "gssapi"            null)
+    (mkWith   false                   "winssl"            null)
+    (mkWith   false                   "darwinssl"         null)
+    (mkWith   (optOpenssl != null)    "ssl"               null)
+    (mkWith   false                   "gnutls"            null)
+    (mkWith   false                   "polarssl"          null)
+    (mkWith   false                   "cyassl"            null)
+    (mkWith   false                   "nss"               null)
+    (mkWith   false                   "axtls"             null)
+    (mkWith   false                   "libmetalink"       null)
+    (mkWith   (optLibssh2 != null)    "libssh2"           null)
+    (mkWith   (optRtmpdump!= null)    "librtmp"           null)
+    (mkEnable false                   "versioned-symbols" null)
+    (mkWith   false                   "winidn"            null)
+    (mkWith   (optLibidn != null)     "libidn"            null)
+    (mkWith   (optLibnghttp2 != null) "nghttp2"           null)
+    (mkEnable false                   "sspi"              null)
+    (mkEnable true                    "crypto-auth"       null)
+    (mkEnable (optOpenssl != null)    "tls-srp"           null)
+    (mkEnable true                    "unix-sockets"      null)
+    (mkEnable true                    "cookies"           null)
+    (mkEnable (optC-ares != null)     "ares"              null)
+  ];
 
-  CXX = "g++";
-  CXXCPP = "g++ -E";
+  # Fix all broken refernces to dependencies in .la and .pc files
+  postInstall = optionalString (optZlib != null) ''
+    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optOpenssl != null) ''
+    sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optLibssh2 != null) ''
+    sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optLibnghttp2 != null) ''
+    sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optC-ares != null) ''
+    sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optGss != null) ''
+    sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optRtmpdump != null) ''
+    sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optOpenldap != null) ''
+    sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optLibidn != null) ''
+    sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '';
 
-  crossAttrs = {
-    # We should refer to the cross built openssl
-    # For the 'urandom', maybe it should be a cross-system option
-    configureFlags = [
-        ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
-        "--with-random /dev/urandom"
-      ];
-  };
-
-  passthru = {
-    inherit sslSupport openssl;
-  };
-
-  meta = with stdenv.lib; {
+  meta = {
     description = "A command line tool for transferring files with URL syntax";
     homepage    = http://curl.haxx.se/;
-    maintainers = with maintainers; [ lovek323 ];
+    license     = licenses.mit;
     platforms   = platforms.all;
+    maintainers = with maintainers; [ lovek323 wkennington ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 852ef121a2ac..c9fee6081146 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1097,18 +1097,12 @@ let
 
   cudatoolkit = cudatoolkit5;
 
-  curlFull = curl.override {
-    idnSupport = true;
-    ldapSupport = true;
-    gssSupport = true;
-  };
-
-  curl = callPackage ../tools/networking/curl rec {
+  curl-light = curl.override { suffix = "light"; };
+  curl = curl-full.override {
     fetchurl = fetchurlBoot;
-    zlibSupport = true;
-    sslSupport = zlibSupport;
-    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
+    suffix = "";
   };
+  curl-full = callPackage ../tools/networking/curl { suffix = "full"; };
 
   curl3 = callPackage ../tools/networking/curl/7.15.nix rec {
     zlibSupport = true;

From b95fa1c852ff60e9b866c2e4518bd37feeb7eee6 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 2 May 2015 00:59:57 +0200
Subject: [PATCH 0289/1143] grsecurity: Update stable and test patches

stable: 3.1-3.14.40-201504290821 -> 3.1-3.14.40-201504302118
test:   3.1-3.19.6-201504290821  -> 3.1-3.19.6-201504302119
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 2bb8fb570003..9ed7633e7a3b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.40";
-      revision  = "201504290821";
+      revision  = "201504302118";
       branch    = "stable";
-      sha256    = "0382ydr1dshjmwggx5a6ywrdr7qv52w178ify60qw59lrphbdkls";
+      sha256    = "154ivf42ib93f8shh2b2qcqhppd1c6vbjfiazgigr006q638429i";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "3.19.6";
-      revision  = "201504290821";
+      revision  = "201504302119";
       branch    = "test";
-      sha256    = "0nya84cpj2cgncchywfysvmzx5m3wl034f6p7zfxj9l6jhjdcd6q";
+      sha256    = "03yj8011i6mkf33npa7all0c33r95mgiic6zjg494x56279s701s";
     };
 
   grsec_fix_path =

From a46066219c3954c280fe24c93e29d9010f7bb6fc Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 2 May 2015 01:00:56 +0200
Subject: [PATCH 0290/1143] spl: Update from 0.6.4 -> 0.6.4.1

---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 1367be74c636..b3332d88512c 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,13 +1,13 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.6.4";
+  version = "0.6.4.1";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "1jja3aqkm2whb4rcw5k5dr9c4gx6hax1w3f82fb9ks2sy731as6r";
+    sha256 = "1rlflraj66ag2gcvzsyfl4zwhq4846ifyzdmnnmscwmdf2qxc1l8";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From 8119b8a0e414a2541d4e6838d9ddf07306b3854a Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 2 May 2015 01:01:14 +0200
Subject: [PATCH 0291/1143] zfs: Update from 0.6.4 -> 0.6.4.1

---
 pkgs/os-specific/linux/zfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 06aca23369e1..bd4b0c23c8b1 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,13 +1,13 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.6.4";
+  version = "0.6.4.1";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "zfs";
     rev = "zfs-${version}";
-    sha256 = "0xlj2w6gadip3rr3f1lri1n93lkjpzyksnk01sbl5wsrbkry3xjq";
+    sha256 = "15fh1b2rvzvx4j3vgkwrgy2sd553bzwcvk1zai6phjhb6i2rw8v4";
   };
 
   patches = [ ./nix-build.patch ];

From a71f78acf71b4063be1912b8655ce53acb48f24e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 17:39:02 -0700
Subject: [PATCH 0292/1143] libgcrypt: Massive cleanup and make 1.6 the default

---
 pkgs/development/libraries/libgcrypt/1.6.nix  | 44 -----------
 .../libraries/libgcrypt/default.nix           | 73 +++++++++++--------
 .../libgcrypt/no-build-timestamp.patch        | 12 ---
 .../windows/cygwin-setup/default.nix          |  4 +-
 pkgs/top-level/all-packages.nix               | 28 ++-----
 5 files changed, 50 insertions(+), 111 deletions(-)
 delete mode 100644 pkgs/development/libraries/libgcrypt/1.6.nix
 delete mode 100644 pkgs/development/libraries/libgcrypt/no-build-timestamp.patch

diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix
deleted file mode 100644
index 39160675a2a8..000000000000
--- a/pkgs/development/libraries/libgcrypt/1.6.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }:
-
-stdenv.mkDerivation rec {
-  name = "libgcrypt-1.6.3";
-
-  src = fetchurl {
-    url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21";
-  };
-
-  nativeBuildInputs = [ transfig ghostscript texinfo ];
-
-  propagatedBuildInputs = [ libgpgerror ];
-
-  preBuild = ''
-    (cd doc; make stamp-vti)
-  '';
-
-  doCheck = true;
-
-  crossAttrs = let
-    isCross64 = stdenv.cross.config == "x86_64-w64-mingw32";
-  in stdenv.lib.optionalAttrs isCross64 {
-    configureFlags = [ "--disable-asm" "--disable-padlock-support" ];
-  };
-
-  meta = {
-    description = "General-pupose cryptographic library";
-
-    longDescription = ''
-      GNU Libgcrypt is a general purpose cryptographic library based on
-      the code from GnuPG.  It provides functions for all
-      cryptographic building blocks: symmetric ciphers, hash
-      algorithms, MACs, public key algorithms, large integer
-      functions, random numbers and a lot of supporting functions.
-    '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    homepage = https://www.gnu.org/software/libgcrypt/;
-    repositories.git = git://git.gnupg.org/libgcrypt.git;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index af2316320229..bbc625173a95 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,44 +1,55 @@
-{ fetchurl, stdenv, libgpgerror }:
+{ stdenv, fetchurl
+, libgpgerror
 
-stdenv.mkDerivation (rec {
-  name = "libgcrypt-1.5.4";
+# Optional Dependencies
+, libcap ? null, pth ? null
+}:
+
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optLibcap = shouldUsePkg libcap;
+  #optPth = shouldUsePkg pth;
+  optPth = null; # Broken as of 1.6.3
+in
+stdenv.mkDerivation rec {
+  name = "libgcrypt-1.6.3";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33";
+    sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21";
   };
 
-  propagatedBuildInputs = [ libgpgerror ];
+  buildInputs = [ libgpgerror optLibcap optPth ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-asm";
+  configureFlags = [
+    (mkWith   (optLibcap != null) "capabilities"  null)
+    (mkEnable (optPth != null)    "random-daemon" null)
+  ];
 
-  doCheck = stdenv.system != "i686-linux"; # "basic" test fails after stdenv+glibc-2.18
-
-  # For some reason the tests don't find `libgpg-error.so'.
-  checkPhase = ''
-    LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \
-    make check
+  # Make sure libraries are correct for .pc and .la files
+  # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
+  postInstall = ''
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
+  '' + stdenv.lib.optionalString (optLibcap != null) ''
+    sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la
   '';
 
-  patches = [ ./no-build-timestamp.patch ];
+  doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
+    homepage = https://www.gnu.org/software/libgcrypt/;
     description = "General-pupose cryptographic library";
-
-    longDescription = ''
-      GNU Libgcrypt is a general purpose cryptographic library based on
-      the code from GnuPG.  It provides functions for all
-      cryptographic building blocks: symmetric ciphers, hash
-      algorithms, MACs, public key algorithms, large integer
-      functions, random numbers and a lot of supporting functions.
-    '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    homepage = http://gnupg.org/;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+    repositories.git = git://git.gnupg.org/libgcrypt.git;
   };
-} # old "as" problem, see #616 and http://gnupg.10057.n7.nabble.com/Fail-to-build-on-freebsd-7-3-td30245.html
-  // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686)
-    { configureFlags = [ "--disable-aesni-support" ]; }
-)
+}
diff --git a/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch b/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch
deleted file mode 100644
index 897773387232..000000000000
--- a/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libgcrypt-1.5.3.orig/configure libgcrypt-1.5.3/configure
---- libgcrypt-1.5.3.orig/configure	2013-07-25 11:22:47.000000000 +0200
-+++ libgcrypt-1.5.3/configure	2014-04-09 00:17:58.659147199 +0200
-@@ -16520,6 +16520,7 @@
- 
- 
- BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
-+BUILD_TIMESTAMP=1970-01-01T00:01+0000
- 
- 
- cat >>confdefs.h <<_ACEOF
-Only in libgcrypt-1.5.3: out
diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix
index d0995ffc662a..71b47c5a50f9 100644
--- a/pkgs/os-specific/windows/cygwin-setup/default.nix
+++ b/pkgs/os-specific/windows/cygwin-setup/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkgconfig
-, zlib, bzip2, lzma, libgcrypt_1_6
+, zlib, bzip2, lzma, libgcrypt
 }:
 
 with stdenv.lib;
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       buildInputs = map mkStatic (o.buildInputs or []);
       propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []);
     });
-  in map mkStatic [ zlib bzip2 lzma libgcrypt_1_6 ];
+  in map mkStatic [ zlib bzip2 lzma libgcrypt ];
 
   configureFlags = "--disable-shared";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9fee6081146..f96187817f0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -827,7 +827,6 @@ let
   syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
 
   rsyslog = callPackage ../tools/system/rsyslog {
-    libgcrypt = libgcrypt_1_6;
     czmq = null; # Currently Broken
     hadoop = null; # Currently Broken
   };
@@ -1512,13 +1511,9 @@ let
   # use config.packageOverrides if you prefer original gnupg1
   gnupg1 = gnupg1compat;
 
-  gnupg20 = callPackage ../tools/security/gnupg/20.nix {
-    libgcrypt = libgcrypt_1_6;
-  };
+  gnupg20 = callPackage ../tools/security/gnupg/20.nix { };
 
-  gnupg21 = callPackage ../tools/security/gnupg/21.nix {
-    libgcrypt = libgcrypt_1_6;
-  };
+  gnupg21 = callPackage ../tools/security/gnupg/21.nix { };
 
   gnupg = gnupg20;
 
@@ -6602,8 +6597,6 @@ let
 
   libgcrypt = callPackage ../development/libraries/libgcrypt { };
 
-  libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { });
-
   libgdiplus = callPackage ../development/libraries/libgdiplus { };
 
   libgksu = callPackage ../development/libraries/libgksu { };
@@ -6848,9 +6841,7 @@ let
 
   libosmpbf = callPackage ../development/libraries/libosmpbf {};
 
-  libotr = callPackage ../development/libraries/libotr {
-    libgcrypt = libgcrypt_1_6;
-  };
+  libotr = callPackage ../development/libraries/libotr { };
 
   libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
 
@@ -8762,7 +8753,6 @@ let
     python = python2;
     pythonPackages = python2Packages;
     kerberos = heimdal;
-    libgcrypt = libgcrypt_1_6;
     gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;
@@ -9014,9 +9004,7 @@ let
 
   criu = callPackage ../os-specific/linux/criu { };
 
-  cryptsetup = callPackage ../os-specific/linux/cryptsetup {
-    libgcrypt = libgcrypt_1_6;
-  };
+  cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
 
   cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
 
@@ -11042,13 +11030,9 @@ let
     inherit (gnome3) goffice gnome_icon_theme;
   };
 
-  gnunet = callPackage ../applications/networking/p2p/gnunet {
-    libgcrypt = libgcrypt_1_6;
-  };
+  gnunet = callPackage ../applications/networking/p2p/gnunet { };
 
-  gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix {
-    libgcrypt = libgcrypt_1_6;
-  });
+  gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { });
 
   gocr = callPackage ../applications/graphics/gocr { };
 

From 56366679cf2d7bda7ad20f179094ac205ab7faa9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 17:47:23 -0700
Subject: [PATCH 0293/1143] libassuan: Fix propagated build inputs

---
 pkgs/development/libraries/libassuan/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index e625334cefaf..5202ad83605c 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -8,10 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "1ikf9whfi7rg71qa610ynyv12qrw20zkn7zxgvvr9dp41gbqxxbx";
   };
 
-  propagatedBuildInputs = [ libgpgerror pth ];
+  buildInputs = [ libgpgerror pth ];
 
   doCheck = true;
 
+  # Make sure includes are fixed for callers who don't use libassuan-config
+  postInstall = ''
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/assuan.h
+  '';
+
   meta = {
     description = "IPC library used by GnuPG and related software";
 

From d5584b9698689244e99c592f4efb61359de02d5a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 17:47:52 -0700
Subject: [PATCH 0294/1143] opensc: Use libassuan2

---
 pkgs/tools/security/opensc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 917c70f29a0a..8d9366bdc0fc 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl
-, libiconv, pcsclite, libassuan1, libXt
+, libiconv, pcsclite, libassuan, libXt
 , docbook_xsl, libxslt, docbook_xml_dtd_412
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan1
+    autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan
     libXt libxslt libiconv docbook_xml_dtd_412
   ];
 

From 60eda8f64d1147f9210ff50f056edd6c71145519 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 17:48:25 -0700
Subject: [PATCH 0295/1143] libassuan1: Remove

---
 .../libraries/libassuan1/default.nix          | 28 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/development/libraries/libassuan1/default.nix

diff --git a/pkgs/development/libraries/libassuan1/default.nix b/pkgs/development/libraries/libassuan1/default.nix
deleted file mode 100644
index 2532cec03900..000000000000
--- a/pkgs/development/libraries/libassuan1/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchurl, stdenv, pth }:
-
-stdenv.mkDerivation rec {
-  name = "libassuan-1.0.5";
-
-  src = fetchurl {
-    url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1xar8i5jmah75wa9my4x7vkc5b6nmzd2p6k9kmpdg9hsv04292y5";
-  };
-
-  propagatedBuildInputs = [ pth ];
-
-  doCheck = true;
-
-  meta = {
-    description = "Libassuan, the IPC library used by GnuPG and related software";
-
-    longDescription = ''
-      Libassuan is a small library implementing the so-called Assuan
-      protocol.  This protocol is used for IPC between most newer
-      GnuPG components.  Both, server and client side functions are
-      provided.
-    '';
-
-    homepage = http://gnupg.org;
-    license = stdenv.lib.licenses.lgpl2Plus;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f96187817f0a..4438916942f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6371,8 +6371,6 @@ let
 
   libass = callPackage ../development/libraries/libass { };
 
-  libassuan1 = callPackage ../development/libraries/libassuan1 { };
-
   libassuan = callPackage ../development/libraries/libassuan { };
 
   libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix {

From c5d13d4fe96674a4fcb04b54ea552847302e13ee Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 17:48:59 -0700
Subject: [PATCH 0296/1143] libmicrohttpd: Modernize

---
 .../libraries/libmicrohttpd/default.nix       | 69 +++++++++++++------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 8b9f6f1dca57..9eca6bd84b99 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,38 +1,65 @@
-{stdenv, fetchurl, curl, libgcrypt}:
+{ stdenv, fetchurl, pkgconfig
+, curl
 
+# Optional Dependencies
+, openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null
+}:
+
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optOpenssl = shouldUsePkg openssl;
+  optZlib = shouldUsePkg zlib;
+  hasSpdy = optOpenssl != null && optZlib != null;
+
+  optLibgcrypt = shouldUsePkg libgcrypt;
+  optGnutls = shouldUsePkg gnutls;
+  hasHttps = optLibgcrypt != null && optGnutls != null;
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.38";
+  name = "libmicrohttpd-0.9.41";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld";
+    sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p";
   };
 
-  buildInputs = [ curl libgcrypt ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = optional doCheck curl
+    ++ optionals hasSpdy [ optOpenssl optZlib ]
+    ++ optionals hasHttps [ optLibgcrypt optGnutls ];
 
-  preCheck =
-    # Since `localhost' can't be resolved in a chroot, work around it.
-    '' for i in "src/test"*"/"*.[ch]
-       do
-         sed -i "$i" -es/localhost/127.0.0.1/g
-       done
-    '';
+  configureFlags = [
+    (mkWith   true                 "threads"       "posix")
+    (mkEnable true                 "doc"           null)
+    (mkEnable false                "examples"      null)
+    (mkEnable true                 "epoll"         "auto")
+    (mkEnable doCheck              "curl"          null)
+    (mkEnable hasSpdy              "spdy"          null)
+    (mkEnable true                 "messages"      null)
+    (mkEnable true                 "postprocessor" null)
+    (mkWith   hasHttps             "gnutls"        null)
+    (mkEnable hasHttps             "https"         null)
+    (mkEnable true                 "bauth"         null)
+    (mkEnable true                 "dauth"         null)
+  ];
 
   # Disabled because the tests can time-out.
   doCheck = false;
 
   meta = {
     description = "Embeddable HTTP server library";
-
-    longDescription = ''
-      GNU libmicrohttpd is a small C library that is supposed to make
-      it easy to run an HTTP server as part of another application.
-    '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
     homepage = http://www.gnu.org/software/libmicrohttpd/;
-
-    maintainers = [ ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }

From 42663e41a527f0c4ebdfbf220cba1cc85197a596 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 17:49:58 -0700
Subject: [PATCH 0297/1143] libsamplerate: Remove propagation

---
 pkgs/development/libraries/libsamplerate/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 85d51d0ad71e..481d82c0c9ad 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, fftw, libsndfile }:
+{ stdenv, fetchurl, pkgconfig
+, fftw, libsndfile
+}:
 
 stdenv.mkDerivation rec {
   name = "libsamplerate-0.1.8";
@@ -8,8 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck";
   };
 
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ fftw libsndfile ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ fftw libsndfile ];
 
   # maybe interesting configure flags:
   #--disable-fftw          disable usage of FFTW
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
     # GPL or a commercial-use license (available at
     # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf)
     licenses    = with licenses; [ gpl3.shortName unfree ];
-    maintainers = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 wkennington ];
     platforms   = platforms.all;
   };
 }

From e9ee5f99615d0980538e60b1079c8438f8d8135c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 19:13:14 -0700
Subject: [PATCH 0298/1143] libssh2: Modernize Build

---
 .../development/libraries/libssh2/default.nix | 64 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index daeb39bc9821..dfaee9096206 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,19 +1,73 @@
-{stdenv, fetchurlBoot, openssl, zlib}:
+{ stdenv, fetchurl
 
+# Optional Dependencies
+, zlib ? null
+
+# Crypto Dependencies
+, openssl ? null, libgcrypt ? null
+}:
+
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  # Prefer openssl
+  cryptoStr = if shouldUsePkg openssl != null then "openssl"
+    else if shouldUsePkg libgcrypt != null then "libgcrypt"
+      else "none";
+  crypto = {
+    openssl = openssl;
+    libgcrypt = libgcrypt;
+    none = null;
+  }.${cryptoStr};
+
+  optZlib = shouldUsePkg zlib;
+in
+
+assert crypto != null;
+
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libssh2-1.5.0";
 
-  src = fetchurlBoot {
+  src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
     sha256 = "1z6hfgak00yz0azx6lk6n688mywhdxx03j6sdf95p3w6ssnnn6c3";
   };
 
-  buildInputs = [ openssl zlib ];
+  buildInputs = [ crypto optZlib ];
+
+  configureFlags = [
+    (mkWith   (cryptoStr == "openssl")   "openssl"        null)
+    (mkWith   (cryptoStr == "libgcrypt") "libgcrypt"      null)
+    (mkWith   false                      "wicng"          null)
+    (mkWith   optZlib                    "libz"           null)
+    (mkEnable false                      "crypt-none"     null)
+    (mkEnable false                      "mac-none"       null)
+    (mkEnable true                       "gex-new"        null)
+    (mkEnable false                      "debug"          null)
+    (mkEnable false                      "examples-build" null)
+  ];
+
+  postInstall = optionalString (optZlib != null) ''
+    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/libssh2.la
+  '' + optionalString (cryptoStr == "openssl") ''
+    sed -i 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' $out/lib/libssh2.la
+  '' + optionalString (cryptoStr == "libgcrypt") ''
+    sed -i 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' $out/lib/libssh2.la
+  '';
 
   meta = {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = http://www.libssh2.org;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ urkud wkennington ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4438916942f4..e3dd92a1e083 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6903,7 +6903,9 @@ let
 
   libssh = callPackage ../development/libraries/libssh { };
 
-  libssh2 = callPackage ../development/libraries/libssh2 { };
+  libssh2 = callPackage ../development/libraries/libssh2 {
+    fetchurl = fetchurlBoot;
+  };
 
   libstartup_notification = callPackage ../development/libraries/startup-notification { };
 

From 23f836615d510ba0e7346bb633575727c108353e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 19:13:40 -0700
Subject: [PATCH 0299/1143] ncurses: Fix gpm typo

---
 pkgs/development/libraries/ncurses/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index e1f912ae50b4..9ce486323a73 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./clang.patch ];
 
-  buildInputs = [ gpm ];
+  buildInputs = [ optGpm ];
 
   configureFlags = [
     (mkWith   true        "cxx"         null)

From e2b6e11b943d151a93ab997dd182736d8a9be193 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 22:02:24 -0700
Subject: [PATCH 0300/1143] libvorbis: Get rid of propagatedBuildInputs

---
 pkgs/development/libraries/libvorbis/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 5d3218169d9f..7e34c6e9b9fa 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -8,9 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal";
   };
 
-  buildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ libogg ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libogg ];
 
   doCheck = true;
 

From 3550d117cc0a955b370a448e4aa155b9bf48268e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 22:26:52 -0700
Subject: [PATCH 0301/1143] jsoncpp: 1.6.0 -> 1.6.2

---
 .../development/libraries/jsoncpp/default.nix | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index d8b85847975b..7eb7f393ba43 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchurl, cmake, python }:
+{ stdenv, fetchFromGitHub, cmake, python }:
 
-let
-  basename = "jsoncpp";
-  version = "1.6.0";
-in
 stdenv.mkDerivation rec {
-  name = "${basename}-${version}";
-  src = fetchurl {
-    url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz";
-    sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz";
+  name = "jsoncpp-${version}";
+  version = "1.6.2";
+
+  src = fetchFromGitHub {
+    owner = "open-source-parsers";
+    repo = "jsoncpp";
+    rev = version;
+    sha256 = "0p92i0hx2k3g8mwrcy339b56bfq8qgpb65id8xllkgd2ns4wi9zi";
   };
 
-  nativeBuildInputs =
-    [
-      # cmake can be built with the system jsoncpp, or its own bundled version.
-      # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
-      # we make a bootstrapping build with the bundled version.
-      (cmake.override { jsoncpp = null; })
-      python
-    ];
+  nativeBuildInputs = [
+    # cmake can be built with the system jsoncpp, or its own bundled version.
+    # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
+    # we make a bootstrapping build with the bundled version.
+    (cmake.override { jsoncpp = null; })
+    python
+  ];
+
+  cmakeFlags = [
+    "-DJSONCPP_WITH_CMAKE_PACKAGE=1"
+  ];
 
   meta = {
     inherit version;

From 64c68c541305cc90428637061b1bbf9e9d0e67ac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 22:27:14 -0700
Subject: [PATCH 0302/1143] cmake: 3.2.1 -> 3.2.2

---
 pkgs/development/tools/build-managers/cmake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 210c94860509..72ecb10b0990 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -11,7 +11,7 @@ assert wantPS -> (ps != null);
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.2";
-  minorVersion = "1";
+  minorVersion = "2";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0b2hy4p0aa9zshlxyw9nmlh5q8q1lmnwmb594rvh6sx2n7v1r7vm";
+    sha256 = "0y3w83al0vh9ll7fnqm3nx7l8hsl85k8iv9abxb791q36rp4xsdd";
   };
 
   enableParallelBuilding = true;

From e52afb24da9a5c0e0ab749176982578ce2ca5421 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Thu, 30 Apr 2015 20:20:17 +0000
Subject: [PATCH 0303/1143] gconf: removed heavy dependency on gtk by default.

---
 pkgs/desktops/gnome-2/platform/GConf/default.nix  | 11 +++++++----
 pkgs/desktops/gnome-3/3.12/core/gconf/default.nix |  8 +++++---
 pkgs/desktops/gnome-3/3.16/core/gconf/default.nix |  8 +++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index 847983e2c491..d4a8e1ff8469 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2
-, polkit, intltool, dbus_libs, gtk }:
+, polkit, intltool, dbus_libs, gtk ? null, withGtk ? false }:
+
+assert withGtk -> (gtk != null);
 
 stdenv.mkDerivation {
   name = "GConf-2.32.4";
@@ -9,16 +11,17 @@ stdenv.mkDerivation {
     sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
-  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 gtk ]
+  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
     # darwin
-    ++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
+    ++ stdenv.lib.optional (!stdenv.isDarwin) polkit
+    ++ stdenv.lib.optional withGtk gtk;
 
   propagatedBuildInputs = [ glib ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  configureFlags = [ "--with-gtk=2.0" ]
+  configureFlags = stdenv.lib.optional withGtk "--with-gtk=2.0"
     # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
     ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
 }
diff --git a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
index 47dae0486e93..a4cb3e8c1464 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2
-, intltool, polkit, orbit }:
+{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
+, intltool, polkit, orbit, withGtk ? false }:
+
+assert withGtk -> (gnome3 != null);
 
 stdenv.mkDerivation rec {
 
@@ -16,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
   };
 
-  buildInputs = [ libxml2 polkit gnome3.gtk orbit ];
+  buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
   propagatedBuildInputs = [ glib dbus_glib  ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
index 47dae0486e93..a4cb3e8c1464 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2
-, intltool, polkit, orbit }:
+{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
+, intltool, polkit, orbit, withGtk ? false }:
+
+assert withGtk -> (gnome3 != null);
 
 stdenv.mkDerivation rec {
 
@@ -16,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
   };
 
-  buildInputs = [ libxml2 polkit gnome3.gtk orbit ];
+  buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
   propagatedBuildInputs = [ glib dbus_glib  ];
   nativeBuildInputs = [ pkgconfig intltool ];
 

From 2bc69990ccfe2b02163ed9a745e6d3d1f131cf67 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sat, 2 May 2015 11:05:43 +0200
Subject: [PATCH 0304/1143] dmd: Tweaks so that it compiles on darwin

- Patching the makefile so use "clang++" as compiler. This was commented out
  inside of the makefile.

- Fix the path to copy libphobos from.
---
 pkgs/development/compilers/dmd/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 068b29d47ced..c57cf2551aa8 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ unzip curl ];
 
+  # Allow to use "clang++", commented in Makefile
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace src/dmd/posix.mak --replace g++ clang++
+  '';
+
   buildPhase = ''
       cd src/dmd
       make -f posix.mak INSTALL_DIR=$out
@@ -34,8 +39,9 @@ stdenv.mkDerivation {
 
       cd ../phobos
       mkdir $out/lib
-      ${let bits = if stdenv.is64bit then "64" else "32"; in
-      "cp generated/linux/release/${bits}/libphobos2.a $out/lib"
+      ${let bits = if stdenv.is64bit then "64" else "32";
+            osname = if stdenv.isDarwin then "osx" else "linux"; in
+      "cp generated/${osname}/release/${bits}/libphobos2.a $out/lib"
       }
 
       cp -r std $out/include/d2
@@ -55,4 +61,3 @@ stdenv.mkDerivation {
     platforms = platforms.unix;
   };
 }
-

From 2e658c1c6357443ab778653dfc62753677bafe4f Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sat, 2 May 2015 11:20:45 +0200
Subject: [PATCH 0305/1143] dmd: Update version to 2.067.1

---
 pkgs/development/compilers/dmd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index c57cf2551aa8..fb4666de4c21 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, curl }:
 
 stdenv.mkDerivation {
-  name = "dmd-2.067.0";
+  name = "dmd-2.067.1";
 
   src = fetchurl {
-    url = http://downloads.dlang.org/releases/2015/dmd.2.067.0.zip;
-    sha256 = "0b1b65694846ef3430de1de341c8cf353151a1a39656e6a1065fe56bc90fb60b";
+    url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip;
+    sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94";
   };
 
   buildInputs = [ unzip curl ];

From c6d17dfa24243c144d68da31722bee0b739600c0 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 2 May 2015 12:36:04 +0200
Subject: [PATCH 0306/1143] fix up cudatoolkit 6.5 so that nvprof can run

---
 pkgs/development/compilers/cudatoolkit/6.5.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix
index 17156cd06647..268e8e7aeaeb 100644
--- a/pkgs/development/compilers/cudatoolkit/6.5.nix
+++ b/pkgs/development/compilers/cudatoolkit/6.5.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
-, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
+, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
 }:
 
 let version = "6.5.19"; in
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl ];
 
   runtimeDependencies = [
+    glibc
     ncurses expat python zlib
     xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
     gtk2 glib fontconfig freetype unixODBC alsaLib
@@ -54,6 +55,9 @@ stdenv.mkDerivation rec {
     rm $out/tools/CUDA_Occupancy_Calculator.xls
     perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
     mv $out/include $out/usr_include
+
+    # let's remove the 32-bit libraries, they confuse the lib64->lib mover
+    rm -rf $out/lib
   '';
 
   setupHook = ./setup-hook.sh;

From bc8bbd52819a337f3b0c2ed3113ed73f34c2984e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 1 May 2015 22:54:29 -0700
Subject: [PATCH 0307/1143] libsodium: Add maintainer

---
 pkgs/development/libraries/libsodium/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index fc554122c08e..3433417fb921 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Version of NaCl with hardware tests at runtime, not build time";
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.isc;
+    maintainers = with maintainers; [ viric wkennington ];
+    platforms = platforms.all;
   };
 }

From 44aad3817f94a013eaa5ec1218b45bdf8c8eea38 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 May 2015 04:05:32 -0700
Subject: [PATCH 0308/1143] shishi: Modernize Build

---
 pkgs/servers/shishi/default.nix      | 80 +++++++++++++++++++++-------
 pkgs/servers/shishi/gcrypt-fix.patch | 34 ++++++++++++
 2 files changed, 95 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/servers/shishi/gcrypt-fix.patch

diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index a41915e5be8a..a97e6847a450 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -1,5 +1,25 @@
-{ fetchurl, stdenv, libtasn1, libgcrypt, gnutls }:
+{ stdenv, fetchurl
+, libgcrypt, libgpgerror, libtasn1
 
+# Optional Dependencies
+, pam ? null, libidn ? null, gnutls ? null
+}:
+
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optPam = shouldUsePkg pam;
+  optLibidn = shouldUsePkg libidn;
+  optGnutls = shouldUsePkg gnutls;
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "shishi-1.0.2";
 
@@ -8,30 +28,52 @@ stdenv.mkDerivation rec {
     sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
   };
 
-  buildInputs = [ libtasn1 libgcrypt gnutls ] ;
+  # Fixes support for gcrypt 1.6+
+  patches = [ ./gcrypt-fix.patch ];
+
+  buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ];
+
+  configureFlags = [
+    (mkOther                      "sysconfdir"    "/etc")
+    (mkOther                      "localstatedir" "/var")
+    (mkEnable true                "libgcrypt"     null)
+    (mkEnable (optPam != null)    "pam"           null)
+    (mkEnable true                "ipv6"          null)
+    (mkWith   (optLibidn != null) "stringprep"    null)
+    (mkEnable (optGnutls != null) "starttls"      null)
+    (mkEnable true                "des"           null)
+    (mkEnable true                "3des"          null)
+    (mkEnable true                "aes"           null)
+    (mkEnable true                "md"            null)
+    (mkEnable false               "null"          null)
+    (mkEnable true                "arcfour"       null)
+  ];
 
   NIX_CFLAGS_COMPILE
-    = stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT";
+    = optionalString stdenv.isDarwin "-DBIND_8_COMPAT";
 
   doCheck = true;
 
+  installFlags = [ "sysconfdir=\${out}/etc" ];
+
+  # Fix *.la files
+  postInstall = ''
+    sed -i $out/lib/libshi{sa,shi}.la \
+  '' + optionalString (optLibidn != null) ''
+      -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \
+  '' + optionalString (optGnutls != null) ''
+      -e 's,\(-lgnutls\),-L${optGnutls}/lib \1,' \
+  '' + ''
+      -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \
+      -e 's,\(-lgpg-error\),-L${libgpgerror}/lib \1,' \
+      -e 's,\(-ltasn1\),-L${libtasn1}/lib \1,'
+  '';
+
   meta = {
-    description = "An implementation of the Kerberos 5 network security system";
     homepage    = http://www.gnu.org/software/shishi/;
-    license     = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ bjg lovek323 ];
-    platforms   = stdenv.lib.platforms.all;
-
-    longDescription =
-      '' GNU Shishi is an implementation of the Kerberos 5 network
-         authentication system, as specified in RFC 4120.  Shishi can be
-         used to authenticate users in distributed systems.
-
-         Shishi contains a library (`libshishi') that can be used by
-         application developers to add support for Kerberos 5.  Shishi
-         contains a command line utility (1shishi') that is used by
-         users to acquire and manage tickets (and more).  The server
-         side, a Key Distribution Center, is implemented by `shishid'.
-      '';
+    description = "An implementation of the Kerberos 5 network security system";
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ bjg lovek323 wkennington ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/servers/shishi/gcrypt-fix.patch b/pkgs/servers/shishi/gcrypt-fix.patch
new file mode 100644
index 000000000000..ccc37389401b
--- /dev/null
+++ b/pkgs/servers/shishi/gcrypt-fix.patch
@@ -0,0 +1,34 @@
+diff --git a/configure b/configure
+index c9a442b..a596bfe 100755
+--- a/configure
++++ b/configure
+@@ -24491,12 +24491,6 @@ else
+ /* end confdefs.h.  */
+ 
+ #include <gcrypt.h>
+-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
+-   will fail on startup if we don't have 1.4.4 or later, so
+-   test for it early. */
+-#if !defined GCRY_MODULE_ID_USER
+-error too old libgcrypt
+-#endif
+ 
+ int
+ main ()
+diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4
+index b352e33..4bab9f4 100644
+--- a/gl/m4/gc.m4
++++ b/gl/m4/gc.m4
+@@ -12,12 +12,6 @@ AC_DEFUN([gl_GC],
+   if test "$libgcrypt" != no; then
+     AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
+ #include <gcrypt.h>
+-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
+-   will fail on startup if we don't have 1.4.4 or later, so
+-   test for it early. */
+-#if !defined GCRY_MODULE_ID_USER
+-error too old libgcrypt
+-#endif
+ ])
+   fi
+ ])

From 473628b2203635b2f8b7e119a59bcd65b843eab3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 May 2015 04:11:47 -0700
Subject: [PATCH 0309/1143] gss: Modernize

---
 pkgs/development/libraries/gss/default.nix | 32 ++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 75ae4054592d..71dd8c78edae 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,4 +1,8 @@
-{ fetchurl, stdenv, shishi }:
+{ stdenv, fetchurl
+
+# Optional Dependencies
+, shishi ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "gss-1.0.2";
@@ -10,22 +14,22 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ shishi ];
 
+  configureFlags = [
+    "--${if shishi != null then "enable" else "disable"}-kereberos5"
+  ];
+
   doCheck = true;
 
-  meta = {
-    description = "Generic Security Service";
-
-    longDescription =
-      '' GSS is an implementation of the Generic Security Service Application
-	 Program Interface (GSS-API). GSS-API is used by network servers to
-	 provide security services, e.g., to authenticate SMTP/IMAP clients
-	 against SMTP/IMAP servers.
-       '';
+  # Fixup .la files
+  postInstall = stdenv.lib.optionalString (shishi != null) ''
+    sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
+  '';
 
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/gss/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = [ stdenv.lib.maintainers.bjg ];
-    platforms = stdenv.lib.platforms.all;
+    description = "Generic Security Service";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ bjg wkennington ];
+    platforms = platforms.all;
   };
 }

From d1df0cd87370ce9d96fcff5c1a86dbe1e1882227 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 2 May 2015 12:26:50 +0200
Subject: [PATCH 0310/1143] chipmunk: 6.1.5 -> 7.0.0

---
 .../libraries/chipmunk/default.nix            | 52 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index 63c5959960ac..52990097a230 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -1,39 +1,29 @@
-args :  
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  fullDepEntry = args.fullDepEntry;
+{ stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto
+, inputproto, libXi, libXmu
+}:
+
+stdenv.mkDerivation rec {
+  name = "chipmunk-${version}";
+  majorVersion = "7";
+  version = "${majorVersion}.0.0";
 
-  version = lib.attrByPath ["version"] "6.1.5" args;
-  majorVersion = lib.attrByPath ["majorVersion"] "6" args;
-  buildInputs = with args; [
-    cmake freeglut mesa
-    libX11 xproto inputproto libXi libXmu
-  ];
-in
-rec {
   src = fetchurl {
-    url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
-    sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7";
+    url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
+    sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-  
-  /* doConfigure should be specified separately */
-  phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"];
+  buildInputs =
+    [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ];
 
-  genMakefile = fullDepEntry ''
-    cmake -D CMAKE_INSTALL_PREFIX=$out . 
-  '' ["minInit" "addInputs" "doUnpack"];
-
-  demoInstall = fullDepEntry(''
+  postInstall = ''
     mkdir -p $out/bin
-    cp Demo/chipmunk_demos $out/bin
-  '') ["doMakeInstall" "defEnsureDir"];
-      
-  name = "chipmunk-" + version;
-  meta = {
-    description = "2D physics engine";
+    cp demo/chipmunk_demos $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fast and lightweight 2D game physics library";
+    homepage = http://chipmunk2d.net/;
+    license = licenses.mit;
+    platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e86ed832d94..85bbae431234 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5521,8 +5521,7 @@ let
 
   check = callPackage ../development/libraries/check { };
 
-  chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) {
-    inherit cmake freeglut mesa;
+  chipmunk = callPackage ../development/libraries/chipmunk {
     inherit (xlibs) libX11 xproto inputproto libXi libXmu;
   };
 

From 03c749e896c975fb0be25c039323e56bb1e8ebb4 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 2 May 2015 01:01:27 +0200
Subject: [PATCH 0311/1143] icedtea7_web: Update from 1.5.2 -> 1.6

---
 pkgs/development/compilers/icedtea-web/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index ffff81b686a9..f1a7b9078156 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "icedtea-web-${version}";
 
-  version = "1.5.2";
+  version = "1.6";
 
   src = fetchurl {
     url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
 
-    sha256 = "1wrvl66qj0yhaqqhcq24005ci5sc3w005809cld55iiwagr8z7mj";
+    sha256 = "0z8iirvpciai55s4vhpfkhyx4h4hm6dqy4pg4c61pia3innqd4qn";
   };
 
   buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ];

From b526c0fbb2e99a9f6d6c7f4f79a4e316aa980e77 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 2 May 2015 13:37:31 +0200
Subject: [PATCH 0312/1143] attic: Update hash

It seems to have happened the same thing as in
2c89d0b82dfcd399750ae685d91b63cc6b906ef9: the hash changed but
apparently no new commit was added...
---
 pkgs/tools/backup/attic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix
index b7bcadd73c58..fba7a28eded9 100644
--- a/pkgs/tools/backup/attic/default.nix
+++ b/pkgs/tools/backup/attic/default.nix
@@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchzip {
     name = "${name}-src";
     url = "https://github.com/jborg/attic/archive/0.15.tar.gz";
-    sha256 = "0bing5zg82mwvdi27jl77ardw65zaq4996k4677gz2lq7p7b4gd7";
+    sha256 = "0c5rsxxcg897a619cbv75hzi1ahpkym8dccf6y3jlcs98z11vm5d";
   };
 
   propagatedBuildInputs = with python3Packages;

From 5f9ee33df53d1c24a7c37a92f5c0b4cfe2dbc0ee Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Sat, 2 May 2015 14:37:31 +0200
Subject: [PATCH 0313/1143] pkgs: arangodb 2.5.2 -> 2.5.3

---
 pkgs/servers/nosql/arangodb/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 847d56b1f0aa..4ff12f630c9b 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, openssl, zlib, python, gyp, bash, go, readline }:
+{ stdenv, fetchFromGitHub, openssl, zlib, python, gyp, bash, go, readline }:
 
 stdenv.mkDerivation rec {
-  version = "2.5.2";
+  version = "2.5.3";
   name    = "arangodb-${version}";
 
-  src = fetchgit {
-    url = https://github.com/arangodb/arangodb.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "04l9palmh0jwbylapsss7d1s0h54wb6kng30zqsl3dq9l91ii6s0";
+  src = fetchFromGitHub {
+    repo = "arangodb";
+    owner = "arangodb";
+    rev = "67d995aa22ea341129398326fa10c5f6c14e94e9";
+    sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc";
   };
 
   buildInputs = [

From bb9ee2ab55f3d4a3ca03379ade14e2055ac1966c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 2 May 2015 14:44:34 +0200
Subject: [PATCH 0314/1143] Add vala 0.28

---
 pkgs/development/compilers/vala/0.28.nix | 30 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/compilers/vala/0.28.nix

diff --git a/pkgs/development/compilers/vala/0.28.nix b/pkgs/development/compilers/vala/0.28.nix
new file mode 100644
index 000000000000..caec4fda8873
--- /dev/null
+++ b/pkgs/development/compilers/vala/0.28.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
+, glib, libiconv, libintlOrEmpty
+}:
+
+let
+  major = "0.28";
+  minor = "0";
+  sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd";
+in
+stdenv.mkDerivation rec {
+  name = "vala-${major}.${minor}";
+
+  meta = {
+    description = "Compiler for GObject type system";
+    homepage = "http://live.gnome.org/Vala";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ antono lethalman ];
+  };
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
+    inherit sha256;
+  };
+
+  nativeBuildInputs = [ pkgconfig flex bison libxslt ];
+
+  buildInputs = [ glib libiconv ]
+    ++ libintlOrEmpty;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a1116126a96..d285b8f5adb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4477,6 +4477,8 @@ let
 
   vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { };
 
+  vala_0_28 = callPackage ../development/compilers/vala/0.28.nix { };
+
   visualcpp = callPackage ../development/compilers/visual-c++ { };
 
   vs90wrapper = callPackage ../development/compilers/vs90wrapper { };

From 8882805b07c0d71dfd7232cafea875fa6fb3751f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 2 May 2015 14:53:37 +0200
Subject: [PATCH 0315/1143] Add vte 2.90 to gnome 3.16 in case anybody still
 wants it

---
 pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix | 40 ++++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix       |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix

diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
new file mode 100644
index 000000000000..5ccca36bcaad
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  versionMajor = "0.36";
+  versionMinor = "3";
+  moduleName   = "vte";
+
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
+  };
+
+  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
+
+  configureFlags = [ "--enable-introspection" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.gnome.org/;
+    description = "A library implementing a terminal emulator widget for GTK+";
+    longDescription = ''
+      VTE is a library (libvte) implementing a terminal emulator widget for
+      GTK+, and a minimal sample application (vte) using that.  Vte is
+      mainly used in gnome-terminal, but can also be used to embed a
+      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
+      character set conversion, as well as emulating any terminal known to
+      the system's terminfo database.
+    '';
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ astsmtl antono lethalman ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 937d73b9421c..933e89dcd647 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -222,6 +222,8 @@ rec {
 
   vte = callPackage ./core/vte { };
 
+  vte_290 = callPackage ./core/vte/2.90.nix { };
+
   vte-select-text = vte.override { selectTextPatch = true; };
 
   vino = callPackage ./core/vino { };

From dd89ec5785dc173d9fad3a89df4b3d980cc00047 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 2 May 2015 22:15:29 +0900
Subject: [PATCH 0316/1143] Bump Android packages to newest versions, add
 androidsdk_5_1_1 and androidsdk_5_1_1_extras to env

Detailed changes:
- android-sdk: update 24.0.1 -> 24.1.2
- android-platforms: add 5.1.1
- android-platform-tools: update 21 -> 22
- android-build-tools: update 21.1.2 -> 22.0.1
- android-support: update 21 -> 22.1.1
- android-support-repository: update 9 -> 14
---
 pkgs/development/mobile/androidenv/addon.xml  | 154 +++--
 pkgs/development/mobile/androidenv/addons.nix |  89 +--
 .../mobile/androidenv/androidsdk.nix          |   6 +-
 .../mobile/androidenv/build-tools.nix         |  13 +-
 .../development/mobile/androidenv/default.nix |  14 +
 .../mobile/androidenv/generate-addons.xsl     |  36 +-
 .../mobile/androidenv/generate-platforms.xsl  |  26 +-
 .../mobile/androidenv/generate-sysimages.sh   |   2 +
 .../mobile/androidenv/generate-sysimages.xsl  |   2 +-
 .../mobile/androidenv/platform-tools.nix      |   6 +-
 .../mobile/androidenv/platforms-linux.nix     | 101 ++--
 .../mobile/androidenv/platforms-macosx.nix    | 102 ++--
 .../mobile/androidenv/repository-10.xml       | 534 ++++++++++++++----
 .../mobile/androidenv/support-repository.nix  |   9 +-
 .../development/mobile/androidenv/support.nix |   9 +-
 .../development/mobile/androidenv/sys-img.xml | 119 +++-
 .../mobile/androidenv/sysimages.nix           |  90 ++-
 17 files changed, 967 insertions(+), 345 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index 274ae734b6ee..334626b93ac0 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -440,6 +440,7 @@ August 15, 2011
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>34908058</sdk:size>
@@ -467,6 +468,7 @@ August 15, 2011
         <sdk:description>Android + Google APIs, revision 2</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>42435735</sdk:size>
@@ -550,6 +552,7 @@ August 15, 2011
         <sdk:description>Android + Google APIs, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>53691339</sdk:size>
@@ -659,6 +662,7 @@ August 15, 2011
         <sdk:description>Android + Google APIs, API 11, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>83477179</sdk:size>
@@ -686,6 +690,7 @@ August 15, 2011
         <sdk:description>Android + Google APIs, API 12, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>86099835</sdk:size>
@@ -713,6 +718,7 @@ August 15, 2011
         <sdk:description>Android + Google APIs, API 13, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>88615525</sdk:size>
@@ -738,6 +744,7 @@ August 15, 2011
         <sdk:api-level>14</sdk:api-level>
         <sdk:revision>2</sdk:revision>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
         <sdk:libs>
             <sdk:lib>
                 <sdk:name>com.google.android.maps</sdk:name>
@@ -876,14 +883,14 @@ August 15, 2011
     </sdk:add-on>
 
     <sdk:add-on>
-        <!-- Generated at Wed Jul 30 22:26:20 2014 from git_klp-sdk-release @ 1314097 -->
+        <!-- Generated at Wed Apr 22 12:31:26 2015 from git_klp-sdk-release @ 1873184 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-id>google_apis</sdk:name-id>
         <sdk:name-display>Google APIs (ARM System Image)</sdk:name-display>
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:api-level>19</sdk:api-level>
-        <sdk:revision>7</sdk:revision>
+        <sdk:revision>13</sdk:revision>
         <sdk:libs>
             <sdk:lib>
                 <sdk:name>com.google.android.maps</sdk:name>
@@ -897,9 +904,49 @@ August 15, 2011
         </sdk:libs>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>160661775</sdk:size>
-                <sdk:checksum type="sha1">150f5a3fec4f03313ca770b90126605619bd713c</sdk:checksum>
-                <sdk:url>google_apis-19_r07.zip</sdk:url>
+                <sdk:size>181034400</sdk:size>
+                <sdk:checksum type="sha1">75c8af27f1fdf83dc28057537b5bd62b794365cc</sdk:checksum>
+                <sdk:url>google_apis-19_r13.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:add-on>
+
+    <sdk:add-on>
+        <!-- Generated at Tue Oct 14 22:09:52 2014 from git_lmp-release @ 1504858 -->
+        <sdk:vendor-id>google</sdk:vendor-id>
+        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+        <sdk:name-id>google_apis</sdk:name-id>
+        <sdk:name-display>Google APIs</sdk:name-display>
+        <sdk:description>Android + Google APIs</sdk:description>
+        <sdk:api-level>21</sdk:api-level>
+        <sdk:revision>1</sdk:revision>
+        <sdk:libs/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>179499</sdk:size>
+                <sdk:checksum type="sha1">66a754efb24e9bb07cc51648426443c7586c9d4a</sdk:checksum>
+                <sdk:url>google_apis-21_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:add-on>
+
+    <sdk:add-on>
+        <!-- Generated at Mon Mar  2 16:24:05 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <sdk:vendor-id>google</sdk:vendor-id>
+        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+        <sdk:name-id>google_apis</sdk:name-id>
+        <sdk:name-display>Google APIs</sdk:name-display>
+        <sdk:description>Android + Google APIs</sdk:description>
+        <sdk:api-level>22</sdk:api-level>
+        <sdk:revision>1</sdk:revision>
+        <sdk:libs/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>179259</sdk:size>
+                <sdk:checksum type="sha1">5def0f42160cba8acff51b9c0c7e8be313de84f5</sdk:checksum>
+                <sdk:url>google_apis-22_r01.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -917,6 +964,7 @@ August 15, 2011
         <sdk:description>Android + Google TV, API 12, preview release</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-googletv-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>78266751</sdk:size>
@@ -938,6 +986,7 @@ August 15, 2011
         <sdk:description>Android + Google TV, API 13</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-googletv-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>87721879</sdk:size>
@@ -951,11 +1000,11 @@ August 15, 2011
     <!-- EXTRAS VENDOR=ANDROID ........................ -->
 
     <sdk:extra>
-        <!-- Generated at Mon Jun 23 19:18:59 2014 from git_klp-modular-release @ 1246132 -->
+        <!-- Generated at Fri Apr 24 09:30:00 2015 from git_lmp-mr1-supportlib-release @ 1877331 -->
         <sdk:revision>
-            <sdk:major>20</sdk:major>
-            <sdk:minor>0</sdk:minor>
-            <sdk:micro>0</sdk:micro>
+            <sdk:major>22</sdk:major>
+            <sdk:minor>1</sdk:minor>
+            <sdk:micro>1</sdk:micro>
         </sdk:revision>
         <sdk:vendor-display>Android</sdk:vendor-display>
         <sdk:vendor-id>android</sdk:vendor-id>
@@ -964,18 +1013,18 @@ August 15, 2011
         <sdk:old-paths>compatibility</sdk:old-paths>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>5508097</sdk:size>
-                <sdk:checksum type="sha1">719c260dc3eb950712988f987daaf91afa9e36af</sdk:checksum>
-                <sdk:url>support_r20.zip</sdk:url>
+                <sdk:size>8475991</sdk:size>
+                <sdk:checksum type='sha1'>88bdc7b4074065ed28681f39e6b32c4f7ab45d94</sdk:checksum>
+                <sdk:url>support_r22.1.1.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:extra>
 
     <sdk:extra>
-        <!-- Generated from git_lmp-preview-release @ 1242878  -->
+        <!-- Generated at Fri Apr 24 09:30:00 2015 from git_lmp-mr1-supportlib-release @ 1877331 -->
         <sdk:revision>
-            <sdk:major>6</sdk:major>
+            <sdk:major>14</sdk:major>
         </sdk:revision>
         <sdk:vendor-display>Android</sdk:vendor-display>
         <sdk:vendor-id>android</sdk:vendor-id>
@@ -984,12 +1033,12 @@ August 15, 2011
         <sdk:path>m2repository</sdk:path>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>22271942</sdk:size>
-                <sdk:checksum type="sha1">d4874fd330f41a7c16de392ce917c2a3562dd620</sdk:checksum>
-                <sdk:url>android_m2repository_r06.zip</sdk:url>
+                <sdk:size>68533453</sdk:size>
+                <sdk:checksum type="sha1">0011dfe1473ccdfb1a533a19cad152c59dcd6b45</sdk:checksum>
+                <sdk:url>android_m2repository_r14.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
-        <sdk:uses-license ref="android-sdk-preview-license"/>
+        <sdk:uses-license ref="android-sdk-license"/>
     </sdk:extra>
 
     <!-- EXTRAS VENDOR=GOOGLE ....................... -->
@@ -1000,15 +1049,15 @@ August 15, 2011
         <sdk:name-display>Google Repository</sdk:name-display>
         <sdk:path>m2repository</sdk:path>
         <sdk:revision>
-            <sdk:major>11</sdk:major>
+            <sdk:major>17</sdk:major>
         </sdk:revision>
         <sdk:description>Local Maven repository for Google Libraries</sdk:description>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>18832133</sdk:size>
-                <sdk:checksum type="sha1">08b5114037d187cf3d4b44a25570149ef4f8ab3d</sdk:checksum>
-                <sdk:url>google_m2repository_r11.zip</sdk:url>
+                <sdk:size>43508126</sdk:size>
+                <sdk:checksum type="sha1">a91a809149b69fab1efb4652c21b439e8b9e7150</sdk:checksum>
+                <sdk:url>google_m2repository_r17.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
@@ -1066,6 +1115,7 @@ August 15, 2011
         <sdk:description>Google Play services client library and sample code</sdk:description>
         <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>5265389</sdk:size>
@@ -1081,57 +1131,37 @@ August 15, 2011
         <sdk:name-display>Google Play services</sdk:name-display>
         <sdk:path>google_play_services</sdk:path>
         <sdk:revision>
-            <sdk:major>19</sdk:major>
+            <sdk:major>24</sdk:major>
         </sdk:revision>
         <sdk:description>Google Play services client library and sample code</sdk:description>
         <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>13982276</sdk:size>
-                <sdk:checksum type="sha1">847a8806dd3c43effc2afdd7b49fc6ba27f72d5d</sdk:checksum>
-                <sdk:url>google_play_services_5089000_r19.zip</sdk:url>
+                <sdk:size>17636517</sdk:size>
+                <sdk:checksum type="sha1">9dc5092c1043d6d9c162d481e668b95fc2f36782</sdk:checksum>
+                <sdk:url>google_play_services_7327000_r24.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
 
     <sdk:extra>
-        <sdk:vendor-id>google</sdk:vendor-id>
-        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
-        <sdk:name-display>Google Play services for Fit Preview</sdk:name-display>
-        <sdk:path>google_play_services_fit_preview</sdk:path>
-        <sdk:revision>
-            <sdk:major>1</sdk:major>
-        </sdk:revision>
-        <sdk:description>Google Play services client library and sample code</sdk:description>
-        <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
-        <sdk:uses-license ref="android-sdk-preview-license"/>
-        <sdk:archives>
-            <sdk:archive>
-                <sdk:size>15224769</sdk:size>
-                <sdk:checksum type="sha1">34369ca796268ec7274bc49d659d9e8f042b55ae</sdk:checksum>
-                <sdk:url>google_play_services_fit_preview_5208000_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-    </sdk:extra>
-
-    <sdk:extra>
-        <!-- Generated at Tue Jun 10 11:38:56 2014 from git_master-release @ 1216520 -->
+        <!-- Generated at Wed Sep 17 13:48:28 2014 from lmp-dev @ 1437156 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:path>usb_driver</sdk:path>
-        <sdk:description>USB Driver for Windows, revision 10</sdk:description>
+        <sdk:description>USB Driver for Windows, revision 11</sdk:description>
         <sdk:name-display>Google USB Driver</sdk:name-display>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:revision>
-            <sdk:major>10</sdk:major>
+            <sdk:major>11</sdk:major>
         </sdk:revision>
         <sdk:archives>
             <sdk:archive>
-                <sdk:url>usb_driver_r10-windows.zip</sdk:url>
-                <sdk:checksum type="sha1">a5f8280829f07bb3144a8d657ec7aa0128443a2c</sdk:checksum>
-                <sdk:size>8682752</sdk:size>
+                <sdk:url>usb_driver_r11-windows.zip</sdk:url>
+                <sdk:checksum type="sha1">dc8a2ed2fbd7246d4caf9ab10ffe7749dc35d1cc</sdk:checksum>
+                <sdk:size>8682859</sdk:size>
                 <sdk:host-os>windows</sdk:host-os>
             </sdk:archive>
         </sdk:archives>
@@ -1240,4 +1270,24 @@ August 15, 2011
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:obsolete/>
     </sdk:extra>
+
+    <sdk:extra>
+        <sdk:vendor-id>google</sdk:vendor-id>
+        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+        <sdk:name-display>Android Auto API Simulators</sdk:name-display>
+        <sdk:path>simulators</sdk:path>
+        <sdk:revision>
+            <sdk:major>1</sdk:major>
+        </sdk:revision>
+        <sdk:description>Android Auto API testing simulators</sdk:description>
+        <sdk:desc-url>http://developer.android.com/auto</sdk:desc-url>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>2167286</sdk:size>
+                <sdk:checksum type="sha1">4fb5344e34e8faab4db18af07dace44c50db26a7</sdk:checksum>
+                <sdk:url>simulator_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:extra>
 </sdk:sdk-addon>
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index 241aaeb0e812..ca4870cf4c8e 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -1,4 +1,6 @@
 
+# This file is generated from generate-addons.sh. DO NOT EDIT.
+# Execute generate-addons.sh or fetch.sh to update the file.
 {stdenv, fetchurl, unzip}:
 
 let
@@ -13,7 +15,7 @@ let
     });
 in
 {
-    
+
   google_apis_3 = buildGoogleApis {
     name = "google_apis-3";
       src = fetchurl {
@@ -25,7 +27,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_4 = buildGoogleApis {
     name = "google_apis-4";
       src = fetchurl {
@@ -37,7 +39,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_5 = buildGoogleApis {
     name = "google_apis-5";
       src = fetchurl {
@@ -49,7 +51,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_6 = buildGoogleApis {
     name = "google_apis-6";
       src = fetchurl {
@@ -61,7 +63,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_7 = buildGoogleApis {
     name = "google_apis-7";
       src = fetchurl {
@@ -73,7 +75,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_8 = buildGoogleApis {
     name = "google_apis-8";
       src = fetchurl {
@@ -85,7 +87,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_9 = buildGoogleApis {
     name = "google_apis-9";
       src = fetchurl {
@@ -97,7 +99,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_10 = buildGoogleApis {
     name = "google_apis-10";
       src = fetchurl {
@@ -109,7 +111,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_11 = buildGoogleApis {
     name = "google_apis-11";
       src = fetchurl {
@@ -121,7 +123,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_12 = buildGoogleApis {
     name = "google_apis-12";
       src = fetchurl {
@@ -133,7 +135,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_13 = buildGoogleApis {
     name = "google_apis-13";
       src = fetchurl {
@@ -145,7 +147,7 @@ in
         url = http://developer.android.com/;
       };
     };
-    
+
   google_apis_14 = buildGoogleApis {
     name = "google_apis-14";
       src = fetchurl {
@@ -154,10 +156,10 @@ in
       };
       meta = {
         description = "Android + Google APIs";
-        
+
       };
     };
-    
+
   google_apis_15 = buildGoogleApis {
     name = "google_apis-15";
       src = fetchurl {
@@ -166,10 +168,10 @@ in
       };
       meta = {
         description = "Android + Google APIs";
-        
+
       };
     };
-    
+
   google_apis_16 = buildGoogleApis {
     name = "google_apis-16";
       src = fetchurl {
@@ -178,10 +180,10 @@ in
       };
       meta = {
         description = "Android + Google APIs";
-        
+
       };
     };
-    
+
   google_apis_17 = buildGoogleApis {
     name = "google_apis-17";
       src = fetchurl {
@@ -190,10 +192,10 @@ in
       };
       meta = {
         description = "Android + Google APIs";
-        
+
       };
     };
-    
+
   google_apis_18 = buildGoogleApis {
     name = "google_apis-18";
       src = fetchurl {
@@ -202,38 +204,63 @@ in
       };
       meta = {
         description = "Android + Google APIs";
-        
+
       };
     };
-    
+
   google_apis_19 = buildGoogleApis {
     name = "google_apis-19";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-19_r07.zip;
-        sha1 = "150f5a3fec4f03313ca770b90126605619bd713c";
+        url = https://dl-ssl.google.com/android/repository/google_apis-19_r13.zip;
+        sha1 = "75c8af27f1fdf83dc28057537b5bd62b794365cc";
       };
       meta = {
         description = "Android + Google APIs";
-        
+
       };
     };
-  
+
+  google_apis_21 = buildGoogleApis {
+    name = "google_apis-21";
+      src = fetchurl {
+        url = https://dl-ssl.google.com/android/repository/google_apis-21_r01.zip;
+        sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a";
+      };
+      meta = {
+        description = "Android + Google APIs";
+
+      };
+    };
+
+  google_apis_22 = buildGoogleApis {
+    name = "google_apis-22";
+      src = fetchurl {
+        url = https://dl-ssl.google.com/android/repository/google_apis-22_r01.zip;
+        sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5";
+      };
+      meta = {
+        description = "Android + Google APIs";
+
+      };
+    };
+
   android_support_extra = buildGoogleApis {
     name = "android_support_extra";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/support_r20.zip;
-      sha1 = "719c260dc3eb950712988f987daaf91afa9e36af";
+      url = https://dl-ssl.google.com/android/repository/support_r22.1.1.zip;
+      sha1 = "88bdc7b4074065ed28681f39e6b32c4f7ab45d94";
     };
     meta = {
       description = "Android Support Library";
       url = http://developer.android.com/;
     };
   };
+
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/google_play_services_3265130_r12.zip;
-      sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9";
+      url = https://dl-ssl.google.com/android/repository/google_play_services_7327000_r24.zip;
+      sha1 = "9dc5092c1043d6d9c162d481e668b95fc2f36782";
     };
     meta = {
       description = "Google Play services client library and sample code";
@@ -241,6 +268,4 @@ in
     };
   };
 
-  
 }
-  
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index f4c3448c9213..ed7bd051a7a4 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -9,16 +9,16 @@
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
-  version = "24.0.1";
+  version = "24.1.2";
 
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz";
-      sha1 = "fb46b9afa04e09d3c33fa9bfee5c99e9ec6a9523";
+      sha1 = "a46298bjpgzsnchhpcm1i86c4r50x638";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip";
-      sha1 = "7097c09c72645d7ad33c81a37b1a1363a9df2a54";
+      sha1 = "as109624lgrn8krylmyvm33yapqkzr00";
     }
     else throw "platform not ${stdenv.system} supported!";
 
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 158d886a5e7d..3a7df3ce1afd 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,15 +1,16 @@
 {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}:
 
-stdenv.mkDerivation {
-  name = "android-build-tools-r21.1.2";
+stdenv.mkDerivation rec {
+  version="22.0.1";
+  name = "android-build-tools-r${version}";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-linux.zip;
-      sha1 = "5e35259843bf2926113a38368b08458735479658";
+      url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-linux.zip";
+      sha1 = "8sb05s9f1h03qa7hdj72jffy7rf9r2ys";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-macosx.zip;
-      sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48";
+      url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-macosx.zip";
+      sha1 = "pxdwrz6bb8b13fknf6qm67g013vdgnjk";
     }
     else throw "System ${stdenv.system} not supported!";
 
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index e99ab93b7aeb..5df4213d233a 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -142,6 +142,20 @@ rec {
     useGooglePlayServices = true;
   };
 
+  androidsdk_5_1_1 = androidsdk {
+    platformVersions = [ "22" ];
+    abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
+    useGoogleAPIs = true;
+  };
+
+  androidsdk_5_1_1_extras = androidsdk {
+    platformVersions = [ "22" ];
+    abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
+    useGoogleAPIs = true;
+    useExtraSupportLibs = true;
+    useGooglePlayServices = true;
+  };
+
   androidndk = import ./androidndk.nix {
     inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
     inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl
index 51d0c07c9346..a43731fdd08c 100644
--- a/pkgs/development/mobile/androidenv/generate-addons.xsl
+++ b/pkgs/development/mobile/androidenv/generate-addons.xsl
@@ -5,6 +5,8 @@
 
   <xsl:output omit-xml-declaration="yes" indent="no" />
   <xsl:template match="/sdk:sdk-addon">
+# This file is generated from generate-addons.sh. DO NOT EDIT.
+# Execute generate-addons.sh or fetch.sh to update the file.
 {stdenv, fetchurl, unzip}:
 
 let
@@ -19,7 +21,7 @@ let
     });
 in
 {
-    <xsl:for-each select="sdk:add-on[sdk:name-id='google_apis']">
+<xsl:for-each select="sdk:add-on[sdk:name-id='google_apis']">
   google_apis_<xsl:value-of select="sdk:api-level" /> = buildGoogleApis {
     name = "<xsl:value-of select="sdk:name-id" />-<xsl:value-of select="sdk:api-level" />";
       src = fetchurl {
@@ -28,11 +30,37 @@ in
       };
       meta = {
         description = "<xsl:value-of select="sdk:description" />";
-        <xsl:for-each select="sdk:desc-url">url = <xsl:value-of select="." />;</xsl:for-each>
+<xsl:for-each select="sdk:desc-url">        url = <xsl:value-of select="." />;</xsl:for-each>
       };
     };
-    </xsl:for-each>
+</xsl:for-each>
+
+<xsl:for-each select="sdk:extra[sdk:path='support']">
+  android_support_extra = buildGoogleApis {
+    name = "android_support_extra";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
+      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
+    };
+    meta = {
+      description = "Android Support Library";
+      url = http://developer.android.com/;
+    };
+  };
+</xsl:for-each><xsl:for-each select="sdk:extra[sdk:path='google_play_services']">
+  google_play_services = buildGoogleApis {
+    name = "google_play_services";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
+      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
+    };
+    meta = {
+      description = "Google Play services client library and sample code";
+      url = http://developer.android.com/;
+    };
+  };
+</xsl:for-each>
 }
-  </xsl:template>
+</xsl:template>
 
 </xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
index ba556f2baac9..7851f4899bf1 100644
--- a/pkgs/development/mobile/androidenv/generate-platforms.xsl
+++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl
@@ -5,7 +5,23 @@
 
   <xsl:param name="os" />
   <xsl:output omit-xml-declaration="yes" indent="no" />
+
+  <xsl:template name="repository-url">
+    <xsl:variable name="raw-url" select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url"/>
+    <xsl:choose>
+      <xsl:when test="starts-with($raw-url, 'http')">
+        <xsl:value-of select="$raw-url"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>https://dl-ssl.google.com/android/repository/</xsl:text>
+        <xsl:value-of select="$raw-url"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <xsl:template match="/sdk:sdk-repository">
+# This file is generated from generate-platforms.sh. DO NOT EDIT.
+# Execute generate-platforms.sh or fetch.sh to update the file.
 {stdenv, fetchurl, unzip}:
 
 let
@@ -20,19 +36,19 @@ let
   });
 in
 {
-    <xsl:for-each select="sdk:platform[sdk:api-level &lt; 20]">
+    <xsl:for-each select="sdk:platform">
   platform_<xsl:value-of select="sdk:api-level" /> = buildPlatform {
     name = "android-platform-<xsl:value-of select="sdk:version" />";
     src = fetchurl {
-      url = <xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url" />;
+      url = <xsl:call-template name="repository-url"/>;
       sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:checksum[@type='sha1']" />";
     };
     meta = {
       description = "<xsl:value-of select="sdk:description" />";
-      <xsl:for-each select="sdk:desc-url">url = <xsl:value-of select="." />;</xsl:for-each>
+<xsl:for-each select="sdk:desc-url">      url = <xsl:value-of select="." />;</xsl:for-each>
     };
   };
-    </xsl:for-each>
+</xsl:for-each>
 }
-  </xsl:template>
+</xsl:template>
 </xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh
index ef2f825642b7..586381e8ba66 100755
--- a/pkgs/development/mobile/androidenv/generate-sysimages.sh
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh
@@ -1,6 +1,8 @@
 #!/bin/sh -e
 
 cat > sysimages.nix << "EOF"
+# This file is generated from generate-sysimages.sh. DO NOT EDIT.
+# Execute generate-sysimages.sh or fetch.sh to update the file.
 {stdenv, fetchurl, unzip}:
 
 let
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
index 6de690622b5d..aa1e05e85a0e 100644
--- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
@@ -15,6 +15,6 @@
       sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
     };
   };
-    </xsl:for-each>
+</xsl:for-each>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 76e160fb0dae..1be54adaaed7 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,7 +1,7 @@
 {stdenv, stdenv_32bit, fetchurl, unzip}:
 
 let
-  version = "21";
+  version = "22";
 
 in
 
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-linux.zip";
-      sha256 = "35a1762b355451e000a816d97d9af640ca99ae6c5b5b406a3e680210af8106ad";
+      sha256 = "1kbp5fzfdas6c431n53a9w0z0182ihhadd1h8a64m1alkw0swr41";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
-      sha256 = "30ae8724da3db772a776d616b4746516f24ae81330e84315a7ce0c49e0b0b3cb";
+      sha256 = "0r359xxicn7zw9z0jbrmsppx1372fijg09ck907gg8x1cvzj2ry0";
     }
     else throw "System ${stdenv.system} not supported!";
 
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index 4ce1e421478a..cf509cdff97f 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -1,4 +1,6 @@
 
+# This file is generated from generate-platforms.sh. DO NOT EDIT.
+# Execute generate-platforms.sh or fetch.sh to update the file.
 {stdenv, fetchurl, unzip}:
 
 let
@@ -25,7 +27,7 @@ in
       url = http://developer.android.com/sdk/android-1.1.html;
     };
   };
-    
+
   platform_3 = buildPlatform {
     name = "android-platform-1.5";
     src = fetchurl {
@@ -37,7 +39,7 @@ in
       url = http://developer.android.com/sdk/android-1.5.html;
     };
   };
-    
+
   platform_4 = buildPlatform {
     name = "android-platform-1.6";
     src = fetchurl {
@@ -49,7 +51,7 @@ in
       url = http://developer.android.com/sdk/android-1.6.html;
     };
   };
-    
+
   platform_5 = buildPlatform {
     name = "android-platform-2.0";
     src = fetchurl {
@@ -61,7 +63,7 @@ in
       url = http://developer.android.com/sdk/android-2.0.html;
     };
   };
-    
+
   platform_6 = buildPlatform {
     name = "android-platform-2.0.1";
     src = fetchurl {
@@ -73,7 +75,7 @@ in
       url = http://developer.android.com/sdk/android-2.0.1.html;
     };
   };
-    
+
   platform_7 = buildPlatform {
     name = "android-platform-2.1";
     src = fetchurl {
@@ -85,7 +87,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_8 = buildPlatform {
     name = "android-platform-2.2";
     src = fetchurl {
@@ -97,7 +99,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_9 = buildPlatform {
     name = "android-platform-2.3.1";
     src = fetchurl {
@@ -109,7 +111,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_10 = buildPlatform {
     name = "android-platform-2.3.3";
     src = fetchurl {
@@ -121,7 +123,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_11 = buildPlatform {
     name = "android-platform-3.0";
     src = fetchurl {
@@ -133,7 +135,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_12 = buildPlatform {
     name = "android-platform-3.1";
     src = fetchurl {
@@ -145,7 +147,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_13 = buildPlatform {
     name = "android-platform-3.2";
     src = fetchurl {
@@ -157,76 +159,88 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_14 = buildPlatform {
     name = "android-platform-4.0";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-14_r03.zip;
-      sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5";
+      url = https://dl-ssl.google.com/android/repository/android-14_r04.zip;
+      sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
     };
     meta = {
       description = "Android SDK Platform 4.0";
-      
+
     };
   };
-    
+
   platform_15 = buildPlatform {
     name = "android-platform-4.0.3";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-15_r03.zip;
-      sha1 = "23da24610a8da51054c5391001c51ce43a778b97";
+      url = https://dl-ssl.google.com/android/repository/android-15_r05.zip;
+      sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
     };
     meta = {
       description = "Android SDK Platform 4.0.3";
-      
+
     };
   };
-    
+
   platform_16 = buildPlatform {
     name = "android-platform-4.1.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-16_r04.zip;
-      sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee";
+      url = https://dl-ssl.google.com/android/repository/android-16_r05.zip;
+      sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
     };
     meta = {
       description = "Android SDK Platform 4.1.2";
-      
+
     };
   };
-    
+
   platform_17 = buildPlatform {
     name = "android-platform-4.2.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-17_r02.zip;
-      sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec";
+      url = https://dl-ssl.google.com/android/repository/android-17_r03.zip;
+      sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
     };
     meta = {
       description = "Android SDK Platform 4.2.2";
-      
+
     };
   };
-    
+
   platform_18 = buildPlatform {
-    name = "android-platform-4.3";
+    name = "android-platform-4.3.1";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-18_r02.zip;
-      sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534";
+      url = https://dl-ssl.google.com/android/repository/android-18_r03.zip;
+      sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
     };
     meta = {
-      description = "Android SDK Platform 4.3";
-      
+      description = "Android SDK Platform 4.3.1";
+
     };
   };
-    
+
   platform_19 = buildPlatform {
     name = "android-platform-4.4.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-19_r03.zip;
-      sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95";
+      url = https://dl-ssl.google.com/android/repository/android-19_r04.zip;
+      sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
     };
     meta = {
       description = "Android SDK Platform 4.4.2";
-      
+
+    };
+  };
+
+  platform_20 = buildPlatform {
+    name = "android-platform-4.4W.2";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/android-20_r02.zip;
+      sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
+    };
+    meta = {
+      description = "Android SDK Platform 4.4W.2";
+
     };
   };
 
@@ -238,6 +252,19 @@ in
     };
     meta = {
       description = "Android SDK Platform 5.0.1";
+
+    };
+  };
+
+  platform_22 = buildPlatform {
+    name = "android-platform-5.1.1";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/android-22_r02.zip;
+      sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
+    };
+    meta = {
+      description = "Android SDK Platform 5.1.1";
+
     };
   };
 
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index 1f41d8dda9e2..c9ec3dd6e840 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -1,4 +1,6 @@
 
+# This file is generated from generate-platforms.sh. DO NOT EDIT.
+# Execute generate-platforms.sh or fetch.sh to update the file.
 {stdenv, fetchurl, unzip}:
 
 let
@@ -25,7 +27,7 @@ in
       url = http://developer.android.com/sdk/android-1.1.html;
     };
   };
-    
+
   platform_3 = buildPlatform {
     name = "android-platform-1.5";
     src = fetchurl {
@@ -37,7 +39,7 @@ in
       url = http://developer.android.com/sdk/android-1.5.html;
     };
   };
-    
+
   platform_4 = buildPlatform {
     name = "android-platform-1.6";
     src = fetchurl {
@@ -49,7 +51,7 @@ in
       url = http://developer.android.com/sdk/android-1.6.html;
     };
   };
-    
+
   platform_5 = buildPlatform {
     name = "android-platform-2.0";
     src = fetchurl {
@@ -61,7 +63,7 @@ in
       url = http://developer.android.com/sdk/android-2.0.html;
     };
   };
-    
+
   platform_6 = buildPlatform {
     name = "android-platform-2.0.1";
     src = fetchurl {
@@ -73,7 +75,7 @@ in
       url = http://developer.android.com/sdk/android-2.0.1.html;
     };
   };
-    
+
   platform_7 = buildPlatform {
     name = "android-platform-2.1";
     src = fetchurl {
@@ -85,7 +87,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_8 = buildPlatform {
     name = "android-platform-2.2";
     src = fetchurl {
@@ -97,7 +99,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_9 = buildPlatform {
     name = "android-platform-2.3.1";
     src = fetchurl {
@@ -109,7 +111,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_10 = buildPlatform {
     name = "android-platform-2.3.3";
     src = fetchurl {
@@ -121,7 +123,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_11 = buildPlatform {
     name = "android-platform-3.0";
     src = fetchurl {
@@ -133,7 +135,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_12 = buildPlatform {
     name = "android-platform-3.1";
     src = fetchurl {
@@ -145,7 +147,7 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_13 = buildPlatform {
     name = "android-platform-3.2";
     src = fetchurl {
@@ -157,76 +159,88 @@ in
       url = http://developer.android.com/sdk/;
     };
   };
-    
+
   platform_14 = buildPlatform {
     name = "android-platform-4.0";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-14_r03.zip;
-      sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5";
+      url = https://dl-ssl.google.com/android/repository/android-14_r04.zip;
+      sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
     };
     meta = {
       description = "Android SDK Platform 4.0";
-      
+
     };
   };
-    
+
   platform_15 = buildPlatform {
     name = "android-platform-4.0.3";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-15_r03.zip;
-      sha1 = "23da24610a8da51054c5391001c51ce43a778b97";
+      url = https://dl-ssl.google.com/android/repository/android-15_r05.zip;
+      sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
     };
     meta = {
       description = "Android SDK Platform 4.0.3";
-      
+
     };
   };
-    
+
   platform_16 = buildPlatform {
     name = "android-platform-4.1.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-16_r04.zip;
-      sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee";
+      url = https://dl-ssl.google.com/android/repository/android-16_r05.zip;
+      sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
     };
     meta = {
       description = "Android SDK Platform 4.1.2";
-      
+
     };
   };
-    
+
   platform_17 = buildPlatform {
     name = "android-platform-4.2.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-17_r02.zip;
-      sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec";
+      url = https://dl-ssl.google.com/android/repository/android-17_r03.zip;
+      sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
     };
     meta = {
       description = "Android SDK Platform 4.2.2";
-      
+
     };
   };
-    
+
   platform_18 = buildPlatform {
-    name = "android-platform-4.3";
+    name = "android-platform-4.3.1";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-18_r02.zip;
-      sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534";
+      url = https://dl-ssl.google.com/android/repository/android-18_r03.zip;
+      sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
     };
     meta = {
-      description = "Android SDK Platform 4.3";
-      
+      description = "Android SDK Platform 4.3.1";
+
     };
   };
-    
+
   platform_19 = buildPlatform {
     name = "android-platform-4.4.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-19_r03.zip;
-      sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95";
+      url = https://dl-ssl.google.com/android/repository/android-19_r04.zip;
+      sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
     };
     meta = {
       description = "Android SDK Platform 4.4.2";
-      
+
+    };
+  };
+
+  platform_20 = buildPlatform {
+    name = "android-platform-4.4W.2";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/android-20_r02.zip;
+      sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
+    };
+    meta = {
+      description = "Android SDK Platform 4.4W.2";
+
     };
   };
 
@@ -238,8 +252,20 @@ in
     };
     meta = {
       description = "Android SDK Platform 5.0.1";
+
+    };
+  };
+
+  platform_22 = buildPlatform {
+    name = "android-platform-5.1.1";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/android-22_r02.zip;
+      sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
+    };
+    meta = {
+      description = "Android SDK Platform 5.1.1";
+
     };
   };
 
-    
 }
diff --git a/pkgs/development/mobile/androidenv/repository-10.xml b/pkgs/development/mobile/androidenv/repository-10.xml
index 81023cae2eea..fa07307e01e1 100644
--- a/pkgs/development/mobile/androidenv/repository-10.xml
+++ b/pkgs/development/mobile/androidenv/repository-10.xml
@@ -329,6 +329,7 @@ June 2014.
         </sdk:min-tools-rev>
         <sdk:description>Android SDK Platform 1.5_r3</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/android-1.5.html</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>54624370</sdk:size>
@@ -365,6 +366,7 @@ June 2014.
         </sdk:min-tools-rev>
         <sdk:description>Android SDK Platform 1.6_r2</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/android-1.6.html</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>63454485</sdk:size>
@@ -481,6 +483,7 @@ June 2014.
         </sdk:min-tools-rev>
         <sdk:description>Android SDK Platform 2.1_r3</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>70142829</sdk:size>
@@ -582,6 +585,7 @@ June 2014.
         </sdk:min-tools-rev>
         <sdk:description>Android SDK Platform 3.0, revision 2</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>104513908</sdk:size>
@@ -609,6 +613,7 @@ June 2014.
         </sdk:min-tools-rev>
         <sdk:description>Android SDK Platform 3.1, revision 3</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>106472351</sdk:size>
@@ -634,6 +639,7 @@ June 2014.
         </sdk:min-tools-rev>
         <sdk:description>Android SDK Platform 3.2, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>108426536</sdk:size>
@@ -648,51 +654,52 @@ June 2014.
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Thu Dec 15 16:53:11 2011 from git_ics-mr0 @ 238991 -->
-        <sdk:revision>3</sdk:revision>
+        <!-- Generated at Thu Sep 11 14:16:21 2014 from git_ics-mr0 @ 1406408 -->
+        <sdk:revision>4</sdk:revision>
         <sdk:description>Android SDK Platform 4.0</sdk:description>
         <sdk:version>4.0</sdk:version>
         <sdk:api-level>14</sdk:api-level>
         <sdk:layoutlib>
-            <sdk:api>7</sdk:api>
+            <sdk:api>12</sdk:api>
             <sdk:revision>1</sdk:revision>
         </sdk:layoutlib>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>45919570</sdk:size>
-                <sdk:checksum type="sha1">41ba83b51e886461628c41b1b4d47762e0688ed5</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/android-14_r03.zip</sdk:url>
+                <sdk:size>46038082</sdk:size>
+                <sdk:checksum type="sha1">d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c</sdk:checksum>
+                <sdk:url>android-14_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Fri Mar 16 11:22:43 2012 from ics-mr1 @ 291902 -->
-        <sdk:revision>3</sdk:revision>
+        <!-- Generated at Thu Sep 11 14:16:02 2014 from git_ics-mr1 @ 1406430 -->
+        <sdk:revision>5</sdk:revision>
         <sdk:description>Android SDK Platform 4.0.3</sdk:description>
         <sdk:version>4.0.3</sdk:version>
         <sdk:api-level>15</sdk:api-level>
         <sdk:min-tools-rev>
-            <sdk:major>15</sdk:major>
+            <sdk:major>21</sdk:major>
         </sdk:min-tools-rev>
         <sdk:layoutlib>
-            <sdk:api>7</sdk:api>
+            <sdk:api>12</sdk:api>
             <sdk:revision>1</sdk:revision>
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>44414679</sdk:size>
-                <sdk:checksum type="sha1">23da24610a8da51054c5391001c51ce43a778b97</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/android-15_r03.zip</sdk:url>
+                <sdk:size>44533475</sdk:size>
+                <sdk:checksum type="sha1">69ab4c443b37184b2883af1fd38cc20cbeffd0f3</sdk:checksum>
+                <sdk:url>android-15_r05.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Thu Dec  6 10:54:05 2012 from git_jb-dev @ 543062 -->
-        <sdk:revision>4</sdk:revision>
+        <!-- Generated at Thu Sep 11 14:15:43 2014 from git_jb-dev @ 1425332 -->
+        <sdk:revision>5</sdk:revision>
         <sdk:description>Android SDK Platform 4.1.2</sdk:description>
         <sdk:version>4.1.2</sdk:version>
         <sdk:api-level>16</sdk:api-level>
@@ -700,22 +707,22 @@ June 2014.
             <sdk:major>21</sdk:major>
         </sdk:min-tools-rev>
         <sdk:layoutlib>
-            <sdk:api>9</sdk:api>
+            <sdk:api>12</sdk:api>
             <sdk:revision>1</sdk:revision>
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>48005140</sdk:size>
-                <sdk:checksum type="sha1">90b9157b8b45f966be97e11a22fba4591b96c2ee</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/android-16_r04.zip</sdk:url>
+                <sdk:size>48128695</sdk:size>
+                <sdk:checksum type="sha1">12a5ce6235a76bc30f62c26bda1b680e336abd07</sdk:checksum>
+                <sdk:url>android-16_r05.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Wed Feb 13 11:27:09 2013 from git_jb-mr1.1-dev @ 576024 -->
-        <sdk:revision>2</sdk:revision>
+        <!-- Generated at Thu Sep 11 14:15:23 2014 from git_jb-mr1.1-dev @ 1425461 -->
+        <sdk:revision>3</sdk:revision>
         <sdk:description>Android SDK Platform 4.2.2</sdk:description>
         <sdk:version>4.2.2</sdk:version>
         <sdk:api-level>17</sdk:api-level>
@@ -723,45 +730,45 @@ June 2014.
             <sdk:major>21</sdk:major>
         </sdk:min-tools-rev>
         <sdk:layoutlib>
-            <sdk:api>9</sdk:api>
+            <sdk:api>12</sdk:api>
             <sdk:revision>1</sdk:revision>
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>48057484</sdk:size>
-                <sdk:checksum type="sha1">c442c32c1b702173ab0929a74486e4f86fe528ec</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/android-17_r02.zip</sdk:url>
+                <sdk:size>57030216</sdk:size>
+                <sdk:checksum type="sha1">dbe14101c06e6cdb34e300393e64e64f8c92168a</sdk:checksum>
+                <sdk:url>android-17_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Wed Sep 11 18:15:07 2013 from git_jb-mr2-dev @ 819563 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.3</sdk:description>
-        <sdk:version>4.3</sdk:version>
+        <!-- Generated at Thu Sep 11 14:14:59 2014 from git_jb-mr2-dev @ 1425645 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 4.3.1</sdk:description>
+        <sdk:version>4.3.1</sdk:version>
         <sdk:api-level>18</sdk:api-level>
         <sdk:min-tools-rev>
             <sdk:major>21</sdk:major>
         </sdk:min-tools-rev>
         <sdk:layoutlib>
-            <sdk:api>10</sdk:api>
+            <sdk:api>12</sdk:api>
             <sdk:revision>1</sdk:revision>
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>57319855</sdk:size>
-                <sdk:checksum type="sha1">62a9438d4cf6692f4d6510c27a380be195db9534</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/android-18_r02.zip</sdk:url>
+                <sdk:size>57771739</sdk:size>
+                <sdk:checksum type="sha1">e6b09b3505754cbbeb4a5622008b907262ee91cb</sdk:checksum>
+                <sdk:url>android-18_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Fri Feb 28 18:03:43 2014 from git_klp-sdk-release @ 1035858 -->
-        <sdk:revision>3</sdk:revision>
+        <!-- Generated at Mon Sep 22 15:22:30 2014 from git_klp-sdk-release @ 1456859 -->
+        <sdk:revision>4</sdk:revision>
         <sdk:description>Android SDK Platform 4.4.2</sdk:description>
         <sdk:version>4.4.2</sdk:version>
         <sdk:api-level>19</sdk:api-level>
@@ -769,64 +776,86 @@ June 2014.
             <sdk:major>22</sdk:major>
         </sdk:min-tools-rev>
         <sdk:layoutlib>
-            <sdk:api>10</sdk:api>
+            <sdk:api>12</sdk:api>
             <sdk:revision>1</sdk:revision>
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>63798840</sdk:size>
-                <sdk:checksum type="sha1">5f33d8fd36a384fe2b170035e04a29c274a9ef95</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/android-19_r03.zip</sdk:url>
+                <sdk:size>63871092</sdk:size>
+                <sdk:checksum type="sha1">2ff20d89e68f2f5390981342e009db5a2d456aaa</sdk:checksum>
+                <sdk:url>android-19_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Mon Jun 23 19:17:42 2014 from git_klp-modular-release @ 1246132 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform 4.4W</sdk:description>
-        <sdk:version>4.4W</sdk:version>
+        <!-- Generated at Thu Oct 23 11:39:31 2014 from git_klp-modular-dev @ 1537038 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.4W.2</sdk:description>
+        <sdk:version>4.4W.2</sdk:version>
         <sdk:api-level>20</sdk:api-level>
         <sdk:min-tools-rev>
             <sdk:major>22</sdk:major>
         </sdk:min-tools-rev>
         <sdk:layoutlib>
-            <sdk:api>10</sdk:api>
+            <sdk:api>12</sdk:api>
             <sdk:revision>1</sdk:revision>
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>63548914</sdk:size>
-                <sdk:checksum type="sha1">928b1d181101a5bc06f739eb40501e1249dd4895</sdk:checksum>
-                <sdk:url>android-20_r01.zip</sdk:url>
+                <sdk:size>63567784</sdk:size>
+                <sdk:checksum type="sha1">a9251f8a3f313ab05834a07a963000927637e01d</sdk:checksum>
+                <sdk:url>android-20_r02.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Fri Jul 11 18:20:46 2014 from git_lmp-preview-dev @ 1272903 -->
-        <sdk:revision>3</sdk:revision>
-        <sdk:description>Android SDK Platform L</sdk:description>
-        <sdk:version>L</sdk:version>
-        <sdk:api-level>20</sdk:api-level>
-        <sdk:codename>L</sdk:codename>
+        <!-- Generated at Thu Dec  4 12:23:51 2014 from git_lmp-dev @ 1624448 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 5.0.1</sdk:description>
+        <sdk:version>5.0.1</sdk:version>
+        <sdk:api-level>21</sdk:api-level>
         <sdk:min-tools-rev>
             <sdk:major>22</sdk:major>
         </sdk:min-tools-rev>
         <sdk:layoutlib>
-            <sdk:api>11</sdk:api>
-            <sdk:revision>1</sdk:revision>
+            <sdk:api>12</sdk:api>
+            <sdk:revision>2</sdk:revision>
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>69421660</sdk:size>
-                <sdk:checksum type="sha1">76b6da426db06b2e2901dbc5e02d210ba83753c4</sdk:checksum>
-                <sdk:url>android-L_r03.zip</sdk:url>
+                <sdk:size>65897960</sdk:size>
+                <sdk:checksum type="sha1">53536556059bb29ae82f414fd2e14bc335a4eb4c</sdk:checksum>
+                <sdk:url>android-21_r02.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
-        <sdk:uses-license ref="android-sdk-preview-license"/>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Mon Mar 30 10:48:23 2015 from git_lmp-mr1-sdk-release @ 1819727 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 5.1.1</sdk:description>
+        <sdk:version>5.1.1</sdk:version>
+        <sdk:api-level>22</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>22</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>14</sdk:api>
+            <sdk:revision>2</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>66852371</sdk:size>
+                <sdk:checksum type="sha1">5d1bd10fea962b216a0dece1247070164760a9fc</sdk:checksum>
+                <sdk:url>android-22_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <!-- SAMPLES ........................ -->
@@ -839,6 +868,7 @@ June 2014.
         <sdk:revision>01</sdk:revision>
         <sdk:description>Android SDK Samples for Android API 7, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>7677831</sdk:size>
@@ -912,6 +942,7 @@ June 2014.
         <sdk:revision>01</sdk:revision>
         <sdk:description>Android SDK Samples for Android API 11, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>11976920</sdk:size>
@@ -930,6 +961,7 @@ June 2014.
         <sdk:revision>01</sdk:revision>
         <sdk:description>Android SDK Samples for Android API 12, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>12150514</sdk:size>
@@ -948,6 +980,7 @@ June 2014.
         <sdk:revision>01</sdk:revision>
         <sdk:description>Android SDK Samples for Android API 13, revision 1</sdk:description>
         <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>12193502</sdk:size>
@@ -962,6 +995,7 @@ June 2014.
         <!-- Generated at Wed Dec  7 13:48:27 2011 from git_ics-mr0 @ 234950 -->
         <sdk:revision>2</sdk:revision>
         <sdk:api-level>14</sdk:api-level>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>16253619</sdk:size>
@@ -1043,60 +1077,73 @@ June 2014.
     </sdk:sample>
 
     <sdk:sample>
-        <!-- Generated at Wed Jul 23 12:59:18 2014 from git_klp-modular-mr0-release @ 1298572 -->
-        <sdk:revision>2</sdk:revision>
+        <!-- Generated at Mon Nov 17 16:23:46 2014 from git_klp-modular-docs @ 1587091 -->
+        <sdk:revision>3</sdk:revision>
         <sdk:api-level>20</sdk:api-level>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>49718791</sdk:size>
-                <sdk:checksum type="sha1">4b906c46057ee8f502b4f27c23670fd87a49d6ff</sdk:checksum>
-                <sdk:url>samples-20_r02.zip</sdk:url>
+                <sdk:size>50796850</sdk:size>
+                <sdk:checksum type="sha1">8b1290b0b707827808392e8178094a68dfb51a14</sdk:checksum>
+                <sdk:url>samples-20_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:sample>
 
     <sdk:sample>
-        <!-- Generated at Wed Aug 27 10:44:44 2014 from git_lmp-preview-dev @ 1378586 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:api-level>20</sdk:api-level>
-        <sdk:codename>L</sdk:codename>
+        <!-- Generated at Mon Dec 9 17:22:11 2014 from git_lmp-docs @ 1634277 -->
+        <sdk:revision>4</sdk:revision>
+        <sdk:api-level>21</sdk:api-level>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>41182182</sdk:size>
-                <sdk:checksum type="sha1">4afc36cf3f53051881729f733fe9bb571104c48f</sdk:checksum>
-                <sdk:url>samples-L_r02.zip</sdk:url>
+                <sdk:size>95971939</sdk:size>
+                <sdk:checksum type="sha1">3a08d37e97f567f5f629a06a9012f89b05c5ad8a</sdk:checksum>
+                <sdk:url>samples-21_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
-        <sdk:uses-license ref="android-sdk-preview-license"/>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Mon Mar  2 16:26:21 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <sdk:revision>5</sdk:revision>
+        <sdk:api-level>22</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>107981157</sdk:size>
+                <sdk:checksum type="sha1">dbc5cc27b5d15acc25cd6b94b8c2971806b70bb0</sdk:checksum>
+                <sdk:url>samples-22_r05.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
     </sdk:sample>
 
     <!-- PLATFORM-TOOLS ........................ -->
 
     <sdk:platform-tool>
-        <!-- Generated at Mon Jun 23 19:20:39 2014 from git_lmp-preview-dev @ 1244090 -->
+        <!-- Generated at Mon Mar  2 16:26:07 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
         <sdk:revision>
-            <sdk:major>20</sdk:major>
+            <sdk:major>22</sdk:major>
             <sdk:minor>0</sdk:minor>
             <sdk:micro>0</sdk:micro>
         </sdk:revision>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>1741113</sdk:size>
-                <sdk:checksum type="sha1">72c34cc6a991f53e2588f9d5487559f013bc30f9</sdk:checksum>
-                <sdk:url>platform-tools_r20-windows.zip</sdk:url>
+                <sdk:size>1848028</sdk:size>
+                <sdk:checksum type="sha1">720214bd29d08eb82673cd81a8159b083eef19d7</sdk:checksum>
+                <sdk:url>platform-tools_r22-windows.zip</sdk:url>
                 <sdk:host-os>windows</sdk:host-os>
             </sdk:archive>
             <sdk:archive>
-                <sdk:size>1753061</sdk:size>
-                <sdk:checksum type="sha1">fb120ce85b6698b801cb4788b204693c1d682b87</sdk:checksum>
-                <sdk:url>platform-tools_r20-linux.zip</sdk:url>
+                <sdk:size>1751911</sdk:size>
+                <sdk:checksum type="sha1">b78be9cc31cf9f9fe0609e29a6a133beacf03b52</sdk:checksum>
+                <sdk:url>platform-tools_r22-linux.zip</sdk:url>
                 <sdk:host-os>linux</sdk:host-os>
             </sdk:archive>
             <sdk:archive>
-                <sdk:size>1666257</sdk:size>
-                <sdk:checksum type="sha1">f2c65c58caf76169d9bebf25eef5c69ff99670b5</sdk:checksum>
-                <sdk:url>platform-tools_r20-macosx.zip</sdk:url>
+                <sdk:size>1743025</sdk:size>
+                <sdk:checksum type="sha1">ddc96385bccf8a15d4f8a11eb1cb9d2a08a531c8</sdk:checksum>
+                <sdk:url>platform-tools_r22-macosx.zip</sdk:url>
                 <sdk:host-os>macosx</sdk:host-os>
             </sdk:archive>
         </sdk:archives>
@@ -1112,6 +1159,7 @@ June 2014.
             <sdk:minor>0</sdk:minor>
             <sdk:micro>0</sdk:micro>
         </sdk:revision>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>11004914</sdk:size>
@@ -1144,6 +1192,7 @@ June 2014.
             <sdk:minor>0</sdk:minor>
             <sdk:micro>1</sdk:micro>
         </sdk:revision>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>15413527</sdk:size>
@@ -1174,6 +1223,7 @@ June 2014.
             <sdk:minor>1</sdk:minor>
             <sdk:micro>0</sdk:micro>
         </sdk:revision>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>19659547</sdk:size>
@@ -1204,6 +1254,7 @@ June 2014.
             <sdk:minor>1</sdk:minor>
             <sdk:micro>1</sdk:micro>
         </sdk:revision>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>19660000</sdk:size>
@@ -1234,6 +1285,7 @@ June 2014.
             <sdk:minor>0</sdk:minor>
             <sdk:micro>0</sdk:micro>
         </sdk:revision>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>20611447</sdk:size>
@@ -1264,6 +1316,7 @@ June 2014.
             <sdk:minor>0</sdk:minor>
             <sdk:micro>1</sdk:micro>
         </sdk:revision>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>20500648</sdk:size>
@@ -1294,6 +1347,7 @@ June 2014.
             <sdk:minor>0</sdk:minor>
             <sdk:micro>2</sdk:micro>
         </sdk:revision>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>20621117</sdk:size>
@@ -1324,6 +1378,7 @@ June 2014.
             <sdk:minor>0</sdk:minor>
             <sdk:micro>3</sdk:micro>
         </sdk:revision>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>20730715</sdk:size>
@@ -1407,13 +1462,259 @@ June 2014.
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:build-tool>
 
+    <sdk:build-tool>
+        <!-- Generated at Thu Oct 16 16:51:40 2014 from git_lmp-release @ 1521886 -->
+        <sdk:revision>
+            <sdk:major>21</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>22306371</sdk:size>
+                <sdk:checksum type="sha1">5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32</sdk:checksum>
+                <sdk:url>build-tools_r21-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>22153145</sdk:size>
+                <sdk:checksum type="sha1">4933328fdeecbd554a29528f254f4993468e1cf4</sdk:checksum>
+                <sdk:url>build-tools_r21-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>22668456</sdk:size>
+                <sdk:checksum type="sha1">9bef7989b51436bd4e5114d8a0330359f077cbfa</sdk:checksum>
+                <sdk:url>build-tools_r21-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Fri Oct 17 18:37:07 2014 from git_lmp-release @ 1525922 -->
+        <sdk:revision>
+            <sdk:major>21</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>1</sdk:micro>
+        </sdk:revision>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>22306243</sdk:size>
+                <sdk:checksum type="sha1">d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df</sdk:checksum>
+                <sdk:url>build-tools_r21.0.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>22153013</sdk:size>
+                <sdk:checksum type="sha1">e573069eea3e5255e7a65bedeb767f4fd0a5f49a</sdk:checksum>
+                <sdk:url>build-tools_r21.0.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>22668616</sdk:size>
+                <sdk:checksum type="sha1">b60c8f9b810c980abafa04896706f3911be1ade7</sdk:checksum>
+                <sdk:url>build-tools_r21.0.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Tue Oct 21 14:50:58 2014 from git_lmp-release @ 1532339 -->
+        <sdk:revision>
+            <sdk:major>21</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>2</sdk:micro>
+        </sdk:revision>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>22306371</sdk:size>
+                <sdk:checksum type="sha1">37496141b23cbe633167927b7abe6e22d9f1a1c1</sdk:checksum>
+                <sdk:url>build-tools_r21.0.2-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>22153122</sdk:size>
+                <sdk:checksum type="sha1">e1236ab8897b62b57414adcf04c132567b2612a5</sdk:checksum>
+                <sdk:url>build-tools_r21.0.2-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>22668597</sdk:size>
+                <sdk:checksum type="sha1">f17471c154058f3734729ef3cc363399b1cd3de1</sdk:checksum>
+                <sdk:url>build-tools_r21.0.2-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Thu Oct 30 13:18:55 2014 from git_lmp-sdk-release @ 1552913 -->
+        <sdk:revision>
+            <sdk:major>21</sdk:major>
+            <sdk:minor>1</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>32797810</sdk:size>
+                <sdk:checksum type="sha1">c79d63ac6b713a1e326ad4dae43f2ee76708a2f4</sdk:checksum>
+                <sdk:url>build-tools_r21.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>32642820</sdk:size>
+                <sdk:checksum type="sha1">b7455e543784d52a8925f960bc880493ed1478cb</sdk:checksum>
+                <sdk:url>build-tools_r21.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>33158159</sdk:size>
+                <sdk:checksum type="sha1">df619356c2359aa5eacdd48699d15b335d9bd246</sdk:checksum>
+                <sdk:url>build-tools_r21.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Mon Nov  3 13:43:11 2014 from git_lmp-sdk-release @ 1559046 -->
+        <sdk:revision>
+            <sdk:major>21</sdk:major>
+            <sdk:minor>1</sdk:minor>
+            <sdk:micro>1</sdk:micro>
+        </sdk:revision>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>32797356</sdk:size>
+                <sdk:checksum type="sha1">53fc4201237f899d5cd92f0b76ad41fb89da188b</sdk:checksum>
+                <sdk:url>build-tools_r21.1.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>32642454</sdk:size>
+                <sdk:checksum type="sha1">1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d</sdk:checksum>
+                <sdk:url>build-tools_r21.1.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>33157676</sdk:size>
+                <sdk:checksum type="sha1">836a146eab0504aa9387a5132e986fe7c7381571</sdk:checksum>
+                <sdk:url>build-tools_r21.1.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Tue Dec  9 15:56:55 2014 from git_lmp-sdk-release @ 1635773 -->
+        <sdk:revision>
+            <sdk:major>21</sdk:major>
+            <sdk:minor>1</sdk:minor>
+            <sdk:micro>2</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>32792587</sdk:size>
+                <sdk:checksum type="sha1">1d944759c47f60e634d2b8a1f3a4259be2f8d652</sdk:checksum>
+                <sdk:url>build-tools_r21.1.2-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>32637678</sdk:size>
+                <sdk:checksum type="sha1">5e35259843bf2926113a38368b08458735479658</sdk:checksum>
+                <sdk:url>build-tools_r21.1.2-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>33152878</sdk:size>
+                <sdk:checksum type="sha1">e7c906b4ba0eea93b32ba36c610dbd6b204bff48</sdk:checksum>
+                <sdk:url>build-tools_r21.1.2-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Mon Mar  2 21:35:23 2015 from git_lmp-mr1-sdk-release @ 1764203 -->
+        <sdk:revision>
+            <sdk:major>22</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>33254114</sdk:size>
+                <sdk:checksum type="sha1">08fcca41e81b172bd9f570963b90d3a84929e043</sdk:checksum>
+                <sdk:url>build-tools_r22-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>33104280</sdk:size>
+                <sdk:checksum type="sha1">a8a1619dd090e44fac957bce6842e62abf87965b</sdk:checksum>
+                <sdk:url>build-tools_r22-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>33646090</sdk:size>
+                <sdk:checksum type="sha1">af95429b24088d704bc5db9bd606e34ac1b82c0d</sdk:checksum>
+                <sdk:url>build-tools_r22-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Tue Mar 17 10:54:01 2015 from git_lmp-mr1-sdk-release @ 1793126 -->
+        <sdk:revision>
+            <sdk:major>22</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>1</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>33254137</sdk:size>
+                <sdk:checksum type="sha1">61d8cbe069d9e0a57872a83e5e5abe164b7d52cf</sdk:checksum>
+                <sdk:url>build-tools_r22.0.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>33104577</sdk:size>
+                <sdk:checksum type="sha1">da8b9c5c3ede39298e6cf0283c000c2ee9029646</sdk:checksum>
+                <sdk:url>build-tools_r22.0.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>33646102</sdk:size>
+                <sdk:checksum type="sha1">53dad7f608e01d53b17176ba11165acbfccc5bbf</sdk:checksum>
+                <sdk:url>build-tools_r22.0.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
     <!-- TOOLS ........................ -->
 
     <sdk:tool>
-        <!-- Generated at Wed Jul  2 12:10:55 2014 from git_ub-tools-idea133-milestone @ 1259578 -->
+        <!-- Generated at Fri Feb 27 14:06:48 2015 from aosp-studio-1.1-release @ 1758498 -->
         <sdk:revision>
-            <sdk:major>23</sdk:major>
-            <sdk:minor>0</sdk:minor>
+            <sdk:major>24</sdk:major>
+            <sdk:minor>1</sdk:minor>
             <sdk:micro>2</sdk:micro>
         </sdk:revision>
         <sdk:min-platform-tools-rev>
@@ -1421,21 +1722,21 @@ June 2014.
         </sdk:min-platform-tools-rev>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>141154615</sdk:size>
-                <sdk:checksum type="sha1">0a64ec9b7777bb00ff299c94c359163ef5e443ae</sdk:checksum>
-                <sdk:url>tools_r23.0.2-windows.zip</sdk:url>
+                <sdk:size>159505060</sdk:size>
+                <sdk:checksum type="sha1">c20ffa023618c5cb6953131d6dbb0c628a3a1a14</sdk:checksum>
+                <sdk:url>tools_r24.1.2-windows.zip</sdk:url>
                 <sdk:host-os>windows</sdk:host-os>
             </sdk:archive>
             <sdk:archive>
-                <sdk:size>141930870</sdk:size>
-                <sdk:checksum type="sha1">e8a2d55d750adeaded60a3daad48e62b09aa472a</sdk:checksum>
-                <sdk:url>tools_r23.0.2-linux.zip</sdk:url>
+                <sdk:size>169061591</sdk:size>
+                <sdk:checksum type="sha1">c7c30f6da6eff6323260f0353ccaacc984ea6b3e</sdk:checksum>
+                <sdk:url>tools_r24.1.2-linux.zip</sdk:url>
                 <sdk:host-os>linux</sdk:host-os>
             </sdk:archive>
             <sdk:archive>
-                <sdk:size>90920343</sdk:size>
-                <sdk:checksum type="sha1">c46b1e173188ba82a56d6b9e349fdae4e8922bab</sdk:checksum>
-                <sdk:url>tools_r23.0.2-macosx.zip</sdk:url>
+                <sdk:size>89081357</sdk:size>
+                <sdk:checksum type="sha1">e32ba2fb21cc92ec4f1f01b5cb9a06f666eee460</sdk:checksum>
+                <sdk:url>tools_r24.1.2-macosx.zip</sdk:url>
                 <sdk:host-os>macosx</sdk:host-os>
             </sdk:archive>
         </sdk:archives>
@@ -1445,18 +1746,17 @@ June 2014.
     <!-- DOCS ........................ -->
 
     <sdk:doc>
-        <!-- Generated at Mon Jun 23 19:19:47 2014 from git_lmp-preview-release @ 1242878 -->
+        <!-- Generated at Mon Mar  2 16:25:22 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
         <sdk:revision>1</sdk:revision>
-        <sdk:api-level>20</sdk:api-level>
-        <sdk:codename>L</sdk:codename>
+        <sdk:api-level>22</sdk:api-level>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>207889084</sdk:size>
-                <sdk:checksum type="sha1">58a94248c7c960829db3d779c84534e5e783210f</sdk:checksum>
-                <sdk:url>docs-L_r01.zip</sdk:url>
+                <sdk:size>296467484</sdk:size>
+                <sdk:checksum type="sha1">419791c49fa0a305a06966fd1734cf5b0498ea1a</sdk:checksum>
+                <sdk:url>docs-22_r01.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
-        <sdk:uses-license ref="android-sdk-preview-license"/>
+        <sdk:uses-license ref="android-sdk-license"/>
     </sdk:doc>
 
     <!-- SOURCES ........................ -->
@@ -1465,6 +1765,7 @@ June 2014.
         <!-- Generated at Wed Dec  7 13:48:11 2011 from git_ics-mr0 @ 234950 -->
         <sdk:revision>1</sdk:revision>
         <sdk:api-level>14</sdk:api-level>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>16152383</sdk:size>
@@ -1558,5 +1859,34 @@ June 2014.
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Thu Oct 16 16:53:14 2014 from git_lmp-release @ 1521886 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>21</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>28274751</sdk:size>
+                <sdk:checksum type="sha1">137a5044915d32bea297a8c1552684802bbc2e25</sdk:checksum>
+                <sdk:url>sources-21_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Mon Mar  2 16:26:31 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>22</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>28861236</sdk:size>
+                <sdk:checksum type="sha1">98320e13976d11597a4a730a8d203ac9a03ed5a6</sdk:checksum>
+                <sdk:url>sources-22_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
+
 </sdk:sdk-repository>
 
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
index 6905cb24993f..c0c2fb47fcdd 100644
--- a/pkgs/development/mobile/androidenv/support-repository.nix
+++ b/pkgs/development/mobile/androidenv/support-repository.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
-  name = "android-support-repository-r9";
+stdenv.mkDerivation rec {
+  version = "14";
+  name = "android-support-repository-r${version}";
   src = fetchurl {
-    url = http://dl-ssl.google.com/android/repository/android_m2repository_r09.zip;
-    sha256 = "e5295cdbc086251a2904c081038a7f10056359481c66ecff40e59177fd1c753c";
+    url = "http://dl-ssl.google.com/android/repository/android_m2repository_r${version}.zip";
+    sha256 = "027mmfzvs07nbp28vn6c6cgszqdrmmgwdfzda87936lpi5dwg34p";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix
index d9d24f9bf9f4..772ecad8f8a0 100644
--- a/pkgs/development/mobile/androidenv/support.nix
+++ b/pkgs/development/mobile/androidenv/support.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
-  name = "android-support-r21";
+stdenv.mkDerivation rec {
+  version = "22.1.1";
+  name = "android-support-r${version}";
   src = fetchurl {
-    url = https://dl-ssl.google.com/android/repository/support_r21.zip;
-    sha1 = "f9ef8def5c64f17cd8bc41c5efddd37cb155f0be";
+    url = "https://dl-ssl.google.com/android/repository/support_r${version}.zip";
+    sha1 = "jifv8yjg5jrycf8zd0lfsra00yscggc8";
   };
   
   buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 5d2b0f7a883a..ef6507035f3b 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -423,6 +423,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
         <sdk:description>Android SDK Platform 4.0</sdk:description>
         <sdk:api-level>14</sdk:api-level>
         <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:obsolete/>
         <sdk:archives>
             <sdk:archive>
                 <sdk:size>99621822</sdk:size>
@@ -520,40 +521,22 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
     </sdk:system-image>
 
     <sdk:system-image>
-        <!-- Generated at Mon Jun 23 19:22:34 2014 from git_lmp-preview-release @ 1242878 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform L</sdk:description>
-        <sdk:api-level>20</sdk:api-level>
-        <sdk:codename>L</sdk:codename>
+        <!-- Generated at Fri Mar  6 08:10:49 2015 from git_lmp-sdk-release @ 1772600 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 5.0.2</sdk:description>
+        <sdk:api-level>21</sdk:api-level>
         <sdk:abi>armeabi-v7a</sdk:abi>
         <sdk:tag-id>default</sdk:tag-id>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>227716008</sdk:size>
-                <sdk:checksum type="sha1">1d5d81a7078b5b2a685620d93e1e04a51d2e786a</sdk:checksum>
-                <sdk:url>sysimg_armv7a-L_r01.zip</sdk:url>
+                <sdk:size>186521381</sdk:size>
+                <sdk:checksum type="sha1">0b2e21421d29f48211b5289ca4addfa7f4c7ae5a</sdk:checksum>
+                <sdk:url>sysimg_arm-21_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
-        <sdk:uses-license ref="android-sdk-preview-license"/>
+        <sdk:uses-license ref="android-sdk-license"/>
     </sdk:system-image>
 
-    <sdk:system-image>
-        <!-- Generated at Mon Jun 23 19:23:13 2014 from git_lmp-preview-release @ 1242878 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform L</sdk:description>
-        <sdk:api-level>20</sdk:api-level>
-        <sdk:codename>L</sdk:codename>
-        <sdk:abi>x86</sdk:abi>
-        <sdk:tag-id>default</sdk:tag-id>
-        <sdk:archives>
-            <sdk:archive>
-                <sdk:size>245850484</sdk:size>
-                <sdk:checksum type="sha1">c2d32d6244821ff59f370469778525f6a5345010</sdk:checksum>
-                <sdk:url>sysimg_x86-L_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-preview-license"/>
-    </sdk:system-image>
     <!-- X86 SYSTEM IMAGES ........................ -->
 
     <sdk:system-image>
@@ -653,6 +636,90 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
         <sdk:tag-id>default</sdk:tag-id>
     </sdk:system-image>
 
+    <sdk:system-image>
+        <!-- Generated at Fri Mar  6 08:10:07 2015 from git_lmp-sdk-release @ 1772600 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 5.0.2</sdk:description>
+        <sdk:api-level>21</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>201601288</sdk:size>
+                <sdk:checksum type="sha1">a0b510c66769e84fa5e40515531be2d266a4247f</sdk:checksum>
+                <sdk:url>sysimg_x86-21_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Fri Mar  6 08:10:31 2015 from git_lmp-sdk-release @ 1772600 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 5.0.2</sdk:description>
+        <sdk:api-level>21</sdk:api-level>
+        <sdk:abi>x86_64</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>285253158</sdk:size>
+                <sdk:checksum type="sha1">2f205b728695d84488156f4846beb83a353ea64b</sdk:checksum>
+                <sdk:url>sysimg_x86_64-21_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Mon Mar  2 11:00:17 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 5.1</sdk:description>
+        <sdk:api-level>22</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>207436768</sdk:size>
+                <sdk:checksum type="sha1">6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15</sdk:checksum>
+                <sdk:url>sysimg_x86-22_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Mon Mar  2 11:00:41 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 5.1</sdk:description>
+        <sdk:api-level>22</sdk:api-level>
+        <sdk:abi>x86_64</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>292511941</sdk:size>
+                <sdk:checksum type="sha1">05752813603f9fa03a58dcf7f8f5e779be722aae</sdk:checksum>
+                <sdk:url>sysimg_x86_64-22_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Mon Mar  2 11:01:02 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 5.1</sdk:description>
+        <sdk:api-level>22</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>193687339</sdk:size>
+                <sdk:checksum type="sha1">2aa6a887ee75dcf3ac34627853d561997792fcb8</sdk:checksum>
+                <sdk:url>sysimg_arm-22_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
     <!-- MIPS SYSTEM IMAGES ........................ -->
 
     <sdk:system-image>
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index ddc6dd99d39d..83ca0d498309 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -1,3 +1,5 @@
+# This file is generated from generate-sysimages.sh. DO NOT EDIT.
+# Execute generate-sysimages.sh or fetch.sh to update the file.
 {stdenv, fetchurl, unzip}:
 
 let
@@ -20,7 +22,7 @@ in
       sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
     };
   };
-    
+
   sysimg_armeabi-v7a_15 = buildSystemImage {
     name = "sysimg-armeabi-v7a-15";
     src = fetchurl {
@@ -28,7 +30,7 @@ in
       sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e";
     };
   };
-    
+
   sysimg_armeabi-v7a_16 = buildSystemImage {
     name = "sysimg-armeabi-v7a-16";
     src = fetchurl {
@@ -36,7 +38,7 @@ in
       sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7";
     };
   };
-    
+
   sysimg_armeabi-v7a_17 = buildSystemImage {
     name = "sysimg-armeabi-v7a-17";
     src = fetchurl {
@@ -44,7 +46,7 @@ in
       sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c";
     };
   };
-    
+
   sysimg_armeabi-v7a_18 = buildSystemImage {
     name = "sysimg-armeabi-v7a-18";
     src = fetchurl {
@@ -52,7 +54,7 @@ in
       sha1 = "4a1a93200210d8c42793324362868846f67401ab";
     };
   };
-    
+
   sysimg_armeabi-v7a_19 = buildSystemImage {
     name = "sysimg-armeabi-v7a-19";
     src = fetchurl {
@@ -60,23 +62,15 @@ in
       sha1 = "e0d375397e28e3d5d9577a00132463a4696248e5";
     };
   };
-    
-  sysimg_armeabi-v7a_20 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-20";
+
+  sysimg_armeabi-v7a_21 = buildSystemImage {
+    name = "sysimg-armeabi-v7a-21";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-L_r01.zip;
-      sha1 = "1d5d81a7078b5b2a685620d93e1e04a51d2e786a";
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip;
+      sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a";
     };
   };
-    
-  sysimg_x86_20 = buildSystemImage {
-    name = "sysimg-x86-20";
-    src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-L_r01.zip;
-      sha1 = "c2d32d6244821ff59f370469778525f6a5345010";
-    };
-  };
-    
+
   sysimg_x86_10 = buildSystemImage {
     name = "sysimg-x86-10";
     src = fetchurl {
@@ -84,7 +78,7 @@ in
       sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d";
     };
   };
-    
+
   sysimg_x86_15 = buildSystemImage {
     name = "sysimg-x86-15";
     src = fetchurl {
@@ -92,7 +86,7 @@ in
       sha1 = "d540325952e0f097509622b9e685737584b83e40";
     };
   };
-    
+
   sysimg_x86_16 = buildSystemImage {
     name = "sysimg-x86-16";
     src = fetchurl {
@@ -100,7 +94,7 @@ in
       sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a";
     };
   };
-    
+
   sysimg_x86_17 = buildSystemImage {
     name = "sysimg-x86-17";
     src = fetchurl {
@@ -108,7 +102,7 @@ in
       sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b";
     };
   };
-    
+
   sysimg_x86_18 = buildSystemImage {
     name = "sysimg-x86-18";
     src = fetchurl {
@@ -116,7 +110,7 @@ in
       sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1";
     };
   };
-    
+
   sysimg_x86_19 = buildSystemImage {
     name = "sysimg-x86-19";
     src = fetchurl {
@@ -124,7 +118,47 @@ in
       sha1 = "8889cb418984a2a7916a359da7c429d2431ed060";
     };
   };
-    
+
+  sysimg_x86_21 = buildSystemImage {
+    name = "sysimg-x86-21";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip;
+      sha1 = "a0b510c66769e84fa5e40515531be2d266a4247f";
+    };
+  };
+
+  sysimg_x86_64_21 = buildSystemImage {
+    name = "sysimg-x86_64-21";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r03.zip;
+      sha1 = "2f205b728695d84488156f4846beb83a353ea64b";
+    };
+  };
+
+  sysimg_x86_22 = buildSystemImage {
+    name = "sysimg-x86-22";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-22_r01.zip;
+      sha1 = "6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15";
+    };
+  };
+
+  sysimg_x86_64_22 = buildSystemImage {
+    name = "sysimg-x86_64-22";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r01.zip;
+      sha1 = "05752813603f9fa03a58dcf7f8f5e779be722aae";
+    };
+  };
+
+  sysimg_armeabi-v7a_22 = buildSystemImage {
+    name = "sysimg-armeabi-v7a-22";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip;
+      sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8";
+    };
+  };
+
   sysimg_mips_15 = buildSystemImage {
     name = "sysimg-mips-15";
     src = fetchurl {
@@ -132,7 +166,7 @@ in
       sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
     };
   };
-    
+
   sysimg_mips_16 = buildSystemImage {
     name = "sysimg-mips-16";
     src = fetchurl {
@@ -140,7 +174,7 @@ in
       sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
     };
   };
-    
+
   sysimg_mips_17 = buildSystemImage {
     name = "sysimg-mips-17";
     src = fetchurl {
@@ -148,4 +182,4 @@ in
       sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
     };
   };
-    }
+}

From 5c0512aca04dfe04e8188704b66efafd1e0679ff Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 10:57:35 -0500
Subject: [PATCH 0317/1143] ceph: add zlib to buildInputs

---
 pkgs/tools/filesystems/ceph/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 825d14c9fb17..36baee6b99d5 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which
-, boost, python, pythonPackages, libxml2, git
+, boost, python, pythonPackages, libxml2, git, zlib
 
 # Optional Dependencies
 , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
-    boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask
+    boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "0.95") [
     git                   # Used for the gitversion string
     pythonPackages.sphinx # Used for docs

From 1c08ecc94cf954496a23435e7d2ee4d3dc70a463 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 13:30:53 -0500
Subject: [PATCH 0318/1143] clementine: build with required patches

---
 pkgs/applications/audio/clementine/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 4b56052e4782..c60c3e99741e 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -3,7 +3,7 @@
 , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
 , sparsehash, config, makeWrapper, gst_plugins }:
 
-let 
+let
   version = "1.2.3";
 
   withSpotify = config.clementine.spotify or false;
@@ -18,7 +18,10 @@ let
       sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
     };
 
-    patches = [ ./clementine-1.2.1-include-paths.patch ];
+    patches = [
+      ./clementine-1.2.1-include-paths.patch
+      ./clementine-dbus-namespace.patch
+    ];
 
     buildInputs = [
       boost
@@ -55,11 +58,6 @@ stdenv.mkDerivation {
 
   src = ./.;
 
-  patches = [
-    ./clementine-1.2.1-include-paths.patch
-    ./clementine-dbus-namespace.patch
-  ];
-
   buildInputs = [
     wrapped
     makeWrapper

From c8aae45c27ceca3cea5779f55f404aa4ec7d33a6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 13:37:10 -0500
Subject: [PATCH 0319/1143] clementine: wrapped -> unwrapped

---
 pkgs/applications/audio/clementine/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index c60c3e99741e..7cb3aa41465f 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -8,10 +8,10 @@ let
 
   withSpotify = config.clementine.spotify or false;
 
-  wrappedExeName = "clementine";
+  exeName = "clementine";
 
-  wrapped = stdenv.mkDerivation {
-    name = "clementine-wrapped-${version}";
+  unwrapped = stdenv.mkDerivation {
+    name = "clementine-unwrapped-${version}";
 
     src = fetchurl {
       url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
   src = ./.;
 
   buildInputs = [
-    wrapped
+    unwrapped
     makeWrapper
   ] ++ gst_plugins
     ++ stdenv.lib.optional withSpotify libspotify;

From 9d63a5beea8b4a8b48df1e59edcc3d25d4fc3a72 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 13:37:44 -0500
Subject: [PATCH 0320/1143] clementine: don't copy files unnecessarily

---
 pkgs/applications/audio/clementine/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 7cb3aa41465f..c55f3f4d0aaf 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -65,11 +65,8 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional withSpotify libspotify;
 
   installPhase = ''
-    mkdir -p $out
-    cp -a ${wrapped}/* $out
-    chmod -R u+w-t $out
-
-    wrapProgram "$out/bin/${wrappedExeName}" \
+    mkdir -p $out/bin
+    makeWrapper "${unwrapped}/bin/${exeName}" "$out/bin/${exeName}" \
         --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
   '';
 

From 5b80605cfd73bac41286804e9d0be1ccaf2f7b6a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 13:38:16 -0500
Subject: [PATCH 0321/1143] clementine: disable build-time libspotify support

Clementine can download the Spotify support blob at runtime for
supported platforms, but we cannot distribute it because of licensing
restrictions.
---
 pkgs/applications/audio/clementine/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index c55f3f4d0aaf..9e9af0be94d1 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -6,8 +6,6 @@
 let
   version = "1.2.3";
 
-  withSpotify = config.clementine.spotify or false;
-
   exeName = "clementine";
 
   unwrapped = stdenv.mkDerivation {
@@ -61,8 +59,7 @@ stdenv.mkDerivation {
   buildInputs = [
     unwrapped
     makeWrapper
-  ] ++ gst_plugins
-    ++ stdenv.lib.optional withSpotify libspotify;
+  ] ++ gst_plugins;
 
   installPhase = ''
     mkdir -p $out/bin
@@ -77,15 +74,11 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://www.clementine-player.org";
     description = "A multiplatform music player"
-      + " ("
-      + concatStrings (optionals (withSpotify) ["with spotify, "])
-      + "with gstreamer plugins: "
+      + " (with gstreamer plugins: "
       + concatStrings (intersperse ", " (map (x: x.name) gst_plugins))
       + ")";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.ttuegel ];
-    # libspotify is unfree
-    hydraPlatforms = optionals (!withSpotify) platforms.linux;
   };
 }

From 5bfd9f515ff799d0b92fa8fee0c7f3e001bc4f53 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 13:48:04 -0500
Subject: [PATCH 0322/1143] clementine: build wrapper with runCommand

We only need to run the makeWrapper command to make the wrapper, so
there's no need to set src, either.
---
 .../applications/audio/clementine/default.nix | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 9e9af0be94d1..de5fd148aa1a 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
 , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
 , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
-, sparsehash, config, makeWrapper, gst_plugins }:
+, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
 
 let
   version = "1.2.3";
@@ -51,26 +51,11 @@ let
 
 in
 
-stdenv.mkDerivation {
-  name = "clementine-${version}";
-
-  src = ./.;
-
-  buildInputs = [
-    unwrapped
-    makeWrapper
-  ] ++ gst_plugins;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    makeWrapper "${unwrapped}/bin/${exeName}" "$out/bin/${exeName}" \
-        --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
-  '';
-
-  preferLocalBuild = true;
+runCommand "clementine-${version}"
+{
+  buildInputs = [ unwrapped makeWrapper ] ++ gst_plugins;
   dontPatchELF = true;
   dontStrip = true;
-
   meta = with stdenv.lib; {
     homepage = "http://www.clementine-player.org";
     description = "A multiplatform music player"
@@ -82,3 +67,8 @@ stdenv.mkDerivation {
     maintainers = [ maintainers.ttuegel ];
   };
 }
+''
+  mkdir -p $out/bin
+  makeWrapper "${unwrapped}/bin/${exeName}" "$out/bin/${exeName}" \
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+''

From bd55792892dc6cc5db172e41f2b36998b3397143 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 13:59:58 -0500
Subject: [PATCH 0323/1143] libvorbis: propagate libogg dependency

---
 pkgs/development/libraries/libvorbis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 7e34c6e9b9fa..cff6cbe8616f 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libogg ];
+  propagatedBuildInputs = [ libogg ];
 
   doCheck = true;
 

From 5535793302fce083a8cd6bceba2c05380c0ace4f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 14:43:16 -0500
Subject: [PATCH 0324/1143] ncurses5: add old ABI version for binary packages

---
 pkgs/development/libraries/ncurses/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix                | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 9ce486323a73..538c136a042b 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -5,6 +5,7 @@
 
 # Extra Options
 , unicode ? true
+, abiVersion ? null
 }:
 
 let
@@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
     (mkEnable unicode     "widec"       null)
     (mkEnable true        "ext-colors"  null)
     (mkEnable true        "ext-mouse"   null)
-  ];
+  ] ++ stdenv.lib.optional (abiVersion != null) (mkWith true "abi-version" abiVersion);
 
   # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
   # directory doesn't exist, the configure script will disable installation of
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3dd92a1e083..c8c4c716a258 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7241,6 +7241,10 @@ let
 
   ncurses = callPackage ../development/libraries/ncurses { };
 
+  ncurses5 = callPackage ../development/libraries/ncurses {
+    abiVersion = "5";
+  };
+
   neon = callPackage ../development/libraries/neon {
     compressionSupport = true;
     sslSupport = true;

From d1bf222c14c294b0020a6d48636d1edae145f0a8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 2 May 2015 14:43:34 -0500
Subject: [PATCH 0325/1143] ghc: GHC 7.x.y binary builds need libncursesw.so.5

---
 pkgs/top-level/haskell-ng.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix
index 0051c2b3e21f..f068b8b9a12b 100644
--- a/pkgs/top-level/haskell-ng.nix
+++ b/pkgs/top-level/haskell-ng.nix
@@ -7,10 +7,16 @@ rec {
   compiler = {
 
     ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };
-    ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+    ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({
+      gmp = pkgs.gmp4;
+      ncurses = pkgs.ncurses5;
+    } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
-    ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+    ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({
+      gmp = pkgs.gmp4;
+      ncurses = pkgs.ncurses5;
+    } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
 

From 1a6cddff0ed9688d32c0a31eba8b7a918554f08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 2 May 2015 22:03:30 +0200
Subject: [PATCH 0326/1143] pythonPackages.httpretty: add certifi dependency

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8aafa0e2f8e..782acbdf3c4c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5994,7 +5994,7 @@ let
       md5 = "50b02560a49fe928c90c53a49791f621";
     };
 
-    buildInputs = with self; [ tornado requests httplib2 sure nose coverage ];
+    buildInputs = with self; [ tornado requests httplib2 sure nose coverage certifi ];
 
     propagatedBuildInputs = with self; [ urllib3 ];
 

From c9f7c574eca907070066b75a459688433b587fb1 Mon Sep 17 00:00:00 2001
From: Utku Demir <utdemir@gmail.com>
Date: Sat, 2 May 2015 22:04:26 +0200
Subject: [PATCH 0327/1143] pythonPackages.pyzmq: 13.0.0 -> 14.5.0

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 782acbdf3c4c..d409993a45d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13979,10 +13979,10 @@ let
   };
 
   pyzmq = buildPythonPackage rec {
-    name = "pyzmq-13.0.0";
+    name = "pyzmq-14.5.0";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyzmq/pyzmq-13.0.0.zip";
-      md5 = "fa2199022e54a393052d380c6e1a0934";
+      url = "http://pypi.python.org/packages/source/p/pyzmq/${name}.tar.gz";
+      sha256 = "1gbpgz4ngfw5x6zlsa1k0jwy5vd5wg9iz1shdx4zav256ib08vjx";
     };
     buildInputs = with self; [ pkgs.zeromq3 ];
     doCheck = false;

From a5b17ecc945eda6e7248ff7cf2bd17430f003e9a Mon Sep 17 00:00:00 2001
From: Utku Demir <utdemir@gmail.com>
Date: Sat, 2 May 2015 22:04:26 +0200
Subject: [PATCH 0328/1143] pythonPackages.tornado: 3.2 -> 4.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d409993a45d5..816b49afe360 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13850,13 +13850,13 @@ let
 
 
   tornado = buildPythonPackage rec {
-    name = "tornado-3.2";
+    name = "tornado-4.1";
 
     propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
-      md5 = "bd83cee5f1a5c5e139e87996d00b251b";
+      sha256 = "0a12f00h277zbifibnj46wf14801f573irvf6hwkgja5vspd7awr";
     };
 
     doCheck = false;

From ebe3802a8f117989251f1af32ad0397e9c236c60 Mon Sep 17 00:00:00 2001
From: Utku Demir <utdemir@gmail.com>
Date: Sat, 2 May 2015 22:04:26 +0200
Subject: [PATCH 0329/1143] pythonPackages.ipython: 2.3.1 -> 3.1.0

---
 pkgs/shells/ipython/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index 09b2d30ea7ca..47705a05cc87 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null;
 assert pylabQtSupport == true -> pyqt4 != null;
 
 buildPythonPackage rec {
-  name = "ipython-2.3.1";
+  name = "ipython-3.1.0";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "1764gi5m3ff481rjk336cw6i2h4zlc0nxam9rc5m8m7yl9m4d61y";
+    url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
+    sha256 = "092nilrkr76l1mklnslgbw1cz7z1xabp1hz5s7cb30kgy39r482k";
   };
 
   propagatedBuildInputs = [
@@ -28,6 +28,7 @@ buildPythonPackage rec {
     pythonPackages.tornado
     pythonPackages.pyzmq
     pythonPackages.jinja2
+    pythonPackages.jsonschema
   ] ++ stdenv.lib.optionals qtconsoleSupport [
     pythonPackages.pygments
     pythonPackages.pyzmq

From ca03cf5c70797d7a4b78bd012e4e1193b85f13b8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 2 May 2015 23:13:26 +0200
Subject: [PATCH 0330/1143] xmoto: refactor, remove patches and add myself to
 maintainers

---
 pkgs/games/xmoto/default.nix              | 44 ++++++++++-------------
 pkgs/games/xmoto/src-for-default.nix      |  9 -----
 pkgs/games/xmoto/src-info-for-default.nix |  7 ----
 pkgs/top-level/all-packages.nix           |  6 +---
 4 files changed, 20 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/games/xmoto/src-for-default.nix
 delete mode 100644 pkgs/games/xmoto/src-info-for-default.nix

diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index 5695bb5b4294..7d4f2e53a941 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -1,32 +1,26 @@
-a :  
-let 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
+{ stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg
+, libpng, freeglut, mesa, SDL, SDL_mixer, SDL_image, SDL_net
+, SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "xmoto-${version}";
+  version = "0.5.11";
+
+  src = fetchurl {
+    url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
+    sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155";
+  };
+
+  buildInputs = [
     chipmunk sqlite curl zlib bzip2 libjpeg libpng
     freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf 
     lua5 ode libxdg_basedir libxml2
   ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
 
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = [ "patchIncludes" "doConfigure" "doMakeInstall"];
-  patchIncludes = a.fullDepEntry ''
-    sed -e '1i#include <sys/types.h>' -i src/helpers//System.cpp
-    sed -e '1i#include <unistd.h>' -i src/helpers//System.cpp
-  '' ["doUnpack" "minInit"];
-
-  meta = {
-    description = "X-Moto - obstacled race game";
-    maintainers = [
-      a.lib.maintainers.raskin
-      a.lib.maintainers.viric
-    ];
-    platforms = a.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Obstacled race game";
+    homepage = http://xmoto.tuxfamily.org;
+    maintainers = with maintainers; [ raskin viric pSub ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix
deleted file mode 100644
index beb3f6af1645..000000000000
--- a/pkgs/games/xmoto/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="0.5.11";
-   name="xmoto-0.5.11";
-   hash="1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155";
-   url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
-   advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz";
-  
-  
-}
diff --git a/pkgs/games/xmoto/src-info-for-default.nix b/pkgs/games/xmoto/src-info-for-default.nix
deleted file mode 100644
index 8d5d3f49822c..000000000000
--- a/pkgs/games/xmoto/src-info-for-default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  downloadPage = "http://xmoto.tuxfamily.org/";
-  baseName = "xmoto";
-  sourceRegexp = "xmoto-.*-src[.]tar[.].*";
-  versionExtractorSedScript = ''$dashDelimitedVersion'';
-  versionReferenceCreator=''$(replaceAllVersionOccurences)'';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96f04b611517..1afde965760c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9851,11 +9851,7 @@ let
 
   xf86_video_nouveau = xorg.xf86videonouveau;
 
-  xmoto = builderDefsPackage (import ../games/xmoto) {
-    inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
-      freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
-      lua5 ode libxdg_basedir libxml2;
-  };
+  xmoto = callPackage ../games/xmoto { };
 
   xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
 

From 2514f80bdf326d349ce85991ec5a36645e7feaf3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 2 May 2015 23:16:21 +0200
Subject: [PATCH 0331/1143] removed phpPackages.apc

We no longer build packages for php-5.4 and apc is
obsolete and will not build for later versions of php.
See #7615 and #7518.
---
 pkgs/top-level/php-packages.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 6f99cd76cfaa..9187d5606028 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -33,12 +33,6 @@ let self = with self; {
     sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd";
   };
 
-  apc = buildPecl {
-    name = "apc-3.1.13";
-
-    sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y";
-  };
-
   zendopcache = buildPecl {
     name = "zendopcache-7.0.3";
 

From 9dcac56f34f905a656db546ff06d9cdd5bbb41d5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 May 2015 00:02:04 +0200
Subject: [PATCH 0332/1143] bzrTools: update from 2.5 to 2.6 and refactor

---
 .../version-management/bazaar/tools.nix       | 20 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index f10fb5e65ce2..4e03371ff196 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,20 +1,22 @@
-args : with args; 
+{ stdenv, fetchurl, makeWrapper, python2, bazaar }:
 
-rec {
-  version = "2.5";
+stdenv.mkDerivation rec {
+  name = "bzr-tools-${version}";
+  version = "2.6.0";
+  
   src = fetchurl {
     url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
-    sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw";
+    sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
   };
 
-  buildInputs = [];
-  configureFlags = [];
+  buildInputs = [ makeWrapper python2 ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = [(simplyShare "bzrtools")];
+  installPhase = ''
+    ${python2}/bin/python ./setup.py install --prefix=$out
+  '';
       
-  name = "bzr-tools-${version}";
   meta = {
     description = "Bazaar plugins";
+    homepage = http://wiki.bazaar.canonical.com/BzrTools;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1afde965760c..05894be7f6c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10243,9 +10243,7 @@ let
 
   bazaar = callPackage ../applications/version-management/bazaar { };
 
-  bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) {
-    inherit bazaar;
-  };
+  bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { };
 
   beast = callPackage ../applications/audio/beast {
     inherit (gnome) libgnomecanvas libart_lgpl;

From 127050d851126bebbbd253ed2bebcd6f267754ac Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 3 May 2015 00:22:23 +0200
Subject: [PATCH 0333/1143] cppcheck: 1.68 -> 1.69

Also update meta and install man page.
---
 .../tools/analysis/cppcheck/default.nix       | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index d94d44836820..53397786dc49 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -1,29 +1,35 @@
-{ stdenv, fetchurl }:
-
-# TODO: add support for "make man"
+{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }:
 
 let
   name = "cppcheck";
-  version = "1.68";
+  version = "1.69";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "1ca9fdhrrxfyzd6kn67gxbfszp70191cf3ndasrh5jh55ghybmmd";
+    sha256 = "0bjkqy4c6ph6nzparcnbxrdn52i3hiind4jc99v2kvsq281wimab";
   };
 
-  configurePhase = ''
-    makeFlags="PREFIX=$out CFGDIR=$out/cfg"
+  buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
+
+  makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg'';
+
+  postInstall = ''
+    make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
+    mkdir -p $out/share/man/man1
+    cp cppcheck.1 $out/share/man/man1/cppcheck.1
   '';
 
-  postInstall = "cp -r cfg $out/cfg";
-
   meta = {
-    description = "Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun and more";
-    homepage = "http://sourceforge.net/apps/mediawiki/cppcheck/";
-    license = "GPL";
+    description = "A static analysis tool for C/C++ code";
+    longDescription = ''
+      Check C/C++ code for memory leaks, mismatching
+      allocation-deallocation, buffer overruns and more.
+    '';
+    homepage = http://cppcheck.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };

From 36f6601e121c7565fe7c0004cb9ff3307bae5f11 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Apr 2015 21:29:26 -0700
Subject: [PATCH 0334/1143] gnuk: Add derivation for fst-01

---
 pkgs/misc/gnuk/default.nix      | 11 +++++++
 pkgs/misc/gnuk/generic.nix      | 52 +++++++++++++++++++++++++++++++++
 pkgs/misc/gnuk/git.nix          | 11 +++++++
 pkgs/misc/gnuk/unstable.nix     | 11 +++++++
 pkgs/top-level/all-packages.nix |  4 +++
 5 files changed, 89 insertions(+)
 create mode 100644 pkgs/misc/gnuk/default.nix
 create mode 100644 pkgs/misc/gnuk/generic.nix
 create mode 100644 pkgs/misc/gnuk/git.nix
 create mode 100644 pkgs/misc/gnuk/unstable.nix

diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
new file mode 100644
index 000000000000..fb845d9c4765
--- /dev/null
+++ b/pkgs/misc/gnuk/default.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.0.4";
+
+  src = fetchgit {
+    url = "git://git.gniibe.org/gnuk/gnuk.git";
+    rev = "93867d0c8b90c485f9832c0047c3a2e17a029aca";
+    sha256 = "176vx81m6wnfvamxpp7hfbs1pm692zr0my0z2gid65b6rgffdycd";
+  };
+})
diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix
new file mode 100644
index 000000000000..52e970b5b822
--- /dev/null
+++ b/pkgs/misc/gnuk/generic.nix
@@ -0,0 +1,52 @@
+{ stdenv, gcc-arm-embedded, makeWrapper
+, python, pythonPackages
+
+# Extra options
+, device ? "fsij", vid ? "234b", pid ? "0000"
+
+# Version specific options
+, version, src
+, ...
+}:
+
+stdenv.mkDerivation {
+  name = "gnuk-${version}-${device}";
+
+  inherit src;
+
+  nativeBuildInputs = [ gcc-arm-embedded makeWrapper ];
+  buildInputs = [ python ] ++ (with pythonPackages; [ pyusb colorama ]);
+
+  configurePhase = ''
+    cd src
+    patchShebangs configure
+    ./configure --vidpid=${vid}:${pid}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    find . -name gnuk.bin -exec cp {} $out \;
+
+    #sed -i 's,Exception as e,IOError as e,' ../tool/stlinkv2.py
+    sed -i ../tool/stlinkv2.py \
+      -e "1a import array" \
+      -e "s,\(data_received =\) (),\1 array.array('B'),g" \
+      -e "s,\(data_received\) = data_received + \(.*\),\1.extend(\2),g"
+    cp ../tool/stlinkv2.py $out/bin/stlinkv2
+    wrapProgram $out/bin/stlinkv2 --prefix PYTHONPATH : "$PYTHONPATH"
+
+    # Some useful helpers
+    echo "#! ${stdenv.shell} -e" | tee $out/bin/{unlock,flash}
+    echo "$out/bin/stlinkv2 -u \$@" >> $out/bin/unlock
+    echo "$out/bin/stlinkv2 -b \$@ $out/gnuk.bin" >> $out/bin/flash
+    chmod +x $out/bin/{unlock,flash}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.fsij.org/pages/gnuk;
+    description = "an implementation of USB cryptographic token for gpg";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/misc/gnuk/git.nix b/pkgs/misc/gnuk/git.nix
new file mode 100644
index 000000000000..8c03a1eee536
--- /dev/null
+++ b/pkgs/misc/gnuk/git.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "2015-04-22";
+
+  src = fetchgit {
+    url = "git://git.gniibe.org/gnuk/gnuk.git";
+    rev = "3d5a776ab15a4ae6e17d91341a58eda3db09f700";
+    sha256 = "1pkdca331wrf1lsnlxxwbbnfcr7vj9xsac92dhj06fhpq4mb8kgb";
+  };
+})
diff --git a/pkgs/misc/gnuk/unstable.nix b/pkgs/misc/gnuk/unstable.nix
new file mode 100644
index 000000000000..0bfcbc023bf1
--- /dev/null
+++ b/pkgs/misc/gnuk/unstable.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.1.4";
+
+  src = fetchgit {
+    url = "git://git.gniibe.org/gnuk/gnuk.git";
+    rev = "e7e8b9f5ca414a5c901f61b0f043c8da42414103";
+    sha256 = "0zjpgvmnvgvfqp9cd9g8ns9z05alimwcdqx16l22604ywnhdy99l";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05894be7f6c3..9a5f0f7e823d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13992,6 +13992,10 @@ let
     x11Support = true;
   });
 
+  gnuk = callPackage ../misc/gnuk { };
+  gnuk-unstable = callPackage ../misc/gnuk/unstable.nix { };
+  gnuk-git = callPackage ../misc/gnuk/git.nix { };
+
   guix = callPackage ../tools/package-management/guix { };
 
   gxemul = callPackage ../misc/emulators/gxemul { };

From ab50b069e1a3a88028b5bf0fb2e6a6f37a04e686 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 May 2015 15:50:31 -0700
Subject: [PATCH 0335/1143] pulseaudio: Refactor a little

---
 pkgs/servers/pulseaudio/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index b031b0b45089..a4d35124abbc 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -151,8 +151,9 @@ stdenv.mkDerivation rec {
     (mkWith   true                    "system-user"                "pulseaudio")
     (mkWith   true                    "system-group"               "pulseaudio")
     (mkWith   true                    "access-group"               "audio")
-    "--with-systemduserunitdir=\${out}/lib/systemd/user"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";
+    (mkWith   true                    "systemduserunitdir"         "\${out}/lib/systemd/user")
+    (mkWith   stdenv.isDarwin         "mac-sysroot"                "/")
+  ];
 
   enableParallelBuilding = true;
 

From 8de4be096ff276eff71347e548d736e589df5f11 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 May 2015 15:54:30 -0700
Subject: [PATCH 0336/1143] ffado: Refactor and cleanup

---
 pkgs/os-specific/linux/ffado/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index dcbf0e567ad5..b0f545b2171f 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -3,10 +3,7 @@
 
 # Optional dependencies
 , libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null
-, pyqt4 ? null, xdg_utils ? null
-
-, glibmm
-, pythonDBus, qt4
+, pyqt4 ? null, pythonDBus ? null, xdg_utils ? null
 
 # Other Flags
 , prefix ? ""
@@ -23,6 +20,7 @@ let
   optDbus_cplusplus = shouldUsePkg dbus_cplusplus;
   optAlsaLib = shouldUsePkg alsaLib;
   optPyqt4 = shouldUsePkg pyqt4;
+  optPythonDBus = shouldUsePkg pythonDBus;
   optXdg_utils = shouldUsePkg xdg_utils;
 in
 stdenv.mkDerivation rec {
@@ -41,9 +39,6 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals (!libOnly) [
     optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4
     optXdg_utils
-    # dbus dbus_cplusplus glibmm
-    # pyqt4
-    # python pythonDBus qt4
   ];
 
   patches = [ ./build-fix.patch ];
@@ -76,11 +71,12 @@ stdenv.mkDerivation rec {
       LIBDIR=$out/lib INCLUDEDIR=$out/include install
   '' else ''
     scons PREFIX=$out PYPKGDIR=$PYDIR UDEVDIR=$out/lib/udev/rules.d install
-
+  '' + stdenv.lib.optionalString (optPyqt4 != null && optPythonDBus != null) ''
     wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \
-      $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
+      $PYTHONPATH:$PYDIR:${optPyqt4}/$LIBSUFFIX:${optPythonDBus}/$LIBSUFFIX:
+
     wrapProgram $out/bin/ffado-diag --prefix PYTHONPATH : \
-      $PYTHONPATH:$PYDIR:$out/share/libffado/python:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
+      $PYTHONPATH:$PYDIR:$out/share/libffado/python:${optPyqt4}/$LIBSUFFIX:${optPythonDBus}/$LIBSUFFIX:
   '';
 
   meta = with stdenv.lib; {

From 372f7e0a13cb2850c420d59a0917c34bef5271c2 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 2 May 2015 13:50:01 +0200
Subject: [PATCH 0337/1143] pypy: Update from 2.5.0 -> 2.5.1

---
 pkgs/development/interpreters/pypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index f67c48c62d8d..a705deddeb6d 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -7,7 +7,7 @@ assert zlibSupport -> zlib != null;
 let
 
   majorVersion = "2.5";
-  version = "${majorVersion}.0";
+  version = "${majorVersion}.1";
   libPrefix = "pypy${majorVersion}";
 
   pypy = stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ let
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2";
-      sha256 = "126zrsx6663n9w60018mii1z7cqb87iq9irnhp8z630mldallr4d";
+      sha256 = "0gzhgc0rh5ywpkvzishpvkninl41r5k207y8afa8vxwpfx03vcrj";
     };
 
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]

From 2a8577d7feb36372d0195eb6d13bc9b0a853eb1c Mon Sep 17 00:00:00 2001
From: Steven Shaw <steven@steshaw.org>
Date: Sun, 3 May 2015 19:15:03 +1000
Subject: [PATCH 0338/1143] Correct spelling

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index eadaae6715b4..ec3137ede4ff 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -352,7 +352,7 @@ EOF
     if ($fsType eq "btrfs") {
         my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint");
         if ($status != 0 || join("", @msg) =~ /ERROR:/) {
-            die "Failed to retreive subvolume info for $mountPoint\n";
+            die "Failed to retrieve subvolume info for $mountPoint\n";
         }
         my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
         if ($#ids > 0) {

From 123ca02fe3a420cf7ddafed588977f82b5d3d033 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 3 May 2015 06:10:26 -0400
Subject: [PATCH 0339/1143] gcc51: rename gcc5 in light of new versioning
 scheme

---
 pkgs/development/compilers/gcc/{5.1 => 5}/builder.sh            | 0
 pkgs/development/compilers/gcc/{5.1 => 5}/default.nix           | 0
 .../development/compilers/gcc/{5.1 => 5}/gfortran-driving.patch | 0
 pkgs/development/compilers/gcc/{5.1 => 5}/gnat-cflags.patch     | 0
 .../compilers/gcc/{5.1 => 5}/java-jvgenmain-link.patch          | 0
 .../development/compilers/gcc/{5.1 => 5}/libstdc++-target.patch | 0
 pkgs/development/compilers/gcc/{5.1 => 5}/no-sys-dirs.patch     | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/builder.sh (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/default.nix (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/gfortran-driving.patch (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/gnat-cflags.patch (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/java-jvgenmain-link.patch (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/libstdc++-target.patch (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/no-sys-dirs.patch (100%)

diff --git a/pkgs/development/compilers/gcc/5.1/builder.sh b/pkgs/development/compilers/gcc/5/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/builder.sh
rename to pkgs/development/compilers/gcc/5/builder.sh
diff --git a/pkgs/development/compilers/gcc/5.1/default.nix b/pkgs/development/compilers/gcc/5/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/default.nix
rename to pkgs/development/compilers/gcc/5/default.nix
diff --git a/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch b/pkgs/development/compilers/gcc/5/gfortran-driving.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/gfortran-driving.patch
rename to pkgs/development/compilers/gcc/5/gfortran-driving.patch
diff --git a/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch b/pkgs/development/compilers/gcc/5/gnat-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/gnat-cflags.patch
rename to pkgs/development/compilers/gcc/5/gnat-cflags.patch
diff --git a/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch
rename to pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch
diff --git a/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch b/pkgs/development/compilers/gcc/5/libstdc++-target.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/libstdc++-target.patch
rename to pkgs/development/compilers/gcc/5/libstdc++-target.patch
diff --git a/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc/5/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/5/no-sys-dirs.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16e31c620352..1d20f1ff2326 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3622,7 +3622,7 @@ let
       else null;
   }));
 
-  gcc51 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5.1 {
+  gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 {
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion

From de0aa2d099367a0b89feec21fcb051fbe8eb1ada Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sun, 3 May 2015 12:24:52 +0200
Subject: [PATCH 0340/1143] add Ardour4

---
 pkgs/applications/audio/ardour3/default.nix | 88 +++++++++++++++++++++
 pkgs/applications/audio/ardour4/default.nix | 88 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 10 ++-
 3 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/audio/ardour3/default.nix
 create mode 100644 pkgs/applications/audio/ardour4/default.nix

diff --git a/pkgs/applications/audio/ardour3/default.nix b/pkgs/applications/audio/ardour3/default.nix
new file mode 100644
index 000000000000..3142b2c52fcd
--- /dev/null
+++ b/pkgs/applications/audio/ardour3/default.nix
@@ -0,0 +1,88 @@
+{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
+, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
+, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
+, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
+, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
+, perl, pkgconfig, python, serd, sord, sratom, suil }:
+
+let
+
+  # Ardour git repo uses a mix of annotated and lightweight tags. Annotated
+  # tags are used for MAJOR.MINOR versioning, and lightweight tags are used
+  # in-between; MAJOR.MINOR.REV where REV is the number of commits since the
+  # last annotated tag. A slightly different version string format is needed
+  # for the 'revision' info that is built into the binary; it is the format of
+  # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
+
+  # Version to build.
+  tag = "3.5.403";
+
+  # Version info that is built into the binary. Keep in sync with 'tag'. The
+  # last 8 digits is a (fake) commit id.
+  revision = "3.5-403-00000000";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "ardour-${tag}";
+
+  src = fetchgit {
+    url = git://git.ardour.org/ardour/ardour.git;
+    rev = "refs/tags/${tag}";
+    sha256 = "0k1z8sbjf88dqn12kf9cykrqj38vkr879n2g6b4adk6cghn8wz3x";
+  };
+
+  buildInputs = 
+    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
+      glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
+      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
+      makeWrapper pango perl pkgconfig python serd sord sratom suil
+    ];
+
+  patchPhase = ''
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
+    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
+    sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
+    sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
+  '';
+
+  configurePhase = "python waf configure --optimize --prefix=$out";
+
+  buildPhase = "python waf";
+
+  # For the custom ardour clearlooks gtk-engine to work, it must be
+  # moved to a directory called "engines" and added to GTK_PATH
+  installPhase = ''
+    python waf install
+    mkdir -pv $out/gtk2/engines
+    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
+    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
+
+    # Install desktop file
+    mkdir -p "$out/share/applications"
+    cat > "$out/share/applications/ardour.desktop" << EOF
+    [Desktop Entry]
+    Name=Ardour 3
+    GenericName=Digital Audio Workstation
+    Comment=Multitrack harddisk recorder
+    Exec=$out/bin/ardour3
+    Icon=$out/share/ardour3/icons/ardour_icon_256px.png
+    Terminal=false
+    Type=Application
+    X-MultipleArgs=false
+    Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Multi-track hard disk recording software";
+    longDescription = ''
+      Also read "The importance of Paying Something" on their homepage, please!
+    '';
+    homepage = http://ardour.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/applications/audio/ardour4/default.nix b/pkgs/applications/audio/ardour4/default.nix
new file mode 100644
index 000000000000..b0a095fa75a4
--- /dev/null
+++ b/pkgs/applications/audio/ardour4/default.nix
@@ -0,0 +1,88 @@
+{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
+, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
+, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
+, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
+, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
+, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
+
+let
+
+  # Ardour git repo uses a mix of annotated and lightweight tags. Annotated
+  # tags are used for MAJOR.MINOR versioning, and lightweight tags are used
+  # in-between; MAJOR.MINOR.REV where REV is the number of commits since the
+  # last annotated tag. A slightly different version string format is needed
+  # for the 'revision' info that is built into the binary; it is the format of
+  # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
+
+  # Version to build.
+  tag = "4.0";
+
+  # Version info that is built into the binary. Keep in sync with 'tag'. The
+  # last 8 digits is a (fake) commit id.
+  revision = "4.0-e1aa66cb3f";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "ardour-${tag}";
+
+  src = fetchgit {
+    url = git://git.ardour.org/ardour/ardour.git;
+    rev = "e1aa66cb3f";
+    sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
+  };
+
+  buildInputs = 
+    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
+      glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
+      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
+      makeWrapper pango perl pkgconfig python rubberband serd sord sratom suil taglib vampSDK
+    ];
+
+  patchPhase = ''
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
+    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
+    sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
+    sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
+  '';
+
+  configurePhase = "python waf configure --optimize --prefix=$out";
+
+  buildPhase = "python waf";
+
+  # For the custom ardour clearlooks gtk-engine to work, it must be
+  # moved to a directory called "engines" and added to GTK_PATH
+  installPhase = ''
+    python waf install
+    mkdir -pv $out/gtk2/engines
+    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
+    wrapProgram $out/bin/ardour4 --prefix GTK_PATH : $out/gtk2
+
+    # Install desktop file
+    mkdir -p "$out/share/applications"
+    cat > "$out/share/applications/ardour.desktop" << EOF
+    [Desktop Entry]
+    Name=Ardour 3
+    GenericName=Digital Audio Workstation
+    Comment=Multitrack harddisk recorder
+    Exec=$out/bin/ardour4
+    Icon=$out/share/ardour4/icons/ardour_icon_256px.png
+    Terminal=false
+    Type=Application
+    X-MultipleArgs=false
+    Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Multi-track hard disk recording software";
+    longDescription = ''
+      Also read "The importance of Paying Something" on their homepage, please!
+    '';
+    homepage = http://ardour.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d20f1ff2326..3b2fbc26b6bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10158,12 +10158,18 @@ let
 
   antiword = callPackage ../applications/office/antiword {};
 
-  ardour = ardour3;
 
-  ardour3 =  lowPrio (callPackage ../applications/audio/ardour {
+  ardour = ardour4;
+
+  ardour3 =  lowPrio (callPackage ../applications/audio/ardour3 {
     inherit (gnome) libgnomecanvas libgnomecanvasmm;
   });
 
+  ardour4 =  lowPrio (callPackage ../applications/audio/ardour4 {
+    inherit (gnome) libgnomecanvas libgnomecanvasmm;
+    inherit (vamp) vampSDK;
+  });
+
   ario = callPackage ../applications/audio/ario { };
 
   arora = callPackage ../applications/networking/browsers/arora { };

From 797c6d3fab5c427d20e96674b78919ff991aab76 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sun, 3 May 2015 13:03:41 +0200
Subject: [PATCH 0341/1143] cleanup Ardour 3 and Ardour 4

---
 .../default.nix => ardour/ardour3.nix}        |  0
 pkgs/applications/audio/ardour/default.nix    | 20 ++---
 pkgs/applications/audio/ardour4/default.nix   | 88 -------------------
 pkgs/top-level/all-packages.nix               |  9 +-
 4 files changed, 14 insertions(+), 103 deletions(-)
 rename pkgs/applications/audio/{ardour3/default.nix => ardour/ardour3.nix} (100%)
 delete mode 100644 pkgs/applications/audio/ardour4/default.nix

diff --git a/pkgs/applications/audio/ardour3/default.nix b/pkgs/applications/audio/ardour/ardour3.nix
similarity index 100%
rename from pkgs/applications/audio/ardour3/default.nix
rename to pkgs/applications/audio/ardour/ardour3.nix
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 3142b2c52fcd..ea81d6c14c2f 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -3,7 +3,7 @@
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python, serd, sord, sratom, suil }:
+, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
 
 let
 
@@ -15,11 +15,11 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "3.5.403";
+  tag = "4.0";
 
   # Version info that is built into the binary. Keep in sync with 'tag'. The
   # last 8 digits is a (fake) commit id.
-  revision = "3.5-403-00000000";
+  revision = "4.0-e1aa66cb3f";
 
 in
 
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = git://git.ardour.org/ardour/ardour.git;
-    rev = "refs/tags/${tag}";
-    sha256 = "0k1z8sbjf88dqn12kf9cykrqj38vkr879n2g6b4adk6cghn8wz3x";
+    rev = "e1aa66cb3f";
+    sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
   };
 
   buildInputs = 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
       libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-      makeWrapper pango perl pkgconfig python serd sord sratom suil
+      makeWrapper pango perl pkgconfig python rubberband serd sord sratom suil taglib vampSDK
     ];
 
   patchPhase = ''
@@ -57,17 +57,17 @@ stdenv.mkDerivation rec {
     python waf install
     mkdir -pv $out/gtk2/engines
     cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
-    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
+    wrapProgram $out/bin/ardour4 --prefix GTK_PATH : $out/gtk2
 
     # Install desktop file
     mkdir -p "$out/share/applications"
     cat > "$out/share/applications/ardour.desktop" << EOF
     [Desktop Entry]
-    Name=Ardour 3
+    Name=Ardour 4
     GenericName=Digital Audio Workstation
     Comment=Multitrack harddisk recorder
-    Exec=$out/bin/ardour3
-    Icon=$out/share/ardour3/icons/ardour_icon_256px.png
+    Exec=$out/bin/ardour4
+    Icon=$out/share/ardour4/icons/ardour_icon_256px.png
     Terminal=false
     Type=Application
     X-MultipleArgs=false
diff --git a/pkgs/applications/audio/ardour4/default.nix b/pkgs/applications/audio/ardour4/default.nix
deleted file mode 100644
index b0a095fa75a4..000000000000
--- a/pkgs/applications/audio/ardour4/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
-, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
-, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
-, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
-
-let
-
-  # Ardour git repo uses a mix of annotated and lightweight tags. Annotated
-  # tags are used for MAJOR.MINOR versioning, and lightweight tags are used
-  # in-between; MAJOR.MINOR.REV where REV is the number of commits since the
-  # last annotated tag. A slightly different version string format is needed
-  # for the 'revision' info that is built into the binary; it is the format of
-  # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
-
-  # Version to build.
-  tag = "4.0";
-
-  # Version info that is built into the binary. Keep in sync with 'tag'. The
-  # last 8 digits is a (fake) commit id.
-  revision = "4.0-e1aa66cb3f";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "ardour-${tag}";
-
-  src = fetchgit {
-    url = git://git.ardour.org/ardour/ardour.git;
-    rev = "e1aa66cb3f";
-    sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
-  };
-
-  buildInputs = 
-    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
-      glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
-      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-      makeWrapper pango perl pkgconfig python rubberband serd sord sratom suil taglib vampSDK
-    ];
-
-  patchPhase = ''
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
-    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
-    sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
-    sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
-  '';
-
-  configurePhase = "python waf configure --optimize --prefix=$out";
-
-  buildPhase = "python waf";
-
-  # For the custom ardour clearlooks gtk-engine to work, it must be
-  # moved to a directory called "engines" and added to GTK_PATH
-  installPhase = ''
-    python waf install
-    mkdir -pv $out/gtk2/engines
-    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
-    wrapProgram $out/bin/ardour4 --prefix GTK_PATH : $out/gtk2
-
-    # Install desktop file
-    mkdir -p "$out/share/applications"
-    cat > "$out/share/applications/ardour.desktop" << EOF
-    [Desktop Entry]
-    Name=Ardour 3
-    GenericName=Digital Audio Workstation
-    Comment=Multitrack harddisk recorder
-    Exec=$out/bin/ardour4
-    Icon=$out/share/ardour4/icons/ardour_icon_256px.png
-    Terminal=false
-    Type=Application
-    X-MultipleArgs=false
-    Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
-    EOF
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Multi-track hard disk recording software";
-    longDescription = ''
-      Also read "The importance of Paying Something" on their homepage, please!
-    '';
-    homepage = http://ardour.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b2fbc26b6bd..a10162fbdcc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10158,17 +10158,16 @@ let
 
   antiword = callPackage ../applications/office/antiword {};
 
-
   ardour = ardour4;
 
-  ardour3 =  lowPrio (callPackage ../applications/audio/ardour3 {
+  ardour3 =  callPackage ../applications/audio/ardour/ardour3.nix {
     inherit (gnome) libgnomecanvas libgnomecanvasmm;
-  });
+  };
 
-  ardour4 =  lowPrio (callPackage ../applications/audio/ardour4 {
+  ardour4 =  callPackage ../applications/audio/ardour {
     inherit (gnome) libgnomecanvas libgnomecanvasmm;
     inherit (vamp) vampSDK;
-  });
+  };
 
   ario = callPackage ../applications/audio/ario { };
 

From 365fd9efeb8e5d0918e641fc24922bd9e48041a6 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 3 May 2015 11:47:07 +0000
Subject: [PATCH 0342/1143] use gnutls rtmpdump for ffmpeg, as it doesnot build
 otherwise

---
 pkgs/development/libraries/ffmpeg/generic.nix | 6 +++---
 pkgs/top-level/all-packages.nix               | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index d3a68508246b..c33fabeb4166 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -109,7 +109,7 @@
 , openjpeg_1 ? null # JPEG 2000 de/encoder
 , opensslExtlib ? false, openssl ? null
 , pulseaudio ? null # Pulseaudio input support
-, rtmpdump ? null # RTMP[E] support
+, rtmpdump_gnutls ? null # RTMP[E] support
 #, libquvi ? null # Quvi input support
 , sambaExtlib ? false, samba ? null # Samba protocol
 #, schroedinger ? null # Dirac de/encoder
@@ -410,7 +410,7 @@ stdenv.mkDerivation rec {
     (mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl")
     (mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse")
     #(mkFlag quvi         "2.0" "libquvi")
-    (mkFlag (disDarwinFix (rtmpdump != null)) "0.6" "librtmp")
+    (mkFlag (disDarwinFix (rtmpdump_gnutls != null)) "0.6" "librtmp")
     #(mkFlag (schroedinger != null) "0.5" "libschroedinger")
     #(mkFlag (shine != null) "2.0" "libshine")
     (mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient")
@@ -457,7 +457,7 @@ stdenv.mkDerivation rec {
     ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ]
     ++ optionals (!isDarwin) [
       frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */
-      openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 /* xavs */
+      openjpeg_1 pulseaudio rtmpdump_gnutls vid-stab wavpack x265 /* xavs */
   ] ++ optional (!isDarwin && !isCygwin) libva
     ++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d20f1ff2326..c75a8730a149 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2592,6 +2592,7 @@ let
   redmine = callPackage ../applications/version-management/redmine { };
 
   rtmpdump = callPackage ../tools/video/rtmpdump { };
+  rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
 
   reaverwps = callPackage ../tools/networking/reaver-wps {};
 

From c7bb01cfa24ecc1c8d8f63f2c0d4f886bf0a32d2 Mon Sep 17 00:00:00 2001
From: Andreas Baldeau <andreas@baldeau.net>
Date: Sun, 26 Apr 2015 11:44:43 +0200
Subject: [PATCH 0343/1143] Added Font Awesome TTF font.

---
 pkgs/data/fonts/font-awesome-ttf/default.nix | 31 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/data/fonts/font-awesome-ttf/default.nix

diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
new file mode 100644
index 000000000000..7e07ec8a37c3
--- /dev/null
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "font-awesome-4.3.0";
+
+  src = fetchurl {
+    url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
+    sha256 = "018syfvkj01jym60mpys93xv84ky9l2x90gprnm9npzwkw5169jc";
+  };
+
+  buildCommand = ''
+    ${unzip}/bin/unzip $src
+    mkdir -p $out/share/fonts/truetype
+    cp */fonts/*.ttf $out/share/fonts/truetype
+  '';
+
+  meta = {
+    description = "Font Awesome - TTF font";
+
+    longDescription = ''
+      Font Awesome gives you scalable vector icons that can instantly be customized.
+      This package includes only the TTF font. For full CSS etc. see the project website.
+    '';
+
+    homepage = "http://fortawesome.github.io/Font-Awesome/";
+    license = stdenv.lib.licenses.ofl;
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.abaldeau ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c75a8730a149..920bbc006211 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9946,6 +9946,8 @@ let
 
   fira-mono = callPackage ../data/fonts/fira-mono { };
 
+  font-awesome-ttf = callPackage ../data/fonts/font-awesome-ttf { };
+
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
   freepats = callPackage ../data/misc/freepats { };

From 25baba283f8d4902de704055074c9f4326e73461 Mon Sep 17 00:00:00 2001
From: Andreas Baldeau <andreas@baldeau.net>
Date: Sun, 3 May 2015 15:03:40 +0200
Subject: [PATCH 0344/1143] Webstorm update => 10.0.2

---
 pkgs/applications/editors/idea/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index b99265cf0dd9..d1bd3d95b5c6 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -309,13 +309,13 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "9.0.3";
-    build = "139.1112";
+    version = "10.0.2";
+    build = "141.728";
     description = "Professional IDE for Web and JavaScript devlopment";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "e4cfe7b5f1220b68d880c4f236df9c9df2b1efcc04775afad6149d949f45f0aa";
+      sha256 = "0ghv1r145qb5kmp2x375f5674b86d51w024fz390znlnniclizqx";
     };
   };
 

From 6d219ff22236be585a2cac1db67003811e1d659e Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Fri, 1 May 2015 15:54:40 +0100
Subject: [PATCH 0345/1143] Add shairport sync binary.

This binary allows to run a local airtunes server.
---
 pkgs/servers/shairport-sync/default.nix | 38 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/servers/shairport-sync/default.nix

diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
new file mode 100644
index 000000000000..167054330842
--- /dev/null
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, pulseaudio }:
+
+stdenv.mkDerivation rec {
+  version = "2.3.0";
+  name = "shairport-sync-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/mikebrady/shairport-sync/archive/${version}.zip";
+    sha256 = "1kslif2ifrn0frvi39d44wpn53sjahwq0xjc0hd98ycf3xbcgndg";
+  };
+
+  buildInputs = [
+    openssl
+    avahi
+    alsaLib
+    libdaemon
+    autoconf
+    automake
+    pkgconfig
+    libtool
+    popt
+    unzip
+    libconfig
+    pulseaudio
+  ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = "autoreconf -vfi";
+  configureFlags = "--with-alsa --with-avahi --with-ssl=openssl --without-initscript --with-pulseaudio";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mikebrady/shairport-sync;
+    description = "Airtunes server and emulator with multi-room capabilities";
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..c4ae56d62e02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8775,6 +8775,8 @@ let
 
   samba_light = samba4_light;
 
+  shairport-sync = callPackage ../servers/shairport-sync { };
+
   serfdom = callPackage ../servers/serfdom { };
 
   seyren = callPackage ../servers/monitoring/seyren { };

From d88736df6c9cdd6c593646118683fe8e5baadd70 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 3 May 2015 23:03:36 +0900
Subject: [PATCH 0346/1143] androidsdk: Make monitor and other commands to work

---
 pkgs/development/mobile/androidenv/androidsdk.nix | 13 +++++++++----
 pkgs/development/mobile/androidenv/default.nix    |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index ed7bd051a7a4..52b146b87f4b 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -3,7 +3,7 @@
 , zlib_32bit
 , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
 , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
-, freetype, fontconfig, glib, gtk, atk, file, jdk
+, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils
 }:
 {platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs?false, useGooglePlayServices?false}:
 
@@ -27,7 +27,12 @@ stdenv.mkDerivation rec {
     cd $out/libexec
     unpackFile $src
     cd android-sdk-*/tools
-    
+
+    for f in android traceview draw9patch hierarchyviewer monitor ddms screenshot2 uiautomatorviewer monkeyrunner jobb lint
+    do
+        sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f"
+    done
+
     ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     ''
       # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++
@@ -84,7 +89,7 @@ stdenv.mkDerivation rec {
         patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
         
         wrapProgram `pwd`/monitor \
-          --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib
+          --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib:${libXtst}/lib
 
         cd ../..
       ''
@@ -97,7 +102,7 @@ stdenv.mkDerivation rec {
         patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
         
         wrapProgram `pwd`/monitor \
-          --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib
+          --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib::${libXtst}/lib
 
         cd ../..
       ''
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 5df4213d233a..693a53cf428c 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -40,7 +40,7 @@ rec {
 
   androidsdk = import ./androidsdk.nix {
     inherit (pkgs) stdenv fetchurl unzip makeWrapper;
-    inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk;
+    inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils;
     inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
     
     inherit platformTools buildTools support supportRepository platforms sysimages addons;

From 2352fce77694ac1413404b58d06210de1c5c1765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 3 May 2015 17:01:14 +0200
Subject: [PATCH 0347/1143] idea.android-studio: 1.2.0.8 -> 1.2.0.12

---
 pkgs/applications/editors/idea/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index d1bd3d95b5c6..8d150ded4ab7 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -212,14 +212,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.2.0.8";
-    build = "141.1845774";
+    version = "1.2.0.12";
+    build = "141.1890965";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "1l201qv1aya1l9jrybgqclv2v2fgzdpcb6qsnxszcq3npplisw9h";
+      sha256 = "01k96rql192ksnprc4yai97fcals7msf06m9bx1q7asn46887h7n";
     };
   };
 

From d362c6ff98ed3d2ce7b37ff2f9f53f9abcab156a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sun, 3 May 2015 17:45:52 +0200
Subject: [PATCH 0348/1143] update ingen

---
 pkgs/applications/audio/ingen/default.nix         |  9 ++++++---
 pkgs/development/libraries/audio/lilv/default.nix | 13 +++++++------
 pkgs/development/libraries/audio/lv2/default.nix  |  4 ++--
 pkgs/development/libraries/audio/raul/default.nix |  4 ++--
 pkgs/development/libraries/ganv/default.nix       | 13 +++++++------
 pkgs/development/libraries/sord/default.nix       | 13 +++++++------
 6 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index d4abbbe00834..af94e1e7e238 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation  rec {
   name = "ingen-svn-${rev}";
-  rev = "5490";
+  rev = "5675";
 
   src = fetchsvn {
     url = "http://svn.drobilla.net/lad/trunk/ingen";
     rev = rev;
-    sha256 = "09h2mrkzpwzhhyqy21xr7jhfbl82gmqfyj0lzhnjsrab8z56yzk6";
+    sha256 = "1dk56rzbc0rwlbzr90rv8bh5163xwld32nmkvcz7ajfchi4fnv86";
   };
 
   buildInputs = [
@@ -18,7 +18,10 @@ stdenv.mkDerivation  rec {
     python raul serd sord sratom suil
   ];
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = ''
+    sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
+    python waf configure --prefix=$out
+  '';
 
   propagatedBuildInputs = [ rdflib ];
 
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 9f3307742ec4..39e32d193cdf 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
+{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
-  name = "lilv-${version}";
-  version = "0.20.0";
+  name = "lilv-svn-${rev}";
+  rev = "5675";
 
-  src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2";
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/lilv";
+    rev = rev;
+    sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord sratom ];
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index f03f6b3d3710..cda126218ba6 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lv2-${version}";
-  version = "1.10.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "http://lv2plug.in/spec/${name}.tar.bz2";
-    sha256 = "1md41x9snrp4mcfyli7lyfpvcfa78nfy6xkdy84kppnl8m5qw378";
+    sha256 = "1saq0vwqy5zjdkgc5ahs8kcabxfmff2mmg68fiqrkv8hiw9m6jks";
   };
 
   buildInputs = [ gtk libsndfile pkgconfig python ];
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 269e7472280f..789846c15e7d 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "raul-svn-${rev}";
-  rev = "5449";
+  rev = "5675";
 
   src = fetchsvn {
     url = "http://svn.drobilla.net/lad/trunk/raul";
     rev = rev;
-    sha256 = "02ph1hikp1iynwbxbiaf28brkwig7n4lsb3djaivnf14arg5vmzx";
+    sha256 = "0yvm3j57lch89dixx7zsip7pxsws0xxy1y6ck7a3l0534qc5kny4";
   };
 
   buildInputs = [ boost gtk pkgconfig python ];
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index 6639f2e498ba..eef89e9cff63 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, graphviz, gtk, gtkmm, pkgconfig, python }:
+{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "ganv-${version}";
-  version = "1.4.2";
+  name = "ganv-svn-${rev}";
+  rev = "5675";
 
-  src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l";
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/ganv";
+    rev = rev;
+    sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj";
   };
 
   buildInputs = [ graphviz gtk gtkmm pkgconfig python ];
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 96a19bf37cc9..290e85d81c7e 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, python, serd }:
+{ stdenv, fetchsvn, pkgconfig, python, serd }:
 
 stdenv.mkDerivation rec {
-  name = "sord-${version}";
-  version = "0.12.2";
+  name = "sord-svn-${rev}";
+  rev = "327";
 
-  src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx";
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/sord/trunk";
+    rev = rev;
+    sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4";
   };
 
   buildInputs = [ pkgconfig python serd ];

From 9be8b790f822b88dac5b625f92bf8cb0fd1be46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 3 May 2015 18:02:55 +0200
Subject: [PATCH 0349/1143] Choosing a different nodejs for armv5tel.

nodejs 0.12 doesn't build in armv5 or without fpu, it seems.
I tested this change on armv5tel, branch staging.
---
 pkgs/development/web/nodejs/default.nix |  4 ++++
 pkgs/top-level/all-packages.nix         | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index ee121d6788a1..56b8e952e804 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -2,6 +2,10 @@
 , pkgconfig, runCommand, which, unstableVersion ? false
 }:
 
+# nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.
+# Related post: http://zo0ok.com/techfindings/archives/1820
+assert stdenv.system != "armv5tel-linux";
+
 let
   dtrace = runCommand "dtrace-native" {} ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 920bbc006211..64614db14443 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1866,15 +1866,23 @@ let
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; };
+  nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; };
   nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
   nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };
 
-  nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; };
+  nodejs = if stdenv.system == "armv5tel-linux" then
+    nodejs-0_10
+  else
+    nodejs-0_12;
+
+  nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_10; };
 
   nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
 
-  nodePackages = nodePackages_0_12;
+  nodePackages = if stdenv.system == "armv5tel-linux" then
+    nodePackages-0_10
+  else
+    nodePackages-0_12;
 
   iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };
 

From 919de285ebb3dd43b152a598cc8d221f80c61265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 3 May 2015 18:18:43 +0200
Subject: [PATCH 0350/1143] Fix nodePackages naming (evaluation error)

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64614db14443..47db19f158e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1880,9 +1880,9 @@ let
   nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
 
   nodePackages = if stdenv.system == "armv5tel-linux" then
-    nodePackages-0_10
+    nodePackages_0_10
   else
-    nodePackages-0_12;
+    nodePackages_0_12;
 
   iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };
 

From 3bac56f1abc2c02b15633d3591ac302a4df78de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 3 May 2015 18:19:42 +0200
Subject: [PATCH 0351/1143] nodePackages_0_12: use nodejs 0.12. Bad copypaste.

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47db19f158e7..3d3f2b12d371 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1875,7 +1875,7 @@ let
   else
     nodejs-0_12;
 
-  nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_10; };
+  nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_12; };
 
   nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
 

From e1cbfa5415810e92d6a5904d201a69a4a1f40bc0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 3 May 2015 12:46:10 -0500
Subject: [PATCH 0352/1143] jack2: depend on libsndfile

---
 pkgs/misc/jackaudio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index fde43ffd79b5..47511cf58b0e 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper
-, bash, libsamplerate, readline
+, bash, libsamplerate, libsndfile, readline
 
 # Optional Dependencies
 , dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python
 
-    libsamplerate readline
+    libsamplerate libsndfile readline
 
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ];

From 3a371528bb4d5265e53bd021c4fa04e5c3233333 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Wed, 29 Apr 2015 19:14:40 -0700
Subject: [PATCH 0353/1143] New package: jenkins-job-builder

---
 .../jenkins-job-builder/default.nix           | 26 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            | 41 +++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix

diff --git a/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix b/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix
new file mode 100644
index 000000000000..31ab75947dfd
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pythonPackages, buildPythonPackage, git }:
+
+let
+  upstreamName = "jenkins-job-builder";
+  version = "1.2.0";
+
+in
+
+buildPythonPackage rec {
+  name = "${upstreamName}-${version}";
+  namePrefix = "";  # Don't prepend "pythonX.Y-" to the name
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/j/${upstreamName}/${name}.tar.gz";
+    sha256 = "09nxdhb0ilxpmk5gbvik6kj9b6j718j5an903dpcvi3r6vzk9b3p";
+  };
+
+  pythonPath = with pythonPackages; [ pip six pyyaml pbr python-jenkins ];
+  doCheck = false;  # Requires outdated Sphinx
+
+  meta = {
+    description = "System for configuring Jenkins jobs using simple YAML files";
+    homepage = http://ci.openstack.org/jjb.html;
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..7cab823b7abf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5258,6 +5258,8 @@ let
 
   jenkins = callPackage ../development/tools/continuous-integration/jenkins { };
 
+  jenkins-job-builder = callPackage ../development/tools/continuous-integration/jenkins-job-builder { };
+
   lcov = callPackage ../development/tools/analysis/lcov { };
 
   leiningen = callPackage ../development/tools/build-managers/leiningen { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8aafa0e2f8e..9a946d661d9d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4222,6 +4222,27 @@ let
     };
   };
 
+
+  setuptools-git = buildPythonPackage rec {
+    name = "setuptools-git-${version}";
+    version = "1.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/setuptools-git/${name}.tar.gz";
+      md5 = "7b5967e9527c789c3113b07a1f196f6e";
+    };
+
+    propagatedBuildInputs = [ pkgs.git ];
+    doCheck = false;
+
+    meta = {
+      description = "Setuptools revision control system plugin for Git";
+      homepage = https://pypi.python.org/pypi/setuptools-git;
+      license = licenses.bsd3;
+    };
+  };
+
+
   watchdog = buildPythonPackage rec {
     name = "watchdog-${version}";
     version = "0.8.3";
@@ -8314,6 +8335,26 @@ let
   };
 
 
+  python-jenkins = buildPythonPackage rec {
+    name = "python-jenkins-${version}";
+    version = "0.4.5";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-jenkins/${name}.tar.gz";
+      md5 = "10f1c24d45afe9cadd43f8d60b37d04c";
+    };
+
+    buildInputs = with self; [ pbr pip ];
+    pythonPath = with self; [ pyyaml six ];
+    doCheck = false;
+
+    meta = {
+      description = "Python bindings for the remote Jenkins API";
+      homepage = https://pypi.python.org/pypi/python-jenkins;
+      license = licenses.bsd3;
+    };
+  };
+
+
   pil = buildPythonPackage rec {
     name = "PIL-${version}";
     version = "1.1.7";

From d4bd57555157d1788cd7dceedb57b120005e945b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 3 May 2015 20:08:27 +0200
Subject: [PATCH 0354/1143] Ardour 4: enable dbus and alsa support

---
 pkgs/applications/audio/ardour/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index ea81d6c14c2f..3610aa5fe47a 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
+{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, dbus, fftw
 , fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = 
-    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
+    [ alsaLib aubio boost cairomm curl dbus fftw fftwSinglePrec flac glibc
       glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
       libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
   '';
 
-  configurePhase = "python waf configure --optimize --prefix=$out";
+  configurePhase = "python waf configure --with-backend=alsa,jack --optimize --prefix=$out";
 
   buildPhase = "python waf";
 

From 22167289794c080c50f092274de808543c7978c4 Mon Sep 17 00:00:00 2001
From: Philip Potter <philip.g.potter@gmail.com>
Date: Sun, 3 May 2015 15:29:42 +0100
Subject: [PATCH 0355/1143] add support for pam_u2f to nixos pam module

This adds support for authenticating using a U2F device such as a
yubikey neo.
---
 lib/maintainers.nix                           |  1 +
 nixos/modules/security/pam.nix                | 20 +++++++++++++++++
 .../libraries/libu2f-host/default.nix         |  2 +-
 .../libraries/libu2f-server/default.nix       | 20 +++++++++++++++++
 pkgs/os-specific/linux/pam_u2f/default.nix    | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 6 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libu2f-server/default.nix
 create mode 100644 pkgs/os-specific/linux/pam_u2f/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8f148ba91c40..6f4a7be21f6e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -153,6 +153,7 @@
   pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   phausmann = "Philipp Hausmann <nix@314.ch>";
+  philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 631e8317cb4c..35622b12ea33 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -36,6 +36,16 @@ let
         '';
       };
 
+      u2fAuth = mkOption {
+        default = config.security.pam.enableU2F;
+        type = types.bool;
+        description = ''
+          If set, users listed in
+          <filename>~/.yubico/u2f_keys</filename> are able to log in
+          with the associated U2F key.
+        '';
+      };
+
       usbAuth = mkOption {
         default = config.security.pam.usb.enable;
         type = types.bool;
@@ -209,6 +219,8 @@ let
               "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
           ${optionalString cfg.fprintAuth
               "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"}
+          ${optionalString cfg.u2fAuth
+              "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"}
           ${optionalString cfg.usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
           ${optionalString cfg.unixAuth
@@ -364,6 +376,13 @@ in
       '';
     };
 
+    security.pam.enableU2F = mkOption {
+      default = false;
+      description = ''
+        Enable the U2F PAM module.
+      '';
+    };
+
     security.pam.enableEcryptfs = mkOption {
       default = false;
       description = ''
@@ -392,6 +411,7 @@ in
       ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
       ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
       ++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ]
+      ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
       ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
 
     security.setuidPrograms =
diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index f996216826ac..cda18e4e9bd6 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/libu2f-host;
-    description = "a C library and command-line tool thati mplements the host-side of the U2F protocol";
+    description = "A C library and command-line tool thati mplements the host-side of the U2F protocol";
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix
new file mode 100644
index 000000000000..6ac4eb29d134
--- /dev/null
+++ b/pkgs/development/libraries/libu2f-server/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, json_c, hidapi, openssl, check }:
+
+stdenv.mkDerivation rec {
+  name = "libu2f-server-0.0.0";
+
+  src = fetchurl {
+    url = "https://developers.yubico.com/libu2f-server/Releases/libu2f-server-0.0.0.tar.xz";
+    sha256 = "1vdl3qavzfpi6p6h48zw17md9wykfzpay5c4l1c08id46m560wp0";
+  };
+
+  buildInputs = [ pkgconfig json_c hidapi openssl check ];
+
+  meta = with stdenv.lib; {
+    homepage = https://developers.yubico.com/libu2f-server/;
+    description = "A C library that implements the server-side of the U2F protocol";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ philandstuff ];
+  };
+}
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
new file mode 100644
index 000000000000..458d171ec683
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, fetchurl, stdenv }:
+stdenv.mkDerivation rec {
+  name    = "pam_u2f-${version}";
+  version = "0.0.1";
+  src     = fetchurl {
+    url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
+    sha256 = "0p1wia4nfw5h0pmy1lcgwsbrlm7z39v1n37692lgqfzyg1kmpv7l";
+  };
+  buildInputs = with pkgs; [ asciidoc autoconf automake docbook_xml_dtd_45 libtool libu2f-host libu2f-server libxml2 libxslt pkgconfig pam ];
+
+  installFlags = [
+    "PAMDIR=$(out)/lib/security"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://developers.yubico.com/pam-u2f/;
+    description = "A PAM module for allowing authentication with a U2F device";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ philandstuff ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 920bbc006211..0eab47c68d4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6920,6 +6920,8 @@ let
 
   libu2f-host = callPackage ../development/libraries/libu2f-host { };
 
+  libu2f-server = callPackage ../development/libraries/libu2f-server { };
+
   libunistring = callPackage ../development/libraries/libunistring { };
 
   libupnp = callPackage ../development/libraries/pupnp { };
@@ -9573,6 +9575,8 @@ let
 
   pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
 
+  pam_u2f = callPackage ../os-specific/linux/pam_u2f { };
+
   pam_usb = callPackage ../os-specific/linux/pam_usb { };
 
   paxctl = callPackage ../os-specific/linux/paxctl { };

From d66b8344ce03b2f197f79e6a0f0249c77677caea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 3 May 2015 20:25:57 +0200
Subject: [PATCH 0356/1143] Ardour: tidy up expression and improve the
 longDescription

---
 pkgs/applications/audio/ardour/ardour3.nix |  8 ++++++-
 pkgs/applications/audio/ardour/default.nix | 27 ++++++++++++++--------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index 3142b2c52fcd..b6d1ce5bd5b6 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -78,7 +78,13 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Multi-track hard disk recording software";
     longDescription = ''
-      Also read "The importance of Paying Something" on their homepage, please!
+      Ardour is a digital audio workstation (DAW), You can use it to
+      record, edit and mix multi-track audio and midi. Produce your
+      own CDs. Mix video soundtracks. Experiment with new ideas about
+      music and sound.
+
+      Please consider supporting the ardour project financially:
+      https://community.ardour.org/node/8288
     '';
     homepage = http://ardour.org/;
     license = licenses.gpl2;
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 3610aa5fe47a..21dc1d704073 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -3,7 +3,9 @@
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
+, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib
+, vampSDK
+}:
 
 let
 
@@ -32,13 +34,14 @@ stdenv.mkDerivation rec {
     sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
   };
 
-  buildInputs = 
-    [ alsaLib aubio boost cairomm curl dbus fftw fftwSinglePrec flac glibc
-      glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
-      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-      makeWrapper pango perl pkgconfig python rubberband serd sord sratom suil taglib vampSDK
-    ];
+  buildInputs = [
+    alsaLib aubio boost cairomm curl dbus fftw fftwSinglePrec flac
+    glibc glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
+    libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
+    libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
+    makeWrapper pango perl pkgconfig python rubberband serd sord
+    sratom suil taglib vampSDK
+  ];
 
   patchPhase = ''
     printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
@@ -78,7 +81,13 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Multi-track hard disk recording software";
     longDescription = ''
-      Also read "The importance of Paying Something" on their homepage, please!
+      Ardour is a digital audio workstation (DAW), You can use it to
+      record, edit and mix multi-track audio and midi. Produce your
+      own CDs. Mix video soundtracks. Experiment with new ideas about
+      music and sound.
+
+      Please consider supporting the ardour project financially:
+      https://community.ardour.org/node/8288
     '';
     homepage = http://ardour.org/;
     license = licenses.gpl2;

From aaef57d4c2718a2884b325d1951deae494111513 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 3 May 2015 22:08:50 +0200
Subject: [PATCH 0357/1143] netsniff-ng -> v0.5.9-rc5-22-gdafb89c

- Show the packet number as part of the dissector output
- Reorder packet number output
- Print 'IE:' prefix before each mgmt IE parameter
- Print probe request IEs info
- Alias lb to rr as well
---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 0830871c0cde..8e3f5d34f1ea 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "v0.5.9-rc5"; in
+let version = "v0.5.9-rc5-22-gdafb89c"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "76f4acca4bef1658543a97475f1c1d83accc395c";
-    sha256 = "11k88lsdqy41j4xwyx3vq85zjj4n39hj828f1b6naq1ywyfcvmr5";
+    rev = "dafb89c7a307272189b29a5c74bd6e33068ac831";
+    sha256 = "0j6gii9jw93pdnbdk8yxddcc67g30623r2xvgdvrbhg3v2q6k1qm";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From 65775f9a0e2064c1eabd94e0c69694533fbab80b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 3 May 2015 22:08:50 +0200
Subject: [PATCH 0358/1143] vim-plugins: wakatime 3.0.9 -> 4.0.0

---
 pkgs/misc/vim-plugins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 60d67b38a44a..8155d4942fd9 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -527,11 +527,11 @@ rec {
   };
 
   wakatime = buildVimPlugin {
-    name = "wakatime-3.0.9";
+    name = "wakatime-4.0.0";
 
     src = fetchFromGitHub {
-      sha256 = "0qq2h5ysbixypz1ga5j3yrh8sd5h1npqkd59dpl5c1mvjlc30fpk";
-      rev = "f5848439ffdf63db3859f692df1d8fa64b1b3edf";
+      sha256 = "0yfqcln1ah7a9hs6vl8llfyg5rzg1zbsf3y431wdgb0zvp9dlk25";
+      rev = "a7d48d3507499b8667bfca0b12f8865c01b26678";
       repo = "vim-wakatime";
       owner = "wakatime";
     };

From 2325791c2bea48b92fcfb8bbb1988928393cb1fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 3 May 2015 17:09:50 -0500
Subject: [PATCH 0359/1143] plasma53: patch upstream startkde

Rather than shipping our own startkde script, we will go back to
patching upstream's script. This will be less confusing to potential
contributors.
---
 .../services/x11/desktop-managers/kde5.nix    |   2 +-
 pkgs/desktops/plasma-5.3/default.nix          |  21 +-
 .../0001-startkde-NixOS-patches.patch         | 397 ++++++++++++++++++
 pkgs/desktops/plasma-5.3/startkde/default.nix |  34 --
 pkgs/desktops/plasma-5.3/startkde/kdeglobals  |  11 -
 pkgs/desktops/plasma-5.3/startkde/startkde.in | 374 -----------------
 .../plasma-5.3/startkde/startupconfigkeys     |   5 -
 7 files changed, 411 insertions(+), 433 deletions(-)
 create mode 100644 pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
 delete mode 100644 pkgs/desktops/plasma-5.3/startkde/default.nix
 delete mode 100644 pkgs/desktops/plasma-5.3/startkde/kdeglobals
 delete mode 100644 pkgs/desktops/plasma-5.3/startkde/startkde.in
 delete mode 100644 pkgs/desktops/plasma-5.3/startkde/startupconfigkeys

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 02e51577e3e2..7c8cd8aeb855 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -76,7 +76,7 @@ in
     services.xserver.desktopManager.session = singleton {
       name = "kde5";
       bgSupport = true;
-      start = ''exec ${plasma5.startkde}/bin/startkde;'';
+      start = ''exec ${plasma5.plasma-workspace}/bin/startkde;'';
     };
 
     security.setuidOwners = singleton {
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 20818a5c8464..bd840dff42d6 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -139,15 +139,25 @@ let
       };
 
       plasma-workspace = with pkgs; super.plasma-workspace // {
+        patches = [
+          (substituteAll {
+            src = ./plasma-workspace/0001-startkde-NixOS-patches.patch;
+            inherit (pkgs) bash gnused gnugrep socat;
+            inherit (kf5) kconfig kinit kservice;
+            inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+            qt5tools = qt5.tools;
+            dbus_tools = pkgs.dbus.tools;
+          })
+        ];
         buildInputs = with xlibs;
           super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
         postPatch = ''
           substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
             --replace kdostartupconfig5 $out/bin/kdostartupconfig5
         '';
-        postInstall = ''
-          # We use a custom startkde script
-          rm $out/bin/startkde
+        preConfigure = ''
+          substituteInPlace startkde/startkde.cmake \
+            --subst-var-by plasmaWorkspace "$out"
         '';
       };
 
@@ -175,9 +185,4 @@ let
 in
   plasma5 // {
     inherit kf5 scope;
-    startkde = pkgs.callPackage ./startkde {
-      inherit (kf5) kconfig kinit kservice;
-      inherit (plasma5) plasma-desktop plasma-workspace;
-      inherit qt5;
-    };
   }
diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
new file mode 100644
index 000000000000..68f32862b217
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
@@ -0,0 +1,397 @@
+From 9aa37de6cd887c6cdd7ea2356cbb6aecdb988b75 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 3 May 2015 14:51:04 -0500
+Subject: [PATCH] startkde: NixOS patches
+
+---
+ startkde/startkde.cmake | 212 +++++++++++++++++++-----------------------------
+ 1 file changed, 85 insertions(+), 127 deletions(-)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 24e5c1b..d8642d3 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -1,8 +1,29 @@
+-#!/bin/sh
++#!@bash@/bin/bash
+ #
+ #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #
+ 
++# The KDE icon cache is supposed to update itself
++# automatically, but it uses the timestamp on the icon
++# theme directory as a trigger.  Since in Nix the
++# timestamp is always the same, this doesn't work.  So as
++# a workaround, nuke the icon cache on login.  This isn't
++# perfect, since it may require logging out after
++# installing new applications to update the cache.
++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
++rm -fv $HOME/.cache/icon-cache.kcache
++
++# Qt writes a weird ‘libraryPath’ line to
++# ~/.config/Trolltech.conf that causes the KDE plugin
++# paths of previous KDE invocations to be searched.
++# Obviously using mismatching KDE libraries is potentially
++# disastrous, so here we nuke references to the Nix store
++# in Trolltech.conf.  A better solution would be to stop
++# Qt from doing this wackiness in the first place.
++if [ -e $HOME/.config/Trolltech.conf ]; then
++    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
++fi
++
+ if test "x$1" = x--failsafe; then
+     KDE_FAILSAFE=1 # General failsafe flag
+     KWIN_COMPOSE=N # Disable KWin's compositing
+@@ -16,29 +37,16 @@ trap 'echo GOT SIGHUP' HUP
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+-  qbindir=`qtpaths --binaries-dir`
+-  qdbus=$qbindir/qdbus
+-  case $PATH in
+-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+-    *) PATH=$bindir:$PATH; export PATH;;
+-  esac
+-else
+-  qdbus=qdbus
+-fi
+-
+ # Check if a KDE session already is running and whether it's possible to connect to X
+ kcheckrunning
+ kcheckrunning_result=$?
+ if test $kcheckrunning_result -eq 0 ; then
+-	echo "KDE seems to be already running on this display."
+-	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
++  echo "KDE seems to be already running on this display."
++  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
+ 	exit 1
+ elif test $kcheckrunning_result -eq 2 ; then
+ 	echo "\$DISPLAY is not set or cannot connect to the X server."
+-        exit 1
++  exit 1
+ fi
+ 
+ # Boot sequence:
+@@ -56,13 +64,8 @@ fi
+ # * Then ksmserver is started which takes control of the rest of the startup sequence
+ 
+ # We need to create config folder so we can write startupconfigkeys
+-if [  ${XDG_CONFIG_HOME} ]; then
+-  configDir=$XDG_CONFIG_HOME;
+-else
+-  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+-fi
+-
+-mkdir -p $configDir
++configDir=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation)
++mkdir -p "$configDir"
+ 
+ #This is basically setting defaults so we can use them with kstartupconfig5
+ cat >$configDir/startupconfigkeys <<EOF
+@@ -106,53 +109,19 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
+ EOF
+ }
+ 
+-# Make sure the Oxygen font is installed
+-# This is necessary for setups where CMAKE_INSTALL_PREFIX
+-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
+-# $XDG_DATA_HOME for fonts. In this case, we symlink the
+-# Oxygen font under ${XDG_DATA_HOME} and make it known to
+-# fontconfig
+-
+-usr_share="/usr/share"
+-install_share="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@"
+-
+-if [ ! $install_share = $usr_share ]; then
+-
+-    if [ ${XDG_DATA_HOME} ]; then
+-        fontsDir="${XDG_DATA_HOME}/fonts"
+-    else
+-        fontsDir="${HOME}/.fonts"
+-    fi
+-
+-    test -d $fontsDir || {
+-        mkdir -p $fontsDir
+-    }
+-
+-    oxygenDir=$fontsDir/oxygen
+-    prefixDir="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/fonts/oxygen"
+-
+-    # if the oxygen dir doesn't exist, create a symlink to be sure that the
+-    # Oxygen font is available to the user
+-    test -d $oxygenDir || test -d $prefixDir && {
+-        test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
+-    }
+-fi
+-
+ kstartupconfig5
+ returncode=$?
+ if test $returncode -ne 0; then
+-    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
++    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
+     exit 1
+ fi
+ [ -r $configDir/startupconfig ] && . $configDir/startupconfig
+ 
+-if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
+-    export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
+-fi
++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
++export XCURSOR_PATH
+ 
+ # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+-    @EXPORT_XCURSOR_PATH@
+ 
+     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+     if test $? -eq 10; then
+@@ -168,15 +137,33 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
+     fi
+ fi
+ 
+-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+-    xrdb -quiet -merge -nocpp <<EOF
+-Xft.dpi: $kcmfonts_general_forcefontdpi
+-EOF
+-fi
++# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
++# from some users that they're confused and don't know what to do. This is
++# especially necessary on slow machines, where starting KDE takes one or two
++# minutes until anything appears on the screen.
++#
++# If the user has overwritten fonts, the cursor font may be different now
++# so don't move this up.
++#
++@xsetroot@/bin/xsetroot -cursor_name left_ptr
+ 
+ dl=$DESKTOP_LOCKED
+ unset DESKTOP_LOCKED # Don't want it in the environment
+ 
++# Make sure that D-Bus is running
++# D-Bus autolaunch is broken
++if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
++    eval `@dbus_tools@/dbus-launch --sh-syntax --exit-with-session`
++fi
++if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
++    : # ok
++else
++    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
++    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
++    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
++    exit 1
++fi
++
+ ksplash_pid=
+ if test -z "$dl"; then
+   # the splashscreen and progress indicator
+@@ -205,8 +192,7 @@ fi
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-# TODO: Use GenericConfigLocation once we depend on Qt 5.4
+-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
++scriptpath=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
+ 
+ # Add /env/ to the directory to locate the scripts to be sourced
+ for prefix in `echo $scriptpath`; do
+@@ -216,7 +202,7 @@ for prefix in `echo $scriptpath`; do
+ done
+ 
+ # Set the path for Qt plugins provided by KDE
+-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
++QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir`
+ # TODO: Do we really need this?
+ QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+ export QT_PLUGIN_PATH
+@@ -242,7 +228,7 @@ usr_odir=$HOME/.fonts/kde-override
+ usr_fdir=$HOME/.fonts
+ 
+ if test -n "$KDEDIRS"; then
+-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
++  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
+   sys_odir=$kdedirs_first/share/fonts/override
+   sys_fdir=$kdedirs_first/share/fonts
+ else
+@@ -255,23 +241,13 @@ fi
+ # add the user's dirs to the font path, as they might simply have been made
+ # read-only by the administrator, for whatever reason.
+ 
+-test -d "$sys_odir" && xset +fp "$sys_odir"
+-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
+-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
+-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
++test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
++test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
++test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
++test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
+ 
+ # Ask X11 to rebuild its font list.
+-xset fp rehash
+-
+-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+-# from some users that they're confused and don't know what to do. This is
+-# especially necessary on slow machines, where starting KDE takes one or two
+-# minutes until anything appears on the screen.
+-#
+-# If the user has overwritten fonts, the cursor font may be different now
+-# so don't move this up.
+-#
+-xsetroot -cursor_name left_ptr
++@xset@/bin/xset fp rehash
+ 
+ # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+ if test -n "$GS_LIB" ; then
+@@ -284,30 +260,6 @@ fi
+ 
+ echo 'startkde: Starting up...'  1>&2
+ 
+-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
+-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
+-# /usr/local.
+-if test -z "$XDG_DATA_DIRS"; then
+-    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
+-fi
+-export XDG_DATA_DIRS
+-
+-# Make sure that D-Bus is running
+-# D-Bus autolaunch is broken
+-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+-    eval `dbus-launch --sh-syntax --exit-with-session`
+-fi
+-if $qdbus >/dev/null 2>/dev/null; then
+-    : # ok
+-else
+-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+-    exit 1
+-fi
+-
+-
+ # Mark that full KDE session is running (e.g. Konqueror preloading works only
+ # with full KDE running). The KDE_FULL_SESSION property can be detected by
+ # any X client connected to the same X session, even if not launched
+@@ -332,11 +284,11 @@ fi
+ #
+ KDE_FULL_SESSION=true
+ export KDE_FULL_SESSION
+-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+ 
+ KDE_SESSION_VERSION=5
+ export KDE_SESSION_VERSION
+-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+ 
+ KDE_SESSION_UID=`id -ru`
+ export KDE_SESSION_UID
+@@ -346,30 +298,36 @@ export XDG_CURRENT_DESKTOP
+ 
+ # At this point all the environment is ready, let's send it to kwalletd if running
+ if test -n "$PAM_KWALLET_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
++    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+ fi
+ 
+-# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
++# At this point all environment variables are set, let's send it to the DBus
++# session server to update the activation environment
+ @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
+ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not sync environment to dbus.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not sync environment to dbus."
++  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
+   exit 1
+ fi
+ 
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+ # kdeinit unsets this variable before loading applications.
+-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
+ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
++  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation"
+   exit 1
+ fi
+ 
++# (NixOS) We run kbuildsycoca5 before starting the user session because things
++# may be missing or moved if they have run nixos-rebuild and it may not be
++# possible for them to start Konsole to run it manually!
++@kservice@/bin/kbuildsycoca5
++
+ # finally, give the session control to the session manager
+ # see kdebase/ksmserver for the description of the rest of the startup sequence
+ # if the KDEWM environment variable has been set, then it will be used as KDE's
+@@ -385,27 +343,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+ # lock now and do the rest of the KDE startup underneath the locker.
+ KSMSERVEROPTIONS=""
+ test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+-kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
++@kinit@/bin/kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
+ if test $? -eq 255; then
+   # Startup error
+   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
++  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
+ fi
+ 
+-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+ 
+ if test x"$wait_drkonqi"x = x"true"x ; then
+     # wait for remaining drkonqi instances with timeout (in seconds)
+-    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+     wait_drkonqi_counter=0
+-    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++    while @qt5tools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+         sleep 5
+         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+             # ask remaining drkonqis to die in a graceful way
+-            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+-                $qdbus "$address" "/MainApplication" "quit"
++            @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
++                @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit"
+             done
+             break
+         fi
+@@ -417,21 +375,21 @@ echo 'startkde: Shutting down...'  1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+ 
+ # Clean up
+-kdeinit5_shutdown
++@kinit@/bin/kdeinit5_shutdown
+ 
+ echo 'startkde: Running shutdown scripts...'  1>&2
+ 
+ # Run scripts found in <config locations>/plasma-workspace/shutdown
+ for prefix in `echo "$scriptpath"`; do
+-  for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do
++  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
+     test -x "$prefix$file" && "$prefix$file"
+   done
+ done
+ 
+ unset KDE_FULL_SESSION
+-xprop -root -remove KDE_FULL_SESSION
++@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-xprop -root -remove KDE_SESSION_VERSION
++@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
+ unset KDE_SESSION_UID
+ 
+ echo 'startkde: Done.'  1>&2
+-- 
+2.3.6
+
diff --git a/pkgs/desktops/plasma-5.3/startkde/default.nix b/pkgs/desktops/plasma-5.3/startkde/default.nix
deleted file mode 100644
index 624c5d239d5d..000000000000
--- a/pkgs/desktops/plasma-5.3/startkde/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# We provide our own version of the startkde script in its entirety, rather than
-# patching the version provided by kde-workspace, because it requires such
-# extensive patching.
-
-{ stdenv, bash, dbus, gnused, gnugrep, kconfig, kinit, kservice, plasma-desktop
-, plasma-workspace, qt5, socat, xorg }:
-
-let startkde = ./startkde.in; in
-
-stdenv.mkDerivation {
-  name = "startkde-0.1";
-  phases = "installPhase";
-
-  inherit bash gnused gnugrep kconfig kinit kservice socat;
-  inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-  qt5tools = qt5.tools;
-  dbus_tools = dbus.tools;
-  plasmaWorkspace = plasma-workspace;
-  plasmaDesktop = plasma-desktop;
-  startupconfigkeys = ./startupconfigkeys;
-  kdeglobals = ./kdeglobals;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    substituteAll ${startkde} $out/bin/startkde
-    chmod +x $out/bin/startkde
-  '';
-
-  meta = {
-    description = "Custom startkde script for Nixpkgs";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    license = with stdenv.lib.licenses; [ gpl2Plus ];
-  };
-}
diff --git a/pkgs/desktops/plasma-5.3/startkde/kdeglobals b/pkgs/desktops/plasma-5.3/startkde/kdeglobals
deleted file mode 100644
index bfa610712ede..000000000000
--- a/pkgs/desktops/plasma-5.3/startkde/kdeglobals
+++ /dev/null
@@ -1,11 +0,0 @@
-[General]
-XftAntialias=true
-XftHintStyle=hintmedium
-XftSubPixel=none
-desktopFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-fixed=Oxygen Mono,9,-1,5,50,0,0,0,0,0
-font=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-menuFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-smallestReadableFont=Oxygen-Sans,8,-1,5,50,0,0,0,0,0
-taskbarFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
\ No newline at end of file
diff --git a/pkgs/desktops/plasma-5.3/startkde/startkde.in b/pkgs/desktops/plasma-5.3/startkde/startkde.in
deleted file mode 100644
index 0825a0733f43..000000000000
--- a/pkgs/desktops/plasma-5.3/startkde/startkde.in
+++ /dev/null
@@ -1,374 +0,0 @@
-#!@bash@/bin/bash -x
-#
-#  NIXOS KDE STARTUP SCRIPT
-#
-
-# The KDE icon cache is supposed to update itself
-# automatically, but it uses the timestamp on the icon
-# theme directory as a trigger.  Since in Nix the
-# timestamp is always the same, this doesn't work.  So as
-# a workaround, nuke the icon cache on login.  This isn't
-# perfect, since it may require logging out after
-# installing new applications to update the cache.
-# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-rm -fv $HOME/.cache/icon-cache.kcache
-
-# Qt writes a weird ‘libraryPath’ line to
-# ~/.config/Trolltech.conf that causes the KDE plugin
-# paths of previous KDE invocations to be searched.
-# Obviously using mismatching KDE libraries is potentially
-# disastrous, so here we nuke references to the Nix store
-# in Trolltech.conf.  A better solution would be to stop
-# Qt from doing this wackiness in the first place.
-if [ -e $HOME/.config/Trolltech.conf ]; then
-    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-fi
-
-if test "x$1" = x--failsafe; then
-    KDE_FAILSAFE=1 # General failsafe flag
-    KWIN_COMPOSE=N # Disable KWin's compositing
-    export KWIN_COMPOSE KDE_FAILSAFE
-fi
-
-# When the X server dies we get a HUP signal from xinit. We must ignore it
-# because we still need to do some cleanup.
-trap 'echo GOT SIGHUP' HUP
-
-# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
-unset DYLD_FORCE_FLAT_NAMESPACE
-
-# Check if a KDE session already is running and whether it's possible to connect to X
-@plasmaWorkspace@/bin/kcheckrunning
-kcheckrunning_result=$?
-if test $kcheckrunning_result -eq 0 ; then
-  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
-	exit 1
-elif test $kcheckrunning_result -eq 2 ; then
-	echo "\$DISPLAY is not set or cannot connect to the X server."
-  exit 1
-fi
-
-# Boot sequence:
-#
-# kdeinit is used to fork off processes which improves memory usage
-# and startup time.
-#
-# * kdeinit starts klauncher first.
-# * Then kded is started. kded is responsible for keeping the sycoca
-#   database up to date. When an up to date database is present it goes
-#   into the background and the startup continues.
-# * Then kdeinit starts kcminit. kcminit performs initialisation of
-#   certain devices according to the user's settings
-#
-# * Then ksmserver is started which takes control of the rest of the startup sequence
-
-# We need to create config folder so we can write startupconfigkeys
-configDir=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation)
-mkdir -p "$configDir"
-
-# This is basically setting defaults so we can use them with kstartupconfig5
-cat @startupconfigkeys@ >$configDir/startupconfigkeys
-
-# preload the user's locale on first start
-plasmalocalerc=$configDir/plasma-localerc
-test -f $plasmalocalerc || {
-cat >$plasmalocalerc <<EOF
-[Formats]
-LANG=$LANG
-EOF
-}
-
-# export LC_* variables set by kcmshell5 formats into environment
-# so it can be picked up by QLocale and friends.
-exportformatssettings=$configDir/plasma-locale-settings.sh
-[ -f $exportformatssettings ] && . $exportformatssettings
-
-# Write a default kdeglobals file to set up the font
-kdeglobalsfile=$configDir/kdeglobals
-[ -f $kdeglobalsfile ] || cat @kdeglobals@ >$kdeglobalsfile
-
-@plasmaWorkspace@/bin/kstartupconfig5
-returncode=$?
-if test $returncode -ne 0; then
-    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 exited with $returncode"
-    exit 1
-fi
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
-
-XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
-export XCURSOR_PATH
-
-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
-
-    @plasmaDesktop@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-    if test $? -eq 10; then
-        XCURSOR_THEME=default
-        export XCURSOR_THEME
-    elif test -n "$kcminputrc_mouse_cursortheme"; then
-        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
-        export XCURSOR_THEME
-    fi
-    if test -n "$kcminputrc_mouse_cursorsize"; then
-        XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
-        export XCURSOR_SIZE
-    fi
-fi
-
-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-# from some users that they're confused and don't know what to do. This is
-# especially necessary on slow machines, where starting KDE takes one or two
-# minutes until anything appears on the screen.
-#
-# If the user has overwritten fonts, the cursor font may be different now
-# so don't move this up.
-#
-@xsetroot@/bin/xsetroot -cursor_name left_ptr
-
-dl=$DESKTOP_LOCKED
-unset DESKTOP_LOCKED # Don't want it in the environment
-
-# Make sure that D-Bus is running
-# D-Bus autolaunch is broken
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
-fi
-if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
-    : # ok
-else
-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
-    exit 1
-fi
-
-ksplash_pid=
-if test -z "$dl"; then
-  # the splashscreen and progress indicator
-  case "$ksplashrc_ksplash_engine" in
-    KSplashQML)
-      ksplash_pid=`@plasmaWorkspace@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
-      ;;
-    None)
-      ;;
-    *)
-      ;;
-  esac
-fi
-
-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
-# (where <config locations> correspond to the system and user's configuration
-# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
-# and /etc/xdg/ on Linux)
-#
-# This is where you can define environment variables that will be available to
-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
-# or eval `gpg-agent --daemon`.
-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
-#
-# (see end of this file).
-# For anything else (that doesn't set env vars, or that needs a window manager),
-# better use the Autostart folder.
-
-scriptpath=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
-
-# Add /env/ to the directory to locate the scripts to be sourced
-for prefix in `echo $scriptpath`; do
-  for file in "$prefix"/env/*.sh; do
-    test -r "$file" && . "$file"
-  done
-done
-
-# Set the path for Qt plugins provided by KDE
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir`
-# TODO: Do we really need this?
-QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
-export QT_PLUGIN_PATH
-
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
-else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
-test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
-test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
-test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-@xset@/bin/xset fp rehash
-
-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
-if test -n "$GS_LIB" ; then
-    GS_LIB=$usr_fdir:$GS_LIB
-    export GS_LIB
-else
-    GS_LIB=$usr_fdir
-    export GS_LIB
-fi
-
-echo 'startkde: Starting up...'  1>&2
-
-
-# Mark that full KDE session is running (e.g. Konqueror preloading works only
-# with full KDE running). The KDE_FULL_SESSION property can be detected by
-# any X client connected to the same X session, even if not launched
-# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
-# however guarantees that the application is launched in the same environment
-# like the KDE session and that e.g. KDE utilities/libraries are available.
-# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
-# The matching tests are:
-#   For $KDE_FULL_SESSION:
-#     if test -n "$KDE_FULL_SESSION"; then ... whatever
-#   For KDE_FULL_SESSION property:
-#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
-#     if test $? -eq 0; then ... whatever
-#
-# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
-# of the user running the KDE session. It should be rarely needed (e.g.
-# after sudo to prevent desktop-wide functionality in the new user's kded).
-#
-# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number.
-# Note that this didn't exist in KDE3, which can be detected by its absense and
-# the presence of KDE_FULL_SESSION.
-#
-KDE_FULL_SESSION=true
-export KDE_FULL_SESSION
-@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-
-KDE_SESSION_VERSION=5
-export KDE_SESSION_VERSION
-@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-
-KDE_SESSION_UID=`id -ru`
-export KDE_SESSION_UID
-
-XDG_CURRENT_DESKTOP=KDE
-export XDG_CURRENT_DESKTOP
-
-# At this point all the environment is ready, let's send it to kwalletd if running
-if test -n "$PAM_KWALLET_LOGIN" ; then
-    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-fi
-
-# At this point all environment variables are set, let's send it to the DBus
-# session server to update the activation environment
-@plasmaWorkspace@/lib/libexec/ksyncdbusenv
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not sync environment to dbus.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
-  exit 1
-fi
-
-# We set LD_BIND_NOW to increase the efficiency of kdeinit.
-# kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not start kdeinit5.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5."
-  exit 1
-fi
-
-# (NixOS) We run kbuildsycoca5 before starting the user session because things
-# may be missing or moved if they have run nixos-rebuild and it may not be
-# possible for them to start Konsole to run it manually!
-@kservice@/bin/kbuildsycoca5
-
-# finally, give the session control to the session manager
-# see kdebase/ksmserver for the description of the rest of the startup sequence
-# if the KDEWM environment variable has been set, then it will be used as KDE's
-# window manager instead of kwin.
-# if KDEWM is not set, ksmserver will ensure kwin is started.
-# kwrapper5 is used to reduce startup time and memory usage
-# kwrapper5 does not return useful error codes such as the exit code of ksmserver.
-# We only check for 255 which means that the ksmserver process could not be
-# started, any problems thereafter, e.g. ksmserver failing to initialize,
-# will remain undetected.
-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
-# If the session should be locked from the start (locked autologin),
-# lock now and do the rest of the KDE startup underneath the locker.
-KSMSERVEROPTIONS=""
-test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
-@kinit@/bin/kwrapper5 @plasmaWorkspace@/bin/ksmserver $KDEWM $KSMSERVEROPTIONS
-if test $? -eq 255; then
-  # Startup error
-  echo 'startkde: Could not start ksmserver.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver."
-fi
-
-wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
-
-if test x"$wait_drkonqi"x = x"true"x ; then
-    # wait for remaining drkonqi instances with timeout (in seconds)
-    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-    wait_drkonqi_counter=0
-    while @qt5tools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-        sleep 5
-        wait_drkonqi_counter=$((wait_drkonqi_counter+5))
-        if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
-            # ask remaining drkonqis to die in a graceful way
-            @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
-                @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit"
-            done
-            break
-        fi
-    done
-fi
-
-echo 'startkde: Shutting down...'  1>&2
-# just in case
-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-
-# Clean up
-@kinit@/bin/kdeinit5_shutdown
-
-echo 'startkde: Running shutdown scripts...'  1>&2
-
-# Run scripts found in <config locations>/plasma-workspace/shutdown
-for prefix in `echo "$scriptpath"`; do
-  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
-    test -x "$prefix$file" && "$prefix$file"
-  done
-done
-
-unset KDE_FULL_SESSION
-@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
-unset KDE_SESSION_VERSION
-@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
-unset KDE_SESSION_UID
-
-echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/plasma-5.3/startkde/startupconfigkeys b/pkgs/desktops/plasma-5.3/startkde/startupconfigkeys
deleted file mode 100644
index 0fc92cff8a53..000000000000
--- a/pkgs/desktops/plasma-5.3/startkde/startupconfigkeys
+++ /dev/null
@@ -1,5 +0,0 @@
-kcminputrc Mouse cursorTheme 'breeze_cursors'
-kcminputrc Mouse cursorSize ''
-ksplashrc KSplash Theme Breeze
-ksplashrc KSplash Engine KSplashQML
-kcmfonts General forceFontDPI 0

From f73682c52612bd0ebf1b6c59977e44e0b359dd94 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 May 2015 13:53:37 -0700
Subject: [PATCH 0360/1143] ncurses: Cleanup abi version

---
 pkgs/development/libraries/ncurses/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                | 4 ----
 pkgs/top-level/haskell-ng.nix                  | 2 --
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 538c136a042b..051d29924dfc 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -4,8 +4,8 @@
 , gpm ? null
 
 # Extra Options
+, abiVersion ? "5"
 , unicode ? true
-, abiVersion ? null
 }:
 
 let
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ optGpm ];
 
   configureFlags = [
+    (mkWith   true        "abi-version" abiVersion)
     (mkWith   true        "cxx"         null)
     (mkWith   true        "cxx-binding" null)
     (mkWith   false       "ada"         null)
@@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
     (mkEnable unicode     "widec"       null)
     (mkEnable true        "ext-colors"  null)
     (mkEnable true        "ext-mouse"   null)
-  ] ++ stdenv.lib.optional (abiVersion != null) (mkWith true "abi-version" abiVersion);
+  ];
 
   # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
   # directory doesn't exist, the configure script will disable installation of
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8c4c716a258..e3dd92a1e083 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7241,10 +7241,6 @@ let
 
   ncurses = callPackage ../development/libraries/ncurses { };
 
-  ncurses5 = callPackage ../development/libraries/ncurses {
-    abiVersion = "5";
-  };
-
   neon = callPackage ../development/libraries/neon {
     compressionSupport = true;
     sslSupport = true;
diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix
index f068b8b9a12b..73c0abd4726d 100644
--- a/pkgs/top-level/haskell-ng.nix
+++ b/pkgs/top-level/haskell-ng.nix
@@ -9,13 +9,11 @@ rec {
     ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };
     ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({
       gmp = pkgs.gmp4;
-      ncurses = pkgs.ncurses5;
     } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
     ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({
       gmp = pkgs.gmp4;
-      ncurses = pkgs.ncurses5;
     } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });

From 9740b0d12d467aaa0ddc1cc27559374250ae5549 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 May 2015 13:45:10 -0700
Subject: [PATCH 0361/1143] kerberos: Modernize build

---
 .../libraries/kerberos/heimdal.nix            | 79 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index aeea290bdb28..c06fcdb384e8 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,7 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, flex, yacc, readline, openldap, libcap_ng
-, sqlite, db, ncurses, openssl, cyrus_sasl
+{ stdenv, fetchurl, pkgconfig, flex, yacc
+
+# Optional Dependencies
+, openldap ? null, libcap_ng ? null, sqlite ? null, openssl ? null, db ? null
+, readline ? null, libedit ? null, pam ? null
+
+#, readline, openldap, libcap_ng
+#, sqlite, db, ncurses, openssl, cyrus_sasl
 }:
 
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optOpenldap = shouldUsePkg openldap;
+  optLibcap_ng = shouldUsePkg libcap_ng;
+  optSqlite = shouldUsePkg sqlite;
+  optOpenssl = shouldUsePkg openssl;
+  optDb = shouldUsePkg db;
+  optReadline = shouldUsePkg readline;
+  optLibedit = shouldUsePkg libedit;
+  optPam = shouldUsePkg pam;
+in
 stdenv.mkDerivation rec {
   name = "heimdal-1.5.3";
 
@@ -13,14 +38,43 @@ stdenv.mkDerivation rec {
     sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
   };
 
-  ## ugly, X should be made an option
+  nativeBuildInputs = [ pkgconfig flex yacc ];
+  buildInputs = [
+    optOpenldap optLibcap_ng optSqlite optOpenssl optDb optReadline optLibedit
+    optPam
+  ];
+
   configureFlags = [
-    "--enable-hdb-openldap-module"
-    "--with-capng"
-    "--with-openldap=${openldap}"
-    "--with-sqlite3=${sqlite}"
-    "--with-openssl-lib=${openssl}/lib"
-    "--without-x"
+    (mkOther                         "sysconfdir"            "/etc")
+    (mkOther                         "localstatedir"         "/var")
+    (mkWith   (optOpenldap != null)  "openldap"              optOpenldap)
+    (mkEnable (optOpenldap != null)  "hdb-openldap-module"   null)
+    (mkEnable true                   "pk-init"               null)
+    (mkEnable true                   "digest"                null)
+    (mkEnable true                   "kx509"                 null)
+    (mkWith   (optLibcap_ng != null) "capng"                 null)
+    (mkWith   (optSqlite != null)    "sqlite3"               sqlite)
+    (mkEnable (optSqlite != null)    "sqlite-cache"          null)
+    #(mkWith  true                   "libintl"               glibc)              # TODO libintl fix
+    (mkWith   true                   "hdbdir"                "/var/lib/heimdal")
+    (mkWith   (optOpenssl != null)   "openssl"               optOpenssl)
+    (mkEnable true                   "pthread-support"       null)
+    (mkEnable true                   "dce"                   null)
+    (mkEnable true                   "afs-support"           null)
+    (mkWith   (optDb != null)        "berkeley-db"           optDb)
+    (mkEnable false                  "nmdb"                  null)
+    (mkEnable false                  "developer"             null)
+    (mkWith   true                   "ipv6"                  null)
+    (mkEnable false                  "socket-wrapper"        null)
+    (mkEnable true                   "otp"                   null)
+    (mkEnable false                  "osfc2"                 null)
+    (mkEnable true                   "mmap"                  null)
+    (mkEnable true                   "afs-string-to-key"     null)
+    (mkWith   (optReadline != null)  "readline"              optReadline)
+    (mkWith   (optLibedit != null)   "libedit"               optLibedit)
+    (mkWith   false                  "x"                     null)
+    (mkEnable true                   "kcm"                   null)
+    (mkEnable true                   "heimdal-documentation" null)
   ];
 
   # We need to build hcrypt for applications like samba
@@ -34,16 +88,11 @@ stdenv.mkDerivation rec {
     (cd lib/hcrypto; make install)
     (cd include/hcrypto; make install)
 
-    # dont succeed with --libexec=$out/sbin, so
+    # Doesn't succeed with --libexec=$out/sbin, so
     mv "$out/libexec/"* $out/sbin/
     rmdir $out/libexec
   '';
 
-  buildInputs = [
-    pkgconfig flex yacc readline openldap libcap_ng sqlite db ncurses
-    cyrus_sasl openssl
-  ];
-
   meta = with stdenv.lib; {
     description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
     license = licenses.bsd3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3dd92a1e083..a4eb351261a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6191,7 +6191,6 @@ let
     openldap = openldap.override {
       cyrus_sasl = cyrus_sasl.override { kerberos = null; };
     };
-    cyrus_sasl = cyrus_sasl.override { kerberos = null; };
   };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };

From 5728c06f8320e134795374f35289ee6590ba2f85 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 May 2015 13:54:30 -0700
Subject: [PATCH 0362/1143] Revert "libvorbis: propagate libogg dependency"

This reverts commit bd55792892dc6cc5db172e41f2b36998b3397143.
---
 pkgs/development/libraries/libvorbis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index cff6cbe8616f..7e34c6e9b9fa 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ libogg ];
+  buildInputs = [ libogg ];
 
   doCheck = true;
 

From ca5c9e6cf2ea5a7367154c52b41072722924ef2b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 May 2015 14:12:53 -0700
Subject: [PATCH 0363/1143] libvorbis: Fix ogg dependency

---
 pkgs/development/libraries/libvorbis/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 7e34c6e9b9fa..2ab6f6246726 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  # Fix header reference
+  postInstall = ''
+    sed -i $out/include/vorbis/codec.h \
+      -e 's,#include <ogg/ogg.h>,#include "${libogg}/include/ogg/ogg.h",g'
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://xiph.org/vorbis/;
     license = licenses.bsd3;

From cecae8262acad802d41e50160012b55d1f322bdf Mon Sep 17 00:00:00 2001
From: Paulus Esterhazy <pesterhazy@gmail.com>
Date: Mon, 4 May 2015 08:55:12 +0200
Subject: [PATCH 0364/1143] Add "six" as dependency

Ansible's official dynamic inventory script for AWS, ec2.py, requires
python library `six` to work properly. This commit adds the library as
a dependency.
---
 pkgs/tools/system/ansible/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix
index c033814c6311..284f6cbb3d28 100644
--- a/pkgs/tools/system/ansible/default.nix
+++ b/pkgs/tools/system/ansible/default.nix
@@ -20,7 +20,7 @@ pythonPackages.buildPythonPackage rec {
   dontPatchShebangs = true;
 
   propagatedBuildInputs = with pythonPackages; [
-    paramiko jinja2 pyyaml httplib2 boto
+    paramiko jinja2 pyyaml httplib2 boto six
   ];
 
   postFixup = ''

From 63ea868735ccdec62a2ebc2982ea680321475c00 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 4 May 2015 03:33:31 -0400
Subject: [PATCH 0365/1143] tornado: fix breakage from a5b17ec tornado 4.x now
 depends on certifi add tornado 3.2.2 back for packages not compatible with
 4.x

---
 pkgs/top-level/python-packages.nix | 44 ++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 816b49afe360..09b762bb72ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13848,11 +13848,23 @@ let
     };
   };
 
+  # Remove tornado 3.x once pythonPackages.thumbor is updated to 5.x
+  tornado_3 = buildPythonPackage rec {
+    name = "tornado-3.2.2";
 
+    propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
+      sha256 = "13mq6nx98999zql8p2zlg4sj2hr2sxq9w11mqzi7rjfjs0z2sn8i";
+    };
+
+    doCheck = false;
+  };
   tornado = buildPythonPackage rec {
     name = "tornado-4.1";
 
-    propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 ];
+    propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
@@ -14994,20 +15006,22 @@ let
     disabled = ! isPy27;
 
     propagatedBuildInputs = with self; [
-                    tornado
-                    pycrypto
-                    pycurl
-                    pillow
-                    derpconf
-                    python_magic
-                    thumborPexif
-                    (pkgs.opencv.override {
-                        gtk = null;
-                        glib = null;
-                        xineLib = null;
-                        gstreamer = null;
-                        ffmpeg = null;
-                    }) ];
+      # Remove pythonPackages.tornado 3.x once thumbor is updated to 5.x
+      tornado_3
+      pycrypto
+      pycurl
+      pillow
+      derpconf
+      python_magic
+      thumborPexif
+      (pkgs.opencv.override {
+        gtk = null;
+        glib = null;
+        xineLib = null;
+        gstreamer = null;
+        ffmpeg = null;
+      })
+    ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz";

From 2d34bc06a0a29e9b2c6a302c24b1685a419119ae Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 4 May 2015 08:09:42 +0000
Subject: [PATCH 0366/1143] fix wavpack .pc file

The .pc file is missing declaration of exec_prefix causing other packages to
fail such as gst-plugins-good beacuse pkg-config stops processing
remaining .pc files

I notified david at wavpack com

enableParallelBuilding = true; also happens to work
---
 pkgs/development/libraries/wavpack/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 8a63b780b4c2..08465861f27f 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -4,6 +4,12 @@ stdenv.mkDerivation rec {
   name = "wavpack-${version}";
   version = "4.70.0";
 
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    sed -i '2iexec_prefix=@exec_prefix@' wavpack.pc.in
+  '';
+
   src = fetchurl {
     url = "http://www.wavpack.com/${name}.tar.bz2";
     sha256 = "191h8hv8qk72hfh1crg429i9yq3cminwqb249sy9zadbn1wy7b9c";

From 9bf7b293e606ef1a45cbc9fa14f7650e49164580 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Mon, 4 May 2015 11:58:12 +0200
Subject: [PATCH 0367/1143] make lilv and sord svn versions separate.

---
 pkgs/applications/audio/ingen/default.nix     |  8 +++---
 .../libraries/audio/lilv/default.nix          | 13 ++++-----
 .../libraries/audio/lilv/lilv-svn.nix         | 28 +++++++++++++++++++
 pkgs/development/libraries/sord/default.nix   | 13 ++++-----
 pkgs/development/libraries/sord/sord-svn.nix  | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 6 files changed, 74 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/libraries/audio/lilv/lilv-svn.nix
 create mode 100644 pkgs/development/libraries/sord/sord-svn.nix

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index af94e1e7e238..40ba278f7a00 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv
-, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv-svn
+, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom
 , suil
 }:
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [
-    boost ganv glibmm gtk gtkmm jack2 lilv lv2 makeWrapper pkgconfig
-    python raul serd sord sratom suil
+    boost ganv glibmm gtk gtkmm jack2 lilv-svn lv2 makeWrapper pkgconfig
+    python raul serd sord-svn sratom suil
   ];
 
   configurePhase = ''
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 39e32d193cdf..9f3307742ec4 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord, sratom }:
+{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
-  name = "lilv-svn-${rev}";
-  rev = "5675";
+  name = "lilv-${version}";
+  version = "0.20.0";
 
-  src = fetchsvn {
-    url = "http://svn.drobilla.net/lad/trunk/lilv";
-    rev = rev;
-    sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq";
+  src = fetchurl {
+    url = "http://download.drobilla.net/${name}.tar.bz2";
+    sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord sratom ];
diff --git a/pkgs/development/libraries/audio/lilv/lilv-svn.nix b/pkgs/development/libraries/audio/lilv/lilv-svn.nix
new file mode 100644
index 000000000000..0b02774bc172
--- /dev/null
+++ b/pkgs/development/libraries/audio/lilv/lilv-svn.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord-svn, sratom }:
+
+stdenv.mkDerivation rec {
+  name = "lilv-svn-${rev}";
+  rev = "5675";
+
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/lilv";
+    rev = rev;
+    sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq";
+  };
+
+  buildInputs = [ lv2 pkgconfig python serd sord-svn sratom ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://drobilla.net/software/lilv;
+    description = "A C library to make the use of LV2 plugins";
+    license = licenses.mit;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 290e85d81c7e..96a19bf37cc9 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchsvn, pkgconfig, python, serd }:
+{ stdenv, fetchurl, pkgconfig, python, serd }:
 
 stdenv.mkDerivation rec {
-  name = "sord-svn-${rev}";
-  rev = "327";
+  name = "sord-${version}";
+  version = "0.12.2";
 
-  src = fetchsvn {
-    url = "http://svn.drobilla.net/sord/trunk";
-    rev = rev;
-    sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4";
+  src = fetchurl {
+    url = "http://download.drobilla.net/${name}.tar.bz2";
+    sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx";
   };
 
   buildInputs = [ pkgconfig python serd ];
diff --git a/pkgs/development/libraries/sord/sord-svn.nix b/pkgs/development/libraries/sord/sord-svn.nix
new file mode 100644
index 000000000000..290e85d81c7e
--- /dev/null
+++ b/pkgs/development/libraries/sord/sord-svn.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, pkgconfig, python, serd }:
+
+stdenv.mkDerivation rec {
+  name = "sord-svn-${rev}";
+  rev = "327";
+
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/sord/trunk";
+    rev = rev;
+    sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4";
+  };
+
+  buildInputs = [ pkgconfig python serd ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://drobilla.net/software/sord;
+    description = "A lightweight C library for storing RDF data in memory";
+    license = licenses.mit;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 920bbc006211..7380dd7c222d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7550,6 +7550,7 @@ let
   libsmf = callPackage ../development/libraries/audio/libsmf { };
 
   lilv = callPackage ../development/libraries/audio/lilv { };
+  lilv-svn = callPackage ../development/libraries/audio/lilv/lilv-svn.nix { };
 
   lv2 = callPackage ../development/libraries/audio/lv2 { };
 
@@ -7661,6 +7662,7 @@ let
   soqt = callPackage ../development/libraries/soqt { };
 
   sord = callPackage ../development/libraries/sord {};
+  sord-svn = callPackage ../development/libraries/sord/sord-svn.nix {};
 
   soundtouch = callPackage ../development/libraries/soundtouch {};
 

From c0c82ea2ebbcf0632260a931cf832cac1c8a014e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 19 Apr 2015 18:47:45 +0200
Subject: [PATCH 0368/1143] Replace old "haskellPackages" code with Haskell NG.

---
 pkgs/top-level/all-packages.nix     |   45 +-
 pkgs/top-level/haskell-defaults.nix |  223 --
 pkgs/top-level/haskell-ng.nix       |   88 -
 pkgs/top-level/haskell-packages.nix | 3329 +--------------------------
 4 files changed, 79 insertions(+), 3606 deletions(-)
 delete mode 100644 pkgs/top-level/haskell-defaults.nix
 delete mode 100644 pkgs/top-level/haskell-ng.nix

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1381dd9754e3..efac01952850 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3775,42 +3775,9 @@ let
 
   # Haskell and GHC
 
-  # Import Haskell infrastructure.
+  haskell = callPackage ./haskell-packages.nix { };
 
-  haskell = let pkgs_       = pkgs // { /* add necessary overrides here */ };
-                callPackage = newScope pkgs_;
-                newScope    = extra: lib.callPackageWith (pkgs_ // pkgs_.xorg // extra);
-            in callPackage ./haskell-defaults.nix { pkgs = pkgs_; inherit callPackage newScope; };
-
-  # Available GHC versions.
-
-  # For several compiler versions, we export a large set of Haskell-related
-  # packages.
-
-  # NOTE (recurseIntoAttrs): After discussion, we originally decided to
-  # enable it for all GHC versions. However, this is getting too much,
-  # particularly in connection with Hydra builds for all these packages.
-  # So we enable it for selected versions only. We build all ghcs, though
-
-  ghc = recurseIntoAttrs (lib.mapAttrs' (name: value:
-    lib.nameValuePair (builtins.substring (builtins.stringLength "packages_") (builtins.stringLength name) name) value.ghc
-  ) (lib.filterAttrs (name: value:
-    builtins.substring 0 (builtins.stringLength "packages_") name == "packages_"
-  ) haskell));
-
-  haskellPackages_ghc6104 = haskell.packages_ghc6104;
-  haskellPackages_ghc6123 = haskell.packages_ghc6123;
-  haskellPackages_ghc704  = haskell.packages_ghc704;
-  haskellPackages_ghc722  = haskell.packages_ghc722;
-  haskellPackages_ghc742  = haskell.packages_ghc742;
-  haskellPackages_ghc763  = haskell.packages_ghc763;
-  haskellPackages_ghc784_no_profiling = recurseIntoAttrs haskell.packages_ghc784.noProfiling;
-  haskellPackages_ghc784_profiling    = recurseIntoAttrs haskell.packages_ghc784.profiling;
-  haskellPackages_ghc784              = recurseIntoAttrs haskell.packages_ghc784.highPrio;
-  haskellPackages = haskellPackages_ghc784;
-
-  haskell-ng = callPackage ./haskell-ng.nix { };
-  haskellngPackages = haskell-ng.packages.ghc7101.override {
+  haskellPackages = haskell.packages.ghc7101.override {
     overrides = config.haskellPackageOverrides or (self: super: {});
     provideOldAttributeNames = config.provideOldHaskellAttributeNames or false;
   };
@@ -10681,10 +10648,7 @@ let
 
     stratego = callPackage ../applications/editors/emacs-modes/stratego { };
 
-    structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode {
-      inherit (haskellPackages) cabal ;
-      haskellSrcExts = haskellPackages.haskellSrcExts_1_15_0_1;
-    };
+    structuredHaskellMode = haskellPackages.structured-haskell-mode;
 
     sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
 
@@ -14462,7 +14426,8 @@ let
   buildbotSlave = buildbot-slave;  # added 2014-12-09
   cool-old-term = cool-retro-term; # added 2015-01-31
   rssglx = rss-glx; #added 2015-03-25
-
+  haskell-ng = haskell;                 # 2015-04-19
+  haskellngPackages = haskellPackages;  # 2015-04-19
 
   opentsdb = callPackage ../tools/misc/opentsdb {};
 
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
deleted file mode 100644
index 7540244b9bc6..000000000000
--- a/pkgs/top-level/haskell-defaults.nix
+++ /dev/null
@@ -1,223 +0,0 @@
-# Haskell / GHC infrastructure in Nixpkgs
-#
-# In this file, we
-#
-#    * define sets of default package versions for each GHC compiler version,
-#    * associate GHC versions with bootstrap compiler versions and package defaults.
-#
-# The actual Haskell packages are composed in haskell-packages.nix. There is
-# more documentation in there.
-
-{ makeOverridable, lowPrio, hiPrio, stdenv, pkgs, newScope, config, callPackage } : rec {
-
-  # haskell-packages.nix provides the latest possible version of every package,
-  # and this file overrides those version choices per compiler when appropriate.
-  # Older compilers inherit the overrides from newer ones.
-
-  ghcHEADPrefs = self : super : super // {
-    cabalInstall_1_20_0_6 = super.cabalInstall_1_20_0_6.override { Cabal = null; };
-    mtl = self.mtl_2_2_1;
-  };
-
-  ghc784Prefs = self : super : ghcHEADPrefs self super // {
-    cabalInstall_1_20_0_6 = super.cabalInstall_1_20_0_6.override { Cabal = self.Cabal_1_20_0_3; };
-    codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_3; }; };
-    jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_3; };
-    MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x
-    mtl = self.mtl_2_1_3_1;
-    xhtml = null;
-    transformersCompat = super.transformersCompat.override { cabal = self.cabal.override {
-      extension = self: super: { configureFlags = "-fthree " + super.configureFlags or ""; };
-    }; };
-  };
-
-  ghc763Prefs = self : super : ghc784Prefs self super // {
-    Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override {
-      binary = self.binary_0_7_2_2.override { cabal = self.cabal.override { extension = self: super: { doCheck = false; }; }; };
-    };
-    aeson = self.aeson_0_7_0_4;
-    ariadne = super.ariadne.override {
-      haskellNames = self.haskellNames.override {
-        haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; };
-      };
-    };
-    attoparsec = self.attoparsec_0_11_3_1;
-    binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_2; };
-    bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_2; }; };
-    cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
-      HTTP = self.HTTP.override { network = self.network_2_5_0_0; };
-      network = self.network_2_5_0_0;
-    };
-    criterion = super.criterion.override {
-      statistics = self.statistics.override {
-        vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_2; };
-      };
-    };
-    entropy = super.entropy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; };
-    gloss = null;                       # requires base >= 4.7
-    modularArithmetic = null;           # requires base >= 4.7
-    pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_2; };
-    rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_2; };
-    distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_2; };
-    networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_2; };
-    distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_2; };
-    scientific = self.scientific_0_2_0_2;
-    singletons = null;                  # requires base >= 4.7
-    transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
-    zipArchive = super.zipArchive_0_2_2_1;    # works without binary 0.7.x
-  };
-
-  ghc742Prefs = self : super : ghc763Prefs self super // {
-    aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; };
-    extensibleExceptions = null;        # core package in ghc <= 7.4.x
-    hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
-    haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    primitive = self.primitive_0_5_3_0; # later versions don't compile
-    random = self.random_1_0_1_1;       # requires base >= 4.6.x
-  };
-
-  ghc722Prefs = self : super : ghc742Prefs self super // {
-    cabalInstall = self.cabalInstall_1_20_0_6;
-    caseInsensitive = self.caseInsensitive_1_0_0_1;
-    deepseq = self.deepseq_1_3_0_2;
-    DrIFT = null;                       # doesn't compile with old GHC versions
-    syb = self.syb_0_4_0;
-  };
-
-  ghc704Prefs = self : super : ghc722Prefs self super // {
-    binary = self.binary_0_7_2_2;       # core package in ghc >= 7.2.2
-    caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2
-    HsSyck = self.HsSyck_0_51;
-    random = null;                      # core package in ghc <= 7.0.x
-  };
-
-  ghc6123Prefs = self : super : ghc704Prefs self super // {
-    alex = self.alex_3_1_3;
-    async = self.async_2_0_1_4;
-    attoparsec = self.attoparsec_0_10_4_0;
-    cabalInstall = self.cabalInstall_1_16_0_2;
-    cgi = self.cgi_3001_1_7_5;
-    deepseq = self.deepseq_1_2_0_1;
-    dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    exceptions = null;                  # none of our versions compile
-    jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; };
-    logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    monadPar = self.monadPar_0_1_0_3;
-    nats = null;                        # none of our versions compile
-    networkUri = super.networkUri.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    parallel = self.parallel_3_2_0_3;
-    primitive = self.primitive_0_5_0_1;
-    reflection = super.reflection.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    scientific = null;                  # none of our versions compile
-    split = self.split_0_1_4_3;
-    stm = self.stm_2_4_2;
-    syb = null;                         # core package in ghc < 7
-    tagged = super.tagged.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    temporary = null;                   # none of our versions compile
-    vector = super.vector_0_10_9_3;
-    vectorAlgorithms = super.vectorAlgorithms.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-  };
-
-  ghc6104Prefs = self : super : ghc6123Prefs self super // {
-    alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    async = null;                       # none of our versions compile
-    attoparsec = null;                  # none of our versions compile
-    binary = super.binary_0_7_2_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2;
-    caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    hsyslog = super.hsyslog.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    parsec = super.parsec.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    systemFilepath = super.systemFilepath.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    systemFileio = super.systemFileio.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    tfRandom = null;                    # does not compile
-    time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
- };
-
-  # Abstraction for Haskell packages collections
-  packagesFun = makeOverridable
-   ({ ghc
-    , prefFun
-    , extension ? (self : super : {})
-    , profExplicit ? false, profDefault ? false
-    , modifyPrio ? lowPrio
-    } :
-    let haskellPackagesClass = import ./haskell-packages.nix {
-          inherit pkgs newScope ghc modifyPrio;
-          enableLibraryProfiling =
-            if profExplicit then profDefault
-                            else config.cabal.libraryProfiling or profDefault;
-        };
-        haskellPackagesPrefsClass = self : let super = haskellPackagesClass self; in super // prefFun self super;
-        haskellPackagesExtensionClass = self : let super = haskellPackagesPrefsClass self; in super // extension self super;
-        haskellPackages = haskellPackagesExtensionClass haskellPackages;
-    in haskellPackages);
-
-  defaultVersionPrioFun =
-    profDefault :
-    if config.cabal.libraryProfiling or false == profDefault
-      then (x : x)
-      else lowPrio;
-
-  packages = args : let r = packagesFun args;
-                    in  r // { lowPrio     = r.override { modifyPrio   = lowPrio; };
-                               highPrio    = r.override { modifyPrio   = hiPrio; };
-                               noProfiling = r.override { profDefault  = false;
-                                                          profExplicit = true;
-                                                          modifyPrio   = defaultVersionPrioFun false; };
-                               profiling   = r.override { profDefault  = true;
-                                                          profExplicit = true;
-                                                          modifyPrio   = defaultVersionPrioFun true; };
-                             };
-
-  # Compiler configurations
-  #
-  # Here, we associate compiler versions with bootstrap compiler versions and
-  # preference functions.
-
-  packages_ghc784 =
-    packages { ghc = pkgs.haskell-ng.compiler.ghc784;
-               prefFun = ghc784Prefs;
-             };
-
-  packages_ghc763 =
-    packages { ghc = pkgs.haskell-ng.compiler.ghc763;
-               prefFun = ghc763Prefs;
-             };
-
-  packages_ghc742 =
-    packages { ghc = pkgs.haskell-ng.compiler.ghc742;
-               prefFun = ghc742Prefs;
-             };
-
-  packages_ghc722 =
-    packages { ghc = pkgs.haskell-ng.compiler.ghc722;
-               prefFun = ghc722Prefs;
-             };
-
-  packages_ghc704 =
-    packages { ghc = pkgs.haskell-ng.compiler.ghc704;
-               prefFun = ghc704Prefs;
-             };
-
-  packages_ghc6123 =
-    packages { ghc = pkgs.haskell-ng.compiler.ghc6123;
-               prefFun = ghc6123Prefs;
-             };
-
-  packages_ghc6104 =
-    packages { ghc = pkgs.haskell-ng.compiler.ghc6104;
-               prefFun = ghc6104Prefs;
-             };
-
-}
diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix
deleted file mode 100644
index 0051c2b3e21f..000000000000
--- a/pkgs/top-level/haskell-ng.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ pkgs, callPackage, stdenv }:
-
-rec {
-
-  lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
-
-  compiler = {
-
-    ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };
-    ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-
-    ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; };
-    ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; };
-    ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc = compiler.ghc784;
-
-    ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
-      ghc = compiler.ghc7101;
-    };
-  };
-
-  packages = {
-
-    ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; };
-    ghc6123 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc6123;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
-    };
-    ghc704 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc704;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
-    };
-    ghc722 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc722;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
-    };
-    ghc742 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc742;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
-    };
-    ghc763 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc763;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
-    };
-    ghc784 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc784;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
-    };
-    ghc7101 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc7101;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
-    };
-    ghcHEAD = callPackage ../development/haskell-modules {
-      ghc = compiler.ghcHEAD;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
-    };
-    ghcjs = callPackage ../development/haskell-modules {
-      ghc = compiler.ghcjs;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
-    };
-
-  };
-}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 512d4b74dfb4..0051c2b3e21f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,3269 +1,88 @@
-# Haskell packages in Nixpkgs
-#
-# This file defines a function parameterized by the following:
-#
-#    pkgs:
-#       the whole Nixpkgs (so that we can depend on non-Haskell packages)
-#
-#    newScope:
-#       for redefining callPackage locally to resolve dependencies of
-#       Haskell packages automatically
-#
-#    ghc:
-#       the GHC version to be used for building the Haskell packages
-#
-#    prefFun:
-#       version preferences for Haskell packages (see below)
-#
-#    enableLibraryProfiling:
-#       Boolean flag indicating whether profiling libraries for all Haskell
-#       packages should be built. If a library is to be built with profiling
-#       enabled, its dependencies should have profiling enabled as well.
-#       Therefore, this is implemented as a global flag.
-#
-#    modifyPrio:
-#       Either the identity function or lowPrio is intended to be passed
-#       here. The idea is that we can make a complete set of Haskell packages
-#       have low priority from the outside.
-#
-#
-# Policy for keeping multiple versions:
-#
-# We keep multiple versions for
-#
-#    * packages that are part of the Haskell Platform
-#    * packages that are known to have severe interface changes
-#
-# For the packages where we keep multiple versions, version x.y.z is mapped
-# to an attribute of name package_x_y_z and stored in a Nix expression called
-# x.y.z.nix. There is no default.nix for such packages. There also is an
-# attribute package that is defined to be self.package_x_y_z where x.y.z is
-# the default version of the package. The global default can be overridden by
-# passing a preferences function.
-#
-# For most packages, however, we keep only one version, and use default.nix.
+{ pkgs, callPackage, stdenv }:
 
-{ pkgs, newScope, ghc, modifyPrio ? (x : x)
-, enableLibraryProfiling ? false
-, enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version
-, enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version
-, enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version
-, enableStaticLibraries ? true
-}:
+rec {
 
-# We redefine callPackage to take into account the new scope. The optional
-# modifyPrio argument can be set to lowPrio to make all Haskell packages have
-# low priority.
+  lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
 
-self : let callPackage = x : y : modifyPrio (newScope self x y); in
+  compiler = {
 
-# Indentation deliberately broken at this point to keep the bulk
-# of this file at a low indentation level.
-
-{
-  inherit callPackage;
-
-  # GHC and its wrapper
-  #
-  # We use a wrapped version of GHC for nearly everything. The wrapped version
-  # adds functionality to GHC to find libraries depended on or installed via
-  # Nix. Because the wrapper is so much more useful than the plain GHC, we
-  # call the plain GHC ghcPlain and the wrapped GHC simply ghc.
-
-  ghcPlain = pkgs.lowPrio ghc; # Note that "ghc" is not "self.ghc" and
-                               # refers to the function argument at the
-                               # top of this file.
-
-  ghc = callPackage ../development/compilers/ghc/wrapper.nix {
-    ghc = ghc; # refers to ghcPlain
-  };
-
-  # An experimental wrapper around ghcPlain that does not automatically
-  # pick up packages from the profile, but instead has a fixed set of packages
-  # in its global database. The set of packages can be specified as an
-  # argument to this function.
-
-  ghcWithPackages = pkgs : callPackage ../development/compilers/ghc/with-packages.nix {
-    ghc = ghc;                  # refers to ghcPlain
-    packages = pkgs self;
-    ignoreCollisions = false;
-  };
-
-  ghcWithPackagesOld = pkgs : (self.ghcWithPackages pkgs).override { ignoreCollisions = true; };
-
-  # This is the Cabal builder, the function we use to build most Haskell
-  # packages. It isn't the Cabal library, which is spelled "Cabal".
-
-  cabal = callPackage ../build-support/cabal {
-    Cabal = null;               # prefer the Cabal version shipped with the compiler
-    hscolour = self.hscolourBootstrap;
-    inherit enableLibraryProfiling enableCheckPhase
-      enableStaticLibraries enableSharedLibraries enableSharedExecutables;
-    glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
-    extension = self : super : {};
-  };
-
-  # A variant of the cabal build driver that disables unit testing.
-  # Useful for breaking cycles, where the unit test of a package A
-  # depends on package B, which has A as a regular build input.
-  cabalNoTest = self.cabal.override { enableCheckPhase = false; };
-
-  # Convenience helper function.
-  disableTest = x: x.override { cabal = self.cabalNoTest; };
-
-  # Haskell libraries.
-
-  acidState = callPackage ../development/libraries/haskell/acid-state {};
-
-  accelerate = callPackage ../development/libraries/haskell/accelerate {};
-
-  accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {};
-
-  accelerateExamples = callPackage ../development/libraries/haskell/accelerate-examples {};
-
-  accelerateFft = callPackage ../development/libraries/haskell/accelerate-fft {};
-
-  accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {};
-
-  acmeLookofdisapproval = callPackage ../development/libraries/haskell/acme-lookofdisapproval {};
-
-  active = callPackage ../development/libraries/haskell/active {};
-
-  ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
-
-  abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {};
-
-  abstractDequeTests = callPackage ../development/libraries/haskell/abstract-deque-tests {};
-
-  abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
-
-  ad = callPackage ../development/libraries/haskell/ad {};
-
-  adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
-
-  AES = callPackage ../development/libraries/haskell/AES {};
-
-  aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; };
-  aeson_0_8_0_2 = callPackage ../development/libraries/haskell/aeson/0.8.0.2.nix { blazeBuilder = null; };
-  aeson = self.aeson_0_8_0_2;
-
-  aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {};
-
-  aesonQq = callPackage ../development/libraries/haskell/aeson-qq {};
-
-  aesonUtils = callPackage ../development/libraries/haskell/aeson-utils {};
-
-  algebra = callPackage ../development/libraries/haskell/algebra {};
-
-  alsaCore = callPackage ../development/libraries/haskell/alsa-core {};
-
-  alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {};
-
-  alsaPcm = callPackage ../development/libraries/haskell/alsa-pcm {};
-
-  amqp = callPackage ../development/libraries/haskell/amqp {};
-
-  annotatedWlPprint = callPackage ../development/libraries/haskell/annotated-wl-pprint {};
-
-  appar = callPackage ../development/libraries/haskell/appar {};
-
-  ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {};
-
-  ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
-
-  applicativeQuoters = callPackage ../development/libraries/haskell/applicative-quoters {};
-
-  ariadne = callPackage ../development/libraries/haskell/ariadne {};
-
-  arithmoi = callPackage ../development/libraries/haskell/arithmoi {};
-
-  arrows = callPackage ../development/libraries/haskell/arrows {};
-
-  assertFailure = callPackage ../development/libraries/haskell/assert-failure {};
-
-  asn1Data = callPackage ../development/libraries/haskell/asn1-data {};
-
-  asn1Encoding = callPackage ../development/libraries/haskell/asn1-encoding {};
-
-  asn1Parse = callPackage ../development/libraries/haskell/asn1-parse {};
-
-  asn1Types = callPackage ../development/libraries/haskell/asn1-types {};
-
-  async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {};
-  async_2_0_1_6 = callPackage ../development/libraries/haskell/async/2.0.1.6.nix {};
-  async = self.async_2_0_1_6;
-
-  atomicPrimops = callPackage ../development/libraries/haskell/atomic-primops {};
-
-  attempt = callPackage ../development/libraries/haskell/attempt {};
-
-  attoLisp = callPackage ../development/libraries/haskell/atto-lisp {};
-
-  attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {};
-  attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {};
-  attoparsec_0_12_1_2 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.2.nix {};
-  attoparsec = self.attoparsec_0_12_1_2;
-
-  attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {};
-
-  attoparsecConduit = callPackage ../development/libraries/haskell/attoparsec-conduit {};
-
-  attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec-enumerator {};
-
-  autoUpdate = callPackage ../development/libraries/haskell/auto-update {};
-
-  aws = callPackage ../development/libraries/haskell/aws {};
-
-  awsEc2 = callPackage ../development/libraries/haskell/aws-ec2 {};
-
-  authenticate = callPackage ../development/libraries/haskell/authenticate {};
-
-  authenticateOauth = callPackage ../development/libraries/haskell/authenticate-oauth {};
-
-  base16Bytestring = callPackage ../development/libraries/haskell/base16-bytestring {};
-
-  base32Bytestring = callPackage ../development/libraries/haskell/base32-bytestring {};
-
-  base64String = callPackage ../development/libraries/haskell/base64-string {};
-
-  base64Bytestring = callPackage ../development/libraries/haskell/base64-bytestring {};
-
-  baseCompat = callPackage ../development/libraries/haskell/base-compat {};
-
-  baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {};
-
-  basePrelude = callPackage ../development/libraries/haskell/base-prelude {};
-
-  basicPrelude = callPackage ../development/libraries/haskell/basic-prelude {};
-
-  benchpress = callPackage ../development/libraries/haskell/benchpress {};
-
-  bencoding = callPackage ../development/libraries/haskell/bencoding {};
-
-  bencode = callPackage ../development/libraries/haskell/bencode {};
-
-  bert = callPackage ../development/libraries/haskell/bert {};
-
-  bifunctors = callPackage ../development/libraries/haskell/bifunctors {};
-
-  bimap = callPackage ../development/libraries/haskell/bimap {};
-
-  binary_0_7_2_2 = callPackage ../development/libraries/haskell/binary/0.7.2.2.nix {};
-  binary = null;                # core package since ghc >= 7.2.x
-
-  binaryStrict = callPackage ../development/libraries/haskell/binary-strict {};
-
-  binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {};
-
-  binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
-
-  bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {};
-
-  bindingsGLFW = callPackage ../development/libraries/haskell/bindings-GLFW {};
-
-  bindingsLibusb = callPackage ../development/libraries/haskell/bindings-libusb {
-    libusb = pkgs.libusb1;
-  };
-
-  bindingsPortaudio = callPackage ../development/libraries/haskell/bindings-portaudio {};
-
-  bindingsPosix = callPackage ../development/libraries/haskell/bindings-posix {};
-
-  bitarray = callPackage ../development/libraries/haskell/bitarray {};
-
-  bitmap = callPackage ../development/libraries/haskell/bitmap {};
-
-  bitsAtomic = callPackage ../development/libraries/haskell/bits-atomic {};
-
-  bitsExtras = callPackage ../development/libraries/haskell/bits-extras {};
-
-  bitset = callPackage ../development/libraries/haskell/bitset {};
-
-  bktrees = callPackage ../development/libraries/haskell/bktrees {};
-
-  blankCanvas = callPackage ../development/libraries/haskell/blank-canvas {};
-
-  blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
-
-  blazeBuilderConduit = callPackage ../development/libraries/haskell/blaze-builder-conduit {};
-
-  blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {};
-
-  blazeFromHtml = callPackage ../development/libraries/haskell/blaze-from-html {};
-
-  blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
-
-  blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {};
-
-  blazeSvg = callPackage ../development/libraries/haskell/blaze-svg {};
-
-  blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
-
-  BlogLiterately = callPackage ../development/libraries/haskell/BlogLiterately {};
-
-  bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
-
-  bmp = callPackage ../development/libraries/haskell/bmp {};
-
-  Boolean = callPackage ../development/libraries/haskell/Boolean {};
-
-  boolExtras = callPackage ../development/libraries/haskell/bool-extras {};
-
-  boundingboxes = callPackage ../development/libraries/haskell/boundingboxes {};
-
-  BoundedChan = callPackage ../development/libraries/haskell/BoundedChan {};
-
-  boxes = callPackage ../development/libraries/haskell/boxes {};
-
-  brainfuck = callPackage ../development/libraries/haskell/brainfuck {};
-
-  bson = callPackage ../development/libraries/haskell/bson {};
-
-  boomerang = callPackage ../development/libraries/haskell/boomerang {};
-
-  bound = callPackage ../development/libraries/haskell/bound {};
-
-  bv = callPackage ../development/libraries/haskell/bv {};
-
-  byteable = callPackage ../development/libraries/haskell/byteable {};
-
-  bytedump = callPackage ../development/libraries/haskell/bytedump {};
-
-  byteorder = callPackage ../development/libraries/haskell/byteorder {};
-
-  bytes = callPackage ../development/libraries/haskell/bytes {};
-
-  bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
-
-  bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {};
-
-  bytestringMmap = callPackage ../development/libraries/haskell/bytestring-mmap {};
-
-  bytestringShow = callPackage ../development/libraries/haskell/bytestring-show {};
-
-  bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {};
-
-  bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {};
-
-  bzlib = callPackage ../development/libraries/haskell/bzlib {};
-
-  call = callPackage ../development/libraries/haskell/call {};
-
-  c2hs = callPackage ../development/tools/haskell/c2hs {};
-
-  c2hsc = callPackage ../development/tools/haskell/c2hsc {};
-
-  Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {};
-  Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {};
-  Cabal_1_20_0_3 = callPackage ../development/libraries/haskell/Cabal/1.20.0.3.nix {};
-  Cabal_1_22_0_0 = callPackage ../development/libraries/haskell/Cabal/1.22.0.0.nix {};
-  Cabal = null;                 # core package since forever
-
-  cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {};
-
-  cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
-
-  cabalLenses = callPackage ../development/libraries/haskell/cabal-lenses {};
-
-  cabalMacosx = callPackage ../development/libraries/haskell/cabal-macosx {};
-
-  cairo = callPackage ../development/libraries/haskell/cairo {
-    inherit (pkgs) cairo zlib;
-    libc = pkgs.stdenv.cc.libc;
-  };
-
-  carray = callPackage ../development/libraries/haskell/carray {};
-
-  categories = callPackage ../development/libraries/haskell/categories {};
-
-  cassava = callPackage ../development/libraries/haskell/cassava {};
-
-  caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {};
-  caseInsensitive_1_2_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.1.nix {};
-  caseInsensitive = self.caseInsensitive_1_2_0_1;
-
-  cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
-
-  CCdelcont = callPackage ../development/libraries/haskell/CC-delcont {};
-
-  cereal = callPackage ../development/libraries/haskell/cereal {};
-
-  cerealConduit = callPackage ../development/libraries/haskell/cereal-conduit {};
-
-  certificate = callPackage ../development/libraries/haskell/certificate {};
-
-  cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {};
-  cgi_3001_2_0_0 = callPackage ../development/libraries/haskell/cgi/3001.2.0.0.nix {};
-  cgi = self.cgi_3001_2_0_0;
-
-  cgrep = callPackage ../development/libraries/haskell/cgrep {};
-
-  charset = callPackage ../development/libraries/haskell/charset {};
-
-  charsetdetectAe = callPackage ../development/libraries/haskell/charsetdetect-ae {};
-
-  Chart = callPackage ../development/libraries/haskell/Chart {};
-  ChartCairo = callPackage ../development/libraries/haskell/Chart-cairo {};
-  ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {};
-  ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {};
-
-  chaselevDeque = callPackage ../development/libraries/haskell/chaselev-deque {};
-
-  ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {};
-
-  cheapskate = callPackage ../development/libraries/haskell/cheapskate {};
-
-  checkers = callPackage ../development/libraries/haskell/checkers {};
-
-  chell = callPackage ../development/libraries/haskell/chell {};
-
-  chellQuickcheck = callPackage ../development/libraries/haskell/chell-quickcheck {};
-
-  chunkedData = callPackage ../development/libraries/haskell/chunked-data {};
-
-  citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {};
-
-  cipherAes = callPackage ../development/libraries/haskell/cipher-aes {};
-
-  cipherAes128 = callPackage ../development/libraries/haskell/cipher-aes128 {};
-
-  cipherBlowfish = callPackage ../development/libraries/haskell/cipher-blowfish {};
-
-  cipherCamellia = callPackage ../development/libraries/haskell/cipher-camellia {};
-
-  cipherDes = callPackage ../development/libraries/haskell/cipher-des {};
-
-  cipherRc4 = callPackage ../development/libraries/haskell/cipher-rc4 {};
-
-  circlePacking = callPackage ../development/libraries/haskell/circle-packing {};
-
-  clashLib = callPackage ../development/libraries/haskell/clash-lib {};
-
-  clashPrelude = callPackage ../development/libraries/haskell/clash-prelude {};
-
-  classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {};
-
-  classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {};
-
-  classyPreludeYesod = callPackage ../development/libraries/haskell/classy-prelude-yesod {};
-
-  clay = callPackage ../development/libraries/haskell/clay {};
-
-  cleanUnions = callPackage ../development/libraries/haskell/clean-unions {};
-
-  clientsession = callPackage ../development/libraries/haskell/clientsession {};
-
-  clock = callPackage ../development/libraries/haskell/clock {};
-
-  cmdargs = callPackage ../development/libraries/haskell/cmdargs {};
-
-  cmdlib = callPackage ../development/libraries/haskell/cmdlib {};
-
-  cmdtheline = callPackage ../development/libraries/haskell/cmdtheline {};
-
-  codeBuilder = callPackage ../development/libraries/haskell/code-builder {};
-
-  CodecImageDevIL = callPackage ../development/libraries/haskell/codec-image-devil {};
-
-  colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
-
-  colors = callPackage ../development/libraries/haskell/colors {};
-
-  colour = callPackage ../development/libraries/haskell/colour {};
-
-  comonad = callPackage ../development/libraries/haskell/comonad {};
-
-  comonadsFd = callPackage ../development/libraries/haskell/comonads-fd {};
-
-  comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {};
-
-  compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
-
-  compdata = callPackage ../development/libraries/haskell/compdata {};
-
-  compdataParam = callPackage ../development/libraries/haskell/compdata-param {};
-
-  composition = callPackage ../development/libraries/haskell/composition {};
-
-  compressed = callPackage ../development/libraries/haskell/compressed {};
-
-  concatenative = callPackage ../development/libraries/haskell/concatenative {};
-
-  concreteTyperep = callPackage ../development/libraries/haskell/concreteTyperep {};
-
-  cond = callPackage ../development/libraries/haskell/cond {};
-
-  conduit = callPackage ../development/libraries/haskell/conduit {};
-
-  conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {};
-
-  conduitExtra = callPackage ../development/libraries/haskell/conduit-extra {};
-
-  ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
-
-  configurator = callPackage ../development/libraries/haskell/configurator {};
-
-  connection = callPackage ../development/libraries/haskell/connection {};
-
-  constraints = callPackage ../development/libraries/haskell/constraints {};
-
-  controlBool = callPackage ../development/libraries/haskell/control-bool {};
-
-  controlMonadFree = callPackage ../development/libraries/haskell/control-monad-free {};
-
-  controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {};
-
-  convertible = callPackage ../development/libraries/haskell/convertible {};
-
-  continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {};
-
-  contravariant = callPackage ../development/libraries/haskell/contravariant {};
-
-  concurrentExtra = callPackage ../development/libraries/haskell/concurrent-extra {};
-
-  concurrentSupply = callPackage ../development/libraries/haskell/concurrent-supply {};
-
-  converge = callPackage ../development/libraries/haskell/converge {};
-
-  cookie = callPackage ../development/libraries/haskell/cookie {};
-
-  coroutineObject = callPackage ../development/libraries/haskell/coroutine-object {};
-
-  cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
-
-  criterion = callPackage ../development/libraries/haskell/criterion {};
-
-  Crypto = callPackage ../development/libraries/haskell/Crypto {};
-
-  cryptoApi = callPackage ../development/libraries/haskell/crypto-api {};
-
-  cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};
-
-  cryptoCipherTests = callPackage ../development/libraries/haskell/crypto-cipher-tests {};
-
-  cryptoCipherTypes = callPackage ../development/libraries/haskell/crypto-cipher-types {};
-
-  cryptoConduit = callPackage ../development/libraries/haskell/crypto-conduit {};
-
-  cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
-
-  cryptohashConduit = callPackage ../development/libraries/haskell/cryptohash-conduit {};
-
-  cryptohashCryptoapi = callPackage ../development/libraries/haskell/cryptohash-cryptoapi {};
-
-  cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {};
-
-  cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {};
-
-  cryptoPubkey = callPackage ../development/libraries/haskell/crypto-pubkey {};
-
-  cryptoRandom = callPackage ../development/libraries/haskell/crypto-random {};
-
-  cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {};
-
-  cuda = callPackage ../development/libraries/haskell/cuda {
-    inherit (pkgs.linuxPackages) nvidia_x11;
-  };
-
-  csv = callPackage ../development/libraries/haskell/csv {};
-
-  csvConduit = callPackage ../development/libraries/haskell/csv-conduit {};
-
-  cssText = callPackage ../development/libraries/haskell/css-text {};
-
-  cufft = callPackage ../development/libraries/haskell/cufft {};
-
-  curl = callPackage ../development/libraries/haskell/curl { curl = pkgs.curl; };
-
-  cpu = callPackage ../development/libraries/haskell/cpu {};
-
-  daemons = callPackage ../development/libraries/haskell/daemons { };
-
-  dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {};
-
-  dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {};
-
-  dataAccessorTransformers = callPackage ../development/libraries/haskell/data-accessor/data-accessor-transformers.nix {};
-
-  dataAccessorMtl = callPackage ../development/libraries/haskell/data-accessor/data-accessor-mtl.nix {};
-
-  dataBinaryIeee754 = callPackage ../development/libraries/haskell/data-binary-ieee754 {};
-
-  dataDefault = callPackage ../development/libraries/haskell/data-default {};
-
-  dataDefaultClass = callPackage ../development/libraries/haskell/data-default-class {};
-  dataDefaultInstancesBase = callPackage ../development/libraries/haskell/data-default-instances-containers {};
-  dataDefaultInstancesContainers = callPackage ../development/libraries/haskell/data-default-instances-base {};
-  dataDefaultInstancesDlist = callPackage ../development/libraries/haskell/data-default-instances-dlist {};
-  dataDefaultInstancesOldLocale = callPackage ../development/libraries/haskell/data-default-instances-old-locale {};
-
-  dataenc = callPackage ../development/libraries/haskell/dataenc {};
-
-  dataFin = callPackage ../development/libraries/haskell/data-fin {};
-
-  dataFix = callPackage ../development/libraries/haskell/data-fix {};
-
-  dataFlags = callPackage ../development/libraries/haskell/data-flags {};
-
-  dataHash = callPackage ../development/libraries/haskell/data-hash {};
-
-  dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
-
-  dataLens = callPackage ../development/libraries/haskell/data-lens {};
-
-  dataLensFd = callPackage ../development/libraries/haskell/data-lens-fd {};
-
-  dataLensLight = callPackage ../development/libraries/haskell/data-lens-light {};
-
-  dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {};
-
-  dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
-
-  dataOrdlist = callPackage ../development/libraries/haskell/data-ordlist {};
-
-  dataPprint = callPackage ../development/libraries/haskell/data-pprint {};
-
-  dataReify = callPackage ../development/libraries/haskell/data-reify {};
-
-  dateCache = callPackage ../development/libraries/haskell/date-cache {};
-
-  dataChecked = callPackage ../development/libraries/haskell/data-checked {};
-
-  datetime = callPackage ../development/libraries/haskell/datetime {};
-
-  DAV = callPackage ../development/libraries/haskell/DAV {};
-
-  dbmigrations = callPackage ../development/libraries/haskell/dbmigrations {};
-
-  dbus = callPackage ../development/libraries/haskell/dbus {};
-
-  Decimal = callPackage ../development/libraries/haskell/Decimal {};
-
-  deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {};
-  deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {};
-  deepseq = null;               # core package since ghc >= 7.4.x
-
-  deepseqGenerics = callPackage ../development/libraries/haskell/deepseq-generics {};
-
-  deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};
-
-  derive = callPackage ../development/libraries/haskell/derive {};
-
-  dependentMap = callPackage ../development/libraries/haskell/dependent-map {};
-
-  dependentSum = callPackage ../development/libraries/haskell/dependent-sum {};
-
-  dependentSumTemplate = callPackage ../development/libraries/haskell/dependent-sum-template {};
-
-  derp = callPackage ../development/libraries/haskell/derp {};
-
-  dice = callPackage ../development/libraries/haskell/dice {};
-
-  diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {};
-  diagramsBuilder = callPackage ../development/libraries/haskell/diagrams/builder { };
-  diagramsBuilderWrapper = callPackage ../development/libraries/haskell/diagrams/builder/wrapper.nix { };
-  diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {};
-  diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {};
-  diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {};
-  diagramsGtk = callPackage ../development/libraries/haskell/diagrams/gtk.nix {};
-  diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
-  diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {};
-  diagramsRasterific = callPackage ../development/libraries/haskell/diagrams/rasterific.nix {};
-  diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {};
-
-  Diff = callPackage ../development/libraries/haskell/Diff {};
-
-  diff3 = callPackage ../development/libraries/haskell/diff3 {};
-
-  digest = callPackage ../development/libraries/haskell/digest {
-    inherit (pkgs) zlib;
-  };
-
-  digestPure = callPackage ../development/libraries/haskell/digest-pure {};
-
-  digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {};
-
-  digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {};
-
-  digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {};
-
-  digestiveFunctorsSnap = callPackage ../development/libraries/haskell/digestive-functors-snap {};
-
-  digits = callPackage ../development/libraries/haskell/digits {};
-
-  dimensional = callPackage ../development/libraries/haskell/dimensional {};
-
-  dimensionalTf = callPackage ../development/libraries/haskell/dimensional-tf {};
-
-  directSqlite = callPackage ../development/libraries/haskell/direct-sqlite {};
-
-  directoryLayout = callPackage ../development/libraries/haskell/directory-layout {};
-
-  directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
-
-  distributedStatic = callPackage ../development/libraries/haskell/distributed-static {};
-
-  distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};
-
-  distributedProcessMonadControl = callPackage ../development/libraries/haskell/distributed-process-monad-control {};
-
-  distributedProcessP2p = callPackage ../development/libraries/haskell/distributed-process-p2p {};
-
-  distributedProcessPlatform = callPackage ../development/libraries/haskell/distributed-process-platform {};
-
-  distributive = callPackage ../development/libraries/haskell/distributive {};
-
-  djinn = callPackage ../development/libraries/haskell/djinn {};
-
-  djinnGhc = callPackage ../development/libraries/haskell/djinn-ghc {};
-
-  djinnLib = callPackage ../development/libraries/haskell/djinn-lib {};
-
-  dlist = callPackage ../development/libraries/haskell/dlist {};
-
-  dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {};
-
-  dns = callPackage ../development/libraries/haskell/dns {};
-
-  doctest = callPackage ../development/libraries/haskell/doctest {};
-
-  doctestProp = callPackage ../development/libraries/haskell/doctest-prop {};
-
-  domSelector = callPackage ../development/libraries/haskell/dom-selector {};
-
-  dotgen = callPackage ../development/libraries/haskell/dotgen {};
-
-  doubleConversion = callPackage ../development/libraries/haskell/double-conversion {};
-
-  download = callPackage ../development/libraries/haskell/download {};
-
-  downloadCurl = callPackage ../development/libraries/haskell/download-curl {};
-
-  DRBG = callPackage ../development/libraries/haskell/DRBG {};
-
-  dsp = callPackage ../development/libraries/haskell/dsp {};
-
-  dstring = callPackage ../development/libraries/haskell/dstring {};
-
-  dualTree = callPackage ../development/libraries/haskell/dual-tree {};
-
-  dynamicCabal = callPackage ../development/libraries/haskell/dynamic-cabal {};
-
-  dyre = callPackage ../development/libraries/haskell/dyre {};
-
-  easyFile = callPackage ../development/libraries/haskell/easy-file {};
-
-  editDistance = callPackage ../development/libraries/haskell/edit-distance {};
-
-  editline = callPackage ../development/libraries/haskell/editline {};
-
-  ekg = callPackage ../development/libraries/haskell/ekg {};
-  ekgBosun = callPackage ../development/libraries/haskell/ekg-bosun {};
-  ekgCarbon = callPackage ../development/libraries/haskell/ekg-carbon {};
-  ekgCore = callPackage ../development/libraries/haskell/ekg-core {};
-
-  elerea = callPackage ../development/libraries/haskell/elerea {};
-
-  Elm = callPackage ../development/compilers/elm/elm.nix {};
-
-  elmCompiler = callPackage ../development/compilers/elm/elm-compiler.nix {};
-
-  elmMake = callPackage ../development/compilers/elm/elm-make.nix {
-    optparseApplicative = self.optparseApplicative_0_10_0;
-  };
-
-  elmPackage = callPackage ../development/compilers/elm/elm-package.nix {
-    optparseApplicative = self.optparseApplicative_0_10_0;
-  };
-
-  elmServer = callPackage ../development/compilers/elm/elm-server.nix {};
-
-  elmRepl = callPackage ../development/compilers/elm/elm-repl.nix {};
-
-  elmReactor = callPackage ../development/compilers/elm/elm-reactor.nix {};
-
-  elmGet = callPackage ../development/compilers/elm/elm-get.nix {
-    optparseApplicative = self.optparseApplicative_0_10_0;
-  };
-
-  emailValidate = callPackage ../development/libraries/haskell/email-validate {};
-
-  enclosedExceptions = callPackage ../development/libraries/haskell/enclosed-exceptions {};
-
-  encoding = callPackage ../development/libraries/haskell/encoding {};
-
-  engineIo = callPackage ../development/libraries/haskell/engine-io {};
-  engineIoSnap = callPackage ../development/libraries/haskell/engine-io-snap {};
-
-  enumerator = callPackage ../development/libraries/haskell/enumerator {};
-
-  enummapset = callPackage ../development/libraries/haskell/enummapset {};
-
-  enummapsetTh = callPackage ../development/libraries/haskell/enummapset-th {};
-
-  enumset = callPackage ../development/libraries/haskell/enumset {};
-
-  entropy = callPackage ../development/libraries/haskell/entropy {};
-
-  elevator = callPackage ../development/libraries/haskell/elevator {};
-
-  equationalReasoning = callPackage ../development/libraries/haskell/equational-reasoning {};
-
-  equivalence = callPackage ../development/libraries/haskell/equivalence {};
-
-  erf = callPackage ../development/libraries/haskell/erf {};
-
-  errorcallEqInstance = callPackage ../development/libraries/haskell/errorcall-eq-instance {};
-
-  errors = callPackage ../development/libraries/haskell/errors {};
-
-  either = callPackage ../development/libraries/haskell/either {};
-
-  EitherT = callPackage ../development/libraries/haskell/EitherT {};
-
-  esqueleto = callPackage ../development/libraries/haskell/esqueleto {};
-
-  eventList = callPackage ../development/libraries/haskell/event-list {};
-
-  exhaustive = callPackage ../development/libraries/haskell/exhaustive {};
-
-  exPool = callPackage ../development/libraries/haskell/ex-pool {};
-
-  exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
-
-  exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {};
-
-  exceptions = callPackage ../development/libraries/haskell/exceptions {};
-
-  explicitException = callPackage ../development/libraries/haskell/explicit-exception {};
-
-  executablePath = callPackage ../development/libraries/haskell/executable-path {};
-
-  Extra = callPackage ../development/libraries/haskell/Extra-lib {};
-
-  fay = callPackage ../development/libraries/haskell/fay {};
-
-  fayBase = callPackage ../development/libraries/haskell/fay-base {};
-
-  fayText = callPackage ../development/libraries/haskell/fay-text {};
-
-  fdoNotify = callPackage ../development/libraries/haskell/fdo-notify {};
-
-  filepath = null;              # core package since forever
-
-  fileLocation = callPackage ../development/libraries/haskell/file-location {};
-
-  fixedVector = callPackage ../development/libraries/haskell/fixed-vector {};
-
-  fmlist = callPackage ../development/libraries/haskell/fmlist {};
-
-  ftphs = callPackage ../development/libraries/haskell/ftphs {};
-
-  extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {};
-
-  extensibleExceptions = callPackage ../development/libraries/haskell/extensible-exceptions {};
-
-  extra = callPackage ../development/libraries/haskell/extra {};
-
-  failure = callPackage ../development/libraries/haskell/failure {};
-
-  fastcgi = callPackage ../development/libraries/haskell/fastcgi {};
-
-  fastLogger = callPackage ../development/libraries/haskell/fast-logger {};
-
-  fb = callPackage ../development/libraries/haskell/fb {};
-
-  fclabels = callPackage ../development/libraries/haskell/fclabels {};
-
-  FerryCore = callPackage ../development/libraries/haskell/FerryCore {};
-
-  funcmp = callPackage ../development/libraries/haskell/funcmp {};
-
-  feed = callPackage ../development/libraries/haskell/feed {};
-
-  fileEmbed = callPackage ../development/libraries/haskell/file-embed {};
-
-  filemanip = callPackage ../development/libraries/haskell/filemanip {};
-
-  flexibleDefaults = callPackage ../development/libraries/haskell/flexible-defaults {};
-
-  filestore = callPackage ../development/libraries/haskell/filestore {};
-
-  filesystemConduit = callPackage ../development/libraries/haskell/filesystem-conduit {};
-
-  final = callPackage ../development/libraries/haskell/final {};
-
-  fixed = callPackage ../development/libraries/haskell/fixed {};
-
-  fgl = callPackage ../development/libraries/haskell/fgl {};
-
-  fglVisualize = callPackage ../development/libraries/haskell/fgl-visualize {};
-
-  fingertree = callPackage ../development/libraries/haskell/fingertree {};
-
-  focus = callPackage ../development/libraries/haskell/focus {};
-
-  foldl = callPackage ../development/libraries/haskell/foldl {};
-
-  folds = callPackage ../development/libraries/haskell/folds {};
-
-  FontyFruity = callPackage ../development/libraries/haskell/FontyFruity {};
-
-  forceLayout = callPackage ../development/libraries/haskell/force-layout {};
-
-  formatting = callPackage ../development/libraries/haskell/formatting {};
-
-  free = callPackage ../development/libraries/haskell/free {};
-
-  freeGame = callPackage ../development/libraries/haskell/free-game {};
-
-  fsnotify = callPackage ../development/libraries/haskell/fsnotify {
-    hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.hfsevents;
-  };
-
-  freetype2 = callPackage ../development/libraries/haskell/freetype2 {};
-
-  fuzzcheck = callPackage ../development/libraries/haskell/fuzzcheck {};
-
-  functorInfix = callPackage ../development/libraries/haskell/functor-infix {};
-
-  gamma = callPackage ../development/libraries/haskell/gamma {};
-
-  geniplate = callPackage ../development/libraries/haskell/geniplate {};
-
-  gd = callPackage ../development/libraries/haskell/gd {
-    inherit (pkgs) gd zlib;
-  };
-
-  gdiff = callPackage ../development/libraries/haskell/gdiff {};
-
-  genericAeson = callPackage ../development/libraries/haskell/generic-aeson {};
-
-  genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {};
-
-  GenericPretty = callPackage ../development/libraries/haskell/GenericPretty {};
-
-  genericsSop = callPackage ../development/libraries/haskell/generics-sop {};
-
-  ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
-
-  ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
-
-  ghcEventsAnalyze = callPackage ../development/tools/haskell/ghc-events-analyze {};
-
-  ghcGcTune = callPackage ../development/tools/haskell/ghc-gc-tune {};
-
-  ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view {
-    cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
-  };
-
-  ghcid = callPackage ../development/tools/haskell/ghcid {};
-
-  ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
-
-  ghcjsPrim = callPackage ../development/libraries/haskell/ghcjs-prim {};
-
-  ghcMod = callPackage ../development/libraries/haskell/ghc-mod { inherit (pkgs) emacs; };
-
-  ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
-
-  ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
-
-  ghcParser = callPackage ../development/libraries/haskell/ghc-parser {};
-
-  ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {};
-
-  ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {};
-
-  ghcVis = callPackage ../development/libraries/haskell/ghc-vis {
-    cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
-  };
-
-  gio = callPackage ../development/libraries/haskell/gio {};
-
-  gitDate = callPackage ../development/libraries/haskell/git-date {};
-
-  github = callPackage ../development/libraries/haskell/github {};
-
-  gitit = callPackage ../development/libraries/haskell/gitit {};
-
-  gitlib = callPackage ../development/libraries/haskell/gitlib {};
-
-  gitlibLibgit2 = callPackage ../development/libraries/haskell/gitlib-libgit2 {};
-
-  gitlibTest = callPackage ../development/libraries/haskell/gitlib-test {};
-
-  gl = callPackage ../development/libraries/haskell/gl {};
-
-  glade = callPackage ../development/libraries/haskell/glade {
-    inherit (pkgs.gnome) libglade;
-    gtkC = pkgs.gtk;
-    libc = pkgs.stdenv.cc.libc;
-  };
-
-  GLFW = callPackage ../development/libraries/haskell/GLFW {};
-
-  GLFWB = callPackage ../development/libraries/haskell/GLFW-b {};
-
-  glib = callPackage ../development/libraries/haskell/glib {
-    glib = pkgs.glib;
-    libc = pkgs.stdenv.cc.libc;
-  };
-
-  Glob = callPackage ../development/libraries/haskell/Glob {};
-
-  GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
-
-  gloss = callPackage ../development/libraries/haskell/gloss {};
-
-  glossBanana = callPackage ../development/libraries/haskell/gloss-banana {};
-
-  glossAccelerate = callPackage ../development/libraries/haskell/gloss-accelerate {};
-
-  glossRaster = callPackage ../development/libraries/haskell/gloss-raster {};
-
-  glossRasterAccelerate = callPackage ../development/libraries/haskell/gloss-raster-accelerate {};
-
-  glossRendering = callPackage ../development/libraries/haskell/gloss-rendering {};
-
-  glpkHs = callPackage ../development/libraries/haskell/glpk-hs {};
-
-  GLURaw = callPackage ../development/libraries/haskell/GLURaw {};
-
-  GLUT = callPackage ../development/libraries/haskell/GLUT {};
-
-  GLUtil = callPackage ../development/libraries/haskell/GLUtil {};
-
-  gnuidn = callPackage ../development/libraries/haskell/gnuidn {};
-
-  gnuplot = callPackage ../development/libraries/haskell/gnuplot {};
-
-  gnutls = callPackage ../development/libraries/haskell/gnutls { inherit (pkgs) gnutls; };
-
-  greencard = callPackage ../development/libraries/haskell/greencard { };
-
-  gsasl = callPackage ../development/libraries/haskell/gsasl { inherit (pkgs) gsasl; };
-
-  gtk = callPackage ../development/libraries/haskell/gtk {
-    inherit (pkgs) gtk;
-    libc = pkgs.stdenv.cc.libc;
-  };
-
-  gtk3 = callPackage ../development/libraries/haskell/gtk3 {
-    inherit (pkgs) gtk3;
-  };
-
-  gtkglext = callPackage ../development/libraries/haskell/gtkglext { gtkglext = pkgs.gnome2.gtkglext; };
-
-  gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};
-
-  gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 {
-    inherit (pkgs.gnome) gtksourceview;
-    libc = pkgs.stdenv.cc.libc;
-  };
-
-  gtkTraymanager = callPackage ../development/libraries/haskell/gtk-traymanager {};
-
-  Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
-
-  graphmod = callPackage ../development/tools/haskell/graphmod {};
-
-  graphviz = callPackage ../development/libraries/haskell/graphviz { systemGraphviz = pkgs.graphviz; };
-
-  graphSCC = callPackage ../development/libraries/haskell/graphscc {};
-
-  graphWrapper = callPackage ../development/libraries/haskell/graph-wrapper {};
-
-  grid = callPackage ../development/libraries/haskell/grid {};
-
-  groom = callPackage ../development/libraries/haskell/groom {};
-
-  groups = callPackage ../development/libraries/haskell/groups {};
-
-  groupoids = callPackage ../development/libraries/haskell/groupoids {};
-
-  hakyll = callPackage ../development/libraries/haskell/hakyll {};
-
-  half = callPackage ../development/libraries/haskell/half {};
-
-  hamlet = callPackage ../development/libraries/haskell/hamlet {};
-
-  happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {};
-
-  happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {};
-
-  happstackLite = callPackage ../development/libraries/haskell/happstack/happstack-lite.nix {};
-
-  happstackFastCGI = callPackage ../development/libraries/haskell/happstack/happstack-fastcgi.nix {};
-
-  hashable = callPackage ../development/libraries/haskell/hashable {};
-
-  hashableExtras = callPackage ../development/libraries/haskell/hashable-extras {};
-
-  hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
-
-  hashtables = callPackage ../development/libraries/haskell/hashtables {};
-
-  hask = callPackage ../development/libraries/haskell/hask {};
-
-  haskelldb = callPackage ../development/libraries/haskell/haskelldb {};
-
-  haskeline = callPackage ../development/libraries/haskell/haskeline {};
-
-  haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
-
-  haskellGenerate = callPackage ../development/libraries/haskell/haskell-generate {};
-
-  haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {};
-
-  haskellMpi = callPackage ../development/libraries/haskell/haskell-mpi {
-    mpi = pkgs.openmpi;
-  };
-
-  haskellNames = callPackage ../development/libraries/haskell/haskell-names {};
-
-  HaskellNet = callPackage ../development/libraries/haskell/HaskellNet {};
-  HaskellNetSSL = callPackage ../development/libraries/haskell/HaskellNet-SSL {};
-
-  haskellPackages = callPackage ../development/libraries/haskell/haskell-packages {};
-
-  haskellSrc = callPackage ../development/libraries/haskell/haskell-src {};
-
-  haskellSrcExts_1_15_0_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.15.0.1.nix {};
-  haskellSrcExts_1_16_0_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.16.0.1.nix {};
-  haskellSrcExts = self.haskellSrcExts_1_16_0_1;
-
-  haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
-
-  haskintex = callPackage ../development/libraries/haskell/haskintex {};
-
-  haskoin = callPackage ../development/libraries/haskell/haskoin {};
-
-  haskore = callPackage ../development/libraries/haskell/haskore {};
-
-  hastache = callPackage ../development/libraries/haskell/hastache {};
-
-  hasteCompiler = callPackage ../development/libraries/haskell/haste-compiler {};
-
-  hastePerch = callPackage ../development/libraries/haskell/haste-perch {};
-
-  HaTeX = callPackage ../development/libraries/haskell/HaTeX {};
-
-  hcltest = callPackage ../development/libraries/haskell/hcltest {};
-
-  hedis = callPackage ../development/libraries/haskell/hedis {};
-
-  heredoc = callPackage ../development/libraries/haskell/heredoc {};
-
-  here = callPackage ../development/libraries/haskell/here {};
-
-  hexpat = callPackage ../development/libraries/haskell/hexpat {};
-
-  hex = callPackage ../development/libraries/haskell/hex {};
-
-  hgal = callPackage ../development/libraries/haskell/hgal {};
-
-  higherLeveldb = callPackage ../development/libraries/haskell/higher-leveldb {};
-
-  hourglass = callPackage ../development/libraries/haskell/hourglass {};
-
-  hplayground = callPackage ../development/libraries/haskell/hplayground {};
-
-  hseCpp = callPackage ../development/libraries/haskell/hse-cpp {};
-
-  hsimport = callPackage ../development/libraries/haskell/hsimport {};
-
-  HTF = callPackage ../development/libraries/haskell/HTF {};
-
-  HTTP = callPackage ../development/libraries/haskell/HTTP {};
-
-  httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
-
-  httpClient = callPackage ../development/libraries/haskell/http-client {};
-
-  httpClientConduit = callPackage ../development/libraries/haskell/http-client-conduit {};
-
-  httpClientMultipart = callPackage ../development/libraries/haskell/http-client-multipart {};
-
-  httpClientTls = callPackage ../development/libraries/haskell/http-client-tls {};
-
-  httpCommon = callPackage ../development/libraries/haskell/http-common {};
-
-  httpKit = callPackage ../development/libraries/haskell/http-kit {};
-
-  httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {};
-
-  hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
-
-  handaGdata = callPackage ../development/libraries/haskell/handa-gdata {};
-
-  haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {};
-
-  haxl = callPackage ../development/libraries/haskell/haxl {};
-
-  haxr = callPackage ../development/libraries/haskell/haxr {};
-
-  haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
-
-  HaXml = callPackage ../development/libraries/haskell/HaXml {};
-
-  hdaemonize = callPackage ../development/libraries/haskell/hdaemonize {};
-
-  HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};
-
-  HDBCOdbc = callPackage ../development/libraries/haskell/HDBC/HDBC-odbc.nix {
-    odbc = pkgs.unixODBC;
-  };
-
-  HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {};
-
-  HDBCSqlite3 = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {};
-
-  HPDF = callPackage ../development/libraries/haskell/HPDF {};
-
-  heist = callPackage ../development/libraries/haskell/heist {};
-
-  hflags = callPackage ../development/libraries/haskell/hflags {};
-
-  hfsevents = callPackage ../development/libraries/haskell/hfsevents {};
-
-  HFuse = callPackage ../development/libraries/haskell/HFuse {};
-
-  highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};
-
-  hinotify = callPackage ../development/libraries/haskell/hinotify {};
-
-  hi = callPackage ../development/libraries/haskell/hi {};
-
-  hindent = callPackage ../development/libraries/haskell/hindent {};
-
-  hint = callPackage ../development/libraries/haskell/hint {};
-
-  hit = callPackage ../development/libraries/haskell/hit {};
-
-  hjsmin = callPackage ../development/libraries/haskell/hjsmin {};
-
-  hledger = callPackage ../development/libraries/haskell/hledger {};
-  hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
-  hledgerInterest = callPackage ../applications/office/hledger-interest {};
-  hledgerIrr = callPackage ../applications/office/hledger-irr {};
-  hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
-
-  hlibgit2 = callPackage ../development/libraries/haskell/hlibgit2 {};
-
-  HList = callPackage ../development/libraries/haskell/HList {};
-
-  hmatrix = callPackage ../development/libraries/haskell/hmatrix {
-    liblapack = pkgs.liblapack.override { shared = true; };
-  };
-
-  hmatrixGsl = callPackage ../development/libraries/haskell/hmatrix-gsl {};
-
-  hmatrixSpecial = callPackage ../development/libraries/haskell/hmatrix-special {};
-
-  hoauth = callPackage ../development/libraries/haskell/hoauth {};
-
-  hoauth2 = callPackage ../development/libraries/haskell/hoauth2 {};
-
-  hoodle = callPackage ../applications/graphics/hoodle {};
-
-  hoodleBuilder = callPackage ../development/libraries/haskell/hoodle-builder {};
-
-  hoodleCore = callPackage ../development/libraries/haskell/hoodle-core {};
-
-  hoodleParser = callPackage ../development/libraries/haskell/hoodle-parser {};
-
-  hoodleRender = callPackage ../development/libraries/haskell/hoodle-render {};
-
-  hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {};
-
-  hoogle_4_2_34 = callPackage ../development/libraries/haskell/hoogle/4.2.34.nix { haskellSrcExts = self.haskellSrcExts_1_15_0_1; };
-  hoogle_4_2_36 = callPackage ../development/libraries/haskell/hoogle/4.2.36.nix {};
-  hoogle = self.hoogle_4_2_36;
-
-  hoogleLocal = callPackage ../development/libraries/haskell/hoogle/local.nix {};
-
-  hoopl = callPackage ../development/libraries/haskell/hoopl {};
-
-  hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
-
-  hosc = callPackage ../development/libraries/haskell/hosc {
-    binary = self.binary_0_7_2_2;
-    dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_2; };
-  };
-
-  hostname = callPackage ../development/libraries/haskell/hostname {};
-
-  hp2anyCore = callPackage ../development/libraries/haskell/hp2any-core {};
-
-  hp2anyGraph = callPackage ../development/libraries/haskell/hp2any-graph {};
-
-  hS3 = callPackage ../development/libraries/haskell/hS3 {};
-
-  hsbencher = callPackage ../development/libraries/haskell/hsbencher {};
-
-  hsbencherFusion = callPackage ../development/libraries/haskell/hsbencher-fusion {};
-
-  hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {};
-
-  hsc3 = callPackage ../development/libraries/haskell/hsc3 {};
-
-  hsc3Dot = callPackage ../development/libraries/haskell/hsc3-dot {};
-
-  hsc3Process = callPackage ../development/libraries/haskell/hsc3-process {};
-
-  hsc3Db = callPackage ../development/libraries/haskell/hsc3-db {};
-
-  hsc3Lang = callPackage ../development/libraries/haskell/hsc3-lang {
-    hmatrixSpecial = self.hmatrixSpecial.override {
-      hmatrix = self.hmatrix.override { binary = self.binary_0_7_2_2; };
-      hmatrixGsl = self.hmatrixGsl.override {
-        hmatrix = self.hmatrix.override { binary = self.binary_0_7_2_2; };
-      };
-    };
-  };
-
-  hsc3Server = callPackage ../development/libraries/haskell/hsc3-server {};
-
-  hsdns = callPackage ../development/libraries/haskell/hsdns {};
-
-  hsemail = callPackage ../development/libraries/haskell/hsemail {};
-
-  hslua = callPackage ../development/libraries/haskell/hslua {
-    lua = pkgs.lua5_1;
-  };
-
-  HSH = callPackage ../development/libraries/haskell/HSH {};
-
-  hsini = callPackage ../development/libraries/haskell/hsini {};
-
-  HsSyck_0_51 = callPackage ../development/libraries/haskell/HsSyck/0.51.nix {};
-  HsSyck_0_52 = callPackage ../development/libraries/haskell/HsSyck/0.52.nix {};
-  HsSyck = self.HsSyck_0_52;
-
-  HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {};
-
-  hsshellscript = callPackage ../development/libraries/haskell/hsshellscript {};
-
-  HStringTemplate = callPackage ../development/libraries/haskell/HStringTemplate {};
-
-  hspread = callPackage ../development/libraries/haskell/hspread {};
-
-  hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {};
-
-  hspec = callPackage ../development/libraries/haskell/hspec {};
-
-  hspecAttoparsec = callPackage ../development/libraries/haskell/hspec-attoparsec {};
-
-  hspecWai = callPackage ../development/libraries/haskell/hspec-wai {};
-
-  hspec2 = callPackage ../development/libraries/haskell/hspec2 {};
-
-  hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
-
-  hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {};
-
-  hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};
-
-  hspecCheckers = callPackage ../development/libraries/haskell/hspec-checkers {};
-
-  hspecCore = callPackage ../development/libraries/haskell/hspec-core {};
-
-  hspecContrib = callPackage ../development/libraries/haskell/hspec-contrib {};
-
-  hspecDiscover = callPackage ../development/libraries/haskell/hspec-discover {};
-
-  hspecLaws = callPackage ../development/libraries/haskell/hspec-laws {};
-
-  hstatsd = callPackage ../development/libraries/haskell/hstatsd {};
-
-  hsyslog = callPackage ../development/libraries/haskell/hsyslog {};
-
-  html = callPackage ../development/libraries/haskell/html {};
-
-  htmlConduit = callPackage ../development/libraries/haskell/html-conduit {};
-
-  httpConduit = callPackage ../development/libraries/haskell/http-conduit {};
-
-  httpdShed = callPackage ../development/libraries/haskell/httpd-shed {};
-
-  httpDate = callPackage ../development/libraries/haskell/http-date {};
-
-  httpStreams = callPackage ../development/libraries/haskell/http-streams {};
-
-  httpTypes = callPackage ../development/libraries/haskell/http-types {};
-
-  holyProject = callPackage ../development/libraries/haskell/holy-project {};
-
-  HUnit = callPackage ../development/libraries/haskell/HUnit {};
-
-  HUnitApprox = callPackage ../development/libraries/haskell/HUnit-approx {};
-
-  hweblib = callPackage ../development/libraries/haskell/hweblib/default.nix {};
-
-  hxt = callPackage ../development/libraries/haskell/hxt {};
-
-  hxtCharproperties = callPackage ../development/libraries/haskell/hxt-charproperties {};
-
-  hxtHttp = callPackage ../development/libraries/haskell/hxt-http {};
-
-  hxtPickleUtils = callPackage ../development/libraries/haskell/hxt-pickle-utils {};
-
-  hxtRegexXmlschema = callPackage ../development/libraries/haskell/hxt-regex-xmlschema {};
-
-  hxtTagsoup = callPackage ../development/libraries/haskell/hxt-tagsoup {};
-
-  hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {};
-
-  hxtXpath = callPackage ../development/libraries/haskell/hxt-xpath {};
-
-  hybridVectors = callPackage ../development/libraries/haskell/hybrid-vectors {};
-
-  iCalendar = callPackage ../development/libraries/haskell/iCalendar {};
-
-  idna = callPackage ../development/libraries/haskell/idna {};
-
-  IfElse = callPackage ../development/libraries/haskell/IfElse {};
-
-  ieee754 = callPackage ../development/libraries/haskell/ieee754 {};
-
-  ihaskell = callPackage ../development/tools/haskell/ihaskell {};
-
-  imm = callPackage ../development/libraries/haskell/imm {};
-
-  implicit = callPackage ../development/libraries/haskell/implicit {};
-
-  indents = callPackage ../development/libraries/haskell/indents {};
-
-  indexed = callPackage ../development/libraries/haskell/indexed {};
-
-  indexedFree = callPackage ../development/libraries/haskell/indexed-free {};
-
-  instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};
-
-  interlude = callPackage ../development/libraries/haskell/interlude {};
-
-  intern = callPackage ../development/libraries/haskell/intern {};
-
-  interpolate = callPackage ../development/libraries/haskell/interpolate {};
-
-  interpolatedstringPerl6 = callPackage ../development/libraries/haskell/interpolatedstring-perl6 {};
-
-  intervals = callPackage ../development/libraries/haskell/intervals {};
-
-  IntervalMap = callPackage ../development/libraries/haskell/IntervalMap {};
-
-  ioChoice = callPackage ../development/libraries/haskell/io-choice {};
-
-  ioMemoize = callPackage ../development/libraries/haskell/io-memoize {};
-
-  IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
-
-  IOSpec = callPackage ../development/libraries/haskell/IOSpec {};
-
-  ioStorage = callPackage ../development/libraries/haskell/io-storage {};
-
-  ioStreams = callPackage ../development/libraries/haskell/io-streams {};
-
-  ipprint = callPackage ../development/libraries/haskell/ipprint {};
-
-  iproute = callPackage ../development/libraries/haskell/iproute {};
-
-  irc = callPackage ../development/libraries/haskell/irc {};
-
-  iteratee = callPackage ../development/libraries/haskell/iteratee {};
-
-  ivor = callPackage ../development/libraries/haskell/ivor {};
-
-  ivory = callPackage ../development/libraries/haskell/ivory {};
-
-  ixset = callPackage ../development/libraries/haskell/ixset {};
-
-  ixShapable = callPackage ../development/libraries/haskell/ix-shapable {};
-
-  jack = callPackage ../development/libraries/haskell/jack {};
-
-  JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {};
-
-  jmacro = callPackage ../development/libraries/haskell/jmacro {};
-  jmacroRpc = callPackage ../development/libraries/haskell/jmacro-rpc {};
-  jmacroRpcHappstack = callPackage ../development/libraries/haskell/jmacro-rpc-happstack {};
-  jmacroRpcSnap = callPackage ../development/libraries/haskell/jmacro-rpc-snap {};
-
-  jpeg = callPackage ../development/libraries/haskell/jpeg {};
-
-  jsFlot = callPackage ../development/libraries/haskell/js-flot {};
-
-  jsJquery = callPackage ../development/libraries/haskell/js-jquery {};
-
-  json = callPackage ../development/libraries/haskell/json {};
-
-  jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {};
-
-  jsonRpc = callPackage ../development/libraries/haskell/json-rpc {};
-
-  jsonSchema = callPackage ../development/libraries/haskell/json-schema {};
-
-  jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
-
-  JuicyPixelsUtil = callPackage ../development/libraries/haskell/JuicyPixels-util {};
-
-  jwt = callPackage ../development/libraries/haskell/jwt {};
-
-  kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {};
-
-  kansasComet = callPackage ../development/libraries/haskell/kansas-comet {};
-
-  kansasLava = callPackage ../development/libraries/haskell/kansas-lava {};
-
-  keys = callPackage ../development/libraries/haskell/keys {};
-
-  knob = callPackage ../development/libraries/haskell/knob {};
-
-  labeledTree = callPackage ../development/libraries/haskell/labeled-tree {};
-
-  languageC = callPackage ../development/libraries/haskell/language-c {};
-
-  languageCInline = callPackage ../development/libraries/haskell/language-c-inline {};
-
-  languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {};
-
-  languageEcmascript = callPackage ../development/libraries/haskell/language-ecmascript {};
-
-  languageGlsl = callPackage ../development/libraries/haskell/language-glsl {};
-
-  languageJava = callPackage ../development/libraries/haskell/language-java {};
-
-  languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
-
-  languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
-
-  lambdabot = callPackage ../development/libraries/haskell/lambdabot {
-    haskellSrcExts = self.haskellSrcExts_1_15_0_1;
-    hoogle = self.hoogle_4_2_34.override {
-      haskellSrcExts = self.haskellSrcExts_1_15_0_1;
-    };
-  };
-
-  lambdabotWrapper = callPackage ../development/libraries/haskell/lambdabot/wrapper.nix {
-    mueval = self.muevalWrapper.override {
-      additionalPackages = [ self.lambdabot ];
-    };
-  };
-
-  lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {};
-
-  lambdacubeEngine = callPackage ../development/libraries/haskell/lambdacube-engine {};
-
-  largeword = callPackage ../development/libraries/haskell/largeword {};
-
-  lattices = callPackage ../development/libraries/haskell/lattices {};
-
-  lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};
-
-  lens = callPackage ../development/libraries/haskell/lens {};
-
-  lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
-
-  lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
-
-  lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};
-
-  lensFamily = callPackage ../development/libraries/haskell/lens-family {};
-
-  lensFamilyTh = callPackage ../development/libraries/haskell/lens-family-th {};
-
-  lenses = callPackage ../development/libraries/haskell/lenses {};
-
-  leveldbHaskell = callPackage ../development/libraries/haskell/leveldb-haskell {};
-
-  libffi = callPackage ../development/libraries/haskell/libffi {
-    libffi = pkgs.libffi;
-  };
-
-  libjenkins = callPackage ../development/libraries/haskell/libjenkins {};
-
-  libmpd = callPackage ../development/libraries/haskell/libmpd {};
-
-  libnotify = callPackage ../development/libraries/haskell/libnotify { inherit (pkgs) libnotify; };
-
-  liblastfm = callPackage ../development/libraries/haskell/liblastfm {};
-
-  libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {};
-
-  libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {};
-
-  liftedAsync = callPackage ../development/libraries/haskell/lifted-async {};
-
-  liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
-
-  linAlg = callPackage ../development/libraries/haskell/lin-alg {};
-
-  linear = callPackage ../development/libraries/haskell/linear {};
-
-  linearOpenGL = callPackage ../development/libraries/haskell/linear-opengl {};
-
-  linuxInotify = callPackage ../development/libraries/haskell/linux-inotify {};
-
-  List = callPackage ../development/libraries/haskell/List {};
-
-  lists = callPackage ../development/libraries/haskell/lists {};
-
-  listT = callPackage ../development/libraries/haskell/list-t {};
-
-  listExtras = callPackage ../development/libraries/haskell/listExtras {};
-
-  listTries = callPackage ../development/libraries/haskell/list-tries {};
-
-  ListLike = callPackage ../development/libraries/haskell/ListLike {};
-
-  ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
-
-  llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmConfig = pkgs.llvmPackages_34.llvm; };
-
-  llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};
-
-  lrucache = callPackage ../development/libraries/haskell/lrucache {};
-
-  lochTh = callPackage ../development/libraries/haskell/loch-th {};
-
-  lockfreeQueue = callPackage ../development/libraries/haskell/lockfree-queue {};
-
-  logfloat = callPackage ../development/libraries/haskell/logfloat {};
-
-  logging = callPackage ../development/libraries/haskell/logging {};
-
-  loggingFacade = callPackage ../development/libraries/haskell/logging-facade {};
-
-  loggingFacadeJournald = callPackage ../development/libraries/haskell/logging-facade-journald {};
-
-  logict = callPackage ../development/libraries/haskell/logict {};
-
-  logsink = callPackage ../development/libraries/haskell/logsink {};
-
-  loop = callPackage ../development/libraries/haskell/loop {};
-
-  lushtags = callPackage ../development/libraries/haskell/lushtags {};
-
-  lzmaConduit = callPackage ../development/libraries/haskell/lzma-conduit {};
-
-  lzmaEnumerator = callPackage ../development/libraries/haskell/lzma-enumerator {};
-
-  maccatcher = callPackage ../development/libraries/haskell/maccatcher {};
-
-  machines = callPackage ../development/libraries/haskell/machines {};
-
-  machinesDirectory = callPackage ../development/libraries/haskell/machines-directory {};
-
-  machinesIo = callPackage ../development/libraries/haskell/machines-io {};
-
-  managed = callPackage ../development/libraries/haskell/managed {};
-
-  mapSyntax = callPackage ../development/libraries/haskell/map-syntax {};
-
-  markdown = callPackage ../development/libraries/haskell/markdown {};
-
-  markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {};
-
-  mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
-
-  mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {};
-
-  markovChain = callPackage ../development/libraries/haskell/markov-chain {};
-
-  matrix = callPackage ../development/libraries/haskell/matrix {};
-
-  maude = callPackage ../development/libraries/haskell/maude {};
-
-  MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
-
-  meep = callPackage ../development/libraries/haskell/meep {};
-
-  MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {};
-
-  mersenneRandom = callPackage ../development/libraries/haskell/mersenne-random {};
-
-  mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};
-
-  MFlow = callPackage ../development/libraries/haskell/MFlow {};
-
-  midi = callPackage ../development/libraries/haskell/midi {};
-
-  mime = callPackage ../development/libraries/haskell/mime {};
-
-  minimorph = callPackage ../development/libraries/haskell/minimorph {};
-
-  minioperational = callPackage ../development/libraries/haskell/minioperational {};
-
-  miniutter = callPackage ../development/libraries/haskell/miniutter {
-    binary = self.binary_0_7_2_2;
-  };
-
-  mimeMail = callPackage ../development/libraries/haskell/mime-mail {};
-
-  mimeTypes = callPackage ../development/libraries/haskell/mime-types {};
-
-  misfortune = callPackage ../development/libraries/haskell/misfortune {};
-
-  missingForeign = callPackage ../development/libraries/haskell/missing-foreign {};
-
-  MissingH = callPackage ../development/libraries/haskell/MissingH { testpack = null; };
-
-  mmap = callPackage ../development/libraries/haskell/mmap {};
-
-  modularArithmetic = callPackage ../development/libraries/haskell/modular-arithmetic {};
-
-  MonadCatchIOMtl = callPackage ../development/libraries/haskell/MonadCatchIO-mtl {};
-
-  MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
-
-  monadControl = callPackage ../development/libraries/haskell/monad-control {};
-
-  monadCoroutine = callPackage ../development/libraries/haskell/monad-coroutine {};
-
-  monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {};
-
-  monadExtras = callPackage ../development/libraries/haskell/monad-extras {};
-
-  monadJournal = callPackage ../development/libraries/haskell/monad-journal {};
-
-  monadLib = callPackage ../development/libraries/haskell/monadlib {};
-
-  monadloc = callPackage ../development/libraries/haskell/monadloc {};
-
-  monadlocPp = callPackage ../development/libraries/haskell/monadloc-pp {};
-
-  monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
-
-  monadLogger = callPackage ../development/libraries/haskell/monad-logger {};
-
-  monadIO = callPackage ../development/libraries/haskell/monadIO {};
-
-  monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
-  monadPar_0_3_4_7 = callPackage ../development/libraries/haskell/monad-par/0.3.4.7.nix {};
-  monadPar = self.monadPar_0_3_4_7;
-
-  monadParallel = callPackage ../development/libraries/haskell/monad-parallel {};
-
-  monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
-
-  monadPeel = callPackage ../development/libraries/haskell/monad-peel {};
-
-  MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {};
-
-  MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {};
-  MonadRandom_0_3_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.3.0.1.nix {};
-  MonadRandom = self.MonadRandom_0_3_0_1;
-
-  monadStm = callPackage ../development/libraries/haskell/monad-stm {};
-
-  monadSupply = callPackage ../development/libraries/haskell/monad-supply {};
-
-  monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
-
-  monadUnify = callPackage ../development/libraries/haskell/monad-unify {};
-
-  monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {};
-
-  monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {};
-
-  mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
-
-  monomorphic = callPackage ../development/libraries/haskell/monomorphic {};
-
-  monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {};
-
-  mmorph = callPackage ../development/libraries/haskell/mmorph {};
-
-  mpppc = callPackage ../development/libraries/haskell/mpppc {};
-
-  msgpack = callPackage ../development/libraries/haskell/msgpack {};
-
-  mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {};
-  mtl_2_2_1 = callPackage ../development/libraries/haskell/mtl/2.2.1.nix {};
-  mtl = null; # tightly coupled with 'transformers' which is a core package
-
-  mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
-
-  mtlPrelude = callPackage ../development/libraries/haskell/mtl-prelude {};
-
-  mueval = callPackage ../development/libraries/haskell/mueval {};
-
-  muevalWrapper = callPackage ../development/libraries/haskell/mueval/wrapper.nix {};
-
-  multiarg = callPackage ../development/libraries/haskell/multiarg {};
-
-  multimap = callPackage ../development/libraries/haskell/multimap {};
-
-  multipart = callPackage ../development/libraries/haskell/multipart {};
-
-  multiplate = callPackage ../development/libraries/haskell/multiplate {};
-
-  multirec = callPackage ../development/libraries/haskell/multirec {};
-
-  multiset = callPackage ../development/libraries/haskell/multiset {};
-
-  murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
-
-  mvc = callPackage ../development/libraries/haskell/mvc {};
-
-  mvcUpdates = callPackage ../development/libraries/haskell/mvc-updates {};
-
-  mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
-
-  mysql = callPackage ../development/libraries/haskell/mysql {
-    mysqlConfig = pkgs.mysql;
-    inherit (pkgs) zlib;
-  };
-
-  mysqlSimple = callPackage ../development/libraries/haskell/mysql-simple {};
-
-  nanospec = callPackage ../development/libraries/haskell/nanospec {};
-
-  nat = callPackage ../development/libraries/haskell/nat {};
-
-  nats = callPackage ../development/libraries/haskell/nats {};
-
-  naturals = callPackage ../development/libraries/haskell/naturals {};
-
-  ncurses = callPackage ../development/libraries/haskell/ncurses {
-    inherit (pkgs) ncurses;
-  };
-
-  netlist = callPackage ../development/libraries/haskell/netlist {};
-
-  netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {};
-
-  netwire = callPackage ../development/libraries/haskell/netwire {};
-
-  network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
-  network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
-  network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {};
-  network_2_6_0_2 = callPackage ../development/libraries/haskell/network/2.6.0.2.nix {};
-  network = self.network_2_6_0_2;
-
-  networkCarbon = callPackage ../development/libraries/haskell/network-carbon {};
-
-  networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
-  networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {};
-
-  networkData = callPackage ../development/libraries/haskell/network-data {};
-
-  networkFancy = callPackage ../development/libraries/haskell/network-fancy {};
-
-  networkInfo = callPackage ../development/libraries/haskell/network-info {};
-
-  networkMetrics = callPackage ../development/libraries/haskell/network-metrics {};
-
-  networkMulticast = callPackage ../development/libraries/haskell/network-multicast {};
-
-  networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};
-
-  networkSimple = callPackage ../development/libraries/haskell/network-simple {};
-
-  networkTransport = callPackage ../development/libraries/haskell/network-transport {};
-
-  networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {};
-
-  networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {};
-
-  networkUri = callPackage ../development/libraries/haskell/network-uri {};
-
-  newtype = callPackage ../development/libraries/haskell/newtype {};
-
-  nonEmpty = callPackage ../development/libraries/haskell/non-empty {};
-
-  nonNegative = callPackage ../development/libraries/haskell/non-negative {};
-
-  numericExtras = callPackage ../development/libraries/haskell/numeric-extras {};
-
-  numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
-
-  NumInstances = callPackage ../development/libraries/haskell/NumInstances {};
-
-  numbers = callPackage ../development/libraries/haskell/numbers {};
-
-  numtype = callPackage ../development/libraries/haskell/numtype {};
-
-  numtypeTf = callPackage ../development/libraries/haskell/numtype-tf {};
-
-  OneTuple = callPackage ../development/libraries/haskell/OneTuple {};
-
-  objective = callPackage ../development/libraries/haskell/objective {};
-
-  ObjectName = callPackage ../development/libraries/haskell/ObjectName {};
-
-  oeis = callPackage ../development/libraries/haskell/oeis {};
-
-  ofx = callPackage ../development/libraries/haskell/ofx {};
-
-  opaleye = callPackage ../development/libraries/haskell/opaleye {};
-
-  OpenAL = callPackage ../development/libraries/haskell/OpenAL {};
-
-  OpenGL = callPackage ../development/libraries/haskell/OpenGL {};
-
-  OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
-
-  opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {};
-
-  operational = callPackage ../development/libraries/haskell/operational {};
-
-  opml = callPackage ../development/libraries/haskell/opml {};
-
-  options = callPackage ../development/libraries/haskell/options {};
-
-  optparseApplicative_0_10_0 = callPackage ../development/libraries/haskell/optparse-applicative/0.10.0.nix {};
-  optparseApplicative_0_11_0_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.11.0.1.nix {};
-  optparseApplicative = self.optparseApplicative_0_11_0_1;
-
-  packdeps = callPackage ../development/tools/haskell/packdeps {};
-
-  pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
-
-  patience = callPackage ../development/libraries/haskell/patience {};
-
-  pandoc = callPackage ../development/libraries/haskell/pandoc {};
-
-  pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {};
-
-  pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};
-
-  pango = callPackage ../development/libraries/haskell/pango {
-    inherit (pkgs) pango;
-    libc = pkgs.stdenv.cc.libc;
-  };
-
-  parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {};
-  parallel_3_2_0_5 = callPackage ../development/libraries/haskell/parallel/3.2.0.5.nix {};
-  parallel = self.parallel_3_2_0_5;
-
-  parallelIo = callPackage ../development/libraries/haskell/parallel-io {};
-
-  parseargs = callPackage ../development/libraries/haskell/parseargs {};
-
-  parsec = callPackage ../development/libraries/haskell/parsec {};
-
-  parsecExtra = callPackage ../development/libraries/haskell/parsec-extra {};
-
-  parsek = callPackage ../development/libraries/haskell/parsek {};
-
-  parsers = callPackage ../development/libraries/haskell/parsers {};
-
-  parsimony = callPackage ../development/libraries/haskell/parsimony {};
-
-  PastePipe = callPackage ../development/tools/haskell/PastePipe {};
-
-  pathtype = callPackage ../development/libraries/haskell/pathtype {};
-
-  patternArrows = callPackage ../development/libraries/haskell/pattern-arrows {};
-
-  pbkdf = callPackage ../development/libraries/haskell/pbkdf {};
-
-  pcap = callPackage ../development/libraries/haskell/pcap {};
-
-  pcapEnumerator = callPackage ../development/libraries/haskell/pcap-enumerator {};
-
-  pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
-
-  pdfToolboxContent = callPackage ../development/libraries/haskell/pdf-toolbox-content {};
-
-  pdfToolboxCore = callPackage ../development/libraries/haskell/pdf-toolbox-core {};
-
-  pdfToolboxDocument = callPackage ../development/libraries/haskell/pdf-toolbox-document {};
-
-  pem = callPackage ../development/libraries/haskell/pem {};
-
-  permutation = callPackage ../development/libraries/haskell/permutation {};
-
-  persistent = callPackage ../development/libraries/haskell/persistent {};
-
-  persistentMysql = callPackage ../development/libraries/haskell/persistent-mysql {};
-
-  persistentPostgresql = callPackage ../development/libraries/haskell/persistent-postgresql {};
-
-  persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {};
-
-  persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
-
-  pgm = callPackage ../development/libraries/haskell/pgm {};
-
-  pipes = callPackage ../development/libraries/haskell/pipes {};
-
-  pipesAeson = callPackage ../development/libraries/haskell/pipes-aeson {};
-
-  pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {};
-
-  pipesBinary = callPackage ../development/libraries/haskell/pipes-binary {};
-
-  pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {};
-
-  pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
-
-  pipesCsv = callPackage ../development/libraries/haskell/pipes-csv {};
-
-  pipesHttp = callPackage ../development/libraries/haskell/pipes-http {};
-
-  pipesNetwork = callPackage ../development/libraries/haskell/pipes-network {};
-
-  pipesGroup = callPackage ../development/libraries/haskell/pipes-group {};
-
-  pipesParse = callPackage ../development/libraries/haskell/pipes-parse {};
-
-  pipesPostgresqlSimple = callPackage ../development/libraries/haskell/pipes-postgresql-simple {};
-
-  pipesSafe = callPackage ../development/libraries/haskell/pipes-safe {};
-
-  pipesShell = callPackage ../development/libraries/haskell/pipes-shell {};
-
-  pipesText = callPackage ../development/libraries/haskell/pipes-text {};
-
-  pipesZlib = callPackage ../development/libraries/haskell/pipes-zlib {};
-
-  placeholders = callPackage ../development/libraries/haskell/placeholders {};
-
-  plugins= callPackage ../development/libraries/haskell/plugins {};
-
-  polynomialsBernstein = callPackage ../development/libraries/haskell/polynomials-bernstein {};
-
-  polyparse = callPackage ../development/libraries/haskell/polyparse {};
-
-  pointed = callPackage ../development/libraries/haskell/pointed {};
-
-  pointedlist = callPackage ../development/libraries/haskell/pointedlist {};
-
-  poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};
-
-  pop3client = callPackage ../development/libraries/haskell/pop3-client {};
-
-  poppler = callPackage ../development/libraries/haskell/poppler {
-    popplerGlib = pkgs.poppler;
-    libc = pkgs.stdenv.cc.libc;
-  };
-
-  posixPaths = callPackage ../development/libraries/haskell/posix-paths {};
-
-  postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq {
-    inherit (pkgs) postgresql;
-  };
-
-  postgresqlSimple = callPackage ../development/libraries/haskell/postgresql-simple {};
-
-  ppm = callPackage ../development/libraries/haskell/ppm {};
-
-  pqueue = callPackage ../development/libraries/haskell/pqueue {};
-
-  process_1_2_0_0 = callPackage ../development/libraries/haskell/process/1.2.0.0.nix {};
-  process = null;      # core package since forever
-
-  productProfunctors = callPackage ../development/libraries/haskell/product-profunctors {};
-
-  profiteur = callPackage ../development/tools/haskell/profiteur {};
-
-  preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {};
-
-  preludeSafeenum = callPackage ../development/libraries/haskell/prelude-safeenum {};
-
-  preprocessorTools = callPackage ../development/libraries/haskell/preprocessor-tools {};
-
-  presburger = callPackage ../development/libraries/haskell/presburger {};
-
-  present = callPackage ../development/libraries/haskell/present {};
-
-  prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
-
-  prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
-
-  punycode = callPackage ../development/libraries/haskell/punycode {};
-
-  pureCdb = callPackage ../development/libraries/haskell/pure-cdb {};
-
-  primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {};
-  primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {};
-  primitive_0_5_4_0 = callPackage ../development/libraries/haskell/primitive/0.5.4.0.nix {};
-  primitive = self.primitive_0_5_4_0;
-
-  probability = callPackage ../development/libraries/haskell/probability {};
-
-  profunctors = callPackage ../development/libraries/haskell/profunctors {};
-
-  projectTemplate = callPackage ../development/libraries/haskell/project-template {};
-
-  processConduit = callPackage ../development/libraries/haskell/process-conduit {};
-
-  processExtras = callPackage ../development/libraries/haskell/process-extras {};
-
-  prolog = callPackage ../development/libraries/haskell/prolog {};
-  prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib {};
-  prologGraph = callPackage ../development/libraries/haskell/prolog-graph {};
-
-  protobuf = callPackage ../development/libraries/haskell/protobuf {};
-
-  protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {};
-
-  protocolBuffersDescriptor = callPackage ../development/libraries/haskell/protocol-buffers-descriptor {};
-
-  PSQueue = callPackage ../development/libraries/haskell/PSQueue {};
-
-  psqueues = callPackage ../development/libraries/haskell/psqueues {};
-
-  publicsuffixlist = callPackage ../development/libraries/haskell/publicsuffixlist {};
-
-  pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {};
-
-  purescript = callPackage ../development/libraries/haskell/purescript {};
-
-  pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {};
-
-  QuickCheck = callPackage ../development/libraries/haskell/QuickCheck {};
-
-  quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {};
-
-  quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {};
-
-  quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
-
-  quickcheckPropertyMonad = callPackage ../development/libraries/haskell/quickcheck-property-monad {};
-
-  quickcheckUnicode = callPackage ../development/libraries/haskell/quickcheck-unicode {};
-
-  qrencode = callPackage ../development/libraries/haskell/qrencode {
-    inherit (pkgs) qrencode;
-  };
-
-  RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
-
-  random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};
-  random_1_0_1_3 = callPackage ../development/libraries/haskell/random/1.0.1.3.nix {};
-  random_1_1 = callPackage ../development/libraries/haskell/random/1.1.nix {};
-  random = self.random_1_1;
-
-  randomFu = callPackage ../development/libraries/haskell/random-fu {};
-
-  randomSource = callPackage ../development/libraries/haskell/random-source {};
-
-  randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {};
-
-  rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {};
-
-  ranges = callPackage ../development/libraries/haskell/ranges {};
-
-  Rasterific = callPackage ../development/libraries/haskell/Rasterific {};
-
-  rawStringsQq = callPackage ../development/libraries/haskell/rawStringsQq {};
-
-  reserve = callPackage ../development/libraries/haskell/reserve {};
-
-  reverseApply = callPackage ../development/libraries/haskell/reverse-apply {};
-
-  rvar = callPackage ../development/libraries/haskell/rvar {};
-
-  reactiveBanana = callPackage ../development/libraries/haskell/reactive-banana {};
-
-  reactiveBananaWx = callPackage ../development/libraries/haskell/reactive-banana-wx {};
-
-  ReadArgs = callPackage ../development/libraries/haskell/ReadArgs {};
-
-  readline = callPackage ../development/libraries/haskell/readline {
-    inherit (pkgs) readline ncurses;
-  };
-
-  recaptcha = callPackage ../development/libraries/haskell/recaptcha {};
-
-  recursionSchemes = callPackage ../development/libraries/haskell/recursion-schemes {};
-
-  reducers = callPackage ../development/libraries/haskell/reducers {};
-
-  reflection = callPackage ../development/libraries/haskell/reflection {};
-
-  RefSerialize = callPackage ../development/libraries/haskell/RefSerialize {};
-
-  regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {};
-
-  regexBase = callPackage ../development/libraries/haskell/regex-base {};
-
-  regexCompat = callPackage ../development/libraries/haskell/regex-compat {};
-
-  regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {};
-
-  regexPcreBuiltin = callPackage ../development/libraries/haskell/regex-pcre-builtin {};
-
-  regexPosix = callPackage ../development/libraries/haskell/regex-posix {};
-
-  regexTdfa = callPackage ../development/libraries/haskell/regex-tdfa {};
-
-  regexTdfaRc = callPackage ../development/libraries/haskell/regex-tdfa-rc {};
-
-  regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {};
-
-  regexPcre = callPackage ../development/libraries/haskell/regex-pcre {};
-
-  regexpr = callPackage ../development/libraries/haskell/regexpr {};
-
-  regular = callPackage ../development/libraries/haskell/regular {};
-
-  regularXmlpickler = callPackage ../development/libraries/haskell/regular-xmlpickler {};
-
-  rematch = callPackage ../development/libraries/haskell/rematch {};
-
-  remote = callPackage ../development/libraries/haskell/remote {};
-
-  repa = callPackage ../development/libraries/haskell/repa {};
-  repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {};
-  repaExamples = callPackage ../development/libraries/haskell/repa-examples {};
-  repaIo = callPackage ../development/libraries/haskell/repa-io {};
-
-  RepLib = callPackage ../development/libraries/haskell/RepLib {};
-
-  repr = callPackage ../development/libraries/haskell/repr {};
-
-  resourcePool = callPackage ../development/libraries/haskell/resource-pool {};
-
-  resourcePoolCatchio = callPackage ../development/libraries/haskell/resource-pool-catchio {};
-
-  resourcet = callPackage ../development/libraries/haskell/resourcet {};
-
-  restClient = callPackage ../development/libraries/haskell/rest-client {};
-
-  restCore = callPackage ../development/libraries/haskell/rest-core {};
-
-  restGen = callPackage ../development/libraries/haskell/rest-gen {};
-
-  restHappstack = callPackage ../development/libraries/haskell/rest-happstack {};
-
-  restSnap = callPackage ../development/libraries/haskell/rest-snap {};
-
-  restStringmap = callPackage ../development/libraries/haskell/rest-stringmap {};
-
-  restTypes = callPackage ../development/libraries/haskell/rest-types {};
-
-  restWai = callPackage ../development/libraries/haskell/rest-wai {};
-
-  retry = callPackage ../development/libraries/haskell/retry {};
-
-  rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {};
-
-  rex = callPackage ../development/libraries/haskell/rex {};
-
-  rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {};
-
-  robotsTxt = callPackage ../development/libraries/haskell/robots-txt {};
-
-  rope = callPackage ../development/libraries/haskell/rope {};
-
-  rosezipper = callPackage ../development/libraries/haskell/rosezipper {};
-
-  RSA = callPackage ../development/libraries/haskell/RSA {};
-
-  saltine = callPackage ../development/libraries/haskell/saltine {};
-
-  sampleFrame = callPackage ../development/libraries/haskell/sample-frame {};
-
-  safe = callPackage ../development/libraries/haskell/safe {};
-
-  safecopy = callPackage ../development/libraries/haskell/safecopy {};
-
-  SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {};
-
-  sbv = callPackage ../development/libraries/haskell/sbv {};
-
-  scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {};
-  scientific_0_3_3_3 = callPackage ../development/libraries/haskell/scientific/0.3.3.3.nix {};
-  scientific = self.scientific_0_3_3_3;
-
-  scotty = callPackage ../development/libraries/haskell/scotty {};
-
-  scottyHastache = callPackage ../development/libraries/haskell/scotty-hastache {};
-
-  scrypt = callPackage ../development/libraries/haskell/scrypt {};
-
-  serialport = callPackage ../development/libraries/haskell/serialport {};
-
-  securemem = callPackage ../development/libraries/haskell/securemem {};
-
-  sendfile = callPackage ../development/libraries/haskell/sendfile {};
-
-  semigroups = callPackage ../development/libraries/haskell/semigroups {};
-
-  semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {};
-
-  semigroupoidExtras = callPackage ../development/libraries/haskell/semigroupoid-extras {};
-
-  servant = callPackage ../development/libraries/haskell/servant {};
-
-  servantServer = callPackage ../development/libraries/haskell/servant-server {};
-
-  servantClient = callPackage ../development/libraries/haskell/servant-client {};
-
-  servantDocs = callPackage ../development/libraries/haskell/servant-docs {};
-
-  servantJquery = callPackage ../development/libraries/haskell/servant-jquery {};
-
-  setenv = callPackage ../development/libraries/haskell/setenv {};
-
-  setlocale = callPackage ../development/libraries/haskell/setlocale {};
-
-  shellish = callPackage ../development/libraries/haskell/shellish {};
-
-  shellmate = callPackage ../development/libraries/haskell/shellmate {};
-
-  shelly = callPackage ../development/libraries/haskell/shelly {};
-
-  shellConduit = callPackage ../development/libraries/haskell/shell-conduit {};
-
-  simpleConduit = callPackage ../development/libraries/haskell/simple-conduit {};
-
-  simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {};
-
-  simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {};
-
-  simpleSqlParser = callPackage ../development/libraries/haskell/simple-sql-parser {};
-
-  silently = callPackage ../development/libraries/haskell/silently {};
-
-  sitemap = callPackage ../development/libraries/haskell/sitemap {};
-
-  sized = callPackage ../development/libraries/haskell/sized {};
-
-  sizedTypes = callPackage ../development/libraries/haskell/sized-types {};
-
-  skein = callPackage ../development/libraries/haskell/skein {};
-
-  slackApi = callPackage ../development/libraries/haskell/slack-api {};
-
-  smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
-
-  smtLib = callPackage ../development/libraries/haskell/smtLib {};
-
-  smtpMail = callPackage ../development/libraries/haskell/smtp-mail {};
-
-  smtpsGmail = callPackage ../development/libraries/haskell/smtps-gmail {};
-
-  snap = callPackage ../development/libraries/haskell/snap/snap.nix {};
-
-  snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {};
-
-  snapErrorCollector = callPackage ../development/libraries/haskell/snap-error-collector {};
-
-  snapletPostgresqlSimple = callPackage ../development/libraries/haskell/snaplet-postgresql-simple {};
-
-  snapletRedis = callPackage ../development/libraries/haskell/snaplet-redis {};
-
-  snapletStripe = callPackage ../development/libraries/haskell/snaplet-stripe {};
-
-  snapBlaze = callPackage ../development/libraries/haskell/snap-blaze/default.nix {};
-
-  snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
-
-  snapCors = callPackage ../development/libraries/haskell/snap-cors {};
-
-  snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {};
-
-  snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {};
-
-  snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
-
-  snapWebRoutes = callPackage ../development/libraries/haskell/snap-web-routes {};
-
-  snowball = callPackage ../development/libraries/haskell/snowball {};
-
-  socks = callPackage ../development/libraries/haskell/socks {};
-
-  socketIo = callPackage ../development/libraries/haskell/socket-io {};
-
-  sodium = callPackage ../development/libraries/haskell/sodium {};
-
-  sparse = callPackage ../development/libraries/haskell/sparse {};
-
-  spawn = callPackage ../development/libraries/haskell/spawn {};
-
-  speculation = callPackage ../development/libraries/haskell/speculation {};
-
-  spoon = callPackage ../development/libraries/haskell/spoon {};
-
-  srcloc = callPackage ../development/libraries/haskell/srcloc {};
-
-  statePlus = callPackage ../development/libraries/haskell/state-plus {};
-
-  stateref = callPackage ../development/libraries/haskell/stateref {};
-
-  statestack = callPackage ../development/libraries/haskell/statestack {};
-
-  StateVar = callPackage ../development/libraries/haskell/StateVar {};
-
-  statistics = callPackage ../development/libraries/haskell/statistics {};
-
-  statvfs = callPackage ../development/libraries/haskell/statvfs {};
-
-  StrafunskiStrategyLib = callPackage ../development/libraries/haskell/Strafunski-StrategyLib {};
-
-  streamingCommons = callPackage ../development/libraries/haskell/streaming-commons {};
-
-  streamproc = callPackage ../development/libraries/haskell/streamproc {};
-
-  strict = callPackage ../development/libraries/haskell/strict {};
-
-  stringable = callPackage ../development/libraries/haskell/stringable {};
-
-  stringCombinators = callPackage ../development/libraries/haskell/string-combinators {};
-
-  stringConversions = callPackage ../development/libraries/haskell/string-conversions {};
-
-  stringprep = callPackage ../development/libraries/haskell/stringprep {};
-
-  stringQq = callPackage ../development/libraries/haskell/string-qq {};
-
-  stringsearch = callPackage ../development/libraries/haskell/stringsearch {};
-
-  strptime = callPackage ../development/libraries/haskell/strptime {};
-
-  stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {};
-
-  syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {};
-  syb_0_4_2 = callPackage ../development/libraries/haskell/syb/0.4.2.nix {};
-  syb = self.syb_0_4_2;
-
-  sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {};
-
-  sybWithClassInstancesText = callPackage ../development/libraries/haskell/syb/syb-with-class-instances-text.nix {};
-
-  syntactic = callPackage ../development/libraries/haskell/syntactic {};
-
-  syz = callPackage ../development/libraries/haskell/syz {};
-
-  SDLImage = callPackage ../development/libraries/haskell/SDL-image {};
-
-  SDLMixer = callPackage ../development/libraries/haskell/SDL-mixer {};
-
-  SDLTtf = callPackage ../development/libraries/haskell/SDL-ttf {};
-
-  SDL = callPackage ../development/libraries/haskell/SDL {
-    inherit (pkgs) SDL;
-  };
-
-  sdl2 = callPackage ../development/libraries/haskell/sdl2 {
-    inherit (pkgs) SDL2;
-  };
-
-  SHA = callPackage ../development/libraries/haskell/SHA {};
-
-  SHA2 = callPackage ../development/libraries/haskell/SHA2 {};
-
-  shake = callPackage ../development/libraries/haskell/shake {};
-
-  shakespeare = callPackage ../development/libraries/haskell/shakespeare {};
-
-  shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {};
-
-  shakespeareI18n = callPackage ../development/libraries/haskell/shakespeare-i18n {};
-
-  shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js {};
-
-  shakespeareText = callPackage ../development/libraries/haskell/shakespeare-text {};
-
-  Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix {};
-
-  show = callPackage ../development/libraries/haskell/show {};
-
-  singletons = callPackage ../development/libraries/haskell/singletons {};
-
-  SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
-
-  socketActivation = callPackage ../development/libraries/haskell/socket-activation {};
-
-  sourcemap = callPackage ../development/libraries/haskell/sourcemap {};
-
-  split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {};
-  split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {};
-  split = self.split_0_2_2;
-
-  sqliteSimple = callPackage ../development/libraries/haskell/sqlite-simple/default.nix {};
-
-  stbImage = callPackage ../development/libraries/haskell/stb-image {};
-
-  stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {};
-  stm_2_4_3 = callPackage ../development/libraries/haskell/stm/2.4.3.nix {};
-  stm = self.stm_2_4_3;
-
-  stmChans = callPackage ../development/libraries/haskell/stm-chans {};
-
-  stmConduit = callPackage ../development/libraries/haskell/stm-conduit {};
-
-  stmContainers = callPackage ../development/libraries/haskell/stm-containers {};
-
-  stmDelay = callPackage ../development/libraries/haskell/stm-delay {};
-
-  STMonadTrans = callPackage ../development/libraries/haskell/STMonadTrans {};
-
-  stmStats = callPackage ../development/libraries/haskell/stm-stats {};
-
-  storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
-
-  storableEndian = callPackage ../development/libraries/haskell/storable-endian {};
-
-  storableRecord = callPackage ../development/libraries/haskell/storable-record {};
-
-  Stream = callPackage ../development/libraries/haskell/Stream {};
-
-  strictConcurrency = callPackage ../development/libraries/haskell/strict-concurrency {};
-
-  stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {};
-
-  stripe = callPackage ../development/libraries/haskell/stripe {};
-
-  svgcairo = callPackage ../development/libraries/haskell/svgcairo {
-    libc = pkgs.stdenv.cc.libc;
-  };
-
-  SVGFonts = callPackage ../development/libraries/haskell/SVGFonts {};
-
-  symbol = callPackage ../development/libraries/haskell/symbol {};
-
-  systemArgv0 = callPackage ../development/libraries/haskell/system-argv0 {};
-
-  systemFilepath = callPackage ../development/libraries/haskell/system-filepath {};
-
-  systemFileio = callPackage ../development/libraries/haskell/system-fileio {};
-
-  systemPosixRedirect = callPackage ../development/libraries/haskell/system-posix-redirect {};
-
-  systemTimeMonotonic = callPackage ../development/libraries/haskell/system-time-monotonic {};
-
-  TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {};
-
-  tables = callPackage ../development/libraries/haskell/tables {};
-
-  tabular = callPackage ../development/libraries/haskell/tabular {};
-
-  tagged = callPackage ../development/libraries/haskell/tagged {};
-
-  taggedTransformer = callPackage ../development/libraries/haskell/tagged-transformer {};
-
-  taggy = callPackage ../development/libraries/haskell/taggy {};
-
-  taggyLens = callPackage ../development/libraries/haskell/taggy-lens {};
-
-  tagshare = callPackage ../development/libraries/haskell/tagshare {};
-
-  tagsoup = callPackage ../development/libraries/haskell/tagsoup {};
-
-  tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {};
-
-  tasty = callPackage ../development/libraries/haskell/tasty {};
-
-  tastyAntXml = callPackage ../development/libraries/haskell/tasty-ant-xml {};
-
-  tastyGolden = callPackage ../development/libraries/haskell/tasty-golden {};
-
-  tastyHspec = callPackage ../development/libraries/haskell/tasty-hspec {};
-
-  tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
-
-  tastyProgram = callPackage ../development/libraries/haskell/tasty-program {};
-
-  tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {};
-
-  tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {};
-
-  tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {};
-
-  tastyTh = callPackage ../development/libraries/haskell/tasty-th {};
-
-  TCache = callPackage ../development/libraries/haskell/TCache {};
-
-  tcacheAWS = callPackage ../development/libraries/haskell/tcache-AWS {};
-
-  template = callPackage ../development/libraries/haskell/template {};
-
-  templateDefault = callPackage ../development/libraries/haskell/template-default {};
-
-  temporary = callPackage ../development/libraries/haskell/temporary {};
-
-  temporaryRc = callPackage ../development/libraries/haskell/temporary-rc {};
-
-  Tensor = callPackage ../development/libraries/haskell/Tensor {};
-
-  terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {};
-
-  terminalSize = callPackage ../development/libraries/haskell/terminal-size {};
-
-  terminfo = callPackage ../development/libraries/haskell/terminfo { inherit (pkgs) ncurses; };
-
-  testFramework = callPackage ../development/libraries/haskell/test-framework {};
-
-  testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {};
-
-  testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {};
-
-  testFrameworkSmallcheck = callPackage ../development/libraries/haskell/test-framework-smallcheck {};
-
-  testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {};
-
-  testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {};
-
-  testingFeat = callPackage ../development/libraries/haskell/testing-feat {};
-
-  testSimple = callPackage ../development/libraries/haskell/test-simple {};
-
-  texmath = callPackage ../development/libraries/haskell/texmath {};
-
-  text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {};
-  text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {};
-  text_1_2_0_3 = callPackage ../development/libraries/haskell/text/1.2.0.3.nix {};
-  text = self.text_1_2_0_3;
-
-  textBinary = callPackage ../development/libraries/haskell/text-binary {};
-
-  textFormat = callPackage ../development/libraries/haskell/text-format {};
-
-  textIcu = callPackage ../development/libraries/haskell/text-icu {};
-
-  textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {};
-
-  tfRandom = callPackage ../development/libraries/haskell/tf-random {};
-
-  these = callPackage ../development/libraries/haskell/these {};
-
-  thespian = callPackage ../development/libraries/haskell/thespian {};
-
-  thDesugar = callPackage ../development/libraries/haskell/th-desugar {};
-
-  thExpandSyns = callPackage ../development/libraries/haskell/th-expand-syns {};
-
-  thExtras = callPackage ../development/libraries/haskell/th-extras {};
-
-  thLift = callPackage ../development/libraries/haskell/th-lift {};
-
-  thLiftInstances = callPackage ../development/libraries/haskell/th-lift-instances {};
-
-  thOrphans = callPackage ../development/libraries/haskell/th-orphans {};
-
-  threadmanager = callPackage ../development/libraries/haskell/threadmanager {};
-
-  threads = callPackage ../development/libraries/haskell/threads {};
-
-  threadLocalStorage = callPackage ../development/libraries/haskell/thread-local-storage {};
-
-  thReifyMany = callPackage ../development/libraries/haskell/th-reify-many {};
-
-  Thrift = callPackage ../development/libraries/haskell/Thrift {};
-
-  thyme = callPackage ../development/libraries/haskell/thyme {};
-
-  threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {};
-
-  time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {};
-  time_1_5 = callPackage ../development/libraries/haskell/time/1.5.nix {};
-  time = null;                  # core package since ghc >= 6.12.x
-
-  timerep = callPackage ../development/libraries/haskell/timerep {};
-
-  timeparsers = callPackage ../development/libraries/haskell/timeparsers {};
-
-  timeRecurrence = callPackage ../development/libraries/haskell/time-recurrence {};
-
-  timezoneOlson = callPackage ../development/libraries/haskell/timezone-olson {};
-
-  timezoneSeries = callPackage ../development/libraries/haskell/timezone-series {};
-
-  timeCompat = callPackage ../development/libraries/haskell/time-compat {};
-
-  tls = callPackage ../development/libraries/haskell/tls {};
-
-  torrent = callPackage ../development/libraries/haskell/torrent {};
-
-  tostring = callPackage ../development/libraries/haskell/tostring {};
-
-  transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {};
-  transformers_0_4_2_0 = callPackage ../development/libraries/haskell/transformers/0.4.2.0.nix {};
-  transformers = null;          # core package since ghc >= 7.8.x
-
-  transformersBase = callPackage ../development/libraries/haskell/transformers-base {};
-
-  transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {};
-
-  transformersFree = callPackage ../development/libraries/haskell/transformers-free {};
-
-  traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {};
-
-  treeView = callPackage ../development/libraries/haskell/tree-view {};
-
-  trifecta = callPackage ../development/libraries/haskell/trifecta {};
-
-  trivia = callPackage ../development/libraries/haskell/trivia {};
-
-  tuple = callPackage ../development/libraries/haskell/tuple {};
-
-  twitterConduit = callPackage ../development/libraries/haskell/twitter-conduit {};
-
-  twitterTypes = callPackage ../development/libraries/haskell/twitter-types {};
-
-  twitterTypesLens = callPackage ../development/libraries/haskell/twitter-types-lens {};
-
-  typeAligned = callPackage ../development/libraries/haskell/type-aligned {};
-
-  TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {};
-
-  typeEq = callPackage ../development/libraries/haskell/type-eq {};
-
-  typeEquality = callPackage ../development/libraries/haskell/type-equality {};
-
-  typeNatural = callPackage ../development/libraries/haskell/type-natural {};
-
-  typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {};
-
-  typographyGeometry = callPackage ../development/libraries/haskell/typography-geometry {};
-
-  tz = callPackage ../development/libraries/haskell/tz {
-    pkgs_tzdata = pkgs.tzdata;
-  };
-
-  tzdata = callPackage ../development/libraries/haskell/tzdata {};
-
-  unbound = callPackage ../development/libraries/haskell/unbound {};
-
-  unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {};
-
-  unboundGenerics = callPackage ../development/libraries/haskell/unbound-generics {};
-
-  unificationFd = callPackage ../development/libraries/haskell/unification-fd {};
-
-  unionFind = callPackage ../development/libraries/haskell/union-find {};
-
-  uniplate = callPackage ../development/libraries/haskell/uniplate {};
-
-  units = callPackage ../development/libraries/haskell/units {};
-
-  unique = callPackage ../development/libraries/haskell/unique {};
-
-  uniqueid = callPackage ../development/libraries/haskell/uniqueid {};
-
-  unixBytestring = callPackage ../development/libraries/haskell/unix-bytestring {};
-
-  unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
-
-  unixMemory = callPackage ../development/libraries/haskell/unix-memory {};
-
-  unixProcessConduit = callPackage ../development/libraries/haskell/unix-process-conduit {};
-
-  unixTime = callPackage ../development/libraries/haskell/unix-time {};
-
-  Unixutils = callPackage ../development/libraries/haskell/Unixutils {};
-
-  unlambda = callPackage ../development/libraries/haskell/unlambda {};
-
-  unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {};
-
-  uri = callPackage ../development/libraries/haskell/uri {};
-
-  uriEncode = callPackage ../development/libraries/haskell/uri-encode {};
-
-  url = callPackage ../development/libraries/haskell/url {};
-
-  urlencoded = callPackage ../development/libraries/haskell/urlencoded {};
-
-  usb = callPackage ../development/libraries/haskell/usb {};
-
-  utf8Light = callPackage ../development/libraries/haskell/utf8-light {};
-
-  utf8String = callPackage ../development/libraries/haskell/utf8-string {};
-
-  utilityHt = callPackage ../development/libraries/haskell/utility-ht {};
-
-  uulib = callPackage ../development/libraries/haskell/uulib {};
-
-  uuid = callPackage ../development/libraries/haskell/uuid {};
-
-  uuOptions = callPackage ../development/libraries/haskell/uu-options {};
-
-  uuInterleaved = callPackage ../development/libraries/haskell/uu-interleaved {};
-
-  uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {};
-
-  vacuum = callPackage ../development/libraries/haskell/vacuum {};
-
-  vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {};
-
-  vacuumGraphviz = callPackage ../development/libraries/haskell/vacuum-graphviz {};
-
-  vado = callPackage ../development/libraries/haskell/vado {};
-
-  vault = callPackage ../development/libraries/haskell/vault {};
-
-  vcsgui = callPackage ../development/libraries/haskell/vcsgui {};
-
-  vcsRevision = callPackage ../development/libraries/haskell/vcs-revision {};
-
-  vcswrapper = callPackage ../development/libraries/haskell/vcswrapper {};
-
-  Vec = callPackage ../development/libraries/haskell/Vec {};
-
-  vect = callPackage ../development/libraries/haskell/vect {};
-
-  vector_0_10_9_3  = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {};
-  vector_0_10_12_2  = callPackage ../development/libraries/haskell/vector/0.10.12.2.nix {};
-  vector = self.vector_0_10_12_2;
-
-  vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
-
-  vectorBinaryInstances = callPackage ../development/libraries/haskell/vector-binary-instances {};
-
-  vectorFftw = callPackage ../development/libraries/haskell/vector-fftw {};
-
-  vectorInstances = callPackage ../development/libraries/haskell/vector-instances {};
-
-  vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
-
-  vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {};
-
-  vectorThUnbox = callPackage ../development/libraries/haskell/vector-th-unbox {};
-
-  vinyl = callPackage ../development/libraries/haskell/vinyl {};
-
-  vkAwsRoute53 = callPackage ../development/libraries/haskell/vk-aws-route53 {};
-
-  vkPosixPty = callPackage ../development/libraries/haskell/vk-posix-pty {};
-
-  void = callPackage ../development/libraries/haskell/void {};
-
-  vty = callPackage ../development/libraries/haskell/vty {};
-
-  vtyUi = callPackage ../development/libraries/haskell/vty-ui {};
-
-  wai = callPackage ../development/libraries/haskell/wai {};
-
-  waiAppStatic = callPackage ../development/libraries/haskell/wai-app-static {};
-
-  waiConduit = callPackage ../development/libraries/haskell/wai-conduit {};
-
-  waiExtra = callPackage ../development/libraries/haskell/wai-extra {};
-
-  waiHandlerLaunch = callPackage ../development/libraries/haskell/wai-handler-launch {};
-
-  waiHandlerFastcgi = callPackage ../development/libraries/haskell/wai-handler-fastcgi { inherit (pkgs) fcgi; };
-
-  waiLogger = callPackage ../development/libraries/haskell/wai-logger {};
-
-  waiMiddlewareStatic = callPackage ../development/libraries/haskell/wai-middleware-static {};
-
-  waiTest = callPackage ../development/libraries/haskell/wai-test {};
-
-  waiWebsockets = callPackage ../development/libraries/haskell/wai-websockets {};
-
-  warp = callPackage ../development/libraries/haskell/warp {};
-
-  warpTls = callPackage ../development/libraries/haskell/warp-tls {};
-
-  WAVE = callPackage ../development/libraries/haskell/WAVE {};
-
-  wcwidth = callPackage ../development/libraries/haskell/wcwidth {};
-
-  webdriver = callPackage ../development/libraries/haskell/webdriver {};
-
-  webkit = callPackage ../development/libraries/haskell/webkit {
-    webkit = pkgs.webkitgtk2;
-  };
-
-  webkitgtk3 = callPackage ../development/libraries/haskell/webkitgtk3 {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  webRoutes = callPackage ../development/libraries/haskell/web-routes {};
-
-  webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};
-
-  webRoutesHappstack = callPackage ../development/libraries/haskell/web-routes-happstack {};
-
-  websockets = callPackage ../development/libraries/haskell/websockets {};
-
-  websocketsSnap = callPackage ../development/libraries/haskell/websockets-snap {};
-
-  CouchDB = callPackage ../development/libraries/haskell/CouchDB {};
-
-  wlPprint = callPackage ../development/libraries/haskell/wl-pprint {};
-
-  wlPprintExtras = callPackage ../development/libraries/haskell/wl-pprint-extras {};
-
-  wlPprintTerminfo = callPackage ../development/libraries/haskell/wl-pprint-terminfo {};
-
-  wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {};
-
-  wizards = callPackage ../development/libraries/haskell/wizards {};
-
-  word8 = callPackage ../development/libraries/haskell/word8 {};
-
-  wordexp = callPackage ../development/libraries/haskell/wordexp {};
-
-  Workflow = callPackage ../development/libraries/haskell/Workflow {};
-
-  wreq = callPackage ../development/libraries/haskell/wreq {};
-
-  wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};
-
-  wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix {
-    wxGTK = pkgs.wxGTK29;
-  };
-
-  wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix {
-    wxGTK = pkgs.wxGTK29;
-  };
-
-  wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
-
-  x509 = callPackage ../development/libraries/haskell/x509 {};
-
-  x509Store = callPackage ../development/libraries/haskell/x509-store {};
-
-  x509System = callPackage ../development/libraries/haskell/x509-system {};
-
-  x509Validation = callPackage ../development/libraries/haskell/x509-validation {};
-
-  X11 = callPackage ../development/libraries/haskell/X11 {};
-
-  X11Xft = callPackage ../development/libraries/haskell/X11-xft {};
-
-  xdgBasedir = callPackage ../development/libraries/haskell/xdg-basedir {};
-
-  xdot = callPackage ../development/libraries/haskell/xdot {};
-
-  xhtml = callPackage ../development/libraries/haskell/xhtml {};
-
-  xml = callPackage ../development/libraries/haskell/xml {};
-
-  xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {};
-
-  xmlConduitWriter = callPackage ../development/libraries/haskell/xml-conduit-writer {};
-
-  xmlgen = callPackage ../development/libraries/haskell/xmlgen {};
-
-  xmlHamlet = callPackage ../development/libraries/haskell/xml-hamlet {};
-
-  xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {};
-
-  xmlHtmlConduitLens = callPackage ../development/libraries/haskell/xml-html-conduit-lens {};
-
-  xmlLens = callPackage ../development/libraries/haskell/xml-lens {};
-
-  xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
-
-  xorshift = callPackage ../development/libraries/haskell/xorshift {};
-
-  xournalParser = callPackage ../development/libraries/haskell/xournal-parser {};
-
-  xournalTypes = callPackage ../development/libraries/haskell/xournal-types {};
-
-  xtest = callPackage ../development/libraries/haskell/xtest {};
-
-  xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
-
-  Yampa = callPackage ../development/libraries/haskell/Yampa {};
-
-  yaml = callPackage ../development/libraries/haskell/yaml {};
-
-  yamlLight = callPackage ../development/libraries/haskell/yaml-light {};
-
-  yap = callPackage ../development/libraries/haskell/yap {};
-
-  yeganesh = callPackage ../applications/misc/yeganesh {};
-
-  yesod = callPackage ../development/libraries/haskell/yesod {};
-
-  yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
-
-  yesodAuthHashdb = callPackage ../development/libraries/haskell/yesod-auth-hashdb {};
-
-  yesodBin = callPackage ../development/libraries/haskell/yesod-bin {};
-
-  yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
-
-  yesodDefault = callPackage ../development/libraries/haskell/yesod-default {};
-
-  yesodForm = callPackage ../development/libraries/haskell/yesod-form {};
-
-  yesodJson = callPackage ../development/libraries/haskell/yesod-json {};
-
-  yesodMarkdown = callPackage ../development/libraries/haskell/yesod-markdown {};
-
-  yesodNewsfeed = callPackage ../development/libraries/haskell/yesod-newsfeed {};
-
-  yesodPagination = callPackage ../development/libraries/haskell/yesod-pagination {};
-
-  yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {};
-
-  yesodRoutes = callPackage ../development/libraries/haskell/yesod-routes {};
-
-  yesodStatic = callPackage ../development/libraries/haskell/yesod-static {};
-
-  yesodTest = callPackage ../development/libraries/haskell/yesod-test {};
-
-  yst = callPackage ../development/libraries/haskell/yst {};
-
-  zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell { zeromq = pkgs.zeromq2; };
-
-  zeromq3Haskell = callPackage ../development/libraries/haskell/zeromq3-haskell { zeromq = pkgs.zeromq3; };
-
-  zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; };
-
-  zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {};
-  zipArchive_0_2_3_5 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.5.nix {};
-  zipArchive = self.zipArchive_0_2_3_5;
-
-  zipper = callPackage ../development/libraries/haskell/zipper {};
-
-  zippers = callPackage ../development/libraries/haskell/zippers {};
-
-  zlib = callPackage ../development/libraries/haskell/zlib { inherit (pkgs) zlib;};
-
-  zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
-
-  zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {};
-
-  zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
-
-  # Compilers.
-
-  Agda = callPackage ../development/compilers/agda {};
-
-  epic = callPackage ../development/compilers/epic {};
-
-  pakcs = callPackage ../development/compilers/pakcs {};
-
-  # Development tools.
-
-  alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {};
-  alex_3_1_3 = callPackage ../development/tools/parsing/alex/3.1.3.nix {};
-  alex = self.alex_3_1_3;
-
-  BNFC = callPackage ../development/tools/haskell/BNFC {};
-
-  cake3 = callPackage ../development/tools/haskell/cake3 {};
-
-  cpphs = callPackage ../development/tools/misc/cpphs {};
-
-  DrIFT = callPackage ../development/tools/haskell/DrIFT {};
-
-  haddock = callPackage ../development/tools/documentation/haddock {};
-
-  haddockApi = callPackage ../development/libraries/haskell/haddock-api {};
-
-  haddockLibrary = callPackage ../development/libraries/haskell/haddock-library {};
-
-  HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {};
-
-  happy = callPackage ../development/tools/parsing/happy {};
-
-  happyMeta = callPackage ../development/tools/haskell/happy-meta {};
-
-  haskellDocs = callPackage ../development/tools/haskell/haskell-docs {};
-
-  haskdogs = callPackage ../development/tools/haskell/haskdogs {};
-
-  hasktags = callPackage ../development/tools/haskell/hasktags {};
-
-  hdevtools = callPackage ../development/tools/haskell/hdevtools {};
-
-  hlint = callPackage ../development/tools/haskell/hlint {};
-
-  hp2anyManager = callPackage ../development/tools/haskell/hp2any-manager {};
-
-  hsb2hs = callPackage ../development/tools/haskell/hsb2hs {};
-
-  hscolour = callPackage ../development/tools/haskell/hscolour {};
-  hscolourBootstrap = self.hscolour.override {
-    cabal = self.cabal.override {
-      extension = self : super : {
-        hyperlinkSource = false;
-        configureFlags = super.configureFlags or "" +
-          pkgs.lib.optionalString (pkgs.stdenv.lib.versionOlder "6.12" ghc.version) " --ghc-option=-rtsopts";
-      } // pkgs.stdenv.lib.optionalAttrs (pkgs.stdenv.lib.versionOlder "7.9" ghc.version) { noHaddock = true; };
-    };
-  };
-
-  hscope = callPackage ../development/tools/haskell/hscope { };
-
-  hslogger = callPackage ../development/tools/haskell/hslogger {};
-
-  pointfree = callPackage ../development/tools/haskell/pointfree {};
-
-  pointful = callPackage ../development/tools/haskell/pointful {};
-
-  ShellCheck = callPackage ../development/tools/misc/ShellCheck {};
-
-  SourceGraph = callPackage ../development/tools/haskell/SourceGraph {};
-
-  tar = callPackage ../development/libraries/haskell/tar {};
-
-  threadscope = callPackage ../development/tools/haskell/threadscope {};
-
-  uuagcBootstrap = callPackage ../development/tools/haskell/uuagc/bootstrap.nix {};
-  uuagcCabal = callPackage ../development/tools/haskell/uuagc/cabal.nix {};
-  uuagc = callPackage ../development/tools/haskell/uuagc {};
-
-  # Applications.
-
-  arbtt = callPackage ../applications/misc/arbtt {};
-
-  clashGhc = callPackage ../development/compilers/clash-ghc {};
-
-  idris_plain = callPackage ../development/compilers/idris {};
-
-  idris = callPackage ../development/compilers/idris/wrapper.nix {};
-
-  ncIndicators = callPackage ../applications/misc/nc-indicators {};
-
-  sloane = callPackage ../applications/science/math/sloane {};
-
-  taffybar = callPackage ../applications/misc/taffybar {};
-
-  validation = callPackage ../development/libraries/haskell/validation {};
-
-  vimus = callPackage ../applications/audio/vimus {};
-
-  xlsx = callPackage ../development/libraries/haskell/xlsx {};
-
-  xmobar = callPackage ../applications/misc/xmobar {};
-
-  xmonad = callPackage ../applications/window-managers/xmonad {};
-
-  xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {};
-
-  xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {};
-
-  xmonadScreenshot = callPackage ../development/libraries/haskell/xmonad-screenshot {};
-
-  # Yi packages
-
-  dynamicState = callPackage ../development/libraries/haskell/dynamic-state {};
-
-  ooPrototypes = callPackage ../development/libraries/haskell/oo-prototypes {};
-
-  wordTrie = callPackage ../development/libraries/haskell/word-trie {};
-
-  # This is an unwrapped version of Yi, it will not behave well. Use
-  # ‘yi’ from all-packages.nix instead.
-  yi = callPackage ../applications/editors/yi/yi.nix { };
-
-  yiFuzzyOpen = callPackage ../development/libraries/haskell/yi-fuzzy-open {};
-
-  yiMonokai = callPackage ../development/libraries/haskell/yi-monokai {};
-
-  yiLanguage = callPackage ../development/libraries/haskell/yi-language {};
-
-  yiRope = callPackage ../development/libraries/haskell/yi-rope {};
-
-  yiSnippet = callPackage ../development/libraries/haskell/yi-snippet {};
-
-  # Tools.
-
-  cabalDb = callPackage ../development/tools/haskell/cabal-db {};
-
-  cabal2nix = pkgs.cabal2nix;
-
-  # Build a cabal package given a local .cabal file
-  buildLocalCabalWithArgs = { src
-                            , name
-                            , args ? {}
-                            , cabalDrvArgs ? { jailbreak = true; }
-                            # for import-from-derivation, want to use current system
-                            , nativePkgs ? import pkgs.path {}
-                            }: let
-    cabalExpr = nativePkgs.stdenv.mkDerivation ({
-      name = "${name}.nix";
-
-      buildCommand = ''
-      export HOME="$TMPDIR"
-      ${nativePkgs.haskellPackages.cabal2nix}/bin/cabal2nix ${src} \
-          | sed -e 's/licenses.proprietary/licenses.unfree/' > $out
-      '';
-
-    } // pkgs.lib.optionalAttrs nativePkgs.stdenv.isLinux {
-      LANG = "en_US.UTF-8";
-      LOCALE_ARCHIVE = "${nativePkgs.glibcLocales}/lib/locale/locale-archive";
+    ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };
+    ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
+    ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
     });
-  in callPackage cabalExpr ({
-    cabal = self.cabal.override {
-      extension = eself: esuper: {
-        buildDepends = [ self.cabalInstall ] ++ esuper.buildDepends;
-      } // cabalDrvArgs;
-    };
-  } // args);
 
-  buildLocalCabal = src: name: self.buildLocalCabalWithArgs { inherit src name; };
+    ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; };
+    ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; };
+    ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
+    ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
+    ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
+    ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
+    ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
+    ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
+    ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
+    ghc = compiler.ghc784;
 
-  cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};
-
-  cabalBounds = callPackage ../development/tools/haskell/cabal-bounds {
-    Cabal = self.Cabal_1_20_0_3;
-    cabalLenses = self.cabalLenses.override {
-      Cabal = self.Cabal_1_20_0_3;
+    ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
+      ghc = compiler.ghc7101;
     };
   };
 
-  cabalMeta = callPackage ../development/tools/haskell/cabal-meta {};
+  packages = {
 
-  cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {};
-
-  cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};
-
-  cabalg = callPackage ../development/libraries/haskell/cabalg {};
-
-  cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; };
-  cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; };
-  cabalInstall_1_20_0_6 = callPackage ../tools/package-management/cabal-install/1.20.0.6.nix { Cabal = self.Cabal_1_20_0_3; };
-  cabalInstall_1_22_0_0 = callPackage ../tools/package-management/cabal-install/1.22.0.0.nix { Cabal = self.Cabal_1_22_0_0; };
-  cabalInstall = self.cabalInstall_1_22_0_0;
-
-  codex = callPackage ../development/tools/haskell/codex {};
-
-  commandQq = callPackage ../development/libraries/haskell/command-qq {};
-
-  escoger = callPackage ../tools/misc/escoger { };
-
-  gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {
-    cabal = self.cabal.override { extension = self : super : { enableSharedExecutables = false; }; };
-    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
-    fdoNotify = if pkgs.stdenv.isLinux then self.fdoNotify else null;
-    hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
-  };
-
-  githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};
-
-  hobbes = callPackage ../development/tools/haskell/hobbes {};
-
-  jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
-
-  journalMailer = callPackage ../tools/system/journal-mailer {};
-
-  keter = callPackage ../development/tools/haskell/keter {};
-
-  lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
-
-  liquidFixpoint = callPackage ../development/tools/haskell/liquid-fixpoint {};
-
-  liquidhaskell = callPackage ../development/tools/haskell/liquidhaskell {};
-
-  packunused = callPackage ../development/tools/haskell/packunused {};
-
-  rehoo = callPackage ../development/tools/haskell/rehoo {};
-
-  sizes = callPackage ../tools/system/sizes {};
-
-  splot = callPackage ../development/tools/haskell/splot {};
-
-  timeplot = callPackage ../development/tools/haskell/timeplot {};
-
-  una = callPackage ../development/tools/haskell/una {};
-
-  # Games.
-
-  LambdaHack = callPackage ../games/LambdaHack {
-    vectorBinaryInstances = self.vectorBinaryInstances.override {
-      binary = self.binary_0_7_2_2; # the miniutter build input requires this version
+    ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; };
+    ghc6123 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc6123;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
     };
+    ghc704 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc704;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
+    };
+    ghc722 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc722;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
+    };
+    ghc742 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc742;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
+    };
+    ghc763 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc763;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
+    };
+    ghc784 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc784;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
+    };
+    ghc7101 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc7101;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
+    };
+    ghcHEAD = callPackage ../development/haskell-modules {
+      ghc = compiler.ghcHEAD;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
+    };
+    ghcjs = callPackage ../development/haskell-modules {
+      ghc = compiler.ghcjs;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+    };
+
   };
-
-  Allure = callPackage ../games/Allure {};
-
-# End of the main part of the file.
-
 }

From 1028dc7cb6689bfed92cfb0fb821c0c54269a4f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 19 Apr 2015 18:52:04 +0200
Subject: [PATCH 0369/1143] Remove obsolete pkgs/development/libraries/haskell
 directory.

---
 .../libraries/haskell/AC-Vector/default.nix   |  14 ---
 .../libraries/haskell/AES/default.nix         |  15 ---
 .../haskell/BlogLiterately/default.nix        |  28 -----
 .../libraries/haskell/Boolean/default.nix     |  14 ---
 .../libraries/haskell/BoundedChan/default.nix |  14 ---
 .../libraries/haskell/CC-delcont/default.nix  |  16 ---
 .../libraries/haskell/Cabal/1.16.0.3.nix      |  25 ----
 .../libraries/haskell/Cabal/1.18.1.3.nix      |  26 -----
 .../libraries/haskell/Cabal/1.20.0.3.nix      |  25 ----
 .../libraries/haskell/Cabal/1.22.0.0.nix      |  26 -----
 .../libraries/haskell/Chart-cairo/default.nix |  21 ----
 .../haskell/Chart-diagrams/default.nix        |  24 ----
 .../libraries/haskell/Chart-gtk/default.nix   |  20 ----
 .../libraries/haskell/Chart/default.nix       |  19 ----
 .../haskell/ChasingBottoms/default.nix        |  18 ---
 .../libraries/haskell/ConfigFile/default.nix  |  18 ---
 .../libraries/haskell/CouchDB/default.nix     |  20 ----
 .../libraries/haskell/Crypto/default.nix      |  17 ---
 .../libraries/haskell/DAV/default.nix         |  27 -----
 .../libraries/haskell/DRBG/default.nix        |  22 ----
 .../libraries/haskell/Decimal/default.nix     |  22 ----
 .../libraries/haskell/Diff/default.nix        |  14 ---
 .../libraries/haskell/EitherT/default.nix     |  18 ---
 .../libraries/haskell/Extra-lib/default.nix   |  21 ----
 .../libraries/haskell/FerryCore/default.nix   |  15 ---
 .../libraries/haskell/FontyFruity/default.nix |  16 ---
 .../libraries/haskell/GLFW-b/default.nix      |  19 ----
 .../libraries/haskell/GLFW/default.nix        |  17 ---
 .../libraries/haskell/GLURaw/default.nix      |  17 ---
 .../libraries/haskell/GLUT/default.nix        |  19 ----
 .../libraries/haskell/GLUtil/default.nix      |  21 ----
 .../haskell/GenericPretty/default.nix         |  15 ---
 .../libraries/haskell/Glob/default.nix        |  16 ---
 .../libraries/haskell/GlomeVec/default.nix    |  16 ---
 .../libraries/haskell/Graphalyze/default.nix  |  20 ----
 .../libraries/haskell/HDBC/HDBC-odbc.nix      |  21 ----
 .../haskell/HDBC/HDBC-postgresql.nix          |  21 ----
 .../libraries/haskell/HDBC/HDBC-sqlite3.nix   |  19 ----
 .../libraries/haskell/HDBC/HDBC.nix           |  18 ---
 .../libraries/haskell/HFuse/default.nix       |  22 ----
 .../libraries/haskell/HList/default.nix       |  20 ----
 .../libraries/haskell/HPDF/default.nix        |  17 ---
 .../libraries/haskell/HSH/default.nix         |  23 ----
 .../haskell/HStringTemplate/default.nix       |  20 ----
 .../libraries/haskell/HTF/default.nix         |  31 -----
 .../libraries/haskell/HTTP/default.nix        |  26 -----
 .../haskell/HUnit-approx/default.nix          |  17 ---
 .../libraries/haskell/HUnit/default.nix       |  16 ---
 .../libraries/haskell/HaTeX/default.nix       |  21 ----
 .../libraries/haskell/HaXml/default.nix       |  19 ----
 .../haskell/HandsomeSoup/default.nix          |  24 ----
 .../haskell/HaskellForMaths/default.nix       |  16 ---
 .../haskell/HaskellNet-SSL/default.nix        |  16 ---
 .../libraries/haskell/HaskellNet/default.nix  |  18 ---
 .../libraries/haskell/HsOpenSSL/default.nix   |  17 ---
 .../libraries/haskell/HsSyck/0.51.nix         |  16 ---
 .../libraries/haskell/HsSyck/0.52.nix         |  15 ---
 .../libraries/haskell/IORefCAS/default.nix    |  20 ----
 .../libraries/haskell/IOSpec/default.nix      |  15 ---
 .../libraries/haskell/IfElse/default.nix      |  15 ---
 .../libraries/haskell/IntervalMap/default.nix |  18 ---
 .../haskell/JuicyPixels-util/default.nix      |  16 ---
 .../libraries/haskell/JuicyPixels/default.nix |  20 ----
 .../libraries/haskell/List/default.nix        |  16 ---
 .../libraries/haskell/ListLike/default.nix    |  18 ---
 .../libraries/haskell/ListZipper/default.nix  |  15 ---
 .../libraries/haskell/MFlow/default.nix       |  27 -----
 .../libraries/haskell/MaybeT/default.nix      |  15 ---
 .../libraries/haskell/MemoTrie/default.nix    |  16 ---
 .../libraries/haskell/MissingH/default.nix    |  25 ----
 .../haskell/MonadCatchIO-mtl/default.nix      |  17 ---
 .../MonadCatchIO-transformers/default.nix     |  16 ---
 .../libraries/haskell/MonadPrompt/default.nix |  15 ---
 .../libraries/haskell/MonadRandom/0.2.0.1.nix |  16 ---
 .../libraries/haskell/MonadRandom/0.3.0.1.nix |  15 ---
 .../haskell/NumInstances/default.nix          |  15 ---
 .../libraries/haskell/ObjectName/default.nix  |  15 ---
 .../libraries/haskell/OneTuple/default.nix    |  14 ---
 .../libraries/haskell/OpenAL/default.nix      |  17 ---
 .../libraries/haskell/OpenGL/default.nix      |  17 ---
 .../libraries/haskell/OpenGLRaw/default.nix   |  16 ---
 .../libraries/haskell/PSQueue/default.nix     |  14 ---
 .../libraries/haskell/QuickCheck/default.nix  |  18 ---
 .../libraries/haskell/RSA/default.nix         |  22 ----
 .../libraries/haskell/Ranged-sets/default.nix |  16 ---
 .../libraries/haskell/Rasterific/default.nix  |  27 -----
 .../libraries/haskell/ReadArgs/default.nix    |  20 ----
 .../haskell/RefSerialize/default.nix          |  16 ---
 .../libraries/haskell/RepLib/default.nix      |  17 ---
 .../libraries/haskell/SDL-image/default.nix   |  17 ---
 .../libraries/haskell/SDL-mixer/default.nix   |  17 ---
 .../libraries/haskell/SDL-ttf/default.nix     |  17 ---
 .../libraries/haskell/SDL/default.nix         |  17 ---
 .../libraries/haskell/SHA/default.nix         |  17 ---
 .../libraries/haskell/SHA2/default.nix        |  15 ---
 .../libraries/haskell/SMTPClient/default.nix  |  15 ---
 .../haskell/STMonadTrans/default.nix          |  15 ---
 .../libraries/haskell/SVGFonts/default.nix    |  20 ----
 .../haskell/SafeSemaphore/default.nix         |  17 ---
 .../libraries/haskell/Shellac/Shellac.nix     |  16 ---
 .../libraries/haskell/StateVar/default.nix    |  15 ---
 .../Strafunski-StrategyLib/default.nix        |  16 ---
 .../libraries/haskell/Stream/default.nix      |  15 ---
 .../libraries/haskell/TCache/default.nix      |  16 ---
 .../haskell/TableAlgebra/default.nix          |  15 ---
 .../libraries/haskell/Tensor/default.nix      |  15 ---
 .../libraries/haskell/Thrift/default.nix      |  17 ---
 .../libraries/haskell/TypeCompose/default.nix |  16 ---
 .../libraries/haskell/Unixutils/default.nix   |  16 ---
 .../libraries/haskell/Vec/default.nix         |  15 ---
 .../libraries/haskell/WAVE/default.nix        |  19 ----
 .../libraries/haskell/Workflow/default.nix    |  21 ----
 .../libraries/haskell/X11-xft/default.nix     |  19 ----
 .../libraries/haskell/X11/default.nix         |  21 ----
 .../libraries/haskell/Yampa/default.nix       |  16 ---
 .../haskell/abstract-deque-tests/default.nix  |  23 ----
 .../haskell/abstract-deque/default.nix        |  17 ---
 .../haskell/abstract-par/default.nix          |  16 ---
 .../haskell/accelerate-cuda/default.nix       |  25 ----
 .../haskell/accelerate-examples/default.nix   |  32 ------
 .../haskell/accelerate-fft/default.nix        |  17 ---
 .../haskell/accelerate-io/default.nix         |  19 ----
 .../libraries/haskell/accelerate/default.nix  |  22 ----
 .../libraries/haskell/acid-state/default.nix  |  20 ----
 .../acme-lookofdisapproval/default.nix        |  15 ---
 .../libraries/haskell/active/default.nix      |  21 ----
 .../libraries/haskell/ad/default.nix          |  21 ----
 .../libraries/haskell/adjunctions/default.nix |  22 ----
 .../haskell/aeson-pretty/default.nix          |  22 ----
 .../libraries/haskell/aeson-qq/default.nix    |  17 ---
 .../libraries/haskell/aeson-utils/default.nix |  17 ---
 .../libraries/haskell/aeson/0.7.0.4.nix       |  28 -----
 .../libraries/haskell/aeson/0.8.0.2.nix       |  27 -----
 .../libraries/haskell/algebra/default.nix     |  21 ----
 .../libraries/haskell/alsa-core/default.nix   |  17 ---
 .../libraries/haskell/alsa-mixer/default.nix  |  18 ---
 .../libraries/haskell/alsa-pcm/default.nix    |  23 ----
 .../libraries/haskell/amqp/default.nix        |  29 -----
 .../haskell/annotated-wl-pprint/default.nix   |  15 ---
 .../haskell/ansi-terminal/default.nix         |  17 ---
 .../haskell/ansi-wl-pprint/default.nix        |  18 ---
 .../libraries/haskell/appar/default.nix       |  14 ---
 .../haskell/applicative-quoters/default.nix   |  15 ---
 .../libraries/haskell/ariadne/default.nix     |  32 ------
 .../libraries/haskell/arithmoi/default.nix    |  18 ---
 .../libraries/haskell/arrows/default.nix      |  16 ---
 .../libraries/haskell/asn1-data/default.nix   |  18 ---
 .../haskell/asn1-encoding/default.nix         |  20 ----
 .../libraries/haskell/asn1-parse/default.nix  |  16 ---
 .../libraries/haskell/asn1-types/default.nix  |  16 ---
 .../haskell/assert-failure/default.nix        |  17 ---
 .../libraries/haskell/async/2.0.1.4.nix       |  19 ----
 .../libraries/haskell/async/2.0.1.6.nix       |  18 ---
 .../haskell/atomic-primops/default.nix        |  16 ---
 .../libraries/haskell/attempt/default.nix     |  16 ---
 .../libraries/haskell/atto-lisp/default.nix   |  24 ----
 .../haskell/attoparsec-binary/default.nix     |  15 ---
 .../haskell/attoparsec-conduit/default.nix    |  17 ---
 .../haskell/attoparsec-enumerator/default.nix |  16 ---
 .../libraries/haskell/attoparsec/0.10.4.0.nix |  22 ----
 .../libraries/haskell/attoparsec/0.11.3.1.nix |  23 ----
 .../libraries/haskell/attoparsec/0.12.1.2.nix |  22 ----
 .../haskell/authenticate-oauth/default.nix    |  24 ----
 .../haskell/authenticate/default.nix          |  24 ----
 .../libraries/haskell/auto-update/default.nix |  15 ---
 .../libraries/haskell/aws-ec2/default.nix     |  27 -----
 .../libraries/haskell/aws/default.nix         |  40 -------
 .../libraries/haskell/base-compat/default.nix |  16 ---
 .../haskell/base-prelude/default.nix          |  15 ---
 .../haskell/base-unicode-symbols/default.nix  |  15 ---
 .../haskell/base16-bytestring/default.nix     |  15 ---
 .../haskell/base32-bytestring/default.nix     |  18 ---
 .../haskell/base64-bytestring/default.nix     |  22 ----
 .../haskell/base64-string/default.nix         |  15 ---
 .../haskell/basic-prelude/default.nix         |  21 ----
 .../libraries/haskell/benchpress/default.nix  |  17 ---
 .../libraries/haskell/bencode/default.nix     |  15 ---
 .../libraries/haskell/bencoding/default.nix   |  17 ---
 .../libraries/haskell/bert/default.nix        |  26 -----
 .../libraries/haskell/bifunctors/default.nix  |  16 ---
 .../libraries/haskell/bimap/default.nix       |  15 ---
 .../haskell/binary-conduit/default.nix        |  23 ----
 .../haskell/binary-shared/default.nix         |  16 ---
 .../haskell/binary-strict/default.nix         |  16 ---
 .../libraries/haskell/binary/0.7.2.2.nix      |  21 ----
 .../haskell/bindings-DSL/default.nix          |  15 ---
 .../haskell/bindings-GLFW/default.nix         |  22 ----
 .../haskell/bindings-libusb/default.nix       |  17 ---
 .../haskell/bindings-portaudio/default.nix    |  17 ---
 .../haskell/bindings-posix/default.nix        |  15 ---
 .../libraries/haskell/bitarray/default.nix    |  15 ---
 .../libraries/haskell/bitmap/default.nix      |  15 ---
 .../libraries/haskell/bits-atomic/default.nix |  16 ---
 .../libraries/haskell/bits-extras/default.nix |  18 ---
 .../libraries/haskell/bitset/default.nix      |  18 ---
 .../libraries/haskell/bktrees/default.nix     |  14 ---
 .../haskell/blank-canvas/default.nix          |  22 ----
 .../haskell/blaze-builder-conduit/default.nix |  17 ---
 .../blaze-builder-enumerator/default.nix      |  17 ---
 .../haskell/blaze-builder/default.nix         |  16 ---
 .../haskell/blaze-from-html/default.nix       |  18 ---
 .../libraries/haskell/blaze-html/default.nix  |  22 ----
 .../haskell/blaze-markup/default.nix          |  22 ----
 .../libraries/haskell/blaze-svg/default.nix   |  17 ---
 .../haskell/blaze-textual/default.nix         |  22 ----
 .../libraries/haskell/bloomfilter/default.nix |  26 -----
 .../libraries/haskell/bmp/default.nix         |  16 ---
 .../libraries/haskell/bool-extras/default.nix |  15 ---
 .../libraries/haskell/boomerang/default.nix   |  15 ---
 .../libraries/haskell/bound/default.nix       |  26 -----
 .../haskell/boundingboxes/default.nix         |  23 ----
 .../libraries/haskell/boxes/default.nix       |  15 ---
 .../libraries/haskell/brainfuck/default.nix   |  17 ---
 .../libraries/haskell/bson/default.nix        |  25 ----
 .../libraries/haskell/bv/default.nix          |  18 ---
 .../libraries/haskell/byteable/default.nix    |  15 ---
 .../libraries/haskell/bytedump/default.nix    |  17 ---
 .../libraries/haskell/byteorder/default.nix   |  15 ---
 .../libraries/haskell/bytes/default.nix       |  21 ----
 .../haskell/bytestring-lexing/default.nix     |  16 ---
 .../haskell/bytestring-mmap/default.nix       |  15 ---
 .../haskell/bytestring-nums/default.nix       |  17 ---
 .../haskell/bytestring-progress/default.nix   |  17 ---
 .../haskell/bytestring-show/default.nix       |  16 ---
 .../haskell/bytestring-trie/default.nix       |  16 ---
 .../libraries/haskell/bzlib/default.nix       |  15 ---
 .../libraries/haskell/cabal-cargs/default.nix |  26 -----
 .../haskell/cabal-file-th/default.nix         |  18 ---
 .../haskell/cabal-lenses/default.nix          |  16 ---
 .../haskell/cabal-macosx/default.nix          |  19 ----
 .../libraries/haskell/cabalg/default.nix      |  19 ----
 .../libraries/haskell/cairo/default.nix       |  21 ----
 .../libraries/haskell/call/default.nix        |  30 -----
 .../libraries/haskell/carray/default.nix      |  15 ---
 .../haskell/case-insensitive/1.0.0.1.nix      |  21 ----
 .../haskell/case-insensitive/1.0.0.2.nix      |  20 ----
 .../haskell/case-insensitive/1.2.0.1.nix      |  19 ----
 .../libraries/haskell/cassava/default.nix     |  26 -----
 .../libraries/haskell/categories/default.nix  |  18 ---
 .../haskell/cautious-file/default.nix         |  16 ---
 .../haskell/cereal-conduit/default.nix        |  17 ---
 .../libraries/haskell/cereal/default.nix      |  14 ---
 .../libraries/haskell/certificate/default.nix |  23 ----
 .../libraries/haskell/cgi/3001.1.7.5.nix      |  17 ---
 .../libraries/haskell/cgi/3001.2.0.0.nix      |  18 ---
 .../libraries/haskell/cgrep/default.nix       |  23 ----
 .../libraries/haskell/charset/default.nix     |  16 ---
 .../haskell/charsetdetect-ae/default.nix      |  16 ---
 .../haskell/chaselev-deque/default.nix        |  25 ----
 .../libraries/haskell/cheapskate/default.nix  |  24 ----
 .../libraries/haskell/checkers/default.nix    |  15 ---
 .../haskell/chell-quickcheck/default.nix      |  16 ---
 .../libraries/haskell/chell/default.nix       |  20 ----
 .../haskell/chunked-data/default.nix          |  21 ----
 .../libraries/haskell/cipher-aes/default.nix  |  22 ----
 .../haskell/cipher-aes128/default.nix         |  18 ---
 .../haskell/cipher-blowfish/default.nix       |  22 ----
 .../haskell/cipher-camellia/default.nix       |  22 ----
 .../libraries/haskell/cipher-des/default.nix  |  22 ----
 .../libraries/haskell/cipher-rc4/default.nix  |  22 ----
 .../haskell/circle-packing/default.nix        |  14 ---
 .../libraries/haskell/citeproc-hs/default.nix |  23 ----
 .../libraries/haskell/clash-lib/default.nix   |  24 ----
 .../haskell/clash-prelude/default.nix         |  16 ---
 .../classy-prelude-conduit/default.nix        |  23 ----
 .../haskell/classy-prelude-yesod/default.nix  |  22 ----
 .../haskell/classy-prelude/default.nix        |  28 -----
 .../libraries/haskell/clay/default.nix        |  18 ---
 .../haskell/clean-unions/default.nix          |  16 ---
 .../haskell/clientsession/default.nix         |  25 ----
 .../libraries/haskell/clock/default.nix       |  15 ---
 .../libraries/haskell/cmdargs/default.nix     |  18 ---
 .../libraries/haskell/cmdlib/default.nix      |  17 ---
 .../libraries/haskell/cmdtheline/default.nix  |  24 ----
 .../haskell/code-builder/default.nix          |  15 ---
 .../haskell/codec-image-devil/default.nix     |  17 ---
 .../haskell/colorize-haskell/default.nix      |  18 ---
 .../libraries/haskell/colors/default.nix      |  17 ---
 .../libraries/haskell/colour/default.nix      |  15 ---
 .../libraries/haskell/command-qq/default.nix  |  18 ---
 .../haskell/comonad-transformers/default.nix  |  18 ---
 .../libraries/haskell/comonad/default.nix     |  22 ----
 .../libraries/haskell/comonads-fd/default.nix |  17 ---
 .../haskell/compact-string-fix/default.nix    |  15 ---
 .../haskell/compdata-param/default.nix        |  20 ----
 .../libraries/haskell/compdata/default.nix    |  25 ----
 .../libraries/haskell/composition/default.nix |  15 ---
 .../libraries/haskell/compressed/default.nix  |  21 ----
 .../haskell/concatenative/default.nix         |  15 ---
 .../haskell/concreteTyperep/default.nix       |  21 ----
 .../haskell/concurrent-extra/default.nix      |  22 ----
 .../haskell/concurrent-supply/default.nix     |  16 ---
 .../libraries/haskell/cond/default.nix        |  15 ---
 .../haskell/conduit-combinators/default.nix   |  31 -----
 .../haskell/conduit-extra/default.nix         |  28 -----
 .../libraries/haskell/conduit/default.nix     |  24 ----
 .../haskell/configurator/default.nix          |  23 ----
 .../libraries/haskell/connection/default.nix  |  21 ----
 .../libraries/haskell/constraints/default.nix |  16 ---
 .../haskell/continued-fractions/default.nix   |  15 ---
 .../haskell/contravariant/default.nix         |  19 ----
 .../haskell/control-bool/default.nix          |  15 ---
 .../haskell/control-monad-free/default.nix    |  16 ---
 .../haskell/control-monad-loop/default.nix    |  16 ---
 .../libraries/haskell/converge/default.nix    |  15 ---
 .../libraries/haskell/convertible/default.nix |  18 ---
 .../libraries/haskell/cookie/default.nix      |  23 ----
 .../haskell/coroutine-object/default.nix      |  20 ----
 .../libraries/haskell/cprng-aes/default.nix   |  16 ---
 .../libraries/haskell/cpu/default.nix         |  17 ---
 .../libraries/haskell/criterion/default.nix   |  32 ------
 .../libraries/haskell/crypto-api/default.nix  |  16 ---
 .../haskell/crypto-cipher-tests/default.nix   |  26 -----
 .../haskell/crypto-cipher-types/default.nix   |  16 ---
 .../haskell/crypto-conduit/default.nix        |  26 -----
 .../haskell/crypto-numbers/default.nix        |  23 ----
 .../haskell/crypto-pubkey-types/default.nix   |  16 ---
 .../haskell/crypto-pubkey/default.nix         |  26 -----
 .../haskell/crypto-random-api/default.nix     |  16 ---
 .../haskell/crypto-random/default.nix         |  16 ---
 .../haskell/cryptocipher/default.nix          |  21 ----
 .../haskell/cryptohash-conduit/default.nix    |  19 ----
 .../haskell/cryptohash-cryptoapi/default.nix  |  16 ---
 .../libraries/haskell/cryptohash/default.nix  |  21 ----
 .../libraries/haskell/css-text/default.nix    |  17 ---
 .../libraries/haskell/csv-conduit/default.nix |  31 -----
 .../libraries/haskell/csv/default.nix         |  15 ---
 .../libraries/haskell/cuda/default.nix        |  44 -------
 .../libraries/haskell/cufft/default.nix       |  18 ---
 .../libraries/haskell/curl/default.nix        |  15 ---
 .../libraries/haskell/daemons/default.nix     |  25 ----
 .../data-accessor/data-accessor-mtl.nix       |  16 ---
 .../data-accessor/data-accessor-template.nix  |  16 ---
 .../data-accessor-transformers.nix            |  16 ---
 .../haskell/data-accessor/data-accessor.nix   |  17 ---
 .../haskell/data-binary-ieee754/default.nix   |  16 ---
 .../haskell/data-checked/default.nix          |  16 ---
 .../haskell/data-default-class/default.nix    |  14 ---
 .../data-default-instances-base/default.nix   |  15 ---
 .../default.nix                               |  15 ---
 .../data-default-instances-dlist/default.nix  |  15 ---
 .../default.nix                               |  15 ---
 .../haskell/data-default/default.nix          |  22 ----
 .../libraries/haskell/data-fin/default.nix    |  22 ----
 .../libraries/haskell/data-fix/default.nix    |  15 ---
 .../libraries/haskell/data-flags/default.nix  |  14 ---
 .../libraries/haskell/data-hash/default.nix   |  17 ---
 .../haskell/data-inttrie/default.nix          |  15 ---
 .../haskell/data-lens-fd/default.nix          |  16 ---
 .../haskell/data-lens-light/default.nix       |  16 ---
 .../haskell/data-lens-template/default.nix    |  16 ---
 .../libraries/haskell/data-lens/default.nix   |  18 ---
 .../haskell/data-memocombinators/default.nix  |  16 ---
 .../haskell/data-ordlist/default.nix          |  14 ---
 .../libraries/haskell/data-pprint/default.nix |  16 ---
 .../libraries/haskell/data-reify/default.nix  |  17 ---
 .../libraries/haskell/dataenc/default.nix     |  18 ---
 .../libraries/haskell/date-cache/default.nix  |  14 ---
 .../libraries/haskell/datetime/default.nix    |  16 ---
 .../haskell/dbmigrations/default.nix          |  24 ----
 .../libraries/haskell/dbus/default.nix        |  28 -----
 .../haskell/deepseq-generics/default.nix      |  17 ---
 .../libraries/haskell/deepseq-th/default.nix  |  18 ---
 .../libraries/haskell/deepseq/1.2.0.1.nix     |  15 ---
 .../libraries/haskell/deepseq/1.3.0.2.nix     |  14 ---
 .../haskell/dependent-map/default.nix         |  16 ---
 .../dependent-sum-template/default.nix        |  16 ---
 .../haskell/dependent-sum/default.nix         |  15 ---
 .../libraries/haskell/derive/default.nix      |  20 ----
 .../libraries/haskell/derp/default.nix        |  14 ---
 .../haskell/diagrams/builder/default.nix      |  26 -----
 .../haskell/diagrams/builder/wrapper.nix      |  52 ---------
 .../libraries/haskell/diagrams/cairo.nix      |  25 ----
 .../libraries/haskell/diagrams/contrib.nix    |  31 -----
 .../libraries/haskell/diagrams/core.nix       |  23 ----
 .../libraries/haskell/diagrams/diagrams.nix   |  20 ----
 .../libraries/haskell/diagrams/gtk.nix        |  16 ---
 .../libraries/haskell/diagrams/lib.nix        |  27 -----
 .../libraries/haskell/diagrams/postscript.nix |  24 ----
 .../libraries/haskell/diagrams/rasterific.nix |  25 ----
 .../libraries/haskell/diagrams/svg.nix        |  25 ----
 .../libraries/haskell/dice/default.nix        |  17 ---
 .../libraries/haskell/diff3/default.nix       |  21 ----
 .../libraries/haskell/digest-pure/default.nix |  16 ---
 .../libraries/haskell/digest/default.nix      |  15 ---
 .../digestive-functors-aeson/default.nix      |  24 ----
 .../digestive-functors-heist/default.nix      |  20 ----
 .../digestive-functors-snap/default.nix       |  17 ---
 .../haskell/digestive-functors/default.nix    |  23 ----
 .../libraries/haskell/digits/default.nix      |  16 ---
 .../haskell/dimensional-tf/default.nix        |  16 ---
 .../libraries/haskell/dimensional/default.nix |  16 ---
 .../haskell/direct-sqlite/default.nix         |  17 ---
 .../haskell/directory-layout/default.nix      |  25 ----
 .../haskell/directory-tree/default.nix        |  17 ---
 .../default.nix                               |  20 ----
 .../distributed-process-p2p/default.nix       |  23 ----
 .../distributed-process-platform/default.nix  |  37 ------
 .../haskell/distributed-process/default.nix   |  23 ----
 .../haskell/distributed-static/default.nix    |  16 ---
 .../haskell/distributive/default.nix          |  19 ----
 .../libraries/haskell/djinn-ghc/default.nix   |  16 ---
 .../libraries/haskell/djinn-lib/default.nix   |  17 ---
 .../libraries/haskell/djinn/default.nix       |  17 ---
 .../haskell/dlist-instances/default.nix       |  16 ---
 .../libraries/haskell/dlist/default.nix       |  17 ---
 .../libraries/haskell/dns/default.nix         |  26 -----
 .../haskell/doctest-prop/default.nix          |  16 ---
 .../libraries/haskell/doctest/default.nix     |  26 -----
 .../haskell/dom-selector/default.nix          |  24 ----
 .../libraries/haskell/dotgen/default.nix      |  16 ---
 .../haskell/double-conversion/default.nix     |  17 ---
 .../haskell/download-curl/default.nix         |  17 ---
 .../libraries/haskell/download/default.nix    |  18 ---
 .../libraries/haskell/dsp/default.nix         |  21 ----
 .../libraries/haskell/dstring/default.nix     |  18 ---
 .../libraries/haskell/dual-tree/default.nix   |  16 ---
 .../haskell/dynamic-cabal/default.nix         |  22 ----
 .../haskell/dynamic-state/default.nix         |  18 ---
 .../libraries/haskell/dyre/default.nix        |  20 ----
 .../libraries/haskell/easy-file/default.nix   |  16 ---
 .../haskell/edit-distance/default.nix         |  18 ---
 .../libraries/haskell/editline/default.nix    |  17 ---
 .../libraries/haskell/either/default.nix      |  23 ----
 .../libraries/haskell/ekg-bosun/default.nix   |  22 ----
 .../libraries/haskell/ekg-carbon/default.nix  |  21 ----
 .../libraries/haskell/ekg-core/default.nix    |  16 ---
 .../libraries/haskell/ekg/default.nix         |  22 ----
 .../libraries/haskell/elerea/default.nix      |  15 ---
 .../libraries/haskell/elevator/default.nix    |  17 ---
 .../haskell/email-validate/default.nix        |  22 ----
 .../haskell/enclosed-exceptions/default.nix   |  24 ----
 .../libraries/haskell/encoding/default.nix    |  19 ----
 .../haskell/engine-io-snap/default.nix        |  21 ----
 .../libraries/haskell/engine-io/default.nix   |  24 ----
 .../libraries/haskell/entropy/default.nix     |  15 ---
 .../libraries/haskell/enumerator/default.nix  |  16 ---
 .../haskell/enummapset-th/default.nix         |  16 ---
 .../libraries/haskell/enummapset/default.nix  |  19 ----
 .../libraries/haskell/enumset/default.nix     |  16 ---
 .../haskell/equational-reasoning/default.nix  |  17 ---
 .../libraries/haskell/equivalence/default.nix |  22 ----
 .../libraries/haskell/erf/default.nix         |  14 ---
 .../haskell/errorcall-eq-instance/default.nix |  15 ---
 .../libraries/haskell/errors/default.nix      |  16 ---
 .../libraries/haskell/esqueleto/default.nix   |  28 -----
 .../libraries/haskell/event-list/default.nix  |  20 ----
 .../libraries/haskell/ex-pool/default.nix     |  19 ----
 .../haskell/exception-mtl/default.nix         |  16 ---
 .../exception-transformers/default.nix        |  21 ----
 .../libraries/haskell/exceptions/default.nix  |  22 ----
 .../haskell/executable-path/default.nix       |  16 ---
 .../libraries/haskell/exhaustive/default.nix  |  16 ---
 .../haskell/explicit-exception/default.nix    |  18 ---
 .../haskell/extensible-effects/default.nix    |  25 ----
 .../haskell/extensible-exceptions/default.nix |  14 ---
 .../libraries/haskell/extra/default.nix       |  18 ---
 .../libraries/haskell/failure/default.nix     |  17 ---
 .../libraries/haskell/fast-logger/default.nix |  16 ---
 .../libraries/haskell/fastcgi/default.nix     |  18 ---
 .../libraries/haskell/fay-base/default.nix    |  18 ---
 .../libraries/haskell/fay-text/default.nix    |  17 ---
 .../libraries/haskell/fay/default.nix         |  31 -----
 .../libraries/haskell/fb/default.nix          |  32 ------
 .../libraries/haskell/fclabels/default.nix    |  16 ---
 .../libraries/haskell/fdo-notify/default.nix  |  16 ---
 .../libraries/haskell/feed/default.nix        |  16 ---
 .../haskell/fgl-visualize/default.nix         |  15 ---
 .../libraries/haskell/fgl/default.nix         |  16 ---
 .../libraries/haskell/file-embed/default.nix  |  17 ---
 .../haskell/file-location/default.nix         |  17 ---
 .../libraries/haskell/filemanip/default.nix   |  17 ---
 .../libraries/haskell/filestore/default.nix   |  20 ----
 .../haskell/filesystem-conduit/default.nix    |  25 ----
 .../libraries/haskell/final/default.nix       |  16 ---
 .../libraries/haskell/fingertree/default.nix  |  20 ----
 .../haskell/fixed-vector/default.nix          |  16 ---
 .../libraries/haskell/fixed/default.nix       |  15 ---
 .../haskell/flexible-defaults/default.nix     |  16 ---
 .../libraries/haskell/fmlist/default.nix      |  14 ---
 .../libraries/haskell/focus/default.nix       |  15 ---
 .../libraries/haskell/foldl/default.nix       |  16 ---
 .../libraries/haskell/folds/default.nix       |  25 ----
 .../haskell/force-layout/default.nix          |  19 ----
 .../libraries/haskell/formatting/default.nix  |  15 ---
 .../libraries/haskell/free-game/default.nix   |  26 -----
 .../libraries/haskell/free/default.nix        |  23 ----
 .../libraries/haskell/freetype2/default.nix   |  16 ---
 .../libraries/haskell/fsnotify/default.nix    |  23 ----
 .../libraries/haskell/ftphs/default.nix       |  20 ----
 .../libraries/haskell/funcmp/default.nix      |  17 ---
 .../haskell/functor-infix/default.nix         |  15 ---
 .../libraries/haskell/fuzzcheck/default.nix   |  21 ----
 .../libraries/haskell/gamma/default.nix       |  16 ---
 .../libraries/haskell/gd/default.nix          |  17 ---
 .../libraries/haskell/gdiff/default.nix       |  15 ---
 .../haskell/generic-aeson/default.nix         |  21 ----
 .../haskell/generic-deriving/default.nix      |  14 ---
 .../haskell/generics-sop/default.nix          |  18 ---
 .../libraries/haskell/geniplate/default.nix   |  15 ---
 .../libraries/haskell/ghc-core/default.nix    |  18 ---
 .../libraries/haskell/ghc-events/default.nix  |  20 ----
 .../haskell/ghc-heap-view/default.nix         |  21 ----
 .../libraries/haskell/ghc-mod/default.nix     |  52 ---------
 .../libraries/haskell/ghc-mtl/default.nix     |  16 ---
 .../libraries/haskell/ghc-parser/default.nix  |  20 ----
 .../libraries/haskell/ghc-paths/default.nix   |  16 ---
 .../haskell/ghc-paths/ghc-paths-nix.patch     |  43 -------
 .../haskell/ghc-syb-utils/default.nix         |  16 ---
 .../libraries/haskell/ghc-syb/default.nix     |  16 ---
 .../libraries/haskell/ghc-vis/default.nix     |  26 -----
 .../haskell/ghcjs-codemirror/default.nix      |  15 ---
 .../libraries/haskell/ghcjs-prim/default.nix  |  12 --
 .../libraries/haskell/gio/default.nix         |  18 ---
 .../libraries/haskell/git-date/default.nix    |  23 ----
 .../libraries/haskell/github/default.nix      |  25 ----
 .../libraries/haskell/gitit/default.nix       |  32 ------
 .../haskell/gitlib-libgit2/default.nix        |  31 -----
 .../libraries/haskell/gitlib-test/default.nix |  22 ----
 .../libraries/haskell/gitlib/default.nix      |  25 ----
 .../libraries/haskell/gl/default.nix          |  18 ---
 .../libraries/haskell/glade/default.nix       |  22 ----
 .../libraries/haskell/glib/default.nix        |  20 ----
 .../haskell/gloss-accelerate/default.nix      |  16 ---
 .../haskell/gloss-banana/default.nix          |  18 ---
 .../gloss-raster-accelerate/default.nix       |  16 ---
 .../haskell/gloss-raster/default.nix          |  18 ---
 .../haskell/gloss-rendering/default.nix       |  15 ---
 .../libraries/haskell/gloss/default.nix       |  16 ---
 .../libraries/haskell/glpk-hs/default.nix     |  16 ---
 .../libraries/haskell/gnuidn/default.nix      |  19 ----
 .../libraries/haskell/gnuplot/default.nix     |  24 ----
 .../libraries/haskell/gnutls/default.nix      |  18 ---
 .../haskell/graph-wrapper/default.nix         |  15 ---
 .../libraries/haskell/graphscc/default.nix    |  15 ---
 .../libraries/haskell/graphviz/default.nix    |  26 -----
 .../libraries/haskell/greencard/default.nix   |  17 ---
 .../libraries/haskell/grid/default.nix        |  22 ----
 .../libraries/haskell/groom/default.nix       |  15 ---
 .../libraries/haskell/groupoids/default.nix   |  17 ---
 .../libraries/haskell/groups/default.nix      |  14 ---
 .../libraries/haskell/gsasl/default.nix       |  17 ---
 .../haskell/gtk-traymanager/default.nix       |  18 ---
 .../libraries/haskell/gtk/default.nix         |  21 ----
 .../haskell/gtk2hs-buildtools/default.nix     |  19 ----
 .../libraries/haskell/gtk3/default.nix        |  23 ----
 .../libraries/haskell/gtkglext/default.nix    |  22 ----
 .../haskell/gtksourceview2/default.nix        |  21 ----
 .../libraries/haskell/hS3/default.nix         |  23 ----
 .../libraries/haskell/hackage-db/default.nix  |  17 ---
 .../libraries/haskell/haddock-api/default.nix |  19 ----
 .../haskell/haddock-library/default.nix       |  17 ---
 .../libraries/haskell/hakyll/default.nix      |  39 -------
 .../libraries/haskell/half/default.nix        |  15 ---
 .../libraries/haskell/hamlet/default.nix      |  17 ---
 .../libraries/haskell/handa-gdata/default.nix |  27 -----
 .../haskell/happstack/happstack-fastcgi.nix   |  17 ---
 .../haskell/happstack/happstack-hamlet.nix    |  18 ---
 .../haskell/happstack/happstack-lite.nix      |  16 ---
 .../haskell/happstack/happstack-server.nix    |  27 -----
 .../haskell/hashable-extras/default.nix       |  22 ----
 .../libraries/haskell/hashable/default.nix    |  23 ----
 .../haskell/hashed-storage/default.nix        |  22 ----
 .../libraries/haskell/hashtables/default.nix  |  20 ----
 .../libraries/haskell/hask/default.nix        |  17 ---
 .../haskell/haskeline-class/default.nix       |  18 ---
 .../libraries/haskell/haskeline/default.nix   |  18 ---
 .../haskell/haskell-generate/default.nix      |  17 ---
 .../haskell/haskell-lexer/default.nix         |  14 ---
 .../libraries/haskell/haskell-mpi/default.nix |  22 ----
 .../haskell/haskell-names/default.nix         |  30 -----
 .../haskell/haskell-packages/default.nix      |  23 ----
 .../haskell/haskell-src-exts/1.15.0.1.nix     |  24 ----
 .../haskell/haskell-src-exts/1.16.0.1.nix     |  23 ----
 .../haskell/haskell-src-meta/default.nix      |  16 ---
 .../libraries/haskell/haskell-src/default.nix |  16 ---
 .../libraries/haskell/haskelldb/default.nix   |  17 ---
 .../libraries/haskell/haskintex/default.nix   |  22 ----
 .../libraries/haskell/haskoin/default.nix     |  29 -----
 .../libraries/haskell/haskore/default.nix     |  23 ----
 .../libraries/haskell/hastache/default.nix    |  21 ----
 .../haskell/haste-compiler/default.nix        |  29 -----
 .../libraries/haskell/haste-perch/default.nix |  18 ---
 .../libraries/haskell/haxl/default.nix        |  22 ----
 .../libraries/haskell/haxr-th/default.nix     |  18 ---
 .../libraries/haskell/haxr/default.nix        |  22 ----
 .../libraries/haskell/hcltest/default.nix     |  27 -----
 .../libraries/haskell/hdaemonize/default.nix  |  17 ---
 .../libraries/haskell/hedis/default.nix       |  24 ----
 .../libraries/haskell/heist/default.nix       |  25 ----
 .../libraries/haskell/here/default.nix        |  17 ---
 .../libraries/haskell/heredoc/default.nix     |  15 ---
 .../libraries/haskell/hex/default.nix         |  14 ---
 .../libraries/haskell/hexpat/default.nix      |  16 ---
 .../libraries/haskell/hflags/default.nix      |  16 ---
 .../libraries/haskell/hfsevents/default.nix   |  16 ---
 .../libraries/haskell/hgal/default.nix        |  16 ---
 .../libraries/haskell/hi/default.nix          |  27 -----
 .../haskell/higher-leveldb/default.nix        |  25 ----
 .../haskell/highlighting-kate/default.nix     |  24 ----
 .../libraries/haskell/hindent/default.nix     |  22 ----
 .../libraries/haskell/hinotify/default.nix    |  15 ---
 .../libraries/haskell/hint/default.nix        |  24 ----
 .../libraries/haskell/hit/default.nix         |  29 -----
 .../libraries/haskell/hjsmin/default.nix      |  28 -----
 .../libraries/haskell/hledger-lib/default.nix |  29 -----
 .../haskell/hledger-web/build-fix.patch       |  47 --------
 .../libraries/haskell/hledger-web/default.nix |  33 ------
 .../libraries/haskell/hledger/default.nix     |  33 ------
 .../libraries/haskell/hlibgit2/default.nix    |  18 ---
 .../libraries/haskell/hmatrix-gsl/default.nix |  17 ---
 .../haskell/hmatrix-special/default.nix       |  17 ---
 .../libraries/haskell/hmatrix/default.nix     |  21 ----
 .../libraries/haskell/hoauth/default.nix      |  22 ----
 .../libraries/haskell/hoauth2/default.nix     |  24 ----
 .../haskell/holy-project/default.nix          |  32 ------
 .../haskell/hoodle-builder/default.nix        |  21 ----
 .../libraries/haskell/hoodle-core/default.nix |  35 ------
 .../haskell/hoodle-extra/default.nix          |  30 -----
 .../haskell/hoodle-parser/default.nix         |  23 ----
 .../haskell/hoodle-render/default.nix         |  24 ----
 .../haskell/hoodle-types/default.nix          |  17 ---
 .../libraries/haskell/hoogle/4.2.34.nix       |  30 -----
 .../libraries/haskell/hoogle/4.2.36.nix       |  30 -----
 .../haskell/hoogle/hoogle-local-wrapper.sh    |   6 -
 .../libraries/haskell/hoogle/local.nix        | 107 ------------------
 .../libraries/haskell/hoopl/default.nix       |  15 ---
 .../libraries/haskell/hopenssl/default.nix    |  18 ---
 .../libraries/haskell/hosc/default.nix        |  24 ----
 .../libraries/haskell/hostname/default.nix    |  14 ---
 .../libraries/haskell/hourglass/default.nix   |  19 ----
 .../libraries/haskell/hp2any-core/default.nix |  16 ---
 .../haskell/hp2any-graph/default.nix          |  23 ----
 .../libraries/haskell/hplayground/default.nix |  22 ----
 .../libraries/haskell/hs-bibutils/default.nix |  16 ---
 .../haskell/hsbencher-fusion/default.nix      |  23 ----
 .../libraries/haskell/hsbencher/default.nix   |  22 ----
 .../libraries/haskell/hsc3-db/default.nix     |  17 ---
 .../libraries/haskell/hsc3-dot/default.nix    |  16 ---
 .../libraries/haskell/hsc3-lang/default.nix   |  23 ----
 .../haskell/hsc3-process/default.nix          |  22 ----
 .../libraries/haskell/hsc3-server/default.nix |  32 ------
 .../libraries/haskell/hsc3/default.nix        |  21 ----
 .../libraries/haskell/hsdns/default.nix       |  18 ---
 .../libraries/haskell/hse-cpp/default.nix     |  16 ---
 .../libraries/haskell/hsemail/default.nix     |  18 ---
 .../libraries/haskell/hsimport/default.nix    |  24 ----
 .../libraries/haskell/hsini/default.nix       |  22 ----
 .../haskell/hslogger-template/default.nix     |  15 ---
 .../libraries/haskell/hslua/default.nix       |  17 ---
 .../haskell/hspec-attoparsec/default.nix      |  17 ---
 .../haskell/hspec-checkers/default.nix        |  16 ---
 .../haskell/hspec-contrib/default.nix         |  17 ---
 .../libraries/haskell/hspec-core/default.nix  |  27 -----
 .../haskell/hspec-discover/default.nix        |  20 ----
 .../hspec-expectations-lens/default.nix       |  17 ---
 .../haskell/hspec-expectations/default.nix    |  18 ---
 .../libraries/haskell/hspec-laws/default.nix  |  17 ---
 .../libraries/haskell/hspec-meta/default.nix  |  25 ----
 .../libraries/haskell/hspec-wai/default.nix   |  24 ----
 .../libraries/haskell/hspec/default.nix       |  23 ----
 .../libraries/haskell/hspec2/default.nix      |  17 ---
 .../libraries/haskell/hspread/default.nix     |  17 ---
 .../haskell/hsshellscript/default.nix         |  17 ---
 .../libraries/haskell/hstatsd/default.nix     |  16 ---
 .../libraries/haskell/hsyslog/default.nix     |  18 ---
 .../haskell/html-conduit/default.nix          |  23 ----
 .../libraries/haskell/html/default.nix        |  14 ---
 .../haskell/http-attoparsec/default.nix       |  17 ---
 .../haskell/http-client-conduit/default.nix   |  17 ---
 .../haskell/http-client-multipart/default.nix |  17 ---
 .../haskell/http-client-tls/default.nix       |  22 ----
 .../libraries/haskell/http-client/default.nix |  32 ------
 .../libraries/haskell/http-common/default.nix |  21 ----
 .../haskell/http-conduit/default.nix          |  31 -----
 .../libraries/haskell/http-date/default.nix   |  16 ---
 .../libraries/haskell/http-kit/default.nix    |  18 ---
 .../haskell/http-reverse-proxy/default.nix    |  30 -----
 .../haskell/http-streams/default.nix          |  35 ------
 .../libraries/haskell/http-types/default.nix  |  22 ----
 .../libraries/haskell/httpd-shed/default.nix  |  18 ---
 .../libraries/haskell/hweblib/default.nix     |  18 ---
 .../haskell/hxt-charproperties/default.nix    |  15 ---
 .../libraries/haskell/hxt-http/default.nix    |  16 ---
 .../haskell/hxt-pickle-utils/default.nix      |  17 ---
 .../haskell/hxt-regex-xmlschema/default.nix   |  17 ---
 .../libraries/haskell/hxt-tagsoup/default.nix |  16 ---
 .../libraries/haskell/hxt-unicode/default.nix |  16 ---
 .../libraries/haskell/hxt-xpath/default.nix   |  16 ---
 .../libraries/haskell/hxt/default.nix         |  23 ----
 .../haskell/hybrid-vectors/default.nix        |  16 ---
 .../libraries/haskell/iCalendar/default.nix   |  22 ----
 .../libraries/haskell/idna/default.nix        |  15 ---
 .../libraries/haskell/ieee754/default.nix     |  15 ---
 .../libraries/haskell/imm/default.nix         |  28 -----
 .../libraries/haskell/implicit/default.nix    |  26 -----
 .../libraries/haskell/indents/default.nix     |  16 ---
 .../haskell/indexed-free/default.nix          |  17 ---
 .../libraries/haskell/indexed/default.nix     |  16 ---
 .../haskell/instant-generics/default.nix      |  16 ---
 .../libraries/haskell/interlude/default.nix   |  15 ---
 .../libraries/haskell/intern/default.nix      |  17 ---
 .../libraries/haskell/interpolate/default.nix |  20 ----
 .../interpolatedstring-perl6/default.nix      |  15 ---
 .../libraries/haskell/intervals/default.nix   |  17 ---
 .../libraries/haskell/io-choice/default.nix   |  20 ----
 .../libraries/haskell/io-memoize/default.nix  |  16 ---
 .../libraries/haskell/io-storage/default.nix  |  15 ---
 .../libraries/haskell/io-streams/default.nix  |  30 -----
 .../libraries/haskell/ipprint/default.nix     |  18 ---
 .../libraries/haskell/iproute/default.nix     |  21 ----
 .../libraries/haskell/irc/default.nix         |  15 ---
 .../libraries/haskell/iteratee/default.nix    |  29 -----
 .../libraries/haskell/ivor/default.nix        |  18 ---
 .../libraries/haskell/ivory/default.nix       |  17 ---
 .../libraries/haskell/ix-shapable/default.nix |  14 ---
 .../libraries/haskell/ixset/default.nix       |  17 ---
 .../libraries/haskell/jack/default.nix        |  24 ----
 .../haskell/jmacro-rpc-happstack/default.nix  |  22 ----
 .../haskell/jmacro-rpc-snap/default.nix       |  17 ---
 .../libraries/haskell/jmacro-rpc/default.nix  |  22 ----
 .../libraries/haskell/jmacro/default.nix      |  24 ----
 .../libraries/haskell/jpeg/default.nix        |  15 ---
 .../libraries/haskell/js-flot/default.nix     |  16 ---
 .../libraries/haskell/js-jquery/default.nix   |  17 ---
 .../haskell/json-assertions/default.nix       |  18 ---
 .../libraries/haskell/json-rpc/default.nix    |  28 -----
 .../libraries/haskell/json-schema/default.nix |  27 -----
 .../libraries/haskell/json/default.nix        |  15 ---
 .../libraries/haskell/jsonTypes/default.nix   |  15 ---
 .../libraries/haskell/jwt/default.nix         |  30 -----
 .../haskell/kan-extensions/default.nix        |  21 ----
 .../haskell/kansas-comet/default.nix          |  21 ----
 .../libraries/haskell/kansas-lava/default.nix |  25 ----
 .../libraries/haskell/keys/default.nix        |  19 ----
 .../libraries/haskell/knob/default.nix        |  16 ---
 .../haskell/labeled-tree/default.nix          |  15 ---
 .../haskell/lambdabot-utils/default.nix       |  22 ----
 .../libraries/haskell/lambdabot/default.nix   |  37 ------
 .../libraries/haskell/lambdabot/deps.patch    |  21 ----
 .../libraries/haskell/lambdabot/wrapper.nix   |  16 ---
 .../haskell/lambdacube-engine/default.nix     |  23 ----
 .../haskell/language-c-inline/default.nix     |  17 ---
 .../haskell/language-c-quote/default.nix      |  27 -----
 .../libraries/haskell/language-c/default.nix  |  17 ---
 .../haskell/language-ecmascript/default.nix   |  29 -----
 .../haskell/language-glsl/default.nix         |  22 ----
 .../language-haskell-extract/default.nix      |  16 ---
 .../haskell/language-java/default.nix         |  24 ----
 .../haskell/language-javascript/default.nix   |  23 ----
 .../libraries/haskell/largeword/default.nix   |  23 ----
 .../libraries/haskell/lattices/default.nix    |  14 ---
 .../haskell/lazysmallcheck/default.nix        |  15 ---
 .../libraries/haskell/lens-aeson/default.nix  |  24 ----
 .../haskell/lens-datetime/default.nix         |  16 ---
 .../haskell/lens-family-core/default.nix      |  15 ---
 .../haskell/lens-family-th/default.nix        |  15 ---
 .../libraries/haskell/lens-family/default.nix |  15 ---
 .../libraries/haskell/lens/default.nix        |  34 ------
 .../libraries/haskell/lenses/default.nix      |  16 ---
 .../haskell/leveldb-haskell/default.nix       |  28 -----
 .../libraries/haskell/libffi/default.nix      |  15 ---
 .../libraries/haskell/libjenkins/default.nix  |  31 -----
 .../haskell/libjenkins/new-conduit.patch      |  23 ----
 .../libraries/haskell/liblastfm/default.nix   |  27 -----
 .../libraries/haskell/libmpd/default.nix      |  24 ----
 .../libraries/haskell/libnotify/default.nix   |  16 ---
 .../haskell/libsystemd-journal/default.nix    |  24 ----
 .../libraries/haskell/libxml-sax/default.nix  |  18 ---
 .../haskell/lifted-async/default.nix          |  21 ----
 .../libraries/haskell/lifted-base/default.nix |  23 ----
 .../libraries/haskell/lin-alg/default.nix     |  15 ---
 .../haskell/linear-opengl/default.nix         |  18 ---
 .../libraries/haskell/linear/default.nix      |  30 -----
 .../haskell/linux-inotify/default.nix         |  16 ---
 .../libraries/haskell/list-t/default.nix      |  21 ----
 .../libraries/haskell/list-tries/default.nix  |  19 ----
 .../libraries/haskell/listExtras/default.nix  |  15 ---
 .../libraries/haskell/lists/default.nix       |  15 ---
 .../haskell/llvm-general-pure/default.nix     |  22 ----
 .../haskell/llvm-general/default.nix          |  26 -----
 .../libraries/haskell/loch-th/default.nix     |  15 ---
 .../haskell/lockfree-queue/default.nix        |  24 ----
 .../libraries/haskell/logfloat/default.nix    |  15 ---
 .../logging-facade-journald/default.nix       |  25 ----
 .../haskell/logging-facade/default.nix        |  19 ----
 .../libraries/haskell/logging/default.nix     |  21 ----
 .../libraries/haskell/logict/default.nix      |  16 ---
 .../libraries/haskell/logsink/default.nix     |  16 ---
 .../libraries/haskell/loop/default.nix        |  16 ---
 .../libraries/haskell/lrucache/default.nix    |  15 ---
 .../libraries/haskell/lushtags/default.nix    |  19 ----
 .../haskell/lzma-conduit/default.nix          |  25 ----
 .../haskell/lzma-enumerator/default.nix       |  25 ----
 .../libraries/haskell/maccatcher/default.nix  |  17 ---
 .../haskell/machines-directory/default.nix    |  16 ---
 .../libraries/haskell/machines-io/default.nix |  16 ---
 .../libraries/haskell/machines/default.nix    |  21 ----
 .../haskell/mainland-pretty/default.nix       |  17 ---
 .../libraries/haskell/managed/default.nix     |  15 ---
 .../libraries/haskell/map-syntax/default.nix  |  21 ----
 .../haskell/markdown-unlit/default.nix        |  18 ---
 .../libraries/haskell/markdown/default.nix    |  27 -----
 .../haskell/markov-chain/default.nix          |  16 ---
 .../haskell/math-functions/default.nix        |  24 ----
 .../libraries/haskell/matrix/default.nix      |  18 ---
 .../libraries/haskell/maude/default.nix       |  16 ---
 .../libraries/haskell/meep/default.nix        |  21 ----
 .../mersenne-random-pure64/default.nix        |  16 ---
 .../haskell/mersenne-random/default.nix       |  15 ---
 .../libraries/haskell/midi/default.nix        |  25 ----
 .../libraries/haskell/mime-mail/default.nix   |  22 ----
 .../libraries/haskell/mime-types/default.nix  |  16 ---
 .../libraries/haskell/mime/default.nix        |  17 ---
 .../libraries/haskell/minimorph/default.nix   |  17 ---
 .../haskell/minioperational/default.nix       |  17 ---
 .../libraries/haskell/miniutter/default.nix   |  19 ----
 .../libraries/haskell/misfortune/default.nix  |  23 ----
 .../haskell/missing-foreign/default.nix       |  14 ---
 .../libraries/haskell/mmap/default.nix        |  16 ---
 .../libraries/haskell/mmorph/default.nix      |  15 ---
 .../haskell/modular-arithmetic/default.nix    |  14 ---
 .../haskell/monad-control/default.nix         |  16 ---
 .../haskell/monad-coroutine/default.nix       |  16 ---
 .../haskell/monad-extras/default.nix          |  19 ----
 .../haskell/monad-journal/default.nix         |  20 ----
 .../haskell/monad-logger/default.nix          |  23 ----
 .../libraries/haskell/monad-loops/default.nix |  15 ---
 .../haskell/monad-par-extras/default.nix      |  18 ---
 .../libraries/haskell/monad-par/0.1.0.3.nix   |  18 ---
 .../libraries/haskell/monad-par/0.3.4.7.nix   |  29 -----
 .../haskell/monad-parallel/default.nix        |  16 ---
 .../libraries/haskell/monad-peel/default.nix  |  18 ---
 .../libraries/haskell/monad-stm/default.nix   |  15 ---
 .../haskell/monad-supply/default.nix          |  15 ---
 .../libraries/haskell/monad-unify/default.nix |  15 ---
 .../libraries/haskell/monadIO/default.nix     |  15 ---
 .../haskell/monadcryptorandom/default.nix     |  16 ---
 .../libraries/haskell/monadlib/default.nix    |  16 ---
 .../libraries/haskell/monadloc-pp/default.nix |  20 ----
 .../libraries/haskell/monadloc/default.nix    |  16 ---
 .../libraries/haskell/monads-tf/default.nix   |  15 ---
 .../libraries/haskell/mongoDB/default.nix     |  22 ----
 .../haskell/mono-traversable/default.nix      |  27 -----
 .../haskell/monoid-extras/default.nix         |  16 ---
 .../haskell/monoid-transformer/default.nix    |  14 ---
 .../libraries/haskell/monomorphic/default.nix |  16 ---
 .../libraries/haskell/mpppc/default.nix       |  16 ---
 .../libraries/haskell/msgpack/default.nix     |  26 -----
 .../libraries/haskell/mtl-prelude/default.nix |  16 ---
 .../libraries/haskell/mtl/2.1.3.1.nix         |  17 ---
 .../libraries/haskell/mtl/2.2.0.1.nix         |  17 ---
 .../libraries/haskell/mtl/2.2.1.nix           |  17 ---
 .../libraries/haskell/mtlparse/default.nix    |  16 ---
 .../libraries/haskell/mueval/default.nix      |  23 ----
 .../libraries/haskell/mueval/wrapper.nix      |  33 ------
 .../libraries/haskell/multiarg/default.nix    |  16 ---
 .../libraries/haskell/multimap/default.nix    |  15 ---
 .../libraries/haskell/multipart/default.nix   |  17 ---
 .../libraries/haskell/multiplate/default.nix  |  17 ---
 .../libraries/haskell/multirec/default.nix    |  15 ---
 .../libraries/haskell/multiset/default.nix    |  14 ---
 .../libraries/haskell/murmur-hash/default.nix |  15 ---
 .../libraries/haskell/mvc-updates/default.nix |  15 ---
 .../libraries/haskell/mvc/default.nix         |  20 ----
 .../libraries/haskell/mwc-random/default.nix  |  23 ----
 .../haskell/mysql-simple/default.nix          |  21 ----
 .../libraries/haskell/mysql/default.nix       |  17 ---
 .../libraries/haskell/nanospec/default.nix    |  16 ---
 .../libraries/haskell/nat/default.nix         |  14 ---
 .../libraries/haskell/nats/default.nix        |  16 ---
 .../libraries/haskell/naturals/default.nix    |  15 ---
 .../libraries/haskell/ncurses/default.nix     |  19 ----
 .../haskell/netlist-to-vhdl/default.nix       |  15 ---
 .../libraries/haskell/netlist/default.nix     |  15 ---
 .../libraries/haskell/netwire/default.nix     |  23 ----
 .../haskell/network-carbon/default.nix        |  18 ---
 .../haskell/network-conduit-tls/default.nix   |  24 ----
 .../haskell/network-conduit/default.nix       |  17 ---
 .../haskell/network-data/default.nix          |  15 ---
 .../haskell/network-fancy/default.nix         |  15 ---
 .../haskell/network-info/default.nix          |  15 ---
 .../haskell/network-metrics/default.nix       |  17 ---
 .../haskell/network-multicast/default.nix     |  15 ---
 .../haskell/network-protocol-xmpp/default.nix |  21 ----
 .../haskell/network-simple/default.nix        |  18 ---
 .../haskell/network-transport-tcp/default.nix |  21 ----
 .../network-transport-tests/default.nix       |  17 ---
 .../haskell/network-transport/default.nix     |  16 ---
 .../libraries/haskell/network-uri/default.nix |  23 ----
 .../libraries/haskell/network/2.2.1.7.nix     |  16 ---
 .../libraries/haskell/network/2.3.0.13.nix    |  19 ----
 .../libraries/haskell/network/2.5.0.0.nix     |  22 ----
 .../libraries/haskell/network/2.6.0.2.nix     |  16 ---
 .../libraries/haskell/newtype/default.nix     |  14 ---
 .../libraries/haskell/non-empty/default.nix   |  16 ---
 .../haskell/non-negative/default.nix          |  17 ---
 .../libraries/haskell/numbers/default.nix     |  18 ---
 .../haskell/numeric-extras/default.nix        |  15 ---
 .../haskell/numeric-prelude/default.nix       |  24 ----
 .../libraries/haskell/numtype-tf/default.nix  |  15 ---
 .../libraries/haskell/numtype/default.nix     |  15 ---
 .../libraries/haskell/objective/default.nix   |  21 ----
 .../libraries/haskell/oeis/default.nix        |  19 ----
 .../libraries/haskell/ofx/default.nix         |  17 ---
 .../haskell/oo-prototypes/default.nix         |  16 ---
 .../libraries/haskell/opaleye/default.nix     |  27 -----
 .../haskell/openssl-streams/default.nix       |  21 ----
 .../libraries/haskell/operational/default.nix |  18 ---
 .../libraries/haskell/opml/default.nix        |  15 ---
 .../libraries/haskell/options/default.nix     |  18 ---
 .../haskell/optparse-applicative/0.10.0.nix   |  18 ---
 .../haskell/optparse-applicative/0.11.0.1.nix |  17 ---
 .../haskell/pandoc-citeproc/default.nix       |  28 -----
 .../haskell/pandoc-types/default.nix          |  16 ---
 .../libraries/haskell/pandoc/default.nix      |  45 --------
 .../libraries/haskell/pango/default.nix       |  21 ----
 .../libraries/haskell/parallel-io/default.nix |  19 ----
 .../libraries/haskell/parallel/3.2.0.3.nix    |  16 ---
 .../libraries/haskell/parallel/3.2.0.5.nix    |  15 ---
 .../libraries/haskell/parseargs/default.nix   |  17 ---
 .../haskell/parsec-extra/default.nix          |  15 ---
 .../libraries/haskell/parsec/default.nix      |  18 ---
 .../libraries/haskell/parsek/default.nix      |  15 ---
 .../libraries/haskell/parsers/default.nix     |  23 ----
 .../libraries/haskell/parsimony/default.nix   |  15 ---
 .../libraries/haskell/path-pieces/default.nix |  16 ---
 .../libraries/haskell/pathtype/default.nix    |  16 ---
 .../libraries/haskell/patience/default.nix    |  14 ---
 .../haskell/pattern-arrows/default.nix        |  16 ---
 .../libraries/haskell/pbkdf/default.nix       |  17 ---
 .../haskell/pcap-enumerator/default.nix       |  16 ---
 .../libraries/haskell/pcap/default.nix        |  17 ---
 .../libraries/haskell/pcre-light/default.nix  |  16 ---
 .../haskell/pdf-toolbox-content/default.nix   |  21 ----
 .../haskell/pdf-toolbox-core/default.nix      |  21 ----
 .../haskell/pdf-toolbox-document/default.nix  |  22 ----
 .../libraries/haskell/pem/default.nix         |  22 ----
 .../libraries/haskell/permutation/default.nix |  16 ---
 .../haskell/persistent-mysql/default.nix      |  21 ----
 .../haskell/persistent-postgresql/default.nix |  23 ----
 .../haskell/persistent-sqlite/default.nix     |  23 ----
 .../haskell/persistent-template/default.nix   |  26 -----
 .../libraries/haskell/persistent/default.nix  |  32 ------
 .../libraries/haskell/pgm/default.nix         |  16 ---
 .../libraries/haskell/pipes-aeson/default.nix |  23 ----
 .../haskell/pipes-attoparsec/default.nix      |  23 ----
 .../haskell/pipes-binary/default.nix          |  26 -----
 .../haskell/pipes-bytestring/default.nix      |  16 ---
 .../haskell/pipes-concurrency/default.nix     |  17 ---
 .../libraries/haskell/pipes-csv/default.nix   |  24 ----
 .../libraries/haskell/pipes-group/default.nix |  15 ---
 .../libraries/haskell/pipes-http/default.nix  |  17 ---
 .../haskell/pipes-network/default.nix         |  20 ----
 .../libraries/haskell/pipes-parse/default.nix |  16 ---
 .../pipes-postgresql-simple/default.nix       |  21 ----
 .../libraries/haskell/pipes-safe/default.nix  |  16 ---
 .../libraries/haskell/pipes-shell/default.nix |  24 ----
 .../libraries/haskell/pipes-text/default.nix  |  23 ----
 .../libraries/haskell/pipes-zlib/default.nix  |  17 ---
 .../libraries/haskell/pipes/default.nix       |  22 ----
 .../haskell/placeholders/default.nix          |  15 ---
 .../libraries/haskell/plugins/default.nix     |  16 ---
 .../libraries/haskell/pointed/default.nix     |  22 ----
 .../libraries/haskell/pointedlist/default.nix |  15 ---
 .../haskell/polynomials-bernstein/default.nix |  16 ---
 .../libraries/haskell/polyparse/default.nix   |  16 ---
 .../haskell/pool-conduit/default.nix          |  20 ----
 .../libraries/haskell/pop3-client/default.nix |  16 ---
 .../libraries/haskell/poppler/default.nix     |  26 -----
 .../libraries/haskell/posix-paths/default.nix |  15 ---
 .../haskell/postgresql-libpq/default.nix      |  16 ---
 .../haskell/postgresql-simple/default.nix     |  26 -----
 .../libraries/haskell/ppm/default.nix         |  16 ---
 .../libraries/haskell/pqueue/default.nix      |  15 ---
 .../haskell/prelude-extras/default.nix        |  15 ---
 .../haskell/prelude-safeenum/default.nix      |  15 ---
 .../haskell/preprocessor-tools/default.nix    |  16 ---
 .../libraries/haskell/presburger/default.nix  |  17 ---
 .../libraries/haskell/present/default.nix     |  15 ---
 .../libraries/haskell/pretty-show/default.nix |  19 ----
 .../libraries/haskell/prettyclass/default.nix |  14 ---
 .../libraries/haskell/primitive/0.5.0.1.nix   |  16 ---
 .../libraries/haskell/primitive/0.5.1.0.nix   |  16 ---
 .../libraries/haskell/primitive/0.5.3.0.nix   |  16 ---
 .../libraries/haskell/primitive/0.5.4.0.nix   |  15 ---
 .../libraries/haskell/probability/default.nix |  16 ---
 .../haskell/process-conduit/default.nix       |  23 ----
 .../haskell/process-extras/default.nix        |  16 ---
 .../libraries/haskell/process/1.2.0.0.nix     |  16 ---
 .../haskell/product-profunctors/default.nix   |  19 ----
 .../libraries/haskell/profunctors/default.nix |  19 ----
 .../haskell/project-template/default.nix      |  26 -----
 .../haskell/prolog-graph-lib/default.nix      |  18 ---
 .../haskell/prolog-graph/default.nix          |  22 ----
 .../libraries/haskell/prolog/default.nix      |  17 ---
 .../libraries/haskell/protobuf/default.nix    |  25 ----
 .../protocol-buffers-descriptor/default.nix   |  16 ---
 .../haskell/protocol-buffers/default.nix      |  16 ---
 .../libraries/haskell/psqueues/default.nix    |  20 ----
 .../haskell/publicsuffixlist/default.nix      |  17 ---
 .../libraries/haskell/punycode/default.nix    |  18 ---
 .../libraries/haskell/pure-cdb/default.nix    |  17 ---
 .../libraries/haskell/pureMD5/default.nix     |  15 ---
 .../libraries/haskell/purescript/default.nix  |  28 -----
 .../haskell/pwstore-fast/default.nix          |  18 ---
 .../libraries/haskell/qrencode/default.nix    |  16 ---
 .../haskell/quickcheck-assertions/default.nix |  18 ---
 .../haskell/quickcheck-instances/default.nix  |  20 ----
 .../haskell/quickcheck-io/default.nix         |  15 ---
 .../quickcheck-property-monad/default.nix     |  17 ---
 .../haskell/quickcheck-unicode/default.nix    |  16 ---
 .../libraries/haskell/random-fu/default.nix   |  21 ----
 .../haskell/random-shuffle/default.nix        |  15 ---
 .../haskell/random-source/default.nix         |  21 ----
 .../libraries/haskell/random/1.0.1.1.nix      |  16 ---
 .../libraries/haskell/random/1.0.1.3.nix      |  16 ---
 .../libraries/haskell/random/1.1.nix          |  15 ---
 .../libraries/haskell/ranges/default.nix      |  14 ---
 .../haskell/rank1dynamic/default.nix          |  16 ---
 .../haskell/rawStringsQq/default.nix          |  15 ---
 .../haskell/reactive-banana-wx/default.nix    |  20 ----
 .../haskell/reactive-banana/default.nix       |  25 ----
 .../libraries/haskell/readline/default.nix    |  21 ----
 .../libraries/haskell/recaptcha/default.nix   |  16 ---
 .../haskell/recursion-schemes/default.nix     |  16 ---
 .../libraries/haskell/reducers/default.nix    |  23 ----
 .../libraries/haskell/reflection/default.nix  |  16 ---
 .../haskell/regex-applicative/default.nix     |  21 ----
 .../libraries/haskell/regex-base/default.nix  |  16 ---
 .../haskell/regex-compat-tdfa/default.nix     |  16 ---
 .../haskell/regex-compat/default.nix          |  16 ---
 .../haskell/regex-pcre-builtin/default.nix    |  16 ---
 .../libraries/haskell/regex-pcre/default.nix  |  17 ---
 .../libraries/haskell/regex-posix/default.nix |  16 ---
 .../haskell/regex-tdfa-rc/default.nix         |  16 ---
 .../haskell/regex-tdfa-text/default.nix       |  15 ---
 .../libraries/haskell/regex-tdfa/default.nix  |  16 ---
 .../libraries/haskell/regexpr/default.nix     |  16 ---
 .../haskell/regular-xmlpickler/default.nix    |  17 ---
 .../libraries/haskell/regular/default.nix     |  14 ---
 .../libraries/haskell/rematch/default.nix     |  16 ---
 .../libraries/haskell/remote/default.nix      |  19 ----
 .../haskell/repa-algorithms/default.nix       |  18 ---
 .../haskell/repa-examples/default.nix         |  24 ----
 .../libraries/haskell/repa-io/default.nix     |  17 ---
 .../libraries/haskell/repa/default.nix        |  16 ---
 .../libraries/haskell/repr/default.nix        |  19 ----
 .../libraries/haskell/reserve/default.nix     |  23 ----
 .../haskell/resource-pool-catchio/default.nix |  21 ----
 .../haskell/resource-pool/default.nix         |  20 ----
 .../libraries/haskell/resourcet/default.nix   |  22 ----
 .../libraries/haskell/rest-client/default.nix |  24 ----
 .../libraries/haskell/rest-core/default.nix   |  27 -----
 .../libraries/haskell/rest-gen/default.nix    |  31 -----
 .../haskell/rest-happstack/default.nix        |  16 ---
 .../libraries/haskell/rest-snap/default.nix   |  22 ----
 .../haskell/rest-stringmap/default.nix        |  22 ----
 .../libraries/haskell/rest-types/default.nix  |  21 ----
 .../libraries/haskell/rest-wai/default.nix    |  22 ----
 .../libraries/haskell/rethinkdb/default.nix   |  25 ----
 .../libraries/haskell/retry/default.nix       |  23 ----
 .../haskell/reverse-apply/default.nix         |  14 ---
 .../libraries/haskell/rex/default.nix         |  16 ---
 .../libraries/haskell/rfc5051/default.nix     |  16 ---
 .../libraries/haskell/robots-txt/default.nix  |  18 ---
 .../libraries/haskell/rope/default.nix        |  18 ---
 .../libraries/haskell/rosezipper/default.nix  |  14 ---
 .../libraries/haskell/rvar/default.nix        |  16 ---
 .../libraries/haskell/safe/default.nix        |  15 ---
 .../libraries/haskell/safecopy/default.nix    |  21 ----
 .../libraries/haskell/saltine/default.nix     |  22 ----
 .../haskell/sample-frame/default.nix          |  18 ---
 .../libraries/haskell/sbv/default.nix         |  23 ----
 .../libraries/haskell/scientific/0.2.0.2.nix  |  22 ----
 .../libraries/haskell/scientific/0.3.3.3.nix  |  24 ----
 .../haskell/scotty-hastache/default.nix       |  20 ----
 .../libraries/haskell/scotty/default.nix      |  26 -----
 .../libraries/haskell/scrypt/default.nix      |  22 ----
 .../libraries/haskell/sdl2/default.nix        |  17 ---
 .../libraries/haskell/securemem/default.nix   |  16 ---
 .../haskell/semigroupoid-extras/default.nix   |  18 ---
 .../haskell/semigroupoids/default.nix         |  20 ----
 .../libraries/haskell/semigroups/default.nix  |  16 ---
 .../libraries/haskell/sendfile/default.nix    |  16 ---
 .../libraries/haskell/serialport/default.nix  |  17 ---
 .../haskell/servant-client/default.nix        |  27 -----
 .../haskell/servant-docs/default.nix          |  23 ----
 .../haskell/servant-jquery/default.nix        |  22 ----
 .../haskell/servant-server/default.nix        |  31 -----
 .../libraries/haskell/servant/default.nix     |  17 ---
 .../libraries/haskell/setenv/default.nix      |  15 ---
 .../libraries/haskell/setlocale/default.nix   |  15 ---
 .../libraries/haskell/shake/default.nix       |  27 -----
 .../haskell/shakespeare-css/default.nix       |  17 ---
 .../haskell/shakespeare-i18n/default.nix      |  17 ---
 .../haskell/shakespeare-js/default.nix        |  17 ---
 .../haskell/shakespeare-text/default.nix      |  17 ---
 .../libraries/haskell/shakespeare/default.nix |  25 ----
 .../haskell/shell-conduit/default.nix         |  25 ----
 .../libraries/haskell/shellish/default.nix    |  16 ---
 .../libraries/haskell/shellmate/default.nix   |  17 ---
 .../libraries/haskell/shelly/default.nix      |  23 ----
 .../libraries/haskell/show/default.nix        |  15 ---
 .../libraries/haskell/silently/default.nix    |  17 ---
 .../haskell/simple-conduit/default.nix        |  26 -----
 .../haskell/simple-reflect/default.nix        |  15 ---
 .../haskell/simple-sendfile/default.nix       |  19 ----
 .../haskell/simple-sql-parser/default.nix     |  21 ----
 .../libraries/haskell/singletons/default.nix  |  22 ----
 .../libraries/haskell/singletons/test.patch   |  12 --
 .../libraries/haskell/sitemap/default.nix     |  16 ---
 .../libraries/haskell/sized-types/default.nix |  20 ----
 .../libraries/haskell/sized/default.nix       |  18 ---
 .../libraries/haskell/skein/default.nix       |  18 ---
 .../libraries/haskell/slack-api/default.nix   |  19 ----
 .../libraries/haskell/smallcheck/default.nix  |  17 ---
 .../libraries/haskell/smtLib/default.nix      |  15 ---
 .../libraries/haskell/smtp-mail/default.nix   |  21 ----
 .../libraries/haskell/smtps-gmail/default.nix |  23 ----
 .../libraries/haskell/snap-blaze/default.nix  |  16 ---
 .../libraries/haskell/snap-cors/default.nix   |  21 ----
 .../haskell/snap-error-collector/default.nix  |  22 ----
 .../haskell/snap-web-routes/default.nix       |  17 ---
 .../libraries/haskell/snap/core.nix           |  27 -----
 .../libraries/haskell/snap/loader-dynamic.nix |  18 ---
 .../libraries/haskell/snap/loader-static.nix  |  15 ---
 .../libraries/haskell/snap/server.nix         |  29 -----
 .../libraries/haskell/snap/snap.nix           |  30 -----
 .../haskell/snaplet-acid-state/default.nix    |  18 ---
 .../snaplet-postgresql-simple/default.nix     |  24 ----
 .../haskell/snaplet-redis/default.nix         |  21 ----
 .../haskell/snaplet-stripe/default.nix        |  23 ----
 .../libraries/haskell/snowball/default.nix    |  23 ----
 .../haskell/socket-activation/default.nix     |  17 ---
 .../libraries/haskell/socket-io/default.nix   |  21 ----
 .../libraries/haskell/socks/default.nix       |  16 ---
 .../libraries/haskell/sodium/default.nix      |  15 ---
 .../libraries/haskell/sourcemap/default.nix   |  19 ----
 .../libraries/haskell/sparse/default.nix      |  30 -----
 .../libraries/haskell/spawn/default.nix       |  14 ---
 .../libraries/haskell/speculation/default.nix |  16 ---
 .../libraries/haskell/split/0.1.4.3.nix       |  16 ---
 .../libraries/haskell/split/0.2.2.nix         |  16 ---
 .../libraries/haskell/spoon/default.nix       |  15 ---
 .../haskell/sqlite-simple/default.nix         |  22 ----
 .../libraries/haskell/srcloc/default.nix      |  15 ---
 .../libraries/haskell/state-plus/default.nix  |  16 ---
 .../libraries/haskell/stateref/default.nix    |  16 ---
 .../libraries/haskell/statestack/default.nix  |  15 ---
 .../libraries/haskell/statistics/default.nix  |  29 -----
 .../libraries/haskell/statvfs/default.nix     |  14 ---
 .../libraries/haskell/stb-image/default.nix   |  16 ---
 .../libraries/haskell/stm-chans/default.nix   |  16 ---
 .../libraries/haskell/stm-conduit/default.nix |  28 -----
 .../haskell/stm-containers/default.nix        |  27 -----
 .../libraries/haskell/stm-delay/default.nix   |  18 ---
 .../libraries/haskell/stm-stats/default.nix   |  15 ---
 .../libraries/haskell/stm/2.4.2.nix           |  15 ---
 .../libraries/haskell/stm/2.4.3.nix           |  14 ---
 .../haskell/storable-complex/default.nix      |  14 ---
 .../haskell/storable-endian/default.nix       |  15 ---
 .../haskell/storable-record/default.nix       |  19 ----
 .../haskell/streaming-commons/default.nix     |  23 ----
 .../libraries/haskell/streamproc/default.nix  |  16 ---
 .../haskell/strict-concurrency/default.nix    |  18 ---
 .../libraries/haskell/strict/default.nix      |  15 ---
 .../haskell/string-combinators/default.nix    |  15 ---
 .../haskell/string-conversions/default.nix    |  15 ---
 .../libraries/haskell/string-qq/default.nix   |  14 ---
 .../libraries/haskell/stringable/default.nix  |  15 ---
 .../haskell/stringbuilder/default.nix         |  15 ---
 .../libraries/haskell/stringprep/default.nix  |  19 ----
 .../haskell/stringsearch/default.nix          |  15 ---
 .../libraries/haskell/stripe/default.nix      |  23 ----
 .../libraries/haskell/strptime/default.nix    |  15 ---
 .../haskell/stylish-haskell/default.nix       |  26 -----
 .../libraries/haskell/svgcairo/default.nix    |  19 ----
 .../libraries/haskell/syb/0.4.0.nix           |  17 ---
 .../libraries/haskell/syb/0.4.2.nix           |  17 ---
 .../syb/syb-with-class-instances-text.nix     |  15 ---
 .../libraries/haskell/syb/syb-with-class.nix  |  14 ---
 .../libraries/haskell/symbol/default.nix      |  17 ---
 .../libraries/haskell/syntactic/default.nix   |  23 ----
 .../haskell/system-argv0/default.nix          |  16 ---
 .../haskell/system-fileio/default.nix         |  20 ----
 .../haskell/system-filepath/default.nix       |  18 ---
 .../haskell/system-posix-redirect/default.nix |  14 ---
 .../haskell/system-time-monotonic/default.nix |  16 ---
 .../libraries/haskell/syz/default.nix         |  16 ---
 .../libraries/haskell/tables/default.nix      |  26 -----
 .../libraries/haskell/tabular/default.nix     |  17 ---
 .../haskell/tagged-transformer/default.nix    |  21 ----
 .../libraries/haskell/tagged/default.nix      |  15 ---
 .../libraries/haskell/taggy-lens/default.nix  |  19 ----
 .../libraries/haskell/taggy/default.nix       |  26 -----
 .../libraries/haskell/tagshare/default.nix    |  15 ---
 .../libraries/haskell/tagsoup/default.nix     |  18 ---
 .../haskell/tagstream-conduit/default.nix     |  23 ----
 .../libraries/haskell/tar/default.nix         |  16 ---
 .../haskell/tasty-ant-xml/default.nix         |  21 ----
 .../haskell/tasty-golden/default.nix          |  23 ----
 .../libraries/haskell/tasty-hspec/default.nix |  22 ----
 .../libraries/haskell/tasty-hunit/default.nix |  17 ---
 .../haskell/tasty-program/default.nix         |  16 ---
 .../haskell/tasty-quickcheck/default.nix      |  18 ---
 .../libraries/haskell/tasty-rerun/default.nix |  22 ----
 .../haskell/tasty-smallcheck/default.nix      |  17 ---
 .../libraries/haskell/tasty-th/default.nix    |  17 ---
 .../libraries/haskell/tasty/default.nix       |  22 ----
 .../libraries/haskell/tcache-AWS/default.nix  |  16 ---
 .../haskell/template-default/default.nix      |  17 ---
 .../libraries/haskell/template/default.nix    |  15 ---
 .../haskell/temporary-rc/default.nix          |  16 ---
 .../libraries/haskell/temporary/default.nix   |  17 ---
 .../haskell/terminal-progress-bar/default.nix |  21 ----
 .../haskell/terminal-size/default.nix         |  14 ---
 .../libraries/haskell/terminfo/default.nix    |  16 ---
 .../haskell/test-framework-hunit/default.nix  |  16 ---
 .../test-framework-quickcheck2/default.nix    |  19 ----
 .../test-framework-smallcheck/default.nix     |  16 ---
 .../test-framework-th-prime/default.nix       |  15 ---
 .../haskell/test-framework-th/default.nix     |  20 ----
 .../haskell/test-framework/default.nix        |  22 ----
 .../libraries/haskell/test-simple/default.nix |  16 ---
 .../haskell/testing-feat/default.nix          |  15 ---
 .../libraries/haskell/texmath/default.nix     |  21 ----
 .../libraries/haskell/text-binary/default.nix |  16 ---
 .../libraries/haskell/text-format/default.nix |  16 ---
 .../libraries/haskell/text-icu/default.nix    |  23 ----
 .../haskell/text-stream-decode/default.nix    |  17 ---
 .../libraries/haskell/text/0.11.2.3.nix       |  24 ----
 .../libraries/haskell/text/1.1.1.3.nix        |  24 ----
 .../libraries/haskell/text/1.2.0.3.nix        |  23 ----
 .../libraries/haskell/tf-random/default.nix   |  15 ---
 .../libraries/haskell/th-desugar/default.nix  |  19 ----
 .../haskell/th-expand-syns/default.nix        |  15 ---
 .../libraries/haskell/th-extras/default.nix   |  16 ---
 .../haskell/th-lift-instances/default.nix     |  18 ---
 .../libraries/haskell/th-lift/default.nix     |  15 ---
 .../libraries/haskell/th-orphans/default.nix  |  16 ---
 .../haskell/th-reify-many/default.nix         |  16 ---
 .../libraries/haskell/these/default.nix       |  22 ----
 .../libraries/haskell/thespian/default.nix    |  16 ---
 .../haskell/thread-local-storage/default.nix  |  16 ---
 .../haskell/threadmanager/default.nix         |  14 ---
 .../libraries/haskell/threads/default.nix     |  23 ----
 .../haskell/threepenny-gui/default.nix        |  30 -----
 .../libraries/haskell/thyme/default.nix       |  28 -----
 .../libraries/haskell/time-compat/default.nix |  16 ---
 .../haskell/time-recurrence/default.nix       |  21 ----
 .../libraries/haskell/time/1.1.2.4.nix        |  16 ---
 .../libraries/haskell/time/1.5.nix            |  22 ----
 .../libraries/haskell/timeparsers/default.nix |  16 ---
 .../libraries/haskell/timerep/default.nix     |  15 ---
 .../haskell/timezone-olson/default.nix        |  17 ---
 .../haskell/timezone-series/default.nix       |  17 ---
 .../libraries/haskell/tls/default.nix         |  32 ------
 .../libraries/haskell/torrent/default.nix     |  15 ---
 .../libraries/haskell/tostring/default.nix    |  16 ---
 .../haskell/transformers-base/default.nix     |  16 ---
 .../haskell/transformers-compat/default.nix   |  17 ---
 .../haskell/transformers-free/default.nix     |  16 ---
 .../haskell/transformers/0.3.0.0.nix          |  15 ---
 .../haskell/transformers/0.4.2.0.nix          |  15 ---
 .../haskell/traverse-with-class/default.nix   |  16 ---
 .../libraries/haskell/tree-view/default.nix   |  15 ---
 .../libraries/haskell/trifecta/default.nix    |  25 ----
 .../libraries/haskell/trivia/default.nix      |  17 ---
 .../libraries/haskell/tuple/default.nix       |  15 ---
 .../haskell/twitter-conduit/default.nix       |  36 ------
 .../haskell/twitter-types-lens/default.nix    |  16 ---
 .../haskell/twitter-types/default.nix         |  25 ----
 .../haskell/type-aligned/default.nix          |  15 ---
 .../libraries/haskell/type-eq/default.nix     |  17 ---
 .../haskell/type-equality/default.nix         |  15 ---
 .../type-level-natural-number/default.nix     |  14 ---
 .../haskell/type-natural/default.nix          |  20 ----
 .../haskell/typography-geometry/default.nix   |  16 ---
 .../libraries/haskell/tz/default.nix          |  24 ----
 .../libraries/haskell/tzdata/default.nix      |  22 ----
 .../haskell/unbound-generics/default.nix      |  19 ----
 .../libraries/haskell/unbound/default.nix     |  16 ---
 .../haskell/unbounded-delays/default.nix      |  15 ---
 .../haskell/unification-fd/default.nix        |  16 ---
 .../libraries/haskell/union-find/default.nix  |  16 ---
 .../libraries/haskell/uniplate/default.nix    |  16 ---
 .../libraries/haskell/unique/default.nix      |  14 ---
 .../libraries/haskell/uniqueid/default.nix    |  17 ---
 .../libraries/haskell/units/default.nix       |  24 ----
 .../haskell/unix-bytestring/default.nix       |  15 ---
 .../libraries/haskell/unix-compat/default.nix |  15 ---
 .../libraries/haskell/unix-memory/default.nix |  16 ---
 .../haskell/unix-process-conduit/default.nix  |  19 ----
 .../libraries/haskell/unix-time/default.nix   |  16 ---
 .../libraries/haskell/unlambda/default.nix    |  18 ---
 .../haskell/unordered-containers/default.nix  |  23 ----
 .../libraries/haskell/uri-encode/default.nix  |  19 ----
 .../libraries/haskell/uri/default.nix         |  16 ---
 .../libraries/haskell/url/default.nix         |  16 ---
 .../libraries/haskell/urlencoded/default.nix  |  19 ----
 .../libraries/haskell/usb/default.nix         |  17 ---
 .../libraries/haskell/utf8-light/default.nix  |  14 ---
 .../libraries/haskell/utf8-string/default.nix |  20 ----
 .../libraries/haskell/utility-ht/default.nix  |  15 ---
 .../haskell/uu-interleaved/default.nix        |  15 ---
 .../libraries/haskell/uu-options/default.nix  |  20 ----
 .../haskell/uu-parsinglib/default.nix         |  16 ---
 .../libraries/haskell/uuid/default.nix        |  27 -----
 .../libraries/haskell/uulib/default.nix       |  15 ---
 .../haskell/vacuum-cairo/default.nix          |  20 ----
 .../haskell/vacuum-graphviz/default.nix       |  16 ---
 .../libraries/haskell/vacuum/default.nix      |  16 ---
 .../libraries/haskell/vado/default.nix        |  19 ----
 .../libraries/haskell/validation/default.nix  |  21 ----
 .../libraries/haskell/vault/default.nix       |  17 ---
 .../haskell/vcs-revision/default.nix          |  14 ---
 .../libraries/haskell/vcsgui/default.nix      |  18 ---
 .../libraries/haskell/vcswrapper/default.nix  |  19 ----
 .../libraries/haskell/vect/default.nix        |  16 ---
 .../haskell/vector-algorithms/default.nix     |  19 ----
 .../vector-binary-instances/default.nix       |  16 ---
 .../libraries/haskell/vector-fftw/default.nix |  17 ---
 .../haskell/vector-instances/default.nix      |  19 ----
 .../haskell/vector-space-points/default.nix   |  15 ---
 .../haskell/vector-space/default.nix          |  15 ---
 .../haskell/vector-th-unbox/default.nix       |  16 ---
 .../libraries/haskell/vector/0.10.12.2.nix    |  23 ----
 .../libraries/haskell/vector/0.10.9.3.nix     |  18 ---
 .../libraries/haskell/vinyl/default.nix       |  15 ---
 .../haskell/vk-aws-route53/default.nix        |  19 ----
 .../haskell/vk-posix-pty/default.nix          |  17 ---
 .../libraries/haskell/void/default.nix        |  16 ---
 .../libraries/haskell/vty-ui/default.nix      |  24 ----
 .../libraries/haskell/vty/default.nix         |  34 ------
 .../haskell/wai-app-static/default.nix        |  33 ------
 .../libraries/haskell/wai-conduit/default.nix |  16 ---
 .../libraries/haskell/wai-extra/default.nix   |  31 -----
 .../haskell/wai-handler-fastcgi/default.nix   |  17 ---
 .../haskell/wai-handler-launch/default.nix    |  19 ----
 .../libraries/haskell/wai-logger/default.nix  |  22 ----
 .../haskell/wai-middleware-static/default.nix |  17 ---
 .../libraries/haskell/wai-test/default.nix    |  17 ---
 .../libraries/haskell/wai-util/default.nix    |  22 ----
 .../haskell/wai-websockets/default.nix        |  24 ----
 .../libraries/haskell/wai/default.nix         |  17 ---
 .../libraries/haskell/warp-tls/default.nix    |  20 ----
 .../libraries/haskell/warp/default.nix        |  30 -----
 .../libraries/haskell/wcwidth/default.nix     |  19 ----
 .../haskell/web-routes-boomerang/default.nix  |  16 ---
 .../haskell/web-routes-happstack/default.nix  |  15 ---
 .../libraries/haskell/web-routes/default.nix  |  25 ----
 .../libraries/haskell/webdriver/default.nix   |  29 -----
 .../libraries/haskell/webkit/default.nix      |  20 ----
 .../libraries/haskell/webkitgtk3/default.nix  |  20 ----
 .../haskell/websockets-snap/default.nix       |  17 ---
 .../libraries/haskell/websockets/default.nix  |  30 -----
 .../libraries/haskell/wizards/default.nix     |  15 ---
 .../haskell/wl-pprint-extras/default.nix      |  19 ----
 .../haskell/wl-pprint-terminfo/default.nix    |  21 ----
 .../haskell/wl-pprint-text/default.nix        |  16 ---
 .../libraries/haskell/wl-pprint/default.nix   |  14 ---
 .../libraries/haskell/word-trie/default.nix   |  18 ---
 .../libraries/haskell/word8/default.nix       |  15 ---
 .../libraries/haskell/wordexp/default.nix     |  16 ---
 .../libraries/haskell/wreq/default.nix        |  38 -------
 .../haskell/wxHaskell/no-ldconfig.patch       |  10 --
 .../libraries/haskell/wxHaskell/wx.nix        |  17 ---
 .../libraries/haskell/wxHaskell/wxc.nix       |  23 ----
 .../libraries/haskell/wxHaskell/wxcore.nix    |  20 ----
 .../libraries/haskell/wxHaskell/wxdirect.nix  |  19 ----
 .../libraries/haskell/x509-store/default.nix  |  20 ----
 .../libraries/haskell/x509-system/default.nix |  16 ---
 .../haskell/x509-validation/default.nix       |  23 ----
 .../libraries/haskell/x509/default.nix        |  25 ----
 .../libraries/haskell/xdg-basedir/default.nix |  16 ---
 .../libraries/haskell/xdot/default.nix        |  18 ---
 .../libraries/haskell/xhtml/default.nix       |  15 ---
 .../libraries/haskell/xlsx/default.nix        |  28 -----
 .../haskell/xml-conduit-writer/default.nix    |  17 ---
 .../libraries/haskell/xml-conduit/default.nix |  27 -----
 .../libraries/haskell/xml-hamlet/default.nix  |  17 ---
 .../haskell/xml-html-conduit-lens/default.nix |  22 ----
 .../libraries/haskell/xml-lens/default.nix    |  17 ---
 .../libraries/haskell/xml-types/default.nix   |  16 ---
 .../libraries/haskell/xml/default.nix         |  16 ---
 .../libraries/haskell/xmlgen/default.nix      |  18 ---
 .../libraries/haskell/xmlhtml/default.nix     |  19 ----
 .../haskell/xmonad-screenshot/default.nix     |  16 ---
 .../libraries/haskell/xorshift/default.nix    |  15 ---
 .../haskell/xournal-parser/default.nix        |  24 ----
 .../haskell/xournal-types/default.nix         |  17 ---
 .../haskell/xss-sanitize/default.nix          |  23 ----
 .../libraries/haskell/xtest/default.nix       |  16 ---
 .../libraries/haskell/yaml-light/default.nix  |  16 ---
 .../libraries/haskell/yaml/default.nix        |  28 -----
 .../libraries/haskell/yap/default.nix         |  15 ---
 .../haskell/yesod-auth-hashdb/default.nix     |  23 ----
 .../libraries/haskell/yesod-auth/default.nix  |  31 -----
 .../libraries/haskell/yesod-bin/default.nix   |  33 ------
 .../libraries/haskell/yesod-core/default.nix  |  39 -------
 .../haskell/yesod-default/default.nix         |  16 ---
 .../libraries/haskell/yesod-form/default.nix  |  26 -----
 .../libraries/haskell/yesod-json/default.nix  |  16 ---
 .../haskell/yesod-markdown/default.nix        |  21 ----
 .../haskell/yesod-newsfeed/default.nix        |  20 ----
 .../haskell/yesod-pagination/default.nix      |  24 ----
 .../haskell/yesod-persistent/default.nix      |  26 -----
 .../haskell/yesod-routes/default.nix          |  17 ---
 .../haskell/yesod-static/default.nix          |  37 ------
 .../libraries/haskell/yesod-test/default.nix  |  29 -----
 .../libraries/haskell/yesod/default.nix       |  26 -----
 .../haskell/yi-fuzzy-open/default.nix         |  22 ----
 .../libraries/haskell/yi-language/default.nix |  28 -----
 .../libraries/haskell/yi-monokai/default.nix  |  17 ---
 .../libraries/haskell/yi-rope/default.nix     |  21 ----
 .../libraries/haskell/yi-snippet/default.nix  |  17 ---
 .../libraries/haskell/yst/default.nix         |  25 ----
 .../haskell/zeromq-haskell/default.nix        |  21 ----
 .../haskell/zeromq3-haskell/default.nix       |  26 -----
 .../haskell/zeromq4-haskell/default.nix       |  22 ----
 .../libraries/haskell/zip-archive/0.2.2.1.nix |  21 ----
 .../libraries/haskell/zip-archive/0.2.3.5.nix |  20 ----
 .../libraries/haskell/zipper/default.nix      |  16 ---
 .../libraries/haskell/zippers/default.nix     |  17 ---
 .../haskell/zlib-bindings/default.nix         |  17 ---
 .../haskell/zlib-conduit/default.nix          |  17 ---
 .../libraries/haskell/zlib-enum/default.nix   |  18 ---
 .../libraries/haskell/zlib/default.nix        |  15 ---
 1429 files changed, 27600 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/AC-Vector/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/AES/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/BlogLiterately/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Boolean/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/BoundedChan/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/CC-delcont/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/Chart-cairo/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Chart-diagrams/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Chart-gtk/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Chart/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ChasingBottoms/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ConfigFile/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/CouchDB/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Crypto/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/DAV/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/DRBG/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Decimal/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Diff/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/EitherT/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Extra-lib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/FerryCore/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/FontyFruity/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/GLFW-b/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/GLFW/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/GLURaw/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/GLUT/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/GLUtil/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/GenericPretty/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Glob/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/GlomeVec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Graphalyze/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
 delete mode 100644 pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
 delete mode 100644 pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
 delete mode 100644 pkgs/development/libraries/haskell/HDBC/HDBC.nix
 delete mode 100644 pkgs/development/libraries/haskell/HFuse/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HList/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HPDF/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HSH/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HStringTemplate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HTF/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HTTP/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HUnit-approx/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HUnit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HaTeX/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HaXml/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HandsomeSoup/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HaskellForMaths/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HaskellNet/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HsOpenSSL/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/HsSyck/0.51.nix
 delete mode 100644 pkgs/development/libraries/haskell/HsSyck/0.52.nix
 delete mode 100644 pkgs/development/libraries/haskell/IORefCAS/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/IOSpec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/IfElse/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/IntervalMap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/JuicyPixels/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/List/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ListLike/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ListZipper/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/MFlow/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/MaybeT/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/MemoTrie/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/MissingH/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/MonadPrompt/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/NumInstances/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ObjectName/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/OneTuple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/OpenAL/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/OpenGL/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/OpenGLRaw/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/PSQueue/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/RSA/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Ranged-sets/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Rasterific/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ReadArgs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/RefSerialize/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/RepLib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SDL-image/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SDL-mixer/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SDL-ttf/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SDL/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SHA/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SHA2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SMTPClient/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/STMonadTrans/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SVGFonts/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/SafeSemaphore/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Shellac/Shellac.nix
 delete mode 100644 pkgs/development/libraries/haskell/StateVar/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Stream/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/TCache/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/TableAlgebra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Tensor/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Thrift/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/TypeCompose/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Unixutils/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Vec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/WAVE/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Workflow/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/X11-xft/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/X11/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Yampa/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/abstract-deque-tests/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/abstract-deque/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/abstract-par/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/accelerate-cuda/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/accelerate-examples/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/accelerate-fft/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/accelerate-io/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/accelerate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/acid-state/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/active/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ad/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/adjunctions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/aeson-pretty/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/aeson-qq/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/aeson-utils/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
 delete mode 100644 pkgs/development/libraries/haskell/aeson/0.8.0.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/algebra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/alsa-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/alsa-mixer/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/alsa-pcm/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/amqp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ansi-terminal/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/appar/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/applicative-quoters/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ariadne/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/arithmoi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/arrows/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/asn1-data/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/asn1-encoding/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/asn1-parse/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/asn1-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/assert-failure/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/async/2.0.1.4.nix
 delete mode 100644 pkgs/development/libraries/haskell/async/2.0.1.6.nix
 delete mode 100644 pkgs/development/libraries/haskell/atomic-primops/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/attempt/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/atto-lisp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/attoparsec-binary/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/authenticate-oauth/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/authenticate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/auto-update/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/aws-ec2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/aws/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/base-compat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/base-prelude/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/base16-bytestring/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/base32-bytestring/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/base64-bytestring/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/base64-string/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/basic-prelude/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/benchpress/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bencode/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bencoding/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bert/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bifunctors/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bimap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/binary-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/binary-shared/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/binary-strict/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/binary/0.7.2.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/bindings-DSL/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bindings-GLFW/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bindings-libusb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bindings-portaudio/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bindings-posix/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bitarray/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bitmap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bits-atomic/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bits-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bitset/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bktrees/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blank-canvas/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blaze-builder/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blaze-from-html/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blaze-html/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blaze-markup/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blaze-svg/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/blaze-textual/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bloomfilter/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bmp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bool-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/boomerang/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bound/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/boundingboxes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/boxes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/brainfuck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bson/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bv/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/byteable/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bytedump/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/byteorder/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bytes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bytestring-lexing/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bytestring-mmap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bytestring-nums/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bytestring-progress/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bytestring-show/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bytestring-trie/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/bzlib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cabal-cargs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cabal-file-th/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cabal-lenses/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cabal-macosx/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cabalg/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cairo/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/call/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/carray/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/cassava/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/categories/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cautious-file/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cereal-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cereal/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/certificate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix
 delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/cgrep/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/charset/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/charsetdetect-ae/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/chaselev-deque/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cheapskate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/checkers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/chell-quickcheck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/chell/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/chunked-data/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cipher-aes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cipher-aes128/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cipher-blowfish/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cipher-camellia/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cipher-des/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cipher-rc4/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/circle-packing/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/citeproc-hs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/clash-lib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/clash-prelude/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/classy-prelude/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/clay/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/clean-unions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/clientsession/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/clock/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cmdargs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cmdlib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cmdtheline/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/code-builder/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/codec-image-devil/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/colorize-haskell/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/colors/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/colour/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/command-qq/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/comonad-transformers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/comonad/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/comonads-fd/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/compact-string-fix/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/compdata-param/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/compdata/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/composition/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/compressed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/concatenative/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/concreteTyperep/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/concurrent-extra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/concurrent-supply/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cond/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/conduit-combinators/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/conduit-extra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/configurator/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/connection/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/constraints/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/continued-fractions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/contravariant/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/control-bool/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/control-monad-free/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/control-monad-loop/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/converge/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/convertible/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cookie/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/coroutine-object/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cprng-aes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cpu/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/criterion/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-api/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-numbers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-pubkey/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-random-api/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/crypto-random/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cryptocipher/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cryptohash/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/css-text/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/csv-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/csv/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cuda/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/cufft/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/curl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/daemons/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-checked/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-default-class/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-default-instances-base/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-default/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-fin/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-fix/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-flags/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-hash/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-inttrie/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-lens-fd/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-lens-light/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-lens-template/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-lens/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-memocombinators/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-ordlist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-pprint/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-reify/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dataenc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/date-cache/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/datetime/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dbmigrations/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dbus/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/deepseq-generics/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/deepseq-th/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/dependent-map/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dependent-sum-template/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dependent-sum/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/derive/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/derp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/builder/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/cairo.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/contrib.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/core.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/diagrams.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/gtk.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/lib.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/postscript.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/rasterific.nix
 delete mode 100644 pkgs/development/libraries/haskell/diagrams/svg.nix
 delete mode 100644 pkgs/development/libraries/haskell/dice/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/diff3/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/digest-pure/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/digest/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/digestive-functors/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/digits/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dimensional-tf/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dimensional/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/direct-sqlite/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/directory-layout/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/directory-tree/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/distributed-process-platform/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/distributed-process/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/distributed-static/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/distributive/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/djinn-ghc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/djinn-lib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/djinn/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dlist-instances/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dlist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dns/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/doctest-prop/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/doctest/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dom-selector/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dotgen/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/double-conversion/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/download-curl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/download/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dsp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dstring/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dual-tree/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dynamic-cabal/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dynamic-state/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/dyre/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/easy-file/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/edit-distance/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/editline/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/either/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ekg-bosun/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ekg-carbon/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ekg-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ekg/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/elerea/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/elevator/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/email-validate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/encoding/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/engine-io-snap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/engine-io/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/entropy/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/enumerator/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/enummapset-th/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/enummapset/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/enumset/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/equational-reasoning/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/equivalence/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/erf/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/errors/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/esqueleto/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/event-list/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ex-pool/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/exception-mtl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/exception-transformers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/exceptions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/executable-path/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/exhaustive/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/explicit-exception/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/extensible-effects/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/extra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/failure/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fast-logger/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fastcgi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fay-base/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fay-text/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fay/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fclabels/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fdo-notify/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/feed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fgl-visualize/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fgl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/file-embed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/file-location/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/filemanip/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/filestore/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/filesystem-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/final/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fingertree/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fixed-vector/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fixed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/flexible-defaults/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fmlist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/focus/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/foldl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/folds/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/force-layout/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/formatting/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/free-game/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/free/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/freetype2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fsnotify/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ftphs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/funcmp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/functor-infix/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/fuzzcheck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gamma/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gd/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gdiff/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/generic-aeson/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/generic-deriving/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/generics-sop/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/geniplate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-events/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-heap-view/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-mod/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-mtl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-parser/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-paths/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch
 delete mode 100644 pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-syb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghc-vis/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ghcjs-prim/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gio/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/git-date/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/github/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gitit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gitlib-test/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gitlib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/glade/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/glib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gloss-accelerate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gloss-banana/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gloss-raster/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gloss-rendering/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gloss/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/glpk-hs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gnuidn/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gnuplot/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gnutls/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/graph-wrapper/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/graphscc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/graphviz/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/greencard/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/grid/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/groom/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/groupoids/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/groups/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gsasl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gtk-traymanager/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gtk/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gtk3/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gtkglext/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/gtksourceview2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hS3/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hackage-db/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haddock-api/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haddock-library/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hakyll/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/half/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hamlet/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/handa-gdata/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix
 delete mode 100644 pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
 delete mode 100644 pkgs/development/libraries/haskell/happstack/happstack-lite.nix
 delete mode 100644 pkgs/development/libraries/haskell/happstack/happstack-server.nix
 delete mode 100644 pkgs/development/libraries/haskell/hashable-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hashable/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hashed-storage/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hashtables/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hask/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskeline-class/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskeline/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-generate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-lexer/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-mpi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-names/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-packages/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-src-meta/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskell-src/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskelldb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskintex/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskoin/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haskore/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hastache/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haste-compiler/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haste-perch/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haxl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haxr-th/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/haxr/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hcltest/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hdaemonize/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hedis/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/heist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/here/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/heredoc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hex/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hexpat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hflags/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hfsevents/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hgal/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/higher-leveldb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/highlighting-kate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hindent/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hinotify/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hint/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hjsmin/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hledger-lib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hledger-web/build-fix.patch
 delete mode 100644 pkgs/development/libraries/haskell/hledger-web/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hledger/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hlibgit2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hmatrix-gsl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hmatrix-special/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hmatrix/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoauth/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoauth2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/holy-project/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoodle-builder/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoodle-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoodle-extra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoodle-parser/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoodle-render/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoodle-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoogle/4.2.34.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoogle/4.2.36.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
 delete mode 100644 pkgs/development/libraries/haskell/hoogle/local.nix
 delete mode 100644 pkgs/development/libraries/haskell/hoopl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hopenssl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hosc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hostname/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hourglass/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hp2any-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hp2any-graph/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hplayground/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hs-bibutils/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsbencher-fusion/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsbencher/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsc3-db/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsc3-dot/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsc3-lang/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsc3-process/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsc3-server/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsc3/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsdns/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hse-cpp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsemail/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsimport/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsini/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hslogger-template/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hslua/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-attoparsec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-checkers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-contrib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-discover/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-expectations/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-laws/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-meta/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec-wai/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspec2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hspread/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsshellscript/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hstatsd/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hsyslog/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/html-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/html/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-attoparsec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-client-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-client-multipart/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-client-tls/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-client/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-common/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-date/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-kit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-streams/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/http-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/httpd-shed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hweblib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hxt-charproperties/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hxt-http/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hxt-tagsoup/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hxt-unicode/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hxt-xpath/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hxt/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/hybrid-vectors/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/iCalendar/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/idna/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ieee754/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/imm/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/implicit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/indents/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/indexed-free/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/indexed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/instant-generics/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/interlude/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/intern/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/interpolate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/intervals/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/io-choice/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/io-memoize/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/io-storage/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/io-streams/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ipprint/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/iproute/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/irc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/iteratee/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ivor/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ivory/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ix-shapable/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ixset/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jack/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jmacro-rpc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jmacro/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jpeg/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/js-flot/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/js-jquery/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/json-assertions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/json-rpc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/json-schema/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/json/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jsonTypes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jwt/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/kan-extensions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/kansas-comet/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/kansas-lava/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/keys/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/knob/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/labeled-tree/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lambdabot-utils/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lambdabot/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lambdabot/deps.patch
 delete mode 100644 pkgs/development/libraries/haskell/lambdabot/wrapper.nix
 delete mode 100644 pkgs/development/libraries/haskell/lambdacube-engine/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/language-c-inline/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/language-c-quote/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/language-c/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/language-ecmascript/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/language-glsl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/language-haskell-extract/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/language-java/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/language-javascript/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/largeword/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lattices/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lazysmallcheck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lens-aeson/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lens-datetime/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lens-family-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lens-family-th/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lens-family/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lens/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lenses/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/leveldb-haskell/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/libffi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/libjenkins/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/libjenkins/new-conduit.patch
 delete mode 100644 pkgs/development/libraries/haskell/liblastfm/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/libmpd/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/libnotify/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/libsystemd-journal/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/libxml-sax/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lifted-async/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lifted-base/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lin-alg/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/linear-opengl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/linear/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/linux-inotify/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/list-t/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/list-tries/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/listExtras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lists/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/llvm-general-pure/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/llvm-general/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/loch-th/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lockfree-queue/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/logfloat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/logging-facade-journald/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/logging-facade/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/logging/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/logict/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/logsink/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/loop/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lrucache/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lushtags/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lzma-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/lzma-enumerator/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/maccatcher/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/machines-directory/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/machines-io/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/machines/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mainland-pretty/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/managed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/map-syntax/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/markdown-unlit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/markdown/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/markov-chain/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/math-functions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/matrix/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/maude/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/meep/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mersenne-random/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/midi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mime-mail/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mime-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mime/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/minimorph/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/minioperational/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/miniutter/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/misfortune/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/missing-foreign/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mmap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mmorph/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/modular-arithmetic/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-control/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-coroutine/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-journal/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-logger/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-loops/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-par-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-parallel/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-peel/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-stm/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-supply/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-unify/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monadIO/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monadcryptorandom/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monadlib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monadloc-pp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monadloc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monads-tf/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mongoDB/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mono-traversable/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monoid-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monoid-transformer/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monomorphic/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mpppc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/msgpack/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mtl-prelude/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/mtl/2.2.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/mtl/2.2.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/mtlparse/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mueval/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mueval/wrapper.nix
 delete mode 100644 pkgs/development/libraries/haskell/multiarg/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/multimap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/multipart/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/multiplate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/multirec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/multiset/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/murmur-hash/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mvc-updates/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mvc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mwc-random/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mysql-simple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/mysql/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/nanospec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/nat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/nats/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/naturals/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ncurses/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/netlist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/netwire/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-carbon/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-conduit-tls/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-data/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-fancy/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-info/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-metrics/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-multicast/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-simple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-transport-tcp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-transport-tests/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-transport/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network-uri/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/network/2.2.1.7.nix
 delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.13.nix
 delete mode 100644 pkgs/development/libraries/haskell/network/2.5.0.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/network/2.6.0.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/newtype/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/non-empty/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/non-negative/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/numbers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/numeric-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/numeric-prelude/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/numtype-tf/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/numtype/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/objective/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/oeis/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ofx/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/oo-prototypes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/opaleye/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/openssl-streams/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/operational/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/opml/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/options/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pandoc-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pandoc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pango/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/parallel-io/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/parallel/3.2.0.5.nix
 delete mode 100644 pkgs/development/libraries/haskell/parseargs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/parsec-extra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/parsec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/parsek/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/parsers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/parsimony/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/path-pieces/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pathtype/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/patience/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pattern-arrows/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pbkdf/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pcap-enumerator/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pcap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pcre-light/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pem/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/permutation/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/persistent-mysql/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/persistent-postgresql/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/persistent-sqlite/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/persistent-template/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/persistent/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pgm/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-aeson/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-binary/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-bytestring/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-concurrency/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-csv/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-group/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-http/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-network/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-parse/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-safe/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-shell/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-text/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes-zlib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pipes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/placeholders/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/plugins/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pointed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pointedlist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/polynomials-bernstein/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/polyparse/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pool-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pop3-client/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/poppler/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/posix-paths/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/postgresql-libpq/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/postgresql-simple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/ppm/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pqueue/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/prelude-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/prelude-safeenum/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/preprocessor-tools/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/presburger/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/present/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pretty-show/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/prettyclass/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/primitive/0.5.1.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/primitive/0.5.4.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/probability/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/process-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/process-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/process/1.2.0.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/product-profunctors/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/profunctors/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/project-template/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/prolog-graph/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/prolog/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/protobuf/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/protocol-buffers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/psqueues/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/publicsuffixlist/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/punycode/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pure-cdb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pureMD5/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/purescript/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pwstore-fast/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/qrencode/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/quickcheck-assertions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/quickcheck-instances/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/quickcheck-io/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/quickcheck-unicode/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/random-fu/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/random-shuffle/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/random-source/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/random/1.0.1.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/random/1.0.1.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/random/1.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/ranges/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rank1dynamic/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rawStringsQq/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/reactive-banana/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/readline/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/recaptcha/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/recursion-schemes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/reducers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/reflection/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-applicative/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-base/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-compat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-pcre/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-posix/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-tdfa-text/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regex-tdfa/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regexpr/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/regular/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rematch/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/remote/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/repa-algorithms/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/repa-examples/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/repa-io/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/repa/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/repr/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/reserve/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/resource-pool/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/resourcet/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rest-client/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rest-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rest-gen/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rest-happstack/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rest-snap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rest-stringmap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rest-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rest-wai/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rethinkdb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/retry/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/reverse-apply/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rex/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rfc5051/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/robots-txt/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rope/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rosezipper/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/rvar/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/safe/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/safecopy/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/saltine/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sample-frame/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sbv/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/scientific/0.2.0.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/scientific/0.3.3.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/scotty-hastache/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/scotty/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/scrypt/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sdl2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/securemem/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/semigroupoids/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/semigroups/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sendfile/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/serialport/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/servant-client/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/servant-docs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/servant-jquery/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/servant-server/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/servant/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/setenv/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/setlocale/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shake/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shakespeare-css/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shakespeare-js/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shakespeare-text/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shakespeare/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shell-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shellish/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shellmate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/shelly/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/show/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/silently/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/simple-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/simple-reflect/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/simple-sendfile/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/simple-sql-parser/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/singletons/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/singletons/test.patch
 delete mode 100644 pkgs/development/libraries/haskell/sitemap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sized-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sized/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/skein/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/slack-api/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/smallcheck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/smtLib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/smtp-mail/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/smtps-gmail/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap-blaze/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap-cors/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap-error-collector/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap-web-routes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap/core.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap/loader-dynamic.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap/loader-static.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap/server.nix
 delete mode 100644 pkgs/development/libraries/haskell/snap/snap.nix
 delete mode 100644 pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snaplet-redis/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snaplet-stripe/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/snowball/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/socket-activation/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/socket-io/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/socks/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sodium/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sourcemap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sparse/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/spawn/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/speculation/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/split/0.1.4.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/split/0.2.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/spoon/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/sqlite-simple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/srcloc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/state-plus/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stateref/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/statestack/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/statistics/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/statvfs/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stb-image/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stm-chans/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stm-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stm-containers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stm-delay/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stm-stats/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stm/2.4.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/stm/2.4.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/storable-complex/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/storable-endian/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/storable-record/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/streaming-commons/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/streamproc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/strict-concurrency/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/strict/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/string-combinators/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/string-conversions/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/string-qq/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stringable/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stringbuilder/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stringprep/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stringsearch/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stripe/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/strptime/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/stylish-haskell/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/svgcairo/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/syb/0.4.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/syb/0.4.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
 delete mode 100644 pkgs/development/libraries/haskell/syb/syb-with-class.nix
 delete mode 100644 pkgs/development/libraries/haskell/symbol/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/syntactic/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/system-argv0/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/system-fileio/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/system-filepath/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/system-posix-redirect/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/system-time-monotonic/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/syz/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tables/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tabular/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tagged-transformer/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tagged/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/taggy-lens/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/taggy/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tagshare/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tagsoup/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tagstream-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tar/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-golden/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-hspec/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-hunit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-program/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-rerun/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty-th/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tasty/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tcache-AWS/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/template-default/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/template/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/temporary-rc/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/temporary/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/terminal-progress-bar/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/terminal-size/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/terminfo/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/test-framework-hunit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/test-framework-th/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/test-framework/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/test-simple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/testing-feat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/texmath/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/text-binary/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/text-format/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/text-icu/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/text-stream-decode/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/text/0.11.2.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/text/1.1.1.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/text/1.2.0.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/tf-random/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/th-desugar/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/th-expand-syns/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/th-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/th-lift-instances/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/th-lift/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/th-orphans/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/th-reify-many/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/these/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/thespian/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/thread-local-storage/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/threadmanager/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/threads/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/threepenny-gui/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/thyme/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/time-compat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/time-recurrence/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/time/1.1.2.4.nix
 delete mode 100644 pkgs/development/libraries/haskell/time/1.5.nix
 delete mode 100644 pkgs/development/libraries/haskell/timeparsers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/timerep/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/timezone-olson/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/timezone-series/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tls/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/torrent/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tostring/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/transformers-base/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/transformers-compat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/transformers-free/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/transformers/0.4.2.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/traverse-with-class/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tree-view/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/trifecta/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/trivia/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tuple/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/twitter-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/twitter-types-lens/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/twitter-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/type-aligned/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/type-eq/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/type-equality/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/type-level-natural-number/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/type-natural/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/typography-geometry/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tz/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tzdata/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unbound-generics/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unbound/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unbounded-delays/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unification-fd/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/union-find/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uniplate/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unique/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uniqueid/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/units/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unix-bytestring/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unix-compat/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unix-memory/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unix-process-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unix-time/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unlambda/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/unordered-containers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uri-encode/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uri/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/url/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/urlencoded/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/usb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/utf8-light/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/utf8-string/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/utility-ht/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uu-interleaved/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uu-options/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uu-parsinglib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uuid/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/uulib/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vacuum-cairo/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vacuum/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vado/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/validation/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vault/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vcs-revision/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vcsgui/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vcswrapper/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vect/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector-algorithms/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector-binary-instances/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector-fftw/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector-instances/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector-space-points/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector-space/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector-th-unbox/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector/0.10.12.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/vector/0.10.9.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/vinyl/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vk-aws-route53/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vk-posix-pty/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/void/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vty-ui/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/vty/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-app-static/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-extra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-handler-launch/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-logger/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-middleware-static/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-test/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-util/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai-websockets/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wai/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/warp-tls/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/warp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wcwidth/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/web-routes-happstack/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/web-routes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/webdriver/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/webkit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/webkitgtk3/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/websockets-snap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/websockets/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wizards/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wl-pprint-text/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wl-pprint/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/word-trie/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/word8/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wordexp/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wreq/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch
 delete mode 100644 pkgs/development/libraries/haskell/wxHaskell/wx.nix
 delete mode 100644 pkgs/development/libraries/haskell/wxHaskell/wxc.nix
 delete mode 100644 pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
 delete mode 100644 pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
 delete mode 100644 pkgs/development/libraries/haskell/x509-store/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/x509-system/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/x509-validation/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/x509/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xdg-basedir/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xdot/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xhtml/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xlsx/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xml-conduit-writer/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xml-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xml-hamlet/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xml-lens/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xml-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xml/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xmlgen/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xmlhtml/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xmonad-screenshot/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xorshift/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xournal-parser/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xournal-types/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xss-sanitize/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xtest/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yaml-light/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yaml/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yap/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-auth/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-bin/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-core/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-default/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-form/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-json/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-markdown/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-newsfeed/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-pagination/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-persistent/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-routes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-static/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod-test/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yesod/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yi-language/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yi-monokai/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yi-rope/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yi-snippet/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/yst/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zeromq-haskell/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix
 delete mode 100644 pkgs/development/libraries/haskell/zipper/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zippers/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zlib-bindings/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zlib-conduit/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zlib-enum/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zlib/default.nix

diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix
deleted file mode 100644
index 6693daef619b..000000000000
--- a/pkgs/development/libraries/haskell/AC-Vector/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "AC-Vector";
-  version = "2.3.2";
-  sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
-  meta = {
-    description = "Efficient geometric vectors and transformations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/AES/default.nix b/pkgs/development/libraries/haskell/AES/default.nix
deleted file mode 100644
index 263f2a5d5826..000000000000
--- a/pkgs/development/libraries/haskell/AES/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, monadsTf, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "AES";
-  version = "0.2.9";
-  sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc";
-  buildDepends = [ cereal monadsTf random transformers ];
-  meta = {
-    description = "Fast AES encryption/decryption for bytestrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix
deleted file mode 100644
index 5cb9fa07138a..000000000000
--- a/pkgs/development/libraries/haskell/BlogLiterately/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, boolExtras, cmdargs, dataDefault, filepath
-, HaXml, haxr, highlightingKate, hscolour, lens, mtl, pandoc
-, pandocCiteproc, pandocTypes, parsec, split, strict, temporary
-, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "BlogLiterately";
-  version = "0.7.1.7";
-  sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeHtml boolExtras cmdargs dataDefault filepath HaXml haxr
-    highlightingKate hscolour lens mtl pandoc pandocCiteproc
-    pandocTypes parsec split strict temporary transformers utf8String
-  ];
-  meta = {
-    homepage = "http://byorgey.wordpress.com/blogliterately/";
-    description = "A tool for posting Haskelly articles to blogs";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
deleted file mode 100644
index 137171b77500..000000000000
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Boolean";
-  version = "0.2.3";
-  sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn";
-  meta = {
-    description = "Generalized booleans and numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix
deleted file mode 100644
index 1f4af9d6f713..000000000000
--- a/pkgs/development/libraries/haskell/BoundedChan/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "BoundedChan";
-  version = "1.0.3.0";
-  sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k";
-  meta = {
-    description = "Implementation of bounded channels";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/CC-delcont/default.nix b/pkgs/development/libraries/haskell/CC-delcont/default.nix
deleted file mode 100644
index 459c338b80d2..000000000000
--- a/pkgs/development/libraries/haskell/CC-delcont/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "CC-delcont";
-  version = "0.2";
-  sha256 = "0bl71vj1ypzplx92kz27hhbpnwnxkz5g2q86m4fcmjmp4fym8kc1";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://code.haskell.org/~dolio/CC-delcont";
-    description = "Delimited continuations and dynamically scoped variables";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
deleted file mode 100644
index 7f8b0631fc6c..000000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.16.0.3";
-  sha256 = "11lzqgdjaix8n7nabmafl3jf9gisb04c025cmdycfihfajfn49zg";
-  buildDepends = [ filepath ];
-  testDepends = [
-    extensibleExceptions filepath HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
deleted file mode 100644
index 27673beb1a07..000000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck
-, regexPosix, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.18.1.3";
-  sha256 = "1m1m6f00sc4w0s5hnqy2z05rnaihaw1jy03bidc5pl6r1llkdi15";
-  buildDepends = [ deepseq filepath time ];
-  testDepends = [
-    extensibleExceptions filepath HUnit QuickCheck regexPosix
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
deleted file mode 100644
index 83e8f075f075..000000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck
-, regexPosix, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.20.0.3";
-  sha256 = "0vq1xcwvvk74jkzp7386ldyrls8qszg3rj4l37fyq3fvjkqnx80v";
-  buildDepends = [ deepseq filepath time ];
-  testDepends = [
-    extensibleExceptions filepath HUnit QuickCheck regexPosix
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix b/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix
deleted file mode 100644
index 659a493bc185..000000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, extensibleExceptions, filepath, HUnit
-, QuickCheck, regexPosix, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.22.0.0";
-  sha256 = "13984rli87vzhl5pvpny2cns8dq4k2s5bgmr8n93iw9hrx5w3j48";
-  buildDepends = [ binary deepseq filepath time ];
-  testDepends = [
-    binary extensibleExceptions filepath HUnit QuickCheck regexPosix
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
deleted file mode 100644
index c01793881adc..000000000000
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, Chart, colour, dataDefaultClass, lens, mtl
-, operational, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Chart-cairo";
-  version = "1.3.2";
-  sha256 = "19ghd5xav7pn3z5igbkbsa81vhlpvy55xscc42vbxx1v9f6shq7g";
-  buildDepends = [
-    cairo Chart colour dataDefaultClass lens mtl operational time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/timbod7/haskell-chart/wiki";
-    description = "Cairo backend for Charts";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
deleted file mode 100644
index d6b17ec320f9..000000000000
--- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeSvg, Chart, colour, dataDefaultClass, diagramsCore
-, diagramsLib, diagramsPostscript, diagramsSvg, lens, mtl
-, operational, SVGFonts, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Chart-diagrams";
-  version = "1.3.2";
-  sha256 = "0q5qvzzl5wirlj26a6zpnyq95lpzzkwiqq0mkh25aa3qzzbg4y6g";
-  buildDepends = [
-    blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
-    diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
-    time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/timbod7/haskell-chart/wiki";
-    description = "Diagrams backend for Charts";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
deleted file mode 100644
index 6d55bedb24f5..000000000000
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, Chart, ChartCairo, colour, dataDefaultClass, gtk
-, mtl, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Chart-gtk";
-  version = "1.3.2";
-  sha256 = "175bqh5pl4z0gx50z34afg149g94qw8sk87gbp9mavh5bnpj5a07";
-  buildDepends = [
-    cairo Chart ChartCairo colour dataDefaultClass gtk mtl time
-  ];
-  meta = {
-    homepage = "https://github.com/timbod7/haskell-chart/wiki";
-    description = "Utility functions for using the chart library with GTK";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
deleted file mode 100644
index c41fa5a5a5d3..000000000000
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, colour, dataDefaultClass, lens, mtl, operational, time }:
-
-cabal.mkDerivation (self: {
-  pname = "Chart";
-  version = "1.3.2";
-  sha256 = "0y4xkqdmbyyaxf810dgz0zsfmywlx07c26s9wkk155iriz0yz4m9";
-  buildDepends = [
-    colour dataDefaultClass lens mtl operational time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/timbod7/haskell-chart/wiki";
-    description = "A library for generating 2D Charts and Plots";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
deleted file mode 100644
index 829af010da78..000000000000
--- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, random, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "ChasingBottoms";
-  version = "1.3.0.8";
-  sha256 = "1f6jg4j17s3y7hcz9gp7cffa77p57xgzv15ng5ypcxpq603721dv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl QuickCheck random syb ];
-  jailbreak = true;
-  meta = {
-    description = "For testing partial and infinite values";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
deleted file mode 100644
index a2923dc19dd0..000000000000
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, MissingH, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "ConfigFile";
-  version = "1.1.4";
-  sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ MissingH mtl parsec ];
-  meta = {
-    homepage = "http://software.complete.org/configfile";
-    description = "Configuration file reading & writing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
deleted file mode 100644
index 18f095cd8b16..000000000000
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP, HUnit, json, mtl, network, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "CouchDB";
-  version = "1.2";
-  sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
-  buildDepends = [ HTTP json mtl network utf8String ];
-  testDepends = [ HTTP HUnit json mtl network utf8String ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/arjunguha/haskell-couchdb/";
-    description = "CouchDB interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
deleted file mode 100644
index d9a494fe94e6..000000000000
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, random }:
-
-cabal.mkDerivation (self: {
-  pname = "Crypto";
-  version = "4.2.5.1";
-  sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ HUnit QuickCheck random ];
-  meta = {
-    description = "Collects together existing Haskell cryptographic functions into a package";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
deleted file mode 100644
index b361ae045fbf..000000000000
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, dataDefault, either, errors, exceptions
-, httpClient, httpClientTls, httpTypes, lens, mtl, network
-, networkUri, optparseApplicative, transformers, transformersBase
-, utf8String, xmlConduit, xmlHamlet
-}:
-
-cabal.mkDerivation (self: {
-  pname = "DAV";
-  version = "1.0.3";
-  sha256 = "1wrs3rdk4sarzi4w1pma8h751mjw5x1l8c6w30wv7fg0rmk2cayd";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    caseInsensitive dataDefault either errors exceptions httpClient
-    httpClientTls httpTypes lens mtl network networkUri
-    optparseApplicative transformers transformersBase utf8String
-    xmlConduit xmlHamlet
-  ];
-  meta = {
-    homepage = "http://floss.scru.org/hDAV";
-    description = "RFC 4918 WebDAV support";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix
deleted file mode 100644
index 741368799d14..000000000000
--- a/pkgs/development/libraries/haskell/DRBG/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cipherAes128, cryptoApi, cryptohashCryptoapi
-, entropy, mtl, parallel, prettyclass, tagged
-}:
-
-cabal.mkDerivation (self: {
-  pname = "DRBG";
-  version = "0.5.3";
-  sha256 = "197kp2bchkj3zrl3f06glba9lbjf51mp710sx0qj8i4spvf3jfr8";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cereal cipherAes128 cryptoApi cryptohashCryptoapi entropy mtl
-    parallel prettyclass tagged
-  ];
-  meta = {
-    description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Decimal/default.nix b/pkgs/development/libraries/haskell/Decimal/default.nix
deleted file mode 100644
index 03ae15a24d14..000000000000
--- a/pkgs/development/libraries/haskell/Decimal/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Decimal";
-  version = "0.4.2";
-  sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/PaulJohnson/Haskell-Decimal";
-    description = "Decimal numbers with variable precision";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix
deleted file mode 100644
index 478cb6d657ab..000000000000
--- a/pkgs/development/libraries/haskell/Diff/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Diff";
-  version = "0.3.0";
-  sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98";
-  meta = {
-    description = "O(ND) diff algorithm in haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/EitherT/default.nix b/pkgs/development/libraries/haskell/EitherT/default.nix
deleted file mode 100644
index 234675605309..000000000000
--- a/pkgs/development/libraries/haskell/EitherT/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadControl, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "EitherT";
-  version = "0.2.0";
-  sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw";
-  buildDepends = [ monadControl transformers transformersBase ];
-  meta = {
-    description = "EitherT monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Extra-lib/default.nix b/pkgs/development/libraries/haskell/Extra-lib/default.nix
deleted file mode 100644
index d244700e58a1..000000000000
--- a/pkgs/development/libraries/haskell/Extra-lib/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bzlib, filepath, HUnit, mtl, networkUri, pureMD5
-, QuickCheck, random, regexCompat, time, Unixutils, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Extra";
-  version = "1.46.3";
-  sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh";
-  buildDepends = [
-    bzlib filepath HUnit mtl networkUri pureMD5 QuickCheck random
-    regexCompat time Unixutils zlib
-  ];
-  meta = {
-    homepage = "https://github.com/ddssff/haskell-extra";
-    description = "A grab bag of modules";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix
deleted file mode 100644
index 6f0405807fb7..000000000000
--- a/pkgs/development/libraries/haskell/FerryCore/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HaXml, mtl, parsec, TableAlgebra }:
-
-cabal.mkDerivation (self: {
-  pname = "FerryCore";
-  version = "0.4.6.4";
-  sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp";
-  buildDepends = [ HaXml mtl parsec TableAlgebra ];
-  meta = {
-    description = "Ferry Core Components";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix
deleted file mode 100644
index 325ed34c5d6f..000000000000
--- a/pkgs/development/libraries/haskell/FontyFruity/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, filepath, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "FontyFruity";
-  version = "0.4";
-  sha256 = "0nrlsiwav1mwbmp555vwnc24250yn166yr5fjazjg9g7a0ikkivf";
-  buildDepends = [ binary deepseq filepath text vector ];
-  meta = {
-    description = "A true type file format loader";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLFW-b/default.nix b/pkgs/development/libraries/haskell/GLFW-b/default.nix
deleted file mode 100644
index f3bdfebbe675..000000000000
--- a/pkgs/development/libraries/haskell/GLFW-b/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsGLFW, HUnit, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "GLFW-b";
-  version = "1.4.6";
-  sha256 = "1d9vacb9nsf5cqqwxhn49wsfbhmw1263kgimk5qxpqpg1jiy35hy";
-  buildDepends = [ bindingsGLFW ];
-  testDepends = [
-    bindingsGLFW HUnit testFramework testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    description = "Bindings to GLFW OpenGL library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix
deleted file mode 100644
index fb554c95dfca..000000000000
--- a/pkgs/development/libraries/haskell/GLFW/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "GLFW";
-  version = "0.5.2.2";
-  sha256 = "0yqvfkg9p5h5bv3ak6b89am9kan9lbcq26kg1wk53xl6mz1aaijf";
-  buildDepends = [ OpenGL ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/GLFW";
-    description = "A Haskell binding for GLFW";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
deleted file mode 100644
index d389d7ecf046..000000000000
--- a/pkgs/development/libraries/haskell/GLURaw/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, mesa, OpenGLRaw }:
-
-cabal.mkDerivation (self: {
-  pname = "GLURaw";
-  version = "1.4.0.1";
-  sha256 = "1k0f1vbbrsfc7jb4qbif4w4q87lsis5gvq7jd2n8zzslxd5n8mcn";
-  buildDepends = [ OpenGLRaw ];
-  extraLibraries = [ freeglut mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A raw binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUT/default.nix b/pkgs/development/libraries/haskell/GLUT/default.nix
deleted file mode 100644
index b2cce8565240..000000000000
--- a/pkgs/development/libraries/haskell/GLUT/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
-, OpenGLRaw
-}:
-
-cabal.mkDerivation (self: {
-  pname = "GLUT";
-  version = "2.5.1.1";
-  sha256 = "0n9dkdjmpnbcjg0ll0ny7mw21xwwix0gxy0hq6yagmgaakhpg0aa";
-  buildDepends = [ OpenGL OpenGLRaw ];
-  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL Utility Toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix
deleted file mode 100644
index 0b7910a7e0f4..000000000000
--- a/pkgs/development/libraries/haskell/GLUtil/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, filepath, JuicyPixels, linear, OpenGL, OpenGLRaw
-, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "GLUtil";
-  version = "0.8.2";
-  sha256 = "0z8fi4fd0jrywg595cc67w8pqcn7pgy651hxb4zkqb3400n4jak3";
-  buildDepends = [
-    cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers
-    vector
-  ];
-  buildTools = [ cpphs ];
-  meta = {
-    description = "Miscellaneous OpenGL utilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GenericPretty/default.nix b/pkgs/development/libraries/haskell/GenericPretty/default.nix
deleted file mode 100644
index d2b8fedfc5e8..000000000000
--- a/pkgs/development/libraries/haskell/GenericPretty/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "GenericPretty";
-  version = "1.2.1";
-  sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
-  meta = {
-    homepage = "https://github.com/RazvanRanca/GenericPretty";
-    description = "A generic, derivable, haskell pretty printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix
deleted file mode 100644
index 565f213c42ba..000000000000
--- a/pkgs/development/libraries/haskell/Glob/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, filepath, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "Glob";
-  version = "0.7.5";
-  sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0";
-  buildDepends = [ dlist filepath transformers ];
-  meta = {
-    homepage = "http://iki.fi/matti.niemenmaa/glob/";
-    description = "Globbing library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
deleted file mode 100644
index 0223d6c6ae5c..000000000000
--- a/pkgs/development/libraries/haskell/GlomeVec/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, llvm }:
-
-cabal.mkDerivation (self: {
-  pname = "GlomeVec";
-  version = "0.2";
-  sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
-  buildTools = [ llvm ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Glome";
-    description = "Simple 3D vector library";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
deleted file mode 100644
index 8e42eaa01d01..000000000000
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bktrees, fgl, filepath, graphviz, pandoc, random, text
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Graphalyze";
-  version = "0.14.1.0";
-  sha256 = "0pyrhpl06lsppr8ch21crinkax7fh0k18wfvgjinc8phkk6j5hz3";
-  buildDepends = [
-    bktrees fgl filepath graphviz pandoc random text time
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Graph-Theoretic Analysis library";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
deleted file mode 100644
index 9622ea5d0dc6..000000000000
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HDBC, mtl, odbc, time, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HDBC-odbc";
-  version = "2.4.0.0";
-  sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ HDBC mtl time utf8String ];
-  extraLibraries = [ odbc ];
-  noHaddock = true;
-  meta = {
-    homepage = "https://github.com/hdbc/hdbc-odbc";
-    description = "ODBC driver for HDBC";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
deleted file mode 100644
index 6b0df7e9d852..000000000000
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, convertible, HDBC, mtl, parsec, postgresql, time
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HDBC-postgresql";
-  version = "2.3.2.2";
-  sha256 = "0x42lf429dxjkz22jn5fybimlixxs20zq01ap40344qlwh01hd90";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ convertible HDBC mtl parsec time utf8String ];
-  extraLibraries = [ postgresql ];
-  meta = {
-    homepage = "http://github.com/hdbc/hdbc-postgresql";
-    description = "PostgreSQL driver for HDBC";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
deleted file mode 100644
index 563cc38dac3a..000000000000
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HDBC, mtl, sqlite, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HDBC-sqlite3";
-  version = "2.3.3.0";
-  sha256 = "11765nsncgyv9j6r5wpziqyhy0lxrmqbhgricbdx0c788ky75y92";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ HDBC mtl utf8String ];
-  extraLibraries = [ sqlite ];
-  meta = {
-    homepage = "http://software.complete.org/hdbc-sqlite3";
-    description = "Sqlite v3 driver for HDBC";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
deleted file mode 100644
index fb8358854621..000000000000
--- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, convertible, mtl, text, time, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HDBC";
-  version = "2.4.0.0";
-  sha256 = "1zwkrr0pbgxi2y75n2sjr3xs8xa3pxbmnqg3phqkjqcz3j4gcq6y";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ convertible mtl text time utf8String ];
-  meta = {
-    homepage = "https://github.com/hdbc/hdbc";
-    description = "Haskell Database Connectivity";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
deleted file mode 100644
index 05caf6975ac3..000000000000
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fuse }:
-
-cabal.mkDerivation (self: {
-  pname = "HFuse";
-  version = "0.2.4.4";
-  sha256 = "1wsrf9y90dk27da9pm9m11hnrxwrqwvq6c9799b91a91mc2lxslc";
-  isLibrary = true;
-  isExecutable = true;
-  extraLibraries = [ fuse ];
-  preConfigure = ''
-    sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
-  '';
-  meta = {
-    homepage = "https://github.com/m15k/hfuse";
-    description = "HFuse is a binding for the Linux FUSE library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
deleted file mode 100644
index d2c88291fc2d..000000000000
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, diffutils, doctest, filepath, hspec, lens, mtl
-, syb, tagged
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HList";
-  version = "0.3.4.1";
-  sha256 = "02hw496qv2p0nnbz7lq7jfqnis19qqjsylyvdksqbwmjprk32rh2";
-  buildDepends = [ mtl tagged ];
-  testDepends = [ cmdargs doctest filepath hspec lens mtl syb ];
-  buildTools = [ diffutils ];
-  doCheck = false;
-  meta = {
-    description = "Heterogeneous lists";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HPDF/default.nix b/pkgs/development/libraries/haskell/HPDF/default.nix
deleted file mode 100644
index d34e590e9e69..000000000000
--- a/pkgs/development/libraries/haskell/HPDF/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl, random, vector, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "HPDF";
-  version = "1.4.6";
-  sha256 = "15v1mf58fqa25higf52jqlf3fw2fbggfm5v8a8v00zz6q0f3lzn9";
-  buildDepends = [ binary mtl random vector zlib ];
-  meta = {
-    homepage = "http://www.alpheccar.org";
-    description = "Generation of PDF documents";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
deleted file mode 100644
index 01c0595e900a..000000000000
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
-, regexPosix
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HSH";
-  version = "2.1.2";
-  sha256 = "17ysn131xskx4s1g5kg08zy141q3q16bns4bsg3yjzvf6cjpz2kq";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    filepath hslogger MissingH mtl regexBase regexCompat regexPosix
-  ];
-  meta = {
-    homepage = "http://software.complete.org/hsh";
-    description = "Library to mix shell scripting with Haskell programs";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
deleted file mode 100644
index 23fd31b2b3d9..000000000000
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text
-, time, utf8String, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HStringTemplate";
-  version = "0.7.3";
-  sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8";
-  buildDepends = [
-    blazeBuilder deepseq filepath mtl parsec syb text time utf8String
-    void
-  ];
-  meta = {
-    description = "StringTemplate implementation in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
deleted file mode 100644
index cc27d4cf2ae9..000000000000
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, base64Bytestring, cpphs, Diff
-, filepath, haskellLexer, haskellSrc, HUnit, liftedBase
-, monadControl, mtl, QuickCheck, random, regexCompat, temporary
-, text, time, unorderedContainers, vector, xmlgen
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTF";
-  version = "0.12.2.3";
-  sha256 = "0g5z2ypn6i7wpz1439c6qjmi8lw2b86zaljkgwchjn8r8gvw4mbm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson base64Bytestring cpphs Diff haskellLexer haskellSrc HUnit
-    liftedBase monadControl mtl QuickCheck random regexCompat text time
-    vector xmlgen
-  ];
-  testDepends = [
-    aeson aesonPretty filepath HUnit mtl random regexCompat temporary
-    text unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/skogsbaer/HTF/";
-    description = "The Haskell Test Framework";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/default.nix b/pkgs/development/libraries/haskell/HTTP/default.nix
deleted file mode 100644
index 0a5a16dfadc3..000000000000
--- a/pkgs/development/libraries/haskell/HTTP/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed
-, httpTypes, HUnit, mtl, network, networkUri, parsec, pureMD5
-, split, testFramework, testFrameworkHunit, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.18";
-  sha256 = "1jn0ikbdwhd32qjwpnsmpnmy0dxhmwfhf8851ifxik91fn7j5j4k";
-  buildDepends = [ mtl network networkUri parsec ];
-  testDepends = [
-    caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes
-    HUnit mtl network networkUri pureMD5 split testFramework
-    testFrameworkHunit wai warp
-  ];
-  doCheck = false;
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HUnit-approx/default.nix b/pkgs/development/libraries/haskell/HUnit-approx/default.nix
deleted file mode 100644
index b507aa21cbb5..000000000000
--- a/pkgs/development/libraries/haskell/HUnit-approx/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "HUnit-approx";
-  version = "1.0";
-  sha256 = "0svkjvcanjsi5bhn9b91jhig36np5imr3qyj6b1s5msm7wmlk3v1";
-  buildDepends = [ HUnit ];
-  testDepends = [ HUnit ];
-  meta = {
-    homepage = "https://github.com/goldfirere/HUnit-approx";
-    description = "Approximate equality for floating point numbers with HUnit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HUnit/default.nix b/pkgs/development/libraries/haskell/HUnit/default.nix
deleted file mode 100644
index 0ab6f152aeed..000000000000
--- a/pkgs/development/libraries/haskell/HUnit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "HUnit";
-  version = "1.2.5.2";
-  sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "http://hunit.sourceforge.net/";
-    description = "A unit testing framework for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaTeX/default.nix b/pkgs/development/libraries/haskell/HaTeX/default.nix
deleted file mode 100644
index 9f5c8c76097f..000000000000
--- a/pkgs/development/libraries/haskell/HaTeX/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, matrix, parsec, QuickCheck, tasty, tastyQuickcheck, text
-, transformers, wlPprintExtras
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HaTeX";
-  version = "3.16.0.0";
-  sha256 = "16b3aaaahsy153dfii2lc1672kkm6i9mch5hmyf9229b17hhh5pa";
-  buildDepends = [
-    matrix parsec QuickCheck text transformers wlPprintExtras
-  ];
-  testDepends = [ QuickCheck tasty tastyQuickcheck text ];
-  meta = {
-    homepage = "http://wrongurl.net/haskell/HaTeX";
-    description = "The Haskell LaTeX library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
deleted file mode 100644
index d20d7be551c7..000000000000
--- a/pkgs/development/libraries/haskell/HaXml/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, polyparse, random }:
-
-cabal.mkDerivation (self: {
-  pname = "HaXml";
-  version = "1.25";
-  sha256 = "02l53v9c8qzkp5zzs31973pp27q4k2h04h9x3852gah78qjvnslk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath polyparse random ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://projects.haskell.org/HaXml/";
-    description = "Utilities for manipulating XML documents";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
deleted file mode 100644
index 69915ccfeefa..000000000000
--- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HTTP, hxt, hxtHttp, MaybeT, mtl, network
-, networkUri, parsec, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HandsomeSoup";
-  version = "0.3.5";
-  sha256 = "1d1zanlr1mdxjc69xvbxg5kn5bc08gd960j6lb1x3grhcgmj9krm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    HTTP hxt hxtHttp MaybeT mtl network networkUri parsec transformers
-  ];
-  testDepends = [ hspec hxt ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/egonSchiele/HandsomeSoup";
-    description = "Work with HTML more easily in HXT";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
deleted file mode 100644
index 9bd9c9f4796a..000000000000
--- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "HaskellForMaths";
-  version = "0.4.5";
-  sha256 = "03j83gvxjjqjwl047j0acsf9j5vs3zpzbap036sw4slq31nza2p9";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://haskellformaths.blogspot.com/";
-    description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
deleted file mode 100644
index 2aad877f6880..000000000000
--- a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, connection, dataDefault, HaskellNet, network, tls }:
-
-cabal.mkDerivation (self: {
-  pname = "HaskellNet-SSL";
-  version = "0.2.5.2";
-  sha256 = "0jhm43zd6jvhbahk4ki29ydg02qnjj4mw823rckqxk6f91q00qlp";
-  buildDepends = [ connection dataDefault HaskellNet network tls ];
-  meta = {
-    homepage = "https://github.com/dpwright/HaskellNet-SSL";
-    description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaskellNet/default.nix b/pkgs/development/libraries/haskell/HaskellNet/default.nix
deleted file mode 100644
index 284bdce97376..000000000000
--- a/pkgs/development/libraries/haskell/HaskellNet/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64String, cryptohash, mimeMail, mtl, network, text }:
-
-cabal.mkDerivation (self: {
-  pname = "HaskellNet";
-  version = "0.4";
-  sha256 = "152ayk35czl8fi2mar1g6c5mi3pikvnpcy967prg97a9vy0ld1yp";
-  buildDepends = [
-    base64String cryptohash mimeMail mtl network text
-  ];
-  meta = {
-    homepage = "https://github.com/jtdaugherty/HaskellNet";
-    description = "Client support for POP3, SMTP, and IMAP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
deleted file mode 100644
index c752b20551dc..000000000000
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, openssl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "HsOpenSSL";
-  version = "0.11.1";
-  sha256 = "1v73xjq3hxdzsrisyyshr46i7p9psinjbmc1z49cxgwisg8mn5xy";
-  buildDepends = [ network time ];
-  extraLibraries = [ openssl ];
-  meta = {
-    homepage = "https://github.com/phonohawk/HsOpenSSL";
-    description = "Partial OpenSSL binding for Haskell";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HsSyck/0.51.nix b/pkgs/development/libraries/haskell/HsSyck/0.51.nix
deleted file mode 100644
index 1be5744b6a33..000000000000
--- a/pkgs/development/libraries/haskell/HsSyck/0.51.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashtables, syb, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HsSyck";
-  version = "0.51";
-  sha256 = "13y5vbzrix33dzwhdrvng2ds2dnipkxn1h22jvbf47rwnkyh2g49";
-  buildDepends = [ hashtables syb utf8String ];
-  meta = {
-    description = "Fast, lightweight YAML loader and dumper";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HsSyck/0.52.nix b/pkgs/development/libraries/haskell/HsSyck/0.52.nix
deleted file mode 100644
index b3d64e539e18..000000000000
--- a/pkgs/development/libraries/haskell/HsSyck/0.52.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashtables, syb, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HsSyck";
-  version = "0.52";
-  sha256 = "1hdckbm60pzmydaz4rsw3kz9byd205987jcddakyhmgfinzvqwvc";
-  buildDepends = [ hashtables syb utf8String ];
-  meta = {
-    description = "Fast, lightweight YAML loader and dumper";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix
deleted file mode 100644
index 980ab8c448cb..000000000000
--- a/pkgs/development/libraries/haskell/IORefCAS/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bitsAtomic, HUnit, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "IORefCAS";
-  version = "0.2.0.1";
-  sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb";
-  buildDepends = [ bitsAtomic ];
-  testDepends = [ bitsAtomic HUnit QuickCheck time ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
-    description = "Atomic compare and swap for IORefs and STRefs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix
deleted file mode 100644
index f9f95586b455..000000000000
--- a/pkgs/development/libraries/haskell/IOSpec/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, Stream }:
-
-cabal.mkDerivation (self: {
-  pname = "IOSpec";
-  version = "0.2.5";
-  sha256 = "0r6vqg39h6vzwlb33cvk72k4mh6jd8rpdcnkqsfxdqmsk7h8x84j";
-  buildDepends = [ mtl QuickCheck Stream ];
-  meta = {
-    description = "A pure specification of the IO monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix
deleted file mode 100644
index 0f211b4cd509..000000000000
--- a/pkgs/development/libraries/haskell/IfElse/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "IfElse";
-  version = "0.85";
-  sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Anaphoric and miscellaneous useful control-flow";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix
deleted file mode 100644
index 65b53d91b52d..000000000000
--- a/pkgs/development/libraries/haskell/IntervalMap/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, deepseq, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "IntervalMap";
-  version = "0.4.0.1";
-  sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf";
-  buildDepends = [ deepseq ];
-  testDepends = [ Cabal deepseq QuickCheck ];
-  meta = {
-    homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
-    description = "Maps from Intervals to values, with efficient search";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
deleted file mode 100644
index ca3e10682fa1..000000000000
--- a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, JuicyPixels, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "JuicyPixels-util";
-  version = "0.2";
-  sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
-  buildDepends = [ JuicyPixels vector ];
-  meta = {
-    homepage = "https://github.com/fumieval/JuicyPixels-util";
-    description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
deleted file mode 100644
index e8c1c610e899..000000000000
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, mtl, primitive, transformers, vector
-, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "JuicyPixels";
-  version = "3.2";
-  sha256 = "1z4i0464zdijv54b7wzc55zrp8h67ahm6mrdk7a6gi2qm0nihmy5";
-  buildDepends = [
-    binary deepseq mtl primitive transformers vector zlib
-  ];
-  meta = {
-    homepage = "https://github.com/Twinside/Juicy.Pixels";
-    description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix
deleted file mode 100644
index 7fef71551908..000000000000
--- a/pkgs/development/libraries/haskell/List/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "List";
-  version = "0.5.1";
-  sha256 = "1hgkal8jh035bs0z6z8i899dc0888fhdx8940y27aaxxbmlzfy1p";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/yairchu/generator/tree";
-    description = "List monad transformer and class";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
deleted file mode 100644
index 1e99f819bcc6..000000000000
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, fmlist, HUnit, QuickCheck, random, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "ListLike";
-  version = "4.1.0";
-  sha256 = "0j78mm9vsl3scwgqp4h2bhq54hf22bxj9cg9pl26d12zw7038kwj";
-  buildDepends = [ dlist fmlist text vector ];
-  testDepends = [ dlist fmlist HUnit QuickCheck random text vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://software.complete.org/listlike";
-    description = "Generic support for list-like structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix
deleted file mode 100644
index 0f3edbaf5f2a..000000000000
--- a/pkgs/development/libraries/haskell/ListZipper/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "ListZipper";
-  version = "1.2.0.2";
-  sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9";
-  buildDepends = [ QuickCheck ];
-  meta = {
-    description = "Simple zipper for lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix
deleted file mode 100644
index aaf84a841873..000000000000
--- a/pkgs/development/libraries/haskell/MFlow/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession
-, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes
-, monadloc, mtl, parsec, pwstoreFast, random, RefSerialize
-, resourcet, stm, TCache, text, time, transformers, utf8String
-, vector, wai, waiExtra, warp, warpTls, Workflow
-}:
-
-cabal.mkDerivation (self: {
-  pname = "MFlow";
-  version = "0.4.5.9";
-  sha256 = "0mqsyx7wkfgvpppqgpjpvzwx79vj7lh4c8afzzj1hgh8z0ilb4ik";
-  buildDepends = [
-    blazeHtml blazeMarkup caseInsensitive clientsession conduit
-    conduitExtra extensibleExceptions httpTypes monadloc mtl parsec
-    pwstoreFast random RefSerialize resourcet stm TCache text time
-    transformers utf8String vector wai waiExtra warp warpTls Workflow
-  ];
-  buildTools = [ cpphs ];
-  meta = {
-    description = "stateful, RESTful web framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix
deleted file mode 100644
index 012ce6249fcb..000000000000
--- a/pkgs/development/libraries/haskell/MaybeT/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "MaybeT";
-  version = "0.1.2";
-  sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "MaybeT monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix
deleted file mode 100644
index 3e7f18180392..000000000000
--- a/pkgs/development/libraries/haskell/MemoTrie/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, void }:
-
-cabal.mkDerivation (self: {
-  pname = "MemoTrie";
-  version = "0.6.2";
-  sha256 = "1g4b82s30bqkfids3iywf873nyn8h7l8rp8l3xl58smj5lbi3p4x";
-  buildDepends = [ void ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/MemoTrie";
-    description = "Trie-based memo functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
deleted file mode 100644
index 3115c437b093..000000000000
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, errorcallEqInstance, filepath, hslogger, HUnit, mtl
-, network, parsec, QuickCheck, random, regexCompat, testpack, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "MissingH";
-  version = "1.3.0.1";
-  sha256 = "1cwdhgqqv2riqwhsgyrpmqyzvg19lx6zp1g7xdp4rikh7rkn03ds";
-  buildDepends = [
-    filepath hslogger HUnit mtl network parsec random regexCompat time
-  ];
-  testDepends = [
-    errorcallEqInstance filepath hslogger HUnit mtl network parsec
-    QuickCheck random regexCompat testpack time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://software.complete.org/missingh";
-    description = "Large utility library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
deleted file mode 100644
index 11e97d72ea8c..000000000000
--- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, MonadCatchIOTransformers }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadCatchIO-mtl";
-  version = "0.3.1.0";
-  sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq";
-  buildDepends = [ extensibleExceptions MonadCatchIOTransformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl";
-    description = "Monad-transformer version of the Control.Exception module";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
deleted file mode 100644
index d4cbd7c09ba4..000000000000
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, monadsTf, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadCatchIO-transformers";
-  version = "0.3.1.2";
-  sha256 = "1r5c4qz6yp1qrsmk9di35d5kk2dcnaxh2mg3n5kdim991ydzsi1d";
-  buildDepends = [ extensibleExceptions monadsTf transformers ];
-  jailbreak = true;
-  meta = {
-    description = "Monad-transformer compatible version of the Control.Exception module";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
deleted file mode 100644
index 412f24450c48..000000000000
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadPrompt";
-  version = "1.0.0.5";
-  sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "MonadPrompt, implementation & examples";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
deleted file mode 100644
index 41796adb963e..000000000000
--- a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadRandom";
-  version = "0.2.0.1";
-  sha256 = "1689302z053zhcr46w5q3a57kd6z365kkgzxh638gcakzzk3pmwm";
-  buildDepends = [ mtl random transformers ];
-  meta = {
-    description = "Random-number generation monad";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix
deleted file mode 100644
index 0362804ed45e..000000000000
--- a/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadRandom";
-  version = "0.3.0.1";
-  sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0";
-  buildDepends = [ mtl random transformers ];
-  meta = {
-    description = "Random-number generation monad";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix
deleted file mode 100644
index 38fbbfdbfbf8..000000000000
--- a/pkgs/development/libraries/haskell/NumInstances/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "NumInstances";
-  version = "1.4";
-  sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
-  meta = {
-    homepage = "https://github.com/conal/NumInstances";
-    description = "Instances of numeric classes for functions and tuples";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix
deleted file mode 100644
index e2fed3f2191d..000000000000
--- a/pkgs/development/libraries/haskell/ObjectName/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ObjectName";
-  version = "1.0.1.0";
-  sha256 = "1aw221i1cisk7jpgchs16f3br0ddllh0n0idhw5v6n6ysv4vv155";
-  meta = {
-    homepage = "https://github.com/haskell-opengl/ObjectName";
-    description = "Explicitly handled object names";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix
deleted file mode 100644
index b2af0024b5cc..000000000000
--- a/pkgs/development/libraries/haskell/OneTuple/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "OneTuple";
-  version = "0.2.1";
-  sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
-  meta = {
-    description = "Singleton Tuple";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
deleted file mode 100644
index 98aac94e01de..000000000000
--- a/pkgs/development/libraries/haskell/OpenAL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, openal, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenAL";
-  version = "1.6.0.0";
-  sha256 = "0bw20ykn8vi3g4im4nsrfz7p1qq9qwnx8da83zwdbr3wjm9934gd";
-  buildDepends = [ OpenGL ];
-  extraLibraries = [ openal ];
-  meta = {
-    homepage = "https://github.com/haskell-openal/ALUT";
-    description = "A binding to the OpenAL cross-platform 3D audio API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/default.nix b/pkgs/development/libraries/haskell/OpenGL/default.nix
deleted file mode 100644
index f6767ab577c2..000000000000
--- a/pkgs/development/libraries/haskell/OpenGL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, GLURaw, libX11, mesa, OpenGLRaw, text }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.9.2.0";
-  sha256 = "1sa5jmhj0az6sik6swv2vgzhv9gj34dbq2px23ag1a4yrk5gcn0p";
-  buildDepends = [ GLURaw OpenGLRaw text ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
deleted file mode 100644
index 65466306fd80..000000000000
--- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGLRaw";
-  version = "1.5.0.0";
-  sha256 = "04lsidv82fl7yb2fnqpx7q0vgiwxbswh8g7dv9q9s9i2jwiaaal5";
-  extraLibraries = [ mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A raw binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix
deleted file mode 100644
index 751dadebfa87..000000000000
--- a/pkgs/development/libraries/haskell/PSQueue/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "PSQueue";
-  version = "1.1";
-  sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58";
-  meta = {
-    description = "Priority Search Queue";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/default.nix b/pkgs/development/libraries/haskell/QuickCheck/default.nix
deleted file mode 100644
index 3c623e9f0dd5..000000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, testFramework, tfRandom, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.7.6";
-  sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40";
-  buildDepends = [ random tfRandom transformers ];
-  testDepends = [ testFramework ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "https://github.com/nick8325/quickcheck";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
deleted file mode 100644
index 53655d467659..000000000000
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG, pureMD5
-, QuickCheck, SHA, tagged, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "RSA";
-  version = "2.1.0";
-  sha256 = "0bhnnz7vp1942ac2vg0y6vsag9bm0pslnm4ix6lmw28hy6d1jk2a";
-  buildDepends = [ binary cryptoApi cryptoPubkeyTypes pureMD5 SHA ];
-  testDepends = [
-    binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA
-    tagged testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
deleted file mode 100644
index 51296cb2a0e4..000000000000
--- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "Ranged-sets";
-  version = "0.3.0";
-  sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l";
-  buildDepends = [ HUnit QuickCheck ];
-  meta = {
-    homepage = "http://code.haskell.org/ranged-sets";
-    description = "Ranged sets for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix
deleted file mode 100644
index 5380cb596592..000000000000
--- a/pkgs/development/libraries/haskell/Rasterific/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, criterion, deepseq, dlist, filepath, FontyFruity
-, free, JuicyPixels, mtl, primitive, QuickCheck, statistics, vector
-, vectorAlgorithms
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Rasterific";
-  version = "0.4";
-  sha256 = "1cw8lalxp9cs3w3kfr4ayp5h0kd71fdnyih99xpljy8zxw28hv3z";
-  buildDepends = [
-    dlist FontyFruity free JuicyPixels mtl primitive vector
-    vectorAlgorithms
-  ];
-  testDepends = [
-    binary criterion deepseq filepath FontyFruity JuicyPixels
-    QuickCheck statistics vector
-  ];
-  doCheck = false;
-  meta = {
-    description = "A pure haskell drawing engine";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix
deleted file mode 100644
index c9f107449767..000000000000
--- a/pkgs/development/libraries/haskell/ReadArgs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, systemFilepath, text }:
-
-cabal.mkDerivation (self: {
-  pname = "ReadArgs";
-  version = "1.2.2";
-  sha256 = "1v6yr5zzrrj31prfzxxh1n27sfnkqpkw34v3a47rcnm444ba58a7";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ systemFilepath text ];
-  testDepends = [ hspec systemFilepath text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/rampion/ReadArgs";
-    description = "Simple command line argument parsing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/RefSerialize/default.nix b/pkgs/development/libraries/haskell/RefSerialize/default.nix
deleted file mode 100644
index 1307d4ae42e8..000000000000
--- a/pkgs/development/libraries/haskell/RefSerialize/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, hashtables, stringsearch }:
-
-cabal.mkDerivation (self: {
-  pname = "RefSerialize";
-  version = "0.3.1.3";
-  sha256 = "0qrca0jismpvjy7i4xx19ljrj72gqcmwqg47a51ykncsvci0fjrm";
-  buildDepends = [ binary hashtables stringsearch ];
-  meta = {
-    description = "Write to and read from ByteStrings maintaining internal memory references";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
deleted file mode 100644
index f62f1b1392e2..000000000000
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, typeEquality }:
-
-cabal.mkDerivation (self: {
-  pname = "RepLib";
-  version = "0.5.3.3";
-  sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
-  buildDepends = [ mtl typeEquality ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://code.google.com/p/replib/";
-    description = "Generic programming library with representation types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix
deleted file mode 100644
index c744ca41cf99..000000000000
--- a/pkgs/development/libraries/haskell/SDL-image/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL, SDL_image }:
-
-cabal.mkDerivation (self: {
-  pname = "SDL-image";
-  version = "0.6.1";
-  sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni";
-  buildDepends = [ SDL ];
-  extraLibraries = [ SDL_image ];
-  meta = {
-    description = "Binding to libSDL_image";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
deleted file mode 100644
index 7ec8cecd92c3..000000000000
--- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL, SDL_mixer }:
-
-cabal.mkDerivation (self: {
-  pname = "SDL-mixer";
-  version = "0.6.1";
-  sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1";
-  buildDepends = [ SDL ];
-  extraLibraries = [ SDL_mixer ];
-  meta = {
-    description = "Binding to libSDL_mixer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
deleted file mode 100644
index 77c3434216aa..000000000000
--- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL, SDL_ttf }:
-
-cabal.mkDerivation (self: {
-  pname = "SDL-ttf";
-  version = "0.6.2";
-  sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a";
-  buildDepends = [ SDL ];
-  extraLibraries = [ SDL_ttf ];
-  meta = {
-    description = "Binding to libSDL_ttf";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
deleted file mode 100644
index 6eca4791fcfc..000000000000
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL }:
-
-cabal.mkDerivation (self: {
-  pname = "SDL";
-  version = "0.6.5";
-  sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb";
-  extraLibraries = [ SDL ];
-  meta = {
-    description = "Binding to libSDL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
deleted file mode 100644
index 2a9c98ef67a4..000000000000
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "SHA";
-  version = "1.6.4.1";
-  sha256 = "03fwpl8hrl9q197w8v1glqi5g1d51c7hz4m8zi5s8x1yvpbwcfvl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary ];
-  meta = {
-    description = "Implementations of the SHA suite of message digest functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SHA2/default.nix b/pkgs/development/libraries/haskell/SHA2/default.nix
deleted file mode 100644
index 769192146ae5..000000000000
--- a/pkgs/development/libraries/haskell/SHA2/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, AES, monadsTf, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "SHA2";
-  version = "0.2.5";
-  sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";
-  buildDepends = [ AES monadsTf transformers ];
-  meta = {
-    description = "Fast, incremental SHA hashing for bytestrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
deleted file mode 100644
index c070ab8dcaab..000000000000
--- a/pkgs/development/libraries/haskell/SMTPClient/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, hsemail, network }:
-
-cabal.mkDerivation (self: {
-  pname = "SMTPClient";
-  version = "1.1.0";
-  sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk";
-  buildDepends = [ extensibleExceptions hsemail network ];
-  meta = {
-    description = "A simple SMTP client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/STMonadTrans/default.nix b/pkgs/development/libraries/haskell/STMonadTrans/default.nix
deleted file mode 100644
index 34ef6152cd27..000000000000
--- a/pkgs/development/libraries/haskell/STMonadTrans/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "STMonadTrans";
-  version = "0.3.2";
-  sha256 = "1cl5bsc5mr3silcmbjylgw5qa04pf2np9mippxnsa4p3dk089gkh";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "A monad transformer version of the ST monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix
deleted file mode 100644
index a4bb78eca681..000000000000
--- a/pkgs/development/libraries/haskell/SVGFonts/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeMarkup, blazeSvg, dataDefaultClass
-, diagramsLib, parsec, split, text, tuple, vector, vectorSpace, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "SVGFonts";
-  version = "1.4.0.3";
-  sha256 = "0jkjcf27xqjzv9lny7j181kcma26wngrq3vzw2sp2hwkdcjryyin";
-  buildDepends = [
-    attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec
-    split text tuple vector vectorSpace xml
-  ];
-  meta = {
-    description = "Fonts from the SVG-Font format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
deleted file mode 100644
index 577af377488d..000000000000
--- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "SafeSemaphore";
-  version = "0.10.1";
-  sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91";
-  buildDepends = [ stm ];
-  testDepends = [ HUnit ];
-  meta = {
-    homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore";
-    description = "Much safer replacement for QSemN, QSem, and SampleVar";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
deleted file mode 100644
index 1715d62b02ba..000000000000
--- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "Shellac";
-  version = "0.9.5.2";
-  sha256 = "1js9la0hziqsmb56q9kzfycda2sw3xm4kv2y5q2h3zlw5gzc5xli";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://rwd.rdockins.name/shellac/home/";
-    description = "A framework for creating shell envinronments";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix
deleted file mode 100644
index b4bd9b44e3f8..000000000000
--- a/pkgs/development/libraries/haskell/StateVar/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "StateVar";
-  version = "1.0.1.0";
-  sha256 = "02n2sxxkr0ydc77dc3amwp5jrw289d2s2z55rhrmhxxg1c7lp5js";
-  meta = {
-    homepage = "https://github.com/haskell-opengl/StateVar";
-    description = "State variables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
deleted file mode 100644
index 2fa2a91efe8d..000000000000
--- a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "Strafunski-StrategyLib";
-  version = "5.0.0.4";
-  sha256 = "0miffjc8li5l1jarmz8l34z5mx3q68pyxghsi1lbda51bzz3wy1g";
-  buildDepends = [ mtl syb ];
-  jailbreak = true;
-  meta = {
-    description = "Library for strategic programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix
deleted file mode 100644
index 3e1c1b7b32e3..000000000000
--- a/pkgs/development/libraries/haskell/Stream/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lazysmallcheck, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "Stream";
-  version = "0.4.7.1";
-  sha256 = "08h0h6pwvfcj92n7mk5za36x9agpqnax12cjlvd68zwghjf9qxy3";
-  buildDepends = [ lazysmallcheck QuickCheck ];
-  meta = {
-    description = "A library for manipulating infinite lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/TCache/default.nix b/pkgs/development/libraries/haskell/TCache/default.nix
deleted file mode 100644
index 9c2638302a56..000000000000
--- a/pkgs/development/libraries/haskell/TCache/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashtables, mtl, RefSerialize, stm, text }:
-
-cabal.mkDerivation (self: {
-  pname = "TCache";
-  version = "0.12.0";
-  sha256 = "0marslz5jg66r3i2d0yjjrj11bpywpadcxs5k4j6782iczxybd7s";
-  buildDepends = [ hashtables mtl RefSerialize stm text ];
-  meta = {
-    description = "A Transactional cache with user-defined persistence";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix
deleted file mode 100644
index 396f2366d153..000000000000
--- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HaXml, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "TableAlgebra";
-  version = "0.7.1";
-  sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz";
-  buildDepends = [ HaXml mtl ];
-  meta = {
-    description = "Ferry Table Algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix
deleted file mode 100644
index 8b5869caae9e..000000000000
--- a/pkgs/development/libraries/haskell/Tensor/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Tensor";
-  version = "1.1.0.0";
-  sha256 = "1vn409805p5b47v5mf7rk0gypqag5bn1pzlsmsp9blr3jyj6dgph";
-  meta = {
-    homepage = "https://github.com/haskell-opengl/Tensor";
-    description = "Tensor data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Thrift/default.nix b/pkgs/development/libraries/haskell/Thrift/default.nix
deleted file mode 100644
index bbd5f45f9caa..000000000000
--- a/pkgs/development/libraries/haskell/Thrift/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, HTTP, network }:
-
-cabal.mkDerivation (self: {
-  pname = "Thrift";
-  version = "0.6.0.1";
-  sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv";
-  buildDepends = [ binary HTTP network ];
-  meta = {
-    homepage = "http://thrift.apache.org";
-    description = "Haskell bindings for the Apache Thrift RPC system";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix
deleted file mode 100644
index de5f41ab384b..000000000000
--- a/pkgs/development/libraries/haskell/TypeCompose/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "TypeCompose";
-  version = "0.9.10";
-  sha256 = "1wpldqdf6czl36fs4pvvj2z3kg1487sanqncp4rbmgrrhbfmqxxq";
-  meta = {
-    homepage = "https://github.com/conal/TypeCompose";
-    description = "Type composition classes & instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Unixutils/default.nix b/pkgs/development/libraries/haskell/Unixutils/default.nix
deleted file mode 100644
index c776686509b3..000000000000
--- a/pkgs/development/libraries/haskell/Unixutils/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, pureMD5, regexTdfa, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "Unixutils";
-  version = "1.52";
-  sha256 = "1gp04mc6irycwazykl9kpyhkkryn3hbnpn08ih6cjbsm3p8yi8b4";
-  buildDepends = [ filepath pureMD5 regexTdfa zlib ];
-  meta = {
-    homepage = "https://github.com/seereason/haskell-unixutils";
-    description = "A crude interface between Haskell and Unix-like operating systems";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix
deleted file mode 100644
index eab20222769d..000000000000
--- a/pkgs/development/libraries/haskell/Vec/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Vec";
-  version = "1.0.5";
-  sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
-  meta = {
-    homepage = "http://github.net/sedillard/Vec";
-    description = "Fixed-length lists and low-dimensional linear algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/WAVE/default.nix b/pkgs/development/libraries/haskell/WAVE/default.nix
deleted file mode 100644
index 6082f5e76cf5..000000000000
--- a/pkgs/development/libraries/haskell/WAVE/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parseargs }:
-
-cabal.mkDerivation (self: {
-  pname = "WAVE";
-  version = "0.1.3";
-  sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ parseargs ];
-  meta = {
-    homepage = "http://github.com/BartMassey/WAVE";
-    description = "WAVE audio file IO library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Workflow/default.nix b/pkgs/development/libraries/haskell/Workflow/default.nix
deleted file mode 100644
index 7dd6f2985766..000000000000
--- a/pkgs/development/libraries/haskell/Workflow/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, exceptions, extensibleExceptions, mtl
-, RefSerialize, stm, TCache, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Workflow";
-  version = "0.8.1";
-  sha256 = "0z23g68gcbbn43i78cql4is9js3m4z16rm2x8s57f73n0hx7f00l";
-  buildDepends = [
-    binary exceptions extensibleExceptions mtl RefSerialize stm TCache
-    vector
-  ];
-  meta = {
-    description = "Workflow patterns over a monad for thread state logging & recovery";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix
deleted file mode 100644
index df9ddb1e2778..000000000000
--- a/pkgs/development/libraries/haskell/X11-xft/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11
-}:
-
-cabal.mkDerivation (self: {
-  pname = "X11-xft";
-  version = "0.3.1";
-  sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf";
-  buildDepends = [ utf8String X11 ];
-  extraLibraries = [ fontconfig freetype pkgconfig ];
-  pkgconfigDepends = [ libXft ];
-  configureFlags = "--extra-include-dirs=${freetype}/include/freetype2";
-  meta = {
-    description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
deleted file mode 100644
index fbd5e2c0c7b5..000000000000
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, libX11, libXext, libXinerama, libXrandr
-, libXrender
-}:
-
-cabal.mkDerivation (self: {
-  pname = "X11";
-  version = "1.6.1.2";
-  sha256 = "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj";
-  buildDepends = [ dataDefault ];
-  extraLibraries = [
-    libX11 libXext libXinerama libXrandr libXrender
-  ];
-  meta = {
-    homepage = "https://github.com/haskell-pkg-janitors/X11";
-    description = "A binding to the X11 graphics library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Yampa/default.nix b/pkgs/development/libraries/haskell/Yampa/default.nix
deleted file mode 100644
index 5ae451f81634..000000000000
--- a/pkgs/development/libraries/haskell/Yampa/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "Yampa";
-  version = "0.9.6";
-  sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Yampa";
-    description = "Library for programming hybrid systems";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix b/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix
deleted file mode 100644
index a5d171f177b1..000000000000
--- a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractDeque, HUnit, random, testFramework
-, testFrameworkHunit, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "abstract-deque-tests";
-  version = "0.3";
-  sha256 = "19gb5x5z3nvazdra3skm24c2g2byj0i4cjbzfwfghnb5q96gn5sz";
-  buildDepends = [
-    abstractDeque HUnit random testFramework testFrameworkHunit time
-  ];
-  testDepends = [
-    abstractDeque HUnit random testFramework testFrameworkHunit time
-  ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "A test-suite for any queue or double-ended queue satisfying an interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
deleted file mode 100644
index 0bd1a7c59363..000000000000
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, time }:
-
-cabal.mkDerivation (self: {
-  pname = "abstract-deque";
-  version = "0.3";
-  sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
-  buildDepends = [ random time ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "Abstract, parameterized interface to mutable Deques";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix
deleted file mode 100644
index 9c7319297eea..000000000000
--- a/pkgs/development/libraries/haskell/abstract-par/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "abstract-par";
-  version = "0.3.3";
-  sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "https://github.com/simonmar/monad-par";
-    description = "Type classes generalizing the functionality of the 'monad-par' library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
deleted file mode 100644
index 3bb444eec682..000000000000
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, binary, cryptohash, cuda, fclabels, filepath
-, hashable, hashtables, languageCQuote, mainlandPretty, mtl
-, SafeSemaphore, srcloc, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate-cuda";
-  version = "0.14.0.0";
-  sha256 = "1qms1w5rjjd77lldds2ljj9zr15dybnsaq8vxfyb5a4diq12bmi5";
-  buildDepends = [
-    accelerate binary cryptohash cuda fclabels filepath hashable
-    hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc
-    text transformers unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate-cuda/";
-    description = "Accelerate backend for NVIDIA GPUs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix
deleted file mode 100644
index fcd4bb744dd2..000000000000
--- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, accelerateCuda, accelerateFft, accelerateIo
-, attoparsec, bmp, bytestringLexing, cereal, criterion, ekg
-, fclabels, filepath, gloss, glossAccelerate, glossRasterAccelerate
-, HUnit, mwcRandom, primitive, QuickCheck, random, repa, repaIo
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, vector, vectorAlgorithms
-}:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate-examples";
-  version = "0.14.0.0";
-  sha256 = "01hxww3ypjlcfimkvf7gxl2g7msad2yw1d6m0h4kkfqvpx84nfwr";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    accelerate accelerateCuda accelerateFft accelerateIo attoparsec bmp
-    bytestringLexing cereal criterion ekg fclabels filepath gloss
-    glossAccelerate glossRasterAccelerate HUnit mwcRandom primitive
-    QuickCheck random repa repaIo testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector vectorAlgorithms
-  ];
-  configureFlags = "-f-opencl";
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate-examples";
-    description = "Examples using the Accelerate library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix
deleted file mode 100644
index e2f4fade7361..000000000000
--- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, accelerateCuda, cuda, cufft }:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate-fft";
-  version = "0.14.0.0";
-  sha256 = "1rsrgrqn1gdds2wvv1mgzd3yg2mvbkgnj63ygjyzsk9j00wavd1g";
-  buildDepends = [ accelerate accelerateCuda cuda cufft ];
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate-fft";
-    description = "FFT using the Accelerate library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix
deleted file mode 100644
index b8131da6c08d..000000000000
--- a/pkgs/development/libraries/haskell/accelerate-io/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, bmp, repa, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate-io";
-  version = "0.14.0.0";
-  sha256 = "1vvjmsfaz5xbvvb4x2fym43xvcjv41baxlfhlycgizaca4yw8w9h";
-  buildDepends = [ accelerate bmp repa vector ];
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate-io";
-    description = "Read and write Accelerate arrays in various formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix
deleted file mode 100644
index 5ab212a58a1a..000000000000
--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fclabels, hashable, hashtables, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate";
-  version = "0.14.0.0";
-  sha256 = "0b6mnv5l2vrbljak2yx9akpsyqc0qg1il54w0rlfm29fgqknlhjh";
-  buildDepends = [
-    fclabels hashable hashtables unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate/";
-    description = "An embedded language for accelerated array processing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix
deleted file mode 100644
index ab2e682fdc89..000000000000
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, extensibleExceptions, filepath, mtl, network
-, safecopy, stm
-}:
-
-cabal.mkDerivation (self: {
-  pname = "acid-state";
-  version = "0.12.3";
-  sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1";
-  buildDepends = [
-    cereal extensibleExceptions filepath mtl network safecopy stm
-  ];
-  meta = {
-    homepage = "http://acid-state.seize.it/";
-    description = "Add ACID guarantees to any serializable Haskell data structure";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix b/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix
deleted file mode 100644
index 6b2a9856a90e..000000000000
--- a/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "acme-lookofdisapproval";
-  version = "0.1";
-  sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
-  meta = {
-    homepage = "https://github.com/llelf/acme-lookofdisapproval";
-    description = "Express your disapproval";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
deleted file mode 100644
index 02764c108f8c..000000000000
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, newtype, QuickCheck, semigroupoids, semigroups
-, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "active";
-  version = "0.1.0.17";
-  sha256 = "1asp0han2737vfk92gasij804z4jsw8v2bc0m4nrmn3v80vmh7qb";
-  buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
-  testDepends = [
-    newtype QuickCheck semigroupoids semigroups vectorSpace
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Abstractions for animation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix
deleted file mode 100644
index 72c53b5178a3..000000000000
--- a/pkgs/development/libraries/haskell/ad/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, dataReify, doctest, erf, filepath, free, nats
-, reflection, tagged, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ad";
-  version = "4.2.1.1";
-  sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka";
-  buildDepends = [
-    comonad dataReify erf free nats reflection tagged transformers
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/ad";
-    description = "Automatic Differentiation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix
deleted file mode 100644
index f02aa9df5dd0..000000000000
--- a/pkgs/development/libraries/haskell/adjunctions/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, contravariant, distributive, free, mtl
-, profunctors, semigroupoids, semigroups, tagged, transformers
-, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "adjunctions";
-  version = "4.2";
-  sha256 = "07r56r6kyd6wlcxxnsnnyv59pyc8s1gsy54kzwmk9yknks5rij9i";
-  buildDepends = [
-    comonad contravariant distributive free mtl profunctors
-    semigroupoids semigroups tagged transformers void
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/adjunctions/";
-    description = "Adjunctions and representable functors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix
deleted file mode 100644
index 8e1959c401c5..000000000000
--- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, cmdargs, text, unorderedContainers
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson-pretty";
-  version = "0.7.2";
-  sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec cmdargs text unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/informatikr/aeson-pretty";
-    description = "JSON pretty-printing library and command-line tool";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix
deleted file mode 100644
index d7c86d853fae..000000000000
--- a/pkgs/development/libraries/haskell/aeson-qq/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, haskellSrcMeta, hspec, parsec, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "aeson-qq";
-  version = "0.7.4";
-  sha256 = "0wnc9pdjvd15gfkdxzf084393vwmxv2xaxdchzgal1qhwa1mak4v";
-  buildDepends = [ aeson haskellSrcMeta parsec text vector ];
-  testDepends = [ aeson haskellSrcMeta hspec parsec text vector ];
-  meta = {
-    homepage = "http://github.com/zalora/aeson-qq";
-    description = "JSON quasiquoter for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson-utils/default.nix b/pkgs/development/libraries/haskell/aeson-utils/default.nix
deleted file mode 100644
index ee0df96618c5..000000000000
--- a/pkgs/development/libraries/haskell/aeson-utils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, scientific, text }:
-
-cabal.mkDerivation (self: {
-  pname = "aeson-utils";
-  version = "0.2.2.1";
-  sha256 = "0sj4kdcxcj2wnf3s109yxq8gghz976hkiqs19bjcp6qkzdf5w6sd";
-  buildDepends = [ aeson attoparsec scientific text ];
-  jailbreak = true;
-  meta = {
-    description = "Utilities for working with Aeson";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
deleted file mode 100644
index 5dca4bc9062d..000000000000
--- a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
-, mtl, QuickCheck, scientific, syb, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson";
-  version = "0.7.0.4";
-  sha256 = "009grccll41mkf7rarpcrn06l8vc0q0y8l4j9nbdfcl89153rj2k";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
-    text time unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/bos/aeson";
-    description = "Fast JSON parsing and encoding";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix
deleted file mode 100644
index 0625dcf19136..000000000000
--- a/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
-, mtl, QuickCheck, scientific, syb, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson";
-  version = "0.8.0.2";
-  sha256 = "1mc8cwmswx69r77wv7dfim525jqajnlxbcx5xf3ygpszzf6mh1q7";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
-    text time unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/bos/aeson";
-    description = "Fast JSON parsing and encoding";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/algebra/default.nix b/pkgs/development/libraries/haskell/algebra/default.nix
deleted file mode 100644
index 2044c8ad8723..000000000000
--- a/pkgs/development/libraries/haskell/algebra/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, adjunctions, distributive, mtl, nats, semigroupoids
-, semigroups, tagged, transformers, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "algebra";
-  version = "4.2";
-  sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs";
-  buildDepends = [
-    adjunctions distributive mtl nats semigroupoids semigroups tagged
-    transformers void
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/algebra/";
-    description = "Constructive abstract algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix
deleted file mode 100644
index 84f1485856f5..000000000000
--- a/pkgs/development/libraries/haskell/alsa-core/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alsaLib, extensibleExceptions }:
-
-cabal.mkDerivation (self: {
-  pname = "alsa-core";
-  version = "0.5.0.1";
-  sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b";
-  buildDepends = [ extensibleExceptions ];
-  pkgconfigDepends = [ alsaLib ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/ALSA";
-    description = "Binding to the ALSA Library API (Exceptions)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
deleted file mode 100644
index 0e097223f846..000000000000
--- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alsaCore, alsaLib, c2hs }:
-
-cabal.mkDerivation (self: {
-  pname = "alsa-mixer";
-  version = "0.2.0.2";
-  sha256 = "11sc2n879a8rb9yz54cb8vg8rplgapbymzy785p7n7638xx877hk";
-  buildDepends = [ alsaCore ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ alsaLib ];
-  meta = {
-    homepage = "https://github.com/ttuegel/alsa-mixer";
-    description = "Bindings to the ALSA simple mixer API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix
deleted file mode 100644
index e1ac0ea257eb..000000000000
--- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alsaCore, alsaLib, extensibleExceptions, sampleFrame
-, storableRecord
-}:
-
-cabal.mkDerivation (self: {
-  pname = "alsa-pcm";
-  version = "0.6.0.3";
-  sha256 = "0rq0i17xhd0x7dnlhdf3i1fdvmyxrsbm0w0k9lrx20xpy4gw2zfs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    alsaCore extensibleExceptions sampleFrame storableRecord
-  ];
-  pkgconfigDepends = [ alsaLib ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/ALSA";
-    description = "Binding to the ALSA Library API (PCM audio)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
deleted file mode 100644
index d91d4e1bdb8a..000000000000
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, clock, connection, dataBinaryIeee754, hspec
-, hspecExpectations, monadControl, network, networkUri, split, text
-, vector, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "amqp";
-  version = "0.10.1";
-  sha256 = "1a2d17h1zhd2yv1zhd0vvr4g1v6nr188gwv12qwljs1v9y4jkbmc";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary clock connection dataBinaryIeee754 monadControl network
-    networkUri split text vector xml
-  ];
-  testDepends = [
-    binary clock connection dataBinaryIeee754 hspec hspecExpectations
-    network split text vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/hreinhardt/amqp";
-    description = "Client library for AMQP servers (currently only RabbitMQ)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
deleted file mode 100644
index efefdc78f0d8..000000000000
--- a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "annotated-wl-pprint";
-  version = "0.5.3";
-  sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis";
-  meta = {
-    homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
-    description = "The Wadler/Leijen Pretty Printer, with annotation support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
deleted file mode 100644
index 26fbb43ec04f..000000000000
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ansi-terminal";
-  version = "0.6.2.1";
-  sha256 = "1xmp8wpcyvqys777qpyfx99bhlnvmr7jil7r78j5n6fx3mkkhnln";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "https://github.com/feuerbach/ansi-terminal";
-    description = "Simple ANSI terminal support, with Windows compatibility";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
deleted file mode 100644
index d79f0bc979dc..000000000000
--- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal }:
-
-cabal.mkDerivation (self: {
-  pname = "ansi-wl-pprint";
-  version = "0.6.7.1";
-  sha256 = "1by11bg1bd7z18hqgayk0w76hy5n63kmdl14gainlvfgr9jw506r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ ansiTerminal ];
-  meta = {
-    homepage = "http://github.com/batterseapower/ansi-wl-pprint";
-    description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/appar/default.nix b/pkgs/development/libraries/haskell/appar/default.nix
deleted file mode 100644
index ef135f57766c..000000000000
--- a/pkgs/development/libraries/haskell/appar/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "appar";
-  version = "0.1.4";
-  sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
-  meta = {
-    description = "A simple applicative parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/applicative-quoters/default.nix b/pkgs/development/libraries/haskell/applicative-quoters/default.nix
deleted file mode 100644
index 84bd2e1e4386..000000000000
--- a/pkgs/development/libraries/haskell/applicative-quoters/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcMeta }:
-
-cabal.mkDerivation (self: {
-  pname = "applicative-quoters";
-  version = "0.1.0.8";
-  sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl";
-  buildDepends = [ haskellSrcMeta ];
-  meta = {
-    description = "Quasiquoters for idiom brackets and an applicative do-notation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix
deleted file mode 100644
index 2d282fae0223..000000000000
--- a/pkgs/development/libraries/haskell/ariadne/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, bert, Cabal, dataLens, dataLensFd, dataLensTemplate
-, filepath, haskellNames, haskellPackages, haskellSrcExts, hseCpp
-, hslogger, mtl, stm, tagged, tasty, tastyHunit, transformers
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ariadne";
-  version = "0.1.2.3";
-  sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    async bert Cabal dataLens dataLensFd dataLensTemplate filepath
-    haskellNames haskellPackages haskellSrcExts hseCpp hslogger mtl stm
-    tagged transformers utf8String
-  ];
-  testDepends = [
-    bert filepath haskellSrcExts tasty tastyHunit utf8String
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/feuerbach/ariadne";
-    description = "Go-to-definition for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
deleted file mode 100644
index 91797435ceb1..000000000000
--- a/pkgs/development/libraries/haskell/arithmoi/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, random }:
-
-cabal.mkDerivation (self: {
-  pname = "arithmoi";
-  version = "0.4.1.1";
-  sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix";
-  buildDepends = [ mtl random ];
-  configureFlags = "-f-llvm";
-  jailbreak = true;
-  meta = {
-    homepage = "https://bitbucket.org/dafis/arithmoi";
-    description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix
deleted file mode 100644
index 28c691c72122..000000000000
--- a/pkgs/development/libraries/haskell/arrows/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Stream }:
-
-cabal.mkDerivation (self: {
-  pname = "arrows";
-  version = "0.4.4.1";
-  sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v";
-  buildDepends = [ Stream ];
-  meta = {
-    homepage = "http://www.haskell.org/arrows/";
-    description = "Arrow classes and transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix
deleted file mode 100644
index f0b9945cd626..000000000000
--- a/pkgs/development/libraries/haskell/asn1-data/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "asn1-data";
-  version = "0.7.1";
-  sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cereal mtl text ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-asn1-data";
-    description = "ASN1 data reader and writer in RAW, BER and DER forms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
deleted file mode 100644
index cb35f70d1b58..000000000000
--- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Types, hourglass, mtl, tasty, tastyQuickcheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "asn1-encoding";
-  version = "0.9.0";
-  sha256 = "02x3lzyl4gavl3lc2lrg8rknyvs6r2hf8kmm7xrmma5m857iks8p";
-  buildDepends = [ asn1Types hourglass mtl ];
-  testDepends = [
-    asn1Types hourglass mtl tasty tastyQuickcheck text
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-asn1";
-    description = "ASN1 data reader and writer in RAW, BER and DER forms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix
deleted file mode 100644
index 5d6bf33bb268..000000000000
--- a/pkgs/development/libraries/haskell/asn1-parse/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "asn1-parse";
-  version = "0.9.0";
-  sha256 = "0m093wwndyxvy72qlnb70bp8w5ahimrlv1dp972l9s9l5jc4pjg3";
-  buildDepends = [ asn1Encoding asn1Types mtl text ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-asn1";
-    description = "Simple monadic parser for ASN1 stream types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix
deleted file mode 100644
index d2566add400b..000000000000
--- a/pkgs/development/libraries/haskell/asn1-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hourglass }:
-
-cabal.mkDerivation (self: {
-  pname = "asn1-types";
-  version = "0.3.0";
-  sha256 = "1am8nmfarv7ymy3rqm0js2i82v6n6qwz0lnzb1qdmy4ligcdm65r";
-  buildDepends = [ hourglass ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-asn1-types";
-    description = "ASN.1 types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix
deleted file mode 100644
index 2ba1b50c5ca0..000000000000
--- a/pkgs/development/libraries/haskell/assert-failure/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, prettyShow, text }:
-
-cabal.mkDerivation (self: {
-  pname = "assert-failure";
-  version = "0.1.1.0";
-  sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1";
-  buildDepends = [ prettyShow text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/Mikolaj/assert-failure";
-    description = "Syntactic sugar improving 'assert' and 'error'";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
deleted file mode 100644
index 7a050defb4dc..000000000000
--- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "async";
-  version = "2.0.1.4";
-  sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1";
-  buildDepends = [ stm ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/simonmar/async";
-    description = "Run IO operations asynchronously and wait for their results";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.6.nix b/pkgs/development/libraries/haskell/async/2.0.1.6.nix
deleted file mode 100644
index 6c1aed15eab3..000000000000
--- a/pkgs/development/libraries/haskell/async/2.0.1.6.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "async";
-  version = "2.0.1.6";
-  sha256 = "06fzkqjliccxqiygms7v1xff3wlkg54n9xwzv7m1yxylkzlikjkz";
-  buildDepends = [ stm ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/simonmar/async";
-    description = "Run IO operations asynchronously and wait for their results";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix
deleted file mode 100644
index 5a84686d3a43..000000000000
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "atomic-primops";
-  version = "0.6.1";
-  sha256 = "1j8slmqsyhvx7xns1qpvbmcjsfqfkphycv32hgcmk17wl1fzbyi7";
-  buildDepends = [ primitive ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "A safe approach to CAS and other atomic ops in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix
deleted file mode 100644
index 3f95f14c35c0..000000000000
--- a/pkgs/development/libraries/haskell/attempt/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, failure }:
-
-cabal.mkDerivation (self: {
-  pname = "attempt";
-  version = "0.4.0.1";
-  sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
-  buildDepends = [ failure ];
-  meta = {
-    homepage = "http://github.com/snoyberg/attempt/tree/master";
-    description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix
deleted file mode 100644
index 6e69e3615853..000000000000
--- a/pkgs/development/libraries/haskell/atto-lisp/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, HUnit
-, testFramework, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "atto-lisp";
-  version = "0.2.2";
-  sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc";
-  buildDepends = [
-    attoparsec blazeBuilder blazeTextual deepseq text
-  ];
-  testDepends = [
-    attoparsec HUnit testFramework testFrameworkHunit text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/nominolo/atto-lisp";
-    description = "Efficient parsing and serialisation of S-Expressions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
deleted file mode 100644
index e0950ef517bb..000000000000
--- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec }:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec-binary";
-  version = "0.2";
-  sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5";
-  buildDepends = [ attoparsec ];
-  meta = {
-    description = "Binary processing extensions to Attoparsec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
deleted file mode 100644
index b2e64f272fd4..000000000000
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit }:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec-conduit";
-  version = "1.1.0";
-  sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y";
-  buildDepends = [ conduit ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Consume attoparsec parsers via conduit. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
deleted file mode 100644
index be5c1b4435a2..000000000000
--- a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, enumerator, text }:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec-enumerator";
-  version = "0.3.3";
-  sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w";
-  buildDepends = [ attoparsec enumerator text ];
-  meta = {
-    homepage = "https://john-millikin.com/software/attoparsec-enumerator/";
-    description = "Pass input from an enumerator to an Attoparsec parser";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix
deleted file mode 100644
index f53b32d53650..000000000000
--- a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, testFramework
-, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec";
-  version = "0.10.4.0";
-  sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n";
-  buildDepends = [ deepseq text ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 text
-  ];
-  meta = {
-    homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
deleted file mode 100644
index ef61d8c79a1e..000000000000
--- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, scientific, testFramework
-, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec";
-  version = "0.11.3.1";
-  sha256 = "0mmyab3a9mgmfxj1kc7xgxkmmcdj90ph9nzniv7bf2vyf8vhvirl";
-  buildDepends = [ deepseq scientific text ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
deleted file mode 100644
index a60838662487..000000000000
--- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, scientific, testFramework
-, testFrameworkQuickcheck2, text, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec";
-  version = "0.12.1.2";
-  sha256 = "1vazyr3fdahdg1q503sbj0zv4xj7sm7j32mjm856bm51j2s0rhlc";
-  buildDepends = [ deepseq scientific text ];
-  testDepends = [
-    deepseq QuickCheck scientific testFramework
-    testFrameworkQuickcheck2 text vector
-  ];
-  meta = {
-    homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
deleted file mode 100644
index a6f464156835..000000000000
--- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit
-, cryptoPubkeyTypes, dataDefault, httpClient, httpTypes, random
-, RSA, SHA, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "authenticate-oauth";
-  version = "1.5";
-  sha256 = "07y9zh4v9by588k86wlyj3czivj5jlb9jk6g4j9p8j1qgbv4hpk9";
-  buildDepends = [
-    base64Bytestring blazeBuilder blazeBuilderConduit cryptoPubkeyTypes
-    dataDefault httpClient httpTypes random RSA SHA time transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/yesodweb/authenticate";
-    description = "Library to authenticate with OAuth for Haskell web applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
deleted file mode 100644
index af966ebe7bfd..000000000000
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit
-, httpConduit, httpTypes, monadControl, networkUri, resourcet
-, tagstreamConduit, text, transformers, unorderedContainers
-, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "authenticate";
-  version = "1.3.2.10";
-  sha256 = "1dy38k5jpms3xrkw1zh7vjmx06yr5iibgh50m5i2wky2wmryqkf4";
-  buildDepends = [
-    aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
-    httpTypes monadControl networkUri resourcet tagstreamConduit text
-    transformers unorderedContainers xmlConduit
-  ];
-  meta = {
-    homepage = "http://github.com/yesodweb/authenticate";
-    description = "Authentication methods for Haskell web applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix
deleted file mode 100644
index 3ca150892447..000000000000
--- a/pkgs/development/libraries/haskell/auto-update/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "auto-update";
-  version = "0.1.2";
-  sha256 = "0ccix41jjpqkzvnfr5md1cbhsa9fkv6dy7yw73j8dnvqbqnz1z0l";
-  meta = {
-    homepage = "https://github.com/yesodweb/wai";
-    description = "Efficiently run periodic, on-demand actions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aws-ec2/default.nix b/pkgs/development/libraries/haskell/aws-ec2/default.nix
deleted file mode 100644
index 8fec25eb9cbc..000000000000
--- a/pkgs/development/libraries/haskell/aws-ec2/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aws, base16Bytestring, base64Bytestring
-, blazeBuilder, byteable, conduitExtra, cryptohash, httpConduit
-, httpTypes, mtl, optparseApplicative, resourcet, scientific, text
-, time, unorderedContainers, vector, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aws-ec2";
-  version = "0.2.2";
-  sha256 = "1jlm6a4mb3mzzvql8llnvci4qd8imf58m681iqhcw1qq6hy56srl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson aws base16Bytestring base64Bytestring blazeBuilder byteable
-    conduitExtra cryptohash httpConduit httpTypes mtl
-    optparseApplicative resourcet scientific text time
-    unorderedContainers vector xmlConduit
-  ];
-  meta = {
-    homepage = "https://github.com/zalora/aws-ec2";
-    description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
deleted file mode 100644
index 1069c9da1e9d..000000000000
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
-, blazeBuilder, byteable, caseInsensitive, cereal, conduit
-, conduitExtra, cryptohash, dataDefault, errors, filepath
-, httpClient, httpConduit, httpTypes, liftedBase, monadControl, mtl
-, network, QuickCheck, quickcheckInstances, resourcet, safe
-, scientific, tagged, tasty, tastyQuickcheck, text, time
-, transformers, transformersBase, unorderedContainers, utf8String
-, vector, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aws";
-  version = "0.11";
-  sha256 = "19q7r74c5xw04vpwl2fwm675bvkp3vhlak63iqfl1927z2jsyva9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec base16Bytestring base64Bytestring blazeBuilder
-    byteable caseInsensitive cereal conduit conduitExtra cryptohash
-    dataDefault filepath httpConduit httpTypes liftedBase monadControl
-    mtl network resourcet safe scientific tagged text time transformers
-    unorderedContainers utf8String vector xmlConduit
-  ];
-  testDepends = [
-    aeson errors httpClient liftedBase monadControl mtl QuickCheck
-    quickcheckInstances resourcet tagged tasty tastyQuickcheck text
-    time transformers transformersBase
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/aristidb/aws";
-    description = "Amazon Web Services (AWS) for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix
deleted file mode 100644
index 6714ad547de3..000000000000
--- a/pkgs/development/libraries/haskell/base-compat/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, errorcallEqInstance, hspec, QuickCheck, setenv }:
-
-cabal.mkDerivation (self: {
-  pname = "base-compat";
-  version = "0.5.0";
-  sha256 = "1zlpfpfnaqf8rrha19arh882bc560dcw2zwi4j3qrn3lzyh8s1d1";
-  buildDepends = [ errorcallEqInstance setenv ];
-  testDepends = [ hspec QuickCheck ];
-  meta = {
-    description = "A compatibility layer for base";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix
deleted file mode 100644
index a44cdbfa6c11..000000000000
--- a/pkgs/development/libraries/haskell/base-prelude/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "base-prelude";
-  version = "0.1.11";
-  sha256 = "0g6p1d3r6jbqcd8flxfbasb40ga7k90bc0q07drwhlaiadjnx1an";
-  meta = {
-    homepage = "https://github.com/nikita-volkov/base-prelude";
-    description = "The most complete prelude formed from only the \"base\" package";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
deleted file mode 100644
index 1e32a6e26e03..000000000000
--- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "base-unicode-symbols";
-  version = "0.2.2.4";
-  sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52";
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
-    description = "Unicode alternatives for common functions and operators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
deleted file mode 100644
index 36f0bf6935ba..000000000000
--- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "base16-bytestring";
-  version = "0.1.1.6";
-  sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
-  meta = {
-    homepage = "http://github.com/bos/base16-bytestring";
-    description = "Fast base16 (hex) encoding and decoding for ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base32-bytestring/default.nix b/pkgs/development/libraries/haskell/base32-bytestring/default.nix
deleted file mode 100644
index d6f91424da23..000000000000
--- a/pkgs/development/libraries/haskell/base32-bytestring/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bitsExtras, cpu, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "base32-bytestring";
-  version = "0.2.1.0";
-  sha256 = "0z0q3fw3jzprgxmq9b2iz98kf4hwl3nydrzlaiwk81aplisfdgkl";
-  buildDepends = [ bitsExtras cpu ];
-  testDepends = [ hspec QuickCheck ];
-  meta = {
-    homepage = "https://github.com/pxqr/base32-bytestring";
-    description = "Fast base32 and base32hex codec for ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
deleted file mode 100644
index 39c65dd52500..000000000000
--- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "base64-bytestring";
-  version = "1.0.0.1";
-  sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/base64-bytestring";
-    description = "Fast base64 encoding and decoding for ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix
deleted file mode 100644
index 26ab4dc4924f..000000000000
--- a/pkgs/development/libraries/haskell/base64-string/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "base64-string";
-  version = "0.2";
-  sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y";
-  meta = {
-    homepage = "http://urchin.earth.li/~ian/cabal/base64-string/";
-    description = "Base64 implementation for String's";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
deleted file mode 100644
index 5cbd6c9fe143..000000000000
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, liftedBase, ReadArgs, safe, systemFilepath, text
-, transformers, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "basic-prelude";
-  version = "0.3.10";
-  sha256 = "10013ni7kpqlc6s3ryfvmklw3ic5h48rm4wsrb31pcp5xja0qk59";
-  buildDepends = [
-    hashable liftedBase ReadArgs safe systemFilepath text transformers
-    unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/basic-prelude";
-    description = "An enhanced core prelude; a common foundation for alternate preludes";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix
deleted file mode 100644
index 44e73f609f3a..000000000000
--- a/pkgs/development/libraries/haskell/benchpress/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "benchpress";
-  version = "0.2.2.6";
-  sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
-  buildDepends = [ mtl time ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/tibbe/benchpress";
-    description = "Micro-benchmarking with detailed statistics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bencode/default.nix b/pkgs/development/libraries/haskell/bencode/default.nix
deleted file mode 100644
index 2d4630dc867b..000000000000
--- a/pkgs/development/libraries/haskell/bencode/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "bencode";
-  version = "0.5";
-  sha256 = "018cj7h5llvnqyr1jd9nif2ig9hz8d8vmi9iax07all567yhy378";
-  buildDepends = [ binary parsec ];
-  meta = {
-    description = "Parser and printer for bencoded data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bencoding/default.nix b/pkgs/development/libraries/haskell/bencoding/default.nix
deleted file mode 100644
index 325343985ac8..000000000000
--- a/pkgs/development/libraries/haskell/bencoding/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, deepseq, hspec, mtl, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "bencoding";
-  version = "0.4.3.0";
-  sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc";
-  buildDepends = [ attoparsec deepseq mtl text ];
-  testDepends = [ attoparsec hspec QuickCheck ];
-  meta = {
-    homepage = "https://github.com/cobit/bencoding";
-    description = "A library for encoding and decoding of BEncode data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix
deleted file mode 100644
index 953407735e61..000000000000
--- a/pkgs/development/libraries/haskell/bert/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, binary, binaryConduit, conduit, conduitExtra, mtl
-, network, parsec, smallcheck, tasty, tastyHunit, tastySmallcheck
-, time, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bert";
-  version = "1.2.2.3";
-  sha256 = "1waq40hd9wqavzhnvfk1i6wjqkmfb4pl17h4acfzzyz8bj76alkq";
-  buildDepends = [
-    binary binaryConduit conduit conduitExtra mtl network parsec time
-    void
-  ];
-  testDepends = [
-    async binary network smallcheck tasty tastyHunit tastySmallcheck
-  ];
-  meta = {
-    homepage = "https://github.com/feuerbach/bert";
-    description = "BERT implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix
deleted file mode 100644
index 78a34c53b37d..000000000000
--- a/pkgs/development/libraries/haskell/bifunctors/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroupoids, semigroups, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "bifunctors";
-  version = "4.2";
-  sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6";
-  buildDepends = [ semigroupoids semigroups tagged ];
-  meta = {
-    homepage = "http://github.com/ekmett/bifunctors/";
-    description = "Bifunctors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix
deleted file mode 100644
index 4a9d4aa41bc6..000000000000
--- a/pkgs/development/libraries/haskell/bimap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bimap";
-  version = "0.2.4";
-  sha256 = "d991ae393ade2191f42d8a0d659d2b9a749675735eb5b57872f577ede82565c5";
-  meta = {
-    homepage = "http://code.haskell.org/bimap";
-    description = "Bidirectional mapping between two key types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix
deleted file mode 100644
index c7547a7b12b7..000000000000
--- a/pkgs/development/libraries/haskell/binary-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, conduit, hspec, QuickCheck, quickcheckAssertions
-, resourcet, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "binary-conduit";
-  version = "1.2.3";
-  sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr";
-  buildDepends = [ binary conduit resourcet vector ];
-  testDepends = [
-    binary conduit hspec QuickCheck quickcheckAssertions resourcet
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/qnikst/binary-conduit/";
-    description = "data serialization/deserialization conduit library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix
deleted file mode 100644
index bfeef7c0cb62..000000000000
--- a/pkgs/development/libraries/haskell/binary-shared/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "binary-shared";
-  version = "0.8.3";
-  sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3";
-  buildDepends = [ binary mtl ];
-  meta = {
-    homepage = "http://www.leksah.org";
-    description = "Sharing for the binary package";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary-strict/default.nix b/pkgs/development/libraries/haskell/binary-strict/default.nix
deleted file mode 100644
index e62fd782ad94..000000000000
--- a/pkgs/development/libraries/haskell/binary-strict/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "binary-strict";
-  version = "0.4.8.1";
-  sha256 = "07mmh4x8qjpw7w35nxcq8wayy4bagjblbwkpvh3xd38rxpdnl6pi";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://code.haskell.org/binary-low-level";
-    description = "Binary deserialisation using strict ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.2.nix b/pkgs/development/libraries/haskell/binary/0.7.2.2.nix
deleted file mode 100644
index 60eaf0e00311..000000000000
--- a/pkgs/development/libraries/haskell/binary/0.7.2.2.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HUnit, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "binary";
-  version = "0.7.2.2";
-  sha256 = "10z1b9axgfg9kb44b8sfxd5mak5qaqyjfwn4i21y37zgf7wadblr";
-  testDepends = [
-    Cabal filepath HUnit QuickCheck random testFramework
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/kolmodin/binary";
-    description = "Binary serialisation for Haskell values using lazy ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
deleted file mode 100644
index 846f5d6486d1..000000000000
--- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-DSL";
-  version = "1.0.21";
-  sha256 = "0fbrl9jfkwlv66v3cv6cj51kk7jjdry0jz8k83bf4mav26123mk9";
-  meta = {
-    homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
-    description = "FFI domain specific language, on top of hsc2hs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
deleted file mode 100644
index 08e14a782bf1..000000000000
--- a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, HUnit, libX11, libXext, libXfixes, libXi
-, libXrandr, libXxf86vm, mesa, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-GLFW";
-  version = "3.0.3.3";
-  sha256 = "0w6vqshlk0c4k4q81xw7kg4j62h3wpccpy8qbiq5ks69w7z13fy4";
-  buildDepends = [ bindingsDSL ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  extraLibraries = [
-    libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa
-  ];
-  doCheck = false;
-  meta = {
-    description = "Low-level bindings to GLFW OpenGL library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-libusb/default.nix b/pkgs/development/libraries/haskell/bindings-libusb/default.nix
deleted file mode 100644
index e6f429245883..000000000000
--- a/pkgs/development/libraries/haskell/bindings-libusb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, libusb }:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-libusb";
-  version = "1.4.5.0";
-  sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66";
-  buildDepends = [ bindingsDSL ];
-  pkgconfigDepends = [ libusb ];
-  meta = {
-    homepage = "https://github.com/basvandijk/bindings-libusb";
-    description = "Low level bindings to libusb";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-portaudio/default.nix b/pkgs/development/libraries/haskell/bindings-portaudio/default.nix
deleted file mode 100644
index 6ae304d6c75c..000000000000
--- a/pkgs/development/libraries/haskell/bindings-portaudio/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, portaudio }:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-portaudio";
-  version = "0.1";
-  sha256 = "0wcxq300ijfkf4zc7p4xwsd9wzhnlss0kxjf04fka01mf9bh3ai2";
-  buildDepends = [ bindingsDSL ];
-  pkgconfigDepends = [ portaudio ];
-  meta = {
-    description = "Low-level bindings to portaudio library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
deleted file mode 100644
index 49caa0e491ea..000000000000
--- a/pkgs/development/libraries/haskell/bindings-posix/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL }:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-posix";
-  version = "1.2.6";
-  sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
-  buildDepends = [ bindingsDSL ];
-  meta = {
-    description = "Low level bindings to posix";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix
deleted file mode 100644
index f063622e8def..000000000000
--- a/pkgs/development/libraries/haskell/bitarray/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bitarray";
-  version = "0.0.1.1";
-  sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj";
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "Mutable and immutable bit arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix
deleted file mode 100644
index 74c78cab7060..000000000000
--- a/pkgs/development/libraries/haskell/bitmap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bitmap";
-  version = "0.0.2";
-  sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix
deleted file mode 100644
index f45c5a87de95..000000000000
--- a/pkgs/development/libraries/haskell/bits-atomic/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bits-atomic";
-  version = "0.1.3";
-  sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "Atomic bit operations on memory locations for low-level synchronization";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bits-extras/default.nix b/pkgs/development/libraries/haskell/bits-extras/default.nix
deleted file mode 100644
index 3876eabfcaf7..000000000000
--- a/pkgs/development/libraries/haskell/bits-extras/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bits-extras";
-  version = "0.1.3";
-  sha256 = "0sy9dksmdx0773bsn8yi5hw4qpgn16g8aqqj888w1x75cbsxr997";
-  isLibrary = true;
-  isExecutable = true;
-  configureFlags = "--ghc-option=-lgcc_s";
-  meta = {
-    description = "Efficient high-level bit operations not found in Data.Bits";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bitset/default.nix b/pkgs/development/libraries/haskell/bitset/default.nix
deleted file mode 100644
index dfb71a978cb3..000000000000
--- a/pkgs/development/libraries/haskell/bitset/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, gmp, QuickCheck, tasty, tastyQuickcheck }:
-
-cabal.mkDerivation (self: {
-  pname = "bitset";
-  version = "1.4.8";
-  sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988";
-  buildDepends = [ deepseq ];
-  testDepends = [ QuickCheck tasty tastyQuickcheck ];
-  extraLibraries = [ gmp ];
-  doCheck = false;
-  meta = {
-    description = "A space-efficient set data structure";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix
deleted file mode 100644
index 6797a2b950ac..000000000000
--- a/pkgs/development/libraries/haskell/bktrees/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bktrees";
-  version = "0.3.1";
-  sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9";
-  meta = {
-    description = "A set data structure with approximate searching";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blank-canvas/default.nix b/pkgs/development/libraries/haskell/blank-canvas/default.nix
deleted file mode 100644
index 47c343f49b88..000000000000
--- a/pkgs/development/libraries/haskell/blank-canvas/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, colour, dataDefaultClass
-, httpTypes, kansasComet, scotty, stm, text, transformers, vector
-, wai, waiExtra, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "blank-canvas";
-  version = "0.5";
-  sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
-  buildDepends = [
-    aeson base64Bytestring colour dataDefaultClass httpTypes
-    kansasComet scotty stm text transformers vector wai waiExtra warp
-  ];
-  meta = {
-    homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
-    description = "HTML5 Canvas Graphics Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
deleted file mode 100644
index 02b7950a481e..000000000000
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-builder-conduit";
-  version = "1.1.0";
-  sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3";
-  buildDepends = [ conduit ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Convert streams of builders to streams of bytestrings. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
deleted file mode 100644
index a32b89e2eb7a..000000000000
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, enumerator, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-builder-enumerator";
-  version = "0.2.0.6";
-  sha256 = "0pdw18drvikb465qh43b8wjyvpqj3wcilyczc21fri5ma4mxdkyp";
-  buildDepends = [ blazeBuilder enumerator transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/meiersi/blaze-builder-enumerator";
-    description = "Enumeratees for the incremental conversion of builders to bytestrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
deleted file mode 100644
index 4dd5376cad35..000000000000
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-builder";
-  version = "0.3.3.4";
-  sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://github.com/meiersi/blaze-builder";
-    description = "Efficient buffered output";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-from-html/default.nix b/pkgs/development/libraries/haskell/blaze-from-html/default.nix
deleted file mode 100644
index 4897e7505560..000000000000
--- a/pkgs/development/libraries/haskell/blaze-from-html/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, tagsoup }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-from-html";
-  version = "0.3.2.1";
-  sha256 = "1li3zxrgwj5rgk894d9zwfxnx5dfjzkvjlcyck2g7s0awfp2kq4s";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath tagsoup ];
-  meta = {
-    homepage = "http://jaspervdj.be/blaze";
-    description = "Tool to convert HTML to BlazeHtml code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
deleted file mode 100644
index 16c967d78a20..000000000000
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, blazeMarkup, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-html";
-  version = "0.7.0.3";
-  sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx";
-  buildDepends = [ blazeBuilder blazeMarkup text ];
-  testDepends = [
-    blazeBuilder blazeMarkup HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text
-  ];
-  meta = {
-    homepage = "http://jaspervdj.be/blaze";
-    description = "A blazingly fast HTML combinator library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
deleted file mode 100644
index cdea333abcde..000000000000
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-markup";
-  version = "0.6.1.1";
-  sha256 = "1ah6fgfqsmarq8g4gw81yhckz4pclb2ifxv237cqz5zhy9il4j5d";
-  buildDepends = [ blazeBuilder text ];
-  testDepends = [
-    blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
-  ];
-  meta = {
-    homepage = "http://jaspervdj.be/blaze";
-    description = "A blazingly fast markup combinator library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix
deleted file mode 100644
index bf5bc4c262c6..000000000000
--- a/pkgs/development/libraries/haskell/blaze-svg/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeMarkup, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-svg";
-  version = "0.3.4";
-  sha256 = "061011qrpqiyag9549hn0hfikvkrin5wb3cf0zfm9n80cgvzmqd3";
-  buildDepends = [ blazeMarkup mtl ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/deepakjois/blaze-svg";
-    description = "SVG combinator library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
deleted file mode 100644
index b3f3334684d8..000000000000
--- a/pkgs/development/libraries/haskell/blaze-textual/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, doubleConversion, QuickCheck, testFramework
-, testFrameworkQuickcheck2, text, time, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-textual";
-  version = "0.2.0.9";
-  sha256 = "1gwy1pjnc2ikxfxn9c751rnydry1hmlfk13k29xnns9vwglf81f0";
-  buildDepends = [ blazeBuilder text time vector ];
-  testDepends = [
-    blazeBuilder doubleConversion QuickCheck testFramework
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/bos/blaze-textual";
-    description = "Fast rendering of common datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix
deleted file mode 100644
index 2494f08eaac3..000000000000
--- a/pkgs/development/libraries/haskell/bloomfilter/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bloomfilter";
-  version = "2.0.0.0";
-  sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f";
-  buildDepends = [ deepseq ];
-  # https://github.com/bos/bloomfilter/pull/8
-  preConfigure = ''
-    sed -i -e "s/0xffffffff/0x7fffffff/" Data/BloomFilter/Easy.hs
-  '';
-  testDepends = [
-    QuickCheck random testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/bos/bloomfilter";
-    description = "Pure and impure Bloom Filter implementations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix
deleted file mode 100644
index 3147b139409f..000000000000
--- a/pkgs/development/libraries/haskell/bmp/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "bmp";
-  version = "1.2.5.2";
-  sha256 = "0f88f2ynm1fpzbjijy5fa8blfrdv42h5h28hfjlpd4fp0h96in5x";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://code.ouroborus.net/bmp";
-    description = "Read and write uncompressed BMP image files";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bool-extras/default.nix b/pkgs/development/libraries/haskell/bool-extras/default.nix
deleted file mode 100644
index f180670f9b9e..000000000000
--- a/pkgs/development/libraries/haskell/bool-extras/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bool-extras";
-  version = "0.4.0";
-  sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
-  meta = {
-    homepage = "http://tom.lokhorst.eu/bool-extras";
-    description = "A fold function for Bool";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
deleted file mode 100644
index 82d45baf88ae..000000000000
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "boomerang";
-  version = "1.4.5";
-  sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q";
-  buildDepends = [ mtl text ];
-  meta = {
-    description = "Library for invertible parsing and printing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bound/default.nix b/pkgs/development/libraries/haskell/bound/default.nix
deleted file mode 100644
index dd1f288a1b97..000000000000
--- a/pkgs/development/libraries/haskell/bound/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, binary, bytes, cereal, comonad, doctest
-, filepath, hashable, hashableExtras, preludeExtras, profunctors
-, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bound";
-  version = "1.0.4";
-  sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky";
-  buildDepends = [
-    bifunctors binary bytes cereal comonad hashable hashableExtras
-    preludeExtras profunctors transformers
-  ];
-  testDepends = [
-    doctest filepath preludeExtras transformers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/bound/";
-    description = "Making de Bruijn Succ Less";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/boundingboxes/default.nix b/pkgs/development/libraries/haskell/boundingboxes/default.nix
deleted file mode 100644
index ab5cfabad448..000000000000
--- a/pkgs/development/libraries/haskell/boundingboxes/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, linear, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2, testFrameworkTh
-}:
-
-cabal.mkDerivation (self: {
-  pname = "boundingboxes";
-  version = "0.2.2";
-  sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx";
-  buildDepends = [ lens ];
-  testDepends = [
-    lens linear QuickCheck random testFramework
-    testFrameworkQuickcheck2 testFrameworkTh
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fumieval/boundingboxes";
-    description = "A generic boundingbox for an arbitrary vector";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/boxes/default.nix b/pkgs/development/libraries/haskell/boxes/default.nix
deleted file mode 100644
index aa2a95b621d6..000000000000
--- a/pkgs/development/libraries/haskell/boxes/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, split }:
-
-cabal.mkDerivation (self: {
-  pname = "boxes";
-  version = "0.1.3";
-  sha256 = "1sia3j0x7m68j6j9n7bi1l1yg56ivpkxd95l19xl5vpkg03qizkq";
-  buildDepends = [ split ];
-  meta = {
-    description = "2D text pretty-printing library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
deleted file mode 100644
index 3f7849efaf45..000000000000
--- a/pkgs/development/libraries/haskell/brainfuck/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "brainfuck";
-  version = "0.1";
-  sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Brainfuck interpreter";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
deleted file mode 100644
index 2bcace9da742..000000000000
--- a/pkgs/development/libraries/haskell/bson/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cryptohash, dataBinaryIeee754, mtl, network
-, QuickCheck, testFramework, testFrameworkQuickcheck2, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bson";
-  version = "0.3.1";
-  sha256 = "1kihsjws8sqb44gvilh1zxrqn2bml8gxq2bbanxqb7nr4ymwfkiv";
-  buildDepends = [
-    binary cryptohash dataBinaryIeee754 mtl network text time
-  ];
-  testDepends = [
-    binary cryptohash dataBinaryIeee754 mtl network QuickCheck
-    testFramework testFrameworkQuickcheck2 text time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/mongodb-haskell/bson";
-    description = "BSON documents are JSON-like objects with a standard binary encoding";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix
deleted file mode 100644
index 1e12288624fc..000000000000
--- a/pkgs/development/libraries/haskell/bv/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bv";
-  version = "0.3.0";
-  sha256 = "0r2bp39ilwq3zx38spbx5qrpccwm255ax2skab3i7jxjmf7yj025";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://bitbucket.org/iago/bv-haskell";
-    description = "Bit-vector arithmetic library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/byteable/default.nix b/pkgs/development/libraries/haskell/byteable/default.nix
deleted file mode 100644
index 9adc98599e59..000000000000
--- a/pkgs/development/libraries/haskell/byteable/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "byteable";
-  version = "0.1.1";
-  sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-byteable";
-    description = "Type class for sequence of bytes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytedump/default.nix b/pkgs/development/libraries/haskell/bytedump/default.nix
deleted file mode 100644
index 3031f53d839f..000000000000
--- a/pkgs/development/libraries/haskell/bytedump/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bytedump";
-  version = "1.0";
-  sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-bytedump";
-    description = "Flexible byte dump helpers for human readers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix
deleted file mode 100644
index 123625233fca..000000000000
--- a/pkgs/development/libraries/haskell/byteorder/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "byteorder";
-  version = "1.0.4";
-  sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
-  meta = {
-    homepage = "http://community.haskell.org/~aslatter/code/byteorder";
-    description = "Exposes the native endianness or byte ordering of the system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix
deleted file mode 100644
index 1ad3446bd0cf..000000000000
--- a/pkgs/development/libraries/haskell/bytes/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cereal, doctest, filepath, mtl, text, time
-, transformers, transformersCompat, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bytes";
-  version = "0.14.1.2";
-  sha256 = "1v1nnp1m5i4bfr0fshbps163v6yn6var53p0vcvav6g4w5wffd7d";
-  buildDepends = [
-    binary cereal mtl text time transformers transformersCompat void
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/analytics/bytes";
-    description = "Sharing code for serialization between binary and cereal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
deleted file mode 100644
index bcc0f3d0a768..000000000000
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-lexing";
-  version = "0.4.3.2";
-  sha256 = "09ymg1n21668wn4harxg0cqlz98fz990bangpy99w2z7d6cwbc05";
-  buildTools = [ alex ];
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Parse and produce literals efficiently from strict or lazy bytestrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
deleted file mode 100644
index 1be3a48144cf..000000000000
--- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-mmap";
-  version = "0.2.2";
-  sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/";
-    description = "mmap support for strict ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
deleted file mode 100644
index c311fbe17388..000000000000
--- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-nums";
-  version = "0.3.6";
-  sha256 = "1kg777gpqj05h5bj0637yky64bdx7x77hm7nq2rhpw4i1mh9gjmx";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://github.com/solidsnack/bytestring-nums";
-    description = "Parse numeric literals from ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix
deleted file mode 100644
index 33d6a17b0293..000000000000
--- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, terminalProgressBar, time }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-progress";
-  version = "1.0.3";
-  sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs";
-  buildDepends = [ terminalProgressBar time ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/acw/bytestring-progress";
-    description = "A library for tracking the consumption of a lazy ByteString";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-show/default.nix b/pkgs/development/libraries/haskell/bytestring-show/default.nix
deleted file mode 100644
index c36bf611ab47..000000000000
--- a/pkgs/development/libraries/haskell/bytestring-show/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-show";
-  version = "0.3.5.6";
-  sha256 = "04h81a0bh2fvnkby1qafnydb29gzk6d4d311i2lbn7lm2vyjw919";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://code.haskell.org/~dolio/";
-    description = "Efficient conversion of values into readable byte strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
deleted file mode 100644
index da84b55cc0f9..000000000000
--- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-trie";
-  version = "0.2.4";
-  sha256 = "1fv3xh52hqhzdbq78c3lrgx5vd49cabwp9ww5ki1888zlq29pyck";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "An efficient finite map from (byte)strings to values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bzlib/default.nix b/pkgs/development/libraries/haskell/bzlib/default.nix
deleted file mode 100644
index 9699cd8cad60..000000000000
--- a/pkgs/development/libraries/haskell/bzlib/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bzip2 }:
-
-cabal.mkDerivation (self: {
-  pname = "bzlib";
-  version = "0.5.0.4";
-  sha256 = "1vf37y7wknrihf7hipd6lihkmn7sszbgfb325my52yzbjs3baccd";
-  extraLibraries = [ bzip2 ];
-  meta = {
-    description = "Compression and decompression in the bzip2 format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
deleted file mode 100644
index ba535cd13b2d..000000000000
--- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens
-, strict, systemFileio, systemFilepath, tasty, tastyGolden, text
-, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-cargs";
-  version = "0.7.5";
-  sha256 = "0z17s4w9wlmdqbzh0c1jwqfp4d6599hqv0r4dzm9djb0x8vj327k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal cabalLenses cmdargs either lens strict systemFileio
-    systemFilepath text transformers unorderedContainers
-  ];
-  testDepends = [ filepath tasty tastyGolden ];
-  jailbreak = true;
-  meta = {
-    description = "A command line program for extracting compiler arguments from a cabal file";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
deleted file mode 100644
index 2b1dcdd65583..000000000000
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-file-th";
-  version = "0.2.3";
-  sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8";
-  buildDepends = [ Cabal ];
-  meta = {
-    homepage = "http://github.com/nkpart/cabal-file-th";
-    description = "Template Haskell expressions for reading fields from a project's cabal file";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
deleted file mode 100644
index 256cba3734cc..000000000000
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, lens, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-lenses";
-  version = "0.4.2";
-  sha256 = "0vsicvk979qznm3b174r6d5wkkyhpqx8gxjs5jw9na2jhimzjcjf";
-  buildDepends = [ Cabal lens unorderedContainers ];
-  jailbreak = true;
-  meta = {
-    description = "Lenses and traversals for the Cabal library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix
deleted file mode 100644
index f147fe4b2818..000000000000
--- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, fgl, filepath, parsec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-macosx";
-  version = "0.2.3";
-  sha256 = "0rvmb6lx2alr7f0v7nbv48xzg7wp4nrn03hdkjc4a4c97rai14i9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ Cabal fgl filepath parsec text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/gimbo/cabal-macosx";
-    description = "Cabal support for creating Mac OSX application bundles";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabalg/default.nix b/pkgs/development/libraries/haskell/cabalg/default.nix
deleted file mode 100644
index 62dea42b3d5e..000000000000
--- a/pkgs/development/libraries/haskell/cabalg/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "cabalg";
-  version = "0.2.9";
-  sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    description = "alias for cabal install from given git repo";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ dmalikov ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
deleted file mode 100644
index 8f64f23585c5..000000000000
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, text
-, utf8String, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cairo";
-  version = "0.13.0.5";
-  sha256 = "0ak6hzfrcyxajx7qybsmd5g26blqb6zxvv8r2a8bnylvm5sdj70r";
-  buildDepends = [ mtl text utf8String ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ cairo libc pkgconfig zlib ];
-  pkgconfigDepends = [ cairo ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Cairo library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/call/default.nix b/pkgs/development/libraries/haskell/call/default.nix
deleted file mode 100644
index c11a07ae94c1..000000000000
--- a/pkgs/development/libraries/haskell/call/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsPortaudio, boundingboxes, cleanUnions, colors
-, controlBool, deepseq, distributive, elevator, filepath, freetype2
-, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens, linear
-, minioperational, mtl, objective, OpenGL, OpenGLRaw, random
-, reflection, text, transformers, vector, WAVE
-}:
-
-cabal.mkDerivation (self: {
-  pname = "call";
-  version = "0.1.1.2";
-  sha256 = "1g96asydq0lc07xf2c709zdv99r6ljs5a7jm6fvlyjswqnbrwy9s";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    bindingsPortaudio boundingboxes cleanUnions colors controlBool
-    deepseq distributive elevator filepath freetype2 GLFWB hashable
-    JuicyPixels JuicyPixelsUtil lens linear minioperational mtl
-    objective OpenGL OpenGLRaw random reflection text transformers
-    vector WAVE
-  ];
-  meta = {
-    homepage = "https://github.com/fumieval/call";
-    description = "The call game engine";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/carray/default.nix b/pkgs/development/libraries/haskell/carray/default.nix
deleted file mode 100644
index 42fbad8b07d4..000000000000
--- a/pkgs/development/libraries/haskell/carray/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, ixShapable, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "carray";
-  version = "0.1.5.2";
-  sha256 = "0kjqxjnamhnpjjf2bgm1gnsy6jx1fjbn5mx394pyx1vq3lkfgfb0";
-  buildDepends = [ binary ixShapable syb ];
-  meta = {
-    description = "A C-compatible array library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix
deleted file mode 100644
index d0b40e42d487..000000000000
--- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, HUnit, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "case-insensitive";
-  version = "1.0.0.1";
-  sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/basvandijk/case-insensitive";
-    description = "Case insensitive string comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix
deleted file mode 100644
index 650c45ada96a..000000000000
--- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, HUnit, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "case-insensitive";
-  version = "1.0.0.2";
-  sha256 = "11cczwg11y6pfsidj1i052rhri98sgg2qzf0ixgjq1gywakjx5f2";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "https://github.com/basvandijk/case-insensitive";
-    description = "Case insensitive string comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
deleted file mode 100644
index 96b5bc114a33..000000000000
--- a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, HUnit, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "case-insensitive";
-  version = "1.2.0.1";
-  sha256 = "1hnckzi6yq3332fx4b140lwa9p6x69rlpaw6y1pmldj2h9nsxl6m";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "https://github.com/basvandijk/case-insensitive";
-    description = "Case insensitive string comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix
deleted file mode 100644
index 0ae9782a33b8..000000000000
--- a/pkgs/development/libraries/haskell/cassava/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cassava";
-  version = "0.4.2.0";
-  sha256 = "1v1izdjd4maqrlpm4cf2xpackpjp1i4vg1s7mzq90dwa6r9572x3";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq text unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/tibbe/cassava";
-    description = "A CSV parsing and encoding library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix
deleted file mode 100644
index 0f923d377380..000000000000
--- a/pkgs/development/libraries/haskell/categories/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, void }:
-
-cabal.mkDerivation (self: {
-  pname = "categories";
-  version = "1.0.6";
-  sha256 = "0i5mrxbhqj5g46lvwbw2m07prjvfwja6q8648qm6bq54z6zrl5cy";
-  buildDepends = [ void ];
-  meta = {
-    homepage = "http://github.com/ekmett/categories";
-    description = "Categories";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
deleted file mode 100644
index e99557b79892..000000000000
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "cautious-file";
-  version = "1.0.2";
-  sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
-  buildDepends = [ filepath ];
-  doCheck = false;
-  meta = {
-    description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
deleted file mode 100644
index baad29433582..000000000000
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, conduit, HUnit, mtl, resourcet, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "cereal-conduit";
-  version = "0.7.2.3";
-  sha256 = "0s1s8jm25wxj44x44vjz4kz5qblkyjaz7f8rw5i81bzam32afj9s";
-  buildDepends = [ cereal conduit resourcet transformers ];
-  testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
-  meta = {
-    homepage = "https://github.com/snoyberg/conduit";
-    description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
deleted file mode 100644
index 906222c3bbb3..000000000000
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "cereal";
-  version = "0.4.1.0";
-  sha256 = "0m0iwjf9bds4nwk1rgr19rvjri4kncn37k51l1n9y869r104b8lb";
-  meta = {
-    description = "A binary serialization library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
deleted file mode 100644
index 5c5c82196ffa..000000000000
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Data, cryptohash, cryptoPubkeyTypes, filepath, mtl
-, pem, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "certificate";
-  version = "1.3.9";
-  sha256 = "18g5rq7lpxmvmlnz610537w6mix6z6kxjrfj2ylbhkc81r5pn9g6";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "Certificates and Key Reader/Writer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix
deleted file mode 100644
index c1c284ad70c8..000000000000
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, parsec, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "cgi";
-  version = "3001.1.7.5";
-  sha256 = "1zdgdzkrzclf492pb9px5a490mxfxl5c1099axcxxm9wlpmf49ji";
-  buildDepends = [ mtl network parsec xhtml ];
-  meta = {
-    homepage = "http://andersk.mit.edu/haskell/cgi/";
-    description = "A library for writing CGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
deleted file mode 100644
index 2bacef96e085..000000000000
--- a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, mtl, network, networkUri, parsec, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "cgi";
-  version = "3001.2.0.0";
-  sha256 = "03az978d5ayv5v4g89h4wajjhcribyf37b8ws8kvsqir3i7h7k8d";
-  buildDepends = [ exceptions mtl network networkUri parsec xhtml ];
-  meta = {
-    homepage = "https://github.com/cheecheeo/haskell-cgi";
-    description = "A library for writing CGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix
deleted file mode 100644
index 91f7920fceaf..000000000000
--- a/pkgs/development/libraries/haskell/cgrep/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, cmdargs, dlist, either, filepath, mtl
-, regexPosix, safe, split, stm, stringsearch, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cgrep";
-  version = "6.4.9";
-  sha256 = "1g5np8r5h8hxgyxr3m7595xh7fiq1b8h9w6vm0ly81949lbwclga";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal cmdargs dlist either filepath mtl regexPosix safe
-    split stm stringsearch unorderedContainers
-  ];
-  meta = {
-    homepage = "http://awgn.github.io/cgrep/";
-    description = "Command line tool";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix
deleted file mode 100644
index 1b37fd77bd98..000000000000
--- a/pkgs/development/libraries/haskell/charset/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroups, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "charset";
-  version = "0.3.7";
-  sha256 = "1x912dx5650x8ql3ivhpiwmxd6kv7zghark3s8ljvl1g3qr1pxd6";
-  buildDepends = [ semigroups unorderedContainers ];
-  meta = {
-    homepage = "http://github.com/ekmett/charset";
-    description = "Fast unicode character sets based on complemented PATRICIA tries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix b/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix
deleted file mode 100644
index 39571e4a87c7..000000000000
--- a/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "charsetdetect-ae";
-  version = "1.0.1";
-  sha256 = "0bvdnv608glim8yn4dvh3av7x0fxxp3z6719j0n005bygdfgjxna";
-  meta = {
-    homepage = "http://github.com/Aelve/charsetdetect-ae";
-    description = "Character set detection using Mozilla's Universal Character Set Detector";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/chaselev-deque/default.nix b/pkgs/development/libraries/haskell/chaselev-deque/default.nix
deleted file mode 100644
index 0b271ce5f687..000000000000
--- a/pkgs/development/libraries/haskell/chaselev-deque/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractDeque, abstractDequeTests, atomicPrimops
-, bitsAtomic, HUnit, testFramework, testFrameworkHunit
-, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "chaselev-deque";
-  version = "0.5.0.3";
-  sha256 = "1qkrypqsbfnr6kcl6idqmq2z4nf6jmqmgzddzhh031nxd22p18y6";
-  buildDepends = [
-    abstractDeque atomicPrimops bitsAtomic transformers vector
-  ];
-  testDepends = [
-    abstractDeque abstractDequeTests atomicPrimops HUnit testFramework
-    testFrameworkHunit vector
-  ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "Chase & Lev work-stealing lock-free double-ended queues (deques)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix
deleted file mode 100644
index 7d96433a588c..000000000000
--- a/pkgs/development/libraries/haskell/cheapskate/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, dataDefault, httpTypes, mtl, syb, text
-, uniplate, wai, waiExtra, xssSanitize
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cheapskate";
-  version = "0.1.0.2";
-  sha256 = "1bz3zi2w5vm128csg21swcz4cm7h8ybqylpknr4fnyxmg3gxdd7d";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson blazeHtml dataDefault httpTypes mtl syb text uniplate wai
-    waiExtra xssSanitize
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jgm/cheapskate";
-    description = "Experimental markdown processor";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix
deleted file mode 100644
index 65f9d20a19af..000000000000
--- a/pkgs/development/libraries/haskell/checkers/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, random }:
-
-cabal.mkDerivation (self: {
-  pname = "checkers";
-  version = "0.4.1";
-  sha256 = "19ndgbivd07vchsqs6z9iqjl2jldbq7h4skqc9acracd9xyq1vdr";
-  buildDepends = [ QuickCheck random ];
-  meta = {
-    description = "Check properties on standard classes and data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
deleted file mode 100644
index 498bcaf2bf64..000000000000
--- a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chell, QuickCheck, random }:
-
-cabal.mkDerivation (self: {
-  pname = "chell-quickcheck";
-  version = "0.2.4";
-  sha256 = "0ys6aks97y5h0n8n8dmwx8jrai4bjlnr7n69s259664y694054wd";
-  buildDepends = [ chell QuickCheck random ];
-  meta = {
-    homepage = "https://john-millikin.com/software/chell/";
-    description = "QuickCheck support for the Chell testing library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix
deleted file mode 100644
index 2b6c4e61bf9f..000000000000
--- a/pkgs/development/libraries/haskell/chell/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, options, patience, random, text
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "chell";
-  version = "0.4";
-  sha256 = "1hynr7n7wxgc3z6zrc3xrfpiqlh4zfb3kagwwfhqmcamv9d4x0ng";
-  buildDepends = [
-    ansiTerminal options patience random text transformers
-  ];
-  meta = {
-    homepage = "https://john-millikin.com/software/chell/";
-    description = "A simple and intuitive library for automated testing";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix
deleted file mode 100644
index 2db35213a1a6..000000000000
--- a/pkgs/development/libraries/haskell/chunked-data/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, monoTraversable, semigroups, systemFilepath
-, text, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "chunked-data";
-  version = "0.1.0.1";
-  sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r";
-  buildDepends = [
-    blazeBuilder monoTraversable semigroups systemFilepath text
-    transformers vector
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/chunked-data";
-    description = "Typeclasses for dealing with various chunked data representations";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
deleted file mode 100644
index 32c4b878cff0..000000000000
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, securemem, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-aes";
-  version = "0.2.9";
-  sha256 = "1nkrh8mrrh14zfhjz0lfidw0hw9c70hap9w24rvb14zgfnnasnlq";
-  buildDepends = [ byteable cryptoCipherTypes securemem ];
-  testDepends = [
-    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-    testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cipher-aes";
-    description = "Fast AES cipher implementation with advanced mode of operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-aes128/default.nix b/pkgs/development/libraries/haskell/cipher-aes128/default.nix
deleted file mode 100644
index ce9253611434..000000000000
--- a/pkgs/development/libraries/haskell/cipher-aes128/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cryptoApi, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-aes128";
-  version = "0.6.4";
-  sha256 = "093zpw86wimniwmd73g3nnbfy530q52kynccssqf7jxafbsw75aa";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cereal cryptoApi tagged ];
-  meta = {
-    homepage = "https://github.com/TomMD/cipher-aes128";
-    description = "AES and common modes using AES-NI when available";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
deleted file mode 100644
index 3f2619c70e83..000000000000
--- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, securemem, testFramework, testFrameworkQuickcheck2, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-blowfish";
-  version = "0.0.3";
-  sha256 = "0hb67gmiyqrknynz5am8nada1b1v47rqla87dw5nvfhxhl51fhcg";
-  buildDepends = [ byteable cryptoCipherTypes securemem vector ];
-  testDepends = [
-    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-    testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "Blowfish cipher";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-camellia/default.nix b/pkgs/development/libraries/haskell/cipher-camellia/default.nix
deleted file mode 100644
index 7e83f50568db..000000000000
--- a/pkgs/development/libraries/haskell/cipher-camellia/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, securemem, testFramework, testFrameworkQuickcheck2, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-camellia";
-  version = "0.0.2";
-  sha256 = "19z2mi1rvp8fsqjdbmrm1hdlxmx61yr55fyknmmn945qrlvx234d";
-  buildDepends = [ byteable cryptoCipherTypes securemem vector ];
-  testDepends = [
-    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-    testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "Camellia block cipher primitives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix
deleted file mode 100644
index 7309586e1c69..000000000000
--- a/pkgs/development/libraries/haskell/cipher-des/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, securemem, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-des";
-  version = "0.0.6";
-  sha256 = "1isazxa2nr1y13y0danfk7wghy34rfpn3f43rw714nk2xk6vrwc5";
-  buildDepends = [ byteable cryptoCipherTypes securemem ];
-  testDepends = [
-    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-    testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "DES and 3DES primitives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix
deleted file mode 100644
index 4951584e395b..000000000000
--- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-rc4";
-  version = "0.1.4";
-  sha256 = "0k9qf0cn5yxc4qlqikcm5yyrnkkvr6g3v7306cp8iwz7r4dp6zn6";
-  buildDepends = [ byteable cryptoCipherTypes ];
-  testDepends = [
-    cryptoCipherTests cryptoCipherTypes QuickCheck testFramework
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cipher-rc4";
-    description = "Fast RC4 cipher implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix
deleted file mode 100644
index 82ee642a9baf..000000000000
--- a/pkgs/development/libraries/haskell/circle-packing/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "circle-packing";
-  version = "0.1.0.3";
-  sha256 = "1df284n181ny3i7ajx0j6x5grxw404zzz6y8iybmh5qgba1537g2";
-  meta = {
-    description = "Simple heuristic for packing discs of varying radii in a circle";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
deleted file mode 100644
index 5f7cce6b0600..000000000000
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hexpat, hsBibutils, HTTP, json, mtl, network
-, pandocTypes, parsec, syb, time, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "citeproc-hs";
-  version = "0.3.9";
-  sha256 = "0f3l33a3rcp8lm8nkbda42lijjpaqa7cxszswhjryy1inywpsssg";
-  buildDepends = [
-    filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
-    syb time utf8String
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://gorgias.mine.nu/repos/citeproc-hs/";
-    description = "A Citation Style Language implementation in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clash-lib/default.nix b/pkgs/development/libraries/haskell/clash-lib/default.nix
deleted file mode 100644
index 40860d389117..000000000000
--- a/pkgs/development/libraries/haskell/clash-lib/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, concurrentSupply, contravariant
-, deepseq, errors, fgl, filepath, hashable, lens, ListLike, mtl
-, text, time, transformers, unbound, unorderedContainers
-, uuParsinglib, wlPprintText
-}:
-
-cabal.mkDerivation (self: {
-  pname = "clash-lib";
-  version = "0.4";
-  sha256 = "1c3bxjm356cs7wf49zlazbv44bw06rs81akmsfzkfccrl7gjy7yc";
-  buildDepends = [
-    aeson attoparsec concurrentSupply contravariant deepseq errors fgl
-    filepath hashable lens ListLike mtl text time transformers unbound
-    unorderedContainers uuParsinglib wlPprintText
-  ];
-  meta = {
-    homepage = "http://christiaanb.github.io/clash2";
-    description = "CAES Language for Synchronous Hardware - As a Library";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clash-prelude/default.nix b/pkgs/development/libraries/haskell/clash-prelude/default.nix
deleted file mode 100644
index b463b957e877..000000000000
--- a/pkgs/development/libraries/haskell/clash-prelude/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, thLift }:
-
-cabal.mkDerivation (self: {
-  pname = "clash-prelude";
-  version = "0.6.0.1";
-  sha256 = "0d929g7js15aagd1pa2lfbhd1yiykd0ngp6fv522yhy1yyijn1l7";
-  buildDepends = [ dataDefault thLift ];
-  meta = {
-    homepage = "http://christiaanb.github.io/clash2/";
-    description = "CAES Language for Synchronous Hardware - Prelude library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
deleted file mode 100644
index 3c2d5c6655f4..000000000000
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, classyPrelude, conduit, conduitCombinators, hspec
-, monadControl, QuickCheck, resourcet, systemFileio, transformers
-, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "classy-prelude-conduit";
-  version = "0.10.2";
-  sha256 = "0bgic61p05hpnsami199wzs2q4cbdm00nyp03vsxz2ddsz8dwc8l";
-  buildDepends = [
-    classyPrelude conduit conduitCombinators monadControl resourcet
-    systemFileio transformers void
-  ];
-  testDepends = [ conduit hspec QuickCheck transformers ];
-  meta = {
-    homepage = "https://github.com/snoyberg/classy-prelude";
-    description = "conduit instances for classy-prelude";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix b/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix
deleted file mode 100644
index d615a6e63b5e..000000000000
--- a/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, classyPrelude, classyPreludeConduit, dataDefault
-, httpConduit, httpTypes, persistent, yesod, yesodNewsfeed
-, yesodStatic
-}:
-
-cabal.mkDerivation (self: {
-  pname = "classy-prelude-yesod";
-  version = "0.10.2";
-  sha256 = "1jzf26rj9m8mdhhag66h5zbh91c7ff3jn1q1ghmah12dj9y06137";
-  buildDepends = [
-    aeson classyPrelude classyPreludeConduit dataDefault httpConduit
-    httpTypes persistent yesod yesodNewsfeed yesodStatic
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/classy-prelude";
-    description = "Provide a classy prelude including common Yesod functionality";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
deleted file mode 100644
index 4cd9dc1dba39..000000000000
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, basicPrelude, bifunctors, chunkedData, enclosedExceptions
-, exceptions, hashable, hspec, liftedBase, monoTraversable, mtl
-, primitive, QuickCheck, semigroups, stm, systemFilepath, text
-, time, transformers, unorderedContainers, vector, vectorInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "classy-prelude";
-  version = "0.10.2";
-  sha256 = "0pq16rgksbv2ml4wg7jdxlb9y80h8la78hnrcci637s6kbdisd7k";
-  buildDepends = [
-    basicPrelude bifunctors chunkedData enclosedExceptions exceptions
-    hashable liftedBase monoTraversable mtl primitive semigroups stm
-    systemFilepath text time transformers unorderedContainers vector
-    vectorInstances
-  ];
-  testDepends = [
-    hspec QuickCheck transformers unorderedContainers
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/classy-prelude";
-    description = "A typeclass-based Prelude";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clay/default.nix b/pkgs/development/libraries/haskell/clay/default.nix
deleted file mode 100644
index 4e1b617c0b65..000000000000
--- a/pkgs/development/libraries/haskell/clay/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }:
-
-cabal.mkDerivation (self: {
-  pname = "clay";
-  version = "0.10";
-  sha256 = "0xw7j9v2cfs4874l5n852b38m6v2mpkbr93dxxfkp2kwmqkjbl5v";
-  buildDepends = [ mtl text ];
-  testDepends = [ HUnit mtl testFramework testFrameworkHunit text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://fvisser.nl/clay";
-    description = "CSS preprocessor as embedded Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clean-unions/default.nix b/pkgs/development/libraries/haskell/clean-unions/default.nix
deleted file mode 100644
index 9ec71da8eeca..000000000000
--- a/pkgs/development/libraries/haskell/clean-unions/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "clean-unions";
-  version = "0.1.1";
-  sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
-  meta = {
-    homepage = "https://github.com/fumieval/clean-unions";
-    description = "Open unions without need for Typeable";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
deleted file mode 100644
index 6fcecac9eb51..000000000000
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi
-, cryptoRandom, entropy, hspec, HUnit, QuickCheck, setenv, skein
-, tagged, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "clientsession";
-  version = "0.9.1.1";
-  sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom
-    entropy setenv skein tagged
-  ];
-  testDepends = [ cereal hspec HUnit QuickCheck transformers ];
-  meta = {
-    homepage = "http://github.com/yesodweb/clientsession/tree/master";
-    description = "Securely store session data in a client-side cookie";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix
deleted file mode 100644
index e97195cb5fc3..000000000000
--- a/pkgs/development/libraries/haskell/clock/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "clock";
-  version = "0.4.1.3";
-  sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d";
-  meta = {
-    homepage = "http://corsis.github.com/clock/";
-    description = "High-resolution clock functions: monotonic, realtime, cputime";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
deleted file mode 100644
index c4253944c6d1..000000000000
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "cmdargs";
-  version = "0.10.12";
-  sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath transformers ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/cmdargs/";
-    description = "Command line argument processing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix
deleted file mode 100644
index 2cfe86e2eabf..000000000000
--- a/pkgs/development/libraries/haskell/cmdlib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, split, syb, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "cmdlib";
-  version = "0.3.5";
-  sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl split syb transformers ];
-  meta = {
-    description = "a library for command line parsing & online help";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix
deleted file mode 100644
index aa83ae1a0ec6..000000000000
--- a/pkgs/development/libraries/haskell/cmdtheline/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit
-, transformers, fetchpatch
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cmdtheline";
-  version = "0.2.3";
-  sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04";
-  doCheck = false;
-  patches = [ (fetchpatch { url = "https://github.com/eli-frey/cmdtheline/pull/29.patch"; sha256 = "089rfvvjc44wnhph2ricpbz4iifhyvm1qzg8wsd596v81gy0zvrr"; }) ];
-  buildDepends = [ filepath parsec transformers ];
-  testDepends = [
-    filepath HUnit parsec testFramework testFrameworkHunit transformers
-  ];
-  meta = {
-    homepage = "http://github.com/eli-frey/cmdtheline";
-    description = "Declarative command-line option parsing and documentation library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/code-builder/default.nix b/pkgs/development/libraries/haskell/code-builder/default.nix
deleted file mode 100644
index 92cc3f0f9d81..000000000000
--- a/pkgs/development/libraries/haskell/code-builder/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "code-builder";
-  version = "0.1.3";
-  sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
-  meta = {
-    description = "Simple system for generating code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/codec-image-devil/default.nix b/pkgs/development/libraries/haskell/codec-image-devil/default.nix
deleted file mode 100644
index 567e68b562de..000000000000
--- a/pkgs/development/libraries/haskell/codec-image-devil/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libdevil }:
-
-cabal.mkDerivation (self: {
-  pname = "Codec-Image-DevIL";
-  version = "0.2.3";
-  sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz";
-  extraLibraries = [ libdevil ];
-  meta = {
-    description = "An FFI interface to the DevIL library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
deleted file mode 100644
index ad207329f2da..000000000000
--- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, haskellLexer }:
-
-cabal.mkDerivation (self: {
-  pname = "colorize-haskell";
-  version = "1.0.1";
-  sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ ansiTerminal haskellLexer ];
-  meta = {
-    homepage = "http://github.com/yav/colorize-haskell";
-    description = "Highligt Haskell source";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix
deleted file mode 100644
index 167637863ef8..000000000000
--- a/pkgs/development/libraries/haskell/colors/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, profunctors }:
-
-cabal.mkDerivation (self: {
-  pname = "colors";
-  version = "0.2.0.1";
-  sha256 = "0xl7hdp1di8gl0g28vz2lm6pbj7hihdkfnr18843016736hll4qn";
-  buildDepends = [ profunctors ];
-  meta = {
-    homepage = "https://github.com/fumieval/colors";
-    description = "A type for colors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix
deleted file mode 100644
index 748e62b1d94a..000000000000
--- a/pkgs/development/libraries/haskell/colour/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "colour";
-  version = "2.3.3";
-  sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Colour";
-    description = "A model for human colour/color perception";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/command-qq/default.nix b/pkgs/development/libraries/haskell/command-qq/default.nix
deleted file mode 100644
index 961506b6a819..000000000000
--- a/pkgs/development/libraries/haskell/command-qq/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, hspec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "command-qq";
-  version = "0.3.0.0";
-  sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5";
-  buildDepends = [ text ];
-  testDepends = [ doctest hspec text ];
-  doCheck = false;
-  meta = {
-    homepage = "http://biegunka.github.io/command-qq/";
-    description = "Quasiquoters for external commands";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
deleted file mode 100644
index f44f299522d9..000000000000
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad }:
-
-cabal.mkDerivation (self: {
-  pname = "comonad-transformers";
-  version = "4.0";
-  sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z";
-  buildDepends = [ comonad ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/ekmett/comonad-transformers/";
-    description = "This package has been merged into comonad 4.0";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
deleted file mode 100644
index 36a0db0b9ccd..000000000000
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, distributive, doctest, filepath, semigroups
-, tagged, transformers, transformersCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "comonad";
-  version = "4.2.2";
-  sha256 = "022fcy0ijwsdnjb1b1jrwy2ypzzbzvfgj9ns0c74hrsj08gjh8j8";
-  buildDepends = [
-    contravariant distributive semigroups tagged transformers
-    transformersCompat
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/comonad/";
-    description = "Comonads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
deleted file mode 100644
index 8c009b8b501c..000000000000
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad }:
-
-cabal.mkDerivation (self: {
-  pname = "comonads-fd";
-  version = "4.0";
-  sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s";
-  buildDepends = [ comonad ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/ekmett/comonads-fd/";
-    description = "This package has been merged into comonad 4.0";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
deleted file mode 100644
index a0a6959b4b1b..000000000000
--- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "compact-string-fix";
-  version = "0.3.2";
-  sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
-  meta = {
-    homepage = "http://twan.home.fmf.nl/compact-string/";
-    description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/compdata-param/default.nix b/pkgs/development/libraries/haskell/compdata-param/default.nix
deleted file mode 100644
index 2ab1ecd9131f..000000000000
--- a/pkgs/development/libraries/haskell/compdata-param/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, compdata, HUnit, mtl, testFramework, testFrameworkHunit
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "compdata-param";
-  version = "0.8.0.2";
-  sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs";
-  buildDepends = [ compdata mtl transformers ];
-  testDepends = [
-    compdata HUnit mtl testFramework testFrameworkHunit transformers
-  ];
-  meta = {
-    description = "Parametric Compositional Data Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix
deleted file mode 100644
index ecaec5c4dd04..000000000000
--- a/pkgs/development/libraries/haskell/compdata/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns
-, transformers, treeView
-}:
-
-cabal.mkDerivation (self: {
-  pname = "compdata";
-  version = "0.9";
-  sha256 = "1wk9vj834l3fc64fcsrgc9hz5f2z7461hs8lv1ldkfsixx4mxyqc";
-  buildDepends = [
-    deepseq derive mtl QuickCheck thExpandSyns transformers treeView
-  ];
-  testDepends = [
-    deepseq derive HUnit mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 thExpandSyns
-    transformers
-  ];
-  meta = {
-    description = "Compositional Data Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/composition/default.nix b/pkgs/development/libraries/haskell/composition/default.nix
deleted file mode 100644
index bf86e11cc813..000000000000
--- a/pkgs/development/libraries/haskell/composition/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "composition";
-  version = "1.0.1.0";
-  sha256 = "1gx27vz2djiiwygcjaygjmiwjnls084b5v9km3jpimlz312qh5hc";
-  meta = {
-    homepage = "http://patch-tag.com/r/DanBurton/composition/home";
-    description = "Combinators for unorthodox function composition";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/compressed/default.nix b/pkgs/development/libraries/haskell/compressed/default.nix
deleted file mode 100644
index 9ef921a616f8..000000000000
--- a/pkgs/development/libraries/haskell/compressed/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, fingertree, hashable, keys, pointed, reducers
-, semigroupoids, semigroups, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "compressed";
-  version = "3.10";
-  sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw";
-  buildDepends = [
-    comonad fingertree hashable keys pointed reducers semigroupoids
-    semigroups unorderedContainers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/compressed/";
-    description = "Compressed containers and reducers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/concatenative/default.nix b/pkgs/development/libraries/haskell/concatenative/default.nix
deleted file mode 100644
index 9762ffc5fc83..000000000000
--- a/pkgs/development/libraries/haskell/concatenative/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "concatenative";
-  version = "1.0.1";
-  sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
-  meta = {
-    homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty";
-    description = "A library for postfix control flow";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/concreteTyperep/default.nix b/pkgs/development/libraries/haskell/concreteTyperep/default.nix
deleted file mode 100644
index 24e2569ad0ea..000000000000
--- a/pkgs/development/libraries/haskell/concreteTyperep/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, hashable, QuickCheck, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "concrete-typerep";
-  version = "0.1.0.2";
-  sha256 = "07wy8drg4723zdy2172jrcvd5ir2c4ggcfz1n33jhm9iv3cl2app";
-  buildDepends = [ binary hashable ];
-  testDepends = [
-    binary hashable QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    description = "Binary and Hashable instances for TypeRep";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
deleted file mode 100644
index 69c1d1edddcc..000000000000
--- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, HUnit, random, stm, testFramework
-, testFrameworkHunit, unboundedDelays
-}:
-
-cabal.mkDerivation (self: {
-  pname = "concurrent-extra";
-  version = "0.7.0.9";
-  sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw";
-  buildDepends = [ stm unboundedDelays ];
-  testDepends = [
-    async HUnit random stm testFramework testFrameworkHunit
-    unboundedDelays
-  ];
-  meta = {
-    homepage = "https://github.com/basvandijk/concurrent-extra";
-    description = "Extra concurrency primitives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/concurrent-supply/default.nix b/pkgs/development/libraries/haskell/concurrent-supply/default.nix
deleted file mode 100644
index 7b91f2f018b3..000000000000
--- a/pkgs/development/libraries/haskell/concurrent-supply/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable }:
-
-cabal.mkDerivation (self: {
-  pname = "concurrent-supply";
-  version = "0.1.7";
-  sha256 = "0crg4rm5wibw9h6lmsi43d280xg1xr9xbgqr9s4inxq7x0yyn68c";
-  buildDepends = [ hashable ];
-  meta = {
-    homepage = "http://github.com/ekmett/concurrent-supply/";
-    description = "A fast concurrent unique identifier supply with a pure API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix
deleted file mode 100644
index 4846e5cb61f5..000000000000
--- a/pkgs/development/libraries/haskell/cond/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "cond";
-  version = "0.4.1.1";
-  sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
-  meta = {
-    homepage = "https://github.com/kallisti-dev/cond";
-    description = "Basic conditional and boolean operators with monadic variants";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
deleted file mode 100644
index 0f237e12cb08..000000000000
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base16Bytestring, base64Bytestring, chunkedData, conduit
-, conduitExtra, hspec, monadControl, monoTraversable, mtl
-, mwcRandom, primitive, QuickCheck, resourcet, safe, silently
-, systemFileio, systemFilepath, text, transformers
-, transformersBase, unixCompat, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "conduit-combinators";
-  version = "0.3.0.4";
-  sha256 = "1aphk79r3ibpb9gykdnz55isp7kf48jhz4h4vgplb0ndbmz8f8zm";
-  buildDepends = [
-    base16Bytestring base64Bytestring chunkedData conduit conduitExtra
-    monadControl monoTraversable mwcRandom primitive resourcet
-    systemFileio systemFilepath text transformers transformersBase
-    unixCompat vector void
-  ];
-  testDepends = [
-    base16Bytestring base64Bytestring chunkedData conduit hspec
-    monoTraversable mtl mwcRandom QuickCheck safe silently
-    systemFilepath text transformers vector
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/conduit-combinators";
-    description = "Commonly used conduit functions, for both chunked and unchunked data";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
deleted file mode 100644
index 8a551de35165..000000000000
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, attoparsec, blazeBuilder, conduit, exceptions
-, filepath, hspec, monadControl, network, primitive, resourcet, stm
-, streamingCommons, text, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "conduit-extra";
-  version = "1.1.5";
-  sha256 = "1i38n3pdibjpi9kg37wvv4m6krfbsdd4baik804ss2ml1ry7gm4p";
-  buildDepends = [
-    attoparsec blazeBuilder conduit filepath monadControl network
-    primitive resourcet stm streamingCommons text transformers
-    transformersBase
-  ];
-  testDepends = [
-    async attoparsec blazeBuilder conduit exceptions hspec resourcet
-    stm text transformers transformersBase
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Batteries included conduit: adapters for common libraries";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
deleted file mode 100644
index d0683175482c..000000000000
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, hspec, liftedBase, mmorph, mtl, QuickCheck
-, resourcet, safe, transformers, transformersBase, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "conduit";
-  version = "1.2.3.1";
-  sha256 = "04n330f9iad6asmry81aqvb7wyh7b962d6pvcfnpm327z4llnvbq";
-  buildDepends = [
-    exceptions liftedBase mmorph mtl resourcet transformers
-    transformersBase void
-  ];
-  testDepends = [
-    exceptions hspec mtl QuickCheck resourcet safe transformers void
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Streaming data processing library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix
deleted file mode 100644
index 3ea53f686c9a..000000000000
--- a/pkgs/development/libraries/haskell/configurator/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, filepath, hashable, HUnit, testFramework
-, testFrameworkHunit, text, unixCompat, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "configurator";
-  version = "0.3.0.0";
-  sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
-  buildDepends = [
-    attoparsec hashable text unixCompat unorderedContainers
-  ];
-  testDepends = [
-    filepath HUnit testFramework testFrameworkHunit text
-  ];
-  meta = {
-    homepage = "http://github.com/bos/configurator";
-    description = "Configuration management";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix
deleted file mode 100644
index 8b2380767f3b..000000000000
--- a/pkgs/development/libraries/haskell/connection/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cprngAes, dataDefaultClass, network, socks, tls, x509
-, x509Store, x509System, x509Validation
-}:
-
-cabal.mkDerivation (self: {
-  pname = "connection";
-  version = "0.2.3";
-  sha256 = "02mqn19pssdak82jw38p3cbwjyfvmjc6fawgx5981hzbdgb64vsb";
-  buildDepends = [
-    cprngAes dataDefaultClass network socks tls x509 x509Store
-    x509System x509Validation
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-connection";
-    description = "Simple and easy network connections API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
deleted file mode 100644
index 3f1b196ef276..000000000000
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, newtype }:
-
-cabal.mkDerivation (self: {
-  pname = "constraints";
-  version = "0.4";
-  sha256 = "0nnplylzbcw884jgsd4i46z75dkiyx4166j5fym5zdnwhyj75sp5";
-  buildDepends = [ newtype ];
-  meta = {
-    homepage = "http://github.com/ekmett/constraints/";
-    description = "Constraint manipulation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix
deleted file mode 100644
index 2ec057f6a96a..000000000000
--- a/pkgs/development/libraries/haskell/continued-fractions/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "continued-fractions";
-  version = "0.9.1.1";
-  sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
-  meta = {
-    homepage = "/dev/null";
-    description = "Continued fractions";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
deleted file mode 100644
index 73a874c0a157..000000000000
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroups, tagged, transformers, transformersCompat, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "contravariant";
-  version = "1.2";
-  sha256 = "0gzk9b3xig48jvqz9983a7kziyb2n9z329kn6cqw1k0p8w2h3l8f";
-  buildDepends = [
-    semigroups tagged transformers transformersCompat void
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/contravariant/";
-    description = "Contravariant functors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/control-bool/default.nix b/pkgs/development/libraries/haskell/control-bool/default.nix
deleted file mode 100644
index 12f9b287d1bb..000000000000
--- a/pkgs/development/libraries/haskell/control-bool/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "control-bool";
-  version = "0.2.1";
-  sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
-  meta = {
-    homepage = "https://github.com/fumieval/control-bool";
-    description = "Useful combinators for boolean expressions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/control-monad-free/default.nix b/pkgs/development/libraries/haskell/control-monad-free/default.nix
deleted file mode 100644
index e2768a9cf557..000000000000
--- a/pkgs/development/libraries/haskell/control-monad-free/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "control-monad-free";
-  version = "0.5.3";
-  sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
-  buildDepends = [ deepseq transformers ];
-  meta = {
-    homepage = "http://github.com/pepeiborra/control-monad-free";
-    description = "Free monads and monad transformers";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/control-monad-loop/default.nix b/pkgs/development/libraries/haskell/control-monad-loop/default.nix
deleted file mode 100644
index 40d7e5a1e338..000000000000
--- a/pkgs/development/libraries/haskell/control-monad-loop/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "control-monad-loop";
-  version = "0.1";
-  sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj";
-  buildDepends = [ transformers transformersBase ];
-  meta = {
-    homepage = "https://github.com/joeyadams/haskell-control-monad-loop";
-    description = "Simple monad transformer for imperative-style loops";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix
deleted file mode 100644
index 63f7fa81c9df..000000000000
--- a/pkgs/development/libraries/haskell/converge/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "converge";
-  version = "0.1.0.1";
-  sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj";
-  meta = {
-    homepage = "/dev/null";
-    description = "Limit operations for converging sequences";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix
deleted file mode 100644
index fd8f6dac3a83..000000000000
--- a/pkgs/development/libraries/haskell/convertible/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "convertible";
-  version = "1.1.0.0";
-  sha256 = "0pc3z4jfjna1rz5wlfimw9fyhpasmdnwvava883s401760y99i0k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl text time ];
-  meta = {
-    homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible";
-    description = "Typeclasses and instances for converting between types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
deleted file mode 100644
index abbafafa5297..000000000000
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck
-, tasty, tastyHunit, tastyQuickcheck, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cookie";
-  version = "0.4.1.4";
-  sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d";
-  buildDepends = [ blazeBuilder dataDefault deepseq text time ];
-  testDepends = [
-    blazeBuilder HUnit QuickCheck tasty tastyHunit tastyQuickcheck text
-    time
-  ];
-  doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version;
-  meta = {
-    homepage = "http://github.com/snoyberg/cookie";
-    description = "HTTP cookie parsing and rendering";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix
deleted file mode 100644
index e3ba619c6aa3..000000000000
--- a/pkgs/development/libraries/haskell/coroutine-object/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, either, lens, mtl, safecopy, transformers
-, transformersFree, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "coroutine-object";
-  version = "0.3";
-  sha256 = "0q0rvcc7ipxwmikaxh0ymq1d65f2q1a2jrd1i553pdf8hwmv0k1r";
-  buildDepends = [
-    cereal either lens mtl safecopy transformers transformersFree uuid
-  ];
-  meta = {
-    description = "Object-oriented programming realization using coroutine";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
deleted file mode 100644
index 632647e21825..000000000000
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cipherAes, cryptoRandom }:
-
-cabal.mkDerivation (self: {
-  pname = "cprng-aes";
-  version = "0.6.1";
-  sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4";
-  buildDepends = [ byteable cipherAes cryptoRandom ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cprng-aes";
-    description = "Crypto Pseudo Random Number Generator using AES in counter mode";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix
deleted file mode 100644
index d10ecaa00593..000000000000
--- a/pkgs/development/libraries/haskell/cpu/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "cpu";
-  version = "0.1.2";
-  sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cpu";
-    description = "Cpu information and properties helpers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
deleted file mode 100644
index 01ea05575652..000000000000
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ansiWlPprint, binary, cassava, deepseq, either
-, filepath, Glob, hastache, HUnit, mtl, mwcRandom
-, optparseApplicative, parsec, QuickCheck, statistics
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, time, transformers, vector, vectorAlgorithms
-}:
-
-cabal.mkDerivation (self: {
-  pname = "criterion";
-  version = "1.0.2.0";
-  sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson ansiWlPprint binary cassava deepseq either filepath Glob
-    hastache mtl mwcRandom optparseApplicative parsec statistics text
-    time transformers vector vectorAlgorithms
-  ];
-  testDepends = [
-    HUnit QuickCheck statistics testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.serpentine.com/criterion";
-    description = "Robust, reliable performance measurement and analysis";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
deleted file mode 100644
index 2a83b2486740..000000000000
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, entropy, tagged, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-api";
-  version = "0.13.2";
-  sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak";
-  buildDepends = [ cereal entropy tagged transformers ];
-  meta = {
-    homepage = "https://github.com/TomMD/crypto-api";
-    description = "A generic interface for cryptographic operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
deleted file mode 100644
index 04b1b1918783..000000000000
--- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck
-, securemem, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-cipher-tests";
-  version = "0.0.11";
-  sha256 = "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz";
-  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
deleted file mode 100644
index 63431431bf73..000000000000
--- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, securemem }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-cipher-types";
-  version = "0.0.9";
-  sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0";
-  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/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
deleted file mode 100644
index c7c3f2590a73..000000000000
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, conduit, conduitExtra, cryptoApi, cryptocipher
-, cryptohashCryptoapi, hspec, resourcet, skein, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-conduit";
-  version = "0.5.5";
-  sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf";
-  buildDepends = [
-    cereal conduit conduitExtra cryptoApi resourcet transformers
-  ];
-  testDepends = [
-    cereal conduit conduitExtra cryptoApi cryptocipher
-    cryptohashCryptoapi hspec skein transformers
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/prowdsponsor/crypto-conduit";
-    description = "Conduit interface for cryptographic operations (from crypto-api)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
deleted file mode 100644
index d101d9af197a..000000000000
--- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoRandom, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-numbers";
-  version = "0.2.3";
-  sha256 = "0nx2mlf40127j7vas7liqy2yzfg4alfaxcjilcxk99kavpaanzgp";
-  buildDepends = [ cryptoRandom vector ];
-  testDepends = [
-    byteable cryptoRandom HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-numbers";
-    description = "Cryptographic numbers: functions and algorithms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
deleted file mode 100644
index 6c0060e52a8d..000000000000
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Types }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-pubkey-types";
-  version = "0.4.2.3";
-  sha256 = "1isfyr1ly9hv8idslpjbyc9hhgb1zqd9gfc1s4kvwy4gcdsvrx52";
-  buildDepends = [ asn1Types ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
-    description = "Generic cryptography Public keys algorithm types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
deleted file mode 100644
index a8979fef3153..000000000000
--- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptohash, cryptoNumbers, cryptoPubkeyTypes
-, cryptoRandom, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-pubkey";
-  version = "0.2.5";
-  sha256 = "18rxm6mgxp8x4ns2725pw6ja2g6n6k64dj9cbwdlsb13pkdh3lxq";
-  buildDepends = [
-    byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom
-  ];
-  testDepends = [
-    byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-pubkey";
-    description = "Public Key cryptography";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-random-api/default.nix b/pkgs/development/libraries/haskell/crypto-random-api/default.nix
deleted file mode 100644
index 674c2e870136..000000000000
--- a/pkgs/development/libraries/haskell/crypto-random-api/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, entropy }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-random-api";
-  version = "0.2.0";
-  sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
-  buildDepends = [ entropy ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-random-api";
-    description = "Simple random generators API for cryptography related code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix
deleted file mode 100644
index c7053cbf1e39..000000000000
--- a/pkgs/development/libraries/haskell/crypto-random/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, securemem, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-random";
-  version = "0.0.8";
-  sha256 = "058ilm05ni5ribggx25cfrhsv1z0abvgxzf3wd3d6qqq58p5wbkv";
-  buildDepends = [ securemem vector ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-random";
-    description = "Simple cryptographic random related 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
deleted file mode 100644
index 6f9c05f544b0..000000000000
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cipherAes, cipherBlowfish, cipherCamellia, cipherDes
-, cipherRc4, cryptoCipherTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cryptocipher";
-  version = "0.6.2";
-  sha256 = "0ip3a2as0df6drl29sryayxx22sx55v6bs60s2fh3i1nxqnydf9l";
-  buildDepends = [
-    cipherAes cipherBlowfish cipherCamellia cipherDes cipherRc4
-    cryptoCipherTypes
-  ];
-  meta = {
-    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/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
deleted file mode 100644
index c9476bae647d..000000000000
--- a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, cryptohash, resourcet, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cryptohash-conduit";
-  version = "0.1.1";
-  sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga";
-  buildDepends = [
-    conduit conduitExtra cryptohash resourcet transformers
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptohash-conduit";
-    description = "cryptohash conduit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
deleted file mode 100644
index a1ff03e4c49d..000000000000
--- a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cryptoApi, cryptohash, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "cryptohash-cryptoapi";
-  version = "0.1.3";
-  sha256 = "0wj53p32js8lfg0i8akrljpash0jdiyv2vcqpmjbd4dq2fx81w2n";
-  buildDepends = [ cereal cryptoApi cryptohash tagged ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi";
-    description = "Crypto-api interfaces for cryptohash";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
deleted file mode 100644
index 5d143dfc9e82..000000000000
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, HUnit, QuickCheck, tasty, tastyHunit
-, tastyQuickcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cryptohash";
-  version = "0.11.6";
-  sha256 = "0dyzcaxr8vhzqq9hj4240rxpi87h4ps87yz09klz723shls26f6s";
-  buildDepends = [ byteable ];
-  testDepends = [
-    byteable HUnit QuickCheck tasty tastyHunit tastyQuickcheck
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptohash";
-    description = "collection of crypto hashes, fast, pure and practical";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
deleted file mode 100644
index dcc2146313db..000000000000
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, hspec, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "css-text";
-  version = "0.1.2.1";
-  sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw";
-  buildDepends = [ attoparsec text ];
-  testDepends = [ attoparsec hspec QuickCheck text ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "CSS parser and renderer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/csv-conduit/default.nix b/pkgs/development/libraries/haskell/csv-conduit/default.nix
deleted file mode 100644
index f0c01481dbd4..000000000000
--- a/pkgs/development/libraries/haskell/csv-conduit/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, attoparsecConduit, blazeBuilder, conduit
-, conduitExtra, dataDefault, HUnit, mmorph, monadControl, mtl
-, primitive, resourcet, testFramework, testFrameworkHunit, text
-, transformers, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "csv-conduit";
-  version = "0.6.3";
-  sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec attoparsecConduit blazeBuilder conduit conduitExtra
-    dataDefault mmorph monadControl mtl primitive resourcet text
-    transformers unorderedContainers vector
-  ];
-  testDepends = [
-    HUnit mtl primitive testFramework testFrameworkHunit text
-    transformers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ozataman/csv-conduit";
-    description = "A flexible, fast, conduit-based CSV parser library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix
deleted file mode 100644
index e3908008aa7a..000000000000
--- a/pkgs/development/libraries/haskell/csv/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "csv";
-  version = "0.1.2";
-  sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c";
-  buildDepends = [ filepath parsec ];
-  meta = {
-    description = "CSV loader and dumper";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
deleted file mode 100644
index 25eced2e8102..000000000000
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, cudatoolkit, nvidia_x11 }:
-
-cabal.mkDerivation (self: {
-  pname = "cuda";
-  version = "0.6.5.1";
-  sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y";
-  isLibrary = true;
-  isExecutable = true;
-  buildTools = [ c2hs ];
-  extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.cc ];
-  doCheck = false;
-  # Perhaps this should be the default in cabal.nix ...
-  #
-  # The cudatoolkit provides both 64 and 32-bit versions of the
-  # library. GHC's linker fails if the wrong version is found first.
-  # We solve this by eliminating lib64 from the path on 32-bit
-  # platforms and putting lib64 first on 64-bit platforms.
-  libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib";
-  configurePhase = ''
-    for i in Setup.hs Setup.lhs; do
-      test -f $i && ghc --make $i
-    done
-    for p in $extraBuildInputs $propagatedNativeBuildInputs; do
-      if [ -d "$p/include" ]; then
-        extraLibDirs="$extraLibDirs --extra-include-dir=$p/include"
-      fi
-      for d in $libPaths; do
-        if [ -d "$p/$d" ]; then
-          extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d"
-        fi
-      done
-    done
-    ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags
-  '';
-  meta = {
-    homepage = "https://github.com/tmcdonell/cuda";
-    description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix
deleted file mode 100644
index dfcf9bec757b..000000000000
--- a/pkgs/development/libraries/haskell/cufft/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, cuda }:
-
-cabal.mkDerivation (self: {
-  pname = "cufft";
-  version = "0.1.1.0";
-  sha256 = "0d13nf61698gzh0hcycx1z9bm2xpikkg27bjymsjhfwimvqn7z8h";
-  buildDepends = [ cuda ];
-  buildTools = [ c2hs ];
-  meta = {
-    homepage = "http://github.com/robeverest/cufft";
-    description = "Haskell bindings for the CUFFT library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix
deleted file mode 100644
index 82bdd707ea77..000000000000
--- a/pkgs/development/libraries/haskell/curl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, curl }:
-
-cabal.mkDerivation (self: {
-  pname = "curl";
-  version = "1.3.8";
-  sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh";
-  extraLibraries = [ curl ];
-  meta = {
-    description = "Haskell binding to libcurl";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/daemons/default.nix b/pkgs/development/libraries/haskell/daemons/default.nix
deleted file mode 100644
index 1ec84449dd32..000000000000
--- a/pkgs/development/libraries/haskell/daemons/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, dataDefault, filepath, HUnit, network, pipes
-, testFramework, testFrameworkHunit, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "daemons";
-  version = "0.2.1";
-  sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cereal dataDefault filepath network pipes transformers
-  ];
-  testDepends = [
-    dataDefault HUnit testFramework testFrameworkHunit
-  ];
-  meta = {
-    homepage = "https://github.com/scvalex/daemons";
-    description = "Daemons in Haskell made fun and easy";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
deleted file mode 100644
index 2f514295786a..000000000000
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "data-accessor-mtl";
-  version = "0.2.0.4";
-  sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
-  buildDepends = [ dataAccessor mtl ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Record_access";
-    description = "Use Accessor to access state in mtl State monad class";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
deleted file mode 100644
index 5b3a54d7220b..000000000000
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "data-accessor-template";
-  version = "0.2.1.11";
-  sha256 = "1n2slv287zp6pabqb7xbfi296dbikw5a4ivqmnas0c4nxikqkayx";
-  buildDepends = [ dataAccessor utilityHt ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Record_access";
-    description = "Utilities for accessing and manipulating fields of records";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
deleted file mode 100644
index c25d8d98cb90..000000000000
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "data-accessor-transformers";
-  version = "0.2.1.6";
-  sha256 = "1iawhp1h68ynr2axj12jrn47nf08mss0ar8blagp59yi8j7170fa";
-  buildDepends = [ dataAccessor transformers ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Record_access";
-    description = "Use Accessor to access state in transformers State monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
deleted file mode 100644
index f80a8fc0fe8b..000000000000
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "data-accessor";
-  version = "0.2.2.6";
-  sha256 = "0668qgllmp2911ppsb0g9z95nq2x0h2cvzyyjlb6iwhnjzyyg7gf";
-  buildDepends = [ transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Record_access";
-    description = "Utilities for accessing and manipulating fields of records";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
deleted file mode 100644
index 8e11a9ef85d9..000000000000
--- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "data-binary-ieee754";
-  version = "0.4.4";
-  sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "https://john-millikin.com/software/data-binary-ieee754/";
-    description = "Parser/Serialiser for IEEE-754 floating-point values";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-checked/default.nix b/pkgs/development/libraries/haskell/data-checked/default.nix
deleted file mode 100644
index 790e22d5cfa6..000000000000
--- a/pkgs/development/libraries/haskell/data-checked/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "data-checked";
-  version = "0.3";
-  sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "https://github.com/mvv/data-checked";
-    description = "Type-indexed runtime-checked properties";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-class/default.nix b/pkgs/development/libraries/haskell/data-default-class/default.nix
deleted file mode 100644
index 646f73a2aa96..000000000000
--- a/pkgs/development/libraries/haskell/data-default-class/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-class";
-  version = "0.0.1";
-  sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
-  meta = {
-    description = "A class for types with a default value";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix
deleted file mode 100644
index 992a5e012dd2..000000000000
--- a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-instances-base";
-  version = "0.0.1";
-  sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
-  buildDepends = [ dataDefaultClass ];
-  meta = {
-    description = "Default instances for types in base";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
deleted file mode 100644
index 49752fd50553..000000000000
--- a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-instances-containers";
-  version = "0.0.1";
-  sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
-  buildDepends = [ dataDefaultClass ];
-  meta = {
-    description = "Default instances for types in containers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
deleted file mode 100644
index 753d91b8a4d8..000000000000
--- a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, dlist }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-instances-dlist";
-  version = "0.0.1";
-  sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
-  buildDepends = [ dataDefaultClass dlist ];
-  meta = {
-    description = "Default instances for types in dlist";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
deleted file mode 100644
index 0da8199f3aea..000000000000
--- a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-instances-old-locale";
-  version = "0.0.1";
-  sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
-  buildDepends = [ dataDefaultClass ];
-  meta = {
-    description = "Default instances for types in old-locale";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
deleted file mode 100644
index 549cb24a689a..000000000000
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, dataDefaultInstancesBase
-, dataDefaultInstancesContainers, dataDefaultInstancesDlist
-, dataDefaultInstancesOldLocale
-}:
-
-cabal.mkDerivation (self: {
-  pname = "data-default";
-  version = "0.5.3";
-  sha256 = "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c";
-  buildDepends = [
-    dataDefaultClass dataDefaultInstancesBase
-    dataDefaultInstancesContainers dataDefaultInstancesDlist
-    dataDefaultInstancesOldLocale
-  ];
-  meta = {
-    description = "A class for types with a default value";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-fin/default.nix b/pkgs/development/libraries/haskell/data-fin/default.nix
deleted file mode 100644
index 73fa4488d9f8..000000000000
--- a/pkgs/development/libraries/haskell/data-fin/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lazysmallcheck, preludeSafeenum, QuickCheck, reflection
-, smallcheck, tagged
-}:
-
-cabal.mkDerivation (self: {
-  pname = "data-fin";
-  version = "0.1.1.3";
-  sha256 = "02n3dr4gj73z549vwq5h7h1kvmx2j8vaxjcggpdlppps9wl6flry";
-  buildDepends = [
-    lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck
-    tagged
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Finite totally ordered sets";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-fix/default.nix b/pkgs/development/libraries/haskell/data-fix/default.nix
deleted file mode 100644
index ab029a7d1c9e..000000000000
--- a/pkgs/development/libraries/haskell/data-fix/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-fix";
-  version = "0.0.1";
-  sha256 = "09r08lrv92ka6p35wkbfhq9ywg7y5pmgszwbz8a20h31vjz1ffpr";
-  meta = {
-    homepage = "https://github.com/anton-k/data-fix";
-    description = "Fixpoint data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-flags/default.nix b/pkgs/development/libraries/haskell/data-flags/default.nix
deleted file mode 100644
index ed2c5b682ce7..000000000000
--- a/pkgs/development/libraries/haskell/data-flags/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-flags";
-  version = "0.0.3.1";
-  sha256 = "1s0djw1qarjn1fkyf21fd6pacfpfy4cvyw3wbd63ccaf9g0s1gs5";
-  meta = {
-    description = "A package for working with bit masks and flags in general";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-hash/default.nix b/pkgs/development/libraries/haskell/data-hash/default.nix
deleted file mode 100644
index a2c6adeedf99..000000000000
--- a/pkgs/development/libraries/haskell/data-hash/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }:
-
-cabal.mkDerivation (self: {
-  pname = "data-hash";
-  version = "0.2.0.0";
-  sha256 = "1bfsbc4fkg3jqgbgka1mg6k1fizynvvxbhf2zb0x1apgr579mcrm";
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    description = "Combinators for building fast hashing functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix
deleted file mode 100644
index c9e3ddb3dde4..000000000000
--- a/pkgs/development/libraries/haskell/data-inttrie/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-inttrie";
-  version = "0.1.0";
-  sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814";
-  meta = {
-    homepage = "http://github.com/luqui/data-inttrie";
-    description = "A lazy, infinite trie of integers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-lens-fd/default.nix b/pkgs/development/libraries/haskell/data-lens-fd/default.nix
deleted file mode 100644
index 85935a5ebdad..000000000000
--- a/pkgs/development/libraries/haskell/data-lens-fd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, dataLens, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "data-lens-fd";
-  version = "2.0.5";
-  sha256 = "0r8cfgn6wx304b5ihmwgsxxjwalb7086wii655mgmb6cn3nirpyk";
-  buildDepends = [ comonad dataLens mtl transformers ];
-  meta = {
-    homepage = "http://github.com/roconnor/data-lens-fd/";
-    description = "Lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix
deleted file mode 100644
index 017e5e706db6..000000000000
--- a/pkgs/development/libraries/haskell/data-lens-light/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "data-lens-light";
-  version = "0.1.2.1";
-  sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "https://github.com/feuerbach/data-lens-light";
-    description = "Simple lenses, minimum dependencies";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
deleted file mode 100644
index d167e8051cd4..000000000000
--- a/pkgs/development/libraries/haskell/data-lens-template/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataLens }:
-
-cabal.mkDerivation (self: {
-  pname = "data-lens-template";
-  version = "2.1.8";
-  sha256 = "0w8x5zn3d98z0q74bqfgkb9s0ca9hd1xc53gjl759s77wm4iwa0q";
-  buildDepends = [ dataLens ];
-  meta = {
-    homepage = "http://github.com/roconnor/data-lens-template/";
-    description = "Utilities for Data.Lens";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
deleted file mode 100644
index b65a41f048ee..000000000000
--- a/pkgs/development/libraries/haskell/data-lens/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, semigroupoids, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "data-lens";
-  version = "2.10.5";
-  sha256 = "11na4wx0f0ihk87d00njwrfc430nb25dkkadv1n47yvcyfc60i90";
-  buildDepends = [ comonad semigroupoids transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/roconnor/data-lens/";
-    description = "Used to be Haskell 98 Lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
deleted file mode 100644
index 2588a396dc0b..000000000000
--- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataInttrie }:
-
-cabal.mkDerivation (self: {
-  pname = "data-memocombinators";
-  version = "0.5.1";
-  sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
-  buildDepends = [ dataInttrie ];
-  meta = {
-    homepage = "http://github.com/luqui/data-memocombinators";
-    description = "Combinators for building memo tables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix
deleted file mode 100644
index 3db8f1ef067c..000000000000
--- a/pkgs/development/libraries/haskell/data-ordlist/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-ordlist";
-  version = "0.4.7.0";
-  sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
-  meta = {
-    description = "Set and bag operations on ordered lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix
deleted file mode 100644
index d082cbae510c..000000000000
--- a/pkgs/development/libraries/haskell/data-pprint/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, mtl, parallel, time }:
-
-cabal.mkDerivation (self: {
-  pname = "data-pprint";
-  version = "0.2.3";
-  sha256 = "1ygbhn399d4hlrdjmg7gxbr5akydb78p6qa80rv7m6j0fsqzbf6y";
-  buildDepends = [ deepseq mtl parallel time ];
-  jailbreak = true;
-  meta = {
-    description = "Prettyprint and compare Data values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix
deleted file mode 100644
index 00c2dc1b48ce..000000000000
--- a/pkgs/development/libraries/haskell/data-reify/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-reify";
-  version = "0.6";
-  sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification";
-    description = "Reify a recursive data structure into an explicit graph";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
deleted file mode 100644
index dcb0e97bdb25..000000000000
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "dataenc";
-  version = "0.14.0.7";
-  sha256 = "1wwgm7wakkz6v94lyxyd3yi21l3h28sss4xxdb3d770vmjhp1lzr";
-  isLibrary = true;
-  isExecutable = true;
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
-    description = "Data encoding library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix
deleted file mode 100644
index bacf480a262d..000000000000
--- a/pkgs/development/libraries/haskell/date-cache/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "date-cache";
-  version = "0.3.0";
-  sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb";
-  meta = {
-    description = "Date cacher";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix
deleted file mode 100644
index d337f4ee2272..000000000000
--- a/pkgs/development/libraries/haskell/datetime/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "datetime";
-  version = "0.2.1";
-  sha256 = "1yfg3wvi13r725dhfsmcdw4ns3cgl2ayrb5jck0q8b4crk2dlrzg";
-  buildDepends = [ QuickCheck time ];
-  meta = {
-    homepage = "http://github.com/esessoms/datetime";
-    description = "Utilities to make Data.Time.* easier to use.";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix
deleted file mode 100644
index 7a97a76c6b2e..000000000000
--- a/pkgs/development/libraries/haskell/dbmigrations/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, configurator, fgl, filepath, HDBC, HDBCPostgresql
-, HDBCSqlite3, HUnit, mtl, random, text, time, yamlLight
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dbmigrations";
-  version = "0.8";
-  sha256 = "0m1zvc61y0n7p66iwsb8wzwgivxnc08cm1h3xvf1jnwrv294dwch";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    configurator fgl filepath HDBC HDBCPostgresql HDBCSqlite3 HUnit mtl
-    random text time yamlLight
-  ];
-  jailbreak = true;
-  meta = {
-    description = "An implementation of relational database \"migrations\"";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
deleted file mode 100644
index dc88a6133505..000000000000
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, chell, chellQuickcheck, filepath, libxmlSax
-, network, parsec, QuickCheck, random, text, transformers, vector
-, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dbus";
-  version = "0.10.9";
-  sha256 = "0sjnmxy0ikvg21sip7yadg4qr3lniy1wwpavkg48dc87gv98ymdb";
-  buildDepends = [
-    cereal libxmlSax network parsec random text transformers vector
-    xmlTypes
-  ];
-  testDepends = [
-    cereal chell chellQuickcheck filepath libxmlSax network parsec
-    QuickCheck random text transformers vector xmlTypes
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-dbus/";
-    description = "A client library for the D-Bus IPC system";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq-generics/default.nix b/pkgs/development/libraries/haskell/deepseq-generics/default.nix
deleted file mode 100644
index 0ee12f4b4653..000000000000
--- a/pkgs/development/libraries/haskell/deepseq-generics/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq-generics";
-  version = "0.1.1.1";
-  sha256 = "1icc2gxsbnjjl150msnyysvr9r14kb6s2gm3izrj5a3mwf6l7s08";
-  buildDepends = [ deepseq ];
-  testDepends = [ deepseq HUnit testFramework testFrameworkHunit ];
-  meta = {
-    homepage = "https://github.com/hvr/deepseq-generics";
-    description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
deleted file mode 100644
index 1d34e12a844a..000000000000
--- a/pkgs/development/libraries/haskell/deepseq-th/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq-th";
-  version = "0.1.0.4";
-  sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965";
-  buildDepends = [ deepseq ];
-  testDepends = [ deepseq ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Template Haskell based deriver for optimised NFData instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
deleted file mode 100644
index 340d7fb3bf22..000000000000
--- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq";
-  version = "1.2.0.1";
-  sha256 = "0r7lkqhllj7phmn4sq836fmis4wy9fpka4hjzhqzhbbykzys0z7d";
-  meta = {
-    description = "Deep evaluation of data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix
deleted file mode 100644
index 99ce96c88466..000000000000
--- a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq";
-  version = "1.3.0.2";
-  sha256 = "09jnfz5158s4fvlfjbz44vb5jsvflagmsrgbk846arymwym6b7bp";
-  meta = {
-    description = "Deep evaluation of data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dependent-map/default.nix b/pkgs/development/libraries/haskell/dependent-map/default.nix
deleted file mode 100644
index 0270139c3831..000000000000
--- a/pkgs/development/libraries/haskell/dependent-map/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dependentSum }:
-
-cabal.mkDerivation (self: {
-  pname = "dependent-map";
-  version = "0.1.1.2";
-  sha256 = "1g8mq8189c6wr1rik70019gqrnk84c613x9cn5383p7hhfyc0rnn";
-  buildDepends = [ dependentSum ];
-  meta = {
-    homepage = "https://github.com/mokus0/dependent-map";
-    description = "Dependent finite maps (partial dependent products)";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix b/pkgs/development/libraries/haskell/dependent-sum-template/default.nix
deleted file mode 100644
index 614a3fdf72d2..000000000000
--- a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dependentSum, thExtras }:
-
-cabal.mkDerivation (self: {
-  pname = "dependent-sum-template";
-  version = "0.0.0.1";
-  sha256 = "16p6ckl6ml8lgy42mvivnqphfd73cg8chms3fxid66gv4fif68zl";
-  buildDepends = [ dependentSum thExtras ];
-  meta = {
-    homepage = "/dev/null";
-    description = "Template Haskell code to generate instances of classes in dependent-sum package";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dependent-sum/default.nix b/pkgs/development/libraries/haskell/dependent-sum/default.nix
deleted file mode 100644
index 9f0922a8dfa8..000000000000
--- a/pkgs/development/libraries/haskell/dependent-sum/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "dependent-sum";
-  version = "0.2.1.0";
-  sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3";
-  meta = {
-    homepage = "https://github.com/mokus0/dependent-sum";
-    description = "Dependent sum type";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
deleted file mode 100644
index 5b8c5297316a..000000000000
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, haskellSrcExts, syb, transformers, uniplate }:
-
-cabal.mkDerivation (self: {
-  pname = "derive";
-  version = "2.5.18";
-  sha256 = "1jqng8v1d4rac8xmrpm7h1pkyr9pfwsbb0ap6pnwzpwz9fns9c3k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    filepath haskellSrcExts syb transformers uniplate
-  ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/derive/";
-    description = "A program and library to derive instances for data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix
deleted file mode 100644
index c14b43a4bc3a..000000000000
--- a/pkgs/development/libraries/haskell/derp/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "derp";
-  version = "0.1.6";
-  sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk";
-  meta = {
-    description = "Derivative Parsing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/default.nix b/pkgs/development/libraries/haskell/diagrams/builder/default.nix
deleted file mode 100644
index 40e1cf457966..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/builder/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeSvg, cmdargs, diagramsCairo, diagramsLib
-, diagramsPostscript, diagramsSvg, exceptions, filepath, hashable
-, haskellSrcExts, hint, lens, mtl, split, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-builder";
-  version = "0.6.0.2";
-  sha256 = "18avlhwywhrxlf1cyp9fdiy0i3gy12k4i28cymllmmyx78fv59q5";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeSvg cmdargs diagramsCairo diagramsLib diagramsPostscript
-    diagramsSvg exceptions filepath hashable haskellSrcExts hint lens
-    mtl split transformers
-  ];
-  configureFlags = "-fcairo -fsvg -fps -frasterific";
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "hint-based build service for the diagrams graphics EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
deleted file mode 100644
index 3fbc8c3f2b05..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  If user need access to more haskell package for building his
-  diagrams, he simply has to pass these package through the
-  extra packages function as follow in `config.nix`:
-
-  ~~~
-  diagramBuilderWrapper.override {
-    extraPackages = self : [myHaskellPackage];
-  }
-  ­~~~
-
-  WARNING:
-  Note that this solution works well but however, as this is a
-  non-cabal derivation, user should be carefull to never put this
-  package inside the listing passed as argument to `ghcWithPackages`
-  as it will silently disregard the package. This silent disregard
-  should be regarded as an issue for `ghcWithPackages`. It should
-  rather raise an error instead when a non-cabal dirivation is
-  directly passed to it. The alternative would have been to
-  use a fake cabal file in order to make this a cabal derivation.
-*/
-
-{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper,
-  extraPackages ? (self: []) }:
-let
-  # Used same technique such as xmonad
-  w = ghcWithPackages
-    (self: [ diagramsBuilder ] ++ extraPackages self);
-  wrappedGhc = w.override { ignoreCollisions = true; };
-in
-stdenv.mkDerivation {
-  name = diagramsBuilder.name + "-wrapper";
-  buildInputs = [ makeWrapper ];
-  buildCommand = ''
-    makeWrapper \
-    "${diagramsBuilder}/bin/diagrams-builder-svg" "$out/bin/diagrams-builder-svg" \
-      --set NIX_GHC ${wrappedGhc}/bin/ghc \
-      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
-
-    makeWrapper \
-    "${diagramsBuilder}/bin/diagrams-builder-cairo" "$out/bin/diagrams-builder-cairo" \
-      --set NIX_GHC ${wrappedGhc}/bin/ghc \
-      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
-
-    makeWrapper \
-    "${diagramsBuilder}/bin/diagrams-builder-ps" "$out/bin/diagrams-builder-ps" \
-    --set NIX_GHC ${wrappedGhc}/bin/ghc \
-    --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
-  '';
-  preferLocalBuild = true;
-  meta = diagramsBuilder.meta;
-}
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
deleted file mode 100644
index 24c26e052d91..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib
-, filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative
-, pango, split, statestack, time, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-cairo";
-  version = "1.2.0.4";
-  sha256 = "1yg6ja5jha499b6j5fsgdl4f3l2ff1gp6cl7ixzj9y26m7a10bqq";
-  buildDepends = [
-    cairo colour dataDefaultClass diagramsCore diagramsLib filepath
-    hashable JuicyPixels lens mtl optparseApplicative pango split
-    statestack time transformers vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "Cairo backend for diagrams drawing EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
deleted file mode 100644
index 78ed983650f7..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, arithmoi, circlePacking, colour, dataDefault
-, dataDefaultClass, diagramsCore, diagramsLib, forceLayout, HUnit
-, lens, MonadRandom, mtl, parsec, QuickCheck, semigroups, split
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, vectorSpace, vectorSpacePoints
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-contrib";
-  version = "1.1.2.4";
-  sha256 = "0iq5psy5wjm664hqsaprynba0b7x3ijxngh7mbk6hkh004vsna1w";
-  buildDepends = [
-    arithmoi circlePacking colour dataDefault dataDefaultClass
-    diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
-    semigroups split text vectorSpace vectorSpacePoints
-  ];
-  testDepends = [
-    diagramsLib HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "Collection of user contributions to diagrams EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
deleted file mode 100644
index 518b5594cb6c..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dualTree, lens, MemoTrie, monoidExtras, newtype
-, semigroups, vectorSpace, vectorSpacePoints
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-core";
-  version = "1.2.0.4";
-  sha256 = "1axkgprqs4jvzh5vfr118nzr1h0m48axr5jfiqqrqvy5xyjcagkq";
-  buildDepends = [
-    dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
-    vectorSpacePoints
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "Core libraries for diagrams EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
deleted file mode 100644
index 268bdce42792..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, diagramsContrib, diagramsCore, diagramsLib, diagramsSvg }:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams";
-  version = "1.2";
-  sha256 = "17j7hyd86h9msc8ni19agb0yhixga76q9kh4i109iyiyqizdnfhg";
-  buildDepends = [
-    diagramsContrib diagramsCore diagramsLib diagramsSvg
-  ];
-  noHaddock = true;
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "Embedded domain-specific language for declarative vector graphics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/gtk.nix b/pkgs/development/libraries/haskell/diagrams/gtk.nix
deleted file mode 100644
index c169c9e0e486..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/gtk.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, diagramsCairo, diagramsLib, gtk }:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-gtk";
-  version = "1.0.1.3";
-  sha256 = "1bcgplmg01sp7iwhgx7ircbn9bj15m42w6vkh539sd65y01z3hc8";
-  buildDepends = [ cairo diagramsCairo diagramsLib gtk ];
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "Backend for rendering diagrams directly to GTK windows";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
deleted file mode 100644
index d2e25254f678..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, active, colour, dataDefaultClass, diagramsCore, dualTree
-, filepath, fingertree, hashable, intervals, JuicyPixels, lens
-, MemoTrie, monoidExtras, optparseApplicative, semigroups, tagged
-, vectorSpace, vectorSpacePoints
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-lib";
-  version = "1.2.0.7";
-  sha256 = "12ddlipp47j2mifwhi0ilb2fjdh2whk24s4d5h6ais2znj3hh99a";
-  buildDepends = [
-    active colour dataDefaultClass diagramsCore dualTree filepath
-    fingertree hashable intervals JuicyPixels lens MemoTrie
-    monoidExtras optparseApplicative semigroups tagged vectorSpace
-    vectorSpacePoints
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "Embedded domain-specific language for declarative graphics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
deleted file mode 100644
index 841487305ef4..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, diagramsCore, diagramsLib, dlist
-, filepath, hashable, lens, monoidExtras, mtl, semigroups, split
-, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-postscript";
-  version = "1.1.0.3";
-  sha256 = "172r7q9jzhy2kv5bsbakakwv6gpvy308gvp8xpirbch9mrvnjxhz";
-  buildDepends = [
-    dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
-    lens monoidExtras mtl semigroups split vectorSpace
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "Postscript backend for diagrams drawing EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
deleted file mode 100644
index 8e494241f74e..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, diagramsCore, diagramsLib, filepath
-, FontyFruity, JuicyPixels, lens, mtl, optparseApplicative
-, Rasterific, split, statestack, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-rasterific";
-  version = "0.1.0.5";
-  sha256 = "1a95l8g55jsmqhbv9flk5kfkfa40z93axbjfz6xb74lyvl6xccwr";
-  buildDepends = [
-    dataDefaultClass diagramsCore diagramsLib filepath FontyFruity
-    JuicyPixels lens mtl optparseApplicative Rasterific split
-    statestack time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "Rasterific backend for diagrams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
deleted file mode 100644
index 1994905c1d4b..000000000000
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeMarkup, blazeSvg, colour
-, diagramsCore, diagramsLib, filepath, hashable, JuicyPixels, lens
-, monoidExtras, mtl, split, time, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-svg";
-  version = "1.1.0.3";
-  sha256 = "0byqxwz9h1hi2yrq2vz32gv0az9q3l94qa2q3nl3j8sa64qmpdwq";
-  buildDepends = [
-    base64Bytestring blazeMarkup blazeSvg colour diagramsCore
-    diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl
-    split time vectorSpace
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "SVG backend for diagrams drawing EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dice/default.nix b/pkgs/development/libraries/haskell/dice/default.nix
deleted file mode 100644
index 1e3b448f4496..000000000000
--- a/pkgs/development/libraries/haskell/dice/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec, randomFu, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "dice";
-  version = "0.1";
-  sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ parsec randomFu transformers ];
-  meta = {
-    description = "Simplistic D&D style dice-rolling system";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diff3/default.nix b/pkgs/development/libraries/haskell/diff3/default.nix
deleted file mode 100644
index d13b7af776b1..000000000000
--- a/pkgs/development/libraries/haskell/diff3/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Diff, QuickCheck, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diff3";
-  version = "0.2.0.3";
-  sha256 = "0zdfn1jhsq8pd23qpkhzr8wgiwbazfbq688bjnpc406i7gq88k78";
-  buildDepends = [ Diff ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/diff3.git";
-    description = "Perform a 3-way difference of documents";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digest-pure/default.nix b/pkgs/development/libraries/haskell/digest-pure/default.nix
deleted file mode 100644
index a36483bf2f7c..000000000000
--- a/pkgs/development/libraries/haskell/digest-pure/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, digest, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "digest-pure";
-  version = "0.0.3";
-  sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w";
-  testDepends = [ digest QuickCheck ];
-  meta = {
-    homepage = "http://github.com/danieldk/digest-pure";
-    description = "Pure hash functions for bytestrings";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix
deleted file mode 100644
index 6b1f2077ca69..000000000000
--- a/pkgs/development/libraries/haskell/digest/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "digest";
-  version = "0.0.1.2";
-  sha256 = "04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4";
-  extraLibraries = [ zlib ];
-  meta = {
-    description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
deleted file mode 100644
index 819d4690da58..000000000000
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl
-, safe, scientific, tasty, tastyHunit, text, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "digestive-functors-aeson";
-  version = "1.1.12.1";
-  sha256 = "1jwrlmavwjq3bf8ylazi91mwl47n5pdh3lipv4p7v0gq45dm3hg9";
-  buildDepends = [
-    aeson digestiveFunctors lens lensAeson safe text vector
-  ];
-  testDepends = [
-    aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/digestive-functors-aeson";
-    description = "Run digestive-functors forms against JSON";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
deleted file mode 100644
index 29ed05048067..000000000000
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, digestiveFunctors, heist, mtl, text, xmlhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "digestive-functors-heist";
-  version = "0.8.6.1";
-  sha256 = "1l8ppn2h1nxzn5wxnglc2fyi7r90177v75yf4n7cyvzrcxdaz4bb";
-  buildDepends = [
-    blazeBuilder digestiveFunctors heist mtl text xmlhtml
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jaspervdj/digestive-functors";
-    description = "Heist frontend for the digestive-functors library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
deleted file mode 100644
index 71d1a6448fa5..000000000000
--- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, digestiveFunctors, filepath, mtl, snapCore, text }:
-
-cabal.mkDerivation (self: {
-  pname = "digestive-functors-snap";
-  version = "0.6.1.0";
-  sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr";
-  buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jaspervdj/digestive-functors";
-    description = "Snap backend for the digestive-functors library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix
deleted file mode 100644
index 03448a3fe679..000000000000
--- a/pkgs/development/libraries/haskell/digestive-functors/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "digestive-functors";
-  version = "0.7.1.1";
-  sha256 = "161461y8gil2922gx6kdc59g50ywk9nk74gkxl0yrwvz80a118c9";
-  buildDepends = [ mtl text time ];
-  testDepends = [
-    HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jaspervdj/digestive-functors";
-    description = "A practical formlet library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digits/default.nix b/pkgs/development/libraries/haskell/digits/default.nix
deleted file mode 100644
index 16f4e665f933..000000000000
--- a/pkgs/development/libraries/haskell/digits/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "digits";
-  version = "0.2";
-  sha256 = "18s9k7kj0qvd4297msl0k6ziwfb5bl1gwnxlrl8b4rkqda4kf17l";
-  buildDepends = [ QuickCheck ];
-  meta = {
-    description = "Converts integers to lists of digits and back";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
deleted file mode 100644
index b6e3f40f9377..000000000000
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, numtypeTf, time }:
-
-cabal.mkDerivation (self: {
-  pname = "dimensional-tf";
-  version = "0.3.0.1";
-  sha256 = "0gnaylxhjcyvsibq15bw9k4c846l2329yvvl79cdw2jqggfnzxw6";
-  buildDepends = [ numtypeTf time ];
-  meta = {
-    homepage = "http://dimensional.googlecode.com/";
-    description = "Statically checked physical dimensions, implemented using type families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
deleted file mode 100644
index 9be32b5596a1..000000000000
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, numtype, time }:
-
-cabal.mkDerivation (self: {
-  pname = "dimensional";
-  version = "0.13.0.1";
-  sha256 = "1cn7gyskp0ax5lm5k05p6qp461hirjyhj0k1qyd64fgdmmp81vi6";
-  buildDepends = [ numtype time ];
-  meta = {
-    homepage = "http://dimensional.googlecode.com/";
-    description = "Statically checked physical dimensions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
deleted file mode 100644
index c3be0f888ac2..000000000000
--- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base16Bytestring, HUnit, text }:
-
-cabal.mkDerivation (self: {
-  pname = "direct-sqlite";
-  version = "2.3.14";
-  sha256 = "0xxvr2wln54snkvs2r46fkkn7yhm6i2afgww40vnfqamg8g81x5w";
-  buildDepends = [ text ];
-  testDepends = [ base16Bytestring HUnit text ];
-  meta = {
-    homepage = "https://github.com/IreneKnapp/direct-sqlite";
-    description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix
deleted file mode 100644
index 2cc9682dccb1..000000000000
--- a/pkgs/development/libraries/haskell/directory-layout/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, commandQq, doctest, filepath, free, hspec, lens
-, semigroups, temporary, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "directory-layout";
-  version = "0.7.4.1";
-  sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b";
-  buildDepends = [
-    commandQq filepath free hspec lens semigroups text transformers
-    unorderedContainers
-  ];
-  testDepends = [
-    commandQq doctest filepath free hspec lens semigroups temporary
-    text transformers unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    description = "Directory layout DSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix
deleted file mode 100644
index d4bff085005c..000000000000
--- a/pkgs/development/libraries/haskell/directory-tree/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "directory-tree";
-  version = "0.12.0";
-  sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz";
-  buildDepends = [ filepath ];
-  testDepends = [ filepath ];
-  meta = {
-    homepage = "http://brandon.si/code/directory-tree-module-released/";
-    description = "A simple directory-like tree datatype, with useful IO functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
deleted file mode 100644
index d8de329a7deb..000000000000
--- a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, distributedProcess, monadControl, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process-monad-control";
-  version = "0.5.1";
-  sha256 = "01sdzmb8izsycxshhsg0pbx0mgn10y41df1dj1s66ish0qszw07m";
-  buildDepends = [
-    distributedProcess monadControl transformers transformersBase
-  ];
-  meta = {
-    homepage = "http://haskell-distributed.github.io";
-    description = "Orphan instances for MonadBase and MonadBaseControl";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix b/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
deleted file mode 100644
index 165b09d13bf6..000000000000
--- a/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, distributedProcess, mtl, network, networkTransport
-, networkTransportTcp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process-p2p";
-  version = "0.1.3.0";
-  sha256 = "00lvi2x1s8r7lwfvsjnvzc9iwdk4ip8svw85p2h3ra4iqbzj70l2";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary distributedProcess mtl network networkTransport
-    networkTransportTcp
-  ];
-  meta = {
-    homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
-    description = "Peer-to-peer node discovery for Cloud Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process-platform/default.nix b/pkgs/development/libraries/haskell/distributed-process-platform/default.nix
deleted file mode 100644
index cb014f53a8a9..000000000000
--- a/pkgs/development/libraries/haskell/distributed-process-platform/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, binary, dataAccessor, deepseq
-, distributedProcess, distributedStatic, fingertree, hashable
-, HUnit, mtl, network, networkTransport, networkTransportTcp
-, QuickCheck, rematch, stm, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process-platform";
-  version = "0.1.0";
-  sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary dataAccessor deepseq distributedProcess fingertree hashable
-    mtl stm time transformers unorderedContainers
-  ];
-  testDepends = [
-    ansiTerminal binary dataAccessor deepseq distributedProcess
-    distributedStatic fingertree hashable HUnit mtl network
-    networkTransport networkTransportTcp QuickCheck rematch stm
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 time
-    transformers unorderedContainers
-  ];
-  hyperlinkSource = false;
-  jailbreak = true;
-  doCheck = false;
-  patchPhase = "mv Setup.hs Setup.lhs";
-  meta = {
-    homepage = "http://github.com/haskell-distributed/distributed-process-platform";
-    description = "The Cloud Haskell Application Platform";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix
deleted file mode 100644
index 0232a02c8af5..000000000000
--- a/pkgs/development/libraries/haskell/distributed-process/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataAccessor, deepseq, distributedStatic, hashable
-, mtl, networkTransport, random, rank1dynamic, stm, syb, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process";
-  version = "0.5.2";
-  sha256 = "04llhz9z28365idgj13hhwkp98zwqv6mhhy9i7416wk5d3r70g7l";
-  buildDepends = [
-    binary dataAccessor deepseq distributedStatic hashable mtl
-    networkTransport random rank1dynamic stm syb time transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell-distributed.github.com/";
-    description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix
deleted file mode 100644
index 4dce7cc1deda..000000000000
--- a/pkgs/development/libraries/haskell/distributed-static/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, rank1dynamic }:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-static";
-  version = "0.3.1.0";
-  sha256 = "190b6vjcipgrvnfl72c0ssw8crza02gfw9kwyvwg043jcznihj08";
-  buildDepends = [ binary rank1dynamic ];
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "Compositional, type-safe, polymorphic static values and closures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
deleted file mode 100644
index 9bb64ee4c59b..000000000000
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, tagged, transformers
-, transformersCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributive";
-  version = "0.4.4";
-  sha256 = "0s2ln9jv7bh4ri2y31178pvjl8x6nik5d0klx7j2b77yjlsgblc2";
-  buildDepends = [ tagged transformers transformersCompat ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/distributive/";
-    description = "Distributive functors -- Dual to Traversable";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/djinn-ghc/default.nix b/pkgs/development/libraries/haskell/djinn-ghc/default.nix
deleted file mode 100644
index 3b5ffae42c5e..000000000000
--- a/pkgs/development/libraries/haskell/djinn-ghc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, djinnLib, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "djinn-ghc";
-  version = "0.0.2.2";
-  sha256 = "0dz5jg58si9fsc12212rxmzky09zric7b2sdj1ydmvnrjxkh9l70";
-  buildDepends = [ async djinnLib mtl transformers ];
-  meta = {
-    description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/djinn-lib/default.nix b/pkgs/development/libraries/haskell/djinn-lib/default.nix
deleted file mode 100644
index 357ad9a4fdcc..000000000000
--- a/pkgs/development/libraries/haskell/djinn-lib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "djinn-lib";
-  version = "0.0.1.2";
-  sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://www.augustsson.net/Darcs/Djinn/";
-    description = "Generate Haskell code from a type. Library extracted from djinn package.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix
deleted file mode 100644
index e922d9ff7be4..000000000000
--- a/pkgs/development/libraries/haskell/djinn/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskeline, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "djinn";
-  version = "2014.9.7";
-  sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ haskeline mtl ];
-  meta = {
-    description = "Generate Haskell code from a type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dlist-instances/default.nix b/pkgs/development/libraries/haskell/dlist-instances/default.nix
deleted file mode 100644
index 29910a22381f..000000000000
--- a/pkgs/development/libraries/haskell/dlist-instances/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "dlist-instances";
-  version = "0.1";
-  sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615";
-  buildDepends = [ dlist semigroups ];
-  meta = {
-    homepage = "https://github.com/gregwebs/dlist-instances";
-    description = "Difference lists instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
deleted file mode 100644
index bf0b73b45e60..000000000000
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, deepseq, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "dlist";
-  version = "0.7.1";
-  sha256 = "13ka30bn742ldacfgj2lhxvhwf769d0ziy2358vmd5xaq6fn1xfr";
-  buildDepends = [ deepseq ];
-  testDepends = [ Cabal QuickCheck ];
-  meta = {
-    homepage = "https://github.com/spl/dlist";
-    description = "Difference lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
deleted file mode 100644
index ab74819965a7..000000000000
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, binary, blazeBuilder, conduit, conduitExtra
-, doctest, hspec, iproute, mtl, network, random, resourcet, word8
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dns";
-  version = "1.4.4";
-  sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd";
-  buildDepends = [
-    attoparsec binary blazeBuilder conduit conduitExtra iproute mtl
-    network random resourcet
-  ];
-  testDepends = [
-    attoparsec binary blazeBuilder conduit conduitExtra doctest hspec
-    iproute mtl network random resourcet word8
-  ];
-  testTarget = "spec";
-  meta = {
-    description = "DNS library in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/doctest-prop/default.nix b/pkgs/development/libraries/haskell/doctest-prop/default.nix
deleted file mode 100644
index bca82f78bcf4..000000000000
--- a/pkgs/development/libraries/haskell/doctest-prop/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "doctest-prop";
-  version = "0.2";
-  sha256 = "09wxkhcmh297hqnx3g4x8ff0w5dcmls9y383417rc8wawf5q288n";
-  buildDepends = [ HUnit QuickCheck ];
-  testDepends = [ doctest HUnit QuickCheck ];
-  meta = {
-    description = "Allow QuickCheck-style property testing within doctest";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
deleted file mode 100644
index af3f9e2d5255..000000000000
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit
-, QuickCheck, setenv, silently, stringbuilder, syb, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "doctest";
-  version = "0.9.11.1";
-  sha256 = "1gzzzwr7f7281mlbfbk74nxr28l70lwfaws4xjfx2v06xazl99db";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ deepseq filepath ghcPaths syb transformers ];
-  testDepends = [
-    baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
-    silently stringbuilder syb transformers
-  ];
-  doCheck = false;
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
-  meta = {
-    homepage = "https://github.com/sol/doctest#readme";
-    description = "Test interactive Haskell examples";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dom-selector/default.nix b/pkgs/development/libraries/haskell/dom-selector/default.nix
deleted file mode 100644
index b9806ca4dc7b..000000000000
--- a/pkgs/development/libraries/haskell/dom-selector/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, htmlConduit, parsec, QuickCheck, text, thLift
-, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dom-selector";
-  version = "0.2.0.1";
-  sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22";
-  buildDepends = [
-    blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
-  ];
-  testDepends = [
-    blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/nebuta/";
-    description = "DOM traversal by CSS selectors for xml-conduit package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix
deleted file mode 100644
index f72b051be44a..000000000000
--- a/pkgs/development/libraries/haskell/dotgen/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "dotgen";
-  version = "0.4.1";
-  sha256 = "1g5ds0mqkz0lzhcp42hin08azschs3p083ikdk4d5jil8rzl7d8k";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "A simple interface for building .dot graph files.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix
deleted file mode 100644
index 7089c9fcd054..000000000000
--- a/pkgs/development/libraries/haskell/double-conversion/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, testFramework, testFrameworkQuickcheck2, text }:
-
-cabal.mkDerivation (self: {
-  pname = "double-conversion";
-  version = "2.0.1.0";
-  sha256 = "034ji9jgf3jl0n5pp1nki3lsg173c3b9vniwnwp1q21iasqbawh0";
-  buildDepends = [ text ];
-  testDepends = [ testFramework testFrameworkQuickcheck2 text ];
-  meta = {
-    homepage = "https://github.com/bos/double-conversion";
-    description = "Fast conversion between double precision floating point and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix
deleted file mode 100644
index c30cbfec691e..000000000000
--- a/pkgs/development/libraries/haskell/download-curl/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, curl, feed, tagsoup, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "download-curl";
-  version = "0.1.4";
-  sha256 = "1wf3pf2k4i6jvpfsjlxdj6v53qd33jj1z1ipaf3p47glgx4xw3lm";
-  buildDepends = [ curl feed tagsoup xml ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/download-curl";
-    description = "High-level file download based on URLs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix
deleted file mode 100644
index dc9ecd7145a4..000000000000
--- a/pkgs/development/libraries/haskell/download/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, feed, tagsoup, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "download";
-  version = "0.3.2";
-  sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3";
-  buildDepends = [ feed tagsoup xml ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/download";
-    description = "High-level file download based on URLs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix
deleted file mode 100644
index f0d64562d7c1..000000000000
--- a/pkgs/development/libraries/haskell/dsp/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "dsp";
-  version = "0.2.3";
-  sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ random ];
-  patchPhase = ''
-    sed -i -e 's|random.*<1.1,|random,|' dsp.cabal
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/DSP";
-    description = "Haskell Digital Signal Processing";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
deleted file mode 100644
index eee03fd3fba1..000000000000
--- a/pkgs/development/libraries/haskell/dstring/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseUnicodeSymbols, dlist }:
-
-cabal.mkDerivation (self: {
-  pname = "dstring";
-  version = "0.4.0.4";
-  sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
-  buildDepends = [ baseUnicodeSymbols dlist ];
-  meta = {
-    homepage = "https://github.com/basvandijk/dstring";
-    description = "Difference strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
deleted file mode 100644
index 7efdcce85261..000000000000
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monoidExtras, newtype, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "dual-tree";
-  version = "0.2.0.5";
-  sha256 = "077njr9m6x9n2id0419rn6v4xwb9nvxshrmas9pkknp52va4ljg5";
-  buildDepends = [ monoidExtras newtype semigroups ];
-  jailbreak = true;
-  meta = {
-    description = "Rose trees with cached and accumulating monoidal annotations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
deleted file mode 100644
index 066c11e5a361..000000000000
--- a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, doctest, filepath, ghcPaths, haskellGenerate
-, haskellSrcExts, HUnit, tasty, tastyHunit, tastyTh, time, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dynamic-cabal";
-  version = "0.3.3";
-  sha256 = "0fq6q0j2fx7ygarzgsvb7scssjnrxjrq188d0habfar6bdm0vqdg";
-  buildDepends = [
-    dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time
-    void
-  ];
-  testDepends = [ doctest filepath HUnit tasty tastyHunit tastyTh ];
-  meta = {
-    homepage = "http://github.com/bennofs/dynamic-cabal/";
-    description = "dynamic-cabal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dynamic-state/default.nix b/pkgs/development/libraries/haskell/dynamic-state/default.nix
deleted file mode 100644
index 21eb0fdab281..000000000000
--- a/pkgs/development/libraries/haskell/dynamic-state/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, concreteTyperep, hashable, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "dynamic-state";
-  version = "0.1.1.0";
-  sha256 = "18dc6fbnyk3q7n7gvqrgy98qc2grq0algr2jnc1ai3vm9bqh2x8n";
-  buildDepends = [
-    binary concreteTyperep hashable unorderedContainers
-  ];
-  meta = {
-    description = "Optionally serializable dynamic state keyed by type";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix
deleted file mode 100644
index 0d47a68d06d9..000000000000
--- a/pkgs/development/libraries/haskell/dyre/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, executablePath, filepath, ghcPaths, ioStorage
-, time, xdgBasedir
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dyre";
-  version = "0.8.12";
-  sha256 = "10hnlysy4bjvvznk8v902mlk4jx95qf972clyi1l32xkqrf30972";
-  buildDepends = [
-    binary executablePath filepath ghcPaths ioStorage time xdgBasedir
-  ];
-  meta = {
-    homepage = "http://github.com/willdonnelly/dyre";
-    description = "Dynamic reconfiguration in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/easy-file/default.nix b/pkgs/development/libraries/haskell/easy-file/default.nix
deleted file mode 100644
index 8ba73d74efee..000000000000
--- a/pkgs/development/libraries/haskell/easy-file/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, time }:
-
-cabal.mkDerivation (self: {
-  pname = "easy-file";
-  version = "0.2.0";
-  sha256 = "0v8skixq15rvyiyky1dcrfl9jrzkbi75vai8np11xy2kg7a8ym2a";
-  buildDepends = [ filepath time ];
-  meta = {
-    homepage = "http://github.com/kazu-yamamoto/easy-file";
-    description = "Cross-platform File handling";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix
deleted file mode 100644
index c68e32b78dfd..000000000000
--- a/pkgs/development/libraries/haskell/edit-distance/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "edit-distance";
-  version = "0.2.1.2";
-  sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://github.com/batterseapower/edit-distance";
-    description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix
deleted file mode 100644
index 4458a067b1f4..000000000000
--- a/pkgs/development/libraries/haskell/editline/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libedit }:
-
-cabal.mkDerivation (self: {
-  pname = "editline";
-  version = "0.2.1.1";
-  sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
-  extraLibraries = [ libedit ];
-  meta = {
-    homepage = "http://code.haskell.org/editline";
-    description = "Bindings to the editline library (libedit)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
deleted file mode 100644
index 70c8573ade5b..000000000000
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, exceptions, free, monadControl, MonadRandom
-, mtl, profunctors, semigroupoids, semigroups, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "either";
-  version = "4.3.2.1";
-  sha256 = "09c1xal7d6azw0cc8mwi0ry8blysg29cmyfipdhg1b7vzyjavv22";
-  buildDepends = [
-    bifunctors exceptions free monadControl MonadRandom mtl profunctors
-    semigroupoids semigroups transformers transformersBase
-  ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
-  meta = {
-    homepage = "http://github.com/ekmett/either/";
-    description = "An either monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix
deleted file mode 100644
index e4074ddd1ff7..000000000000
--- a/pkgs/development/libraries/haskell/ekg-bosun/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ekgCore, httpClient, lens, network, networkUri
-, text, time, unorderedContainers, vector, wreq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ekg-bosun";
-  version = "1.0.3";
-  sha256 = "0mlfsmw1aa24p6fhml8m2dj2v7hrp91a9d3cfl74rr8z8am61mqc";
-  buildDepends = [
-    aeson ekgCore httpClient lens network networkUri text time
-    unorderedContainers vector wreq
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/ekg-bosun";
-    description = "Send ekg metrics to a Bosun instance";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix
deleted file mode 100644
index 2339009a138b..000000000000
--- a/pkgs/development/libraries/haskell/ekg-carbon/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ekgCore, network, networkCarbon, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ekg-carbon";
-  version = "1.0.2";
-  sha256 = "0m8cv2hsn1745f7pj552rp9sjsyfh7fbgjw6k2ippqcbxmhqmf4i";
-  buildDepends = [
-    ekgCore network networkCarbon text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/ekg-carbon";
-    description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix
deleted file mode 100644
index 6e2189dbadb6..000000000000
--- a/pkgs/development/libraries/haskell/ekg-core/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "ekg-core";
-  version = "0.1.0.2";
-  sha256 = "0iipj2q4msawxlvzzikiy7jls22ncbx7v3ldi7y75d52cyl2lmpg";
-  buildDepends = [ text unorderedContainers ];
-  meta = {
-    homepage = "https://github.com/tibbe/ekg-core";
-    description = "Tracking of system metrics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix
deleted file mode 100644
index 05dd7d998771..000000000000
--- a/pkgs/development/libraries/haskell/ekg/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ekgCore, filepath, network, snapCore, snapServer
-, text, time, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ekg";
-  version = "0.4.0.5";
-  sha256 = "0ak06yz88p79bhayy8byy3j9yw9bix7zhw8yxfcdnxjwgnx621h0";
-  buildDepends = [
-    aeson ekgCore filepath network snapCore snapServer text time
-    transformers unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/tibbe/ekg";
-    description = "Remote monitoring of processes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix
deleted file mode 100644
index 4d843bb08363..000000000000
--- a/pkgs/development/libraries/haskell/elerea/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "elerea";
-  version = "2.8.0";
-  sha256 = "1sc71775f787dh70ay9fm6x6npsn81yci9yr984ai87ddz023sab";
-  buildDepends = [ transformers transformersBase ];
-  meta = {
-    description = "A minimalistic FRP library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/elevator/default.nix b/pkgs/development/libraries/haskell/elevator/default.nix
deleted file mode 100644
index a93e52a0ba08..000000000000
--- a/pkgs/development/libraries/haskell/elevator/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cleanUnions, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "elevator";
-  version = "0.1.3";
-  sha256 = "0z7rj70ilv4y95prfdj3fjlw4icr64d66lqgyr6jp28zxrxw1535";
-  buildDepends = [ cleanUnions transformers ];
-  meta = {
-    homepage = "https://github.com/fumieval/elevator";
-    description = "Immediately lifts to a desired level";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix
deleted file mode 100644
index 8f95b8ec67bc..000000000000
--- a/pkgs/development/libraries/haskell/email-validate/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "email-validate";
-  version = "2.0.1";
-  sha256 = "1qxvcm8xiyz50ganzic8cm8nxswq361i80yi939y3n89dk067lzj";
-  buildDepends = [ attoparsec ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
-    description = "Validating an email address string against RFC 5322";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
deleted file mode 100644
index a28c9fc4683c..000000000000
--- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, deepseq, hspec, liftedBase, monadControl
-, QuickCheck, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "enclosed-exceptions";
-  version = "1.0.1";
-  sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz";
-  buildDepends = [
-    async deepseq liftedBase monadControl transformers transformersBase
-  ];
-  testDepends = [
-    async deepseq hspec liftedBase monadControl QuickCheck transformers
-    transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/jcristovao/enclosed-exceptions";
-    description = "Catching all exceptions from within an enclosed computation";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix
deleted file mode 100644
index 148d4f4debfb..000000000000
--- a/pkgs/development/libraries/haskell/encoding/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, extensibleExceptions, HaXml, mtl, regexCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "encoding";
-  version = "0.7.0.2";
-  sha256 = "14l3dx7ayvp2dm37c3h7p63zfzmhwpx1hirbkm04idhi3906lxps";
-  buildDepends = [
-    binary extensibleExceptions HaXml mtl regexCompat
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://code.haskell.org/encoding/";
-    description = "A library for various character encodings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
deleted file mode 100644
index b37ef7c2bc18..000000000000
--- a/pkgs/development/libraries/haskell/engine-io-snap/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsecEnumerator, engineIo, MonadCatchIOTransformers
-, snapCore, unorderedContainers, websockets, websocketsSnap
-}:
-
-cabal.mkDerivation (self: {
-  pname = "engine-io-snap";
-  version = "1.0.2";
-  sha256 = "0x2sb3b825ds1g2g15yyqxdrw6bh968ivmyd1933l47649qbs0xr";
-  buildDepends = [
-    attoparsecEnumerator engineIo MonadCatchIOTransformers snapCore
-    unorderedContainers websockets websocketsSnap
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/engine.io";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix
deleted file mode 100644
index d275a2f2b0f5..000000000000
--- a/pkgs/development/libraries/haskell/engine-io/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, attoparsec, base64Bytestring, either, free
-, monadLoops, mwcRandom, stm, stmDelay, text, transformers
-, unorderedContainers, vector, websockets
-}:
-
-cabal.mkDerivation (self: {
-  pname = "engine-io";
-  version = "1.2.3";
-  sha256 = "05sc939x24f3na6nxywgbq0yx4wdamh6zk4spdclqgq65j7v0hxc";
-  buildDepends = [
-    aeson async attoparsec base64Bytestring either free monadLoops
-    mwcRandom stm stmDelay text transformers unorderedContainers vector
-    websockets
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/engine.io";
-    description = "A Haskell implementation of Engine.IO";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
deleted file mode 100644
index 3b40f5959f79..000000000000
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "entropy";
-  version = "0.3.4.1";
-  sha256 = "10myxs2a7838sywnlfggpsd7lmvzphl10zdh1vbbi18n3x79gyk0";
-  meta = {
-    homepage = "https://github.com/TomMD/entropy";
-    description = "A platform independent entropy source";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
deleted file mode 100644
index d68222f6f7bf..000000000000
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "enumerator";
-  version = "0.4.20";
-  sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
-  buildDepends = [ text transformers ];
-  meta = {
-    homepage = "https://john-millikin.com/software/enumerator/";
-    description = "Reliable, high-performance processing with left-fold enumerators";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix
deleted file mode 100644
index 9b24980b5b9f..000000000000
--- a/pkgs/development/libraries/haskell/enummapset-th/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "enummapset-th";
-  version = "0.6.0.1";
-  sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "https://github.com/liyang/enummapset-th";
-    description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enummapset/default.nix b/pkgs/development/libraries/haskell/enummapset/default.nix
deleted file mode 100644
index 97833ea94650..000000000000
--- a/pkgs/development/libraries/haskell/enummapset/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "enummapset";
-  version = "0.5.2.0";
-  sha256 = "065gxljrjw59rdf7abq0v0c29wg1ymg984ckixnjrcs1yks0c2js";
-  buildDepends = [ deepseq ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/michalt/enummapset";
-    description = "IntMap and IntSet with Enum keys/elements";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enumset/default.nix b/pkgs/development/libraries/haskell/enumset/default.nix
deleted file mode 100644
index d563ce042479..000000000000
--- a/pkgs/development/libraries/haskell/enumset/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, storableRecord }:
-
-cabal.mkDerivation (self: {
-  pname = "enumset";
-  version = "0.0.4";
-  sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w";
-  buildDepends = [ dataAccessor storableRecord ];
-  meta = {
-    description = "Sets of enumeration values represented by machine words";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ertes ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix
deleted file mode 100644
index b9562573f8f2..000000000000
--- a/pkgs/development/libraries/haskell/equational-reasoning/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, singletons, tagged, void }:
-
-cabal.mkDerivation (self: {
-  pname = "equational-reasoning";
-  version = "0.2.0.4";
-  sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j";
-  buildDepends = [ singletons tagged void ];
-  jailbreak = true;
-  meta = {
-    description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/equivalence/default.nix b/pkgs/development/libraries/haskell/equivalence/default.nix
deleted file mode 100644
index 38de239b821b..000000000000
--- a/pkgs/development/libraries/haskell/equivalence/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, STMonadTrans, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "equivalence";
-  version = "0.2.5";
-  sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3";
-  buildDepends = [ mtl STMonadTrans ];
-  testDepends = [
-    mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://bitbucket.org/paba/equivalence/";
-    description = "Maintaining an equivalence relation implemented as union-find using STT";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix
deleted file mode 100644
index 431a9b99b335..000000000000
--- a/pkgs/development/libraries/haskell/erf/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "erf";
-  version = "2.0.0.0";
-  sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
-  meta = {
-    description = "The error function, erf, and related functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix
deleted file mode 100644
index 69949aeb575c..000000000000
--- a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "errorcall-eq-instance";
-  version = "0.1.0";
-  sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk";
-  testDepends = [ hspec QuickCheck ];
-  meta = {
-    description = "An orphan Eq instance for ErrorCall";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
deleted file mode 100644
index d61bef4102de..000000000000
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, either, safe, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "errors";
-  version = "1.4.7";
-  sha256 = "09g53dylwsw1phxq5zhkbq8pnpwqzipvqclmcrdypzkpwkmfncl7";
-  buildDepends = [ either safe transformers ];
-  jailbreak = true;
-  meta = {
-    description = "Simplified error-handling";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
deleted file mode 100644
index c85ff455180d..000000000000
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, hspec, HUnit, monadControl, monadLogger
-, persistent, persistentSqlite, persistentTemplate, QuickCheck
-, resourcet, tagged, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "esqueleto";
-  version = "2.1.2.1";
-  sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i";
-  buildDepends = [
-    conduit monadLogger persistent resourcet tagged text transformers
-    unorderedContainers
-  ];
-  testDepends = [
-    conduit hspec HUnit monadControl monadLogger persistent
-    persistentSqlite persistentTemplate QuickCheck resourcet text
-    transformers
-  ];
-  meta = {
-    homepage = "https://github.com/prowdsponsor/esqueleto";
-    description = "Type-safe EDSL for SQL queries on persistent backends";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix
deleted file mode 100644
index 99f48cb9a280..000000000000
--- a/pkgs/development/libraries/haskell/event-list/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, nonNegative, QuickCheck, random, transformers, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "event-list";
-  version = "0.1.1.1";
-  sha256 = "16qrjvn8z2nlpfp3xlgwsg2abn7b33n3z673qs5k6ashfbkdy5ja";
-  buildDepends = [ nonNegative QuickCheck transformers utilityHt ];
-  testDepends = [
-    nonNegative QuickCheck random transformers utilityHt
-  ];
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/event-list/";
-    description = "Event lists with relative or absolute time stamps";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix
deleted file mode 100644
index 7c40662dd980..000000000000
--- a/pkgs/development/libraries/haskell/ex-pool/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, hashable, stm, time, transformers, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "ex-pool";
-  version = "0.2";
-  sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva";
-  buildDepends = [
-    exceptions hashable stm time transformers vector
-  ];
-  meta = {
-    homepage = "https://github.com/kim/ex-pool";
-    description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix
deleted file mode 100644
index 49fb11535a12..000000000000
--- a/pkgs/development/libraries/haskell/exception-mtl/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptionTransformers, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "exception-mtl";
-  version = "0.3.0.5";
-  sha256 = "1rqrh1wbm67w9rbh1gg5zsavlsw9nfw0hnbs9q2djglh73pq3iqj";
-  buildDepends = [ exceptionTransformers mtl transformers ];
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "Exception monad transformer instances for mtl2 classes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix
deleted file mode 100644
index 2e2f828cb307..000000000000
--- a/pkgs/development/libraries/haskell/exception-transformers/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm, testFramework, testFrameworkHunit
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "exception-transformers";
-  version = "0.3.0.4";
-  sha256 = "1m4mwgzynymdjvrrrvl90q468pgwik07yy2lsff9spxhcd43w2ra";
-  buildDepends = [ stm transformers ];
-  testDepends = [
-    HUnit testFramework testFrameworkHunit transformers
-  ];
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "Type classes and monads for unchecked extensible exceptions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix
deleted file mode 100644
index ef56c9909e1c..000000000000
--- a/pkgs/development/libraries/haskell/exceptions/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, testFramework, testFrameworkQuickcheck2
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "exceptions";
-  version = "0.6.1";
-  sha256 = "09jv5jskv48fd5la1pdvafwc9j2jxj1ncf6yxzkwcjddynbkyszm";
-  buildDepends = [ mtl transformers ];
-  testDepends = [
-    mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/exceptions/";
-    description = "Extensible optionally-pure exceptions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix
deleted file mode 100644
index c8ec138eb63c..000000000000
--- a/pkgs/development/libraries/haskell/executable-path/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "executable-path";
-  version = "0.0.3";
-  sha256 = "1jg58qf19qz93c60ryglcavwdcysz4fd4qn8kpw5im9w9kniawlc";
-  buildDepends = [ filepath ];
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "Finding out the full path of the executable";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/exhaustive/default.nix b/pkgs/development/libraries/haskell/exhaustive/default.nix
deleted file mode 100644
index bd77f9f8f115..000000000000
--- a/pkgs/development/libraries/haskell/exhaustive/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, genericsSop, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "exhaustive";
-  version = "1.1.0";
-  sha256 = "14pdf5iks0j2vpg3w48qs32lnj8ahkd0jljjhx1qap66mss0i3jl";
-  buildDepends = [ genericsSop transformers ];
-  meta = {
-    homepage = "http://github.com/ocharles/exhaustive";
-    description = "Compile time checks that a computation considers producing data through all possible constructors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
deleted file mode 100644
index 6c5c4f2b2ff8..000000000000
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "explicit-exception";
-  version = "0.1.7.3";
-  sha256 = "0f1p1llz6z4ag1wnf57mgm861cbw7va0g0m8klp6f6pnirdhlwz1";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Exception";
-    description = "Exceptions which are explicit in the type signature";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix
deleted file mode 100644
index e7f1f16059d4..000000000000
--- a/pkgs/development/libraries/haskell/extensible-effects/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers, transformersBase
-, typeAligned, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "extensible-effects";
-  version = "1.9.0.1";
-  sha256 = "17hl4x4052jfn7xs6xhnc6d3x75a8haw2zsbnjd6rr5gsd1hq5kx";
-  buildDepends = [ transformers transformersBase typeAligned void ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 void
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/RobotGymnast/extensible-effects";
-    description = "An Alternative to Monad Transformers";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/default.nix b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
deleted file mode 100644
index 39969527a85a..000000000000
--- a/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "extensible-exceptions";
-  version = "0.1.1.4";
-  sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
-  meta = {
-    description = "Extensible exceptions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix
deleted file mode 100644
index 9e90fe2bb05b..000000000000
--- a/pkgs/development/libraries/haskell/extra/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "extra";
-  version = "1.0";
-  sha256 = "0ainwq8f2mp1wc30srl971xy4qnrcyrcyig1kmrxx951hgav1dkb";
-  buildDepends = [ filepath time ];
-  testDepends = [ filepath QuickCheck time ];
-  meta = {
-    homepage = "https://github.com/ndmitchell/extra#readme";
-    description = "Extra functions I use";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
deleted file mode 100644
index 86912a2e4457..000000000000
--- a/pkgs/development/libraries/haskell/failure/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "failure";
-  version = "0.2.0.3";
-  sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
-  buildDepends = [ transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Failure";
-    description = "A simple type class for success/failure computations. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
deleted file mode 100644
index b0cd40e48fc2..000000000000
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, autoUpdate, blazeBuilder, filepath, hspec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "fast-logger";
-  version = "2.2.3";
-  sha256 = "0zap61gz0snbq42h8nyjh637fr2cm1ny9f77sqd6v3yfqjq0ljh3";
-  buildDepends = [ autoUpdate blazeBuilder filepath text ];
-  testDepends = [ hspec ];
-  meta = {
-    description = "A fast logging system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fastcgi/default.nix b/pkgs/development/libraries/haskell/fastcgi/default.nix
deleted file mode 100644
index a41815250e1f..000000000000
--- a/pkgs/development/libraries/haskell/fastcgi/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cgi, fcgi }:
-
-cabal.mkDerivation (self: {
-  pname = "fastcgi";
-  version = "3001.0.2.4";
-  sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr";
-  buildDepends = [ cgi ];
-  extraLibraries = [ fcgi ];
-  meta = {
-    description = "A Haskell library for writing FastCGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix
deleted file mode 100644
index 466dd4782617..000000000000
--- a/pkgs/development/libraries/haskell/fay-base/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fay }:
-
-cabal.mkDerivation (self: {
-  pname = "fay-base";
-  version = "0.19.4.1";
-  sha256 = "1pk1jjwyh2n9fg583v4cd0ll5qglphwnfm08q95klcvc61p4wqg6";
-  buildDepends = [ fay ];
-  meta = {
-    homepage = "https://github.com/faylang/fay/";
-    description = "The base package for Fay";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    inherit (fay.meta) broken;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix
deleted file mode 100644
index 05b2505d7622..000000000000
--- a/pkgs/development/libraries/haskell/fay-text/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fay, fayBase, text }:
-
-cabal.mkDerivation (self: {
-  pname = "fay-text";
-  version = "0.3.2";
-  sha256 = "1yjsn188ixpfqdr75xyl57rbv53dybik4g28h6p3jv73q494552m";
-  buildDepends = [ fay fayBase text ];
-  meta = {
-    homepage = "https://github.com/faylang/fay-text";
-    description = "Fay Text type represented as JavaScript strings";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    inherit (fay.meta) broken;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
deleted file mode 100644
index 9a268a9b34fe..000000000000
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, dataDefault, filepath, ghcPaths, haskellNames
-, haskellPackages, haskellSrcExts, languageEcmascript, mtl
-, optparseApplicative, safe, sourcemap, split, spoon, syb, text
-, time, transformers, uniplate, unorderedContainers, utf8String
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fay";
-  version = "0.21.2.1";
-  sha256 = "06ijfkm1x5a15hac9f4cs4f16rva2hkf07xfh0mm9q3wkamqxlfm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson dataDefault filepath ghcPaths haskellNames haskellPackages
-    haskellSrcExts languageEcmascript mtl optparseApplicative safe
-    sourcemap split spoon syb text time transformers uniplate
-    unorderedContainers utf8String vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/faylang/fay/wiki";
-    description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
deleted file mode 100644
index b325af923d7d..000000000000
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
-, cereal, conduit, conduitExtra, cryptoApi, cryptohash
-, cryptohashCryptoapi, dataDefault, hspec, httpConduit, httpTypes
-, HUnit, liftedBase, monadControl, monadLogger, QuickCheck
-, resourcet, text, time, transformers, transformersBase
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fb";
-  version = "1.0.8";
-  sha256 = "1cv722kkp6lbxajv3ka4088x2491yy41cfypqqkq753mm59x6s9m";
-  buildDepends = [
-    aeson attoparsec base16Bytestring base64Bytestring cereal conduit
-    conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
-    httpConduit httpTypes liftedBase monadControl monadLogger resourcet
-    text time transformers transformersBase unorderedContainers
-  ];
-  testDepends = [
-    aeson conduit dataDefault hspec httpConduit HUnit liftedBase
-    monadControl QuickCheck resourcet text time transformers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/prowdsponsor/fb";
-    description = "Bindings to Facebook's API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
deleted file mode 100644
index 431a46504ee2..000000000000
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "fclabels";
-  version = "2.0.2";
-  sha256 = "108ad6l8ibz44n000hlywqpqslsz1czmsal7qvbd53chmmm4xgdp";
-  buildDepends = [ mtl transformers ];
-  meta = {
-    homepage = "https://github.com/sebastiaanvisser/fclabels";
-    description = "First class accessor labels implemented as lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fdo-notify/default.nix b/pkgs/development/libraries/haskell/fdo-notify/default.nix
deleted file mode 100644
index 170cf7b33951..000000000000
--- a/pkgs/development/libraries/haskell/fdo-notify/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dbus }:
-
-cabal.mkDerivation (self: {
-  pname = "fdo-notify";
-  version = "0.3.1";
-  sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
-  buildDepends = [ dbus ];
-  meta = {
-    homepage = "http://bitbucket.org/taejo/fdo-notify/";
-    description = "Desktop Notifications client";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
deleted file mode 100644
index b7bc816b6d03..000000000000
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time, utf8String, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "feed";
-  version = "0.3.9.2";
-  sha256 = "05sg2ly1pvni3sfv03rbf60vdjkrfa0f9mmc1dm1hrmp638j67gg";
-  buildDepends = [ time 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/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
deleted file mode 100644
index ea11a67d3c90..000000000000
--- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dotgen, fgl }:
-
-cabal.mkDerivation (self: {
-  pname = "fgl-visualize";
-  version = "0.1.0.1";
-  sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq";
-  buildDepends = [ dotgen fgl ];
-  meta = {
-    description = "Convert FGL graphs to dot (graphviz) files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fgl/default.nix b/pkgs/development/libraries/haskell/fgl/default.nix
deleted file mode 100644
index 65a67528d01a..000000000000
--- a/pkgs/development/libraries/haskell/fgl/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "fgl";
-  version = "5.5.0.1";
-  sha256 = "0qw70f5hfrxmrx49wx8vk2f5cam7jbpb20mp4i0ybcwdld5ncqda";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell";
-    description = "Martin Erwig's Functional Graph Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
deleted file mode 100644
index b9cd34552b2c..000000000000
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "file-embed";
-  version = "0.0.7";
-  sha256 = "0mj8f70f9k78wjzcx59w68szajafmm119rcrsspmxsygglh8ji2g";
-  buildDepends = [ filepath ];
-  testDepends = [ filepath HUnit ];
-  meta = {
-    homepage = "https://github.com/snoyberg/file-embed";
-    description = "Use Template Haskell to embed file contents directly";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix
deleted file mode 100644
index e027047a9ea5..000000000000
--- a/pkgs/development/libraries/haskell/file-location/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, liftedBase, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "file-location";
-  version = "0.4.5.3";
-  sha256 = "0d1iqhdac1gcag1d7ch9ia4fm97jpp31m46b794z90bmm6nr29h9";
-  buildDepends = [ liftedBase transformers ];
-  testDepends = [ liftedBase transformers ];
-  meta = {
-    homepage = "https://github.com/gregwebs/FileLocation.hs";
-    description = "common functions that show file location information";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/filemanip/default.nix b/pkgs/development/libraries/haskell/filemanip/default.nix
deleted file mode 100644
index c07ba6c2c907..000000000000
--- a/pkgs/development/libraries/haskell/filemanip/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, unixCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "filemanip";
-  version = "0.3.6.2";
-  sha256 = "03l114rhb4f6nyzs9w14i79d7kyyq9ia542alsqpbmikm9gxm4rz";
-  buildDepends = [ filepath mtl unixCompat ];
-  meta = {
-    homepage = "https://github.com/bos/filemanip";
-    description = "Expressive file and directory manipulation for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
deleted file mode 100644
index 1fa820a2c5a5..000000000000
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Diff, filepath, HUnit, mtl, parsec, split, time
-, utf8String, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "filestore";
-  version = "0.6.0.4";
-  sha256 = "1b3ymdqwcn84m8kkybshx10bfylby49i0yhbassvlgf0n096lp12";
-  buildDepends = [ Diff filepath parsec split time utf8String xml ];
-  testDepends = [ Diff filepath HUnit mtl time ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Interface for versioning file stores";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
deleted file mode 100644
index 35c3302641d5..000000000000
--- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, conduit, hspec, QuickCheck, systemFileio
-, systemFilepath, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "filesystem-conduit";
-  version = "1.0.0.2";
-  sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1";
-  buildDepends = [
-    conduit systemFileio systemFilepath text transformers
-  ];
-  testDepends = [
-    blazeBuilder conduit hspec QuickCheck text transformers
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Use system-filepath data types with conduits. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/final/default.nix b/pkgs/development/libraries/haskell/final/default.nix
deleted file mode 100644
index 3669d7e36490..000000000000
--- a/pkgs/development/libraries/haskell/final/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "final";
-  version = "0.1";
-  sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
-  buildDepends = [ stm transformers ];
-  meta = {
-    homepage = "http://github.com/errge/final";
-    description = "utility to add extra safety to monadic returns";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix
deleted file mode 100644
index 321bb5cab8f8..000000000000
--- a/pkgs/development/libraries/haskell/fingertree/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fingertree";
-  version = "0.1.0.0";
-  sha256 = "0c35sryzsijwavvw9x1pk5p99rhmp4g8pjh2ds419mlfgxc039ms";
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    description = "Generic finger-tree structure, with example instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fixed-vector/default.nix b/pkgs/development/libraries/haskell/fixed-vector/default.nix
deleted file mode 100644
index 81df126dd75c..000000000000
--- a/pkgs/development/libraries/haskell/fixed-vector/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filemanip, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "fixed-vector";
-  version = "0.7.0.0";
-  sha256 = "07wpzcpnnz0jjq5gs4ra8c2hyrxzmp0ryk06y3ryf8i4w65awgvf";
-  buildDepends = [ primitive ];
-  testDepends = [ doctest filemanip primitive ];
-  meta = {
-    description = "Generic vectors with statically known size";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fixed/default.nix b/pkgs/development/libraries/haskell/fixed/default.nix
deleted file mode 100644
index 5a1aef66051a..000000000000
--- a/pkgs/development/libraries/haskell/fixed/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "fixed";
-  version = "0.2.1";
-  sha256 = "1ayfya62ngcyyhi736fl5cd39iw568lkl16j4mliw3mi1cs2cic0";
-  meta = {
-    homepage = "http://github.com/ekmett/fixed";
-    description = "Signed 15.16 precision fixed point arithmetic";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
deleted file mode 100644
index 1a20983a5a50..000000000000
--- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, thExtras, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "flexible-defaults";
-  version = "0.0.1.1";
-  sha256 = "0cbp8hb7y29xz3hl780173cs6ca4df0r98fz7v3drqr46aq55ipl";
-  buildDepends = [ thExtras transformers ];
-  meta = {
-    homepage = "https://github.com/mokus0/flexible-defaults";
-    description = "Generate default function implementations for complex type classes";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fmlist/default.nix b/pkgs/development/libraries/haskell/fmlist/default.nix
deleted file mode 100644
index 1fbdedf76be3..000000000000
--- a/pkgs/development/libraries/haskell/fmlist/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "fmlist";
-  version = "0.8";
-  sha256 = "1knr9yh58fwjpkm37hvrqghlchf5qibwf9q52app6zh3ys999rrs";
-  meta = {
-    description = "FoldMap lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/focus/default.nix b/pkgs/development/libraries/haskell/focus/default.nix
deleted file mode 100644
index 9a890587f848..000000000000
--- a/pkgs/development/libraries/haskell/focus/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "focus";
-  version = "0.1.3";
-  sha256 = "11l6rlr22m0z41c9fynpisj0cnx70zzcxhsakz9b09ap8wj0raqy";
-  meta = {
-    homepage = "https://github.com/nikita-volkov/focus";
-    description = "A general abstraction for manipulating elements of container data structures";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
deleted file mode 100644
index bd0cd070d11d..000000000000
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, primitive, text, transformers, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "foldl";
-  version = "1.0.7";
-  sha256 = "0mqxibifrlfqnibzy9b2rncy4dyljdz35560ni3rwi8hkyix74a9";
-  buildDepends = [ primitive text transformers vector ];
-  meta = {
-    description = "Composable, streaming, and efficient left folds";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/folds/default.nix b/pkgs/development/libraries/haskell/folds/default.nix
deleted file mode 100644
index c274c774415f..000000000000
--- a/pkgs/development/libraries/haskell/folds/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, contravariant, deepseq, doctest, filepath, lens
-, mtl, pointed, profunctors, reflection, semigroupoids, semigroups
-, tagged, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "folds";
-  version = "0.6.2";
-  sha256 = "13zdmf7szdy9ka5dw0vgzbfmndm7w8fz7ryz5h2z5hsqg9am2qqa";
-  buildDepends = [
-    comonad contravariant lens pointed profunctors reflection
-    semigroupoids tagged transformers vector
-  ];
-  testDepends = [ deepseq doctest filepath mtl semigroups ];
-  configureFlags = "-f-test-hlint";
-  enableSplitObjs = false;
-  meta = {
-    homepage = "http://github.com/ekmett/folds";
-    description = "Beautiful Folding";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
deleted file mode 100644
index 91dfc9dca84d..000000000000
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, lens, vectorSpace, vectorSpacePoints }:
-
-cabal.mkDerivation (self: {
-  pname = "force-layout";
-  version = "0.3.0.8";
-  sha256 = "00b831l94r3lx0b330ql3w551w0fwziayhsjydzbfqq335syaaxg";
-  buildDepends = [
-    dataDefaultClass lens vectorSpace vectorSpacePoints
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Simple force-directed layout";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/formatting/default.nix b/pkgs/development/libraries/haskell/formatting/default.nix
deleted file mode 100644
index 04fd91850813..000000000000
--- a/pkgs/development/libraries/haskell/formatting/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, scientific, text, textFormat, time }:
-
-cabal.mkDerivation (self: {
-  pname = "formatting";
-  version = "5.4";
-  sha256 = "017fm3pqr2nqpcqmpldr74cvb641hxvybhvnwv8a8vv4ry1vdrk9";
-  buildDepends = [ scientific text textFormat time ];
-  meta = {
-    description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix
deleted file mode 100644
index a7edf7817ba9..000000000000
--- a/pkgs/development/libraries/haskell/free-game/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, boundingboxes, colors, controlBool, filepath, free
-, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens
-, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers
-, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "free-game";
-  version = "1.1.80";
-  sha256 = "1vpwrviwxib22mkaqmwndzfly8iicr85sh1y914gwp5n83lmkava";
-  buildDepends = [
-    boundingboxes colors controlBool filepath free freetype2 GLFWB
-    hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
-    OpenGLRaw random reflection transformers vector void
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/fumieval/free-game";
-    description = "Create games for free";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
deleted file mode 100644
index 5837cc448c2d..000000000000
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, comonad, distributive, mtl, preludeExtras
-, profunctors, semigroupoids, semigroups, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "free";
-  version = "4.10.0.1";
-  sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq";
-  buildDepends = [
-    bifunctors comonad distributive mtl preludeExtras profunctors
-    semigroupoids semigroups transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/free/";
-    description = "Monads for free";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/freetype2/default.nix b/pkgs/development/libraries/haskell/freetype2/default.nix
deleted file mode 100644
index d5fdc8f926eb..000000000000
--- a/pkgs/development/libraries/haskell/freetype2/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "freetype2";
-  version = "0.1.1";
-  sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "Haskell binding for FreeType 2 library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
deleted file mode 100644
index 4db72b35234e..000000000000
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, hinotify, systemFileio, systemFilepath, tasty
-, tastyHunit, temporaryRc, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fsnotify";
-  version = "0.1.0.3";
-  sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z";
-  buildDepends = [
-    async hinotify systemFileio systemFilepath text time
-  ];
-  testDepends = [
-    async systemFileio systemFilepath tasty tastyHunit temporaryRc
-  ];
-  doCheck = false;
-  meta = {
-    description = "Cross platform library for file change notification";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ftphs/default.nix b/pkgs/development/libraries/haskell/ftphs/default.nix
deleted file mode 100644
index ac96b094799c..000000000000
--- a/pkgs/development/libraries/haskell/ftphs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hslogger, MissingH, mtl, network, parsec, regexCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "ftphs";
-  version = "1.0.9.1";
-  sha256 = "1whvawaifhi5xgmiagdayjf7m6p6vs71mvc4a4csd4vzzjr0a2yf";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    hslogger MissingH mtl network parsec regexCompat
-  ];
-  meta = {
-    homepage = "http://software.complete.org/ftphs";
-    description = "FTP Client and Server Library";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
deleted file mode 100644
index 16f41718d0b5..000000000000
--- a/pkgs/development/libraries/haskell/funcmp/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "funcmp";
-  version = "1.7";
-  sha256 = "1rna7x7lw36fv5pyq0zn4b472mh11r0bszzji13wm3byhhmzs04k";
-  buildDepends = [ filepath ];
-  meta = {
-    homepage = "http://savannah.nongnu.org/projects/funcmp/";
-    description = "Functional MetaPost";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/functor-infix/default.nix b/pkgs/development/libraries/haskell/functor-infix/default.nix
deleted file mode 100644
index d3e6322a7cbe..000000000000
--- a/pkgs/development/libraries/haskell/functor-infix/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "functor-infix";
-  version = "0.0.1";
-  sha256 = "1f8m4nxlr2il9j0ilgw91fhp6mmz5xqlhylavncqwvbcq82362dc";
-  meta = {
-    homepage = "https://github.com/fmap/functor-infix";
-    description = "Compositions of functors";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fuzzcheck/default.nix b/pkgs/development/libraries/haskell/fuzzcheck/default.nix
deleted file mode 100644
index 171a501667fc..000000000000
--- a/pkgs/development/libraries/haskell/fuzzcheck/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecExpectations, HUnit, liftedBase, monadControl
-, QuickCheck, random, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fuzzcheck";
-  version = "0.1.1";
-  sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc";
-  buildDepends = [
-    liftedBase monadControl QuickCheck random transformers
-  ];
-  testDepends = [ hspec hspecExpectations HUnit QuickCheck ];
-  meta = {
-    homepage = "https://github.com/fpco/fuzzcheck";
-    description = "A simple checker for stress testing monadic code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix
deleted file mode 100644
index 2f55936fadf1..000000000000
--- a/pkgs/development/libraries/haskell/gamma/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, continuedFractions, converge, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "gamma";
-  version = "0.9.0.2";
-  sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq";
-  buildDepends = [ continuedFractions converge vector ];
-  meta = {
-    homepage = "https://github.com/mokus0/gamma";
-    description = "Gamma function and related functions";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix
deleted file mode 100644
index f2a534f47c85..000000000000
--- a/pkgs/development/libraries/haskell/gd/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "gd";
-  version = "3000.7.3";
-  sha256 = "1dkzv6zs00qi0jmblkw05ywizc8y3baz7pnz0lcqn1cs1mhcpbhl";
-  extraLibraries = [
-    expat fontconfig freetype gd libjpeg libpng zlib
-  ];
-  meta = {
-    description = "A Haskell binding to a subset of the GD graphics library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix
deleted file mode 100644
index 616b5eb337d3..000000000000
--- a/pkgs/development/libraries/haskell/gdiff/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "gdiff";
-  version = "1.1";
-  sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc";
-  meta = {
-    homepage = "https://github.com/eelco/gdiff";
-    description = "Generic diff and patch";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix
deleted file mode 100644
index fc3e6c32c724..000000000000
--- a/pkgs/development/libraries/haskell/generic-aeson/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, genericDeriving, mtl, tagged, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "generic-aeson";
-  version = "0.2.0.2";
-  sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh";
-  buildDepends = [
-    aeson attoparsec genericDeriving mtl tagged text
-    unorderedContainers vector
-  ];
-  meta = {
-    description = "Derivation of Aeson instances using GHC generics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
deleted file mode 100644
index 06c543911301..000000000000
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "generic-deriving";
-  version = "1.7.0";
-  sha256 = "145bixg4jr0hhw32jznrvl4qjjk7bgjbxlfznqra1s1rnmcyr5v6";
-  meta = {
-    description = "Generic programming library for generalised deriving";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix
deleted file mode 100644
index d7724a7b1ba6..000000000000
--- a/pkgs/development/libraries/haskell/generics-sop/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "generics-sop";
-  version = "0.1.0.4";
-  sha256 = "00rjlqsjb7hba5q0kbfwg4ajk75a4sd7m72wx18fa9rlz92qbx2j";
-  buildDepends = [ tagged ];
-  meta = {
-    description = "Generic Programming using True Sums of Products";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [
-      aycanirican ocharles
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix
deleted file mode 100644
index 87e1296330aa..000000000000
--- a/pkgs/development/libraries/haskell/geniplate/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "geniplate";
-  version = "0.6.0.5";
-  sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Use Template Haskell to generate Uniplate-like functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix
deleted file mode 100644
index ee92a45e87b6..000000000000
--- a/pkgs/development/libraries/haskell/ghc-core/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, colorizeHaskell, filepath, pcreLight }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-core";
-  version = "0.5.6";
-  sha256 = "11byidxq2mcqams9a7df0hwwlzir639mr1s556sw5rrbi7jz6d7c";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ colorizeHaskell filepath pcreLight ];
-  meta = {
-    homepage = "https://github.com/shachaf/ghc-core";
-    description = "Display GHC's core and assembly output in a pager";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
deleted file mode 100644
index 580a21bd8c6c..000000000000
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-events";
-  version = "0.4.3.0";
-  sha256 = "128p651hp8v1i0iaccmfh3ap6lajcrzdihjb853s71pgnpal6izr";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary mtl ];
-  testDepends = [ binary mtl ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Library and tool for parsing .eventlog files from GHC";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
deleted file mode 100644
index a7032f5a2509..000000000000
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-heap-view";
-  version = "0.5.3";
-  sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0";
-  buildDepends = [ binary transformers ];
-  testDepends = [ deepseq ];
-  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;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
deleted file mode 100644
index a2adaa2403df..000000000000
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, Cabal, convertible, dataDefault, deepseq, djinnGhc
-, doctest, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts
-, hlint, hspec, ioChoice, makeWrapper, monadControl, monadJournal
-, mtl, split, syb, temporary, text, time, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-mod";
-  version = "5.2.1.2";
-  sha256 = "11wnrdb6blw169w6kd49ax9h1r9qkka5329lmdhimvki8amv8riv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    async Cabal convertible dataDefault deepseq djinnGhc filepath
-    ghcPaths ghcSybUtils haskellSrcExts hlint ioChoice monadControl
-    monadJournal mtl split syb temporary text time transformers
-    transformersBase
-  ];
-  testDepends = [
-    Cabal convertible deepseq djinnGhc doctest filepath ghcPaths
-    ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl
-    monadJournal mtl split syb temporary text time transformers
-    transformersBase
-  ];
-  buildTools = [ emacs makeWrapper ];
-  doCheck = false;
-  configureFlags = "--datasubdir=${self.pname}-${self.version}";
-  postInstall = ''
-    cd $out/share/$pname-$version
-    make
-    rm Makefile
-    cd ..
-    ensureDir "$out/share/emacs"
-    mv $pname-$version emacs/site-lisp
-    wrapProgram $out/bin/ghc-mod --add-flags \
-      "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")"
-    wrapProgram $out/bin/ghc-modi --add-flags \
-      "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")"
-  '';
-  meta = {
-    homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-    description = "Happy Haskell Programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [
-      andres bluescreen303 ocharles
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
deleted file mode 100644
index 9ba3362000ad..000000000000
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, extensibleExceptions, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-mtl";
-  version = "1.2.1.0";
-  sha256 = "0h6r6gip9nsjlsq88wj105hhqliy7ac2dmmndsfzbjz07b03cklk";
-  buildDepends = [ exceptions extensibleExceptions mtl ];
-  meta = {
-    homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
-    description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-parser/default.nix b/pkgs/development/libraries/haskell/ghc-parser/default.nix
deleted file mode 100644
index 1cbfe4a19f3a..000000000000
--- a/pkgs/development/libraries/haskell/ghc-parser/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, happy }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-parser";
-  version = "0.1.3.0";
-  sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn";
-  buildTools = [ cpphs happy ];
-  patchPhase = ''
-    substituteInPlace build-parser.sh --replace "/bin/bash" "$SHELL"
-  '';
-  meta = {
-    homepage = "https://github.com/gibiansky/IHaskell";
-    description = "Haskell source parser from GHC";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ edwtjo ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix
deleted file mode 100644
index 0a2b7dc18f3c..000000000000
--- a/pkgs/development/libraries/haskell/ghc-paths/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-paths";
-  version = "0.1.0.9";
-  sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
-  patches = [ ./ghc-paths-nix.patch ];
-  meta = {
-    description = "Knowledge of GHC's installation directories";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch b/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch
deleted file mode 100644
index b3c75a26a035..000000000000
--- a/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur ghc-paths-0.1.0.9/GHC/Paths.hs ghc-paths-0.1.0.9-new/GHC/Paths.hs
---- ghc-paths-0.1.0.9/GHC/Paths.hs	2012-12-16 13:53:45.720148396 +0100
-+++ ghc-paths-0.1.0.9-new/GHC/Paths.hs	2012-12-16 17:22:12.765576568 +0100
-@@ -1,13 +1,35 @@
- {-# LANGUAGE CPP #-}
-+{-# LANGUAGE ScopedTypeVariables #-}
- 
- module GHC.Paths (
-         ghc, ghc_pkg, libdir, docdir
-   ) where
- 
-+import Control.Exception as E
-+import Data.Maybe
-+import System.Environment
-+import System.IO.Unsafe
-+
-+-- Yes, there's lookupEnv now, but we want to be compatible
-+-- with older GHCs.
-+checkEnv :: String -> IO (Maybe String)
-+checkEnv var = E.catch (fmap Just (getEnv var))
-+                       (\ (e :: IOException) -> return Nothing)
-+
-+nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath
-+nixLibdir = unsafePerformIO (checkEnv "NIX_GHC_LIBDIR")
-+nixDocdir = unsafePerformIO (checkEnv "NIX_GHC_DOCDIR")
-+nixGhc    = unsafePerformIO (checkEnv "NIX_GHC")
-+nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCPKG")
-+{-# NOINLINE nixLibdir #-}
-+{-# NOINLINE nixDocdir #-}
-+{-# NOINLINE nixGhc    #-}
-+{-# NOINLINE nixGhcPkg #-}
-+
- libdir, docdir, ghc, ghc_pkg :: FilePath
- 
--libdir  = GHC_PATHS_LIBDIR
--docdir  = GHC_PATHS_DOCDIR
-+libdir  = fromMaybe GHC_PATHS_LIBDIR  nixLibdir
-+docdir  = fromMaybe GHC_PATHS_DOCDIR  nixDocdir
- 
--ghc     = GHC_PATHS_GHC
--ghc_pkg = GHC_PATHS_GHC_PKG
-+ghc     = fromMaybe GHC_PATHS_GHC     nixGhc
-+ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg
diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
deleted file mode 100644
index 0c7d5c82f112..000000000000
--- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-syb-utils";
-  version = "0.2.2";
-  sha256 = "03r4x3a4hjivxladlw23jk8s2pgfh85lqf196ks1ngyg6ih1g6lk";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "http://github.com/nominolo/ghc-syb";
-    description = "Scrap Your Boilerplate utilities for the GHC API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix
deleted file mode 100644
index 58caf7f3e297..000000000000
--- a/pkgs/development/libraries/haskell/ghc-syb/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-syb";
-  version = "0.2.0.0";
-  sha256 = "0052bd2ee4d92fbb010bebc7bcfd533a0b78437f1fb0834288ce979c103d9d67";
-  meta = {
-    homepage = "http://github.com/nominolo/ghc-syb";
-    description = "Data and Typeable instances for the GHC API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
deleted file mode 100644
index 5a1da0848b2c..000000000000
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl
-, svgcairo, text, transformers, xdot
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-vis";
-  version = "0.7.2.7";
-  sha256 = "0kxkmbp71yx5mskzpcyjd8s2yq01q1q6dxmqzmwg6naalcpcbswv";
-  buildDepends = [
-    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";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix b/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix
deleted file mode 100644
index 06473e161fb9..000000000000
--- a/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ghcjs-codemirror";
-  version = "0.0.0.1";
-  sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
-  meta = {
-    homepage = "https://github.com/ghcjs/CodeMirror";
-    description = "Installs CodeMirror JavaScript files";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghcjs-prim/default.nix b/pkgs/development/libraries/haskell/ghcjs-prim/default.nix
deleted file mode 100644
index 04d73661e600..000000000000
--- a/pkgs/development/libraries/haskell/ghcjs-prim/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ cabal, primitive, fetchgit }:
-
-cabal.mkDerivation (self: {
-  pname = "ghcjs-prim";
-  version = "0.1.0.0";
-  src = fetchgit {
-    url = git://github.com/ghcjs/ghcjs-prim.git;
-    rev = "8e003e1a1df10233bc3f03d7bbd7d37de13d2a84";
-    sha256 = "11k2r87s58wmpxykn61lihn4vm3x67cm1dygvdl26papifinj6pz";
-  };
-  buildDepends = [ primitive ];
-})
diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
deleted file mode 100644
index c98f772f87a9..000000000000
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk2hsBuildtools, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "gio";
-  version = "0.13.0.3";
-  sha256 = "15025jj6i1gpvjs46545vzmvs6ka41x15lrllqr9hd0qsyhibsf5";
-  buildDepends = [ glib mtl ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ glib ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GIO";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/git-date/default.nix b/pkgs/development/libraries/haskell/git-date/default.nix
deleted file mode 100644
index 1ee0095cd177..000000000000
--- a/pkgs/development/libraries/haskell/git-date/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2, time
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "git-date";
-  version = "0.2.1";
-  sha256 = "17xiim439igg1gfcfwpzxjkgpmfqqh9v79jm4bg0f9h5dijij79l";
-  buildDepends = [ time utf8String ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 time utf8String
-  ];
-  meta = {
-    homepage = "https://github.com/singpolyma/git-date-haskell";
-    description = "Bindings to the date parsing from Git";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
deleted file mode 100644
index 3e2b84a93db3..000000000000
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base16Bytestring, byteable
-, caseInsensitive, conduit, cryptohash, dataDefault, failure
-, hashable, HTTP, httpConduit, httpTypes, network, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "github";
-  version = "0.13.1";
-  sha256 = "0rz89lpswxxsdyfjb63v9md96bxr3abxzwqryh1a2jxhm7f1ia5l";
-  buildDepends = [
-    aeson attoparsec base16Bytestring byteable caseInsensitive conduit
-    cryptohash dataDefault failure hashable HTTP httpConduit httpTypes
-    network text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/github";
-    description = "Access to the Github API, v3";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
deleted file mode 100644
index d256c2f014f0..000000000000
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, blazeHtml, ConfigFile, feed
-, filepath, filestore, ghcPaths, happstackServer, highlightingKate
-, hoauth2, hslogger, HStringTemplate, HTTP, httpClientTls
-, httpConduit, json, mtl, network, networkUri, pandoc, pandocTypes
-, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text
-, time, uri, url, utf8String, uuid, xhtml, xml, xssSanitize, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gitit";
-  version = "0.10.6.1";
-  sha256 = "1l6zra0yiwrmiycblp25b5yd1yrz94537l8zkspkf7z6wc8vdkn0";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson base64Bytestring blazeHtml ConfigFile feed filepath filestore
-    ghcPaths happstackServer highlightingKate hoauth2 hslogger
-    HStringTemplate HTTP httpClientTls httpConduit json mtl network
-    networkUri pandoc pandocTypes parsec random recaptcha safe SHA
-    split syb tagsoup text time uri url utf8String uuid xhtml xml
-    xssSanitize zlib
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://gitit.net";
-    description = "Wiki using happstack, git or darcs, and pandoc";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
deleted file mode 100644
index bb7206803ebd..000000000000
--- a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitCombinators, exceptions, fastLogger
-, filepath, gitlib, gitlibTest, hlibgit2, hspec, hspecExpectations
-, HUnit, liftedAsync, liftedBase, missingForeign, mmorph
-, monadControl, monadLogger, monadLoops, mtl, resourcet, stm
-, stmConduit, tagged, text, textIcu, time, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gitlib-libgit2";
-  version = "3.1.0.1";
-  sha256 = "0rqx1cqj7rciy7kr5dfzh4crvjk0s6amm3d5nzyawkkkdda54dcs";
-  buildDepends = [
-    conduit conduitCombinators exceptions fastLogger filepath gitlib
-    hlibgit2 liftedAsync liftedBase missingForeign mmorph monadControl
-    monadLogger monadLoops mtl resourcet stm stmConduit tagged text
-    textIcu time transformers transformersBase
-  ];
-  testDepends = [
-    exceptions gitlib gitlibTest hspec hspecExpectations HUnit
-    monadLogger transformers
-  ];
-  meta = {
-    description = "Libgit2 backend for gitlib";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix
deleted file mode 100644
index 130a0efdcd11..000000000000
--- a/pkgs/development/libraries/haskell/gitlib-test/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitCombinators, exceptions, gitlib, hspec
-, hspecExpectations, HUnit, monadControl, tagged, text, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gitlib-test";
-  version = "3.1.0.1";
-  sha256 = "1c65v86brvw3sy48vg79j0ijc5n4cpafksqsmbjs50h3v80zkdm3";
-  buildDepends = [
-    conduit conduitCombinators exceptions gitlib hspec
-    hspecExpectations HUnit monadControl tagged text time transformers
-  ];
-  meta = {
-    description = "Test library for confirming gitlib backend compliance";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gitlib/default.nix b/pkgs/development/libraries/haskell/gitlib/default.nix
deleted file mode 100644
index cfa9dd2b8e3e..000000000000
--- a/pkgs/development/libraries/haskell/gitlib/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base16Bytestring, conduit, conduitCombinators, exceptions
-, filepath, hashable, liftedAsync, liftedBase, monadControl
-, monadLogger, mtl, resourcet, semigroups, systemFilepath, tagged
-, text, time, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gitlib";
-  version = "3.1.0";
-  sha256 = "0zyym7m8bdhc4wi2jrhcmipmlq106qkd61c4y9iisgk73v2pg9f4";
-  buildDepends = [
-    base16Bytestring conduit conduitCombinators exceptions filepath
-    hashable liftedAsync liftedBase monadControl monadLogger mtl
-    resourcet semigroups systemFilepath tagged text time transformers
-    unorderedContainers
-  ];
-  meta = {
-    description = "API library for working with Git repositories";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gl/default.nix b/pkgs/development/libraries/haskell/gl/default.nix
deleted file mode 100644
index 05c7a68d0c3f..000000000000
--- a/pkgs/development/libraries/haskell/gl/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, fixed, half, hxt, mesa, split, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "gl";
-  version = "0.6.1";
-  sha256 = "0wqsbwnp69g6vz5irf65zv1nx4vnlwcm771jxzk70r2wzi2vsg3y";
-  buildDepends = [ filepath fixed half hxt split transformers ];
-  extraLibraries = [ mesa ];
-  noHaddock = true;
-  meta = {
-    description = "Complete OpenGL raw bindings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
deleted file mode 100644
index 27af64b973dc..000000000000
--- a/pkgs/development/libraries/haskell/glade/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade
-, pkgconfig
-}:
-
-cabal.mkDerivation (self: {
-  pname = "glade";
-  version = "0.12.5.0";
-  sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr";
-  buildDepends = [ glib gtk ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ gtkC libglade ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the glade library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
deleted file mode 100644
index 872364fe985b..000000000000
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, text, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "glib";
-  version = "0.13.0.6";
-  sha256 = "1hn3l0vrz76gmk7bjhs4nw68izf29k0pxm92l0zih7wq5ny4lhrv";
-  buildDepends = [ text utf8String ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ glib ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GLIB library for Gtk2Hs";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
deleted file mode 100644
index 172d5f315263..000000000000
--- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, accelerateCuda, gloss }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-accelerate";
-  version = "1.8.15.0";
-  sha256 = "1nj2rnp2bg3xmi4xbaws9jc7qx3b4qqg9fyvfv13xdav28d7iqb0";
-  buildDepends = [ accelerate accelerateCuda gloss ];
-  meta = {
-    description = "Extras to interface Gloss and Accelerate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-banana/default.nix b/pkgs/development/libraries/haskell/gloss-banana/default.nix
deleted file mode 100644
index 58adb03fc780..000000000000
--- a/pkgs/development/libraries/haskell/gloss-banana/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gloss, reactiveBanana }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-banana";
-  version = "0.1.0.4";
-  sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3";
-  buildDepends = [ gloss reactiveBanana ];
-  meta = {
-    homepage = "https://github.com/Twey/gloss-banana";
-    description = "An Interface for gloss in terms of a reactive-banana Behavior";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ twey ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
deleted file mode 100644
index 1a21c2632eea..000000000000
--- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, accelerateCuda, gloss, glossAccelerate }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-raster-accelerate";
-  version = "1.8.15.0";
-  sha256 = "1fs3ybrzkykslac1zzh6g73lfdfysn6y2fr1pra9hd0a7x5a8j10";
-  buildDepends = [ accelerate accelerateCuda gloss glossAccelerate ];
-  meta = {
-    description = "Parallel rendering of raster images using Accelerate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix
deleted file mode 100644
index 16316b165907..000000000000
--- a/pkgs/development/libraries/haskell/gloss-raster/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gloss, glossRendering, llvm, repa }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-raster";
-  version = "1.9.2.1";
-  sha256 = "0vz03hw9rck9vcbh1lvy7dncij9ykgh7mslb3hwsz8z570dbnacw";
-  buildDepends = [ gloss glossRendering repa ];
-  extraLibraries = [ llvm ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://gloss.ouroborus.net";
-    description = "Parallel rendering of raster images";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-rendering/default.nix b/pkgs/development/libraries/haskell/gloss-rendering/default.nix
deleted file mode 100644
index 190993e44fc2..000000000000
--- a/pkgs/development/libraries/haskell/gloss-rendering/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bmp, GLUT, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-rendering";
-  version = "1.9.2.1";
-  sha256 = "05wdiadwjykz8x0fimznp3q1drm4v3vnv6cv6wjkj1xsclmhb99k";
-  buildDepends = [ bmp GLUT OpenGL ];
-  meta = {
-    description = "Gloss picture data types and rendering functions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
deleted file mode 100644
index da6eb98776f6..000000000000
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bmp, glossRendering, GLUT, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss";
-  version = "1.9.2.1";
-  sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l";
-  buildDepends = [ bmp glossRendering GLUT OpenGL ];
-  meta = {
-    homepage = "http://gloss.ouroborus.net";
-    description = "Painless 2D vector graphics, animations and simulations";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix
deleted file mode 100644
index 50289f334088..000000000000
--- a/pkgs/development/libraries/haskell/glpk-hs/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, glpk, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "glpk-hs";
-  version = "0.3.4";
-  sha256 = "0wyasd0dqi5nnh52lx980vnyhm0rwib0sd7qnpj4s9hq8rn994cm";
-  buildDepends = [ deepseq mtl ];
-  extraLibraries = [ glpk ];
-  meta = {
-    description = "Comprehensive GLPK linear programming bindings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix
deleted file mode 100644
index 8bedf0d4186b..000000000000
--- a/pkgs/development/libraries/haskell/gnuidn/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, libidn, text }:
-
-cabal.mkDerivation (self: {
-  pname = "gnuidn";
-  version = "0.2.1";
-  sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37";
-  buildDepends = [ text ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ libidn ];
-  pkgconfigDepends = [ libidn ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-gnuidn/";
-    description = "Bindings for GNU IDN";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix
deleted file mode 100644
index dc1526610498..000000000000
--- a/pkgs/development/libraries/haskell/gnuplot/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, dataAccessorTransformers, deepseq, filepath
-, temporary, time, transformers, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gnuplot";
-  version = "0.5.2.2";
-  sha256 = "0l5hi346bhs9w11i3z6yy4mcr3k50xcp3j31g6wza9grxlfqc5av";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataAccessor dataAccessorTransformers deepseq filepath temporary
-    time transformers utilityHt
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
-    description = "2D and 3D plots using gnuplot";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix
deleted file mode 100644
index 5d8ee9b61df3..000000000000
--- a/pkgs/development/libraries/haskell/gnutls/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gnutls, monadsTf, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "gnutls";
-  version = "0.1.5";
-  sha256 = "1sf6b4g0jwk1jrzjq4vwwak57lzm1zc43ggysp973q5icm6gs8wp";
-  buildDepends = [ monadsTf transformers ];
-  extraLibraries = [ gnutls ];
-  pkgconfigDepends = [ gnutls ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-gnutls/";
-    description = "Bindings for GNU libgnutls";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/graph-wrapper/default.nix b/pkgs/development/libraries/haskell/graph-wrapper/default.nix
deleted file mode 100644
index f38bc24d2464..000000000000
--- a/pkgs/development/libraries/haskell/graph-wrapper/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "graph-wrapper";
-  version = "0.2.4.3";
-  sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg";
-  meta = {
-    homepage = "http://www.github.com/batterseapower/graph-wrapper";
-    description = "A wrapper around the standard Data.Graph with a less awkward interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/graphscc/default.nix b/pkgs/development/libraries/haskell/graphscc/default.nix
deleted file mode 100644
index 2124bd0b2549..000000000000
--- a/pkgs/development/libraries/haskell/graphscc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "GraphSCC";
-  version = "1.0.4";
-  sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq";
-  meta = {
-    description = "Tarjan's algorithm for computing the strongly connected components of a graph";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
deleted file mode 100644
index c50e0403bd68..000000000000
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, colour, dlist, fgl, filepath, polyparse, QuickCheck
-, systemGraphviz, temporary, text, transformers, wlPprintText
-}:
-
-cabal.mkDerivation (self: {
-  pname = "graphviz";
-  version = "2999.17.0.1";
-  sha256 = "0s6l1mlqvllrlx7vc06lgcs68ajhfk98awm63ab1dkqmcnj23ixv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    colour dlist fgl filepath polyparse temporary text transformers
-    wlPprintText
-  ];
-  testDepends = [ fgl filepath QuickCheck systemGraphviz text ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://projects.haskell.org/graphviz/";
-    description = "Bindings to Graphviz for graph visualisation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/greencard/default.nix b/pkgs/development/libraries/haskell/greencard/default.nix
deleted file mode 100644
index 530c3be15055..000000000000
--- a/pkgs/development/libraries/haskell/greencard/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "greencard";
-  version = "3.0.4.2";
-  sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "https://github.com/sof/greencard";
-    description = "GreenCard, a foreign function pre-processor for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/grid/default.nix b/pkgs/development/libraries/haskell/grid/default.nix
deleted file mode 100644
index 8826d3ca2b5a..000000000000
--- a/pkgs/development/libraries/haskell/grid/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, QuickCheck, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "grid";
-  version = "7.6.7";
-  sha256 = "1sdm47y9hbqn40bfi4fssnbrhksca7gdkgpqvz1gd2lqs729i1nf";
-  buildDepends = [ cereal ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/mhwombat/grid";
-    description = "Tools for working with regular grids (graphs, lattices)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/groom/default.nix b/pkgs/development/libraries/haskell/groom/default.nix
deleted file mode 100644
index 41853b763f44..000000000000
--- a/pkgs/development/libraries/haskell/groom/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts }:
-
-cabal.mkDerivation (self: {
-  pname = "groom";
-  version = "0.1.2";
-  sha256 = "045hzpnf17rp1ib6q3gcznl9b7ivz5zmv0gh7qfg726kr8i030hf";
-  buildDepends = [ haskellSrcExts ];
-  meta = {
-    description = "Pretty printing for well-behaved Show instances";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix
deleted file mode 100644
index 1f0c73c00db4..000000000000
--- a/pkgs/development/libraries/haskell/groupoids/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroupoids }:
-
-cabal.mkDerivation (self: {
-  pname = "groupoids";
-  version = "4.0";
-  sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6";
-  buildDepends = [ semigroupoids ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/ekmett/groupoids/";
-    description = "This package has been absorbed into semigroupoids 4.0";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/groups/default.nix b/pkgs/development/libraries/haskell/groups/default.nix
deleted file mode 100644
index 4f9fb3f67aef..000000000000
--- a/pkgs/development/libraries/haskell/groups/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "groups";
-  version = "0.4.0.0";
-  sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k";
-  meta = {
-    description = "Haskell 98 groups";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gsasl/default.nix b/pkgs/development/libraries/haskell/gsasl/default.nix
deleted file mode 100644
index da0ab99d9767..000000000000
--- a/pkgs/development/libraries/haskell/gsasl/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gsasl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "gsasl";
-  version = "0.3.5";
-  sha256 = "1797rs6syrgs82akbj7nkmj0nni4w83fhwrl1zy2l3jqkcacvbm3";
-  buildDepends = [ transformers ];
-  pkgconfigDepends = [ gsasl ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-gsasl/";
-    description = "Bindings for GNU libgsasl";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
deleted file mode 100644
index 53613255c324..000000000000
--- a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, x11 }:
-
-cabal.mkDerivation (self: {
-  pname = "gtk-traymanager";
-  version = "0.1.5";
-  sha256 = "0hzl9pa5vx04vslb2visx35wwjagzzi1j5gyk5acy8pym8ly50hm";
-  buildDepends = [ glib gtk ];
-  pkgconfigDepends = [ gtk x11 ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/travitch/gtk-traymanager";
-    description = "A wrapper around the eggtraymanager library for Linux system trays";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
deleted file mode 100644
index effbd57f7996..000000000000
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
-, pkgconfig, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtk";
-  version = "0.13.3";
-  sha256 = "016v6r53py659ncx0nvlcvvs3j3kj6rrbrm7lk8sggdhm7jvz6w7";
-  buildDepends = [ cairo gio glib mtl pango text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ glib gtk ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Gtk+ graphical user interface library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
deleted file mode 100644
index 9fabf287166c..000000000000
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, filepath, happy, hashtables, random }:
-
-cabal.mkDerivation (self: {
-  pname = "gtk2hs-buildtools";
-  version = "0.13.0.3";
-  sha256 = "1ijcmcjp8mralpzl1gvh24bzq8njlzkvck1r07b010rrklv04arp";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath hashtables random ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Tools to build the Gtk2Hs suite of User Interface libraries";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix
deleted file mode 100644
index d39adf4e5e43..000000000000
--- a/pkgs/development/libraries/haskell/gtk3/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gio, glib, gtk2hsBuildtools, gtk3, mtl, pango, text
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtk3";
-  version = "0.13.3";
-  sha256 = "0246d4dxgmfvq7g8avswjry2rh5lfj1kzcf0vqwchgvlvcfhgzlh";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cairo gio glib mtl pango text time transformers ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ glib gtk3 ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Gtk+ graphical user interface library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtkglext/default.nix b/pkgs/development/libraries/haskell/gtkglext/default.nix
deleted file mode 100644
index 481e2ade84af..000000000000
--- a/pkgs/development/libraries/haskell/gtkglext/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, gtk2hsBuildtools, gtkglext, pango
-, pangox_compat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtkglext";
-  version = "0.12.5.0";
-  sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
-  buildDepends = [ glib gtk pango ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ gtkglext pangox_compat ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GTK+ OpenGL Extension";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
deleted file mode 100644
index d3f0f3136f83..000000000000
--- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl
-, pkgconfig, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtksourceview2";
-  version = "0.13.1.1";
-  sha256 = "09439drmwfy5bqni1clcn0nng30irn9x43fjak9jljggg1yij9xw";
-  buildDepends = [ glib gtk mtl text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ gtksourceview ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GtkSourceView library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix
deleted file mode 100644
index 5cbad954c31a..000000000000
--- a/pkgs/development/libraries/haskell/hS3/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, networkUri
-, random, regexCompat, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hS3";
-  version = "0.5.9";
-  sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Crypto dataenc HTTP hxt MissingH network networkUri random
-    regexCompat utf8String
-  ];
-  meta = {
-    homepage = "http://gregheartsfield.com/hS3/";
-    description = "Interface to Amazon's Simple Storage Service (S3)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
deleted file mode 100644
index e4243def8b48..000000000000
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, tar, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "hackage-db";
-  version = "1.11";
-  sha256 = "14jjy3i5pjdcw2cx3n5ipg72zahvy9vh87vlcgnz44slw8av6dcq";
-  buildDepends = [ Cabal filepath tar utf8String ];
-  meta = {
-    homepage = "http://github.com/peti/hackage-db";
-    description = "access Hackage's package database via Data.Map";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haddock-api/default.nix b/pkgs/development/libraries/haskell/haddock-api/default.nix
deleted file mode 100644
index d2dc35b1ffd5..000000000000
--- a/pkgs/development/libraries/haskell/haddock-api/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, deepseq, filepath, ghcPaths, haddockLibrary, xhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haddock-api";
-  version = "2.15.0.1";
-  sha256 = "1s25wykd5ka9chi67s07zy1jyd4pxs72d6lcpj7551izcs2l86sm";
-  buildDepends = [
-    Cabal deepseq filepath ghcPaths haddockLibrary xhtml
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haddock/";
-    description = "A documentation-generation tool for Haskell libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haddock-library/default.nix b/pkgs/development/libraries/haskell/haddock-library/default.nix
deleted file mode 100644
index a7041b3ba28e..000000000000
--- a/pkgs/development/libraries/haskell/haddock-library/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseCompat, deepseq, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "haddock-library";
-  version = "1.1.1";
-  sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m";
-  buildDepends = [ deepseq ];
-  testDepends = [ baseCompat deepseq hspec QuickCheck ];
-  meta = {
-    homepage = "http://www.haskell.org/haddock/";
-    description = "Library exposing some functionality of Haddock";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
deleted file mode 100644
index 7eeacd238ba7..000000000000
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, cryptohash
-, dataDefault, deepseq, filepath, fsnotify, httpConduit, httpTypes
-, HUnit, lrucache, mtl, network, networkUri, pandoc, pandocCiteproc
-, parsec, QuickCheck, random, regexBase, regexTdfa, snapCore
-, snapServer, systemFilepath, tagsoup, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
-, utillinux
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hakyll";
-  version = "4.6.1.1";
-  sha256 = "1y1bc25ivj6sgq9909qgwsm54dn6sdisd1znkk9r5x9c7ajv6gaa";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
-    filepath fsnotify httpConduit httpTypes lrucache mtl network
-    networkUri pandoc pandocCiteproc parsec random regexBase regexTdfa
-    snapCore snapServer systemFilepath tagsoup text time
-  ];
-  testDepends = [
-    binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
-    filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network
-    networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase
-    regexTdfa snapCore snapServer systemFilepath tagsoup testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text time utillinux
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://jaspervdj.be/hakyll";
-    description = "A static website compiler library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/half/default.nix b/pkgs/development/libraries/haskell/half/default.nix
deleted file mode 100644
index e113f6730d99..000000000000
--- a/pkgs/development/libraries/haskell/half/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "half";
-  version = "0.2.0.1";
-  sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw";
-  meta = {
-    homepage = "http://github.com/ekmett/half";
-    description = "Half-precision floating-point";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
deleted file mode 100644
index c897eb036bd3..000000000000
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "hamlet";
-  version = "1.2.0";
-  sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Haml-like template files that are compile-time checked (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/handa-gdata/default.nix b/pkgs/development/libraries/haskell/handa-gdata/default.nix
deleted file mode 100644
index b96c68297cbb..000000000000
--- a/pkgs/development/libraries/haskell/handa-gdata/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, binary, caseInsensitive, cmdargs
-, dataDefault, filepath, GenericPretty, HTTP, httpConduit, json
-, network, pureMD5, random, regexPosix, resourcet, split, time
-, unixCompat, utf8String, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "handa-gdata";
-  version = "0.7.0.1";
-  sha256 = "1azjfhwcirf6nv7pym8lcrghvjbrb1hh1y2w43g7qxxdmk54n8g7";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    base64Bytestring binary caseInsensitive cmdargs dataDefault
-    filepath GenericPretty HTTP httpConduit json network pureMD5 random
-    regexPosix resourcet split time unixCompat utf8String xml
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://code.google.com/p/hgdata";
-    description = "Library and command-line utility for accessing Google services and APIs";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix b/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix
deleted file mode 100644
index e16092fe523a..000000000000
--- a/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cgi, fastcgi, happstackServer, mtl, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "happstack-fastcgi";
-  version = "0.1.5";
-  sha256 = "0rvb041nx2f8azvfy1yysisjqrmsfbxnccn992v5q7zhlglcvj8h";
-  buildDepends = [ cgi fastcgi happstackServer mtl utf8String ];
-  meta = {
-    description = "Happstack extension for use with FastCGI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
deleted file mode 100644
index 3567b418ba32..000000000000
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happstackServer, shakespeare, text }:
-
-cabal.mkDerivation (self: {
-  pname = "happstack-hamlet";
-  version = "7.0.4";
-  sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
-  buildDepends = [ happstackServer shakespeare text ];
-  meta = {
-    homepage = "http://www.happstack.com/";
-    description = "Support for Hamlet HTML templates in Happstack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
deleted file mode 100644
index d0d4de909efb..000000000000
--- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happstackServer, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "happstack-lite";
-  version = "7.3.6";
-  sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8";
-  buildDepends = [ happstackServer mtl text ];
-  meta = {
-    homepage = "http://www.happstack.com/";
-    description = "Happstack minus the useless stuff";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
deleted file mode 100644
index 15a1e90414e4..000000000000
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
-, filepath, hslogger, html, HUnit, monadControl, mtl, network
-, networkUri, parsec, sendfile, syb, systemFilepath, text, threads
-, time, timeCompat, transformers, transformersBase, utf8String
-, xhtml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "happstack-server";
-  version = "7.4.0";
-  sha256 = "009y87g4wika9g0p58v8sdayh41rixkivhvi7j1dnxbm4qy89qpk";
-  buildDepends = [
-    base64Bytestring blazeHtml extensibleExceptions filepath hslogger
-    html monadControl mtl network networkUri parsec sendfile syb
-    systemFilepath text threads time timeCompat transformers
-    transformersBase utf8String xhtml zlib
-  ];
-  testDepends = [ HUnit parsec zlib ];
-  meta = {
-    homepage = "http://happstack.com";
-    description = "Web related tools and services";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashable-extras/default.nix b/pkgs/development/libraries/haskell/hashable-extras/default.nix
deleted file mode 100644
index 70868a2e83a7..000000000000
--- a/pkgs/development/libraries/haskell/hashable-extras/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, doctest, filepath, genericDeriving, hashable
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hashable-extras";
-  version = "0.2.0.1";
-  sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s";
-  buildDepends = [
-    bifunctors genericDeriving hashable transformers
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/analytics/hashable-extras/";
-    description = "Higher-rank Hashable";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix
deleted file mode 100644
index ba2690e6ce84..000000000000
--- a/pkgs/development/libraries/haskell/hashable/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hashable";
-  version = "1.2.3.0";
-  sha256 = "02akgpwjzj2w5jnn31xp6yvgs4xmyircm8wcbq9v0icza6yb11qi";
-  buildDepends = [ text ];
-  testDepends = [
-    HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/tibbe/hashable";
-    description = "A class for types that can be converted to a hash value";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
deleted file mode 100644
index b7e6af904fee..000000000000
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataenc, extensibleExceptions, filepath, mmap, mtl
-, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hashed-storage";
-  version = "0.5.11";
-  sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary dataenc extensibleExceptions filepath mmap mtl zlib
-  ];
-  doCheck = false;
-  meta = {
-    description = "Hashed file storage support code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
deleted file mode 100644
index ddccebeb48d8..000000000000
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fetchgit, hashable, primitive, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "hashtables";
-  version = "1.2.0.1";
-  src = fetchgit {
-    url = "git://github.com/gregorycollins/hashtables.git";
-    sha256 = "1622ba3eb37e72cbedf01ae17162e045ca6506dea8a78750cc85805fe8e86129";
-    rev = "a045fa90f4bc3923f38d1b468ce4d3982cef85e0";
-  };
-  buildDepends = [ hashable primitive vector ];
-  meta = {
-    homepage = "http://github.com/gregorycollins/hashtables";
-    description = "Mutable hash tables in the ST monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hask/default.nix b/pkgs/development/libraries/haskell/hask/default.nix
deleted file mode 100644
index 3162a4fb7e4b..000000000000
--- a/pkgs/development/libraries/haskell/hask/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, constraints, reflection, tagged, transformers, void }:
-
-cabal.mkDerivation (self: {
-  pname = "hask";
-  version = "0";
-  sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39";
-  buildDepends = [ constraints reflection tagged transformers void ];
-  meta = {
-    homepage = "http://github.com/ekmett/hask";
-    description = "Categories";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix
deleted file mode 100644
index 1b1519c43260..000000000000
--- a/pkgs/development/libraries/haskell/haskeline-class/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskeline, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "haskeline-class";
-  version = "0.6.2";
-  sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
-  buildDepends = [ haskeline mtl ];
-  meta = {
-    homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";
-    description = "Class interface for working with Haskeline";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
deleted file mode 100644
index f8f4d5ed998e..000000000000
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, terminfo, transformers, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "haskeline";
-  version = "0.7.1.3";
-  sha256 = "1bwyfn7y9mi18g7zxz8wxjkld51azlfbxypxbiqdinpm2fdl63mi";
-  buildDepends = [ filepath terminfo transformers utf8String ];
-  configureFlags = "-fterminfo";
-  jailbreak = true;
-  meta = {
-    homepage = "http://trac.haskell.org/haskeline";
-    description = "A command-line interface for user input, written in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix
deleted file mode 100644
index 7ca03476110b..000000000000
--- a/pkgs/development/libraries/haskell/haskell-generate/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, haskellSrcExts, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-generate";
-  version = "0.2.2";
-  sha256 = "1wdfs28p195szg6jxq0qbyj4jdbqnsp9frgjnp25mzf14y9i1yid";
-  buildDepends = [ haskellSrcExts transformers ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/bennofs/haskell-generate/";
-    description = "haskell-generate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
deleted file mode 100644
index 2e81d7570954..000000000000
--- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-lexer";
-  version = "1.0";
-  sha256 = "86d0c4071295c8613eb965768cb61a0c8422fc0c429a49c7a93e93a72b185b86";
-  meta = {
-    description = "A fully compliant Haskell 98 lexer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-mpi/default.nix b/pkgs/development/libraries/haskell/haskell-mpi/default.nix
deleted file mode 100644
index b7d9bf991481..000000000000
--- a/pkgs/development/libraries/haskell/haskell-mpi/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, cereal, extensibleExceptions, mpi }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-mpi";
-  version = "1.2.1";
-  sha256 = "1d3xlwz3sx1m7iyf67cfr1vsp3w4iz9mmqvmvdiblj4569hxblr5";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cereal extensibleExceptions ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ mpi ];
-  meta = {
-    homepage = "http://github.com/bjpop/haskell-mpi";
-    description = "Distributed parallel programming in Haskell using MPI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
deleted file mode 100644
index 5185c1037a87..000000000000
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, Cabal, dataLensLight, filemanip, filepath
-, haskellPackages, haskellSrcExts, hseCpp, mtl, prettyShow, tagged
-, tasty, tastyGolden, transformers, traverseWithClass, typeEq
-, uniplate, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-names";
-  version = "0.5.0";
-  sha256 = "07fwdnhiqz6w323iw4xspar8m6sc6mv85i5f2vzbb5y8mrv352zr";
-  buildDepends = [
-    aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts
-    hseCpp mtl tagged transformers traverseWithClass typeEq uniplate
-  ];
-  testDepends = [
-    aeson Cabal filemanip filepath haskellPackages haskellSrcExts
-    hseCpp mtl prettyShow tagged tasty tastyGolden traverseWithClass
-    uniplate utf8String
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://documentup.com/haskell-suite/haskell-names";
-    description = "Name resolution library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix
deleted file mode 100644
index a23c6691a664..000000000000
--- a/pkgs/development/libraries/haskell/haskell-packages/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, Cabal, deepseq, filepath, haskellSrcExts, hseCpp
-, mtl, optparseApplicative, tagged, transformers
-, transformersCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-packages";
-  version = "0.2.4.3";
-  sha256 = "0s1z5zzl53nmjnrlf1czri634h8fksbgkqvvz8hpwa60wsaf4dxn";
-  buildDepends = [
-    aeson Cabal deepseq filepath haskellSrcExts hseCpp mtl
-    optparseApplicative tagged transformers transformersCompat
-  ];
-  meta = {
-    homepage = "http://documentup.com/haskell-suite/haskell-packages";
-    description = "Haskell suite library for package management and integration with Cabal";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix
deleted file mode 100644
index 93e07dede858..000000000000
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, filemanip, filepath, happy, mtl, smallcheck, syb
-, tasty, tastyGolden, tastySmallcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src-exts";
-  version = "1.15.0.1";
-  sha256 = "0xp5i06c478vn5m504ax5dfa7p5zc0kflbdkm2ijdzc779lpbx45";
-  buildDepends = [ cpphs ];
-  testDepends = [
-    filemanip filepath mtl smallcheck syb tasty tastyGolden
-    tastySmallcheck
-  ];
-  buildTools = [ happy ];
-  meta = {
-    homepage = "https://github.com/haskell-suite/haskell-src-exts";
-    description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix
deleted file mode 100644
index d837c2f689bd..000000000000
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, filepath, happy, mtl, smallcheck, syb, tasty
-, tastyGolden, tastySmallcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src-exts";
-  version = "1.16.0.1";
-  sha256 = "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz";
-  buildDepends = [ cpphs ];
-  testDepends = [
-    filepath mtl smallcheck syb tasty tastyGolden tastySmallcheck
-  ];
-  buildTools = [ happy ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell-suite/haskell-src-exts";
-    description = "Manipulating Haskell 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/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
deleted file mode 100644
index e43c0430be7f..000000000000
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, syb, thOrphans, uniplate }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src-meta";
-  version = "0.6.0.8";
-  sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk";
-  buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
-  jailbreak = true;
-  meta = {
-    description = "Parse source to template-haskell abstract syntax";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src/default.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix
deleted file mode 100644
index 428715ac07bc..000000000000
--- a/pkgs/development/libraries/haskell/haskell-src/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src";
-  version = "1.0.1.6";
-  sha256 = "1vscvbsly7k0zqb7fi6bm38dfacyl8qgmv0h25fqkn95c0v5dif7";
-  buildDepends = [ syb ];
-  buildTools = [ happy ];
-  meta = {
-    description = "Support for manipulating Haskell source code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix
deleted file mode 100644
index d732a4655809..000000000000
--- a/pkgs/development/libraries/haskell/haskelldb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "haskelldb";
-  version = "2.2.4";
-  sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y";
-  buildDepends = [ mtl time ];
-  meta = {
-    homepage = "https://github.com/m4dc4p/haskelldb";
-    description = "A library of combinators for generating and executing SQL statements";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskintex/default.nix b/pkgs/development/libraries/haskell/haskintex/default.nix
deleted file mode 100644
index c659d3966f0c..000000000000
--- a/pkgs/development/libraries/haskell/haskintex/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, filepath, haskellSrcExts, HaTeX, hint, parsec
-, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskintex";
-  version = "0.5.0.2";
-  sha256 = "1qfqslr8pxks3qmfarmscgvc0q8zn72prqyk5xhmfvkf6q35pmfn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary filepath haskellSrcExts HaTeX hint parsec text transformers
-  ];
-  meta = {
-    homepage = "http://daniel-diaz.github.io/projects/haskintex";
-    description = "Haskell Evaluation inside of LaTeX code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskoin/default.nix b/pkgs/development/libraries/haskell/haskoin/default.nix
deleted file mode 100644
index 7d13d6e797b0..000000000000
--- a/pkgs/development/libraries/haskell/haskoin/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, binary, byteable, cryptohash, deepseq
-, either, HUnit, jsonRpc, mtl, pbkdf, QuickCheck, split
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskoin";
-  version = "0.1.0.2";
-  sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c";
-  buildDepends = [
-    aeson binary byteable cryptohash deepseq either jsonRpc mtl pbkdf
-    split text
-  ];
-  testDepends = [
-    aeson async binary byteable cryptohash deepseq either HUnit jsonRpc
-    mtl pbkdf QuickCheck split testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/haskoin/haskoin";
-    description = "Implementation of the Bitcoin protocol";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix
deleted file mode 100644
index 7f1e29a8c6cc..000000000000
--- a/pkgs/development/libraries/haskell/haskore/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, eventList, haskellSrc, markovChain, midi
-, nonNegative, parsec, random, transformers, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskore";
-  version = "0.2.0.5";
-  sha256 = "0zvr7hwxnv01g626617yv7f0vwpmyqvlwbyc6yhb2mrlfqwdgbd0";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataAccessor eventList haskellSrc markovChain midi nonNegative
-    parsec random transformers utilityHt
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Haskore";
-    description = "The Haskore Computer Music System";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
deleted file mode 100644
index bb26f635f629..000000000000
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, filepath, HUnit, ieee754, mtl, syb, text
-, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hastache";
-  version = "0.6.0";
-  sha256 = "1z609mhsc875ba3k6mlmlqpmqlwgxpav2asnf83yzq1q7bfs0cxh";
-  buildDepends = [
-    blazeBuilder filepath ieee754 mtl syb text transformers utf8String
-  ];
-  testDepends = [ HUnit mtl syb text ];
-  meta = {
-    homepage = "http://github.com/lymar/hastache";
-    description = "Haskell implementation of Mustache templates";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix
deleted file mode 100644
index f2cf3d24f877..000000000000
--- a/pkgs/development/libraries/haskell/haste-compiler/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754
-, dataDefault, either, filepath, ghcPaths, HTTP, monadsTf, mtl
-, network, networkUri, random, shellmate, systemFileio, tar
-, transformers, utf8String, websockets
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haste-compiler";
-  version = "0.4.3";
-  sha256 = "1wkb6a1jwmpjr0jlz5fjq652jz6a6agg0a5pfazyfpdznvd4mm62";
-  isLibrary = true;
-  isExecutable = true;
-  noHaddock = true;
-  buildDepends = [
-    binary blazeBuilder bzlib dataBinaryIeee754 dataDefault either
-    filepath ghcPaths HTTP monadsTf mtl network networkUri random
-    shellmate systemFileio tar transformers utf8String websockets
-  ];
-  configureFlags = "-fportable";
-  meta = {
-    homepage = "http://haste-lang.org/";
-    description = "Haskell To ECMAScript compiler";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix
deleted file mode 100644
index 221a7fe647ba..000000000000
--- a/pkgs/development/libraries/haskell/haste-perch/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hasteCompiler, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "haste-perch";
-  version = "0.1.0.4";
-  sha256 = "12ssfik7v671727yxplz44gwgy9i815l44r4z3x066ndcqglr306";
-  buildDepends = [ hasteCompiler transformers ];
-  meta = {
-    homepage = "https://github.com/agocorona/haste-perch";
-    description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haxl/default.nix b/pkgs/development/libraries/haskell/haxl/default.nix
deleted file mode 100644
index f257df7f1e01..000000000000
--- a/pkgs/development/libraries/haskell/haxl/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, filepath, hashable, HUnit, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haxl";
-  version = "0.1.0.0";
-  sha256 = "1spkcvsy0p3ksxapaz93db09y2jsswr5k6qs6cvxmwxxhbnswv36";
-  buildDepends = [
-    aeson filepath hashable HUnit text time unorderedContainers vector
-  ];
-  testDepends = [ aeson hashable HUnit text unorderedContainers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/facebook/Haxl";
-    description = "A Haskell library for efficient, concurrent, and concise data access";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix
deleted file mode 100644
index 7d7e8282e288..000000000000
--- a/pkgs/development/libraries/haskell/haxr-th/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haxr }:
-
-cabal.mkDerivation (self: {
-  pname = "haxr-th";
-  version = "3000.5";
-  sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif";
-  buildDepends = [ haxr ];
-  meta = {
-    homepage = "http://www.haskell.org/haxr/";
-    description = "Automatic deriving of XML-RPC structs for Haskell records";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
deleted file mode 100644
index 708959b00457..000000000000
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, HaXml, HTTP, mtl, network
-, networkUri, time, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haxr";
-  version = "3000.10.3.1";
-  sha256 = "0alvrsk85f1l79hfa9shagjckp4sx835l9734ab2izfv50mxx7gm";
-  buildDepends = [
-    base64Bytestring blazeBuilder HaXml HTTP mtl network networkUri
-    time utf8String
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/HaXR";
-    description = "XML-RPC client and server library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix
deleted file mode 100644
index c08f9e79bf00..000000000000
--- a/pkgs/development/libraries/haskell/hcltest/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, doctest, either, filepath, free, lens, mmorph
-, monadControl, mtl, optparseApplicative, randomShuffle, split, stm
-, tagged, tasty, temporary, text, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hcltest";
-  version = "0.3.6";
-  sha256 = "145l3kfxi1slngcmh4dnn09hhpr5v6s5nppk0i5a5jzxpp2yx6sd";
-  buildDepends = [
-    dlist either filepath free lens mmorph monadControl mtl
-    optparseApplicative randomShuffle split stm tagged tasty temporary
-    text transformers transformersBase
-  ];
-  testDepends = [ doctest filepath ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/bennofs/hcltest/";
-    description = "A testing library for command line applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix
deleted file mode 100644
index 1fdca2c4f9aa..000000000000
--- a/pkgs/development/libraries/haskell/hdaemonize/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, filepath, hsyslog, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hdaemonize";
-  version = "0.5.0.0";
-  sha256 = "15dyaa9rbmsjp3sg9yxg1i90kfy9rvlzmwg5kl8kwal69ajzjjgv";
-  buildDepends = [ extensibleExceptions filepath hsyslog mtl ];
-  meta = {
-    homepage = "http://github.com/madhadron/hdaemonize";
-    description = "Library to handle the details of writing daemons for UNIX";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hedis/default.nix b/pkgs/development/libraries/haskell/hedis/default.nix
deleted file mode 100644
index 47cf3fee865f..000000000000
--- a/pkgs/development/libraries/haskell/hedis/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, BoundedChan, bytestringLexing, HUnit, mtl
-, network, resourcePool, testFramework, testFrameworkHunit, time
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hedis";
-  version = "0.6.5";
-  sha256 = "1kn8i49yxms1bpjwpy4m8vyycgi755zvy4zc66w068nmnd1kiykh";
-  buildDepends = [
-    attoparsec BoundedChan bytestringLexing mtl network resourcePool
-    time vector
-  ];
-  testDepends = [ HUnit mtl testFramework testFrameworkHunit time ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/informatikr/hedis";
-    description = "Client library for the Redis datastore: supports full command set, pipelining";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
deleted file mode 100644
index 9927e65cfc32..000000000000
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
-, dlist, errors, filepath, hashable, mapSyntax
-, MonadCatchIOTransformers, mtl, random, text, time, transformers
-, unorderedContainers, vector, xmlhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "heist";
-  version = "0.14.0.1";
-  sha256 = "1nhksdn95v35ymml3kgm70axjl4vkjfvj1wvlcm1a1frlnbk993w";
-  buildDepends = [
-    aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
-    filepath hashable mapSyntax MonadCatchIOTransformers mtl random
-    text time transformers unorderedContainers vector xmlhtml
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "An Haskell template system supporting both HTML5 and XML";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix
deleted file mode 100644
index a7a1527cd1d1..000000000000
--- a/pkgs/development/libraries/haskell/here/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcMeta, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "here";
-  version = "1.2.6";
-  sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif";
-  buildDepends = [ haskellSrcMeta mtl parsec ];
-  meta = {
-    homepage = "https://github.com/tmhedberg/here";
-    description = "Here docs & interpolated strings via quasiquotation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ edwtjo ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/heredoc/default.nix b/pkgs/development/libraries/haskell/heredoc/default.nix
deleted file mode 100644
index 13f417c8f981..000000000000
--- a/pkgs/development/libraries/haskell/heredoc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "heredoc";
-  version = "0.2.0.0";
-  sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9";
-  meta = {
-    homepage = "http://hackage.haskell.org/package/heredoc";
-    description = "multi-line string / here document using QuasiQuotes";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hex/default.nix b/pkgs/development/libraries/haskell/hex/default.nix
deleted file mode 100644
index 235d617e96b2..000000000000
--- a/pkgs/development/libraries/haskell/hex/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hex";
-  version = "0.1.2";
-  sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
-  meta = {
-    description = "Convert strings into hexadecimal and back";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix
deleted file mode 100644
index 63e92de9424d..000000000000
--- a/pkgs/development/libraries/haskell/hexpat/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, List, text, transformers, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "hexpat";
-  version = "0.20.7";
-  sha256 = "03r5j54a250f01km6i8qja1h1k512ds2bp7r0yk2jpbbar2y7c08";
-  buildDepends = [ deepseq List text transformers utf8String ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Hexpat/";
-    description = "XML parser/formatter based on expat";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix
deleted file mode 100644
index 019815fd57c1..000000000000
--- a/pkgs/development/libraries/haskell/hflags/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hflags";
-  version = "0.4";
-  sha256 = "17zzx273kmnwwazmmns78cllz3l7wad1gi7hizgcxi68j04blhd4";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://github.com/errge/hflags";
-    description = "Command line flag parser, very similar to Google's gflags";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hfsevents/default.nix b/pkgs/development/libraries/haskell/hfsevents/default.nix
deleted file mode 100644
index 30ec31e60e28..000000000000
--- a/pkgs/development/libraries/haskell/hfsevents/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hfsevents";
-  version = "0.1.5";
-  sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
-  buildDepends = [ cereal mtl text ];
-  meta = {
-    homepage = "http://github.com/luite/hfsevents";
-    description = "File/folder watching for OS X";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.darwin;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hgal/default.nix b/pkgs/development/libraries/haskell/hgal/default.nix
deleted file mode 100644
index a301f935da95..000000000000
--- a/pkgs/development/libraries/haskell/hgal/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hgal";
-  version = "2.0.0.2";
-  sha256 = "17qw8izy54042g56mp3hdbmqcyk95cdarg58xggniwd85q2l5dpi";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "library for computation automorphism group and canonical labelling of a graph";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hi/default.nix b/pkgs/development/libraries/haskell/hi/default.nix
deleted file mode 100644
index 0384325c2d70..000000000000
--- a/pkgs/development/libraries/haskell/hi/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, hspec, HUnit, parsec, split, template
-, temporaryRc, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hi";
-  version = "0.0.8.2";
-  sha256 = "0h94wjxdr6g6n3rvkn1xsjqr49p9fgidmraifvz5mzryn6rmd18r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    filepath parsec split template temporaryRc text time
-  ];
-  testDepends = [
-    doctest filepath hspec HUnit parsec split template temporaryRc text
-    time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fujimura/hi";
-    description = "Generate scaffold for cabal project";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/higher-leveldb/default.nix b/pkgs/development/libraries/haskell/higher-leveldb/default.nix
deleted file mode 100644
index a25a37741d39..000000000000
--- a/pkgs/development/libraries/haskell/higher-leveldb/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, dataDefault, hspec, leveldbHaskell, liftedBase
-, monadControl, mtl, resourcet, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "higher-leveldb";
-  version = "0.2.1.0";
-  sha256 = "13bwh9jg7smh8vwgrih79ivi073690l9nn478r5m0w64gbkvdm5p";
-  buildDepends = [
-    cereal dataDefault leveldbHaskell liftedBase monadControl mtl
-    resourcet transformers transformersBase
-  ];
-  testDepends = [
-    cereal hspec leveldbHaskell liftedBase monadControl mtl resourcet
-    transformers transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/jeremyjh/higher-leveldb";
-    description = "A rich monadic API for working with leveldb databases";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
deleted file mode 100644
index d5ee69f5f0db..000000000000
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, Diff, filepath, mtl, parsec, regexPcre
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "highlighting-kate";
-  version = "0.5.11";
-  sha256 = "0jfgz4cyn6fylfrsk1yi0fykir8mhxdniq80h7hy5i2xv7qwf5vw";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeHtml filepath mtl parsec regexPcre utf8String
-  ];
-  testDepends = [ blazeHtml Diff filepath ];
-  prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal";
-  meta = {
-    homepage = "http://github.com/jgm/highlighting-kate";
-    description = "Syntax highlighting";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix
deleted file mode 100644
index ea5e13a1b5f3..000000000000
--- a/pkgs/development/libraries/haskell/hindent/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, haskellSrcExts, hspec, monadLoops, mtl, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hindent";
-  version = "4.0";
-  sha256 = "1l4dhp55ps92zvz2nmhs1j4hfsbs0r5f2b7idjcy8ibng8sgb361";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ];
-  testDepends = [
-    dataDefault haskellSrcExts hspec monadLoops mtl text
-  ];
-  doCheck = false;
-  meta = {
-    description = "Extensible Haskell pretty printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
deleted file mode 100644
index 2513922781b6..000000000000
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hinotify";
-  version = "0.3.7";
-  sha256 = "0i7mxg9ilzcgijda6j3ya5xnpbxa3wm9xswdfif95jim9w82sw0b";
-  meta = {
-    homepage = "https://github.com/kolmodin/hinotify.git";
-    description = "Haskell binding to inotify";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
deleted file mode 100644
index ce0eec94488e..000000000000
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, extensibleExceptions, filepath, ghcMtl
-, ghcPaths, HUnit, mtl, random, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hint";
-  version = "0.4.2.1";
-  sha256 = "0nc545y1v3s1897f3ims7m37wnn288xyz1zb9sxqs6immdxyly0g";
-  buildDepends = [
-    exceptions extensibleExceptions filepath ghcMtl ghcPaths mtl random
-    utf8String
-  ];
-  testDepends = [
-    exceptions extensibleExceptions filepath HUnit mtl
-  ];
-  meta = {
-    homepage = "http://hub.darcs.net/jcpetruzza/hint";
-    description = "Runtime Haskell interpreter (GHC API wrapper)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
deleted file mode 100644
index 08ff35ca8aaa..000000000000
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, bytedump, cryptohash, hourglass, HUnit, mtl
-, parsec, patience, QuickCheck, random, systemFileio
-, systemFilepath, testFramework, testFrameworkQuickcheck2
-, unixCompat, vector, zlib, zlibBindings
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hit";
-  version = "0.6.2";
-  sha256 = "07lfjbn48v8ykkyj15diy4a9kpgzc93gv0l1rdfcacl3f26a97hs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec cryptohash hourglass mtl parsec patience random
-    systemFileio systemFilepath unixCompat vector zlib zlibBindings
-  ];
-  testDepends = [
-    bytedump hourglass HUnit QuickCheck testFramework
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hit";
-    description = "Git operations in haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
deleted file mode 100644
index 5ee8f2d4f881..000000000000
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript
-, optparseApplicative, QuickCheck, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hjsmin";
-  version = "0.1.4.7";
-  sha256 = "1gw9is6piqrqxnrwp8v3vij90icmym58rxqnnklrcjfi3ai7y58f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeBuilder languageJavascript optparseApplicative text
-  ];
-  testDepends = [
-    blazeBuilder Cabal HUnit languageJavascript QuickCheck
-    testFramework testFrameworkHunit text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/alanz/hjsmin";
-    description = "Haskell implementation of a javascript minifier";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
deleted file mode 100644
index 350b384ef00c..000000000000
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeMarkup, cmdargs, csv, Decimal, filepath, HUnit, mtl
-, parsec, prettyShow, regexpr, regexTdfa, safe, split
-, testFramework, testFrameworkHunit, time, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hledger-lib";
-  version = "0.24";
-  sha256 = "1r0qlah45z1p180d245fyji8xnxv9ipgg9m1dr56s4xaw910f6ns";
-  buildDepends = [
-    blazeMarkup cmdargs csv Decimal filepath HUnit mtl parsec
-    prettyShow regexpr regexTdfa safe split time transformers
-    utf8String
-  ];
-  testDepends = [
-    blazeMarkup cmdargs csv Decimal filepath HUnit mtl parsec
-    prettyShow regexpr regexTdfa safe split testFramework
-    testFrameworkHunit time transformers
-  ];
-  meta = {
-    homepage = "http://hledger.org";
-    description = "Core data types, parsers and utilities for the hledger accounting tool";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hledger-web/build-fix.patch b/pkgs/development/libraries/haskell/hledger-web/build-fix.patch
deleted file mode 100644
index 45862bf1679c..000000000000
--- a/pkgs/development/libraries/haskell/hledger-web/build-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Only in hledger-web-0.22.4: dist
-diff -urw hledger-web-0.22.4-orig/Hledger/Web/Main.hs hledger-web-0.22.4/Hledger/Web/Main.hs
---- hledger-web-0.22.4-orig/Hledger/Web/Main.hs	2014-04-07 13:00:41.168884350 +0200
-+++ hledger-web-0.22.4/Hledger/Web/Main.hs	2014-04-07 13:14:46.584599468 +0200
-@@ -15,7 +15,8 @@
- -- import Yesod.Default.Main   (defaultMain)
- import Settings            --  (parseExtra)
- import Application          (makeApplication)
--import Data.Conduit.Network (HostPreference(HostIPv4))
-+import Data.String
-+import Data.Conduit.Network
- import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
- import Network.Wai.Handler.Launch (runUrlPort)
- --
-@@ -65,7 +66,7 @@
-   app <- makeApplication opts j' AppConfig{appEnv = Development
-                                           ,appPort = p
-                                           ,appRoot = pack u
--                                          ,appHost = HostIPv4
-+                                          ,appHost = fromString "*4"
-                                           ,appExtra = Extra "" Nothing staticRoot
-                                           }
-   if server_ opts
-diff -urw hledger-web-0.22.4-orig/hledger-web.cabal hledger-web-0.22.4/hledger-web.cabal
---- hledger-web-0.22.4-orig/hledger-web.cabal	2014-04-07 13:00:41.168884350 +0200
-+++ hledger-web-0.22.4/hledger-web.cabal	2014-04-07 13:16:26.376772344 +0200
-@@ -128,7 +128,7 @@
-                    , http-conduit
-                    , http-client          >= 0.2 && < 0.3
-                    , HUnit
--                   , network-conduit
-+                   , network-conduit, conduit-extra
-                    , old-locale
-                    , parsec
-                    , regexpr              >= 0.5.1
-@@ -220,7 +220,7 @@
-                    , http-conduit
-                    , http-client          >= 0.2 && < 0.3
-                    , HUnit
--                   , network-conduit
-+                   , network-conduit, conduit-extra
-                    , old-locale
-                    , parsec
-                    , regexpr              >= 0.5.1
-Only in hledger-web-0.22.4: Setup
-Only in hledger-web-0.22.4: Setup.hi
-Only in hledger-web-0.22.4: Setup.o
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
deleted file mode 100644
index ae5de9c757b6..000000000000
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
-, conduitExtra, dataDefault, filepath, hjsmin, hledger, hledgerLib
-, hspec, httpClient, httpConduit, HUnit, json, networkConduit
-, parsec, regexpr, safe, shakespeare, text, time, transformers, wai
-, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore
-, yesodStatic, yesodTest
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hledger-web";
-  version = "0.24";
-  sha256 = "0dwqrq31yf0kw3rk06f1ny2670w2qw83bvvqwp87g4xky5v69xpi";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeHtml blazeMarkup clientsession cmdargs conduitExtra
-    dataDefault filepath hjsmin hledger hledgerLib httpClient
-    httpConduit HUnit json networkConduit parsec regexpr safe
-    shakespeare text time transformers wai waiExtra waiHandlerLaunch
-    warp yaml yesod yesodCore yesodStatic
-  ];
-  testDepends = [ hspec yesod yesodTest ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://hledger.org";
-    description = "A web interface for the hledger accounting tool";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
deleted file mode 100644
index a53cb3cc14e2..000000000000
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
-, parsec, prettyShow, regexpr, regexTdfa, safe, shakespeare
-, shakespeareText, split, tabular, testFramework
-, testFrameworkHunit, text, time, transformers, utf8String, wizards
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hledger";
-  version = "0.24";
-  sha256 = "1f32lg12i9s075xfbl3f5vhanjg8ms5ilw0hgpbsfh8g9nvlvffc";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
-    prettyShow regexpr regexTdfa safe shakespeare shakespeareText split
-    tabular text time utf8String wizards
-  ];
-  testDepends = [
-    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
-    prettyShow regexpr regexTdfa safe shakespeare shakespeareText split
-    tabular testFramework testFrameworkHunit text time transformers
-    wizards
-  ];
-  meta = {
-    homepage = "http://hledger.org";
-    description = "The main command-line interface for the hledger accounting tool";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hlibgit2/default.nix b/pkgs/development/libraries/haskell/hlibgit2/default.nix
deleted file mode 100644
index 3798d3082a75..000000000000
--- a/pkgs/development/libraries/haskell/hlibgit2/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, git, openssl, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "hlibgit2";
-  version = "0.18.0.13";
-  sha256 = "1bslg51kkhnwm48kxaad4izq3xmzv6dpqy10a5kh16vr5zy3w5hz";
-  buildDepends = [ bindingsDSL zlib ];
-  testDepends = [ git ];
-  extraLibraries = [ openssl ];
-  meta = {
-    description = "Low-level bindings to libgit2";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix b/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix
deleted file mode 100644
index 501d84a596f6..000000000000
--- a/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gsl, hmatrix, random, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "hmatrix-gsl";
-  version = "0.16.0.2";
-  sha256 = "1l865v2vpjl7f5741z58m9gw1ksskgzfm5gzp9pxiqazsgb2h5ym";
-  buildDepends = [ hmatrix random vector ];
-  pkgconfigDepends = [ gsl ];
-  meta = {
-    homepage = "https://github.com/albertoruiz/hmatrix";
-    description = "Numerical computation";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hmatrix-special/default.nix b/pkgs/development/libraries/haskell/hmatrix-special/default.nix
deleted file mode 100644
index c6e9f3dbbbf8..000000000000
--- a/pkgs/development/libraries/haskell/hmatrix-special/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gsl, hmatrix, hmatrixGsl }:
-
-cabal.mkDerivation (self: {
-  pname = "hmatrix-special";
-  version = "0.3.0.1";
-  sha256 = "1ziqzbfrk7xyah5n0cys1ccnmj2z91wxdamanv3y5v717zhdrqix";
-  buildDepends = [ hmatrix hmatrixGsl ];
-  extraLibraries = [ gsl ];
-  meta = {
-    homepage = "https://github.com/albertoruiz/hmatrix";
-    description = "Interface to GSL special functions";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
deleted file mode 100644
index afc5833d5e28..000000000000
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, blas, deepseq, liblapack, random, split
-, storableComplex, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hmatrix";
-  version = "0.16.1.0";
-  sha256 = "0jdkh9cq3dzc2fdkqv2zpv70knfkr0i01wv83zw3gjjv081gcn5h";
-  buildDepends = [
-    binary deepseq random split storableComplex vector
-  ];
-  extraLibraries = [ blas liblapack ];
-  meta = {
-    homepage = "https://github.com/albertoruiz/hmatrix";
-    description = "Numeric Linear Algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix
deleted file mode 100644
index 8ccbfad945c1..000000000000
--- a/pkgs/development/libraries/haskell/hoauth/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cryptoPubkeyTypes, curl, dataenc, entropy, mtl
-, random, RSA, SHA, time, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoauth";
-  version = "0.3.5";
-  sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp";
-  buildDepends = [
-    binary cryptoPubkeyTypes curl dataenc entropy mtl random RSA SHA
-    time utf8String
-  ];
-  meta = {
-    description = "A Haskell implementation of OAuth 1.0a protocol.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix
deleted file mode 100644
index ec88bb0f1742..000000000000
--- a/pkgs/development/libraries/haskell/hoauth2/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, bytestringShow, httpConduit, httpTypes
-, monadControl, mtl, random, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoauth2";
-  version = "0.4.3";
-  sha256 = "1qmhk9h3rwp29dsjqbgsma4zgzdd6cw1jcryzd17rk32biiiylvg";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson bytestringShow httpConduit httpTypes monadControl mtl random
-    text transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/freizl/hoauth2";
-    description = "hoauth2";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix
deleted file mode 100644
index 1fa7c558731c..000000000000
--- a/pkgs/development/libraries/haskell/holy-project/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ansiTerminal, Cabal, filepath, hastache
-, httpConduit, HUnit, lens, lensAeson, QuickCheck, random
-, smallcheck, split, syb, tasty, tastyHunit, tastyQuickcheck
-, tastySmallcheck, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "holy-project";
-  version = "0.1.1.1";
-  sha256 = "0vb4mlz6gb01aadm2b8kgvgnrwwvl6q4ndx6xldi0xi3rm22xkwj";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson ansiTerminal Cabal filepath hastache httpConduit HUnit lens
-    lensAeson QuickCheck random smallcheck split syb tasty tastyHunit
-    tastyQuickcheck tastySmallcheck text time
-  ];
-  testDepends = [
-    Cabal HUnit QuickCheck smallcheck tasty tastyHunit tastyQuickcheck
-    tastySmallcheck
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/yogsototh/holy-project";
-    description = "Start your Haskell project with cabal, git and tests";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
deleted file mode 100644
index 8e74edc8e6a5..000000000000
--- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-builder";
-  version = "0.3";
-  sha256 = "0mj58g7kfr5hpqv6idjb24d3gdh25z5x2ym62c6ckm5g3f4x3jm9";
-  buildDepends = [
-    blazeBuilder doubleConversion hoodleTypes lens strict text
-  ];
-  meta = {
-    description = "text builder for hoodle file format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix
deleted file mode 100644
index e63b68261d43..000000000000
--- a/pkgs/development/libraries/haskell/hoodle-core/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary
-, cairo, cereal, configurator, coroutineObject, dbus, Diff, dyre
-, either, errors, filepath, fsnotify, gd, gtk, hoodleBuilder
-, hoodleParser, hoodleRender, hoodleTypes, lens, libX11, libXi
-, monadLoops, mtl, network, networkInfo, networkSimple, pango
-, poppler, pureMD5, stm, strict, svgcairo, systemFilepath, text
-, time, transformers, transformersFree, unorderedContainers, uuid
-, vector, xournalParser
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-core";
-  version = "0.14";
-  sha256 = "1njkjxcbnwh9b7mg0xcqkc0clfz64n5h9jqf3323npyw8bhw34b8";
-  buildDepends = [
-    aeson aesonPretty attoparsec base64Bytestring binary cairo cereal
-    configurator coroutineObject dbus Diff dyre either errors filepath
-    fsnotify gd gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes
-    lens monadLoops mtl network networkInfo networkSimple pango poppler
-    pureMD5 stm strict svgcairo systemFilepath text time transformers
-    transformersFree unorderedContainers uuid vector xournalParser
-  ];
-  extraLibraries = [ libX11 libXi ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "Core library for hoodle";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-extra/default.nix b/pkgs/development/libraries/haskell/hoodle-extra/default.nix
deleted file mode 100644
index c26932f10178..000000000000
--- a/pkgs/development/libraries/haskell/hoodle-extra/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary
-, cmdargs, conduit, either, filepath, hoodleParser, hoodleTypes
-, httpConduit, lens, monadLoops, mtl, networkSimple, pureMD5
-, resourcet, text, time, transformers, unorderedContainers
-, xournalParser
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-extra";
-  version = "0.1";
-  sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson aesonPretty attoparsec base64Bytestring binary cmdargs
-    conduit either filepath hoodleParser hoodleTypes httpConduit lens
-    monadLoops mtl networkSimple pureMD5 resourcet text time
-    transformers unorderedContainers xournalParser
-  ];
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "extra hoodle tools";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix
deleted file mode 100644
index 8684a754648d..000000000000
--- a/pkgs/development/libraries/haskell/hoodle-parser/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text
-, transformers, xournalTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-parser";
-  version = "0.3";
-  sha256 = "1ihpmkhjzsf8w4ygljx2agx31xblc0ch4y8m9pwj7rnnjj1sw15i";
-  buildDepends = [
-    attoparsec either hoodleTypes lens mtl strict text transformers
-    xournalTypes
-  ];
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "Hoodle file parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix
deleted file mode 100644
index 71e390222510..000000000000
--- a/pkgs/development/libraries/haskell/hoodle-render/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, cairo, filepath, gd, gtk, hoodleTypes
-, lens, monadLoops, mtl, poppler, stm, strict, svgcairo
-, transformers, unorderedContainers, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-render";
-  version = "0.4";
-  sha256 = "06ds0fzw11a10m927y2jvmgbsjy7cxdpppb6ifxkg173csp92a2d";
-  buildDepends = [
-    base64Bytestring cairo filepath gd gtk hoodleTypes lens monadLoops
-    mtl poppler stm strict svgcairo transformers unorderedContainers
-    uuid
-  ];
-  meta = {
-    description = "Hoodle file renderer";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix
deleted file mode 100644
index 22bc514e153b..000000000000
--- a/pkgs/development/libraries/haskell/hoodle-types/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, lens, mtl, strict, text, uuid }:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-types";
-  version = "0.3";
-  sha256 = "0n9plj6hhsc5482pl7sw4gw7py8r6cn0cl7hg35g2qxdxnzapifm";
-  buildDepends = [ cereal lens mtl strict text uuid ];
-  meta = {
-    description = "Data types for programs for hoodle file format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoogle/4.2.34.nix b/pkgs/development/libraries/haskell/hoogle/4.2.34.nix
deleted file mode 100644
index d498095f8b32..000000000000
--- a/pkgs/development/libraries/haskell/hoogle/4.2.34.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
-, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text
-, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoogle";
-  version = "4.2.34";
-  sha256 = "0vldc7s3nq70jxmnxdzlfrlwg0pxw0lq1lcd53klj2ksjkqhm5jg";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
-    deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
-    resourcet safe shake tagsoup text time transformers uniplate vector
-    vectorAlgorithms wai warp
-  ];
-  testDepends = [ filepath ];
-  testTarget = "--test-option=--no-net";
-  meta = {
-    homepage = "http://www.haskell.org/hoogle/";
-    description = "Haskell API Search";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoogle/4.2.36.nix b/pkgs/development/libraries/haskell/hoogle/4.2.36.nix
deleted file mode 100644
index 5b12f8d28c49..000000000000
--- a/pkgs/development/libraries/haskell/hoogle/4.2.36.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
-, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup
-, temporary, text, time, transformers, uniplate, vector
-, vectorAlgorithms, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoogle";
-  version = "4.2.36";
-  sha256 = "1h65pl0jfki2pcrywak9mh3hfi3wziffhb2q0xp6r4v01536zifv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
-    deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
-    resourcet safe shake tagsoup text time transformers uniplate vector
-    vectorAlgorithms wai warp
-  ];
-  testDepends = [ filepath temporary ];
-  testTarget = "--test-option=--no-net";
-  meta = {
-    homepage = "http://www.haskell.org/hoogle/";
-    description = "Haskell API Search";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
deleted file mode 100644
index 13ea889119c3..000000000000
--- a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! @shell@
-
-COMMAND=$1
-shift
-HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \
-    "$COMMAND" -d @out@/share/hoogle "$@"
diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix
deleted file mode 100644
index 822c2bdd82ea..000000000000
--- a/pkgs/development/libraries/haskell/hoogle/local.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-# Install not only the Hoogle library and executable, but also a local Hoogle
-# database which provides "Source" links to all specified 'packages' -- or the
-# current Haskell Platform if no custom package set is provided.
-#
-# It is intended to be used in config.nix similarly to:
-#
-# { packageOverrides = pkgs: rec {
-#
-#   haskellPackages =
-#     let callPackage = pkgs.lib.callPackageWith haskellPackages;
-#     in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
-#         extension = self: super: {
-#           hoogleLocal = pkgs.haskellPackages.hoogleLocal.override {
-#             packages = with pkgs.haskellPackages; [
-#               mmorph
-#               monadControl
-#             ];
-#           };
-#         };
-#       });
-# }}
-#
-# This will build mmorph and monadControl, and have the hoogle installation
-# refer to their documentation via symlink so they are not garbage collected.
-
-{ stdenv, hoogle, rehoo
-, ghc, packages ? [ ghc.ghc ]
-}:
-
-let
-  inherit (stdenv.lib) optional;
-  wrapper = ./hoogle-local-wrapper.sh;
-in
-stdenv.mkDerivation {
-  name = "hoogle-local-0.1";
-  buildInputs = [hoogle rehoo];
-
-  phases = [ "installPhase" ];
-
-  docPackages = packages;
-  installPhase = ''
-    if [ -z "$docPackages" ]; then
-        echo "ERROR: The packages attribute has not been set"
-        exit 1
-    fi
-
-    mkdir -p $out/share/hoogle/doc
-    export HOOGLE_DOC_PATH=$out/share/hoogle/doc
-
-    cd $out/share/hoogle
-
-    function import_dbs() {
-        find $1 -name '*.txt' | while read f; do
-          newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
-          if [[ -f $f && ! -f ./$newname ]]; then
-            cp -p $f ./$newname
-            hoogle convert -d "$(dirname $f)" "./$newname"
-          fi
-        done
-    }
-
-    for i in $docPackages; do
-        findInputs $i docPackages propagated-native-build-inputs
-        findInputs $i docPackages propagated-build-inputs
-    done
-
-    for i in $docPackages; do
-      if [[ ! $i == $out ]]; then
-        for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
-          if [[ -d $docdir ]]; then
-            import_dbs $docdir
-            ln -sf $docdir $out/share/hoogle/doc
-          fi
-        done
-      fi
-    done
-
-    import_dbs ${ghc}/share/doc/ghc*/html/libraries
-    ln -sf ${ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
-
-    chmod 644 *.hoo *.txt
-    rehoo -j4 -c64 .
-
-    rm -fr downloads *.dep *.txt
-    mv default.hoo x || exit 0
-    rm -f *.hoo
-    mv x default.hoo || exit 1
-
-    if [ ! -f default.hoo ]; then
-        echo "Unable to build the default Hoogle database"
-        exit 1
-    fi
-
-    mkdir -p $out/bin
-    substitute ${wrapper} $out/bin/hoogle \
-        --subst-var out --subst-var-by shell ${stdenv.shell} \
-        --subst-var-by hoogle ${hoogle}
-    chmod +x $out/bin/hoogle
-  '';
-
-  meta = {
-    description = "A local Hoogle database";
-    platforms = ghc.meta.platforms;
-    hydraPlatforms = with stdenv.lib.platforms; none;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/haskell/hoopl/default.nix b/pkgs/development/libraries/haskell/hoopl/default.nix
deleted file mode 100644
index a0c494d67cf9..000000000000
--- a/pkgs/development/libraries/haskell/hoopl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hoopl";
-  version = "3.10.0.1";
-  sha256 = "1wahcngdmb3ixny0havrddkmrhs02rzlf1d1l7g8f6pzg051mr11";
-  meta = {
-    homepage = "http://ghc.cs.tufts.edu/hoopl/";
-    description = "A library to support dataflow analysis and optimization";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix
deleted file mode 100644
index 5532b56e6a14..000000000000
--- a/pkgs/development/libraries/haskell/hopenssl/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, openssl }:
-
-cabal.mkDerivation (self: {
-  pname = "hopenssl";
-  version = "1.7";
-  sha256 = "1zs69kxwz5fnm62mdscbpfz78vwnda75gyx1vxmmlisfhfslprly";
-  buildDepends = [ mtl ];
-  extraLibraries = [ openssl ];
-  meta = {
-    homepage = "http://github.com/peti/hopenssl";
-    description = "FFI bindings to OpenSSL's EVP digest interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hosc/default.nix b/pkgs/development/libraries/haskell/hosc/default.nix
deleted file mode 100644
index 2ad4d6210e2b..000000000000
--- a/pkgs/development/libraries/haskell/hosc/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, blazeBuilder, dataBinaryIeee754, network
-, QuickCheck, testFramework, testFrameworkQuickcheck2, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hosc";
-  version = "0.15";
-  sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf";
-  buildDepends = [
-    binary blazeBuilder dataBinaryIeee754 network time transformers
-  ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hosc";
-    description = "Haskell Open Sound Control";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix
deleted file mode 100644
index 2131599c8a67..000000000000
--- a/pkgs/development/libraries/haskell/hostname/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hostname";
-  version = "1.0";
-  sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
-  meta = {
-    description = "A very simple package providing a cross-platform means of determining the hostname";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix
deleted file mode 100644
index 92e3806b8cd1..000000000000
--- a/pkgs/development/libraries/haskell/hourglass/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, mtl, tasty, tastyHunit, tastyQuickcheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "hourglass";
-  version = "0.2.6";
-  sha256 = "029fmx5r6krj7y7mn4b4m2lpaa3iw6vhyznrib5lhf469i1jp9m3";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq mtl tasty tastyHunit tastyQuickcheck time
-  ];
-  meta = {
-    homepage = "https://github.com/vincenthz/hs-hourglass";
-    description = "simple performant time related library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
deleted file mode 100644
index 8fbcd09e8879..000000000000
--- a/pkgs/development/libraries/haskell/hp2any-core/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, filepath, network, time }:
-
-cabal.mkDerivation (self: {
-  pname = "hp2any-core";
-  version = "0.11.2";
-  sha256 = "1gmw9bggw8hsp6pi0xgrryf0sqjb1aaxbwh85q5h72h4ixskwn1y";
-  buildDepends = [ attoparsec filepath network time ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Hp2any";
-    description = "Heap profiling helper library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
deleted file mode 100644
index aad7c7fdca9a..000000000000
--- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, freeglut, GLUT, hp2anyCore, mesa, network
-, OpenGL, parseargs
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hp2any-graph";
-  version = "0.5.4.2";
-  sha256 = "1yj1miqn265pxq2dfhx87s20vjnnxmsl3d9xdy88cbzglpx2v9il";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    filepath GLUT hp2anyCore network OpenGL parseargs
-  ];
-  extraLibraries = [ freeglut mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Hp2any";
-    description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix
deleted file mode 100644
index c4e9ddbe2aa6..000000000000
--- a/pkgs/development/libraries/haskell/hplayground/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, hasteCompiler, hastePerch, monadsTf
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hplayground";
-  version = "0.1.1.0";
-  sha256 = "03ya82lxhv7acakhl01835p3wvwr3z14jiww7wvj4bzlib8qsi8b";
-  buildDepends = [
-    dataDefault hasteCompiler hastePerch monadsTf transformers
-  ];
-  meta = {
-    homepage = "https://github.com/agocorona/hplayground";
-    description = "a client-side haskell framework that compiles to javascript with the haste compiler";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
deleted file mode 100644
index 9d7b889746eb..000000000000
--- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "hs-bibutils";
-  version = "5.0";
-  sha256 = "18gchn62g2cqzyj1nr8wd5i6smhq739g00cblkllj1jkni33ch2l";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";
-    description = "Haskell bindings to bibutils, the bibliography conversion utilities";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix
deleted file mode 100644
index c045cf8e720d..000000000000
--- a/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, criterion, csv, dataDefault, filepath, handaGdata
-, hsbencher, httpConduit, mtl, network, statistics, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsbencher-fusion";
-  version = "0.3.3";
-  sha256 = "0vp1biv5jwac3bhj7qxl8x3bw73436qn284fippmlr6f54c15yw8";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    criterion csv dataDefault filepath handaGdata hsbencher httpConduit
-    mtl network statistics text time
-  ];
-  doCheck = false;
-  meta = {
-    description = "Backend for uploading benchmark data to Google Fusion Tables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsbencher/default.nix b/pkgs/development/libraries/haskell/hsbencher/default.nix
deleted file mode 100644
index 0786aa18b3c3..000000000000
--- a/pkgs/development/libraries/haskell/hsbencher/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, dataDefault, filepath, GenericPretty, HUnit
-, ioStreams, mtl, random, testFramework, testFrameworkHunit, text
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsbencher";
-  version = "1.20.0.3";
-  sha256 = "1qnj4zhq6j4cvnxcparm2xr9qc6l9q7j72h4dr5jz04lz8c2fkcl";
-  buildDepends = [
-    async dataDefault filepath GenericPretty ioStreams mtl random time
-  ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text time ];
-  doCheck = false;
-  meta = {
-    description = "Launch and gather data from Haskell and non-Haskell benchmarks";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-db/default.nix b/pkgs/development/libraries/haskell/hsc3-db/default.nix
deleted file mode 100644
index 13a32c528633..000000000000
--- a/pkgs/development/libraries/haskell/hsc3-db/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hsc3, safe }:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-db";
-  version = "0.15";
-  sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
-  buildDepends = [ hsc3 safe ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hsc3-db";
-    description = "Haskell SuperCollider Unit Generator Database";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-dot/default.nix b/pkgs/development/libraries/haskell/hsc3-dot/default.nix
deleted file mode 100644
index 7423525e46fb..000000000000
--- a/pkgs/development/libraries/haskell/hsc3-dot/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hsc3 }:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-dot";
-  version = "0.15";
-  sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m";
-  buildDepends = [ filepath hsc3 ];
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hsc3-dot";
-    description = "haskell supercollider graph drawing";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-lang/default.nix b/pkgs/development/libraries/haskell/hsc3-lang/default.nix
deleted file mode 100644
index dd12067d45e6..000000000000
--- a/pkgs/development/libraries/haskell/hsc3-lang/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, dataDefault, dataOrdlist, dlist, hashable
-, hmatrixSpecial, hosc, hsc3, MonadRandom, random, randomShuffle
-, split, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-lang";
-  version = "0.15";
-  sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf";
-  buildDepends = [
-    bifunctors dataDefault dataOrdlist dlist hashable hmatrixSpecial
-    hosc hsc3 MonadRandom random randomShuffle split transformers
-    vector
-  ];
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hsc3-lang";
-    description = "Haskell SuperCollider Language";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-process/default.nix b/pkgs/development/libraries/haskell/hsc3-process/default.nix
deleted file mode 100644
index 6b81f64b03dd..000000000000
--- a/pkgs/development/libraries/haskell/hsc3-process/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, filepath, hosc, hsc3, time, timeCompat
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-process";
-  version = "0.10.0";
-  sha256 = "1h769akpd5gsmmlzmhya3dh56rhpf4fkj0vl6zngahc5hl4s7qxc";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataDefault filepath hosc hsc3 time timeCompat transformers
-  ];
-  meta = {
-    homepage = "https://github.com/kaoskorobase/hsc3-process";
-    description = "Create and control scsynth processes";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-server/default.nix b/pkgs/development/libraries/haskell/hsc3-server/default.nix
deleted file mode 100644
index c8e78e4e7ea1..000000000000
--- a/pkgs/development/libraries/haskell/hsc3-server/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bitset, dataDefault, failure, hashtables, hosc, hsc3
-, hsc3Process, liftedBase, ListZipper, monadControl, QuickCheck
-, random, resourcet, testFramework, testFrameworkQuickcheck2
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-server";
-  version = "0.9.2";
-  sha256 = "1lq4y57d555jb0yi10n4j69h4whwsm5h2k6j4r7f9avds5ahh6s2";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    bitset dataDefault failure hashtables hosc hsc3 hsc3Process
-    liftedBase ListZipper monadControl random resourcet transformers
-    transformersBase
-  ];
-  testDepends = [
-    failure QuickCheck random testFramework testFrameworkQuickcheck2
-    transformers
-  ];
-  meta = {
-    homepage = "https://github.com/kaoskorobase/hsc3-server";
-    description = "SuperCollider server resource management and synchronization";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3/default.nix b/pkgs/development/libraries/haskell/hsc3/default.nix
deleted file mode 100644
index 6e05c01220ea..000000000000
--- a/pkgs/development/libraries/haskell/hsc3/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataDefault, dataOrdlist, filepath, hashable, hosc
-, network, random, safe, split, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3";
-  version = "0.15";
-  sha256 = "1rmxl1wcly74bjkw79zw9ydmiclk5716w75b4nz8xkqraijiafrg";
-  buildDepends = [
-    binary dataDefault dataOrdlist filepath hashable hosc network
-    random safe split transformers
-  ];
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hsc3";
-    description = "Haskell SuperCollider";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix
deleted file mode 100644
index f58a8077b158..000000000000
--- a/pkgs/development/libraries/haskell/hsdns/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, adns, network }:
-
-cabal.mkDerivation (self: {
-  pname = "hsdns";
-  version = "1.6.1";
-  sha256 = "0s63acjy1n75k7gjm4kam7v5d4a5kn0aw178mygkqwr5frflghb4";
-  buildDepends = [ network ];
-  extraLibraries = [ adns ];
-  meta = {
-    homepage = "http://github.com/peti/hsdns";
-    description = "Asynchronous DNS Resolver";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hse-cpp/default.nix b/pkgs/development/libraries/haskell/hse-cpp/default.nix
deleted file mode 100644
index 49625acf68c1..000000000000
--- a/pkgs/development/libraries/haskell/hse-cpp/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, haskellSrcExts }:
-
-cabal.mkDerivation (self: {
-  pname = "hse-cpp";
-  version = "0.1";
-  sha256 = "0f1bgi1hnpnry1pm7jhi626afdvymzy7k0a70n07n41js46pjxd0";
-  buildDepends = [ cpphs haskellSrcExts ];
-  meta = {
-    description = "Preprocess+parse haskell code";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
deleted file mode 100644
index 2406a9c2e94f..000000000000
--- a/pkgs/development/libraries/haskell/hsemail/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, hspec, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "hsemail";
-  version = "1.7.7";
-  sha256 = "16wqrpzi5njv26za1rckn74jsqmyswndb6k38yz1567h1y4w7ai5";
-  buildDepends = [ mtl parsec ];
-  testDepends = [ doctest hspec parsec ];
-  meta = {
-    homepage = "http://github.com/peti/hsemail";
-    description = "Internet Message Parsers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
deleted file mode 100644
index cc9b80463222..000000000000
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, cmdargs, dyre, filepath, haskellSrcExts, lens
-, mtl, split, tasty, tastyGolden, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsimport";
-  version = "0.6.4";
-  sha256 = "07v7sm98a0vzfk1xx8mf6l2ybf3rwx4ml2wxp1rlw5w1aapffsfw";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec cmdargs dyre haskellSrcExts lens mtl split text
-  ];
-  testDepends = [ filepath haskellSrcExts tasty tastyGolden ];
-  jailbreak = true;
-  meta = {
-    description = "A command line program for extending the import list of a Haskell source file";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix
deleted file mode 100644
index 5fd6f5afd80e..000000000000
--- a/pkgs/development/libraries/haskell/hsini/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, parsec, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsini";
-  version = "0.3.1";
-  sha256 = "06cys4i1nsic13dkp5jgammm3qykzizlnp6wdka2vl699rvnzaaf";
-  buildDepends = [ mtl parsec ];
-  testDepends = [
-    HUnit mtl parsec QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Package for user configuration files (INI)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix
deleted file mode 100644
index a2116051cdec..000000000000
--- a/pkgs/development/libraries/haskell/hslogger-template/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hslogger, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hslogger-template";
-  version = "2.0.2";
-  sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3";
-  buildDepends = [ hslogger mtl ];
-  meta = {
-    description = "Automatic generation of hslogger functions";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix
deleted file mode 100644
index e76ff36aab5d..000000000000
--- a/pkgs/development/libraries/haskell/hslua/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lua, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hslua";
-  version = "0.3.13";
-  sha256 = "02j3hrzq3dgcv4bvf4xz14qxvzlb0vlxrf7lk9wqwdy43b978mz9";
-  buildDepends = [ mtl ];
-  pkgconfigDepends = [ lua ];
-  configureFlags = "-fsystem-lua";
-  meta = {
-    description = "A Lua language interpreter embedding in Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix b/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix
deleted file mode 100644
index 7b9c9dfd4022..000000000000
--- a/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, hspec, hspecExpectations, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-attoparsec";
-  version = "0.1.0.1";
-  sha256 = "12246p4k0axv6w5jxnid9hyl4cbl3vmd46b7xxli7nq2iw79nl8v";
-  buildDepends = [ attoparsec hspecExpectations text ];
-  testDepends = [ attoparsec hspec hspecExpectations text ];
-  meta = {
-    homepage = "http://github.com/alpmestan/hspec-attoparsec";
-    description = "Utility functions for testing your attoparsec parsers with hspec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-checkers/default.nix b/pkgs/development/libraries/haskell/hspec-checkers/default.nix
deleted file mode 100644
index 7e5022e19b53..000000000000
--- a/pkgs/development/libraries/haskell/hspec-checkers/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, checkers, hspec }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-checkers";
-  version = "0.1.0";
-  sha256 = "043qzgjp9ch9wqm269dd87jn8wk5c90q25098hnz8ilv5pnywk6d";
-  buildDepends = [ checkers hspec ];
-  testDepends = [ checkers hspec ];
-  meta = {
-    description = "Allows to use checkers properties from hspec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-contrib/default.nix b/pkgs/development/libraries/haskell/hspec-contrib/default.nix
deleted file mode 100644
index 53f94edc793d..000000000000
--- a/pkgs/development/libraries/haskell/hspec-contrib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecCore, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-contrib";
-  version = "0.2.0";
-  sha256 = "0p6jh3j84cq66gfp2pk957ha4ds7797vfbfri9lsg9gd4998dwkq";
-  buildDepends = [ hspecCore HUnit ];
-  testDepends = [ hspec hspecCore HUnit QuickCheck ];
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "Contributed functionality for Hspec";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix
deleted file mode 100644
index 313153c55c03..000000000000
--- a/pkgs/development/libraries/haskell/hspec-core/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, async, deepseq, hspecExpectations, hspecMeta
-, HUnit, QuickCheck, quickcheckIo, random, setenv, silently
-, tfRandom, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-core";
-  version = "2.1.2";
-  sha256 = "1mvsfr175g5dbk1xz48d0p4lv4gvv4z3ss3n2s7d2h83i25bmjvh";
-  buildDepends = [
-    ansiTerminal async deepseq hspecExpectations HUnit QuickCheck
-    quickcheckIo random setenv tfRandom time transformers
-  ];
-  testDepends = [
-    ansiTerminal async deepseq hspecExpectations hspecMeta HUnit
-    QuickCheck quickcheckIo random setenv silently tfRandom time
-    transformers
-  ];
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "A Testing Framework for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix
deleted file mode 100644
index 8a4a79eae97f..000000000000
--- a/pkgs/development/libraries/haskell/hspec-discover/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hspecMeta }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-discover";
-  version = "2.1.2";
-  sha256 = "0zv215br94agvg8dbz0f5az5cahgnw8gdx0z84zlrpjxkzf3rb19";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath ];
-  testDepends = [ filepath hspecMeta ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "Automatically discover and run Hspec tests";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix
deleted file mode 100644
index 12ac56702df8..000000000000
--- a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecExpectations, HUnit, lens, silently }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-expectations-lens";
-  version = "0.3.0.0";
-  sha256 = "1v6j4z3gv41jlhbi8ngx7h6d78l1fazvd3bw3c67zsnlgqrvl1x5";
-  buildDepends = [ hspec hspecExpectations HUnit lens ];
-  testDepends = [ hspec lens silently ];
-  meta = {
-    homepage = "http://supki.github.io/hspec-expectations-lens/";
-    description = "Hspec expectations for the lens stuff";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
deleted file mode 100644
index a1267254f1a7..000000000000
--- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, markdownUnlit, silently }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-expectations";
-  version = "0.6.1";
-  sha256 = "0rr1dn39daxi4kqnbz3k21slxpscz939bx16161rr1zp4v7m1lzj";
-  buildDepends = [ HUnit ];
-  testDepends = [ hspec HUnit markdownUnlit silently ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/sol/hspec-expectations#readme";
-    description = "Catchy combinators for HUnit";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-laws/default.nix b/pkgs/development/libraries/haskell/hspec-laws/default.nix
deleted file mode 100644
index b7b2a57d5342..000000000000
--- a/pkgs/development/libraries/haskell/hspec-laws/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, markdownUnlit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-laws";
-  version = "0.0.0";
-  sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j";
-  buildDepends = [ hspec QuickCheck ];
-  testDepends = [ hspec markdownUnlit QuickCheck ];
-  meta = {
-    description = "Document and test laws for standard type classes";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
deleted file mode 100644
index 8a10a3001460..000000000000
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations
-, HUnit, QuickCheck, quickcheckIo, random, setenv, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-meta";
-  version = "2.0.0";
-  sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal async deepseq filepath hspecExpectations HUnit
-    QuickCheck quickcheckIo random setenv time transformers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "A version of Hspec which is used to test Hspec itself";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix
deleted file mode 100644
index cb817c6df43e..000000000000
--- a/pkgs/development/libraries/haskell/hspec-wai/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, hspec, hspecCore, hspecExpectations
-, httpTypes, QuickCheck, text, transformers, wai, waiExtra
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-wai";
-  version = "0.6.2";
-  sha256 = "0nia4hz41g4264mn4s5j8dn9dh0xhdf1gym92wvjmy43rhj3qpzb";
-  buildDepends = [
-    caseInsensitive hspecCore hspecExpectations httpTypes text
-    transformers wai waiExtra
-  ];
-  testDepends = [
-    caseInsensitive hspec hspecCore hspecExpectations httpTypes
-    QuickCheck text transformers wai waiExtra
-  ];
-  meta = {
-    description = "Experimental Hspec support for testing WAI applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
deleted file mode 100644
index 8f8b66b39d32..000000000000
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta
-, HUnit, QuickCheck, stringbuilder, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hspec";
-  version = "2.1.2";
-  sha256 = "04n34g7gbmbkyqzp9by4qdcf87m1gasmc2hnm8i0dqpcnssv05py";
-  buildDepends = [
-    hspecCore hspecDiscover hspecExpectations HUnit QuickCheck
-    transformers
-  ];
-  testDepends = [ hspecCore hspecMeta stringbuilder ];
-  doCheck = false;
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "A Testing Framework for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix
deleted file mode 100644
index c6f64c92182c..000000000000
--- a/pkgs/development/libraries/haskell/hspec2/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecDiscover }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec2";
-  version = "0.6.1";
-  sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
-  buildDepends = [ hspec hspecDiscover ];
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "Alpha version of Hspec 2.0";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix
deleted file mode 100644
index 975fcb784d81..000000000000
--- a/pkgs/development/libraries/haskell/hspread/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, extensibleExceptions, network }:
-
-cabal.mkDerivation (self: {
-  pname = "hspread";
-  version = "0.3.3";
-  sha256 = "6e8a9ecc1a6b1cc767aa188e2f4c04b77b321fd14000cac8f71dd6a7b82afbfc";
-  buildDepends = [ binary extensibleExceptions network ];
-  meta = {
-    description = "A client library for the spread toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsshellscript/default.nix b/pkgs/development/libraries/haskell/hsshellscript/default.nix
deleted file mode 100644
index 221d3079d2be..000000000000
--- a/pkgs/development/libraries/haskell/hsshellscript/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, parsec, random }:
-
-cabal.mkDerivation (self: {
-  pname = "hsshellscript";
-  version = "3.3.2";
-  sha256 = "0rc78yx82gy7a3dxl1mn9hrj1cqhq51zq6w4nf11rzgn6106zdln";
-  buildDepends = [ parsec random ];
-  buildTools = [ c2hs ];
-  meta = {
-    homepage = "http://www.volker-wysk.de/hsshellscript/";
-    description = "Haskell for Unix shell scripting tasks";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hstatsd/default.nix b/pkgs/development/libraries/haskell/hstatsd/default.nix
deleted file mode 100644
index d19d7b388292..000000000000
--- a/pkgs/development/libraries/haskell/hstatsd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hstatsd";
-  version = "0.1";
-  sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4";
-  buildDepends = [ mtl network text ];
-  meta = {
-    homepage = "https://github.com/mokus0/hstatsd";
-    description = "Quick and dirty statsd interface";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
deleted file mode 100644
index 89bd035eaf10..000000000000
--- a/pkgs/development/libraries/haskell/hsyslog/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest }:
-
-cabal.mkDerivation (self: {
-  pname = "hsyslog";
-  version = "2.0";
-  sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq";
-  testDepends = [ doctest ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "http://github.com/peti/hsyslog";
-    description = "FFI interface to syslog(3) from POSIX.1-2001";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
deleted file mode 100644
index f45fa6bb5346..000000000000
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, hspec, HUnit, resourcet
-, systemFilepath, tagstreamConduit, text, transformers, xmlConduit
-, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "html-conduit";
-  version = "1.1.1.1";
-  sha256 = "1bsr0fsy7k606m477c4rxdh7j71nyrp86f1lg9wlwnbm31vrhw00";
-  buildDepends = [
-    conduit conduitExtra resourcet systemFilepath tagstreamConduit text
-    transformers xmlConduit xmlTypes
-  ];
-  testDepends = [ hspec HUnit xmlConduit ];
-  meta = {
-    homepage = "https://github.com/snoyberg/xml";
-    description = "Parse HTML documents using xml-conduit datatypes";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/html/default.nix b/pkgs/development/libraries/haskell/html/default.nix
deleted file mode 100644
index a06b1422bc32..000000000000
--- a/pkgs/development/libraries/haskell/html/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "html";
-  version = "1.0.1.2";
-  sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061";
-  meta = {
-    description = "HTML combinator library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-attoparsec/default.nix b/pkgs/development/libraries/haskell/http-attoparsec/default.nix
deleted file mode 100644
index 233d268e24a7..000000000000
--- a/pkgs/development/libraries/haskell/http-attoparsec/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, httpTypes }:
-
-cabal.mkDerivation (self: {
-  pname = "http-attoparsec";
-  version = "0.1.1";
-  sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
-  buildDepends = [ attoparsec httpTypes ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/tlaitinen/http-attoparsec";
-    description = "Attoparsec parsers for http-types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
deleted file mode 100644
index 60c7b3c68506..000000000000
--- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpClient }:
-
-cabal.mkDerivation (self: {
-  pname = "http-client-conduit";
-  version = "0.3.0";
-  sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19";
-  buildDepends = [ httpClient ];
-  noHaddock = true;
-  meta = {
-    homepage = "https://github.com/snoyberg/http-client";
-    description = "Frontend support for using http-client with conduit (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
deleted file mode 100644
index 1e51404ebb0c..000000000000
--- a/pkgs/development/libraries/haskell/http-client-multipart/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpClient }:
-
-cabal.mkDerivation (self: {
-  pname = "http-client-multipart";
-  version = "0.3.0.0";
-  sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg";
-  buildDepends = [ httpClient ];
-  noHaddock = true;
-  meta = {
-    homepage = "https://github.com/snoyberg/http-client";
-    description = "Generate multipart uploads for http-client. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
deleted file mode 100644
index ca4dbbe1085c..000000000000
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, connection, dataDefaultClass, hspec, httpClient, httpTypes
-, network, tls
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-client-tls";
-  version = "0.2.2";
-  sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5";
-  buildDepends = [
-    connection dataDefaultClass httpClient network tls
-  ];
-  testDepends = [ hspec httpClient httpTypes ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/snoyberg/http-client";
-    description = "http-client backend using the connection package and tls library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
deleted file mode 100644
index 9ab96c6dfe87..000000000000
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, base64Bytestring, blazeBuilder, caseInsensitive
-, cookie, dataDefaultClass, deepseq, exceptions, filepath, hspec
-, httpTypes, mimeTypes, monadControl, network, networkUri
-, publicsuffixlist, random, streamingCommons, text, time
-, transformers, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-client";
-  version = "0.4.6";
-  sha256 = "0zv1jncacwxxk8dj1jlicjdlfhxigpl23frq2vrp4w76d1lsa0d8";
-  buildDepends = [
-    base64Bytestring blazeBuilder caseInsensitive cookie
-    dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
-    network networkUri publicsuffixlist random streamingCommons text
-    time transformers
-  ];
-  testDepends = [
-    async base64Bytestring blazeBuilder caseInsensitive deepseq hspec
-    httpTypes monadControl network streamingCommons text time
-    transformers zlib
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/snoyberg/http-client";
-    description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-common/default.nix b/pkgs/development/libraries/haskell/http-common/default.nix
deleted file mode 100644
index 61c76e55842b..000000000000
--- a/pkgs/development/libraries/haskell/http-common/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, caseInsensitive, mtl
-, network, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-common";
-  version = "0.7.2.0";
-  sha256 = "0w83qz35aaxc2k3qqpamh8anqxr7w3vym5qh40w1a8n4x00pm960";
-  buildDepends = [
-    base64Bytestring blazeBuilder caseInsensitive mtl network text
-    transformers unorderedContainers
-  ];
-  meta = {
-    homepage = "http://research.operationaldynamics.com/projects/http-streams/";
-    description = "Common types for HTTP clients and servers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
deleted file mode 100644
index bb5dc9f7505d..000000000000
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, caseInsensitive, conduit, conduitExtra
-, connection, cookie, dataDefaultClass, hspec, httpClient
-, httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl
-, network, resourcet, streamingCommons, text, time, transformers
-, utf8String, wai, waiConduit, warp, warpTls
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-conduit";
-  version = "2.1.5";
-  sha256 = "0vk2an6h3h7a5klk9xrf3apfm6xdmqm418yrr7pb56b7w5sfq003";
-  buildDepends = [
-    conduit httpClient httpClientTls httpTypes liftedBase monadControl
-    mtl resourcet transformers
-  ];
-  testDepends = [
-    blazeBuilder caseInsensitive conduit conduitExtra connection cookie
-    dataDefaultClass hspec httpClient httpTypes HUnit liftedBase
-    network streamingCommons text time transformers utf8String wai
-    waiConduit warp warpTls
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/http-conduit";
-    description = "HTTP client package with conduit interface and HTTPS support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
deleted file mode 100644
index 4c1e149225f1..000000000000
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, doctest, hspec, time }:
-
-cabal.mkDerivation (self: {
-  pname = "http-date";
-  version = "0.0.4";
-  sha256 = "1pbm066i1cpa3z2kfsqpva0qixnx87s76dpafz3wf6dkaqj8n8i5";
-  buildDepends = [ attoparsec ];
-  testDepends = [ doctest hspec time ];
-  meta = {
-    description = "HTTP Date parser/formatter";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix
deleted file mode 100644
index 63d6d68745cf..000000000000
--- a/pkgs/development/libraries/haskell/http-kit/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, hspec, httpTypes, QuickCheck
-, quickcheckInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-kit";
-  version = "0.5.1";
-  sha256 = "1swnvsbaabk946pys9q9kr0bgdvalnznd59dw981sg7cywqdcz28";
-  buildDepends = [ caseInsensitive httpTypes ];
-  testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ];
-  meta = {
-    description = "A low-level HTTP library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
deleted file mode 100644
index 61f4d91d5cc6..000000000000
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, blazeBuilder, caseInsensitive, conduit
-, conduitExtra, dataDefaultClass, hspec, httpClient, httpConduit
-, httpTypes, liftedBase, monadControl, network, resourcet
-, streamingCommons, text, transformers, wai, waiLogger, warp, word8
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-reverse-proxy";
-  version = "0.4.1.2";
-  sha256 = "1gggn5l08g7mxbka0h7h8w687y3awbm19395fi6wvis76isyz8wy";
-  buildDepends = [
-    async blazeBuilder caseInsensitive conduit conduitExtra
-    dataDefaultClass httpClient httpTypes liftedBase monadControl
-    network resourcet streamingCommons text transformers wai waiLogger
-    word8
-  ];
-  testDepends = [
-    blazeBuilder conduit conduitExtra hspec httpConduit httpTypes
-    liftedBase network resourcet streamingCommons transformers wai warp
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fpco/http-reverse-proxy";
-    description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-streams/default.nix b/pkgs/development/libraries/haskell/http-streams/default.nix
deleted file mode 100644
index ec993a8b2a51..000000000000
--- a/pkgs/development/libraries/haskell/http-streams/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring
-, blazeBuilder, caseInsensitive, HsOpenSSL, hspec
-, hspecExpectations, httpCommon, HUnit, ioStreams
-, MonadCatchIOTransformers, mtl, network, networkUri
-, opensslStreams, snapCore, snapServer, systemFileio
-, systemFilepath, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-streams";
-  version = "0.7.2.4";
-  sha256 = "1hs2d5qiq5vq6qjxxx061w1iigr05chkv28xvlvxfz0wc7nlipzz";
-  buildDepends = [
-    aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
-    HsOpenSSL httpCommon ioStreams mtl network networkUri
-    opensslStreams text transformers unorderedContainers
-  ];
-  testDepends = [
-    aeson aesonPretty attoparsec base64Bytestring blazeBuilder
-    caseInsensitive HsOpenSSL hspec hspecExpectations httpCommon HUnit
-    ioStreams MonadCatchIOTransformers mtl network networkUri
-    opensslStreams snapCore snapServer systemFileio systemFilepath text
-    transformers unorderedContainers
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://research.operationaldynamics.com/projects/http-streams/";
-    description = "An HTTP client using io-streams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
deleted file mode 100644
index f07cb5581f89..000000000000
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, caseInsensitive, doctest, hspec, QuickCheck
-, quickcheckInstances, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-types";
-  version = "0.8.6";
-  sha256 = "1q1ni88rs8d79xnk1x2jaf3848ygxlfhpvv4gw46k08lw29ihfxh";
-  buildDepends = [ blazeBuilder caseInsensitive text ];
-  testDepends = [
-    blazeBuilder doctest hspec QuickCheck quickcheckInstances text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/aristidb/http-types";
-    description = "Generic HTTP types for Haskell (for both client and server code)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
deleted file mode 100644
index 4a4334be7328..000000000000
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, networkUri }:
-
-cabal.mkDerivation (self: {
-  pname = "httpd-shed";
-  version = "0.4.0.3";
-  sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ network networkUri ];
-  jailbreak = true;
-  meta = {
-    description = "A simple web-server with an interact style API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix
deleted file mode 100644
index 1d7d17085dc3..000000000000
--- a/pkgs/development/libraries/haskell/hweblib/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, HUnit, mtl, text, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "hweblib";
-  version = "0.6.3";
-  sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy";
-  buildDepends = [ attoparsec mtl text transformers ];
-  testDepends = [ attoparsec HUnit mtl transformers ];
-  meta = {
-    homepage = "http://github.com/aycanirican/hweblib";
-    description = "Haskell Web Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
deleted file mode 100644
index 45885432767f..000000000000
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-charproperties";
-  version = "9.2.0.0";
-  sha256 = "01v3j0cg9pkp18iy4s8s582qqq98r4l9jzr84x5sa2rva4cg0gpi";
-  meta = {
-    homepage = "https://github.com/UweSchmidt/hxt";
-    description = "Character properties and classes for XML and Unicode";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-http/default.nix b/pkgs/development/libraries/haskell/hxt-http/default.nix
deleted file mode 100644
index a351b68d3d4a..000000000000
--- a/pkgs/development/libraries/haskell/hxt-http/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP, hxt, network, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-http";
-  version = "9.1.5";
-  sha256 = "172y08zx9q4qvdi7k9hg9qahp6qjs24r663il6fmynaw7szsiib9";
-  buildDepends = [ HTTP hxt network parsec ];
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "Interface to native Haskell HTTP package HTTP";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
deleted file mode 100644
index 6ebb0ba0d89f..000000000000
--- a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hxt, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-pickle-utils";
-  version = "0.1.0.2";
-  sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2";
-  buildDepends = [ hxt mtl ];
-  meta = {
-    homepage = "https://github.com/silkapp/hxt-pickle-utils";
-    description = "Utility functions for using HXT picklers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
deleted file mode 100644
index 71d6765f93f3..000000000000
--- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, hxtCharproperties, parsec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-regex-xmlschema";
-  version = "9.2.0";
-  sha256 = "0pcbyvc71173ad0zkgpdpyyljngrk4p1jjjaw5wbwcvm4ijh44g3";
-  buildDepends = [ hxtCharproperties parsec text ];
-  testDepends = [ HUnit parsec text ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
-    description = "A regular expression library for W3C XML Schema regular expressions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix b/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix
deleted file mode 100644
index efbbb3b4e4bd..000000000000
--- a/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hxt, hxtCharproperties, hxtUnicode, tagsoup }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-tagsoup";
-  version = "9.1.3";
-  sha256 = "1rp499j6w3h9xfxqyw2fn05ffq3z0wg1r9h2c205m37mb8visq77";
-  buildDepends = [ hxt hxtCharproperties hxtUnicode tagsoup ];
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "TagSoup parser for HXT";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
deleted file mode 100644
index 777d4315f52f..000000000000
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hxtCharproperties }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-unicode";
-  version = "9.0.2.2";
-  sha256 = "1iljbk7f7d4wkl592bp0vw807683sqdxfnigindkrvr9p1xvwg8r";
-  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 = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-xpath/default.nix b/pkgs/development/libraries/haskell/hxt-xpath/default.nix
deleted file mode 100644
index 9176d0858598..000000000000
--- a/pkgs/development/libraries/haskell/hxt-xpath/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hxt, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-xpath";
-  version = "9.1.2.1";
-  sha256 = "0r9xzxwdqaj0arz9pv6f272dz73m83agbln9q9bclmgqys6l0kr9";
-  buildDepends = [ filepath hxt parsec ];
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "The XPath modules for HXT";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
deleted file mode 100644
index db2badaaaf22..000000000000
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, filepath, HUnit, hxtCharproperties
-, hxtRegexXmlschema, hxtUnicode, mtl, networkUri, parsec
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hxt";
-  version = "9.3.1.7";
-  sha256 = "1dgdq2l9k8v36iahmkxxjmmv955f9gv6lq09nsah9zcscsgm0v2i";
-  buildDepends = [
-    binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
-    hxtUnicode mtl networkUri parsec
-  ];
-  configureFlags = "-fnetwork-uri";
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "A collection of tools for processing XML with Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
deleted file mode 100644
index ccbc4ed7b114..000000000000
--- a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, primitive, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "hybrid-vectors";
-  version = "0.1.2";
-  sha256 = "1scx1xr9rqdpxc1kj5zgf8w1ld1mj68hxr3nl1p352wspvpgd3qf";
-  buildDepends = [ deepseq primitive vector ];
-  meta = {
-    homepage = "http://github.com/ekmett/hybrid-vectors";
-    description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix
deleted file mode 100644
index 734c7587aa9f..000000000000
--- a/pkgs/development/libraries/haskell/iCalendar/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl
-, network, networkUri, parsec, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "iCalendar";
-  version = "0.4.0.2";
-  sha256 = "0a6kj6ih8dpzvld7hjvjp6gcf4f2y81x6bx17z6wgzwdj9fv7jry";
-  buildDepends = [
-    base64Bytestring caseInsensitive dataDefault mime mtl network
-    networkUri parsec text time
-  ];
-  meta = {
-    homepage = "http://github.com/tingtun/iCalendar";
-    description = "iCalendar data types, parser, and printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix
deleted file mode 100644
index a3b1144755de..000000000000
--- a/pkgs/development/libraries/haskell/idna/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, punycode, stringprep, text }:
-
-cabal.mkDerivation (self: {
-  pname = "idna";
-  version = "0.3.0";
-  sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp";
-  buildDepends = [ punycode stringprep text ];
-  meta = {
-    description = "Implements IDNA (RFC 3490)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix
deleted file mode 100644
index de0ce49c83eb..000000000000
--- a/pkgs/development/libraries/haskell/ieee754/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ieee754";
-  version = "0.7.4";
-  sha256 = "1pxbkfa21mvc869n18nn7r29hcinxdbsnk68nlldzld8f6m13g1h";
-  meta = {
-    homepage = "http://github.com/patperry/hs-ieee754";
-    description = "Utilities for dealing with IEEE floating point numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix
deleted file mode 100644
index e21c596fa2fd..000000000000
--- a/pkgs/development/libraries/haskell/imm/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, caseInsensitive, cond, dataDefault, dyre, feed
-, filepath, hslogger, httpConduit, httpTypes, lens, mimeMail
-, monadControl, mtl, network, networkUri, opml, random, resourcet
-, text, textIcu, time, timerep, tls, transformers, transformersBase
-, utf8String, xdgBasedir, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "imm";
-  version = "0.6.0.3";
-  sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    async caseInsensitive cond dataDefault dyre feed filepath hslogger
-    httpConduit httpTypes lens mimeMail monadControl mtl network
-    networkUri opml random resourcet text textIcu time timerep tls
-    transformers transformersBase utf8String xdgBasedir xml
-  ];
-  meta = {
-    description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/implicit/default.nix b/pkgs/development/libraries/haskell/implicit/default.nix
deleted file mode 100644
index 81331833cc48..000000000000
--- a/pkgs/development/libraries/haskell/implicit/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, blazeMarkup, blazeSvg, deepseq, filepath
-, JuicyPixels, mtl, optparseApplicative, parallel, parsec
-, storableEndian, text, unorderedContainers, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "implicit";
-  version = "0.0.3";
-  sha256 = "0zsd25gd0c4sp1ipjnsbn1gbdl6s0y2vy8n4nwn3dxgrv75cd1l9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeBuilder blazeMarkup blazeSvg deepseq filepath JuicyPixels mtl
-    optparseApplicative parallel parsec storableEndian text
-    unorderedContainers vectorSpace
-  ];
-  meta = {
-    homepage = "https://github.com/colah/ImplicitCAD";
-    description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/indents/default.nix b/pkgs/development/libraries/haskell/indents/default.nix
deleted file mode 100644
index 111268cc9f3f..000000000000
--- a/pkgs/development/libraries/haskell/indents/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, concatenative, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "indents";
-  version = "0.3.3";
-  sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
-  buildDepends = [ concatenative mtl parsec ];
-  meta = {
-    homepage = "http://patch-tag.com/r/salazar/indents";
-    description = "indentation sensitive parser-combinators for parsec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/indexed-free/default.nix b/pkgs/development/libraries/haskell/indexed-free/default.nix
deleted file mode 100644
index 23d2cedaa656..000000000000
--- a/pkgs/development/libraries/haskell/indexed-free/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, indexed }:
-
-cabal.mkDerivation (self: {
-  pname = "indexed-free";
-  version = "0.3.1";
-  sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx";
-  buildDepends = [ indexed ];
-  meta = {
-    homepage = "https://github.com/fumieval/indexed-free";
-    description = "indexed monads for free";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/indexed/default.nix b/pkgs/development/libraries/haskell/indexed/default.nix
deleted file mode 100644
index f38468a834dc..000000000000
--- a/pkgs/development/libraries/haskell/indexed/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "indexed";
-  version = "0.1";
-  sha256 = "1dx5pyi5psjd2l26hc3wfsapnywdl0kqpw98b3jwc0xq4406ax12";
-  meta = {
-    homepage = "https://github.com/reinerp/indexed";
-    description = "Haskell98 indexed functors, monads, comonads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
deleted file mode 100644
index ecb9321686c4..000000000000
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "instant-generics";
-  version = "0.4.1";
-  sha256 = "1jcs6spa3g8mazgpivn61gz4c740ks19rkz9sh24ns6n4q53zdvq";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
-    description = "Generic programming library with a sum of products view";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/interlude/default.nix b/pkgs/development/libraries/haskell/interlude/default.nix
deleted file mode 100644
index c4c0ae2a1df3..000000000000
--- a/pkgs/development/libraries/haskell/interlude/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "interlude";
-  version = "0.1.2";
-  sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s";
-  meta = {
-    homepage = "http://malde.org/~ketil/";
-    description = "Replaces some Prelude functions for enhanced error reporting";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/intern/default.nix b/pkgs/development/libraries/haskell/intern/default.nix
deleted file mode 100644
index 7dddb5b5f88d..000000000000
--- a/pkgs/development/libraries/haskell/intern/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, text, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "intern";
-  version = "0.9.1.3";
-  sha256 = "1629m3an18m3nqxq40mg9cn0c6rma1wm3jr7kn6kqpw4xq53zvvp";
-  buildDepends = [ hashable text unorderedContainers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/intern/";
-    description = "Efficient hash-consing for arbitrary data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix
deleted file mode 100644
index cc62218a928d..000000000000
--- a/pkgs/development/libraries/haskell/interpolate/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcMeta, hspec, QuickCheck, quickcheckInstances
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "interpolate";
-  version = "0.1.0";
-  sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id";
-  buildDepends = [ haskellSrcMeta ];
-  testDepends = [
-    haskellSrcMeta hspec QuickCheck quickcheckInstances text
-  ];
-  meta = {
-    description = "String interpolation done right";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
deleted file mode 100644
index b24a79e62d98..000000000000
--- a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcMeta, text }:
-
-cabal.mkDerivation (self: {
-  pname = "interpolatedstring-perl6";
-  version = "0.9.0";
-  sha256 = "15hzmni3wfdgjl0vyk5mcld61ba99wdax87s7wkz2s8bsyxkbq9n";
-  buildDepends = [ haskellSrcMeta text ];
-  meta = {
-    description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
deleted file mode 100644
index 8c552654bac0..000000000000
--- a/pkgs/development/libraries/haskell/intervals/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, distributive, doctest, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "intervals";
-  version = "0.7.0.1";
-  sha256 = "02qb44ga2yfsymkfixy3fdp943r2flwrsaqhb0pjddr3ixzm4ap9";
-  buildDepends = [ distributive ];
-  testDepends = [ doctest filepath ];
-  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/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix
deleted file mode 100644
index 1b145c943dc0..000000000000
--- a/pkgs/development/libraries/haskell/io-choice/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, liftedBase, monadControl, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "io-choice";
-  version = "0.0.5";
-  sha256 = "19nr8kxcg98510cqgjn4c9sd8i9yz8fv4ryqg6lzzgpwqzkvx5ph";
-  buildDepends = [
-    liftedBase monadControl transformers transformersBase
-  ];
-  testDepends = [ hspec liftedBase monadControl transformers ];
-  meta = {
-    description = "Choice for IO and lifted IO";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix
deleted file mode 100644
index 625d689cd40d..000000000000
--- a/pkgs/development/libraries/haskell/io-memoize/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async }:
-
-cabal.mkDerivation (self: {
-  pname = "io-memoize";
-  version = "1.1.1.0";
-  sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7";
-  buildDepends = [ async ];
-  meta = {
-    homepage = "https://github.com/DanBurton/io-memoize";
-    description = "Memoize IO actions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix
deleted file mode 100644
index 2e944b775865..000000000000
--- a/pkgs/development/libraries/haskell/io-storage/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "io-storage";
-  version = "0.3";
-  sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
-  meta = {
-    homepage = "http://github.com/willdonnelly/io-storage";
-    description = "A key-value store in the IO monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix
deleted file mode 100644
index 3963add1825e..000000000000
--- a/pkgs/development/libraries/haskell/io-streams/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, filepath, HUnit, mtl
-, network, primitive, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, time, transformers, vector, zlib
-, zlibBindings
-}:
-
-cabal.mkDerivation (self: {
-  pname = "io-streams";
-  version = "1.2.1.1";
-  sha256 = "1pvrscyw7wcv910p8d9j4a9jdm0vm7m74g5kgzpc5hnxdfibhqj1";
-  buildDepends = [
-    attoparsec blazeBuilder network primitive text time transformers
-    vector zlibBindings
-  ];
-  testDepends = [
-    attoparsec blazeBuilder deepseq filepath HUnit mtl network
-    primitive QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time transformers vector zlib
-    zlibBindings
-  ];
-  configureFlags = "-fNoInteractiveTests";
-  meta = {
-    description = "Simple, composable, and easy-to-use stream I/O";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ipprint/default.nix b/pkgs/development/libraries/haskell/ipprint/default.nix
deleted file mode 100644
index 004b504577a1..000000000000
--- a/pkgs/development/libraries/haskell/ipprint/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Extra, haskellSrc }:
-
-cabal.mkDerivation (self: {
-  pname = "ipprint";
-  version = "0.5";
-  sha256 = "0h75k21blbnzvp5l20qsima557dx6zfrww79y7qsqf04pbd81j7s";
-  buildDepends = [ Extra haskellSrc ];
-  meta = {
-    description = "Tiny helper for pretty-printing values in ghci console";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-
-    # Works For Me. GHC 7.8.4, 2015-01-08 
-    #broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix
deleted file mode 100644
index cfb05b9f0948..000000000000
--- a/pkgs/development/libraries/haskell/iproute/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, appar, byteorder, doctest, hspec, network, QuickCheck
-, safe
-}:
-
-cabal.mkDerivation (self: {
-  pname = "iproute";
-  version = "1.3.1";
-  sha256 = "1l3asv8q1jiwsvpq6kkigrzpm3pjbm03gpc4rbhn6kpi6z9h8cdp";
-  buildDepends = [ appar byteorder network ];
-  testDepends = [
-    appar byteorder doctest hspec network QuickCheck safe
-  ];
-  meta = {
-    homepage = "http://www.mew.org/~kazu/proj/iproute/";
-    description = "IP Routing Table";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
deleted file mode 100644
index d7c101c27fb3..000000000000
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec }:
-
-cabal.mkDerivation (self: {
-  pname = "irc";
-  version = "0.6.0.1";
-  sha256 = "0524phrxjv0i5qabrf4sj0zpcvkdvcivv1lg46591pmvndfhpyn4";
-  buildDepends = [ attoparsec ];
-  meta = {
-    description = "A small library for parsing IRC messages";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
deleted file mode 100644
index b0dd47468d9d..000000000000
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, HUnit, ListLike, monadControl, mtl, parallel
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "iteratee";
-  version = "0.8.9.6";
-  sha256 = "1yc5fqqb8warvgld3cymka7d2wmjydvfin5jy7zaazb7alf14q1p";
-  buildDepends = [
-    exceptions ListLike monadControl parallel transformers
-    transformersBase
-  ];
-  testDepends = [
-    exceptions HUnit ListLike monadControl mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 transformers
-    transformersBase
-  ];
-  meta = {
-    homepage = "http://www.tiresiaspress.us/haskell/iteratee";
-    description = "Iteratee-based I/O";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix
deleted file mode 100644
index 7a80a14853ec..000000000000
--- a/pkgs/development/libraries/haskell/ivor/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "ivor";
-  version = "0.1.14.1";
-  sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych";
-  buildDepends = [ binary mtl parsec ];
-  meta = {
-    homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/";
-    description = "Theorem proving library based on dependent type theory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ivory/default.nix b/pkgs/development/libraries/haskell/ivory/default.nix
deleted file mode 100644
index 3e3c6c78ae1d..000000000000
--- a/pkgs/development/libraries/haskell/ivory/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadLib, parsec, thLift }:
-
-cabal.mkDerivation (self: {
-  pname = "ivory";
-  version = "0.1.0.0";
-  sha256 = "1rn1akrsci0k5nbk4zipxznkdm0y3rvv9la5mnrr9mkj5zikj5sc";
-  buildDepends = [ monadLib parsec thLift ];
-  meta = {
-    homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
-    description = "Safe embedded C programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ix-shapable/default.nix b/pkgs/development/libraries/haskell/ix-shapable/default.nix
deleted file mode 100644
index 965257832e08..000000000000
--- a/pkgs/development/libraries/haskell/ix-shapable/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ix-shapable";
-  version = "0.1.0";
-  sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh";
-  meta = {
-    description = "Reshape multi-dimensional arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix
deleted file mode 100644
index 24bbde7098d4..000000000000
--- a/pkgs/development/libraries/haskell/ixset/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, safecopy, syb, sybWithClass }:
-
-cabal.mkDerivation (self: {
-  pname = "ixset";
-  version = "1.0.6";
-  sha256 = "097f9fkm9a2n67bzagr9h2v7acdn8h1ayv9c83n7nv1dh157bpyv";
-  buildDepends = [ safecopy syb sybWithClass ];
-  meta = {
-    homepage = "http://happstack.com";
-    description = "Efficient relational queries on Haskell sets";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix
deleted file mode 100644
index 1abb8fd38472..000000000000
--- a/pkgs/development/libraries/haskell/jack/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enumset, eventList, explicitException, jack2, midi
-, nonNegative, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jack";
-  version = "0.7.0.3";
-  sha256 = "12ap7xcgzmp5zwmqkwsgxplh5li21m7xngijr4mhnn9y33xc1lrk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    enumset eventList explicitException midi nonNegative transformers
-  ];
-  pkgconfigDepends = [ jack2 ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/JACK";
-    description = "Bindings for the JACK Audio Connection Kit";
-    license = "GPL";
-    platforms = self.stdenv.lib.platforms.linux;
-    maintainers = with self.stdenv.lib.maintainers; [ ertes ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
deleted file mode 100644
index 28498da53d65..000000000000
--- a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, happstackServer, jmacro, jmacroRpc, mtl
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jmacro-rpc-happstack";
-  version = "0.3";
-  sha256 = "0z24iqq0nmvm4x4fz4vl1rsccqnaynhmza502im967y7lials9wa";
-  buildDepends = [
-    aeson blazeHtml happstackServer jmacro jmacroRpc mtl
-  ];
-  meta = {
-    homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
-    description = "Happstack backend for jmacro-rpc";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
deleted file mode 100644
index 2ad9bd83d755..000000000000
--- a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, jmacro, jmacroRpc, mtl, snapCore }:
-
-cabal.mkDerivation (self: {
-  pname = "jmacro-rpc-snap";
-  version = "0.3";
-  sha256 = "1syzx2lw4r8knsqhsvilp04wb8a718379cmn0nhjqlwhpaja9bj8";
-  buildDepends = [ aeson jmacro jmacroRpc mtl snapCore ];
-  meta = {
-    homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
-    description = "Snap backend for jmacro-rpc";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
deleted file mode 100644
index ec2c3d8a9602..000000000000
--- a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, blazeHtml, contravariant, jmacro, mtl
-, scientific, split, text, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jmacro-rpc";
-  version = "0.3";
-  sha256 = "1fkcky2f51764xcbbwnxpxyhk2mmnp364hf8njfcjsijanv938zw";
-  buildDepends = [
-    aeson attoparsec blazeHtml contravariant jmacro mtl scientific
-    split text unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://hub.darcs.net/gershomb/jmacro";
-    description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jmacro/default.nix b/pkgs/development/libraries/haskell/jmacro/default.nix
deleted file mode 100644
index 9f2fee5f7daf..000000000000
--- a/pkgs/development/libraries/haskell/jmacro/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, haskellSrcExts, haskellSrcMeta, mtl, parseargs
-, parsec, regexPosix, safe, syb, text, unorderedContainers, vector
-, wlPprintText
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jmacro";
-  version = "0.6.9";
-  sha256 = "1prplflikryw7scz75rbijn4dl1gdi6589yq5902n26xpaigqsp6";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson haskellSrcExts haskellSrcMeta mtl parseargs parsec regexPosix
-    safe syb text unorderedContainers vector wlPprintText
-  ];
-  meta = {
-    description = "QuasiQuotation library for programmatic generation of Javascript code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix
deleted file mode 100644
index c9a408dc2a02..000000000000
--- a/pkgs/development/libraries/haskell/jpeg/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "jpeg";
-  version = "0.0.1.1";
-  sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "A library for decoding JPEG files written in pure Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/js-flot/default.nix b/pkgs/development/libraries/haskell/js-flot/default.nix
deleted file mode 100644
index 3bc570d557d1..000000000000
--- a/pkgs/development/libraries/haskell/js-flot/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP }:
-
-cabal.mkDerivation (self: {
-  pname = "js-flot";
-  version = "0.8.3";
-  sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
-  testDepends = [ HTTP ];
-  meta = {
-    homepage = "https://github.com/ndmitchell/js-flot#readme";
-    description = "Obtain minified flot code";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/js-jquery/default.nix b/pkgs/development/libraries/haskell/js-jquery/default.nix
deleted file mode 100644
index ad776b577f41..000000000000
--- a/pkgs/development/libraries/haskell/js-jquery/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP }:
-
-cabal.mkDerivation (self: {
-  pname = "js-jquery";
-  version = "1.11.1";
-  sha256 = "0k4hrpxsc48nanr2zw6jcirirsarlshycx7d5hzqqv9jfhy1i88d";
-  testDepends = [ HTTP ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/ndmitchell/js-jquery#readme";
-    description = "Obtain minified jQuery code";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix
deleted file mode 100644
index 9a9364d09d0f..000000000000
--- a/pkgs/development/libraries/haskell/json-assertions/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, indexed, indexedFree, lens, lensAeson, text }:
-
-cabal.mkDerivation (self: {
-  pname = "json-assertions";
-  version = "1.0.5";
-  sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck";
-  buildDepends = [ aeson indexed indexedFree lens lensAeson text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ocharles/json-assertions.git";
-    description = "Test that your (Aeson) JSON encoding matches your expectations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/json-rpc/default.nix b/pkgs/development/libraries/haskell/json-rpc/default.nix
deleted file mode 100644
index c7e5c3373c5e..000000000000
--- a/pkgs/development/libraries/haskell/json-rpc/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, conduit, conduitExtra, deepseq, hashable
-, mtl, QuickCheck, stm, stmConduit, testFramework
-, testFrameworkQuickcheck2, text, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "json-rpc";
-  version = "0.2.1.1";
-  sha256 = "0h6dkb1rgd6qxzcxvqvgwilmibkdbqpjvflijwf54fx2z687fjld";
-  buildDepends = [
-    aeson async conduit conduitExtra deepseq hashable mtl stm
-    stmConduit text unorderedContainers
-  ];
-  testDepends = [
-    aeson async conduit conduitExtra deepseq hashable mtl QuickCheck
-    stm stmConduit testFramework testFrameworkQuickcheck2 text
-    unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/xenog/json-rpc";
-    description = "Fully-featured JSON-RPC 2.0 library";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix
deleted file mode 100644
index cd102d358039..000000000000
--- a/pkgs/development/libraries/haskell/json-schema/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonUtils, attoparsec, genericAeson
-, genericDeriving, mtl, scientific, tagged, tasty, tastyHunit
-, tastyTh, text, time, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "json-schema";
-  version = "0.7.3.0";
-  sha256 = "0jdhmzg1is8dnyz46r6w616xq0w1lypc9xz1c2mcimr9xb9r70zw";
-  buildDepends = [
-    aeson genericAeson genericDeriving mtl scientific tagged text time
-    unorderedContainers vector
-  ];
-  testDepends = [
-    aeson aesonUtils attoparsec genericAeson tagged tasty tastyHunit
-    tastyTh text vector
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Types and type classes for defining JSON schemas";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
deleted file mode 100644
index 3eeb6958f837..000000000000
--- a/pkgs/development/libraries/haskell/json/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, syb, text }:
-
-cabal.mkDerivation (self: {
-  pname = "json";
-  version = "0.9";
-  sha256 = "1r37hhhhc97sxqrcijss80c0380f36bh6f2y4navwih7r3a2ci8j";
-  buildDepends = [ mtl parsec syb text ];
-  meta = {
-    description = "Support for serialising Haskell to and from JSON";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix
deleted file mode 100644
index 2c6323f0bc6c..000000000000
--- a/pkgs/development/libraries/haskell/jsonTypes/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "json-types";
-  version = "0.1";
-  sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn";
-  buildDepends = [ text ];
-  meta = {
-    description = "Basic types for representing JSON";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix
deleted file mode 100644
index dfab13e9132d..000000000000
--- a/pkgs/development/libraries/haskell/jwt/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, cryptohash, dataDefault
-, httpTypes, HUnit, lens, lensAeson, network, networkUri
-, QuickCheck, scientific, semigroups, tasty, tastyHunit
-, tastyQuickcheck, tastyTh, text, time, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jwt";
-  version = "0.5.3";
-  sha256 = "1225fa53gghfpgwhr4x269a6kygfj39fh2qdapdi9mrrvlg302i4";
-  buildDepends = [
-    aeson base64Bytestring cryptohash dataDefault httpTypes network
-    networkUri scientific semigroups text time unorderedContainers
-    vector
-  ];
-  testDepends = [
-    aeson base64Bytestring cryptohash dataDefault httpTypes HUnit lens
-    lensAeson network networkUri QuickCheck scientific semigroups tasty
-    tastyHunit tastyQuickcheck tastyTh text time unorderedContainers
-    vector
-  ];
-  meta = {
-    homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
-    description = "JSON Web Token (JWT) decoding and encoding";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix
deleted file mode 100644
index d359cebd6e14..000000000000
--- a/pkgs/development/libraries/haskell/kan-extensions/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, adjunctions, comonad, contravariant, distributive, free
-, mtl, pointed, semigroupoids, tagged, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "kan-extensions";
-  version = "4.1.1";
-  sha256 = "0g7z37c2jvhvq08ynnd5z2spp7w56vqhpg5biscj62rw7fzssnar";
-  buildDepends = [
-    adjunctions comonad contravariant distributive free mtl pointed
-    semigroupoids tagged transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/kan-extensions/";
-    description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/kansas-comet/default.nix b/pkgs/development/libraries/haskell/kansas-comet/default.nix
deleted file mode 100644
index 1c01d567d758..000000000000
--- a/pkgs/development/libraries/haskell/kansas-comet/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, dataDefault, scotty, stm, text, time, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "kansas-comet";
-  version = "0.3.1";
-  sha256 = "0xbapi4clmkighxh0jb12zpzgrz9sqyfpwdkvrj6cdq6i6a22qx1";
-  buildDepends = [
-    aeson dataDefault scotty stm text time transformers
-    unorderedContainers
-  ];
-  meta = {
-    homepage = "https://github.com/ku-fpg/kansas-comet/";
-    description = "A JavaScript push mechanism based on the comet idiom";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/kansas-lava/default.nix b/pkgs/development/libraries/haskell/kansas-lava/default.nix
deleted file mode 100644
index f81f17a3c274..000000000000
--- a/pkgs/development/libraries/haskell/kansas-lava/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, dataDefault, dataReify, dotgen, filepath, netlist
-, netlistToVhdl, random, sizedTypes, strict
-}:
-
-cabal.mkDerivation (self: {
-  pname = "kansas-lava";
-  version = "0.2.4";
-  sha256 = "0rsjlj558k57r1sfm12n9r9wn8r615bbrwgjhal07qhvy4qip4pg";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs dataDefault dataReify dotgen filepath netlist netlistToVhdl
-    random sizedTypes strict
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
-    description = "Kansas Lava is a hardware simulator and VHDL generator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix
deleted file mode 100644
index 196da768e062..000000000000
--- a/pkgs/development/libraries/haskell/keys/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, free, semigroupoids, semigroups, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "keys";
-  version = "3.10.1";
-  sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n";
-  buildDepends = [
-    comonad free semigroupoids semigroups transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/keys/";
-    description = "Keyed functors and containers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/knob/default.nix b/pkgs/development/libraries/haskell/knob/default.nix
deleted file mode 100644
index 7ad084e06b74..000000000000
--- a/pkgs/development/libraries/haskell/knob/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "knob";
-  version = "0.1.1";
-  sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "https://john-millikin.com/software/knob/";
-    description = "Memory-backed handles";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/labeled-tree/default.nix b/pkgs/development/libraries/haskell/labeled-tree/default.nix
deleted file mode 100644
index ef0301ef7739..000000000000
--- a/pkgs/development/libraries/haskell/labeled-tree/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "labeled-tree";
-  version = "1.0.0.0";
-  sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
-  meta = {
-    description = "Labeled tree structure";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
deleted file mode 100644
index 34cf827c0275..000000000000
--- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, haskellSrc, mtl, network, random, regexCompat
-, regexPosix, syb, tagsoup, utf8String, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lambdabot-utils";
-  version = "4.2.2";
-  sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
-  buildDepends = [
-    binary haskellSrc mtl network random regexCompat regexPosix syb
-    tagsoup utf8String zlib
-  ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Lambdabot";
-    description = "Utility libraries for the advanced IRC bot, Lambdabot";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
deleted file mode 100644
index 6b09752f7d46..000000000000
--- a/pkgs/development/libraries/haskell/lambdabot/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, arrows, binary, brainfuck, dataMemocombinators
-, dependentMap, dependentSum, dependentSumTemplate, dice
-, editDistance, filepath, haskeline, haskellSrcExts, hoogle
-, hslogger, hstatsd, HTTP, IOSpec, liftedBase, logict, misfortune
-, monadControl, MonadRandom, mtl, mueval, network, numbers, oeis
-, parsec, QuickCheck, random, randomFu, randomSource, regexTdfa
-, SafeSemaphore, show, split, syb, tagsoup, time, transformers
-, transformersBase, unlambda, utf8String, vectorSpace, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lambdabot";
-  version = "4.3.0.1";
-  sha256 = "19pkm4m2xk9ziai3ka4scxjavi0as8dmivz9q6vg3npmv0kyhkhb";
-  isLibrary = true;
-  isExecutable = true;
-  patches = [ ./deps.patch ];
-  buildDepends = [
-    arrows binary brainfuck dataMemocombinators dependentMap
-    dependentSum dependentSumTemplate dice editDistance filepath
-    haskeline haskellSrcExts hoogle hslogger hstatsd HTTP IOSpec
-    liftedBase logict misfortune monadControl MonadRandom mtl mueval
-    network numbers oeis parsec QuickCheck random randomFu randomSource
-    regexTdfa SafeSemaphore show split syb tagsoup time transformers
-    transformersBase unlambda utf8String vectorSpace zlib
-  ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Lambdabot";
-    description = "Lambdabot is a development tool and advanced IRC bot";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lambdabot/deps.patch b/pkgs/development/libraries/haskell/lambdabot/deps.patch
deleted file mode 100644
index a92228067194..000000000000
--- a/pkgs/development/libraries/haskell/lambdabot/deps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lambdabot.cabal.orig	2014-10-16 17:39:16.000000000 -0500
-+++ b/lambdabot.cabal	2014-10-16 18:26:58.000000000 -0500
-@@ -166,7 +166,7 @@
-                         edit-distance           >= 0.2,
-                         filepath                >= 1.3,
-                         haskeline               >= 0.7,
--                        haskell-src-exts        >= 1.14.0,
-+                        haskell-src-exts        >= 1.14.0 && < 1.16,
-                         hstatsd                 >= 0.1,
-                         hslogger                >= 1.2.1,
-                         HTTP                    >= 4000,
-@@ -174,7 +174,8 @@
-                         misfortune              >= 0.1,
-                         monad-control           >= 0.3,
-                         mtl                     >= 2,
--                        network                 >= 2.3.0.13,
-+                        network                 >= 2.6,
-+                        network-uri             >= 2.6,
-                         oeis                    >= 0.3.1,
-                         time                    >= 1.4,
-                         parsec                  >= 3,
diff --git a/pkgs/development/libraries/haskell/lambdabot/wrapper.nix b/pkgs/development/libraries/haskell/lambdabot/wrapper.nix
deleted file mode 100644
index a29d73fe72f6..000000000000
--- a/pkgs/development/libraries/haskell/lambdabot/wrapper.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, lambdabot, mueval, ghc, makeWrapper }:
-
-stdenv.mkDerivation {
-  name = "lambdabot-wrapper";
-
-  buildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    makeWrapper "${lambdabot}/bin/lambdabot" "$out/bin/lambdabot" \
-      --prefix PATH : "${ghc}/bin:${mueval}/bin"
-  '';
-
-  preferLocalBuild = true;
-
-  meta = lambdabot.meta;
-}
diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
deleted file mode 100644
index 62f090471013..000000000000
--- a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, bitmap, bytestringTrie, filepath, mtl, OpenGLRaw
-, stbImage, uulib, vect, vector, vectorAlgorithms, xml, zipArchive
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lambdacube-engine";
-  version = "0.2.4";
-  sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f";
-  buildDepends = [
-    binary bitmap bytestringTrie filepath mtl OpenGLRaw stbImage uulib
-    vect vector vectorAlgorithms xml zipArchive
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
-    description = "3D rendering engine written entirely in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
deleted file mode 100644
index 720d7dd8926c..000000000000
--- a/pkgs/development/libraries/haskell/language-c-inline/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, languageCQuote, mainlandPretty }:
-
-cabal.mkDerivation (self: {
-  pname = "language-c-inline";
-  version = "0.7.7.0";
-  sha256 = "10wj8dlsjimgln14y7b50pnnn865ln46v3xcqwr7ahjcl3icavg6";
-  buildDepends = [ filepath languageCQuote mainlandPretty ];
-  testDepends = [ languageCQuote ];
-  meta = {
-    homepage = "https://github.com/mchakravarty/language-c-inline/";
-    description = "Inline C & Objective-C code in Haskell for language interoperability";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
deleted file mode 100644
index 03b1d62546b1..000000000000
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy
-, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-c-quote";
-  version = "0.10.1.3";
-  sha256 = "0kbnqrplwb5w9jfljsrjxisnrnxbc0221hpznvq4m1ldx2mkrh1k";
-  buildDepends = [
-    exceptionMtl exceptionTransformers filepath haskellSrcMeta
-    mainlandPretty mtl srcloc syb symbol
-  ];
-  testDepends = [
-    HUnit srcloc symbol testFramework testFrameworkHunit
-  ];
-  buildTools = [ alex happy ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix
deleted file mode 100644
index 9346a10bdf2c..000000000000
--- a/pkgs/development/libraries/haskell/language-c/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, filepath, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "language-c";
-  version = "0.4.7";
-  sha256 = "1r0jlncv6d6ai8kblrdq9gz8abx57b24y6hfh30xx20zdgccjvaz";
-  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;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix
deleted file mode 100644
index f2f77fb9dd37..000000000000
--- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, Diff, filepath, HUnit, mtl, parsec
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testingFeat, uniplate, wlPprint
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-ecmascript";
-  version = "0.16.2";
-  sha256 = "15jvq3wblx67hhvgblqzfdnks6x17hfnivifps5wfs9v1ljkiq1k";
-  buildDepends = [
-    dataDefaultClass Diff mtl parsec QuickCheck testingFeat uniplate
-    wlPprint
-  ];
-  testDepends = [
-    dataDefaultClass Diff filepath HUnit mtl parsec QuickCheck
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 uniplate
-    wlPprint
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/jswebtools/language-ecmascript";
-    description = "JavaScript parser and pretty-printer library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix
deleted file mode 100644
index 6d983123cb65..000000000000
--- a/pkgs/development/libraries/haskell/language-glsl/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, parsec, prettyclass, testFramework
-, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-glsl";
-  version = "0.1.1";
-  sha256 = "06dc339a2cddzgjda3nzprgr0v2clbhlpl8j81m04i66bbj2l15y";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ parsec prettyclass ];
-  testDepends = [
-    HUnit parsec prettyclass testFramework testFrameworkHunit
-  ];
-  meta = {
-    description = "GLSL abstract syntax tree, parser, and pretty-printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
deleted file mode 100644
index da190862c014..000000000000
--- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexPosix }:
-
-cabal.mkDerivation (self: {
-  pname = "language-haskell-extract";
-  version = "0.2.4";
-  sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
-  buildDepends = [ regexPosix ];
-  meta = {
-    homepage = "http://github.com/finnsson/template-helper";
-    description = "Module to automatically extract functions from the local code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix
deleted file mode 100644
index dc35a8867ba1..000000000000
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-java";
-  version = "0.2.7";
-  sha256 = "1519grsjw0f4skldxs563qz07mmj1cg72ma0plmvzpas7inkikyf";
-  buildDepends = [ cpphs parsec syb ];
-  testDepends = [
-    filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  buildTools = [ alex ];
-  doCheck = false;
-  meta = {
-    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/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
deleted file mode 100644
index 166b5bd5c096..000000000000
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck
-, testFramework, testFrameworkHunit, utf8Light, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-javascript";
-  version = "0.5.13";
-  sha256 = "0h46wfh5xi3gbiaplx3ikmj7mfcwm1d37i5c9n3qfsmmkac29n2w";
-  buildDepends = [ blazeBuilder mtl utf8String ];
-  testDepends = [
-    blazeBuilder Cabal HUnit mtl QuickCheck testFramework
-    testFrameworkHunit utf8Light utf8String
-  ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://github.com/alanz/language-javascript";
-    description = "Parser for JavaScript";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
deleted file mode 100644
index d743c7eee3a8..000000000000
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "largeword";
-  version = "1.2.3";
-  sha256 = "1ldcsnnji6p84sn03j17pdcpg7vqn1xrhyn4wys0v5fyy0d383ln";
-  buildDepends = [ binary ];
-  testDepends = [
-    binary HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/idontgetoutmuch/largeword";
-    description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lattices/default.nix b/pkgs/development/libraries/haskell/lattices/default.nix
deleted file mode 100644
index d37b6d2e8832..000000000000
--- a/pkgs/development/libraries/haskell/lattices/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "lattices";
-  version = "1.2.1.1";
-  sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6";
-  meta = {
-    description = "Fine-grained library for constructing and manipulating lattices";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
deleted file mode 100644
index d38e4528d256..000000000000
--- a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "lazysmallcheck";
-  version = "0.6";
-  sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
-  meta = {
-    homepage = "http://www.cs.york.ac.uk/~mfn/lazysmallcheck/";
-    description = "A library for demand-driven testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
deleted file mode 100644
index f1fcd255b5f9..000000000000
--- a/pkgs/development/libraries/haskell/lens-aeson/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving
-, lens, scientific, semigroups, simpleReflect, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens-aeson";
-  version = "1.0.0.3";
-  sha256 = "0wfbnazarwcza5dn3icsdvsmkyf9ki5lr5d5yidmgijhs63ak7ac";
-  buildDepends = [
-    aeson attoparsec lens scientific text unorderedContainers vector
-  ];
-  testDepends = [
-    doctest filepath genericDeriving semigroups simpleReflect
-  ];
-  meta = {
-    homepage = "http://github.com/lens/lens-aeson/";
-    description = "Law-abiding lenses for aeson";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-datetime/default.nix b/pkgs/development/libraries/haskell/lens-datetime/default.nix
deleted file mode 100644
index 23084746ea23..000000000000
--- a/pkgs/development/libraries/haskell/lens-datetime/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, time }:
-
-cabal.mkDerivation (self: {
-  pname = "lens-datetime";
-  version = "0.2.1";
-  sha256 = "1wqks7ynw3njlizdd9hvgrc1xjxcgcfck9ppj1lgg8wr3l2myi72";
-  buildDepends = [ lens time ];
-  meta = {
-    homepage = "http://github.com/nilcons/lens-datetime";
-    description = "Lenses for Data.Time.* types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix
deleted file mode 100644
index 94a53898325d..000000000000
--- a/pkgs/development/libraries/haskell/lens-family-core/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "lens-family-core";
-  version = "1.2.0";
-  sha256 = "0hxrbbc4azfafnr4ab2zxgic093wwg6gx5h1ggp4xks55d8rhraz";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Haskell 98 Lens Families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-family-th/default.nix b/pkgs/development/libraries/haskell/lens-family-th/default.nix
deleted file mode 100644
index a2ecf7b61efe..000000000000
--- a/pkgs/development/libraries/haskell/lens-family-th/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "lens-family-th";
-  version = "0.4.0.0";
-  sha256 = "02fc3kppb7y2c6j22wi2mzcxffj4k3dl3x09vjllqchfpfcpwbm5";
-  meta = {
-    homepage = "http://github.com/DanBurton/lens-family-th#readme";
-    description = "Generate lens-family style lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-family/default.nix b/pkgs/development/libraries/haskell/lens-family/default.nix
deleted file mode 100644
index 58ce93e1b650..000000000000
--- a/pkgs/development/libraries/haskell/lens-family/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lensFamilyCore, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "lens-family";
-  version = "1.2.0";
-  sha256 = "0pbyx43ajx96nhcw4brml1r5azs1041k7nv4m94ak6x77n5sr4mb";
-  buildDepends = [ lensFamilyCore mtl transformers ];
-  meta = {
-    description = "Lens Families";
-    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
deleted file mode 100644
index f82368422e4a..000000000000
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
-, doctest, exceptions, filepath, free, genericDeriving, hashable
-, hlint, HUnit, mtl, nats, parallel, primitive, profunctors
-, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
-, split, tagged, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
-, transformersCompat, unorderedContainers, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens";
-  version = "4.6.0.1";
-  sha256 = "099hhkca39zxfj9xavd2rafzgm2r4nm8clngcsgcrn1qsy8knvz2";
-  buildDepends = [
-    bifunctors comonad contravariant distributive exceptions filepath
-    free hashable mtl parallel primitive profunctors reflection
-    semigroupoids semigroups split tagged text transformers
-    transformersCompat unorderedContainers vector void
-  ];
-  testDepends = [
-    deepseq doctest filepath genericDeriving hlint HUnit mtl nats
-    parallel QuickCheck semigroups simpleReflect split testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
-    transformers unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/lens/";
-    description = "Lenses, Folds and Traversals";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lenses/default.nix b/pkgs/development/libraries/haskell/lenses/default.nix
deleted file mode 100644
index debe3061798e..000000000000
--- a/pkgs/development/libraries/haskell/lenses/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "lenses";
-  version = "0.1.6";
-  sha256 = "0n2r7gjiq5vk6jjaxn7kr3g5gvn4y0gmdqpn9l0nfgqdnscmfbiv";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://github.com/jvranish/Lenses/tree/master";
-    description = "Simple Functional Lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
deleted file mode 100644
index 2e3ba0032335..000000000000
--- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, dataDefault, exceptions, filepath, leveldb, mtl
-, QuickCheck, resourcet, snappy, tasty, tastyQuickcheck, temporary
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "leveldb-haskell";
-  version = "0.6";
-  sha256 = "1r76dvn8scnjfdw1i5cj3s5s1nqf2yib4jdydjnr8p6c8yvpp3z5";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    async dataDefault exceptions filepath resourcet transformers
-  ];
-  testDepends = [
-    dataDefault exceptions mtl QuickCheck tasty tastyQuickcheck
-    temporary transformers
-  ];
-  extraLibraries = [ leveldb snappy ];
-  meta = {
-    homepage = "http://github.com/kim/leveldb-haskell";
-    description = "Haskell bindings to LevelDB";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libffi/default.nix b/pkgs/development/libraries/haskell/libffi/default.nix
deleted file mode 100644
index 6b5892bce459..000000000000
--- a/pkgs/development/libraries/haskell/libffi/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libffi }:
-
-cabal.mkDerivation (self: {
-  pname = "libffi";
-  version = "0.1";
-  sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28";
-  pkgconfigDepends = [ libffi ];
-  meta = {
-    description = "A binding to libffi";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix
deleted file mode 100644
index a873616f3c01..000000000000
--- a/pkgs/development/libraries/haskell/libjenkins/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, attoparsec, doctest, filepath, free, hspec
-, hspecExpectationsLens, httpClient, httpClientTls, httpTypes, lens
-, liftedAsync, liftedBase, monadControl, mtl, network, networkUri
-, profunctors, text, transformers, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "libjenkins";
-  version = "0.6.0";
-  sha256 = "0rcqmj5myi2wy2acd59gqdfwiiapw1zwzm71bjqb1y66z0rnrkx4";
-  buildDepends = [
-    attoparsec free httpClient httpClientTls httpTypes liftedAsync
-    liftedBase monadControl mtl network networkUri profunctors text
-    transformers
-  ];
-  testDepends = [
-    async attoparsec doctest filepath free hspec hspecExpectationsLens
-    httpClient httpClientTls httpTypes lens liftedAsync liftedBase
-    monadControl mtl network networkUri profunctors text transformers
-    xmlConduit
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Jenkins API interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch b/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch
deleted file mode 100644
index fda68fde5f92..000000000000
--- a/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur libjenkins-0.4.2.0-orig/libjenkins.cabal libjenkins-0.4.2.0/libjenkins.cabal
---- libjenkins-0.4.2.0-orig/libjenkins.cabal	2014-02-17 13:11:22.000000000 -0500
-+++ libjenkins-0.4.2.0/libjenkins.cabal	2014-04-07 11:40:30.046473593 -0400
-@@ -52,6 +52,7 @@
-     , text          >= 0.11
-     , transformers  >= 0.3
-     , xml-conduit   >= 1.1
-+    , resourcet
- 
- test-suite doctest
-   default-language:  Haskell2010
-diff -Naur libjenkins-0.4.2.0-orig/src/Jenkins/Rest/Internal.hs libjenkins-0.4.2.0/src/Jenkins/Rest/Internal.hs
---- libjenkins-0.4.2.0-orig/src/Jenkins/Rest/Internal.hs	2014-02-17 13:11:22.000000000 -0500
-+++ libjenkins-0.4.2.0/src/Jenkins/Rest/Internal.hs	2014-04-07 11:40:02.221415450 -0400
-@@ -22,7 +22,7 @@
- import           Control.Monad.Trans.Reader (ReaderT, runReaderT, ask, local)
- import           Control.Monad.Trans.Maybe (MaybeT(..), mapMaybeT)
- import           Data.ByteString.Lazy (ByteString)
--import           Data.Conduit (ResourceT)
-+import           Control.Monad.Trans.Resource (ResourceT)
- import           Data.Data (Data, Typeable)
- import           Data.Text (Text)
- import qualified Data.Text.Encoding as Text
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
deleted file mode 100644
index abfa8a0496b2..000000000000
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, cereal, cryptoApi, hspec, hspecExpectationsLens
-, httpClient, httpClientTls, HUnit, lens, lensAeson, networkUri
-, profunctors, pureMD5, semigroups, text, xmlConduit
-, xmlHtmlConduitLens
-}:
-
-cabal.mkDerivation (self: {
-  pname = "liblastfm";
-  version = "0.5.1";
-  sha256 = "1bf508a1rqjb486wcwn0n36bm8lwnj3b4bg0826lp92zmaxiyxpy";
-  buildDepends = [
-    aeson cereal cryptoApi httpClient httpClientTls networkUri
-    profunctors pureMD5 semigroups text xmlConduit
-  ];
-  testDepends = [
-    aeson cereal cryptoApi hspec hspecExpectationsLens httpClient
-    httpClientTls HUnit lens lensAeson networkUri profunctors pureMD5
-    text xmlConduit xmlHtmlConduitLens
-  ];
-  meta = {
-    description = "Lastfm API interface";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
deleted file mode 100644
index 6dc0aede0699..000000000000
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, dataDefault, filepath, hspec, mtl, network
-, QuickCheck, text, time, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "libmpd";
-  version = "0.9.0.1";
-  sha256 = "11smm8ai7053hljlxi5l2fkqxrqr1xrh6sxg2r0dlsvmmln7smrd";
-  buildDepends = [
-    attoparsec dataDefault filepath mtl network text time utf8String
-  ];
-  testDepends = [
-    attoparsec dataDefault filepath hspec mtl network QuickCheck text
-    time utf8String
-  ];
-  meta = {
-    homepage = "http://github.com/vimus/libmpd-haskell#readme";
-    description = "An MPD client library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libnotify/default.nix b/pkgs/development/libraries/haskell/libnotify/default.nix
deleted file mode 100644
index 8ed4e80d49f3..000000000000
--- a/pkgs/development/libraries/haskell/libnotify/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, libnotify }:
-
-cabal.mkDerivation (self: {
-  pname = "libnotify";
-  version = "0.1.1.0";
-  sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0";
-  buildDepends = [ glib gtk ];
-  extraLibraries = [ libnotify ];
-  meta = {
-    description = "Bindings to libnotify library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
deleted file mode 100644
index e4dc138eae05..000000000000
--- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd, text
-, transformers, uniplate, unixBytestring, unorderedContainers, uuid
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "libsystemd-journal";
-  version = "1.2.0";
-  sha256 = "10gsqcy5f7m6f0giqhfcqspb17b3gyib4cpw5nrdl7hiah13hi7x";
-  buildDepends = [
-    hashable hsyslog pipes pipesSafe text transformers uniplate
-    unixBytestring unorderedContainers uuid vector
-  ];
-  extraLibraries = [ systemd ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ocharles/libsystemd-journal";
-    description = "Haskell bindings to libsystemd-journal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix
deleted file mode 100644
index 43f4e19029bd..000000000000
--- a/pkgs/development/libraries/haskell/libxml-sax/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libxml2, text, xmlTypes }:
-
-cabal.mkDerivation (self: {
-  pname = "libxml-sax";
-  version = "0.7.5";
-  sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r";
-  buildDepends = [ text xmlTypes ];
-  extraLibraries = [ libxml2 ];
-  pkgconfigDepends = [ libxml2 ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-libxml/";
-    description = "Bindings for the libXML2 SAX interface";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
deleted file mode 100644
index ecb6b9aa18ac..000000000000
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, constraints, HUnit, liftedBase, monadControl, mtl, tasty
-, tastyHunit, tastyTh, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lifted-async";
-  version = "0.6.0.1";
-  sha256 = "12qbibsl26njx6m1dq12gqfb15rkyag23c1vkcinlk301a0cvsmf";
-  buildDepends = [ async constraints liftedBase monadControl transformersBase ];
-  testDepends = [
-    async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh
-  ];
-  meta = {
-    homepage = "https://github.com/maoe/lifted-async";
-    description = "Run lifted IO operations asynchronously and wait for their results";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
deleted file mode 100644
index 2aa24f833253..000000000000
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, monadControl, testFramework, testFrameworkHunit
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lifted-base";
-  version = "0.2.3.3";
-  sha256 = "1n015i21pyh1ksrdiy105c9sw3gm3yvmlwv1sajy7nvpxb2xdjc3";
-  buildDepends = [ monadControl transformersBase ];
-  testDepends = [
-    HUnit monadControl testFramework testFrameworkHunit transformers
-    transformersBase
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/basvandijk/lifted-base";
-    description = "lifted IO operations from the base library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lin-alg/default.nix b/pkgs/development/libraries/haskell/lin-alg/default.nix
deleted file mode 100644
index 39391f989a8e..000000000000
--- a/pkgs/development/libraries/haskell/lin-alg/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, NumInstances, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "lin-alg";
-  version = "0.1.0.2";
-  sha256 = "19123k967mql69my6c19mnvp4qwa4b3bgimmlbhipqdljykj7pqc";
-  buildDepends = [ NumInstances vector ];
-  meta = {
-    description = "Low-dimensional matrices and vectors for graphics and physics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/linear-opengl/default.nix b/pkgs/development/libraries/haskell/linear-opengl/default.nix
deleted file mode 100644
index a10489a6006c..000000000000
--- a/pkgs/development/libraries/haskell/linear-opengl/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, distributive, lens, linear, OpenGL, OpenGLRaw, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "linear-opengl";
-  version = "0.2.0.4";
-  sha256 = "11pdif2w730jqknajr2si77a0z4v4k5spm5zdks642i25ya135ba";
-  buildDepends = [
-    distributive lens linear OpenGL OpenGLRaw tagged
-  ];
-  meta = {
-    homepage = "http://www.github.com/bgamari/linear-opengl";
-    description = "Isomorphisms between linear and OpenGL types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
deleted file mode 100644
index 6301d8d42d67..000000000000
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, adjunctions, binary, distributive, doctest, filepath
-, hashable, HUnit, lens, reflection, semigroupoids, semigroups
-, simpleReflect, tagged, testFramework, testFrameworkHunit
-, transformers, unorderedContainers, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "linear";
-  version = "1.15.5";
-  sha256 = "17fxz49zj6vklgfs583zpn7naqgp5mv2zsvmxrv80ym8r52mp5mi";
-  buildDepends = [
-    adjunctions binary distributive hashable lens reflection
-    semigroupoids semigroups tagged transformers unorderedContainers
-    vector void
-  ];
-  testDepends = [
-    binary doctest filepath HUnit lens simpleReflect testFramework
-    testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/ekmett/linear/";
-    description = "Linear Algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/linux-inotify/default.nix b/pkgs/development/libraries/haskell/linux-inotify/default.nix
deleted file mode 100644
index 2c5dc577f0ff..000000000000
--- a/pkgs/development/libraries/haskell/linux-inotify/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable }:
-
-cabal.mkDerivation (self: {
-  pname = "linux-inotify";
-  version = "0.2.0.1";
-  sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r";
-  buildDepends = [ hashable ];
-  meta = {
-    description = "Thinner binding to the Linux Kernel's inotify interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/list-t/default.nix b/pkgs/development/libraries/haskell/list-t/default.nix
deleted file mode 100644
index 442ffc2028ac..000000000000
--- a/pkgs/development/libraries/haskell/list-t/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, basePrelude, HTF, mmorph, monadControl, mtlPrelude
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "list-t";
-  version = "0.4.2";
-  sha256 = "0n6zc7n5znjas9mgh3a9bn44xv55910i6c3b2l83n4pl9fnad03v";
-  buildDepends = [
-    basePrelude mmorph monadControl transformers transformersBase
-  ];
-  testDepends = [ basePrelude HTF mmorph mtlPrelude ];
-  meta = {
-    homepage = "https://github.com/nikita-volkov/list-t";
-    description = "ListT done right";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/list-tries/default.nix b/pkgs/development/libraries/haskell/list-tries/default.nix
deleted file mode 100644
index f14e202d2267..000000000000
--- a/pkgs/development/libraries/haskell/list-tries/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dlist }:
-
-cabal.mkDerivation (self: {
-  pname = "list-tries";
-  version = "0.5.2";
-  sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary dlist ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://iki.fi/matti.niemenmaa/list-tries/";
-    description = "Tries and Patricia tries: finite sets and maps for list keys";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/listExtras/default.nix b/pkgs/development/libraries/haskell/listExtras/default.nix
deleted file mode 100644
index 2da3060202cb..000000000000
--- a/pkgs/development/libraries/haskell/listExtras/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "list-extras";
-  version = "0.4.1.3";
-  sha256 = "16w10xgh2y76q8aj5pgw4zq5p2phjzf5g1bmkacrm8gbwkp4v71s";
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Common not-so-common functions for lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lists/default.nix b/pkgs/development/libraries/haskell/lists/default.nix
deleted file mode 100644
index 358d33e35d71..000000000000
--- a/pkgs/development/libraries/haskell/lists/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, listExtras, split }:
-
-cabal.mkDerivation (self: {
-  pname = "lists";
-  version = "0.4.2";
-  sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln";
-  buildDepends = [ listExtras split ];
-  meta = {
-    description = "Functions for dealing with lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
deleted file mode 100644
index cd92b67b16aa..000000000000
--- a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "llvm-general-pure";
-  version = "3.4.4.0";
-  sha256 = "0x43yfcss3f5v5mlzyv7d13fvajbdgv4cmkx5yx1904xsiddg27v";
-  buildDepends = [ mtl parsec setenv transformers ];
-  testDepends = [
-    HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    description = "Pure Haskell LLVM functionality (no FFI)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
deleted file mode 100644
index aec66b12723b..000000000000
--- a/pkgs/development/libraries/haskell/llvm-general/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
-, QuickCheck, setenv, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "llvm-general";
-  version = "3.4.4.0";
-  sha256 = "10x7qb2svw0gz0sqf4vn14hpzks3rk29g4i2pzfdi5qk11j8jd9b";
-  buildDepends = [
-    llvmGeneralPure mtl parsec setenv transformers utf8String
-  ];
-  testDepends = [
-    HUnit llvmGeneralPure mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  buildTools = [ llvmConfig ];
-  doCheck = false;
-  meta = {
-    description = "General purpose LLVM bindings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/loch-th/default.nix b/pkgs/development/libraries/haskell/loch-th/default.nix
deleted file mode 100644
index 5061524708bf..000000000000
--- a/pkgs/development/libraries/haskell/loch-th/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "loch-th";
-  version = "0.2.1";
-  sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p";
-  meta = {
-    homepage = "https://github.com/liskin/loch-th";
-    description = "Support for precise error locations in source files (Template Haskell version)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
deleted file mode 100644
index 6864d4c5fc42..000000000000
--- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractDeque, abstractDequeTests, atomicPrimops, HUnit
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lockfree-queue";
-  version = "0.2.3";
-  sha256 = "0y8ax6vcjnjm8g7ybn95wca74hm0g22fvgra06vj6l90pl93awyg";
-  buildDepends = [ abstractDeque atomicPrimops ];
-  testDepends = [
-    abstractDeque abstractDequeTests atomicPrimops HUnit testFramework
-    testFrameworkHunit
-  ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "Michael and Scott lock-free queues";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix
deleted file mode 100644
index e24fd10beb6e..000000000000
--- a/pkgs/development/libraries/haskell/logfloat/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "logfloat";
-  version = "0.12.1";
-  sha256 = "1k13jjqv4df341hcj9hzrlisfx9wrsmyqvzi6ricx341d9z4ch05";
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Log-domain floating point numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logging-facade-journald/default.nix b/pkgs/development/libraries/haskell/logging-facade-journald/default.nix
deleted file mode 100644
index 54a7feee5954..000000000000
--- a/pkgs/development/libraries/haskell/logging-facade-journald/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fetchzip, hspec, libsystemdJournal, loggingFacade, text
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "logging-facade-journald";
-  version = "0.0.0";
-  src = fetchzip {
-    url = "https://hackage.haskell.org/package/logging-facade-journald-0.0.0/logging-facade-journald-0.0.0.tar.gz";
-    sha256 = "1wvh48y3lz2ipz6cwh7gbwajwrd7ziivhkmgpglzjfy335zin7m6";
-  };
-  buildDepends = [
-    libsystemdJournal loggingFacade text unorderedContainers
-  ];
-  testDepends = [
-    hspec libsystemdJournal loggingFacade text unorderedContainers
-  ];
-  meta = {
-    description = "Journald back-end for logging-facade";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logging-facade/default.nix b/pkgs/development/libraries/haskell/logging-facade/default.nix
deleted file mode 100644
index 9e4e7601d85e..000000000000
--- a/pkgs/development/libraries/haskell/logging-facade/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fetchzip, hspec, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "logging-facade";
-  version = "0.0.0";
-  src = fetchzip {
-    url = "https://hackage.haskell.org/package/logging-facade-0.0.0/logging-facade-0.0.0.tar.gz";
-    sha256 = "0w6bkzgf0lamcdnris95i1xq8wg882wf17b517rgr5d1vhxz9y7s";
-  };
-  buildDepends = [ transformers ];
-  testDepends = [ hspec ];
-  meta = {
-    description = "Simple logging abstraction that allows multiple backends";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix
deleted file mode 100644
index 94eb14cb0034..000000000000
--- a/pkgs/development/libraries/haskell/logging/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, fastLogger, hspec, liftedBase, monadControl
-, monadLogger, pcreLight, text, time, transformers, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "logging";
-  version = "2.1.0";
-  sha256 = "15ad4g7zkbklawd98m6x838fr5383vkvq92y75f56j1kj17g7rrh";
-  buildDepends = [
-    binary fastLogger liftedBase monadControl monadLogger pcreLight
-    text time transformers vectorSpace
-  ];
-  testDepends = [ hspec monadLogger ];
-  meta = {
-    description = "Simplified logging in IO for application writers";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
deleted file mode 100644
index 1a51d623557d..000000000000
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "logict";
-  version = "0.6.0.2";
-  sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://code.haskell.org/~dolio/";
-    description = "A backtracking logic-programming monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logsink/default.nix b/pkgs/development/libraries/haskell/logsink/default.nix
deleted file mode 100644
index d272a4d4c2b8..000000000000
--- a/pkgs/development/libraries/haskell/logsink/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hsyslog, loggingFacade, time }:
-
-cabal.mkDerivation (self: {
-  pname = "logsink";
-  version = "0.1.0";
-  sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
-  buildDepends = [ hsyslog loggingFacade time ];
-  testDepends = [ hspec loggingFacade ];
-  meta = {
-    description = "A logging framework for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/loop/default.nix b/pkgs/development/libraries/haskell/loop/default.nix
deleted file mode 100644
index 88edb1909a5d..000000000000
--- a/pkgs/development/libraries/haskell/loop/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "loop";
-  version = "0.2.0";
-  sha256 = "11ifqahlg9ky5klid1fhsyfvfb6w8yb0dsy43s0cxcmldbw3qv5x";
-  testDepends = [ hspec mtl ];
-  meta = {
-    homepage = "https://github.com/nh2/loop";
-    description = "Fast loops (for when GHC can't optimize forM_)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix
deleted file mode 100644
index 6c28b6c8cd53..000000000000
--- a/pkgs/development/libraries/haskell/lrucache/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "lrucache";
-  version = "1.1.1.4";
-  sha256 = "0w3b338wsf7c0acjxxfdjxsljfpsix67aihkl2jwnp5x71awf8qh";
-  meta = {
-    homepage = "http://github.com/chowells79/lrucache";
-    description = "a simple, pure LRU cache";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix
deleted file mode 100644
index c3e90c84c566..000000000000
--- a/pkgs/development/libraries/haskell/lushtags/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "lushtags";
-  version = "0.0.1";
-  sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ haskellSrcExts text vector ];
-  meta = {
-    homepage = "https://github.com/bitc/lushtags";
-    description = "Create ctags compatible tags files for Haskell programs";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lzma-conduit/default.nix b/pkgs/development/libraries/haskell/lzma-conduit/default.nix
deleted file mode 100644
index 9b80409ddd42..000000000000
--- a/pkgs/development/libraries/haskell/lzma-conduit/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, conduit, HUnit, lzma, QuickCheck, resourcet
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lzma-conduit";
-  version = "1.1.1";
-  sha256 = "1i1khkxpia5hp3f0p7h656yvbgwsxffpl2czxjbkiw6iz31rapwg";
-  buildDepends = [ bindingsDSL conduit resourcet transformers ];
-  testDepends = [
-    conduit HUnit QuickCheck resourcet testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  extraLibraries = [ lzma ];
-  meta = {
-    homepage = "http://github.com/alphaHeavy/lzma-conduit";
-    description = "Conduit interface for lzma/xz compression";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = self.stdenv.isLinux && self.stdenv.isi686;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
deleted file mode 100644
index 7a1ee231957a..000000000000
--- a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, enumerator, HUnit, lzma, mtl, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lzma-enumerator";
-  version = "0.1.3";
-  sha256 = "0pzz8bf6310p23pmsa013i8vib0xsfvlkj7zp0w9xs2xsi4j7jk1";
-  buildDepends = [ bindingsDSL enumerator mtl ];
-  testDepends = [
-    enumerator HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  extraLibraries = [ lzma ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/alphaHeavy/lzma-enumerator";
-    description = "Enumerator interface for lzma/xz compression";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = self.stdenv.isi686;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix
deleted file mode 100644
index 24be1424c99a..000000000000
--- a/pkgs/development/libraries/haskell/maccatcher/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "maccatcher";
-  version = "2.1.5";
-  sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary parsec ];
-  meta = {
-    description = "Obtain the host MAC address on *NIX and Windows";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/machines-directory/default.nix b/pkgs/development/libraries/haskell/machines-directory/default.nix
deleted file mode 100644
index 3cd67af354e2..000000000000
--- a/pkgs/development/libraries/haskell/machines-directory/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, machines, machinesIo, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "machines-directory";
-  version = "0.2.0.0";
-  sha256 = "1b1jv23ijhm51nggxrncjhz24k4pl4nvj6s9h3jabr0gsnsb8y2v";
-  buildDepends = [ filepath machines machinesIo transformers ];
-  meta = {
-    homepage = "http://github.com/aloiscochard/machines-io";
-    description = "Directory (system) utilities for the machines library";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/machines-io/default.nix b/pkgs/development/libraries/haskell/machines-io/default.nix
deleted file mode 100644
index c724b7df62b6..000000000000
--- a/pkgs/development/libraries/haskell/machines-io/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chunkedData, machines, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "machines-io";
-  version = "0.2.0.0";
-  sha256 = "0qjbfwyhscjmjbfj709kb9xr5p3yz4v21aq2g4dv1abqwgf85x03";
-  buildDepends = [ chunkedData machines transformers ];
-  meta = {
-    homepage = "http://github.com/aloiscochard/machines-io";
-    description = "IO utilities for the machines library";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix
deleted file mode 100644
index bb01e9f655ef..000000000000
--- a/pkgs/development/libraries/haskell/machines/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, doctest, filepath, free, mtl, pointed
-, profunctors, semigroups, transformers, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "machines";
-  version = "0.4.1";
-  sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb";
-  buildDepends = [
-    comonad free mtl pointed profunctors semigroups transformers void
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/machines/";
-    description = "Networked stream transducers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
deleted file mode 100644
index 1383efab8684..000000000000
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, srcloc, text }:
-
-cabal.mkDerivation (self: {
-  pname = "mainland-pretty";
-  version = "0.2.7";
-  sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q";
-  buildDepends = [ srcloc text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.eecs.harvard.edu/~mainland/";
-    description = "Pretty printing designed for printing source code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/managed/default.nix b/pkgs/development/libraries/haskell/managed/default.nix
deleted file mode 100644
index febb1f8c5741..000000000000
--- a/pkgs/development/libraries/haskell/managed/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "managed";
-  version = "1.0.0";
-  sha256 = "06nb71pd68m5l6a48sz5kkrdif74phbg3y6bn9ydd00y515b9gn5";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "A monad for managed values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/map-syntax/default.nix b/pkgs/development/libraries/haskell/map-syntax/default.nix
deleted file mode 100644
index 52c42efd3209..000000000000
--- a/pkgs/development/libraries/haskell/map-syntax/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "map-syntax";
-  version = "0.2";
-  sha256 = "02v1dvq86qzbfbwbza4myj3a6a6a5p059fi5m3g548hmqk3v2p1r";
-  buildDepends = [ mtl ];
-  testDepends = [
-    deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 transformers
-  ];
-  meta = {
-    description = "Syntax sugar for defining maps";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix
deleted file mode 100644
index 226a4efa8c7f..000000000000
--- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, QuickCheck, silently, stringbuilder }:
-
-cabal.mkDerivation (self: {
-  pname = "markdown-unlit";
-  version = "0.2.0.1";
-  sha256 = "1bc3vcifv2xcddh8liq380c6sxarrs5pf21pfs9i4dx9rfl3hvhq";
-  isLibrary = true;
-  isExecutable = true;
-  testDepends = [ hspec QuickCheck silently stringbuilder ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
-  meta = {
-    description = "Literate Haskell support for Markdown";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix
deleted file mode 100644
index cd0bcd3cfee3..000000000000
--- a/pkgs/development/libraries/haskell/markdown/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeHtml, blazeMarkup, conduit, conduitExtra
-, dataDefault, hspec, systemFileio, systemFilepath, text
-, transformers, xssSanitize
-}:
-
-cabal.mkDerivation (self: {
-  pname = "markdown";
-  version = "0.1.13";
-  sha256 = "1r04h641d9y8p88h59isrz9g42gq7vdykx3n8bhk499ici800134";
-  buildDepends = [
-    attoparsec blazeHtml blazeMarkup conduit conduitExtra dataDefault
-    text transformers xssSanitize
-  ];
-  testDepends = [
-    blazeHtml conduit conduitExtra hspec systemFileio systemFilepath
-    text transformers
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/markdown";
-    description = "Convert Markdown to HTML, with XSS protection";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix
deleted file mode 100644
index 00f283208c65..000000000000
--- a/pkgs/development/libraries/haskell/markov-chain/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "markov-chain";
-  version = "0.0.3.3";
-  sha256 = "1y9fjsf6dg6a9ha75w2szq4gi5fhq89l1r7wqb20hmadkcjjplx8";
-  buildDepends = [ random transformers ];
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/markov-chain/";
-    description = "Markov Chains for generating random sequences with a user definable behaviour";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
deleted file mode 100644
index 2e747760cc7f..000000000000
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, erf, HUnit, ieee754, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, vector
-, vectorThUnbox
-}:
-
-cabal.mkDerivation (self: {
-  pname = "math-functions";
-  version = "0.1.5.2";
-  sha256 = "12cznf7gwia1ki7xhvlhk5p8d09zrdvfgn07pkp4sfrwsc4vijcy";
-  buildDepends = [ deepseq erf vector vectorThUnbox ];
-  testDepends = [
-    HUnit ieee754 QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/math-functions";
-    description = "Special functions and Chebyshev polynomials";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/matrix/default.nix b/pkgs/development/libraries/haskell/matrix/default.nix
deleted file mode 100644
index 2d1ec8aa45ff..000000000000
--- a/pkgs/development/libraries/haskell/matrix/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, loop, primitive, QuickCheck, tasty
-, tastyQuickcheck, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "matrix";
-  version = "0.3.4.0";
-  sha256 = "16a633llf7nh70s92cn8i8sdish9vryy4xh62rimvmn91ivvjay1";
-  buildDepends = [ deepseq loop primitive vector ];
-  testDepends = [ QuickCheck tasty tastyQuickcheck ];
-  meta = {
-    description = "A native implementation of matrix operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix
deleted file mode 100644
index ff95fe0a23b0..000000000000
--- a/pkgs/development/libraries/haskell/maude/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, processExtras, temporary, text, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "maude";
-  version = "0.6.1";
-  sha256 = "0qadqpj5vzg84mqh29p6vr2ffih7y69ds0jdpxmr17am5bh3mhql";
-  buildDepends = [ filepath processExtras temporary text xml ];
-  meta = {
-    homepage = "https://github.com/davidlazar/maude-hs";
-    description = "An interface to the Maude rewriting system";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/meep/default.nix b/pkgs/development/libraries/haskell/meep/default.nix
deleted file mode 100644
index f8ad537938c9..000000000000
--- a/pkgs/development/libraries/haskell/meep/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, doctest, hspec, hspecExpectationsLens, lens
-, QuickCheck, semigroups
-}:
-
-cabal.mkDerivation (self: {
-  pname = "meep";
-  version = "0.1.1.0";
-  sha256 = "1rk5mrvmk07m5zdayfvxirak58d1bxwb04sgg0gcx07w8q8k4yyq";
-  buildDepends = [ bifunctors lens semigroups ];
-  testDepends = [
-    bifunctors doctest hspec hspecExpectationsLens lens QuickCheck
-    semigroups
-  ];
-  meta = {
-    description = "A silly container";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
deleted file mode 100644
index f17b0df4ad1a..000000000000
--- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "mersenne-random-pure64";
-  version = "0.2.0.4";
-  sha256 = "0qh72ynfg1k4c70qxdzsa6f1x9wyxil2d9gi85c879wrc41k899h";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
-    description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mersenne-random/default.nix b/pkgs/development/libraries/haskell/mersenne-random/default.nix
deleted file mode 100644
index ec7a54c9ed2e..000000000000
--- a/pkgs/development/libraries/haskell/mersenne-random/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "mersenne-random";
-  version = "1.0.0.1";
-  sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/mersenne-random";
-    description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix
deleted file mode 100644
index 864d3c5c427b..000000000000
--- a/pkgs/development/libraries/haskell/midi/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, eventList, explicitException, monoidTransformer
-, nonNegative, QuickCheck, random, transformers, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "midi";
-  version = "0.2.1.3";
-  sha256 = "0mqf6q7686zdxljkz3bqa2zhkgirqz5c1fkbd3n4wyipzhjc773a";
-  buildDepends = [
-    binary eventList explicitException monoidTransformer nonNegative
-    QuickCheck random transformers utilityHt
-  ];
-  testDepends = [
-    eventList explicitException nonNegative QuickCheck transformers
-    utilityHt
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/MIDI";
-    description = "Handling of MIDI messages and files";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
deleted file mode 100644
index f20b20f71b7f..000000000000
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, filepath, hspec, random
-, sendmail ? "sendmail", text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mime-mail";
-  version = "0.4.6";
-  sha256 = "051mqpzypg4r6rd06qb75pl3nq9p68r1sl73r0pwl1imcp158aw6";
-  buildDepends = [
-    base64Bytestring blazeBuilder filepath random text
-  ];
-  testDepends = [ blazeBuilder hspec text ];
-  configureFlags = "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\"";
-  meta = {
-    homepage = "http://github.com/snoyberg/mime-mail";
-    description = "Compose MIME email messages";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix
deleted file mode 100644
index daf6cc37b6f1..000000000000
--- a/pkgs/development/libraries/haskell/mime-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "mime-types";
-  version = "0.1.0.4";
-  sha256 = "0bxhkwz8p7mhg5kspbpc5zm4k50pc0r5pzjr6807y88x8vjpvj2x";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "https://github.com/yesodweb/wai";
-    description = "Basic mime-type handling types and functions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix
deleted file mode 100644
index eba24ff8f164..000000000000
--- a/pkgs/development/libraries/haskell/mime/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "mime";
-  version = "0.4.0.1";
-  sha256 = "1m987sqnns54qbsg68332mnrjkh71z6s83cma2kwavf0y305mrp0";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "https://github.com/GaloisInc/mime";
-    description = "Working with MIME types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix
deleted file mode 100644
index c0593855644f..000000000000
--- a/pkgs/development/libraries/haskell/minimorph/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, testFramework, testFrameworkHunit, text }:
-
-cabal.mkDerivation (self: {
-  pname = "minimorph";
-  version = "0.1.5.0";
-  sha256 = "00dnvv0pap2xr74xwzldz89783iw320z7p1rdw0lwjjpbqa3v00g";
-  buildDepends = [ text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "http://darcsden.com/kowey/minimorph";
-    description = "English spelling functions with an emphasis on simplicity";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix
deleted file mode 100644
index 04da7e27e2c4..000000000000
--- a/pkgs/development/libraries/haskell/minioperational/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cleanUnions, elevator, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "minioperational";
-  version = "0.4.8.1";
-  sha256 = "02nkgbpf1dky7h3n99j9m3101wyfahcdx5wk5vidvf9snl5vy1w9";
-  buildDepends = [ cleanUnions elevator transformers ];
-  meta = {
-    homepage = "https://github.com/fumieval/minioperational";
-    description = "fast and simple operational monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix
deleted file mode 100644
index b58449b22add..000000000000
--- a/pkgs/development/libraries/haskell/miniutter/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, HUnit, minimorph, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "miniutter";
-  version = "0.4.4.1";
-  sha256 = "1raq5dq6mx56ddyq5hnh9r2yflry6prcjf17p15ds1w5r8cp8yx1";
-  buildDepends = [ binary minimorph text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "https://github.com/Mikolaj/miniutter";
-    description = "Simple English clause creation from arbitrary words";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/misfortune/default.nix b/pkgs/development/libraries/haskell/misfortune/default.nix
deleted file mode 100644
index cc6192882139..000000000000
--- a/pkgs/development/libraries/haskell/misfortune/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, filepath, knob, monadLoops, randomFu, regexBase
-, regexPcre, semigroups, text, utf8String, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "misfortune";
-  version = "0.1.1.1";
-  sha256 = "0knb31jxxn7zds13a90d4lir39386nwzd181mlzkrw5niw1zwmhb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cereal filepath knob monadLoops randomFu regexBase regexPcre
-    semigroups text utf8String vector
-  ];
-  meta = {
-    homepage = "https://github.com/mokus0/misfortune";
-    description = "fortune-mod clone";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/missing-foreign/default.nix b/pkgs/development/libraries/haskell/missing-foreign/default.nix
deleted file mode 100644
index 928cf73d457b..000000000000
--- a/pkgs/development/libraries/haskell/missing-foreign/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "missing-foreign";
-  version = "0.1.1";
-  sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy";
-  meta = {
-    description = "Convenience functions for FFI work";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix
deleted file mode 100644
index fe4f666b3279..000000000000
--- a/pkgs/development/libraries/haskell/mmap/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "mmap";
-  version = "0.5.9";
-  sha256 = "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "Memory mapped files for POSIX and Windows";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
deleted file mode 100644
index bf8fb46f7939..000000000000
--- a/pkgs/development/libraries/haskell/mmorph/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mmorph";
-  version = "1.0.4";
-  sha256 = "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Monad morphisms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
deleted file mode 100644
index 614fe145bea4..000000000000
--- a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "modular-arithmetic";
-  version = "1.2.0.0";
-  sha256 = "1qlvi0xjdvr4730xj303i6gp610mz4xrlrk191yy8hr7afjysm0k";
-  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-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
deleted file mode 100644
index f75688ef4ceb..000000000000
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-control";
-  version = "1.0.0.2";
-  sha256 = "13l9gq00pjlp1b2g9xzfavl6zibi2s195f234rmhzbsb14yhzgnr";
-  buildDepends = [ stm transformers transformersBase ];
-  meta = {
-    homepage = "https://github.com/basvandijk/monad-control";
-    description = "Lift control operations, like exception catching, through monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-coroutine/default.nix b/pkgs/development/libraries/haskell/monad-coroutine/default.nix
deleted file mode 100644
index 9bcfcc6d4b09..000000000000
--- a/pkgs/development/libraries/haskell/monad-coroutine/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadParallel, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-coroutine";
-  version = "0.8";
-  sha256 = "0nirp5c3vi529ap142zs29j10j9m609ippi3chv6a87h51avkhzx";
-  buildDepends = [ monadParallel transformers ];
-  meta = {
-    homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
-    description = "Coroutine monad transformer for suspending and resuming monadic computations";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix
deleted file mode 100644
index 0b655689dc44..000000000000
--- a/pkgs/development/libraries/haskell/monad-extras/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mmorph, monadControl, stm, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "monad-extras";
-  version = "0.5.9";
-  sha256 = "1y24yz635brllfygia1mbln4d8xiwb0pq0izh5pil7511gijhs0s";
-  buildDepends = [
-    mmorph monadControl stm transformers transformersBase
-  ];
-  meta = {
-    homepage = "http://github.com/jwiegley/monad-extras";
-    description = "Extra utility functions for working with monads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix
deleted file mode 100644
index c95adce3fcc2..000000000000
--- a/pkgs/development/libraries/haskell/monad-journal/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, either, monadControl, mtl, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "monad-journal";
-  version = "0.7";
-  sha256 = "1bfm5p027vf8dz92m6s47z06h05j2jv4pbwkl31svrz5pi5a9lz2";
-  buildDepends = [
-    either monadControl mtl transformers transformersBase
-  ];
-  meta = {
-    homepage = "http://github.com/phaazon/monad-journal";
-    description = "Pure logger typeclass and monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
deleted file mode 100644
index 7988819b81cd..000000000000
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, conduit, conduitExtra, exceptions
-, fastLogger, liftedBase, monadControl, monadLoops, mtl, resourcet
-, stm, stmChans, text, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "monad-logger";
-  version = "0.3.11.1";
-  sha256 = "1vh847ivymhb20sly9aplcm35zcmn7xmibv8lkv1ws9y7s1951p7";
-  buildDepends = [
-    blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
-    monadControl monadLoops mtl resourcet stm stmChans text
-    transformers transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/kazu-yamamoto/logger";
-    description = "A class of monads which can log messages";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
deleted file mode 100644
index 8b9c9b6b9330..000000000000
--- a/pkgs/development/libraries/haskell/monad-loops/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-loops";
-  version = "0.4.2.1";
-  sha256 = "1dprwndc0bxzpmrkj1xb9kzjrg3i06zsg43yaabn5x5gcaj8is56";
-  meta = {
-    homepage = "https://github.com/mokus0/monad-loops";
-    description = "Monadic loops";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
deleted file mode 100644
index a542cdb31739..000000000000
--- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractPar, cereal, deepseq, mtl, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-par-extras";
-  version = "0.3.3";
-  sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2";
-  buildDepends = [
-    abstractPar cereal deepseq mtl random transformers
-  ];
-  meta = {
-    homepage = "https://github.com/simonmar/monad-par";
-    description = "Combinators and extra features for Par monads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
deleted file mode 100644
index 13cc7499aabd..000000000000
--- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-par";
-  version = "0.1.0.3";
-  sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg";
-  buildDepends = [ deepseq HUnit ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/simonmar/monad-par";
-    description = "A library for parallel programming based on a monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix
deleted file mode 100644
index c9d6cf71ae57..000000000000
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras
-, mtl, mwcRandom, parallel, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "monad-par";
-  version = "0.3.4.7";
-  sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13";
-  buildDepends = [
-    abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
-    parallel
-  ];
-  testDepends = [
-    abstractDeque abstractPar deepseq HUnit monadParExtras mtl
-    mwcRandom QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/simonmar/monad-par";
-    description = "A library for parallel programming based on a monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix
deleted file mode 100644
index bff520fab83e..000000000000
--- a/pkgs/development/libraries/haskell/monad-parallel/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parallel, transformers, transformersCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-parallel";
-  version = "0.7.1.3";
-  sha256 = "150ich9fzpmwdvvhsd7ri97nm8zsqn86gr3bh0aqb0wgrg4hbmkx";
-  buildDepends = [ parallel transformers transformersCompat ];
-  meta = {
-    homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
-    description = "Parallel execution of monadic computations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix
deleted file mode 100644
index b7ffb95b9dfb..000000000000
--- a/pkgs/development/libraries/haskell/monad-peel/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-peel";
-  version = "0.1.1";
-  sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l";
-  buildDepends = [ extensibleExceptions transformers ];
-  meta = {
-    homepage = "http://andersk.mit.edu/haskell/monad-peel/";
-    description = "Lift control operations like exception catching through monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-stm/default.nix b/pkgs/development/libraries/haskell/monad-stm/default.nix
deleted file mode 100644
index 5418817160f9..000000000000
--- a/pkgs/development/libraries/haskell/monad-stm/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-stm";
-  version = "0.1.0.2";
-  sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
-  buildDepends = [ stm transformers ];
-  meta = {
-    description = "MonadSTM class analogous to MonadIO";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-supply/default.nix b/pkgs/development/libraries/haskell/monad-supply/default.nix
deleted file mode 100644
index e8c598d3a302..000000000000
--- a/pkgs/development/libraries/haskell/monad-supply/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-supply";
-  version = "0.6";
-  sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Stateful supply monad";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-unify/default.nix b/pkgs/development/libraries/haskell/monad-unify/default.nix
deleted file mode 100644
index f4fac043ea19..000000000000
--- a/pkgs/development/libraries/haskell/monad-unify/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-unify";
-  version = "0.2.2";
-  sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp";
-  buildDepends = [ mtl unorderedContainers ];
-  meta = {
-    description = "Generic first-order unification";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadIO/default.nix b/pkgs/development/libraries/haskell/monadIO/default.nix
deleted file mode 100644
index ec3efa33ae8b..000000000000
--- a/pkgs/development/libraries/haskell/monadIO/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "monadIO";
-  version = "0.10.1.4";
-  sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl";
-  buildDepends = [ mtl stm ];
-  meta = {
-    description = "Overloading of concurrency variables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
deleted file mode 100644
index 2e8c064ac9f3..000000000000
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cryptoApi, mtl, tagged, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monadcryptorandom";
-  version = "0.6.1";
-  sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2";
-  buildDepends = [ cryptoApi mtl tagged transformers ];
-  meta = {
-    homepage = "https://github.com/TomMD/monadcryptorandom";
-    description = "A monad for using CryptoRandomGen";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadlib/default.nix b/pkgs/development/libraries/haskell/monadlib/default.nix
deleted file mode 100644
index bdb12c483b67..000000000000
--- a/pkgs/development/libraries/haskell/monadlib/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "monadLib";
-  version = "3.7.3";
-  sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q";
-  meta = {
-    homepage = "http://wiki.github.com/yav/monadlib";
-    description = "A collection of monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix
deleted file mode 100644
index 9ff5d5079cef..000000000000
--- a/pkgs/development/libraries/haskell/monadloc-pp/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, haskellSrcExts, monadloc, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "monadloc-pp";
-  version = "0.3.1";
-  sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath haskellSrcExts monadloc syb ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/pepeiborra/monadloc-pp";
-    description = "A preprocessor for generating monadic call traces";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadloc/default.nix b/pkgs/development/libraries/haskell/monadloc/default.nix
deleted file mode 100644
index 4d99a61335cf..000000000000
--- a/pkgs/development/libraries/haskell/monadloc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monadloc";
-  version = "0.7.1";
-  sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/pepeiborra/monadloc";
-    description = "A class for monads which can keep a monadic call trace";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix
deleted file mode 100644
index 4d5cd7575fb6..000000000000
--- a/pkgs/development/libraries/haskell/monads-tf/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monads-tf";
-  version = "0.1.0.2";
-  sha256 = "0z07z2lfm3l93fx0qhfd98j76d1rksi5llq67l5v09pm8da4jvyb";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Monad classes, using type families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
deleted file mode 100644
index 3523749dab75..000000000000
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, bson, cryptohash, hashtables, liftedBase
-, monadControl, mtl, network, parsec, random, randomShuffle, text
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mongoDB";
-  version = "2.0.3";
-  sha256 = "1blqd30mw9fl861f07zn7az4psl9byjjbd986884p6rx07m28abk";
-  buildDepends = [
-    binary bson cryptohash hashtables liftedBase monadControl mtl
-    network parsec random randomShuffle text transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/mongodb-haskell/mongodb";
-    description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
deleted file mode 100644
index 91d160fc3450..000000000000
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, dlist, dlistInstances, foldl, hashable, hspec
-, QuickCheck, semigroupoids, semigroups, text, transformers
-, unorderedContainers, vector, vectorAlgorithms, vectorInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mono-traversable";
-  version = "0.6.3";
-  sha256 = "026qii2i6l8lsvhvb9l8gkzybrvf87skg6mjam2bxc3i1bjx1lkr";
-  buildDepends = [
-    comonad dlist dlistInstances hashable semigroupoids semigroups text
-    transformers unorderedContainers vector vectorAlgorithms
-    vectorInstances
-  ];
-  testDepends = [
-    foldl hspec QuickCheck semigroups text transformers
-    unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/mono-traversable";
-    description = "Type classes for mapping, folding, and traversing monomorphic containers";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
deleted file mode 100644
index f7ae10ce08da..000000000000
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, groups, semigroupoids, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "monoid-extras";
-  version = "0.3.3.5";
-  sha256 = "07xll4pz0ijjxj75z0s0bz1lia2f65hsm61snlx0jv3aybrnw280";
-  buildDepends = [ groups semigroupoids semigroups ];
-  jailbreak = true;
-  meta = {
-    description = "Various extra monoid-related definitions and utilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix
deleted file mode 100644
index 147045287dd2..000000000000
--- a/pkgs/development/libraries/haskell/monoid-transformer/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "monoid-transformer";
-  version = "0.0.3";
-  sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l";
-  meta = {
-    description = "Monoid counterparts to some ubiquitous monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monomorphic/default.nix b/pkgs/development/libraries/haskell/monomorphic/default.nix
deleted file mode 100644
index e160878b6802..000000000000
--- a/pkgs/development/libraries/haskell/monomorphic/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "monomorphic";
-  version = "0.0.3.2";
-  sha256 = "13zw506wifz2lf7n4a48rkn7ym44jpiqag21zc1py6xxdlkbrhh2";
-  meta = {
-    homepage = "https://github.com/konn/monomorphic";
-    description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix
deleted file mode 100644
index a466f75a1b1c..000000000000
--- a/pkgs/development/libraries/haskell/mpppc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, split, text }:
-
-cabal.mkDerivation (self: {
-  pname = "mpppc";
-  version = "0.1.3";
-  sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi";
-  buildDepends = [ ansiTerminal split text ];
-  jailbreak = true;
-  meta = {
-    description = "Multi-dimensional parametric pretty-printer with color";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/msgpack/default.nix b/pkgs/development/libraries/haskell/msgpack/default.nix
deleted file mode 100644
index b2a626621fe2..000000000000
--- a/pkgs/development/libraries/haskell/msgpack/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, hashable, mtl
-, QuickCheck, testFramework, testFrameworkQuickcheck2, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "msgpack";
-  version = "0.7.2.5";
-  sha256 = "1iwibyv5aqp5h98x4s5pp3hj218l2k3vff87p727mh74f5j6l3s8";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq hashable mtl text
-    unorderedContainers vector
-  ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://msgpack.org/";
-    description = "A Haskell implementation of MessagePack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl-prelude/default.nix b/pkgs/development/libraries/haskell/mtl-prelude/default.nix
deleted file mode 100644
index 3bf2395cb3a0..000000000000
--- a/pkgs/development/libraries/haskell/mtl-prelude/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl-prelude";
-  version = "1.0.1";
-  sha256 = "09zdsgh4y4b5chl847n1dz4vys2sdyxmf0v39ad449s5rv5l92hj";
-  buildDepends = [ mtl transformers ];
-  meta = {
-    homepage = "https://github.com/nikita-volkov/mtl-prelude";
-    description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
deleted file mode 100644
index 372c8706cc91..000000000000
--- a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "2.1.3.1";
-  sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/mtl";
-    description = "Monad classes, using functional dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix
deleted file mode 100644
index 19dedb3174a0..000000000000
--- a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "2.2.0.1";
-  sha256 = "0486cg4dp0p942zsg7yxpwn1jykx8p3gb794jaq0v3j44a7x00rb";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/mtl";
-    description = "Monad classes, using functional dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.2.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.1.nix
deleted file mode 100644
index 35a1ffad8d2d..000000000000
--- a/pkgs/development/libraries/haskell/mtl/2.2.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "2.2.1";
-  sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/mtl";
-    description = "Monad classes, using functional dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix
deleted file mode 100644
index 6391d2d9ac01..000000000000
--- a/pkgs/development/libraries/haskell/mtlparse/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "mtlparse";
-  version = "0.1.2";
-  sha256 = "cd85d985e4eff842b1c053a2ff507094a20995c5757acc06ea34ff07d9edd142";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/";
-    description = "parse library using mtl package";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mueval/default.nix b/pkgs/development/libraries/haskell/mueval/default.nix
deleted file mode 100644
index 225994a32e5c..000000000000
--- a/pkgs/development/libraries/haskell/mueval/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, extensibleExceptions, filepath, hint, mtl, show
-, simpleReflect, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mueval";
-  version = "0.9.1.1";
-  sha256 = "0p9qf8lb3c1y87qpl9b4n6v6bjrb9fw3yfg4p7niqdz31454d2pz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal extensibleExceptions filepath hint mtl show simpleReflect
-    utf8String
-  ];
-  meta = {
-    homepage = "https://github.com/gwern/mueval";
-    description = "Safely evaluate pure Haskell expressions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mueval/wrapper.nix b/pkgs/development/libraries/haskell/mueval/wrapper.nix
deleted file mode 100644
index 6c3beb4da8be..000000000000
--- a/pkgs/development/libraries/haskell/mueval/wrapper.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, mueval, makeWrapper, ghc
-, show, simpleReflect, mtl, random, QuickCheck
-, additionalPackages ? [] }:
-
-stdenv.mkDerivation {
-  name = "mueval-wrapper";
-
-  buildInputs = [ makeWrapper show simpleReflect mtl random QuickCheck ]
-    ++ additionalPackages;
-
-  ghcVersion = ghc.version;
-
-  buildCommand = ''
-    PKGPATH=""
-    for p in $nativePkgs; do
-      for i in "$p/lib/ghc-$ghcVersion/package.conf.d/"*.installedconf; do
-        PKGPATH=$PKGPATH''${PKGPATH:+:}$i
-      done
-    done
-
-    makeWrapper "${mueval}/bin/mueval" "$out/bin/mueval" \
-      --prefix PATH : "${mueval}/bin" \
-      --prefix GHC_PACKAGE_PATH : "$PKGPATH" \
-      --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages
-  '';
-
-  preferLocalBuild = true;
-
-  meta = {
-    description = mueval.meta.description;
-  };
-}
-
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
deleted file mode 100644
index f9912a6d0134..000000000000
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "multiarg";
-  version = "0.28.0.0";
-  sha256 = "1qy2xlxqhxlj9f5g7wf90vwch3qs1yz733f87irdmak0v4vxdkd5";
-  buildDepends = [ bifunctors utf8String ];
-  meta = {
-    homepage = "https://github.com/massysett/multiarg";
-    description = "Combinators to build command line parsers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multimap/default.nix b/pkgs/development/libraries/haskell/multimap/default.nix
deleted file mode 100644
index 15764392bf13..000000000000
--- a/pkgs/development/libraries/haskell/multimap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multimap";
-  version = "1.2.1";
-  sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
-  meta = {
-    homepage = "http://hub.darcs.net/scravy/multimap";
-    description = "A multimap";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multipart/default.nix b/pkgs/development/libraries/haskell/multipart/default.nix
deleted file mode 100644
index 82cad64df047..000000000000
--- a/pkgs/development/libraries/haskell/multipart/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "multipart";
-  version = "0.1.2";
-  sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "http://www.github.com/silkapp/multipart";
-    description = "HTTP multipart split out of the cgi package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix
deleted file mode 100644
index 503377b58e0c..000000000000
--- a/pkgs/development/libraries/haskell/multiplate/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "multiplate";
-  version = "0.0.2";
-  sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw";
-  buildDepends = [ transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Multiplate";
-    description = "Lightweight generic library for mutually recursive data types";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
deleted file mode 100644
index d7671a522e6e..000000000000
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multirec";
-  version = "0.7.4";
-  sha256 = "01mligrin7fp3fnnwgv8nrww5938ryghgyw9xyw153a615ryj8i9";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
-    description = "Generic programming for families of recursive datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix
deleted file mode 100644
index b22939347122..000000000000
--- a/pkgs/development/libraries/haskell/multiset/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multiset";
-  version = "0.2.2";
-  sha256 = "1g14c1zm4rdc8nxvb69k98h542wi24q2lpba1gpqjqspk4d0sjmn";
-  meta = {
-    description = "The Data.MultiSet container type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix
deleted file mode 100644
index b16d274e7e68..000000000000
--- a/pkgs/development/libraries/haskell/murmur-hash/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "murmur-hash";
-  version = "0.1.0.7";
-  sha256 = "125v4ypiv8n2m8zd1yi46prz96yy79ap0yzhm4vhrws4cf1zapkp";
-  meta = {
-    homepage = "http://github.com/nominolo/murmur-hash";
-    description = "MurmurHash2 implementation for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mvc-updates/default.nix b/pkgs/development/libraries/haskell/mvc-updates/default.nix
deleted file mode 100644
index ef6d465fd814..000000000000
--- a/pkgs/development/libraries/haskell/mvc-updates/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, foldl, mvc }:
-
-cabal.mkDerivation (self: {
-  pname = "mvc-updates";
-  version = "1.2.0";
-  sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
-  buildDepends = [ async foldl mvc ];
-  meta = {
-    description = "Concurrent and combinable updates";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mvc/default.nix b/pkgs/development/libraries/haskell/mvc/default.nix
deleted file mode 100644
index 0068beb9bc37..000000000000
--- a/pkgs/development/libraries/haskell/mvc/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, contravariant, managed, mmorph, pipes
-, pipesConcurrency, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mvc";
-  version = "1.0.3";
-  sha256 = "1b1342qxyn2jxb3a5c9bp6ai7iwhbjxgfpbh2kjm7v75444lx78g";
-  buildDepends = [
-    async contravariant managed mmorph pipes pipesConcurrency
-    transformers
-  ];
-  meta = {
-    description = "Model-view-controller";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
deleted file mode 100644
index 5e015ecbe967..000000000000
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, primitive, QuickCheck, statistics, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, time, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mwc-random";
-  version = "0.13.2.2";
-  sha256 = "1rsrvadaih66xn8zr8kfvrr65g7wpj6i9jnzkmlik9lqrvz4axcp";
-  buildDepends = [ primitive time vector ];
-  testDepends = [
-    HUnit QuickCheck statistics testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/mwc-random";
-    description = "Fast, high quality pseudo random number generation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mysql-simple/default.nix b/pkgs/development/libraries/haskell/mysql-simple/default.nix
deleted file mode 100644
index 3698b727fe01..000000000000
--- a/pkgs/development/libraries/haskell/mysql-simple/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual
-, mysql, pcreLight, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mysql-simple";
-  version = "0.2.2.4";
-  sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6";
-  buildDepends = [
-    attoparsec base16Bytestring blazeBuilder blazeTextual mysql
-    pcreLight text time
-  ];
-  meta = {
-    homepage = "https://github.com/bos/mysql-simple";
-    description = "A mid-level MySQL client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix
deleted file mode 100644
index 5422443d2fe5..000000000000
--- a/pkgs/development/libraries/haskell/mysql/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mysqlConfig, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "mysql";
-  version = "0.1.1.7";
-  sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0";
-  buildTools = [ mysqlConfig ];
-  extraLibraries = [ zlib ];
-  meta = {
-    homepage = "https://github.com/bos/mysql";
-    description = "A low-level MySQL client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix
deleted file mode 100644
index 156e0c04a0a2..000000000000
--- a/pkgs/development/libraries/haskell/nanospec/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, silently }:
-
-cabal.mkDerivation (self: {
-  pname = "nanospec";
-  version = "0.2.0";
-  sha256 = "0g10l86cv33r58zxn2bprqlm80i7g86bwzhn9jqg9s81xc0aw2qv";
-  testDepends = [ hspec silently ];
-  doCheck = false;
-  meta = {
-    description = "A lightweight implementation of a subset of Hspec's API";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix
deleted file mode 100644
index e3b55592204c..000000000000
--- a/pkgs/development/libraries/haskell/nat/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "nat";
-  version = "0.3";
-  sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
-  meta = {
-    description = "Lazy binary natural numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix
deleted file mode 100644
index 3c4130eddc48..000000000000
--- a/pkgs/development/libraries/haskell/nats/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable }:
-
-cabal.mkDerivation (self: {
-  pname = "nats";
-  version = "1";
-  sha256 = "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0";
-  buildDepends = [ hashable ];
-  meta = {
-    homepage = "http://github.com/ekmett/nats/";
-    description = "Natural numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix
deleted file mode 100644
index f4ed7dd2a123..000000000000
--- a/pkgs/development/libraries/haskell/naturals/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "naturals";
-  version = "0.2.0.2";
-  sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
-  meta = {
-    homepage = "frigidcode.com";
-    description = "Constructors and related functions for natural numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
deleted file mode 100644
index 3a5cd89b9267..000000000000
--- a/pkgs/development/libraries/haskell/ncurses/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, ncurses, text, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "ncurses";
-  version = "0.2.11";
-  sha256 = "08jr224i37jxrprka9c276sid6mw001m8r2krd6g8jscshwd5nzk";
-  buildDepends = [ text transformers ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ ncurses ];
-  patchPhase = "find . -type f -exec sed -i -e 's|ncursesw/||' {} \\;";
-  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/netlist-to-vhdl/default.nix b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
deleted file mode 100644
index 6794ce4f37f6..000000000000
--- a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, netlist }:
-
-cabal.mkDerivation (self: {
-  pname = "netlist-to-vhdl";
-  version = "0.3.1";
-  sha256 = "15daik7l0pjqilya01l5rl84g2fyjwkap1md0nx82gxcp8m1v76k";
-  buildDepends = [ netlist ];
-  meta = {
-    description = "Convert a Netlist AST to VHDL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/netlist/default.nix b/pkgs/development/libraries/haskell/netlist/default.nix
deleted file mode 100644
index 70d993cf8e48..000000000000
--- a/pkgs/development/libraries/haskell/netlist/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "netlist";
-  version = "0.3.1";
-  sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67";
-  buildDepends = [ binary syb ];
-  meta = {
-    description = "Netlist AST";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix
deleted file mode 100644
index f60af56b62fb..000000000000
--- a/pkgs/development/libraries/haskell/netwire/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, parallel, profunctors, random, semigroups, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "netwire";
-  version = "5.0.1";
-  sha256 = "1izl4iarcc6z2j0d6gkcygpp63asajikn1p44p8ixwzx96xx578r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    deepseq parallel profunctors random semigroups time transformers
-  ];
-  meta = {
-    homepage = "http://hub.darcs.net/ertes/netwire";
-    description = "Functional reactive programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-carbon/default.nix b/pkgs/development/libraries/haskell/network-carbon/default.nix
deleted file mode 100644
index 82d6c47844d7..000000000000
--- a/pkgs/development/libraries/haskell/network-carbon/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, text, time, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "network-carbon";
-  version = "1.0.2";
-  sha256 = "0r9riydwvmn8v9iih475agl4idb3z6v3djmn3pjlda28g3p0zw9h";
-  buildDepends = [ network text time vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ocharles/network-carbon";
-    description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
deleted file mode 100644
index 5b023f91b66d..000000000000
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, connection, cprngAes, dataDefault
-, HUnit, monadControl, mtl, network, streamingCommons, systemFileio
-, systemFilepath, tls, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network-conduit-tls";
-  version = "1.1.0.2";
-  sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax";
-  buildDepends = [
-    conduit conduitExtra connection cprngAes dataDefault monadControl
-    network streamingCommons systemFileio systemFilepath tls
-    transformers
-  ];
-  testDepends = [ conduit conduitExtra connection HUnit mtl ];
-  meta = {
-    homepage = "https://github.com/snoyberg/conduit";
-    description = "Create TLS-aware network code with conduits";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
deleted file mode 100644
index 4bc1292f074e..000000000000
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit }:
-
-cabal.mkDerivation (self: {
-  pname = "network-conduit";
-  version = "1.1.0";
-  sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p";
-  buildDepends = [ conduit ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Stream socket data using conduits. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-data/default.nix b/pkgs/development/libraries/haskell/network-data/default.nix
deleted file mode 100644
index d6c94c97a322..000000000000
--- a/pkgs/development/libraries/haskell/network-data/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, prettyclass }:
-
-cabal.mkDerivation (self: {
-  pname = "network-data";
-  version = "0.5.2";
-  sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s";
-  buildDepends = [ cereal prettyclass ];
-  meta = {
-    description = "Library for network data structures and their serialization";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix
deleted file mode 100644
index 92e6e9e34c7e..000000000000
--- a/pkgs/development/libraries/haskell/network-fancy/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "network-fancy";
-  version = "0.2.2";
-  sha256 = "12q2ifjwg4ss5l2pv42nfhsawncbwm6y4dwrspadkjv9b8idl91j";
-  meta = {
-    homepage = "http://github.com/taruti/network-fancy";
-    description = "Networking support with a cleaner API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix
deleted file mode 100644
index df584710c142..000000000000
--- a/pkgs/development/libraries/haskell/network-info/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "network-info";
-  version = "0.2.0.5";
-  sha256 = "0ggxnkjkbspynma0wjrc1wwwb9ygx2dhl0n9lfaq7l8r69z7pqwf";
-  meta = {
-    homepage = "http://github.com/jystic/network-info";
-    description = "Access the local computer's basic network configuration";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-metrics/default.nix b/pkgs/development/libraries/haskell/network-metrics/default.nix
deleted file mode 100644
index 1c6bf19e82b7..000000000000
--- a/pkgs/development/libraries/haskell/network-metrics/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataDefault, network, random, time }:
-
-cabal.mkDerivation (self: {
-  pname = "network-metrics";
-  version = "0.4";
-  sha256 = "0dvrjf84pdm42pxwc7fm4gvswc5nzmdsq7cr7ab8jyzvjqb8684c";
-  buildDepends = [ binary dataDefault network random time ];
-  meta = {
-    homepage = "http://github.com/brendanhay/network-metrics";
-    description = "Send metrics to Ganglia, Graphite, and statsd";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix
deleted file mode 100644
index 2102ad3c6056..000000000000
--- a/pkgs/development/libraries/haskell/network-multicast/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network }:
-
-cabal.mkDerivation (self: {
-  pname = "network-multicast";
-  version = "0.0.11";
-  sha256 = "0fgscv9crk2lx99rh234ipgl5psbrjili95inxj23drvwmsj3135";
-  buildDepends = [ network ];
-  meta = {
-    description = "Simple multicast library";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
deleted file mode 100644
index 90d9becb8048..000000000000
--- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gnuidn, gnutls, gsasl, libxmlSax, monadsTf, network, text
-, transformers, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network-protocol-xmpp";
-  version = "0.4.6";
-  sha256 = "0xmafjz11v2dlbyg2ny90ycz315s23yprdpxz3l06igjxw6h3v6n";
-  buildDepends = [
-    gnuidn gnutls gsasl libxmlSax monadsTf network text transformers
-    xmlTypes
-  ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-xmpp/";
-    description = "Client library for the XMPP protocol";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix
deleted file mode 100644
index ba7b0a01f5f4..000000000000
--- a/pkgs/development/libraries/haskell/network-simple/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, network, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "network-simple";
-  version = "0.4.0.2";
-  sha256 = "0k155m1s7k157rpsz8ww9cs7jyw3faybwfmw97agvskhb4axw6hf";
-  buildDepends = [ exceptions network transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/k0001/network-simple";
-    description = "Simple network sockets usage patterns";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
deleted file mode 100644
index cd467f5d2ab7..000000000000
--- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, network, networkTransport
-, networkTransportTests
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network-transport-tcp";
-  version = "0.4.1";
-  sha256 = "11fj0f2yrvdqn3sivfb4p0chs74bx26a0yc49fh160kkcmk42yaf";
-  buildDepends = [ dataAccessor network networkTransport ];
-  testDepends = [ network networkTransport networkTransportTests ];
-  doCheck = false;
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "TCP instantiation of Network.Transport";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
deleted file mode 100644
index 5ee1edec2e98..000000000000
--- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, mtl, networkTransport, random }:
-
-cabal.mkDerivation (self: {
-  pname = "network-transport-tests";
-  version = "0.2.1.0";
-  sha256 = "17qf52a76an9ignhb85alz92j9vk3p0ydmaqys8b1ss5mkqipm64";
-  buildDepends = [ ansiTerminal mtl networkTransport random ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "Unit tests for Network.Transport implementations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix
deleted file mode 100644
index 410e6076f291..000000000000
--- a/pkgs/development/libraries/haskell/network-transport/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, hashable, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "network-transport";
-  version = "0.4.1.0";
-  sha256 = "0xn879ngrbnm71i1wsbxxiih22sdb6csy6aip6fgqyafqlpc1c93";
-  buildDepends = [ binary hashable transformers ];
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "Network abstraction layer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-uri/default.nix b/pkgs/development/libraries/haskell/network-uri/default.nix
deleted file mode 100644
index 6cfd4dca161d..000000000000
--- a/pkgs/development/libraries/haskell/network-uri/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, network, parsec, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network-uri";
-  version = "2.6.0.1";
-  sha256 = "09ymamb128jgqghpda4nixncr73all8qc6q53976aricm6a27p37";
-  buildDepends = [ parsec ];
-  testDepends = [
-    HUnit network testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/network-uri";
-    description = "URI manipulation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
deleted file mode 100644
index 515be08fbcc9..000000000000
--- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.2.1.7";
-  sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58";
-  buildDepends = [ parsec ];
-  meta = {
-    description = "Networking-related facilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
deleted file mode 100644
index 757991666b6a..000000000000
--- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.3.0.13";
-  sha256 = "0xw53czvcw8k49aqxmchc1rcd6pyxp4icwgp64625fnm3l4yjiq7";
-  buildDepends = [ parsec ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.5.0.0.nix b/pkgs/development/libraries/haskell/network/2.5.0.0.nix
deleted file mode 100644
index 59a338a79077..000000000000
--- a/pkgs/development/libraries/haskell/network/2.5.0.0.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, parsec, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.5.0.0";
-  sha256 = "1x90fdzfigqq2vbjqg73p4vyy7p1z0apj79cpl7i9v9amxa6y5mj";
-  buildDepends = [ parsec ];
-  testDepends = [
-    HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.6.0.2.nix b/pkgs/development/libraries/haskell/network/2.6.0.2.nix
deleted file mode 100644
index 37540ad323eb..000000000000
--- a/pkgs/development/libraries/haskell/network/2.6.0.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.6.0.2";
-  sha256 = "12b7saam5ga6l4cplgkad49xa4vkynz2ri9jxidx1cxiqjcl0vc4";
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  meta = {
-    homepage = "https://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix
deleted file mode 100644
index 14105ed7349e..000000000000
--- a/pkgs/development/libraries/haskell/newtype/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "newtype";
-  version = "0.2";
-  sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p";
-  meta = {
-    description = "A typeclass and set of functions for working with newtypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/non-empty/default.nix b/pkgs/development/libraries/haskell/non-empty/default.nix
deleted file mode 100644
index 7fba365097b1..000000000000
--- a/pkgs/development/libraries/haskell/non-empty/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "non-empty";
-  version = "0.2";
-  sha256 = "1wapx5q8spvlq8g7nagj2lwhrqzg90dw4n0qvd1ap47n0rh3iymm";
-  buildDepends = [ QuickCheck utilityHt ];
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/non-empty/";
-    description = "List-like structures with static restrictions on the number of elements";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix
deleted file mode 100644
index 9b7af5e77517..000000000000
--- a/pkgs/development/libraries/haskell/non-negative/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "non-negative";
-  version = "0.1.1";
-  sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7";
-  buildDepends = [ QuickCheck utilityHt ];
-  testDepends = [ QuickCheck utilityHt ];
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/non-negative/";
-    description = "Non-negative numbers";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
deleted file mode 100644
index 3d2ef6af751b..000000000000
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }:
-
-cabal.mkDerivation (self: {
-  pname = "numbers";
-  version = "3000.2.0.1";
-  sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk";
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/jwiegley/numbers#readme";
-    description = "Various number types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numeric-extras/default.nix b/pkgs/development/libraries/haskell/numeric-extras/default.nix
deleted file mode 100644
index 918427d0fa0f..000000000000
--- a/pkgs/development/libraries/haskell/numeric-extras/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ 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
deleted file mode 100644
index 003629d7852a..000000000000
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, nonNegative, parsec, QuickCheck, random
-, storableRecord, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "numeric-prelude";
-  version = "0.4.1";
-  sha256 = "1y1dg4bk811xmz3p23g8kjl6vxns3gs8qj671971c06nccfl1h5r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    deepseq nonNegative parsec QuickCheck random storableRecord
-    utilityHt
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
-    description = "An experimental alternative hierarchy of numeric type classes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix
deleted file mode 100644
index 3b6c777efbfb..000000000000
--- a/pkgs/development/libraries/haskell/numtype-tf/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "numtype-tf";
-  version = "0.1.2";
-  sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
-  meta = {
-    homepage = "http://dimensional.googlecode.com/";
-    description = "Type-level (low cardinality) integers, implemented using type families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
deleted file mode 100644
index 76874e045293..000000000000
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "numtype";
-  version = "1.1";
-  sha256 = "1az10xcfl6qpyy9qnh8g2iqx53rxnjxzc1h8kl1gira6yv7g6857";
-  meta = {
-    homepage = "http://dimensional.googlecode.com/";
-    description = "Type-level (low cardinality) integers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/objective/default.nix b/pkgs/development/libraries/haskell/objective/default.nix
deleted file mode 100644
index 4051efb42f71..000000000000
--- a/pkgs/development/libraries/haskell/objective/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cleanUnions, elevator, minioperational, profunctors
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "objective";
-  version = "0.6.1";
-  sha256 = "1rnlh16r9kcrxffih6z8rprds9nxhlqksqba9wdgdkkwhrhq0ah6";
-  buildDepends = [
-    cleanUnions elevator minioperational profunctors transformers
-  ];
-  meta = {
-    homepage = "https://github.com/fumieval/objective";
-    description = "Extensible objects";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
deleted file mode 100644
index b1b9bd5820f3..000000000000
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP, HUnit, network, networkUri, testFramework
-, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "oeis";
-  version = "0.3.6";
-  sha256 = "1q7ywczm2d5inrjqgz3j8vfk5sj2yixvwdkzlfs2whd0gadbcfa0";
-  buildDepends = [ HTTP network networkUri ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  meta = {
-    description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ofx/default.nix b/pkgs/development/libraries/haskell/ofx/default.nix
deleted file mode 100644
index d7fd805f5e81..000000000000
--- a/pkgs/development/libraries/haskell/ofx/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec, time }:
-
-cabal.mkDerivation (self: {
-  pname = "ofx";
-  version = "0.4.0.2";
-  sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg";
-  buildDepends = [ parsec time ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.github.com/massysett/ofx";
-    description = "Parser for OFX data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/oo-prototypes/default.nix b/pkgs/development/libraries/haskell/oo-prototypes/default.nix
deleted file mode 100644
index b9f011d3aa13..000000000000
--- a/pkgs/development/libraries/haskell/oo-prototypes/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "oo-prototypes";
-  version = "0.1.0.0";
-  sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
-  meta = {
-    homepage = "https://github.com/yi-editor/oo-prototypes";
-    description = "Support for OO-like prototypes";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/opaleye/default.nix b/pkgs/development/libraries/haskell/opaleye/default.nix
deleted file mode 100644
index 918bef94fbae..000000000000
--- a/pkgs/development/libraries/haskell/opaleye/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, postgresqlSimple, productProfunctors
-, profunctors, semigroups, text, time, transformers, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "opaleye";
-  version = "0.3";
-  sha256 = "1jq2q0dswgj5jksdd5xn2ny66d1nfqmwf7cv835gg59g4rd2yyrx";
-  buildDepends = [
-    contravariant postgresqlSimple productProfunctors profunctors
-    semigroups text time transformers uuid
-  ];
-  testDepends = [
-    postgresqlSimple productProfunctors profunctors time
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
-    description = "An SQL-generating DSL targeting PostgreSQL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix
deleted file mode 100644
index 5ae373fbac2d..000000000000
--- a/pkgs/development/libraries/haskell/openssl-streams/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HsOpenSSL, HUnit, ioStreams, network, testFramework
-, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "openssl-streams";
-  version = "1.2.0.0";
-  sha256 = "01hdrsdrp2x7i5zydn2b0blzir7vqvn63n9sf9pwcgnkk6s5j1wc";
-  buildDepends = [ HsOpenSSL ioStreams network ];
-  testDepends = [
-    HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit
-  ];
-  jailbreak = true;
-  meta = {
-    description = "OpenSSL network support for io-streams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/operational/default.nix b/pkgs/development/libraries/haskell/operational/default.nix
deleted file mode 100644
index d3359a3377e9..000000000000
--- a/pkgs/development/libraries/haskell/operational/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, random }:
-
-cabal.mkDerivation (self: {
-  pname = "operational";
-  version = "0.2.3.2";
-  sha256 = "1aj3jhiyz4190b0qmyp684b8lbzrp8jn56s898892rvbp0hxa0pd";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl random ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Operational";
-    description = "Implementation of difficult monads made easy with operational semantics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/opml/default.nix b/pkgs/development/libraries/haskell/opml/default.nix
deleted file mode 100644
index a44954c10cda..000000000000
--- a/pkgs/development/libraries/haskell/opml/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "opml";
-  version = "0.4";
-  sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x";
-  buildDepends = [ xml ];
-  meta = {
-    description = "Representing and handling OPML subscription information";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix
deleted file mode 100644
index 721de1e600e1..000000000000
--- a/pkgs/development/libraries/haskell/options/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chell, chellQuickcheck, monadsTf, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "options";
-  version = "1.2";
-  sha256 = "14qrkwd8h50wf6972p0ylvhnc8mh11fqk9l8q0h9lapj7ywm74vx";
-  buildDepends = [ monadsTf transformers ];
-  testDepends = [ chell chellQuickcheck monadsTf transformers ];
-  doCheck = false;
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-options/";
-    description = "A powerful and easy-to-use command-line option parser";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
deleted file mode 100644
index ea2dc95e364b..000000000000
--- a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiWlPprint, transformers, transformersCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "optparse-applicative";
-  version = "0.10.0";
-  sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb";
-  buildDepends = [ ansiWlPprint transformers transformersCompat ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/pcapriotti/optparse-applicative";
-    description = "Utilities and combinators for parsing command line options";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix
deleted file mode 100644
index bef76ab73ee6..000000000000
--- a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiWlPprint, transformers, transformersCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "optparse-applicative";
-  version = "0.11.0.1";
-  sha256 = "0jdzajj9w0dghv751m59l3imzm2x9lx9cqb6094mncnx8k6cf6f9";
-  buildDepends = [ ansiWlPprint transformers transformersCompat ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/pcapriotti/optparse-applicative";
-    description = "Utilities and combinators for parsing command line options";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
deleted file mode 100644
index feb273fbdeb7..000000000000
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, attoparsec, dataDefault, filepath
-, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb
-, tagsoup, temporary, text, time, vector, xmlConduit, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pandoc-citeproc";
-  version = "0.6";
-  sha256 = "1whi8mrbhfi8wr3qbj1lkgc1pngn8151jjri409hshl1mng4aq5b";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson aesonPretty attoparsec dataDefault filepath hsBibutils mtl
-    pandoc pandocTypes parsec rfc5051 split syb tagsoup temporary text
-    time vector xmlConduit yaml
-  ];
-  testDepends = [
-    aeson filepath pandoc pandocTypes temporary text yaml
-  ];
-  doCheck = false;
-  meta = {
-    description = "Supports using pandoc with citeproc";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
deleted file mode 100644
index 2aff8f024788..000000000000
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, deepseqGenerics, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "pandoc-types";
-  version = "1.12.4.1";
-  sha256 = "1wbgm0s45smi8gix0byapkiarbb416fv765fc329qsvl295xlyqq";
-  buildDepends = [ aeson deepseqGenerics syb ];
-  meta = {
-    homepage = "http://johnmacfarlane.net/pandoc";
-    description = "Types for representing a structured document";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
deleted file mode 100644
index 3788c1f3bf88..000000000000
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, alex, ansiTerminal, base64Bytestring, binary
-, blazeHtml, blazeMarkup, dataDefault, deepseqGenerics, Diff
-, executablePath, extensibleExceptions, filepath, haddockLibrary
-, happy, highlightingKate, hslua, HTTP, httpClient, httpClientTls
-, httpTypes, HUnit, JuicyPixels, mtl, network, networkUri
-, pandocTypes, parsec, QuickCheck, random, scientific, SHA, syb
-, tagsoup, temporary, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, texmath, text, time
-, unorderedContainers, vector, xml, yaml, zipArchive, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pandoc";
-  version = "1.13.1";
-  sha256 = "0vvysa70xp4pskxrvslmddwdsalc479zb8wn6z1vmpvfssvvj6vv";
-  editedCabalFile = "1i57yk1pql4gv97cs86fk82hkwncics1wkzjqd9iz866204y4wrg";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson alex base64Bytestring binary blazeHtml blazeMarkup
-    dataDefault deepseqGenerics extensibleExceptions filepath
-    haddockLibrary happy highlightingKate hslua HTTP httpClient
-    httpClientTls httpTypes JuicyPixels mtl network networkUri
-    pandocTypes parsec random scientific SHA syb tagsoup temporary
-    texmath text time unorderedContainers vector xml yaml zipArchive
-    zlib
-  ];
-  testDepends = [
-    ansiTerminal Diff executablePath filepath highlightingKate HUnit
-    pandocTypes QuickCheck syb testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text zipArchive
-  ];
-  configureFlags = "-fhttps -fmake-pandoc-man-pages";
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://johnmacfarlane.net/pandoc";
-    description = "Conversion between markup formats";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
deleted file mode 100644
index d79b931132df..000000000000
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pango";
-  version = "0.13.0.4";
-  sha256 = "1fglwywac36abpjjpgdsk62f4sndgr5nf29fmana0yac7hxsm1sq";
-  buildDepends = [ cairo glib mtl text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ cairo pango ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Pango text rendering engine";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix
deleted file mode 100644
index 2bf50add8620..000000000000
--- a/pkgs/development/libraries/haskell/parallel-io/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, random }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel-io";
-  version = "0.3.3";
-  sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ extensibleExceptions random ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://batterseapower.github.com/parallel-io";
-    description = "Combinators for executing IO actions in parallel on a thread pool";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
deleted file mode 100644
index 0e73c691383e..000000000000
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel";
-  version = "3.2.0.3";
-  sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Parallel programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix
deleted file mode 100644
index 987ee8c5bdc3..000000000000
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel";
-  version = "3.2.0.5";
-  sha256 = "16hhsi8pr29qqg9ssks0y9j0vmnvpyy1qk46s0c0vgj3pyzl38mm";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Parallel programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix
deleted file mode 100644
index 495df8984f6a..000000000000
--- a/pkgs/development/libraries/haskell/parseargs/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "parseargs";
-  version = "0.1.5.2";
-  sha256 = "0pzw7w1kr2rv6ffqgn93rypn37wy2r5k01p3y5256laaplm575am";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://github.com/BartMassey/parseargs";
-    description = "Command-line argument parsing library for Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsec-extra/default.nix b/pkgs/development/libraries/haskell/parsec-extra/default.nix
deleted file mode 100644
index b3dfb2e0a152..000000000000
--- a/pkgs/development/libraries/haskell/parsec-extra/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadsTf, parsec, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "parsec-extra";
-  version = "0.1.0.5";
-  sha256 = "0x5lpkly8z26ygp0k8ddkybgmfi5n2vnf6sv3sjn3xm531xf6qy4";
-  buildDepends = [ monadsTf parsec transformers ];
-  meta = {
-    description = "Some miscellaneous basic string parsers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix
deleted file mode 100644
index f2258da99682..000000000000
--- a/pkgs/development/libraries/haskell/parsec/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }:
-
-cabal.mkDerivation (self: {
-  pname = "parsec";
-  version = "3.1.7";
-  sha256 = "12h7n367gaw9ifd19yd3ppi4j6kghf7rryacl0ips0fwlxw1x8wa";
-  buildDepends = [ mtl text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.cs.uu.nl/~daan/parsec.html";
-    description = "Monadic parser combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix
deleted file mode 100644
index 45bb96561c33..000000000000
--- a/pkgs/development/libraries/haskell/parsek/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "parsek";
-  version = "1.0.1.2";
-  sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd";
-  meta = {
-    description = "Parallel Parsing Processes";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsers/default.nix b/pkgs/development/libraries/haskell/parsers/default.nix
deleted file mode 100644
index 25f4a1370831..000000000000
--- a/pkgs/development/libraries/haskell/parsers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, charset, doctest, filepath, parsec, QuickCheck
-, quickcheckInstances, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "parsers";
-  version = "0.12.1.1";
-  sha256 = "1yx75xbmg3lms0hj79r5w9fl81g5cbsm842lijhd9jnnbli2mzfw";
-  buildDepends = [
-    attoparsec charset parsec text transformers unorderedContainers
-  ];
-  testDepends = [
-    attoparsec doctest filepath parsec QuickCheck quickcheckInstances
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/parsers/";
-    description = "Parsing combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix
deleted file mode 100644
index 14b0d08396e9..000000000000
--- a/pkgs/development/libraries/haskell/parsimony/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "parsimony";
-  version = "1.3";
-  sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg";
-  buildDepends = [ text ];
-  meta = {
-    description = "Monadic parser combinators derived from Parsec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix
deleted file mode 100644
index eea91f43cb59..000000000000
--- a/pkgs/development/libraries/haskell/path-pieces/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, QuickCheck, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "path-pieces";
-  version = "0.1.4";
-  sha256 = "1fxhp4bk88km7z1rdpify7l38li5k21qxw3vgcmq9b6bblvz6y2v";
-  buildDepends = [ text time ];
-  testDepends = [ hspec HUnit QuickCheck text ];
-  meta = {
-    description = "Components of paths";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix
deleted file mode 100644
index d004b177e3d2..000000000000
--- a/pkgs/development/libraries/haskell/pathtype/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "pathtype";
-  version = "0.5.4";
-  sha256 = "1ns5q3nrkl99xp4mrmk8wpvb9qzyvnw5cyjwh5rh76ykm2d5dbg7";
-  buildDepends = [ QuickCheck time ];
-  meta = {
-    homepage = "http://code.haskell.org/pathtype";
-    description = "Type-safe replacement for System.FilePath etc";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/patience/default.nix b/pkgs/development/libraries/haskell/patience/default.nix
deleted file mode 100644
index 6f70eb1e14d1..000000000000
--- a/pkgs/development/libraries/haskell/patience/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "patience";
-  version = "0.1.1";
-  sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
-  meta = {
-    description = "Patience diff and longest increasing subsequence";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pattern-arrows/default.nix b/pkgs/development/libraries/haskell/pattern-arrows/default.nix
deleted file mode 100644
index 43ef906aad26..000000000000
--- a/pkgs/development/libraries/haskell/pattern-arrows/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "pattern-arrows";
-  version = "0.0.2";
-  sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html";
-    description = "Arrows for Pretty Printing";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pbkdf/default.nix b/pkgs/development/libraries/haskell/pbkdf/default.nix
deleted file mode 100644
index 6f30043ee3b7..000000000000
--- a/pkgs/development/libraries/haskell/pbkdf/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, byteable, bytedump, cryptohash, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "pbkdf";
-  version = "1.1.1.1";
-  sha256 = "1nbn8kan43i00g23g8aljxjpaxm9q1qhzxxdgks0mc4mr1f7bifx";
-  buildDepends = [ binary byteable bytedump cryptohash utf8String ];
-  testDepends = [ binary byteable bytedump cryptohash utf8String ];
-  meta = {
-    homepage = "https://github.com/cdornan/pbkdf";
-    description = "Haskell implementation of the PBKDF functions from RFC-2898";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
deleted file mode 100644
index db35b2fe020d..000000000000
--- a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enumerator, pcap, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pcap-enumerator";
-  version = "0.5";
-  sha256 = "0v7ar3jbs54ibhrbbzmvajc7pc8h8dv56wr77w4vsbyz6xq4sqdb";
-  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
deleted file mode 100644
index 56e2e71969cd..000000000000
--- a/pkgs/development/libraries/haskell/pcap/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ 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/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
deleted file mode 100644
index 49e0d5fffadc..000000000000
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pcre }:
-
-cabal.mkDerivation (self: {
-  pname = "pcre-light";
-  version = "0.4.0.3";
-  sha256 = "0l1df2sk5qwf424bvb8mbdkr2xjg43fi92n5r22yd7vm1zz0jqvf";
-  extraLibraries = [ pcre ];
-  meta = {
-    homepage = "https://github.com/Daniel-Diaz/pcre-light";
-    description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix
deleted file mode 100644
index 5ca5ab956228..000000000000
--- a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base16Bytestring, ioStreams, pdfToolboxCore
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pdf-toolbox-content";
-  version = "0.0.3.1";
-  sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz";
-  buildDepends = [
-    attoparsec base16Bytestring ioStreams pdfToolboxCore text
-  ];
-  meta = {
-    homepage = "https://github.com/Yuras/pdf-toolbox";
-    description = "A collection of tools for processing PDF files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix
deleted file mode 100644
index bc7b179a0da2..000000000000
--- a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, errors, ioStreams, scientific, transformers
-, zlibBindings
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pdf-toolbox-core";
-  version = "0.0.3.0";
-  sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6";
-  buildDepends = [
-    attoparsec errors ioStreams scientific transformers zlibBindings
-  ];
-  meta = {
-    homepage = "https://github.com/Yuras/pdf-toolbox";
-    description = "A collection of tools for processing PDF files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix
deleted file mode 100644
index 77615ed86650..000000000000
--- a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cipherRc4, cryptohash, ioStreams, pdfToolboxContent
-, pdfToolboxCore, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pdf-toolbox-document";
-  version = "0.0.4.0";
-  sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa";
-  buildDepends = [
-    cipherRc4 cryptohash ioStreams pdfToolboxContent pdfToolboxCore
-    text transformers
-  ];
-  meta = {
-    homepage = "https://github.com/Yuras/pdf-toolbox";
-    description = "A collection of tools for processing PDF files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix
deleted file mode 100644
index 42944c03205e..000000000000
--- a/pkgs/development/libraries/haskell/pem/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, HUnit, mtl, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pem";
-  version = "0.2.2";
-  sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
-  buildDepends = [ base64Bytestring mtl ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-pem";
-    description = "Privacy Enhanced Mail (PEM) format reader and writer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix
deleted file mode 100644
index 1c86e8259a8c..000000000000
--- a/pkgs/development/libraries/haskell/permutation/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "permutation";
-  version = "0.5.0.4";
-  sha256 = "0kl5yw1as2y8yf2ac2f6v7g8k7mzjqw5fdh18a6m3jfhjw9rcqf7";
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/spacekitteh/permutation";
-    description = "A library for permutations and combinations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix
deleted file mode 100644
index db4b89990b26..000000000000
--- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeBuilder, conduit, monadControl, monadLogger
-, mysql, mysqlSimple, persistent, resourcet, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent-mysql";
-  version = "2.1.2";
-  sha256 = "06i2wcrqvk216bq3853acqi6wgrdzkz3wzah231gv3yz348lr6sv";
-  buildDepends = [
-    aeson blazeBuilder conduit monadControl monadLogger mysql
-    mysqlSimple persistent resourcet text transformers
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Backend for the persistent library using MySQL database server";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
deleted file mode 100644
index 1ccdeca92771..000000000000
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeBuilder, conduit, monadControl, monadLogger
-, persistent, postgresqlLibpq, postgresqlSimple, resourcet, text
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent-postgresql";
-  version = "2.1.1";
-  sha256 = "0mfvzd62qn7ffx6nrgkr52qzl3prjq8xkahvb6j5akb6azdmzg80";
-  buildDepends = [
-    aeson blazeBuilder conduit monadControl monadLogger persistent
-    postgresqlLibpq postgresqlSimple resourcet text time transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Backend for the persistent library using postgresql";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
deleted file mode 100644
index 34a427ddb07b..000000000000
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, conduit, monadControl, monadLogger, persistent
-, resourcet, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent-sqlite";
-  version = "2.1.1";
-  sha256 = "1hypaixwp6q10gfwbg0xfqfw7vz9j56max5i0k1mklan6js7wy9w";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson conduit monadControl monadLogger persistent resourcet text
-    transformers
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Backend for the persistent library using sqlite3";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
deleted file mode 100644
index 1c8f502ba7b9..000000000000
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, hspec, monadControl, monadLogger, pathPieces
-, persistent, QuickCheck, tagged, text, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent-template";
-  version = "2.1";
-  sha256 = "0rj3yqm38kg7lvj9hi4c5yaypvxj6pwb47b0kg8h2hsa0rshhrdy";
-  buildDepends = [
-    aeson monadControl monadLogger pathPieces persistent tagged text
-    transformers unorderedContainers
-  ];
-  testDepends = [
-    aeson hspec persistent QuickCheck text transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Type-safe, non-relational, multi-backend persistence";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
deleted file mode 100644
index 9775f510d425..000000000000
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml
-, blazeMarkup, conduit, exceptions, fastLogger, hspec, liftedBase
-, monadControl, monadLogger, mtl, pathPieces, resourcePool
-, resourcet, scientific, silently, sqlite, tagged, text, time
-, transformers, transformersBase, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent";
-  version = "2.1.1.4";
-  sha256 = "0nknyrxh28i4cf50fj6mclgd4qnrqsby1w1bzj8jmg8snbyp69d2";
-  buildDepends = [
-    aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
-    exceptions fastLogger liftedBase monadControl monadLogger mtl
-    pathPieces resourcePool resourcet scientific silently tagged text
-    time transformers transformersBase unorderedContainers vector
-  ];
-  testDepends = [
-    aeson attoparsec base64Bytestring blazeHtml conduit hspec
-    monadControl monadLogger pathPieces resourcet scientific text time
-    transformers unorderedContainers vector
-  ];
-  extraLibraries = [ sqlite ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Type-safe, multi-backend data serialization";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix
deleted file mode 100644
index 0e80c55a4475..000000000000
--- a/pkgs/development/libraries/haskell/pgm/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "pgm";
-  version = "0.1.4";
-  sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "https://github.com/astanin/haskell-pgm";
-    description = "Pure Haskell implementation of PGM image format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
deleted file mode 100644
index 237492a65bd1..000000000000
--- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesBytestring
-, pipesParse, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-aeson";
-  version = "0.4.1.2";
-  sha256 = "0wacib0wf40bkm6rp2qcsrahc43g89l3icclbrshk8r54dhbazl7";
-  buildDepends = [
-    aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
-    transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/k0001/pipes-aeson";
-    description = "Encode and decode JSON streams using Aeson and Pipes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
deleted file mode 100644
index d9d5caf4d29e..000000000000
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, tasty
-, tastyHunit, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-attoparsec";
-  version = "0.5.1.1";
-  sha256 = "1ns8s3p6jh4iya71z3j81cqnrfnr4n92kblwgkjlapb23dykl2qz";
-  buildDepends = [ attoparsec pipes pipesParse text transformers ];
-  testDepends = [
-    attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text
-    transformers
-  ];
-  meta = {
-    homepage = "https://github.com/k0001/pipes-attoparsec";
-    description = "Attoparsec and Pipes integration";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix
deleted file mode 100644
index ea9fe83eab7d..000000000000
--- a/pkgs/development/libraries/haskell/pipes-binary/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse
-, smallcheck, tasty, tastyHunit, tastySmallcheck, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-binary";
-  version = "0.4.0.3";
-  sha256 = "0r56h5f9i6hy4zb2bhfi26y7y3z0j4nacdb2dgkxmh5mqjd33f0q";
-  buildDepends = [
-    binary pipes pipesBytestring pipesParse transformers
-  ];
-  testDepends = [
-    binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit
-    tastySmallcheck transformers
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/k0001/pipes-binary";
-    description = "Encode and decode binary streams using the pipes and binary libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
deleted file mode 100644
index 8c52ccf5546d..000000000000
--- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pipes, pipesGroup, pipesParse, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-bytestring";
-  version = "2.1.0";
-  sha256 = "1q98444kpcdc817zbg121g2n1mhblrdfsmd0bs5rqq6ijxb213z0";
-  buildDepends = [ pipes pipesGroup pipesParse transformers ];
-  meta = {
-    description = "ByteString support for pipes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
deleted file mode 100644
index 91c9c6a8e193..000000000000
--- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, pipes, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-concurrency";
-  version = "2.0.2";
-  sha256 = "0g4fbh8dk8ph2ga0vyanqj52rxk9c1zi6g4yk3a1g6bnf4bklhm8";
-  buildDepends = [ pipes stm ];
-  testDepends = [ async pipes stm ];
-  meta = {
-    description = "Concurrency for the pipes ecosystem";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-csv/default.nix b/pkgs/development/libraries/haskell/pipes-csv/default.nix
deleted file mode 100644
index e26526fb0466..000000000000
--- a/pkgs/development/libraries/haskell/pipes-csv/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, cassava, HUnit, pipes, pipesBytestring
-, testFramework, testFrameworkHunit, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-csv";
-  version = "1.4.0";
-  sha256 = "1q1gnfnkvlkk8lwllhyar7323k3jynh9rl6x9yks7lc3nqr1n16j";
-  buildDepends = [
-    blazeBuilder cassava pipes unorderedContainers vector
-  ];
-  testDepends = [
-    cassava HUnit pipes pipesBytestring testFramework
-    testFrameworkHunit vector
-  ];
-  meta = {
-    description = "Fast, streaming csv parser";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-group/default.nix b/pkgs/development/libraries/haskell/pipes-group/default.nix
deleted file mode 100644
index 584713352bac..000000000000
--- a/pkgs/development/libraries/haskell/pipes-group/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, free, pipes, pipesParse, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-group";
-  version = "1.0.1";
-  sha256 = "19caih65hsvnvkwv8dlrrf961aw6k0zr9yx78cia1padslidxlbw";
-  buildDepends = [ free pipes pipesParse transformers ];
-  meta = {
-    description = "Group streams into substreams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix
deleted file mode 100644
index 5f432bc9dd98..000000000000
--- a/pkgs/development/libraries/haskell/pipes-http/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpClient, httpClientTls, pipes }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-http";
-  version = "1.0.2";
-  sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk";
-  buildDepends = [ httpClient httpClientTls pipes ];
-  jailbreak = true;
-  meta = {
-    description = "HTTP client with pipes interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix
deleted file mode 100644
index 4e7cd3d125d1..000000000000
--- a/pkgs/development/libraries/haskell/pipes-network/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, networkSimple, pipes, pipesSafe, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-network";
-  version = "0.6.4";
-  sha256 = "1wabyv5j4q0wxiz8ry7dq3amlvfh4r0721pd2lksx7hj3a5qzm2p";
-  buildDepends = [
-    network networkSimple pipes pipesSafe transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/k0001/pipes-network";
-    description = "Use network sockets together with the pipes library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix
deleted file mode 100644
index 270908a56a67..000000000000
--- a/pkgs/development/libraries/haskell/pipes-parse/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pipes, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-parse";
-  version = "3.0.2";
-  sha256 = "1d5lhh8knk0hmvd9wv2ihs5z9ybyvhd1n7qaazqkazqkyl14pd08";
-  buildDepends = [ pipes transformers ];
-  meta = {
-    description = "Parsing infrastructure for the pipes ecosystem";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix
deleted file mode 100644
index ea2b230feebc..000000000000
--- a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, exceptions, mtl, pipes, pipesConcurrency, pipesSafe
-, postgresqlSimple, stm, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-postgresql-simple";
-  version = "0.1.2.0";
-  sha256 = "12ij2msdwjzzc93mlvvizh6amam5ld9j1a0b9xsa2awdjd21mwc1";
-  buildDepends = [
-    async exceptions mtl pipes pipesConcurrency pipesSafe
-    postgresqlSimple stm text transformers
-  ];
-  meta = {
-    description = "Convert various postgresql-simple calls to work with pipes";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix
deleted file mode 100644
index 6c3265cc9f4d..000000000000
--- a/pkgs/development/libraries/haskell/pipes-safe/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, pipes, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-safe";
-  version = "2.2.0";
-  sha256 = "1m44a2pbws73jbr2ca48i94mrfwzlsibyc22i2w3fqq159qfg6ca";
-  buildDepends = [ exceptions pipes transformers ];
-  meta = {
-    description = "Safety for the pipes ecosystem";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-shell/default.nix b/pkgs/development/libraries/haskell/pipes-shell/default.nix
deleted file mode 100644
index f7f5e20bcf44..000000000000
--- a/pkgs/development/libraries/haskell/pipes-shell/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, hspec, pipes, pipesBytestring, pipesSafe, stm
-, stmChans, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-shell";
-  version = "0.1.3";
-  sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1";
-  buildDepends = [
-    async pipes pipesBytestring pipesSafe stm stmChans text
-  ];
-  testDepends = [
-    async hspec pipes pipesBytestring pipesSafe stm stmChans text
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Create proper Pipes from System.Process";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix
deleted file mode 100644
index 177eb6e7d358..000000000000
--- a/pkgs/development/libraries/haskell/pipes-text/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe
-, streamingCommons, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-text";
-  version = "0.0.0.15";
-  sha256 = "10906gdb9gjhxxmxvmib6kw7py6fl2r4df5bryqvbjvr1afcc3x9";
-  buildDepends = [
-    pipes pipesBytestring pipesGroup pipesParse pipesSafe
-    streamingCommons text transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/michaelt/text-pipes";
-    description = "Text pipes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
deleted file mode 100644
index bbb555681e04..000000000000
--- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pipes, transformers, zlib, zlibBindings }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-zlib";
-  version = "0.4.3";
-  sha256 = "04iiw0r1mnxl4myyp87wqhff6jm0g2246gwismi7jnwy7xmllsmc";
-  buildDepends = [ pipes transformers zlib zlibBindings ];
-  meta = {
-    homepage = "https://github.com/k0001/pipes-zlib";
-    description = "Zlib and GZip compression and decompression for Pipes streams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
deleted file mode 100644
index 9703b14fc71b..000000000000
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mmorph, mtl, QuickCheck, testFramework
-, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes";
-  version = "4.1.4";
-  sha256 = "0bv7i18lf15mvfscnif4hkwgm4anw8b7bbqhzdw4wbjqcvrrsppb";
-  buildDepends = [ mmorph mtl transformers ];
-  testDepends = [
-    mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Compositional pipelines";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/placeholders/default.nix b/pkgs/development/libraries/haskell/placeholders/default.nix
deleted file mode 100644
index bb4a2c5ca150..000000000000
--- a/pkgs/development/libraries/haskell/placeholders/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "placeholders";
-  version = "0.1";
-  sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
-  meta = {
-    homepage = "http://github.com/ahammar/placeholders";
-    description = "Placeholders for use while developing Haskell code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/plugins/default.nix b/pkgs/development/libraries/haskell/plugins/default.nix
deleted file mode 100644
index face90f5b1d8..000000000000
--- a/pkgs/development/libraries/haskell/plugins/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, ghcPaths, haskellSrc, random }:
-
-cabal.mkDerivation (self: {
-  pname = "plugins";
-  version = "1.5.4.0";
-  sha256 = "126lp2bbz9aa3pfi5dmbbzgsancdj1m26k7man96avixb21mzbi8";
-  buildDepends = [ Cabal filepath ghcPaths haskellSrc random ];
-  meta = {
-    homepage = "http://hub.darcs.net/stepcut/plugins";
-    description = "Dynamic linking for Haskell and C objects";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix
deleted file mode 100644
index 82ee1a418c7c..000000000000
--- a/pkgs/development/libraries/haskell/pointed/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm
-, tagged, transformers, transformersCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pointed";
-  version = "4.1.1";
-  sha256 = "183ix3cax4qvph6grghpj5n4m7bd5xznqahjbgwz88gkf9rp2gbj";
-  buildDepends = [
-    comonad dataDefaultClass semigroupoids semigroups stm tagged
-    transformers transformersCompat
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/pointed/";
-    description = "Pointed and copointed data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pointedlist/default.nix b/pkgs/development/libraries/haskell/pointedlist/default.nix
deleted file mode 100644
index 8acb4bac6b17..000000000000
--- a/pkgs/development/libraries/haskell/pointedlist/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "pointedlist";
-  version = "0.6.1";
-  sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l";
-  buildDepends = [ binary ];
-  meta = {
-    description = "A zipper-like comonad which works as a list, tracking a position";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix
deleted file mode 100644
index e2bb34f895c1..000000000000
--- a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "polynomials-bernstein";
-  version = "1.1.1";
-  sha256 = "0pjdwi84gz5j1rij4m89nyljjafzjnakmf4yd6vj4xz54nmmygg6";
-  buildDepends = [ vector ];
-  meta = {
-    description = "A solver for systems of polynomial equations in bernstein form";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix
deleted file mode 100644
index 2b4e881421c2..000000000000
--- a/pkgs/development/libraries/haskell/polyparse/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "polyparse";
-  version = "1.10";
-  sha256 = "0nz7dv91a2f7gf4jnma8qcqa4n6qjcyggf8qdja46sdcabpd0ij2";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://code.haskell.org/~malcolm/polyparse/";
-    description = "A variety of alternative parser combinator libraries";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
deleted file mode 100644
index 14098c980bb3..000000000000
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadControl, resourcePool, resourcet, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pool-conduit";
-  version = "0.1.2.3";
-  sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv";
-  buildDepends = [
-    monadControl resourcePool resourcet transformers
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Resource pool allocations via ResourceT. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pop3-client/default.nix b/pkgs/development/libraries/haskell/pop3-client/default.nix
deleted file mode 100644
index e0f1edad52e3..000000000000
--- a/pkgs/development/libraries/haskell/pop3-client/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network }:
-
-cabal.mkDerivation (self: {
-  pname = "pop3-client";
-  version = "0.1.4";
-  sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
-  buildDepends = [ mtl network ];
-  meta = {
-    homepage = "https://github.com/tmrudick/haskell-pop3-client/";
-    description = "POP3 Client Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix
deleted file mode 100644
index 0eb3c13f9bd4..000000000000
--- a/pkgs/development/libraries/haskell/poppler/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gdk_pixbuf, glib, gtk, gtk2hsBuildtools, libc, mtl
-, pango, popplerGlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "poppler";
-  version = "0.13";
-  sha256 = "1fv0h2ixanzv5vy4l2ln23f9n8ghmgdxzlyx54hh69bwhrcg049s";
-  buildDepends = [ cairo glib gtk mtl ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc ];
-  pkgconfigDepends = [ cairo gdk_pixbuf glib gtk pango popplerGlib ];
-  patchPhase = ''
-    sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
-    sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/gtk2hs/";
-    description = "Binding to the Poppler";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/posix-paths/default.nix b/pkgs/development/libraries/haskell/posix-paths/default.nix
deleted file mode 100644
index 3a49c84b7834..000000000000
--- a/pkgs/development/libraries/haskell/posix-paths/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "posix-paths";
-  version = "0.2.0.3";
-  sha256 = "16r0sd2m9xzzkrvj6qvc7z3yc8r83kpx724v5wifphcri3scvznv";
-  testDepends = [ doctest HUnit QuickCheck ];
-  meta = {
-    description = "POSIX filepath/directory functionality";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
deleted file mode 100644
index eb677e4868c6..000000000000
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, postgresql }:
-
-cabal.mkDerivation (self: {
-  pname = "postgresql-libpq";
-  version = "0.9.0.1";
-  sha256 = "0fdz9pkmrajqm026s6d5ib9kqg5ph93fw7l2xrgf22zagl53rzx3";
-  extraLibraries = [ postgresql ];
-  meta = {
-    homepage = "http://github.com/lpsmith/postgresql-libpq";
-    description = "low-level binding to libpq";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
deleted file mode 100644
index d48e80e30143..000000000000
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base16Bytestring, blazeBuilder
-, blazeTextual, caseInsensitive, cryptohash, hashable, HUnit
-, postgresqlLibpq, scientific, text, time, transformers, uuid
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "postgresql-simple";
-  version = "0.4.8.0";
-  sha256 = "09mflczxjm7a8nixi4a989nq1ijhpikl4j9kqvzcpmfgb8sx38nm";
-  buildDepends = [
-    aeson attoparsec blazeBuilder blazeTextual caseInsensitive hashable
-    postgresqlLibpq scientific text time transformers uuid vector
-  ];
-  testDepends = [
-    aeson base16Bytestring cryptohash HUnit text time vector
-  ];
-  doCheck = false;
-  meta = {
-    description = "Mid-Level PostgreSQL client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix
deleted file mode 100644
index c84253da0e80..000000000000
--- a/pkgs/development/libraries/haskell/ppm/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "ppm";
-  version = "2009.5.13";
-  sha256 = "9e390ca9a9e6e740fa71d2b72fa2c9c3d521118b0ebb35f10fabbbe543ecfb5b";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://github.com/nfjinjing/ppm/tree/master";
-    description = "a tiny PPM image generator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pqueue/default.nix b/pkgs/development/libraries/haskell/pqueue/default.nix
deleted file mode 100644
index fdf153c5a262..000000000000
--- a/pkgs/development/libraries/haskell/pqueue/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "pqueue";
-  version = "1.2.1";
-  sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Reliable, persistent, fast priority queues";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prelude-extras/default.nix b/pkgs/development/libraries/haskell/prelude-extras/default.nix
deleted file mode 100644
index 40cbfef908a3..000000000000
--- a/pkgs/development/libraries/haskell/prelude-extras/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "prelude-extras";
-  version = "0.4";
-  sha256 = "0mzsc9pzcamaa7i3g9hkajy35sbpqdjrflv6r98r8hhlr0yrdjan";
-  meta = {
-    homepage = "http://github.com/ekmett/prelude-extras";
-    description = "Haskell 98 - higher order versions of Prelude classes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prelude-safeenum/default.nix b/pkgs/development/libraries/haskell/prelude-safeenum/default.nix
deleted file mode 100644
index 17674a5be56f..000000000000
--- a/pkgs/development/libraries/haskell/prelude-safeenum/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "prelude-safeenum";
-  version = "0.1.1.1";
-  sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv";
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "A redefinition of the Prelude's Enum class in order to render it safe";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/default.nix b/pkgs/development/libraries/haskell/preprocessor-tools/default.nix
deleted file mode 100644
index 021becccfa1f..000000000000
--- a/pkgs/development/libraries/haskell/preprocessor-tools/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "preprocessor-tools";
-  version = "1.0.1";
-  sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
-  buildDepends = [ mtl parsec syb ];
-  meta = {
-    homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
-    description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix
deleted file mode 100644
index a8efaf7554e5..000000000000
--- a/pkgs/development/libraries/haskell/presburger/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "presburger";
-  version = "1.2";
-  sha256 = "1kx51ydpjg5dv762p85qh9w76qm038rw9pgfnd0az1vms97r1kpm";
-  testDepends = [ QuickCheck ];
-  meta = {
-    homepage = "http://github.com/yav/presburger";
-    description = "A decision procedure for quantifier-free linear arithmetic";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/present/default.nix b/pkgs/development/libraries/haskell/present/default.nix
deleted file mode 100644
index ee63eccf005b..000000000000
--- a/pkgs/development/libraries/haskell/present/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoLisp, dataDefault, mtl, semigroups, text }:
-
-cabal.mkDerivation (self: {
-  pname = "present";
-  version = "2.2";
-  sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4";
-  buildDepends = [ aeson attoLisp dataDefault mtl semigroups text ];
-  meta = {
-    description = "Make presentations for data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
deleted file mode 100644
index a9a39529f61d..000000000000
--- a/pkgs/development/libraries/haskell/pretty-show/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, happy, haskellLexer }:
-
-cabal.mkDerivation (self: {
-  pname = "pretty-show";
-  version = "1.6.8";
-  sha256 = "0vfb712dvbb91659sch62d06vm0451b9l4l0hdwnlbhzjymmh2rs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath haskellLexer ];
-  buildTools = [ happy ];
-  meta = {
-    homepage = "http://wiki.github.com/yav/pretty-show";
-    description = "Tools for working with derived `Show` instances and generic inspection of values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prettyclass/default.nix b/pkgs/development/libraries/haskell/prettyclass/default.nix
deleted file mode 100644
index a81d734aaa9b..000000000000
--- a/pkgs/development/libraries/haskell/prettyclass/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "prettyclass";
-  version = "1.0.0.0";
-  sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5";
-  meta = {
-    description = "Pretty printing class similar to Show";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
deleted file mode 100644
index 49ad80e064fb..000000000000
--- a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.5.0.1";
-  sha256 = "04s33xqxz68ddppig5pjf7ki1y5y62xzzzmg3b5pkcxp0r6rsv2j";
-  meta = {
-    homepage = "http://code.haskell.org/primitive";
-    description = "Primitive memory-related operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix
deleted file mode 100644
index 2b43bf467c17..000000000000
--- a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.5.1.0";
-  sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8";
-  meta = {
-    homepage = "https://github.com/haskell/primitive";
-    description = "Primitive memory-related operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
deleted file mode 100644
index 4f6d728122c7..000000000000
--- a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.5.3.0";
-  sha256 = "11wfdnhrgb7606d5sywqzlvnhzf45a9ywl9wghysvmr0mq2iypvn";
-  meta = {
-    homepage = "https://github.com/haskell/primitive";
-    description = "Primitive memory-related operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix
deleted file mode 100644
index 08b081d227c7..000000000000
--- a/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.5.4.0";
-  sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10";
-  meta = {
-    homepage = "https://github.com/haskell/primitive";
-    description = "Primitive memory-related operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/probability/default.nix b/pkgs/development/libraries/haskell/probability/default.nix
deleted file mode 100644
index bada700ca3d3..000000000000
--- a/pkgs/development/libraries/haskell/probability/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, transformers, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "probability";
-  version = "0.2.4.1";
-  sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc";
-  buildDepends = [ random transformers utilityHt ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
-    description = "Probabilistic Functional Programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix
deleted file mode 100644
index ff8a54b85717..000000000000
--- a/pkgs/development/libraries/haskell/process-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, controlMonadLoop, hspec, mtl
-, resourcet, shakespeare, shakespeareText, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "process-conduit";
-  version = "1.2.0.1";
-  sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8";
-  buildDepends = [
-    conduit controlMonadLoop mtl resourcet shakespeare shakespeareText
-    text
-  ];
-  testDepends = [ conduit conduitExtra hspec resourcet ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/snoyberg/process-conduit";
-    description = "Conduits for processes (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix
deleted file mode 100644
index 000b3b78e7f0..000000000000
--- a/pkgs/development/libraries/haskell/process-extras/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, text }:
-
-cabal.mkDerivation (self: {
-  pname = "process-extras";
-  version = "0.2.0";
-  sha256 = "0mr4f2v19qz6d6jhffz9gky0ykdqwl8c11adbdm04wm2a3xsvf7g";
-  buildDepends = [ deepseq text ];
-  meta = {
-    homepage = "https://github.com/davidlazar/process-extras";
-    description = "Process extras";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/process/1.2.0.0.nix b/pkgs/development/libraries/haskell/process/1.2.0.0.nix
deleted file mode 100644
index 615f9201b04e..000000000000
--- a/pkgs/development/libraries/haskell/process/1.2.0.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "process";
-  version = "1.2.0.0";
-  sha256 = "02il5pxibf0q9b46v0lgdxyc2wlk5kg1v8223ry6brg41zpcj71q";
-  buildDepends = [ deepseq filepath ];
-  meta = {
-    description = "Process libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/product-profunctors/default.nix b/pkgs/development/libraries/haskell/product-profunctors/default.nix
deleted file mode 100644
index 444baa76a1a9..000000000000
--- a/pkgs/development/libraries/haskell/product-profunctors/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, profunctors }:
-
-cabal.mkDerivation (self: {
-  pname = "product-profunctors";
-  version = "0.6";
-  sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4";
-  buildDepends = [ contravariant profunctors ];
-  testDepends = [ profunctors ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/tomjaguarpaw/product-profunctors";
-    description = "product-profunctors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix
deleted file mode 100644
index b1336cd59daf..000000000000
--- a/pkgs/development/libraries/haskell/profunctors/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, distributive, semigroupoids, tagged, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "profunctors";
-  version = "4.3.2";
-  sha256 = "06dv9bjz2hsm32kzfqqm6z54197dfjm3wycnbbgl9pib711w484v";
-  buildDepends = [
-    comonad distributive semigroupoids tagged transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/profunctors/";
-    description = "Profunctors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
deleted file mode 100644
index 8cb7dfd32ae1..000000000000
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, conduit, conduitExtra, hspec, mtl
-, QuickCheck, resourcet, systemFileio, systemFilepath, text
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "project-template";
-  version = "0.1.4.2";
-  sha256 = "10n23s6g7fv0l42hsb804z0qqcyxqw32kwzg1f0w3c6gka844akr";
-  buildDepends = [
-    base64Bytestring conduit conduitExtra mtl resourcet systemFileio
-    systemFilepath text transformers
-  ];
-  testDepends = [
-    base64Bytestring conduit hspec QuickCheck resourcet systemFilepath
-    text transformers
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/haskell-ide";
-    description = "Specify Haskell project templates and generate files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
deleted file mode 100644
index 73ddd10427a5..000000000000
--- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fgl, graphviz, mtl, prolog, text }:
-
-cabal.mkDerivation (self: {
-  pname = "prolog-graph-lib";
-  version = "0.2.0.1";
-  sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr";
-  buildDepends = [ fgl graphviz mtl prolog text ];
-  meta = {
-    homepage = "https://github.com/Erdwolf/prolog";
-    description = "Generating images of resolution trees for Prolog queries";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix
deleted file mode 100644
index 7a8d0fc42f2c..000000000000
--- a/pkgs/development/libraries/haskell/prolog-graph/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "prolog-graph";
-  version = "0.1.0.2";
-  sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs fgl graphviz mtl prolog prologGraphLib text
-  ];
-  meta = {
-    homepage = "https://github.com/Erdwolf/prolog";
-    description = "A command line tool to visualize query resolution in Prolog";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix
deleted file mode 100644
index 71539fb342a0..000000000000
--- a/pkgs/development/libraries/haskell/prolog/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, syb, thLift, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "prolog";
-  version = "0.2.0.1";
-  sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0";
-  buildDepends = [ mtl parsec syb thLift transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/Erdwolf/prolog";
-    description = "A Prolog interpreter written in Haskell";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/protobuf/default.nix b/pkgs/development/libraries/haskell/protobuf/default.nix
deleted file mode 100644
index 3b0c1508ce02..000000000000
--- a/pkgs/development/libraries/haskell/protobuf/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, dataBinaryIeee754, deepseq, hex, HUnit, mtl
-, QuickCheck, tagged, tasty, tastyHunit, tastyQuickcheck, text
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "protobuf";
-  version = "0.2.0.4";
-  sha256 = "0gg678cb1psgdsjzv9x7mhcjmywj8bgzmp9pd850d3p9zyiw9l2j";
-  buildDepends = [
-    cereal dataBinaryIeee754 deepseq mtl text unorderedContainers
-  ];
-  testDepends = [
-    cereal hex HUnit mtl QuickCheck tagged tasty tastyHunit
-    tastyQuickcheck text unorderedContainers
-  ];
-  meta = {
-    homepage = "https://github.com/alphaHeavy/protobuf";
-    description = "Google Protocol Buffers via GHC.Generics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
deleted file mode 100644
index e7df6ac2075e..000000000000
--- a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, protocolBuffers }:
-
-cabal.mkDerivation (self: {
-  pname = "protocol-buffers-descriptor";
-  version = "2.0.17";
-  sha256 = "0jl041645d83iqqiw891d2k760jql6djvi2mmjh9lnmp48lwjy3p";
-  buildDepends = [ protocolBuffers ];
-  meta = {
-    homepage = "http://code.haskell.org/protocol-buffers/";
-    description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
deleted file mode 100644
index d3d81a146580..000000000000
--- a/pkgs/development/libraries/haskell/protocol-buffers/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, filepath, mtl, parsec, syb, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "protocol-buffers";
-  version = "2.0.17";
-  sha256 = "12aky44ssgdj6vsjg0yvr8350cym7n6kn7gdaax0nxzpfxrjfy1v";
-  buildDepends = [ binary filepath mtl parsec syb utf8String ];
-  meta = {
-    homepage = "http://code.haskell.org/protocol-buffers/";
-    description = "Parse Google Protocol Buffer specifications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/psqueues/default.nix b/pkgs/development/libraries/haskell/psqueues/default.nix
deleted file mode 100644
index aea7f2f09508..000000000000
--- a/pkgs/development/libraries/haskell/psqueues/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, deepseq, hashable, HUnit, QuickCheck, tagged
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "psqueues";
-  version = "0.1.1.0";
-  sha256 = "1w6i6cl9wfblbg8d06lffh4l5y42li9a27myyvwnzfv86z49s9cb";
-  buildDepends = [ deepseq hashable ];
-  testDepends = [
-    deepseq hashable HUnit QuickCheck tagged testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  meta = {
-    description = "Pure priority search queues";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
-
diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
deleted file mode 100644
index 2a2d8fcd0985..000000000000
--- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, dataDefault, HUnit, idna, text, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "publicsuffixlist";
-  version = "0.1";
-  sha256 = "0mbrmhgyjp8jms3fd3nq4knc4j97sw8ijrmnlfjs7qj8jw4vwzxk";
-  buildDepends = [ cereal dataDefault text utf8String ];
-  testDepends = [ cereal dataDefault HUnit idna text utf8String ];
-  meta = {
-    homepage = "https://github.com/litherum/publicsuffixlist";
-    description = "Is a given string a domain suffix?";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix
deleted file mode 100644
index 3a07d382754f..000000000000
--- a/pkgs/development/libraries/haskell/punycode/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, encoding, HUnit, mtl, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "punycode";
-  version = "2.0";
-  sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr";
-  buildDepends = [ cereal mtl text ];
-  testDepends = [ cereal encoding HUnit mtl QuickCheck text ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/litherum/punycode";
-    description = "Encode unicode strings to ascii forms according to RFC 3492";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pure-cdb/default.nix b/pkgs/development/libraries/haskell/pure-cdb/default.nix
deleted file mode 100644
index b173a619cfd4..000000000000
--- a/pkgs/development/libraries/haskell/pure-cdb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl, testSimple, Unixutils, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "pure-cdb";
-  version = "0.1.1";
-  sha256 = "1yjh7h02hkhx2vgvn7qfmfd3bp12ibpkf4znybsd2bfh0i1pzn0n";
-  buildDepends = [ binary mtl vector ];
-  testDepends = [ mtl testSimple Unixutils vector ];
-  meta = {
-    homepage = "https://github.com/bosu/pure-cdb";
-    description = "Another pure-haskell CDB (Constant Database) implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix
deleted file mode 100644
index 0252f8dc6df8..000000000000
--- a/pkgs/development/libraries/haskell/pureMD5/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cereal, cryptoApi, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "pureMD5";
-  version = "2.1.2.1";
-  sha256 = "1zsn949qk95bwx1fbyv84q0lhb4k18bgixl7nivfzsnmhr31fs37";
-  buildDepends = [ binary cereal cryptoApi tagged ];
-  meta = {
-    description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
deleted file mode 100644
index fd6fe516de79..000000000000
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fileEmbed, filepath, haskeline, monadUnify, mtl, nodejs
-, optparseApplicative, parsec, patternArrows, time, transformers
-, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "purescript";
-  version = "0.6.3";
-  sha256 = "0hd6aslsfw2jd06wyfzi1kr86vfj91ywvgl9rv9cyawzczk7l7v4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    fileEmbed filepath haskeline monadUnify mtl optparseApplicative
-    parsec patternArrows time transformers unorderedContainers
-    utf8String
-  ];
-  testDepends = [
-    filepath mtl nodejs parsec transformers utf8String
-  ];
-  meta = {
-    homepage = "http://www.purescript.org/";
-    description = "PureScript Programming Language Compiler";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
deleted file mode 100644
index cca1e04bd4e6..000000000000
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, binary, byteable, cryptohash, random }:
-
-cabal.mkDerivation (self: {
-  pname = "pwstore-fast";
-  version = "2.4.4";
-  sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj";
-  buildDepends = [
-    base64Bytestring binary byteable cryptohash random
-  ];
-  meta = {
-    homepage = "https://github.com/PeterScott/pwstore";
-    description = "Secure password storage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/qrencode/default.nix b/pkgs/development/libraries/haskell/qrencode/default.nix
deleted file mode 100644
index 89defe86bada..000000000000
--- a/pkgs/development/libraries/haskell/qrencode/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, qrencode }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-qrencode";
-  version = "1.0.4";
-  sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj";
-  extraLibraries = [ qrencode ];
-  meta = {
-    homepage = "https://github.com/jamessanders/haskell-qrencode";
-    description = "Haskell bindings for libqrencode";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix b/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix
deleted file mode 100644
index d83fdf12acb6..000000000000
--- a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, ieee754, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-assertions";
-  version = "0.1.1";
-  sha256 = "0hrnr17wafng7nc6d8w6pp1lygplri8xkb5380aq64zg9iik2s21";
-  buildDepends = [ ieee754 QuickCheck ];
-  testDepends = [ hspec ieee754 QuickCheck ];
-  meta = {
-    homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
-    description = "HUnit like assertions for QuickCheck";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
deleted file mode 100644
index 11bcb7aab6d5..000000000000
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, QuickCheck, text, time, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-instances";
-  version = "0.3.9";
-  sha256 = "1a0mbd1kga4qnamp80x2g4avjwcy8z0zrriqxdhb1525wyyb0656";
-  buildDepends = [
-    hashable QuickCheck text time unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/aslatter/qc-instances";
-    description = "Common quickcheck instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
deleted file mode 100644
index d96131c53320..000000000000
--- a/pkgs/development/libraries/haskell/quickcheck-io/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-io";
-  version = "0.1.1";
-  sha256 = "16q3sqvxnaqmbb1zbda8f61mdlmmzxhrznqxab113lmg380nwfm2";
-  buildDepends = [ HUnit QuickCheck ];
-  meta = {
-    description = "Use HUnit assertions as QuickCheck properties";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
deleted file mode 100644
index 3ef3b02851e9..000000000000
--- a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, either, filepath, QuickCheck, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-property-monad";
-  version = "0.2.3";
-  sha256 = "12vg14xwhhsqwygrs5lylsg514am5sslqc15nbl8mwzzxix1w8xb";
-  buildDepends = [ either QuickCheck transformers ];
-  testDepends = [ doctest filepath QuickCheck ];
-  meta = {
-    homepage = "http://github.com/bennofs/quickcheck-property-monad/";
-    description = "quickcheck-property-monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix
deleted file mode 100644
index edc2924f09b9..000000000000
--- a/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-unicode";
-  version = "1.0.0.0";
-  sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq";
-  buildDepends = [ QuickCheck ];
-  meta = {
-    homepage = "https://github.com/bos/quickcheck-unicode";
-    description = "Generator and shrink functions for testing Unicode-related software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
deleted file mode 100644
index 73506a3ba750..000000000000
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, erf, logfloat, mathFunctions, monadLoops, mtl
-, randomShuffle, randomSource, rvar, syb, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "random-fu";
-  version = "0.2.6.1";
-  sha256 = "04fi92szpjyg0ffgxfayz00vpiqi67hzyahhin12wvw3pxbyyp9g";
-  buildDepends = [
-    erf logfloat mathFunctions monadLoops mtl randomShuffle
-    randomSource rvar syb transformers vector
-  ];
-  meta = {
-    homepage = "https://github.com/mokus0/random-fu";
-    description = "Random number generation";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix
deleted file mode 100644
index 76f0c1f0ebb9..000000000000
--- a/pkgs/development/libraries/haskell/random-shuffle/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, MonadRandom, random }:
-
-cabal.mkDerivation (self: {
-  pname = "random-shuffle";
-  version = "0.0.4";
-  sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j";
-  buildDepends = [ MonadRandom random ];
-  meta = {
-    description = "Random shuffle implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
deleted file mode 100644
index bdb341cead5a..000000000000
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom
-, random, stateref, syb, thExtras
-}:
-
-cabal.mkDerivation (self: {
-  pname = "random-source";
-  version = "0.3.0.6";
-  sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk";
-  buildDepends = [
-    flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
-    syb thExtras
-  ];
-  meta = {
-    homepage = "https://github.com/mokus0/random-fu";
-    description = "Generic basis for random number generators";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
deleted file mode 100644
index 031c251fbb7b..000000000000
--- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "random";
-  version = "1.0.1.1";
-  sha256 = "0n8m2744gg233s357vqzq3mfhhnbhynqvp4gxsi2gb70bm03nz6z";
-  buildDepends = [ time ];
-  meta = {
-    description = "random number library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.3.nix b/pkgs/development/libraries/haskell/random/1.0.1.3.nix
deleted file mode 100644
index 3939c4392486..000000000000
--- a/pkgs/development/libraries/haskell/random/1.0.1.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "random";
-  version = "1.0.1.3";
-  sha256 = "06mbjx05c54iz5skn4biyjy9sqdr1qi6d33an8wya7sndnpakd21";
-  buildDepends = [ time ];
-  meta = {
-    description = "random number library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random/1.1.nix b/pkgs/development/libraries/haskell/random/1.1.nix
deleted file mode 100644
index 5ff11eeefda0..000000000000
--- a/pkgs/development/libraries/haskell/random/1.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "random";
-  version = "1.1";
-  sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p";
-  buildDepends = [ time ];
-  meta = {
-    description = "random number library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix
deleted file mode 100644
index 33b1ddf5b449..000000000000
--- a/pkgs/development/libraries/haskell/ranges/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ranges";
-  version = "0.2.4";
-  sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv";
-  meta = {
-    description = "Ranges and various functions on them";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix
deleted file mode 100644
index 7137bf668c56..000000000000
--- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "rank1dynamic";
-  version = "0.2.0.0";
-  sha256 = "09p3lggnsn0355440d9cazwijv9qm4siw99gg2xkk2hamp2sj42h";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rawStringsQq/default.nix b/pkgs/development/libraries/haskell/rawStringsQq/default.nix
deleted file mode 100644
index ca5c22489583..000000000000
--- a/pkgs/development/libraries/haskell/rawStringsQq/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "raw-strings-qq";
-  version = "1.0.2";
-  sha256 = "0wnifa97am2s9bqixlidw3nf8w14h2qkg3sn1rxzgvc3fws57jg9";
-  meta = {
-    homepage = "https://github.com/23Skidoo/raw-strings-qq";
-    description = "Raw string literals for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
deleted file mode 100644
index 2bff24cd3abe..000000000000
--- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cabalMacosx, reactiveBanana, wx, wxcore }:
-
-cabal.mkDerivation (self: {
-  pname = "reactive-banana-wx";
-  version = "0.8.0.0";
-  sha256 = "0qfd839nm2ppjhhhnn6s1hbx1mnrzjqx450p4jadsrs1y2403c9n";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cabalMacosx reactiveBanana wx wxcore ];
-  configureFlags = "-f-buildExamples";
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Reactive-banana";
-    description = "Examples for the reactive-banana library, using wxHaskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
deleted file mode 100644
index 964c4767b272..000000000000
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit
-, transformers, unorderedContainers, vault
-}:
-
-cabal.mkDerivation (self: {
-  pname = "reactive-banana";
-  version = "0.8.0.2";
-  sha256 = "0hfhq663dvvb3jbgdnarawryw09m8ckqvqp6p5n4d4dms4gfzcdv";
-  buildDepends = [
-    hashable pqueue transformers unorderedContainers vault
-  ];
-  testDepends = [
-    hashable HUnit pqueue testFramework testFrameworkHunit transformers
-    unorderedContainers vault
-  ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Reactive-banana";
-    description = "Library for functional reactive programming (FRP)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bluescreen303 ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix
deleted file mode 100644
index 9a05fed7e125..000000000000
--- a/pkgs/development/libraries/haskell/readline/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, readline, ncurses }:
-
-cabal.mkDerivation (self: {
-  pname = "readline";
-  version = "1.0.3.0";
-  sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0";
-  propagatedBuildInputs = [ readline ncurses ];
-  # experimentally link with ncursesw because ghci can't interpret ld scripts,
-  # and ncurses sometimes seems to be a script pointing to ncursesw
-  postConfigure = ''
-    sed -i -e "/^extra-libraries/ s/ncurses/ncursesw/" readline.buildinfo
-  '';
-  meta = {
-    description = "An interface to the GNU readline library";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
deleted file mode 100644
index 00fe58be4b12..000000000000
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP, network, networkUri, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "recaptcha";
-  version = "0.1.0.3";
-  sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
-  buildDepends = [ HTTP network networkUri xhtml ];
-  meta = {
-    homepage = "http://github.com/jgm/recaptcha/tree/master";
-    description = "Functions for using the reCAPTCHA service in web applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix
deleted file mode 100644
index e846d69d0dba..000000000000
--- a/pkgs/development/libraries/haskell/recursion-schemes/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, free, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "recursion-schemes";
-  version = "4.1";
-  sha256 = "03rf65ak6bxsr204j6d8g5zyxva9vbmncycav3smqwfg5n3b3pwf";
-  buildDepends = [ comonad free transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/recursion-schemes/";
-    description = "Generalized bananas, lenses and barbed wire";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
deleted file mode 100644
index 5cf9535e1b2b..000000000000
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, fingertree, hashable, keys, pointed
-, semigroupoids, semigroups, text, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "reducers";
-  version = "3.10.3";
-  sha256 = "0hi77mgc2f38y0xfykn7x6gdl6xg710skpx4z76s8c0wwnd28pr6";
-  buildDepends = [
-    comonad fingertree hashable keys pointed semigroupoids semigroups
-    text transformers unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/reducers/";
-    description = "Semigroups, specialized containers and a general map/reduce framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix
deleted file mode 100644
index b7138c3e9746..000000000000
--- a/pkgs/development/libraries/haskell/reflection/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "reflection";
-  version = "1.5.1";
-  sha256 = "18ail6j7rs5jff9zxphxd7vjkwanpv12dhi98s86r65425fdhjlx";
-  buildDepends = [ tagged ];
-  meta = {
-    homepage = "http://github.com/ekmett/reflection";
-    description = "Reifies arbitrary terms into types that can be reflected back into terms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-applicative/default.nix b/pkgs/development/libraries/haskell/regex-applicative/default.nix
deleted file mode 100644
index 1e3b5b96346c..000000000000
--- a/pkgs/development/libraries/haskell/regex-applicative/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, smallcheck, tasty, tastyHunit, tastySmallcheck
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "regex-applicative";
-  version = "0.3.0.3";
-  sha256 = "111j6x1j7bx5viz2hmgyvcdwfrv5x3f9mifx888hyd3hz850wpwc";
-  buildDepends = [ transformers ];
-  testDepends = [
-    smallcheck tasty tastyHunit tastySmallcheck transformers
-  ];
-  meta = {
-    homepage = "https://github.com/feuerbach/regex-applicative";
-    description = "Regex-based parsing with applicative interface";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-base/default.nix b/pkgs/development/libraries/haskell/regex-base/default.nix
deleted file mode 100644
index 2a99cc96c25d..000000000000
--- a/pkgs/development/libraries/haskell/regex-base/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-base";
-  version = "0.93.2";
-  sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
deleted file mode 100644
index b364f3714a68..000000000000
--- a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexTdfa }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-compat-tdfa";
-  version = "0.95.1.4";
-  sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
-  buildDepends = [ regexBase regexTdfa ];
-  meta = {
-    homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
-    description = "Unicode Support version of Text.Regex, using regex-tdfa";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-compat/default.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix
deleted file mode 100644
index 83dffb381fcd..000000000000
--- a/pkgs/development/libraries/haskell/regex-compat/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexPosix }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-compat";
-  version = "0.95.1";
-  sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
-  buildDepends = [ regexBase regexPosix ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
deleted file mode 100644
index f5ddf2a63889..000000000000
--- a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-pcre-builtin";
-  version = "0.94.4.8.8.35";
-  sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
-  buildDepends = [ regexBase ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/regex-pcre";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix
deleted file mode 100644
index db0f8b7ff453..000000000000
--- a/pkgs/development/libraries/haskell/regex-pcre/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pcre, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-pcre";
-  version = "0.94.4";
-  sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf";
-  buildDepends = [ regexBase ];
-  extraLibraries = [ pcre ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/regex-pcre";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-posix/default.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix
deleted file mode 100644
index 292edc235639..000000000000
--- a/pkgs/development/libraries/haskell/regex-posix/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-posix";
-  version = "0.95.2";
-  sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
-  buildDepends = [ regexBase ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix
deleted file mode 100644
index 0e5bb61bfeda..000000000000
--- a/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-tdfa-rc";
-  version = "1.1.8.3";
-  sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3";
-  buildDepends = [ mtl parsec regexBase ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/regex-tdfa";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix
deleted file mode 100644
index b532234312aa..000000000000
--- a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexTdfa, text }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-tdfa-text";
-  version = "1.0.0.2";
-  sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd";
-  buildDepends = [ regexBase regexTdfa text ];
-  meta = {
-    description = "Text interface for regex-tdfa";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
deleted file mode 100644
index 2508920e1b48..000000000000
--- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-tdfa";
-  version = "1.2.0";
-  sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw";
-  buildDepends = [ mtl parsec regexBase ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/regex-tdfa";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix
deleted file mode 100644
index 2a61bf13598b..000000000000
--- a/pkgs/development/libraries/haskell/regexpr/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, mtlparse }:
-
-cabal.mkDerivation (self: {
-  pname = "regexpr";
-  version = "0.5.4";
-  sha256 = "bf7813247f26877d9fba4ba4b66eb80bfddfc2086a5cd8d635b2da0ccde56604";
-  buildDepends = [ HUnit mtl mtlparse ];
-  meta = {
-    homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/";
-    description = "regular expression like Perl/Ruby in Haskell";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
deleted file mode 100644
index 4b4fe43102ac..000000000000
--- a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hxt, regular, text }:
-
-cabal.mkDerivation (self: {
-  pname = "regular-xmlpickler";
-  version = "0.2";
-  sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
-  buildDepends = [ hxt regular text ];
-  meta = {
-    homepage = "http://github.com/silkapp/regular-xmlpickler";
-    description = "Generic generation of HXT XmlPickler instances using Regular";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
deleted file mode 100644
index d18909d6f29e..000000000000
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "regular";
-  version = "0.3.4.3";
-  sha256 = "12pc58agqb4fi0riwxjf0kykn1z12273q8dcdd0fh2x1ddxwgg2r";
-  meta = {
-    description = "Generic programming library for regular datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rematch/default.nix b/pkgs/development/libraries/haskell/rematch/default.nix
deleted file mode 100644
index 0ef47cde9045..000000000000
--- a/pkgs/development/libraries/haskell/rematch/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "rematch";
-  version = "0.2.0.0";
-  sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr";
-  testDepends = [ hspec HUnit ];
-  doCheck = false;
-  meta = {
-    description = "A simple api for matchers";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/remote/default.nix b/pkgs/development/libraries/haskell/remote/default.nix
deleted file mode 100644
index 47235710b1e4..000000000000
--- a/pkgs/development/libraries/haskell/remote/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, filepath, mtl, network, pureMD5, stm, syb, time
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "remote";
-  version = "0.1.1";
-  sha256 = "14awzhpc21pp4iq53vz4ib81ygxsnlnfppv723zy77z6jja08gf0";
-  buildDepends = [
-    binary filepath mtl network pureMD5 stm syb time utf8String
-  ];
-  meta = {
-    description = "Cloud Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
deleted file mode 100644
index 5abce50c45c0..000000000000
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, llvm, repa, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "repa-algorithms";
-  version = "3.3.1.2";
-  sha256 = "12fizvma877ws3xiz3k34jg5xh5yhnl0n5aq2za005l9i5angkk9";
-  buildDepends = [ repa vector ];
-  extraLibraries = [ llvm ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "Algorithms using the Repa array library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
deleted file mode 100644
index 518e8ce47891..000000000000
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, llvm, QuickCheck, random, repa, repaAlgorithms, repaIo
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "repa-examples";
-  version = "3.3.1.1";
-  sha256 = "0gdkwmdnmvq82zglryxx2ic1nm4g2r4a0bwndiwbj670w03p712p";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    QuickCheck random repa repaAlgorithms repaIo vector
-  ];
-  extraLibraries = [ llvm ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "Examples using the Repa array library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
deleted file mode 100644
index 38e6933de613..000000000000
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, bmp, repa, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "repa-io";
-  version = "3.3.1.2";
-  sha256 = "1i58ysk44y7s6z1jmns2fi83flqma4k5nsjh1pblqb2rgl7x0z5p";
-  buildDepends = [ binary bmp repa vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "Read and write Repa arrays in various formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
deleted file mode 100644
index 7978f80eec71..000000000000
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "repa";
-  version = "3.3.1.2";
-  sha256 = "0rsahd6c1mxd8hq9zfx4jqgmcfs4di4askky87y71xy5v4k1x4ai";
-  buildDepends = [ QuickCheck vector ];
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "High performance, regular, shape polymorphic parallel arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
deleted file mode 100644
index fe075fba1fe6..000000000000
--- a/pkgs/development/libraries/haskell/repr/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }:
-
-cabal.mkDerivation (self: {
-  pname = "repr";
-  version = "0.4.1.3";
-  sha256 = "1y1zl81yjc9jrci83bm6bn8hrfqf6x25vxzkhrkydhhwcwqfqaj5";
-  buildDepends = [
-    baseUnicodeSymbols dstring random stringCombinators
-  ];
-  meta = {
-    homepage = "https://github.com/basvandijk/repr";
-    description = "Render overloaded expressions to their textual representation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reserve/default.nix b/pkgs/development/libraries/haskell/reserve/default.nix
deleted file mode 100644
index 753368e07c77..000000000000
--- a/pkgs/development/libraries/haskell/reserve/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseCompat, hspec, httpConduit, httpKit, httpTypes
-, network, QuickCheck, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "reserve";
-  version = "0.1.0";
-  sha256 = "09b570l6hyn0wfd4nb9xpqrpdb97gbaxnbjlz25y6s0pfg5s1yzp";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ baseCompat httpKit httpTypes network ];
-  testDepends = [
-    baseCompat hspec httpConduit httpKit httpTypes network QuickCheck
-    warp
-  ];
-  meta = {
-    description = "Reserve reloads web applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix b/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
deleted file mode 100644
index 47950176a49f..000000000000
--- a/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, MonadCatchIOTransformers, stm, time
-, transformers, transformersBase, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "resource-pool-catchio";
-  version = "0.2.1.0";
-  sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw";
-  buildDepends = [
-    hashable MonadCatchIOTransformers stm time transformers
-    transformersBase vector
-  ];
-  meta = {
-    homepage = "http://github.com/norm2782/pool";
-    description = "Fork of resource-pool, with a MonadCatchIO constraint";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
deleted file mode 100644
index 76492381c7a1..000000000000
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, monadControl, stm, time, transformers
-, transformersBase, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "resource-pool";
-  version = "0.2.3.2";
-  sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6";
-  buildDepends = [
-    hashable monadControl stm time transformers transformersBase vector
-  ];
-  meta = {
-    homepage = "http://github.com/bos/pool";
-    description = "A high-performance striped resource pooling implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
deleted file mode 100644
index 2ee001b42253..000000000000
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "resourcet";
-  version = "1.1.3.3";
-  sha256 = "0ih5p1k0n3ylcv0yk5x7hjzbzhs67vxmng708g9vz7a24xs2m7w2";
-  buildDepends = [
-    exceptions liftedBase mmorph monadControl mtl transformers
-    transformersBase
-  ];
-  testDepends = [ hspec liftedBase transformers ];
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Deterministic allocation and freeing of scarce resources";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-client/default.nix b/pkgs/development/libraries/haskell/rest-client/default.nix
deleted file mode 100644
index a1a1ce6287b1..000000000000
--- a/pkgs/development/libraries/haskell/rest-client/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aesonUtils, caseInsensitive, dataDefault
-, exceptionTransformers, httpConduit, httpTypes, hxt
-, hxtPickleUtils, monadControl, mtl, primitive, resourcet
-, restTypes, tostring, transformersBase, uriEncode, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-client";
-  version = "0.4.0.5";
-  sha256 = "11rsy9an7ck94ijafqd2ddichz0xgb01w2ybyg3iiwy5ckiy384s";
-  buildDepends = [
-    aesonUtils caseInsensitive dataDefault exceptionTransformers
-    httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive
-    resourcet restTypes tostring transformersBase uriEncode utf8String
-  ];
-  meta = {
-    description = "Utility library for use in generated API client libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix
deleted file mode 100644
index 1c4affbafdc9..000000000000
--- a/pkgs/development/libraries/haskell/rest-core/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonUtils, either, errors, fclabels, HUnit, hxt
-, hxtPickleUtils, jsonSchema, mtl, multipart, random, restStringmap
-, restTypes, safe, split, testFramework, testFrameworkHunit, text
-, transformers, unorderedContainers, uriEncode, utf8String, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-core";
-  version = "0.34.0.3";
-  sha256 = "0jcbnzw0hxq1f7f0frsji3ybdlapmps8dv19ni6rq0bvmiip2i19";
-  buildDepends = [
-    aeson aesonUtils either errors fclabels hxt hxtPickleUtils
-    jsonSchema mtl multipart random restStringmap restTypes safe split
-    text transformers unorderedContainers uriEncode utf8String uuid
-  ];
-  testDepends = [
-    HUnit mtl testFramework testFrameworkHunit unorderedContainers
-  ];
-  meta = {
-    description = "Rest API library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix
deleted file mode 100644
index f97d701fba11..000000000000
--- a/pkgs/development/libraries/haskell/rest-gen/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, Cabal, codeBuilder, fclabels, filepath
-, hashable, haskellSrcExts, hslogger, HStringTemplate, HUnit, hxt
-, jsonSchema, restCore, safe, scientific, semigroups, split, tagged
-, testFramework, testFrameworkHunit, text, uniplate
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-gen";
-  version = "0.16.1.3";
-  sha256 = "1nh3rjnn36v13ikvvxc7xahrj3gsswhiq2w54xclrxjl2fzsqz3a";
-  buildDepends = [
-    aeson blazeHtml Cabal codeBuilder fclabels filepath hashable
-    haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore
-    safe scientific semigroups split tagged text uniplate
-    unorderedContainers vector
-  ];
-  testDepends = [
-    fclabels haskellSrcExts HUnit restCore testFramework
-    testFrameworkHunit
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Documentation and client generation from rest definition";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix
deleted file mode 100644
index 0cb090524e88..000000000000
--- a/pkgs/development/libraries/haskell/rest-happstack/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happstackServer, mtl, restCore, restGen, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "rest-happstack";
-  version = "0.2.10.6";
-  sha256 = "0b21wg4nj24yqh6akyaaw7dxmkdvvb7d9l0d32mz3hx4m2jq9ay5";
-  buildDepends = [ happstackServer mtl restCore restGen utf8String ];
-  meta = {
-    description = "Rest driver for Happstack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix
deleted file mode 100644
index ac584ae48448..000000000000
--- a/pkgs/development/libraries/haskell/rest-snap/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, restCore, safe, snapCore
-, unorderedContainers, uriEncode, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-snap";
-  version = "0.1.17.16";
-  sha256 = "02dh2wjhaabg2aabsf7gl5w65kqpb3jigawwh9n2dr4hz6jhvwia";
-  buildDepends = [
-    caseInsensitive restCore safe snapCore unorderedContainers
-    uriEncode utf8String
-  ];
-  meta = {
-    description = "Rest driver for Snap";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
-
diff --git a/pkgs/development/libraries/haskell/rest-stringmap/default.nix b/pkgs/development/libraries/haskell/rest-stringmap/default.nix
deleted file mode 100644
index 9c1e98c06551..000000000000
--- a/pkgs/development/libraries/haskell/rest-stringmap/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, hashable, hxt, jsonSchema, tagged, text, tostring
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-stringmap";
-  version = "0.2.0.2";
-  sha256 = "0nzkc09679c2mz3amh1avk2kfjpqbhbxsr0r9zvgcs71gqkal2mz";
-  buildDepends = [
-    aeson hashable hxt jsonSchema tagged text tostring
-    unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Maps with stringy keys that can be transcoded to JSON and XML";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix
deleted file mode 100644
index 9a4caac1ad2f..000000000000
--- a/pkgs/development/libraries/haskell/rest-types/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, genericAeson, hxt, jsonSchema, mtl, regular
-, regularXmlpickler, restStringmap, text, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-types";
-  version = "1.12";
-  sha256 = "0is0kzpr7w1bfw32ybkqwj8g4fyx5ii983hbrqas9gbrkgc0hxv6";
-  buildDepends = [
-    aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler
-    restStringmap text uuid
-  ];
-  meta = {
-    description = "Silk Rest Framework Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix
deleted file mode 100644
index 761519a99e2b..000000000000
--- a/pkgs/development/libraries/haskell/rest-wai/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore, text
-, unorderedContainers, wai
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-wai";
-  version = "0.1.0.6";
-  sha256 = "1pawc1msv8vc43jzq4ynirwv6k7l7bfrh8r6q8m2vk1rnl6zsbxz";
-  buildDepends = [
-    caseInsensitive httpTypes mimeTypes mtl restCore text
-    unorderedContainers wai
-  ];
-  meta = {
-    description = "Rest driver for WAI applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
-
diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix
deleted file mode 100644
index bcf4272ad7aa..000000000000
--- a/pkgs/development/libraries/haskell/rethinkdb/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, binary, dataDefault, doctest, mtl
-, network, scientific, text, time, unorderedContainers, utf8String
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rethinkdb";
-  version = "1.15.2.1";
-  sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5";
-  buildDepends = [
-    aeson base64Bytestring binary dataDefault mtl network scientific
-    text time unorderedContainers utf8String vector
-  ];
-  testDepends = [ doctest ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/atnnn/haskell-rethinkdb";
-    description = "A driver for RethinkDB 1.15";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix
deleted file mode 100644
index 0df453d10bbd..000000000000
--- a/pkgs/development/libraries/haskell/retry/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, exceptions, hspec, HUnit, QuickCheck
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "retry";
-  version = "0.5.1";
-  sha256 = "1k5qv7c960dayhddvra1gpy1zv90rdjcrzpg8nzar9bpcxapczvj";
-  buildDepends = [ dataDefaultClass exceptions transformers ];
-  testDepends = [
-    dataDefaultClass exceptions hspec HUnit QuickCheck time
-    transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/Soostone/retry";
-    description = "Retry combinators for monadic actions that may fail";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reverse-apply/default.nix b/pkgs/development/libraries/haskell/reverse-apply/default.nix
deleted file mode 100644
index 8f39027b2515..000000000000
--- a/pkgs/development/libraries/haskell/reverse-apply/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "reverse-apply";
-  version = "2.0.1";
-  sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb";
-  meta = {
-    description = "Standard version of the reverse apply operator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rex/default.nix b/pkgs/development/libraries/haskell/rex/default.nix
deleted file mode 100644
index 2f2d3ca89e51..000000000000
--- a/pkgs/development/libraries/haskell/rex/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, haskellSrcMeta, pcreLight }:
-
-cabal.mkDerivation (self: {
-  pname = "rex";
-  version = "0.5.1";
-  sha256 = "18g09pg7hhj052v72vncjvy900h3xhza8hl2g3akad8asn9k6jl6";
-  buildDepends = [ haskellSrcExts haskellSrcMeta pcreLight ];
-  meta = {
-    homepage = "http://github.com/mgsloan/rex";
-    description = "A quasi-quoter for typeful results of regex captures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rfc5051/default.nix b/pkgs/development/libraries/haskell/rfc5051/default.nix
deleted file mode 100644
index 45a7f3c3da38..000000000000
--- a/pkgs/development/libraries/haskell/rfc5051/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "rfc5051";
-  version = "0.1.0.3";
-  sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "Simple unicode collation as per RFC5051";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix
deleted file mode 100644
index 0ebf6dac3018..000000000000
--- a/pkgs/development/libraries/haskell/robots-txt/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, heredoc, hspec, QuickCheck, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "robots-txt";
-  version = "0.4.1.1";
-  sha256 = "16r6j96iay1r6435ym34dp9iggwlfigmzmqq5k5f5ss5bljfc72f";
-  buildDepends = [ attoparsec time ];
-  testDepends = [ attoparsec heredoc hspec QuickCheck transformers ];
-  meta = {
-    homepage = "http://github.com/meanpath/robots";
-    description = "Parser for robots.txt";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rope/default.nix b/pkgs/development/libraries/haskell/rope/default.nix
deleted file mode 100644
index 3c751d5eddd7..000000000000
--- a/pkgs/development/libraries/haskell/rope/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fingertree, mtl, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "rope";
-  version = "0.6.4";
-  sha256 = "1g77bv2mmfhy2mkb08k92m3f2jab6p2la2s7rfib2r1jy6lq5vhb";
-  buildDepends = [ fingertree mtl utf8String ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/rope";
-    description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rosezipper/default.nix b/pkgs/development/libraries/haskell/rosezipper/default.nix
deleted file mode 100644
index 736deff0db01..000000000000
--- a/pkgs/development/libraries/haskell/rosezipper/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "rosezipper";
-  version = "0.2";
-  sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc";
-  meta = {
-    description = "Generic zipper implementation for Data.Tree";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
deleted file mode 100644
index 0802c8ba3f53..000000000000
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, MonadPrompt, mtl, randomSource, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "rvar";
-  version = "0.2.0.2";
-  sha256 = "1n24fl27mrm7cndp8b646b9c5hjm3hf5m12y9ni0f850dd739jm4";
-  buildDepends = [ MonadPrompt mtl randomSource transformers ];
-  meta = {
-    homepage = "https://github.com/mokus0/random-fu";
-    description = "Random Variables";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
deleted file mode 100644
index 3676ee09db66..000000000000
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "safe";
-  version = "0.3.8";
-  sha256 = "0k5lk85z2y8kgk7dx7km32g8vi55vnwln8ys2gs174ljd136cjdf";
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/safe/";
-    description = "Library of safe (exception free) functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/safecopy/default.nix b/pkgs/development/libraries/haskell/safecopy/default.nix
deleted file mode 100644
index 6faa46d20bbc..000000000000
--- a/pkgs/development/libraries/haskell/safecopy/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, lens, quickcheckInstances, tasty, tastyQuickcheck
-, text, time, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "safecopy";
-  version = "0.8.3";
-  sha256 = "10xd42a1i84fwiy3db0ji4bd8ssk9jqysqwc00wdcdjyp50c333n";
-  buildDepends = [ cereal text time vector ];
-  testDepends = [
-    cereal lens quickcheckInstances tasty tastyQuickcheck time vector
-  ];
-  meta = {
-    homepage = "http://acid-state.seize.it/safecopy";
-    description = "Binary serialization with version control";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/saltine/default.nix b/pkgs/development/libraries/haskell/saltine/default.nix
deleted file mode 100644
index acb4066fb2e3..000000000000
--- a/pkgs/development/libraries/haskell/saltine/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libsodium, profunctors, QuickCheck, testFramework
-, testFrameworkQuickcheck2, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "saltine";
-  version = "0.0.0.3";
-  sha256 = "1xjpjblxlpziyyz74ldaqh04shvy2qi34sc6b3232wpc0kyl5s8y";
-  buildDepends = [ profunctors ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 vector
-  ];
-  extraLibraries = [ libsodium ];
-  meta = {
-    description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sample-frame/default.nix b/pkgs/development/libraries/haskell/sample-frame/default.nix
deleted file mode 100644
index 18fcb238726b..000000000000
--- a/pkgs/development/libraries/haskell/sample-frame/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, storableRecord }:
-
-cabal.mkDerivation (self: {
-  pname = "sample-frame";
-  version = "0.0.3";
-  sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ QuickCheck storableRecord ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
-    description = "Handling of samples in an (audio) signal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix
deleted file mode 100644
index 492dcd816ed3..000000000000
--- a/pkgs/development/libraries/haskell/sbv/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, deepseq, filepath, HUnit, mtl, QuickCheck, random
-, syb
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sbv";
-  version = "3.3";
-  sha256 = "193k7njrd7b0qp865ahbjh32h49b86kyc58laifgq6ka2zv64x2f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    async deepseq filepath HUnit mtl QuickCheck random syb
-  ];
-  testDepends = [ filepath HUnit syb ];
-  meta = {
-    homepage = "http://leventerkok.github.com/sbv/";
-    description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix
deleted file mode 100644
index 0e45c9ad0756..000000000000
--- a/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scientific";
-  version = "0.2.0.2";
-  sha256 = "13rrdaf5mrhpckq9vvrm4pnj63vahg7f0g75hk11nk7k1644l4f0";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ smallcheck tasty tastySmallcheck text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/basvandijk/scientific";
-    description = "Arbitrary-precision floating-point numbers represented using scientific notation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix
deleted file mode 100644
index 10e294b42145..000000000000
--- a/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, QuickCheck, smallcheck, tasty
-, tastyAntXml, tastyHunit, tastyQuickcheck, tastySmallcheck, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scientific";
-  version = "0.3.3.3";
-  sha256 = "1hngkmd1kggc84sz4mddc0yj2vyzc87dz5dkkywjgxczys51mhqn";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [
-    QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck
-    tastySmallcheck text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/basvandijk/scientific";
-    description = "Numbers represented using scientific notation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scotty-hastache/default.nix b/pkgs/development/libraries/haskell/scotty-hastache/default.nix
deleted file mode 100644
index 9f5c652d22c5..000000000000
--- a/pkgs/development/libraries/haskell/scotty-hastache/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hastache, httpTypes, mtl, scotty, text, wai
-, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scotty-hastache";
-  version = "0.2.1";
-  sha256 = "1yyip8iq1n71iidmpbfs7rifxvpphyrcaf4z394rx36hq72ka8dn";
-  buildDepends = [
-    filepath hastache httpTypes mtl scotty text wai warp
-  ];
-  meta = {
-    homepage = "https://github.com/scotty-web/scotty-hastache";
-    description = "Easy Mustache templating support for Scotty";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
deleted file mode 100644
index 1e184577a66b..000000000000
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeBuilder, caseInsensitive, dataDefault, hspec2
-, hspecWai, httpTypes, liftedBase, monadControl, mtl, regexCompat
-, text, transformers, transformersBase, wai, waiExtra, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scotty";
-  version = "0.9.1";
-  sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm";
-  buildDepends = [
-    aeson blazeBuilder caseInsensitive dataDefault httpTypes
-    monadControl mtl regexCompat text transformers transformersBase wai
-    waiExtra warp
-  ];
-  testDepends = [ hspec2 hspecWai httpTypes liftedBase text wai ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/scotty-web/scotty";
-    description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scrypt/default.nix b/pkgs/development/libraries/haskell/scrypt/default.nix
deleted file mode 100644
index c0d9e2df2e8b..000000000000
--- a/pkgs/development/libraries/haskell/scrypt/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, entropy, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scrypt";
-  version = "0.5.0";
-  sha256 = "1cnrjdq1ncv224dlk236a7w29na8r019d2acrsxlsaiy74iadh1y";
-  buildDepends = [ base64Bytestring entropy ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/informatikr/scrypt";
-    description = "Stronger password hashing via sequential memory-hard functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix
deleted file mode 100644
index 29561239d193..000000000000
--- a/pkgs/development/libraries/haskell/sdl2/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL2, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "sdl2";
-  version = "1.3.0";
-  sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa";
-  buildDepends = [ transformers ];
-  extraLibraries = [ SDL2 ];
-  pkgconfigDepends = [ SDL2 ];
-  meta = {
-    description = "Low-level bindings to SDL2";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix
deleted file mode 100644
index c03a92d0fd31..000000000000
--- a/pkgs/development/libraries/haskell/securemem/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable }:
-
-cabal.mkDerivation (self: {
-  pname = "securemem";
-  version = "0.1.4";
-  sha256 = "1wdbcnyaarrixfvz79mcyqmfnn9h5zsmrrsa64xj8650ppyaxi48";
-  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/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
deleted file mode 100644
index 13b005a98a92..000000000000
--- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroupoids }:
-
-cabal.mkDerivation (self: {
-  pname = "semigroupoid-extras";
-  version = "4.0";
-  sha256 = "07aa7z4nywcrp9msq83b1pcmryl25yxha89sn5vwlgq40cibcm3g";
-  buildDepends = [ semigroupoids ];
-  meta = {
-    homepage = "http://github.com/ekmett/semigroupoid-extras";
-    description = "This package has been absorbed into semigroupoids 4.0";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
deleted file mode 100644
index ca625f5eb754..000000000000
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, contravariant, distributive, semigroups
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "semigroupoids";
-  version = "4.2";
-  sha256 = "18zip518f2l2ccmg3hjzy5mq2b8r98crzm10kr77yc4m64w5vac8";
-  buildDepends = [
-    comonad contravariant distributive semigroups transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/semigroupoids";
-    description = "Semigroupoids: Category sans id";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
deleted file mode 100644
index 8cd94e9079ff..000000000000
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, nats, text, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "semigroups";
-  version = "0.16";
-  sha256 = "0mq5c6py0z3jaxr1j0aalz4vjd1v6ygffv91h7nh5621rcv4ga4s";
-  buildDepends = [ deepseq hashable nats text unorderedContainers ];
-  meta = {
-    homepage = "http://github.com/ekmett/semigroups/";
-    description = "Anything that associates";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
deleted file mode 100644
index b7fddb0bc048..000000000000
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network }:
-
-cabal.mkDerivation (self: {
-  pname = "sendfile";
-  version = "0.7.9";
-  sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh";
-  buildDepends = [ network ];
-  meta = {
-    homepage = "http://hub.darcs.net/stepcut/sendfile";
-    description = "A portable sendfile library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/serialport/default.nix b/pkgs/development/libraries/haskell/serialport/default.nix
deleted file mode 100644
index 5e733f82ca19..000000000000
--- a/pkgs/development/libraries/haskell/serialport/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "serialport";
-  version = "0.4.7";
-  sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07";
-  testDepends = [ HUnit ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/jputcu/serialport";
-    description = "Cross platform serial port library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-client/default.nix b/pkgs/development/libraries/haskell/servant-client/default.nix
deleted file mode 100644
index d11e25222ea3..000000000000
--- a/pkgs/development/libraries/haskell/servant-client/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, deepseq, either, exceptions, hspec
-, httpClient, httpTypes, network, networkUri, QuickCheck, safe
-, servant, servantServer, stringConversions, text, transformers
-, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-client";
-  version = "0.2.1";
-  sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn";
-  buildDepends = [
-    aeson attoparsec either exceptions httpClient httpTypes networkUri
-    safe servant stringConversions text transformers
-  ];
-  testDepends = [
-    aeson deepseq either hspec httpTypes network QuickCheck servant
-    servantServer wai warp
-  ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "automatical derivation of querying functions for servant webservices";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-docs/default.nix b/pkgs/development/libraries/haskell/servant-docs/default.nix
deleted file mode 100644
index 3da6936532c9..000000000000
--- a/pkgs/development/libraries/haskell/servant-docs/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, hashable, lens, servant, stringConversions
-, systemFilepath, text, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-docs";
-  version = "0.2.1";
-  sha256 = "1wchqdpfrc3hxc629ij6rbpr29dzc0flpc7z8phykpmf59106pcv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson hashable lens servant stringConversions systemFilepath text
-    unorderedContainers
-  ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "generate API docs for your servant webservice";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-jquery/default.nix b/pkgs/development/libraries/haskell/servant-jquery/default.nix
deleted file mode 100644
index 2a85cb191063..000000000000
--- a/pkgs/development/libraries/haskell/servant-jquery/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, filepath, lens, servant, servantServer, stm
-, transformers, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-jquery";
-  version = "0.2.1";
-  sha256 = "1wyfnkzb44m08icfjvdbn1m0b0a1ydsznp1czfdnmq2818rrip8v";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson filepath lens servant servantServer stm transformers warp
-  ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "Automatically derive jquery-based javascript functions to query servant webservices";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix
deleted file mode 100644
index 8c3ce56d4128..000000000000
--- a/pkgs/development/libraries/haskell/servant-server/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, either, exceptions, hspec, hspecWai
-, httpTypes, network, networkUri, parsec, QuickCheck, safe, servant
-, split, stringConversions, systemFilepath, temporary, text
-, transformers, wai, waiAppStatic, waiExtra, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-server";
-  version = "0.2.3";
-  sha256 = "0n4r145jd1g07g0a1mhbc7s61h6cbbvjvhzwngff756iky7fkcb9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec either httpTypes networkUri safe servant split
-    stringConversions systemFilepath text transformers wai waiAppStatic
-    warp
-  ];
-  testDepends = [
-    aeson either exceptions hspec hspecWai httpTypes network parsec
-    QuickCheck servant stringConversions temporary text transformers
-    wai waiExtra warp
-  ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "A family of combinators for defining webservices APIs and serving them";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant/default.nix b/pkgs/development/libraries/haskell/servant/default.nix
deleted file mode 100644
index 1c206c1ab223..000000000000
--- a/pkgs/development/libraries/haskell/servant/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, parsec, QuickCheck, stringConversions, text }:
-
-cabal.mkDerivation (self: {
-  pname = "servant";
-  version = "0.2.1";
-  sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x";
-  buildDepends = [ parsec stringConversions text ];
-  testDepends = [ hspec parsec QuickCheck stringConversions text ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "A family of combinators for defining webservices APIs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix
deleted file mode 100644
index 567c50ecb2ab..000000000000
--- a/pkgs/development/libraries/haskell/setenv/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "setenv";
-  version = "0.1.1.1";
-  sha256 = "0azkvsvk9i1979rn45zryqyirvjhj9b32nnz1m30aasbs2q8f393";
-  doCheck = false;
-  meta = {
-    description = "A cross-platform library for setting environment variables";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix
deleted file mode 100644
index a76a2f5cf325..000000000000
--- a/pkgs/development/libraries/haskell/setlocale/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "setlocale";
-  version = "1.0.0.1";
-  sha256 = "15dzf4hgkn5saz6qyn1xqvinvy0y571crfxfwycmcmm4az6rsqk0";
-  jailbreak = true;
-  meta = {
-    description = "Haskell bindings to setlocale";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
deleted file mode 100644
index 3ed0912b0f3c..000000000000
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ gcc, cabal, binary, deepseq, extra, filepath, hashable, jsFlot
-, jsJquery, QuickCheck, random, time, transformers
-, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shake";
-  version = "0.14.3";
-  sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl";
-  isLibrary = true;
-  isExecutable = true;
-  buildTools = [ gcc ];
-  buildDepends = [
-    binary deepseq extra filepath hashable jsFlot jsJquery random time
-    transformers unorderedContainers utf8String
-  ];
-  testDepends = [
-    binary deepseq extra filepath hashable jsFlot jsJquery QuickCheck
-    random time transformers unorderedContainers utf8String
-  ];
-  meta = {
-    homepage = "http://www.shakebuild.com/";
-    description = "Build system library, like Make, but more accurate dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
deleted file mode 100644
index 3db4273cc924..000000000000
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare-css";
-  version = "1.1.0";
-  sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Stick your haskell variables into css at compile time. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
deleted file mode 100644
index 0b8cdbf5bbc8..000000000000
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare-i18n";
-  version = "1.1.0";
-  sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "A type-based approach to internationalization. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
deleted file mode 100644
index 27aa98d1548b..000000000000
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare-js";
-  version = "1.3.0";
-  sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
deleted file mode 100644
index 786f6741ca18..000000000000
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare-text";
-  version = "1.1.0";
-  sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
deleted file mode 100644
index 5c6b804810df..000000000000
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, blazeMarkup, exceptions, hspec, HUnit
-, parsec, systemFileio, systemFilepath, text, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare";
-  version = "2.0.2.1";
-  sha256 = "1s73nlkccfg3wl0qfx6f7q3afiakdhzh5xksnfhsg5hjhx80qhza";
-  buildDepends = [
-    aeson blazeHtml blazeMarkup exceptions parsec systemFileio
-    systemFilepath text time transformers
-  ];
-  testDepends = [
-    aeson blazeHtml blazeMarkup exceptions hspec HUnit parsec
-    systemFileio systemFilepath text time transformers
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "A toolkit for making compile-time interpolated templates";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix
deleted file mode 100644
index a93e38b1b821..000000000000
--- a/pkgs/development/libraries/haskell/shell-conduit/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, conduit, conduitExtra, controlMonadLoop, filepath
-, monadControl, monadsTf, resourcet, semigroups, split, text
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shell-conduit";
-  version = "4.5";
-  sha256 = "1vgqfba6k0nv8nwa48fv2hkr9xlrrfrdh2awgpllrimnh0yww41g";
-  buildDepends = [
-    async conduit conduitExtra controlMonadLoop filepath monadControl
-    monadsTf resourcet semigroups split text transformers
-    transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/chrisdone/shell-conduit";
-    description = "Write shell scripts with Conduit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shellish/default.nix b/pkgs/development/libraries/haskell/shellish/default.nix
deleted file mode 100644
index cdf2e3a3463e..000000000000
--- a/pkgs/development/libraries/haskell/shellish/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, strict, time, unixCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "shellish";
-  version = "0.1.4";
-  sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan";
-  buildDepends = [ filepath mtl strict time unixCompat ];
-  meta = {
-    homepage = "http://repos.mornfall.net/shellish";
-    description = "shell-/perl- like (systems) programming in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shellmate/default.nix b/pkgs/development/libraries/haskell/shellmate/default.nix
deleted file mode 100644
index dcc7211f8696..000000000000
--- a/pkgs/development/libraries/haskell/shellmate/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, temporary, time, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "shellmate";
-  version = "0.1.6";
-  sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr";
-  buildDepends = [ filepath temporary time transformers ];
-  meta = {
-    homepage = "http://github.com/valderman/shellmate";
-    description = "Simple interface for shell scripting in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
deleted file mode 100644
index 251cb6a17b5f..000000000000
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, enclosedExceptions, exceptions, liftedAsync
-, liftedBase, monadControl, mtl, systemFileio, systemFilepath, text
-, time, transformers, transformersBase, unixCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shelly";
-  version = "1.6.0";
-  sha256 = "0yrx7sv1s8pddpap143d3yi3ypvf84jjh16i8b3dm4kb3m4x3mdv";
-  buildDepends = [
-    async enclosedExceptions exceptions liftedAsync liftedBase
-    monadControl mtl systemFileio systemFilepath text time transformers
-    transformersBase unixCompat
-  ];
-  meta = {
-    homepage = "https://github.com/yesodweb/Shelly.hs";
-    description = "shell-like (systems) programming in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix
deleted file mode 100644
index cc8cf94c9d62..000000000000
--- a/pkgs/development/libraries/haskell/show/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "show";
-  version = "0.6";
-  sha256 = "15bvfffnr034z8wbmhxa8h5qskbxwbflk434dx023l1qlm3sjmsg";
-  buildDepends = [ syb ];
-  meta = {
-    description = "'Show' instances for Lambdabot";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix
deleted file mode 100644
index 619f8614f099..000000000000
--- a/pkgs/development/libraries/haskell/silently/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, nanospec }:
-
-cabal.mkDerivation (self: {
-  pname = "silently";
-  version = "1.2.4.1";
-  sha256 = "035dw3zg680ykyz5rqkkrjn51wkznbc4jb45a8l2gh3vgqzgbf52";
-  buildDepends = [ deepseq ];
-  testDepends = [ deepseq nanospec ];
-  meta = {
-    homepage = "https://github.com/trystan/silently";
-    description = "Prevent or capture writing to stdout and other handles";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/simple-conduit/default.nix b/pkgs/development/libraries/haskell/simple-conduit/default.nix
deleted file mode 100644
index 49e574772f1b..000000000000
--- a/pkgs/development/libraries/haskell/simple-conduit/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, chunkedData, either, exceptions, filepath
-, free, liftedAsync, liftedBase, mmorph, monadControl
-, monoTraversable, mtl, mwcRandom, primitive, semigroups, stm
-, streamingCommons, text, transformers, transformersBase, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "simple-conduit";
-  version = "0.5.1";
-  sha256 = "1jy70cdw2h6fd2618dczajml5k82kkjmd2n0mgbby2mr6r3sk5zr";
-  buildDepends = [
-    bifunctors chunkedData either exceptions filepath free liftedAsync
-    liftedBase mmorph monadControl monoTraversable mtl mwcRandom
-    primitive semigroups stm streamingCommons text transformers
-    transformersBase vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jwiegley/simple-conduit";
-    description = "A simple streaming I/O library based on monadic folds";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix
deleted file mode 100644
index 6ff9d26dc742..000000000000
--- a/pkgs/development/libraries/haskell/simple-reflect/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "simple-reflect";
-  version = "0.3.2";
-  sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
-  meta = {
-    homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
-    description = "Simple reflection of expressions containing variables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
deleted file mode 100644
index d291aba96308..000000000000
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, hspec, HUnit, network, resourcet }:
-
-cabal.mkDerivation (self: {
-  pname = "simple-sendfile";
-  version = "0.2.18";
-  sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49";
-  buildDepends = [ network ];
-  testDepends = [
-    conduit conduitExtra hspec HUnit network resourcet
-  ];
-  doCheck = false;
-  meta = {
-    description = "Cross platform library for the sendfile system call";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix
deleted file mode 100644
index 71cd2f4bbd72..000000000000
--- a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, parsec, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "simple-sql-parser";
-  version = "0.4.0";
-  sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl parsec ];
-  testDepends = [
-    HUnit mtl parsec testFramework testFrameworkHunit
-  ];
-  meta = {
-    homepage = "http://jakewheat.github.io/simple-sql-parser/";
-    description = "A parser for SQL queries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix
deleted file mode 100644
index c4074b9d62c3..000000000000
--- a/pkgs/development/libraries/haskell/singletons/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, constraints, filepath, mtl, tasty, tastyGolden
-, thDesugar
-}:
-
-cabal.mkDerivation (self: {
-  pname = "singletons";
-  version = "1.0";
-  sha256 = "1rd1728wghhqlg2djd7az8i01rf4i3wwwcnz2v43a39jjvhlklkg";
-  buildDepends = [ mtl thDesugar ];
-  testDepends = [ Cabal constraints filepath tasty tastyGolden ];
-  noHaddock = true;
-  patches = self.stdenv.lib.optional self.stdenv.isDarwin ./test.patch;
-  meta = {
-    homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
-    description = "A framework for generating singleton types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/singletons/test.patch b/pkgs/development/libraries/haskell/singletons/test.patch
deleted file mode 100644
index 6979c2c6cb0a..000000000000
--- a/pkgs/development/libraries/haskell/singletons/test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/tests/SingletonsTestSuiteUtils.hs
-+++ b/tests/SingletonsTestSuiteUtils.hs
-@@ -201,7 +201,7 @@ testCompileAndDumpGroup testDir tests =
- filterWithSed :: FilePath -> IO ()
- filterWithSed file = runProcessWithOpts CreatePipe "sed"
- #ifdef darwin_HOST_OS
--  [ "-i", "''"
-+  [ "-i"
- #else
-   [ "-i"
- #endif
-
diff --git a/pkgs/development/libraries/haskell/sitemap/default.nix b/pkgs/development/libraries/haskell/sitemap/default.nix
deleted file mode 100644
index 1a6b28494760..000000000000
--- a/pkgs/development/libraries/haskell/sitemap/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, taggy, taggyLens, text }:
-
-cabal.mkDerivation (self: {
-  pname = "sitemap";
-  version = "0.1.2";
-  sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
-  buildDepends = [ lens taggy taggyLens text ];
-  meta = {
-    homepage = "http://github.com/alpmestan/sitemap";
-    description = "Sitemap parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix
deleted file mode 100644
index 67af162a2a89..000000000000
--- a/pkgs/development/libraries/haskell/sized-types/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, singletons }:
-
-cabal.mkDerivation (self: {
-  pname = "sized-types";
-  version = "0.5.0";
-  sha256 = "1cvgw2plzgpddg2p74hylx499dv4hn2nc8s085mnayp5n9jkn8md";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ singletons ];
-  meta = {
-    homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
-    description = "Sized types in Haskell using the GHC Nat kind";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sized/default.nix b/pkgs/development/libraries/haskell/sized/default.nix
deleted file mode 100644
index ae75ff26e4c4..000000000000
--- a/pkgs/development/libraries/haskell/sized/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, constraints, ListLike, monomorphic, typeNatural, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "sized";
-  version = "0.1.0.0";
-  sha256 = "00n9fb7kk3c6dy4j19d9ikmynllpxc7yd51sign0rhvnasmyrghl";
-  buildDepends = [
-    constraints ListLike monomorphic typeNatural vector
-  ];
-  meta = {
-    description = "Sized sequence data-types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
deleted file mode 100644
index c60bf97d54f4..000000000000
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cryptoApi, filepath, hspec, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "skein";
-  version = "1.0.9.2";
-  sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw";
-  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.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/slack-api/default.nix b/pkgs/development/libraries/haskell/slack-api/default.nix
deleted file mode 100644
index d0e6b32f572e..000000000000
--- a/pkgs/development/libraries/haskell/slack-api/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal, aeson, errors, HsOpenSSL, ioStreams, lens, lensAeson
-, monadLoops, mtl, network, opensslStreams, text, time
-, transformers, websockets, wreq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "slack-api";
-  version = "0.2.1";
-  sha256 = "1k6p60gb13g09y6isr1r90zw548vs4y1fz34amfhdx79g9zm30hy";
-  buildDepends = [
-    aeson errors HsOpenSSL ioStreams lens lensAeson monadLoops mtl
-    network opensslStreams text time transformers websockets wreq
-  ];
-  meta = {
-    description = "Bindings to the Slack RTM API";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
deleted file mode 100644
index 1a35a79d9ec9..000000000000
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, logict, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "smallcheck";
-  version = "1.1.1";
-  sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd";
-  buildDepends = [ logict mtl ];
-  meta = {
-    homepage = "https://github.com/feuerbach/smallcheck";
-    description = "A property-based testing library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/smtLib/default.nix b/pkgs/development/libraries/haskell/smtLib/default.nix
deleted file mode 100644
index 2e60c83e9919..000000000000
--- a/pkgs/development/libraries/haskell/smtLib/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "smtLib";
-  version = "1.0.7";
-  sha256 = "1jn2790x7g7n6jm5cfgd692n3l6iafyv0zyz40hx8ykcs4jh2rkf";
-  meta = {
-    description = "A library for working with the SMTLIB format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/smtp-mail/default.nix b/pkgs/development/libraries/haskell/smtp-mail/default.nix
deleted file mode 100644
index ab97608541dd..000000000000
--- a/pkgs/development/libraries/haskell/smtp-mail/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base16Bytestring, base64Bytestring, cryptohash, filepath
-, mimeMail, network, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "smtp-mail";
-  version = "0.1.4.5";
-  sha256 = "010fbrcbypajwd9fjjc35br9p5axl1pqd0n1v51585ncrlv2icyw";
-  buildDepends = [
-    base16Bytestring base64Bytestring cryptohash filepath mimeMail
-    network text
-  ];
-  meta = {
-    homepage = "http://github.com/jhickner/smtp-mail";
-    description = "Simple email sending via SMTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
deleted file mode 100644
index 75cb227cd858..000000000000
--- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base64Bytestring, conduit, conduitExtra
-, cprngAes, dataDefault, filepath, mimeMail, network, resourcet
-, stringsearch, text, tls, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "smtps-gmail";
-  version = "1.3.0";
-  sha256 = "0vbykxqrw0gdhxwgchvgvkxwh7pwyrc1wvl26x5wqlkmkalmkvv9";
-  buildDepends = [
-    attoparsec base64Bytestring conduit conduitExtra cprngAes
-    dataDefault filepath mimeMail network resourcet stringsearch text
-    tls transformers
-  ];
-  meta = {
-    homepage = "https://github.com/enzoh/smtps-gmail";
-    description = "Gmail SMTP Client";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap-blaze/default.nix b/pkgs/development/libraries/haskell/snap-blaze/default.nix
deleted file mode 100644
index 9dd9bf382bd3..000000000000
--- a/pkgs/development/libraries/haskell/snap-blaze/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, snapCore }:
-
-cabal.mkDerivation (self: {
-  pname = "snap-blaze";
-  version = "0.2.1.2";
-  sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh";
-  buildDepends = [ blazeHtml snapCore ];
-  meta = {
-    homepage = "http://github.com/jaspervdj/snap-blaze";
-    description = "blaze-html integration for Snap";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix
deleted file mode 100644
index f9d043dff806..000000000000
--- a/pkgs/development/libraries/haskell/snap-cors/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, caseInsensitive, hashable, network, networkUri
-, snap, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap-cors";
-  version = "1.2.6";
-  sha256 = "1ihqqpzymgc25shz4dvjfh8lzjczqdqg6ril39d5p7rkn4a8y2d8";
-  buildDepends = [
-    attoparsec caseInsensitive hashable network networkUri snap text
-    transformers unorderedContainers
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/snap-cors";
-    description = "Add CORS headers to Snap applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap-error-collector/default.nix b/pkgs/development/libraries/haskell/snap-error-collector/default.nix
deleted file mode 100644
index b9b6376394a6..000000000000
--- a/pkgs/development/libraries/haskell/snap-error-collector/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, MonadCatchIOTransformers, monadLoops, snap, stm
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap-error-collector";
-  version = "1.1.0";
-  sha256 = "06pqlv93qgibl5gbrp7p1vg6x421nrpkvhazbrcipdpbawrsgaj2";
-  buildDepends = [
-    async MonadCatchIOTransformers monadLoops snap stm time
-    transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/snap-error-collector";
-    description = "Collect errors in batches and dispatch them";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap-web-routes/default.nix b/pkgs/development/libraries/haskell/snap-web-routes/default.nix
deleted file mode 100644
index a8252a4f3f02..000000000000
--- a/pkgs/development/libraries/haskell/snap-web-routes/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, heist, mtl, snap, snapCore, text, webRoutes, xmlhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "snap-web-routes";
-  version = "0.5.0.0";
-  sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv";
-  buildDepends = [ heist mtl snap snapCore text webRoutes xmlhtml ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/lukerandall/snap-web-routes";
-    description = "Type safe URLs for Snap";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
deleted file mode 100644
index 410e9db6f92a..000000000000
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq
-, enumerator, filepath, hashable, HUnit, MonadCatchIOTransformers
-, mtl, random, regexPosix, text, time, unixCompat
-, unorderedContainers, vector, zlibEnum
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap-core";
-  version = "0.9.6.3";
-  sha256 = "0i3gl1kxzi2l76sqhyhda7lrcvq8hq6aqgwvfx5k9fa2xic01dw1";
-  buildDepends = [
-    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
-    bytestringMmap caseInsensitive deepseq enumerator filepath hashable
-    HUnit MonadCatchIOTransformers mtl random regexPosix text time
-    unixCompat unorderedContainers vector zlibEnum
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "Snap: A Haskell Web Framework (core interfaces and types)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
deleted file mode 100644
index 0f4132a75da7..000000000000
--- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, directoryTree, hint, mtl, snapCore, time }:
-
-cabal.mkDerivation (self: {
-  pname = "snap-loader-dynamic";
-  version = "0.10.0.2";
-  sha256 = "0fnpzhwnj3dsqwx880391x9x6y0ry8f6dfrzkfs963zib9l3qvh7";
-  buildDepends = [ directoryTree hint mtl snapCore time ];
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "Snap: A Haskell Web Framework: dynamic loader";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix
deleted file mode 100644
index 4b74ed294dc3..000000000000
--- a/pkgs/development/libraries/haskell/snap/loader-static.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "snap-loader-static";
-  version = "0.9.0.2";
-  sha256 = "0d6s7n6yryfs2jkw0hxvhvc79fhbj256askb1c6ksqhscxxxwz1m";
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "Snap: A Haskell Web Framework: static loader";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
deleted file mode 100644
index cacb0c039456..000000000000
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, blazeBuilderEnumerator, caseInsensitive, enumerator, HsOpenSSL
-, MonadCatchIOTransformers, mtl, network, snapCore, text, time
-, unixCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap-server";
-  version = "0.9.4.5";
-  sha256 = "09399vlqgic0iwmx31c01bjpbdblw8gayxnz71lwzkixqibkbbip";
-  buildDepends = [
-    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
-    caseInsensitive enumerator HsOpenSSL MonadCatchIOTransformers mtl
-    network snapCore text time unixCompat
-  ];
-  configureFlags = "-fopenssl";
-  patchPhase = ''
-    sed -i -e 's|text *>= .*,|text,|' -e 's|HsOpenSSL >= .*|HsOpenSSL|' -e 's|network.*2.6,|network,|' snap-server.cabal
-  '';
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
deleted file mode 100644
index bb4afe88512c..000000000000
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, cereal, clientsession, comonad
-, configurator, directoryTree, dlist, errors, filepath, hashable
-, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
-, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
-, time, transformers, unorderedContainers, vector, vectorAlgorithms
-, xmlhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap";
-  version = "0.13.3.2";
-  sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec cereal clientsession comonad configurator
-    directoryTree dlist errors filepath hashable heist lens logict
-    MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
-    snapCore snapServer stm syb text time transformers
-    unorderedContainers vector vectorAlgorithms xmlhtml
-  ];
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "Top-level package for the Snap Web Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
deleted file mode 100644
index 96a64488f2a4..000000000000
--- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, acidState, snap, text }:
-
-cabal.mkDerivation (self: {
-  pname = "snaplet-acid-state";
-  version = "0.2.6.1";
-  sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60";
-  buildDepends = [ acidState snap text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/mightybyte/snaplet-acid-state";
-    description = "acid-state snaplet for Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
deleted file mode 100644
index 7745fa5ddbe1..000000000000
--- a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, clientsession, configurator, errors, lens
-, MonadCatchIOTransformers, mtl, postgresqlSimple
-, resourcePoolCatchio, snap, text, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snaplet-postgresql-simple";
-  version = "0.6";
-  sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6";
-  buildDepends = [
-    clientsession configurator errors lens MonadCatchIOTransformers mtl
-    postgresqlSimple resourcePoolCatchio snap text transformers
-    unorderedContainers
-  ];
-  meta = {
-    homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
-    description = "postgresql-simple snaplet for the Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix
deleted file mode 100644
index 1b7a7b10b213..000000000000
--- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, configurator, hedis, lens, mtl, network, snap, text
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snaplet-redis";
-  version = "0.1.4.1";
-  sha256 = "0vrsvmgrds7l4q88q7gmy1bz36z5ba45rib2vm5z6v2cf0x22qz2";
-  buildDepends = [
-    configurator hedis lens mtl network snap text transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/dzhus/snaplet-redis/";
-    description = "Redis support for Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
deleted file mode 100644
index 6f0f3d5de06a..000000000000
--- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, configurator, heist, lensFamilyCore, mtl, snap, stripe
-, text, textFormat, transformers, xmlhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snaplet-stripe";
-  version = "0.3.0";
-  sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp";
-  buildDepends = [
-    configurator heist lensFamilyCore mtl snap stripe text textFormat
-    transformers xmlhtml
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/LukeHoersten/snaplet-stripe";
-    description = "Stripe snaplet for the Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snowball/default.nix b/pkgs/development/libraries/haskell/snowball/default.nix
deleted file mode 100644
index d24b27f781ed..000000000000
--- a/pkgs/development/libraries/haskell/snowball/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, quickcheckInstances, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, textIcu
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snowball";
-  version = "1.0.0.1";
-  sha256 = "0fvxzm14ffjqq6n51bi5cmq5yrlggpkbb9rbbw522l6cjgv0apbx";
-  buildDepends = [ text textIcu ];
-  testDepends = [
-    HUnit QuickCheck quickcheckInstances testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh text
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://hub.darcs.net/dag/snowball";
-    description = "Bindings to the Snowball library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/socket-activation/default.nix b/pkgs/development/libraries/haskell/socket-activation/default.nix
deleted file mode 100644
index d66266f08865..000000000000
--- a/pkgs/development/libraries/haskell/socket-activation/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "socket-activation";
-  version = "0.1.0.1";
-  sha256 = "109zxc16zlp98ggc99ap7wbzaa40yg34v3abn2nfs0w49dvh1zma";
-  buildDepends = [ network transformers ];
-  meta = {
-    homepage = "https://github.com/sakana/haskell-socket-activation";
-    description = "systemd socket activation library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix
deleted file mode 100644
index 57827d495f3e..000000000000
--- a/pkgs/development/libraries/haskell/socket-io/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, engineIo, mtl, stm, text, transformers
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "socket-io";
-  version = "1.2.0";
-  sha256 = "1271qmd83q669dcs6ni0f84i5kgvh8vgr4xgx2lcprirbzkx0gdl";
-  buildDepends = [
-    aeson attoparsec engineIo mtl stm text transformers
-    unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/engine.io";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix
deleted file mode 100644
index 6a67dfddcc0c..000000000000
--- a/pkgs/development/libraries/haskell/socks/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, network }:
-
-cabal.mkDerivation (self: {
-  pname = "socks";
-  version = "0.5.4";
-  sha256 = "1nmldlwxqasmg359i2aa3a903gi3lmnlspvf12xk49jrg3mf3dg9";
-  buildDepends = [ cereal network ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-socks";
-    description = "Socks proxy (version 5) implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sodium/default.nix b/pkgs/development/libraries/haskell/sodium/default.nix
deleted file mode 100644
index 0dbd0647a864..000000000000
--- a/pkgs/development/libraries/haskell/sodium/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "sodium";
-  version = "0.11.0.2";
-  sha256 = "0m3ig6nqkw0m6xh6ijgr2w06i4ydyfwx7rsbkrrxflichadm9r2g";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Sodium Reactive Programming (FRP) System";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix
deleted file mode 100644
index cb74bb098f80..000000000000
--- a/pkgs/development/libraries/haskell/sourcemap/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, text, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sourcemap";
-  version = "0.1.3.0";
-  sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5";
-  buildDepends = [
-    aeson attoparsec text unorderedContainers utf8String
-  ];
-  meta = {
-    description = "Implementation of source maps as proposed by Google and Mozilla";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix
deleted file mode 100644
index 28389a860c86..000000000000
--- a/pkgs/development/libraries/haskell/sparse/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, deepseq, doctest, filepath, hlint
-, hybridVectors, lens, linear, mtl, primitive, QuickCheck
-, semigroups, simpleReflect, testFramework
-, testFrameworkQuickcheck2, testFrameworkTh, transformers, vector
-, vectorAlgorithms
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sparse";
-  version = "0.9.1";
-  sha256 = "1pa1h21ca710fdjz60b79jg0v2lr0l11avpiynp9n1cw5bz137fk";
-  buildDepends = [
-    contravariant deepseq hybridVectors lens primitive transformers
-    vector vectorAlgorithms
-  ];
-  testDepends = [
-    deepseq doctest filepath hlint hybridVectors lens linear mtl
-    QuickCheck semigroups simpleReflect testFramework
-    testFrameworkQuickcheck2 testFrameworkTh transformers vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/ekmett/sparse";
-    description = "A playground of sparse linear algebra primitives using Morton ordering";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/spawn/default.nix b/pkgs/development/libraries/haskell/spawn/default.nix
deleted file mode 100644
index 010f51a5251a..000000000000
--- a/pkgs/development/libraries/haskell/spawn/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "spawn";
-  version = "0.3";
-  sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8";
-  meta = {
-    description = "Tiny library for concurrent computations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/speculation/default.nix b/pkgs/development/libraries/haskell/speculation/default.nix
deleted file mode 100644
index 2386d0ad54f6..000000000000
--- a/pkgs/development/libraries/haskell/speculation/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "speculation";
-  version = "1.5.0.1";
-  sha256 = "1kjshccmfnigb2dxq0czn3c1ckdflz6bl1q60h38qp3rc7250ml0";
-  buildDepends = [ stm transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/speculation";
-    description = "A framework for safe, programmable, speculative parallelism";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix
deleted file mode 100644
index b30ce21e342a..000000000000
--- a/pkgs/development/libraries/haskell/split/0.1.4.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "split";
-  version = "0.1.4.3";
-  sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
-  meta = {
-    homepage = "http://code.haskell.org/~byorgey/code/split";
-    description = "Combinator library for splitting lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix
deleted file mode 100644
index 91a6b4cada3f..000000000000
--- a/pkgs/development/libraries/haskell/split/0.2.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "split";
-  version = "0.2.2";
-  sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
-  testDepends = [ QuickCheck ];
-  doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9";
-  meta = {
-    description = "Combinator library for splitting lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/spoon/default.nix b/pkgs/development/libraries/haskell/spoon/default.nix
deleted file mode 100644
index 436291cf8dc0..000000000000
--- a/pkgs/development/libraries/haskell/spoon/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "spoon";
-  version = "0.3.1";
-  sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Catch errors thrown from pure computations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
deleted file mode 100644
index 94d8d4409c9e..000000000000
--- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual
-, directSqlite, HUnit, text, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sqlite-simple";
-  version = "0.4.8.0";
-  sha256 = "098d1s80wlvsp307422f79bm3a9knvgw5ni6jap62fl4rpa7fsmz";
-  buildDepends = [
-    attoparsec blazeBuilder blazeTextual directSqlite text time
-    transformers
-  ];
-  testDepends = [ base16Bytestring directSqlite HUnit text time ];
-  meta = {
-    homepage = "http://github.com/nurpax/sqlite-simple";
-    description = "Mid-Level SQLite client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
deleted file mode 100644
index 8d30afc77add..000000000000
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "srcloc";
-  version = "0.4.1";
-  sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz";
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "Data types for managing source code locations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/state-plus/default.nix b/pkgs/development/libraries/haskell/state-plus/default.nix
deleted file mode 100644
index d35da29273e1..000000000000
--- a/pkgs/development/libraries/haskell/state-plus/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, checkers, mtl, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "state-plus";
-  version = "0.1.1";
-  sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1";
-  buildDepends = [ mtl ];
-  testDepends = [ checkers mtl QuickCheck ];
-  meta = {
-    description = "MonadPlus for StateT";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix
deleted file mode 100644
index b9651681351c..000000000000
--- a/pkgs/development/libraries/haskell/stateref/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "stateref";
-  version = "0.3";
-  sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
-  buildDepends = [ mtl stm ];
-  meta = {
-    homepage = "http://code.haskell.org/~mokus/stateref/";
-    description = "Abstraction for things that work like IORef";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/statestack/default.nix b/pkgs/development/libraries/haskell/statestack/default.nix
deleted file mode 100644
index dac89bd2ef9a..000000000000
--- a/pkgs/development/libraries/haskell/statestack/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "statestack";
-  version = "0.2.0.3";
-  sha256 = "0w5vw8jmnwbfyma4a3ggdm9jvxf3c18kpwbvcmvr5szifaqv9sgx";
-  buildDepends = [ mtl transformers ];
-  meta = {
-    description = "Simple State-like monad transformer with saveable and restorable state";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
deleted file mode 100644
index a24b9359aa48..000000000000
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, binary, deepseq, erf, HUnit, ieee754, mathFunctions
-, monadPar, mwcRandom, primitive, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, vector
-, vectorAlgorithms, vectorBinaryInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "statistics";
-  version = "0.13.2.1";
-  sha256 = "0giibqpnjndnhvxqsr8ikcxxfhz3ws0mk3ckykq2sfwz7gkipvva";
-  buildDepends = [
-    aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive
-    vector vectorAlgorithms vectorBinaryInstances
-  ];
-  testDepends = [
-    binary erf HUnit ieee754 mathFunctions mwcRandom primitive
-    QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector vectorAlgorithms
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/statistics";
-    description = "A library of statistical types, data, and functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix
deleted file mode 100644
index 15454aa0c971..000000000000
--- a/pkgs/development/libraries/haskell/statvfs/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "statvfs";
-  version = "0.2";
-  sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1";
-  meta = {
-    description = "Get unix filesystem statistics with statfs, statvfs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix
deleted file mode 100644
index d24b735ab76c..000000000000
--- a/pkgs/development/libraries/haskell/stb-image/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bitmap }:
-
-cabal.mkDerivation (self: {
-  pname = "stb-image";
-  version = "0.2.1";
-  sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
-  buildDepends = [ bitmap ];
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix
deleted file mode 100644
index 8455aca477bc..000000000000
--- a/pkgs/development/libraries/haskell/stm-chans/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "stm-chans";
-  version = "3.0.0.2";
-  sha256 = "1zsa092yjxsdq8nm2yqagdfpip3i3ff3xdwvys99ns7ridxbyynh";
-  buildDepends = [ stm ];
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Additional types of channels for STM";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
deleted file mode 100644
index c13aa9923173..000000000000
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, cereal, cerealConduit, conduit, conduitExtra, HUnit
-, liftedAsync, liftedBase, monadControl, monadLoops, QuickCheck
-, resourcet, stm, stmChans, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stm-conduit";
-  version = "2.5.3";
-  sha256 = "1jsij92i3rw2wz1166i58p0lxrbx0jndf1hi3kj92ccvnc3zg1iw";
-  buildDepends = [
-    async cereal cerealConduit conduit conduitExtra liftedAsync
-    liftedBase monadControl monadLoops resourcet stm stmChans
-    transformers
-  ];
-  testDepends = [
-    conduit HUnit QuickCheck resourcet stm stmChans testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 transformers
-  ];
-  meta = {
-    homepage = "https://github.com/wowus/stm-conduit";
-    description = "Introduces conduits to channels, and promotes using conduits concurrently";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix
deleted file mode 100644
index d093c5e07db3..000000000000
--- a/pkgs/development/libraries/haskell/stm-containers/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, basePrelude, focus, free, hashable, HTF, listT, lochTh
-, mtl, mtlPrelude, placeholders, primitive, QuickCheck
-, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stm-containers";
-  version = "0.2.7";
-  sha256 = "1qgmrxccnvids2xq2n28cllfqh88f0b2512hm5grrab7qb07phar";
-  buildDepends = [
-    basePrelude focus hashable listT lochTh placeholders primitive
-    transformers
-  ];
-  testDepends = [
-    basePrelude focus free hashable HTF listT lochTh mtl mtlPrelude
-    placeholders primitive QuickCheck transformers unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/nikita-volkov/stm-containers";
-    description = "Containers for STM";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-delay/default.nix b/pkgs/development/libraries/haskell/stm-delay/default.nix
deleted file mode 100644
index ee2500db8d3d..000000000000
--- a/pkgs/development/libraries/haskell/stm-delay/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "stm-delay";
-  version = "0.1.1.1";
-  sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi";
-  buildDepends = [ stm ];
-  testDepends = [ stm ];
-  meta = {
-    homepage = "https://github.com/joeyadams/haskell-stm-delay";
-    description = "Updatable one-shot timer polled with STM";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-stats/default.nix b/pkgs/development/libraries/haskell/stm-stats/default.nix
deleted file mode 100644
index 4f58e73248ca..000000000000
--- a/pkgs/development/libraries/haskell/stm-stats/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, time }:
-
-cabal.mkDerivation (self: {
-  pname = "stm-stats";
-  version = "0.2.0.0";
-  sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa";
-  buildDepends = [ stm time ];
-  meta = {
-    description = "retry statistics for STM transactions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix
deleted file mode 100644
index f8cebde5d0b3..000000000000
--- a/pkgs/development/libraries/haskell/stm/2.4.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.4.2";
-  sha256 = "1nsq92z7y0w227fyig0xz4365xp50hnzzkqr4s836q969kb3rvn8";
-  meta = {
-    description = "Software Transactional Memory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm/2.4.3.nix b/pkgs/development/libraries/haskell/stm/2.4.3.nix
deleted file mode 100644
index f6c7a7e7ce0e..000000000000
--- a/pkgs/development/libraries/haskell/stm/2.4.3.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.4.3";
-  sha256 = "0vzw4s06d5scfy4ircl81ym8ylkw9ckzsp8rq950dvipmaj1xhis";
-  meta = {
-    description = "Software Transactional Memory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix
deleted file mode 100644
index 59f5e6472317..000000000000
--- a/pkgs/development/libraries/haskell/storable-complex/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "storable-complex";
-  version = "0.2.1";
-  sha256 = "0dnxnsi7m5whwwki3fry6db6gyy5qzfz8jcj1fg3fhfyf4f9wpaz";
-  meta = {
-    description = "Storable instance for Complex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/storable-endian/default.nix b/pkgs/development/libraries/haskell/storable-endian/default.nix
deleted file mode 100644
index 9fdbdb5a6b07..000000000000
--- a/pkgs/development/libraries/haskell/storable-endian/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteorder }:
-
-cabal.mkDerivation (self: {
-  pname = "storable-endian";
-  version = "0.2.5";
-  sha256 = "04j1nk0wga4dqrqvhm8yd9h9194db1n3yrnhg8s3gsc0jk7yw1p2";
-  buildDepends = [ byteorder ];
-  meta = {
-    description = "Storable instances with endianness";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
deleted file mode 100644
index fc919b195e01..000000000000
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "storable-record";
-  version = "0.0.3";
-  sha256 = "1mv2s4r7dqkl2fy0wjnywyr2zi2g53nkn0z72mgr8drkzdszzxx1";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ transformers utilityHt ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/storable-record/";
-    description = "Elegant definition of Storable instances for records";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
deleted file mode 100644
index c4d19f611884..000000000000
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck
-, random, stm, text, transformers, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "streaming-commons";
-  version = "0.1.7.3";
-  sha256 = "12sm59dhjrygly215888i2xcsn5m5a393ir0mm6w62883x49wzxb";
-  buildDepends = [
-    blazeBuilder network random stm text transformers zlib
-  ];
-  testDepends = [
-    async blazeBuilder deepseq hspec network QuickCheck text zlib
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/streaming-commons";
-    description = "Common lower-level functions needed by various streaming data libraries";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix
deleted file mode 100644
index cd338472635b..000000000000
--- a/pkgs/development/libraries/haskell/streamproc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "streamproc";
-  version = "1.6.2";
-  sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
-  meta = {
-    homepage = "http://github.com/peti/streamproc";
-    description = "Stream Processer Arrow";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/strict-concurrency/default.nix b/pkgs/development/libraries/haskell/strict-concurrency/default.nix
deleted file mode 100644
index edb0ba0fd47c..000000000000
--- a/pkgs/development/libraries/haskell/strict-concurrency/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "strict-concurrency";
-  version = "0.2.4.1";
-  sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
-    description = "Strict concurrency abstractions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix
deleted file mode 100644
index 6b4a157431e7..000000000000
--- a/pkgs/development/libraries/haskell/strict/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "strict";
-  version = "0.3.2";
-  sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
-  meta = {
-    homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html";
-    description = "Strict data types and String IO";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
deleted file mode 100644
index 3f4e0edf1408..000000000000
--- a/pkgs/development/libraries/haskell/string-combinators/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "string-combinators";
-  version = "0.6.0.5";
-  sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl";
-  meta = {
-    homepage = "https://github.com/basvandijk/string-combinators";
-    description = "Polymorphic functions to build and combine stringlike values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/string-conversions/default.nix b/pkgs/development/libraries/haskell/string-conversions/default.nix
deleted file mode 100644
index 9225bacbfe30..000000000000
--- a/pkgs/development/libraries/haskell/string-conversions/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "string-conversions";
-  version = "0.3.0.3";
-  sha256 = "0n2ifim9n5vm305r989lh5xlbd8qc6byip2nfavf6gd2bcscs84p";
-  buildDepends = [ text utf8String ];
-  meta = {
-    description = "Simplifies dealing with different types for strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix
deleted file mode 100644
index ac0e12811e0c..000000000000
--- a/pkgs/development/libraries/haskell/string-qq/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "string-qq";
-  version = "0.0.2";
-  sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
-  meta = {
-    description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stringable/default.nix b/pkgs/development/libraries/haskell/stringable/default.nix
deleted file mode 100644
index f7de2335ad25..000000000000
--- a/pkgs/development/libraries/haskell/stringable/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, systemFilepath, text }:
-
-cabal.mkDerivation (self: {
-  pname = "stringable";
-  version = "0.1.3";
-  sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7";
-  buildDepends = [ systemFilepath text ];
-  meta = {
-    description = "A Stringable type class, in the spirit of Foldable and Traversable";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix
deleted file mode 100644
index 49a8ddd509ab..000000000000
--- a/pkgs/development/libraries/haskell/stringbuilder/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "stringbuilder";
-  version = "0.5.0";
-  sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9";
-  testDepends = [ hspec QuickCheck ];
-  meta = {
-    description = "A writer monad for multi-line string literals";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix
deleted file mode 100644
index 28a5660b1e77..000000000000
--- a/pkgs/development/libraries/haskell/stringprep/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, tasty, tastyQuickcheck, tastyTh, text, textIcu
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stringprep";
-  version = "1.0.0";
-  sha256 = "0ha4cvzdppd514xh9315v3nvrn1q4xd74gifdqpszw98hj2mw0b0";
-  buildDepends = [ text textIcu ];
-  testDepends = [
-    QuickCheck tasty tastyQuickcheck tastyTh text textIcu
-  ];
-  meta = {
-    description = "Implements the \"StringPrep\" algorithm";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix
deleted file mode 100644
index 02ed1a698a63..000000000000
--- a/pkgs/development/libraries/haskell/stringsearch/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "stringsearch";
-  version = "0.3.6.5";
-  sha256 = "1mjvb1qr4fkxv5qvq4jfswa3dcj3dwzvwx7dbp2wqw8zand41lsq";
-  meta = {
-    homepage = "https://bitbucket.org/dafis/stringsearch";
-    description = "Fast searching, splitting and replacing of ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix
deleted file mode 100644
index 796bf3726767..000000000000
--- a/pkgs/development/libraries/haskell/stripe/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, httpConduit, httpTypes, mtl, text, time
-, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stripe";
-  version = "0.8.1";
-  sha256 = "0vmgj9n7q8ik31z7zzfjfv1qj8f8vrqn9cvk8kjp3k4shj25p7sy";
-  buildDepends = [
-    aeson httpConduit httpTypes mtl text time unorderedContainers
-    utf8String
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/michaelschade/hs-stripe";
-    description = "A Haskell implementation of the Stripe API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix
deleted file mode 100644
index a5975aaddc6c..000000000000
--- a/pkgs/development/libraries/haskell/strptime/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "strptime";
-  version = "1.0.10";
-  sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
-  buildDepends = [ text time ];
-  meta = {
-    description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
deleted file mode 100644
index d739d11c17ab..000000000000
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, cmdargs, filepath, haskellSrcExts, HUnit, mtl
-, strict, syb, testFramework, testFrameworkHunit, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stylish-haskell";
-  version = "0.5.11.0";
-  sha256 = "1174gs5a2n6l2flyb2x93yiq7viwb52kbadw6jya6041xrpblckz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson cmdargs filepath haskellSrcExts mtl strict syb yaml
-  ];
-  testDepends = [
-    aeson cmdargs filepath haskellSrcExts HUnit mtl syb testFramework
-    testFrameworkHunit yaml
-  ];
-  meta = {
-    homepage = "https://github.com/jaspervdj/stylish-haskell";
-    description = "Haskell code prettifier";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix
deleted file mode 100644
index d5e033f094dd..000000000000
--- a/pkgs/development/libraries/haskell/svgcairo/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "svgcairo";
-  version = "0.13.0.0";
-  sha256 = "1i93dhg2fpnk38lgbfpsl97xpfgifrl7xs5nny5vj4hi8ln76ih0";
-  buildDepends = [ cairo glib mtl text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc ];
-  pkgconfigDepends = [ librsvg ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the libsvg-cairo library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix
deleted file mode 100644
index 1cc6747ed16e..000000000000
--- a/pkgs/development/libraries/haskell/syb/0.4.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.4.0";
-  sha256 = "1wxz8y2dcjl407l596qswcl9cakbb5cs4wzwlyy6qjz7lyd0h0gj";
-  testDepends = [ HUnit mtl ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.4.2.nix b/pkgs/development/libraries/haskell/syb/0.4.2.nix
deleted file mode 100644
index 6900c051c01f..000000000000
--- a/pkgs/development/libraries/haskell/syb/0.4.2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.4.2";
-  sha256 = "1gvyw2gbccip24wpp9xi6qgwvg4m5cijhzz1v51wvyamqv4p2b8l";
-  testDepends = [ HUnit mtl ];
-  doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
deleted file mode 100644
index c69b331941c0..000000000000
--- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, sybWithClass, text }:
-
-cabal.mkDerivation (self: {
-  pname = "syb-with-class-instances-text";
-  version = "0.0.1";
-  sha256 = "0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e";
-  buildDepends = [ sybWithClass text ];
-  meta = {
-    description = "Scrap Your Boilerplate With Class Text instance";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
deleted file mode 100644
index a6e802ac5c28..000000000000
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "syb-with-class";
-  version = "0.6.1.5";
-  sha256 = "1gn4p92jabgvbk7bg1nzjimyfzznl800bi9hw4ssvc7jqqnyw5zn";
-  meta = {
-    description = "Scrap Your Boilerplate With Class";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix
deleted file mode 100644
index 46a2979d775d..000000000000
--- a/pkgs/development/libraries/haskell/symbol/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "symbol";
-  version = "0.2.4";
-  sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
-  buildDepends = [ deepseq ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "A 'Symbol' type for fast symbol comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix
deleted file mode 100644
index a2a33e89e151..000000000000
--- a/pkgs/development/libraries/haskell/syntactic/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, constraints, dataHash, mtl, QuickCheck, safe, tagged
-, tasty, tastyGolden, tastyQuickcheck, tastyTh, treeView
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "syntactic";
-  version = "2.0";
-  sha256 = "0b90afdfymsbgllk8np3xfkgrn2b5ry3n2wbpkn660rknsayw94x";
-  buildDepends = [ constraints dataHash mtl safe tagged treeView ];
-  testDepends = [
-    QuickCheck tagged tasty tastyGolden tastyQuickcheck tastyTh
-    utf8String
-  ];
-  meta = {
-    homepage = "https://github.com/emilaxelsson/syntactic";
-    description = "Generic representation and manipulation of abstract syntax";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-argv0/default.nix b/pkgs/development/libraries/haskell/system-argv0/default.nix
deleted file mode 100644
index 6f0eb038b604..000000000000
--- a/pkgs/development/libraries/haskell/system-argv0/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, systemFilepath, text }:
-
-cabal.mkDerivation (self: {
-  pname = "system-argv0";
-  version = "0.1.1";
-  sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
-  buildDepends = [ systemFilepath text ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-filesystem/";
-    description = "Get argv[0] as a FilePath";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
deleted file mode 100644
index cf3dcee33014..000000000000
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chell, systemFilepath, temporary, text, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "system-fileio";
-  version = "0.3.16";
-  sha256 = "1x18ffhas6bhjis0glf0xd6ap8vy7cap8lkmnkn4px83d82yzi8k";
-  buildDepends = [ systemFilepath text time ];
-  testDepends = [
-    chell systemFilepath temporary text time transformers
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/haskell-filesystem";
-    description = "Consistent filesystem interaction across GHC versions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
deleted file mode 100644
index 8ec752d7a396..000000000000
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chell, chellQuickcheck, deepseq, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "system-filepath";
-  version = "0.4.13";
-  sha256 = "0g1lam859vs71vyc8qsg6aianw5s7w19rk02acf2gr8dg3ypznca";
-  buildDepends = [ deepseq text ];
-  testDepends = [ chell chellQuickcheck QuickCheck text ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fpco/haskell-filesystem";
-    description = "High-level, byte-based file and directory path manipulations";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix
deleted file mode 100644
index 748a69a20a4e..000000000000
--- a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "system-posix-redirect";
-  version = "1.1.0.1";
-  sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk";
-  meta = {
-    description = "A toy module to temporarily redirect a program's stdout";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix
deleted file mode 100644
index e9e01fb78fbc..000000000000
--- a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "system-time-monotonic";
-  version = "0.2";
-  sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
-  buildDepends = [ time ];
-  meta = {
-    homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
-    description = "Simple library for using the system's monotonic clock";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syz/default.nix b/pkgs/development/libraries/haskell/syz/default.nix
deleted file mode 100644
index e8c6075ffd27..000000000000
--- a/pkgs/development/libraries/haskell/syz/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "syz";
-  version = "0.2.0.0";
-  sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/";
-    description = "Scrap Your Zippers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tables/default.nix b/pkgs/development/libraries/haskell/tables/default.nix
deleted file mode 100644
index b8159a777d49..000000000000
--- a/pkgs/development/libraries/haskell/tables/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cereal, comonad, deepseq, doctest, filepath
-, hashable, lens, profunctors, safecopy, transformers
-, transformersCompat, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tables";
-  version = "0.4.1";
-  sha256 = "131c97lgni0b9pmkdfd5y0lwrb9yh9qyahknhrim8dzpkkfynk49";
-  buildDepends = [
-    binary cereal comonad deepseq hashable lens profunctors safecopy
-    transformers transformersCompat unorderedContainers
-  ];
-  testDepends = [
-    doctest filepath lens transformers unorderedContainers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/tables/";
-    description = "In-memory storage with multiple keys using lenses and traversals";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix
deleted file mode 100644
index 57f91bcd728a..000000000000
--- a/pkgs/development/libraries/haskell/tabular/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, csv, html, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "tabular";
-  version = "0.2.2.5";
-  sha256 = "00d1f8yr7kbg30ziv09pb8f4apcvrfb6izb26my1s97kw9ixa740";
-  buildDepends = [ csv html mtl ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://hub.darcs.net/kowey/tabular";
-    description = "Two-dimensional data tables with rendering functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagged-transformer/default.nix b/pkgs/development/libraries/haskell/tagged-transformer/default.nix
deleted file mode 100644
index 34da51018e00..000000000000
--- a/pkgs/development/libraries/haskell/tagged-transformer/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, contravariant, distributive, exceptions, mtl
-, reflection, semigroupoids, tagged
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tagged-transformer";
-  version = "0.7.1";
-  sha256 = "1qgfx546pj4aqdblb4gddfxp642snn5dx4kxj3sn5q7c9lsgdh8j";
-  buildDepends = [
-    comonad contravariant distributive exceptions mtl reflection
-    semigroupoids tagged
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/tagged-transformer";
-    description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
deleted file mode 100644
index 10585eb3412b..000000000000
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "tagged";
-  version = "0.7.3";
-  sha256 = "016bzws7w09xhyyqiz56ahlf7zhagihn370ga0083fgv172lym7b";
-  meta = {
-    homepage = "http://github.com/ekmett/tagged";
-    description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/taggy-lens/default.nix b/pkgs/development/libraries/haskell/taggy-lens/default.nix
deleted file mode 100644
index fe8344ba73de..000000000000
--- a/pkgs/development/libraries/haskell/taggy-lens/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, hspec, lens, taggy, text, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "taggy-lens";
-  version = "0.1.2";
-  sha256 = "05m2c9q0rz4y0zz6n3dqf0hhzfvk0mp1692jxykg86c802d7pkib";
-  buildDepends = [ lens taggy text unorderedContainers ];
-  testDepends = [
-    doctest hspec lens taggy text unorderedContainers
-  ];
-  meta = {
-    homepage = "http://github.com/alpmestan/taggy-lens";
-    description = "Lenses for the taggy html/xml parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/taggy/default.nix b/pkgs/development/libraries/haskell/taggy/default.nix
deleted file mode 100644
index d456afbd65f0..000000000000
--- a/pkgs/development/libraries/haskell/taggy/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeHtml, blazeMarkup, hspec, hspecAttoparsec
-, text, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "taggy";
-  version = "0.1.3";
-  sha256 = "18azsibsfjz4zj69dk4a3jrdw6zvd8n1gsd1ynd2hy7i9z168iw8";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec blazeHtml blazeMarkup text unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec blazeHtml blazeMarkup hspec hspecAttoparsec text
-    unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/alpmestan/taggy";
-    description = "Efficient and simple HTML/XML parsing library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagshare/default.nix b/pkgs/development/libraries/haskell/tagshare/default.nix
deleted file mode 100644
index dbd88393c34a..000000000000
--- a/pkgs/development/libraries/haskell/tagshare/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "tagshare";
-  version = "0.0";
-  sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "TagShare - explicit sharing with tags";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
deleted file mode 100644
index 40ddd46ba547..000000000000
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "tagsoup";
-  version = "0.13.3";
-  sha256 = "13b6zy6346r3cxhaivys84fnxarg8wbv7r2znazfjdkqil8n5a1j";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/tagsoup/";
-    description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
deleted file mode 100644
index 2e9393175040..000000000000
--- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
-, conduitExtra, dataDefault, hspec, HUnit, QuickCheck, resourcet
-, text, transformers, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tagstream-conduit";
-  version = "0.5.5.3";
-  sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
-  buildDepends = [
-    attoparsec blazeBuilder caseInsensitive conduit conduitExtra
-    dataDefault resourcet text transformers xmlConduit
-  ];
-  testDepends = [ conduit hspec HUnit QuickCheck resourcet text ];
-  meta = {
-    homepage = "http://github.com/yihuang/tagstream-conduit";
-    description = "streamlined html tag parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix
deleted file mode 100644
index be98c2041562..000000000000
--- a/pkgs/development/libraries/haskell/tar/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, time }:
-
-cabal.mkDerivation (self: {
-  pname = "tar";
-  version = "0.4.0.1";
-  sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
-  buildDepends = [ filepath time ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    description = "Reading, writing and manipulating \".tar\" archive files.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
deleted file mode 100644
index 8f6b953e9546..000000000000
--- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, genericDeriving, mtl, stm, tagged, tasty, transformers
-, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-ant-xml";
-  version = "1.0.1";
-  sha256 = "1wb9lm9rbk46g9cm2lpcrzh59zpcy270p824agg61bj1xb9jymsc";
-  buildDepends = [
-    genericDeriving mtl stm tagged tasty transformers xml
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/tasty-ant-xml";
-    description = "Render tasty output to XML for Jenkins";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix
deleted file mode 100644
index 5f2efb3520f7..000000000000
--- a/pkgs/development/libraries/haskell/tasty-golden/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, deepseq, filepath, mtl, optparseApplicative, tagged
-, tasty, tastyHunit, temporaryRc
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-golden";
-  version = "2.2.2.4";
-  sha256 = "096c4h306r4z7wq8nm94mwmdndm0mwd6hhiqf77iilpdndasrl1c";
-  buildDepends = [
-    async deepseq filepath mtl optparseApplicative tagged tasty
-    temporaryRc
-  ];
-  testDepends = [ filepath tasty tastyHunit temporaryRc ];
-  meta = {
-    homepage = "https://github.com/feuerbach/tasty-golden";
-    description = "Golden tests support for tasty";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix
deleted file mode 100644
index 459a0f1123ab..000000000000
--- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecCore, QuickCheck, random, tasty
-, tastyQuickcheck, tastySmallcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-hspec";
-  version = "1.1";
-  sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6";
-  buildDepends = [
-    hspec hspecCore QuickCheck random tasty tastyQuickcheck
-    tastySmallcheck
-  ];
-  meta = {
-    homepage = "http://github.com/mitchellwrosen/tasty-hspec";
-    description = "Hspec support for the Tasty test framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
deleted file mode 100644
index edbdf8b9cd65..000000000000
--- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, tasty }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-hunit";
-  version = "0.9.0.1";
-  sha256 = "0rhdjb4fakcbkz4cvmmf679zad9h5yr31i1g9xm1338p6xd4vwcb";
-  buildDepends = [ tasty ];
-  meta = {
-    homepage = "http://documentup.com/feuerbach/tasty";
-    description = "HUnit support for the Tasty test framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-program/default.nix b/pkgs/development/libraries/haskell/tasty-program/default.nix
deleted file mode 100644
index 60a88315f728..000000000000
--- a/pkgs/development/libraries/haskell/tasty-program/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, tasty }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-program";
-  version = "1.0.1";
-  sha256 = "04q2pp7hwqiiry17dd3ng0i6ikqzpg7hfgf0ckcg33xw450kpx9n";
-  buildDepends = [ filepath tasty ];
-  meta = {
-    homepage = "https://github.com/jstolarek/tasty-program";
-    description = "Use tasty framework to test whether a program executes correctly";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
deleted file mode 100644
index 36b22a30f537..000000000000
--- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pcreLight, QuickCheck, tagged, tasty, tastyHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-quickcheck";
-  version = "0.8.3.2";
-  sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v";
-  buildDepends = [ QuickCheck tagged tasty ];
-  testDepends = [ pcreLight tasty tastyHunit ];
-  meta = {
-    homepage = "http://documentup.com/feuerbach/tasty";
-    description = "QuickCheck support for the Tasty test framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
deleted file mode 100644
index af251514b420..000000000000
--- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, optparseApplicative, reducers, split, stm, tagged
-, tasty, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-rerun";
-  version = "1.1.3";
-  sha256 = "1pgm3h7kyg7q8ydgqqj9sn65ckl6i7cz6a8g1cfighf4gy5y0cj3";
-  buildDepends = [
-    mtl optparseApplicative reducers split stm tagged tasty
-    transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/tasty-rerun";
-    description = "Run tests by filtering the test tree depending on the result of previous test runs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
deleted file mode 100644
index 9bdf0c52895e..000000000000
--- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, smallcheck, tagged, tasty }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-smallcheck";
-  version = "0.8.0.1";
-  sha256 = "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm";
-  buildDepends = [ async smallcheck tagged tasty ];
-  meta = {
-    homepage = "http://documentup.com/feuerbach/tasty";
-    description = "SmallCheck support for the Tasty test framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix
deleted file mode 100644
index 98d62036e835..000000000000
--- a/pkgs/development/libraries/haskell/tasty-th/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, languageHaskellExtract, tasty }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-th";
-  version = "0.1.3";
-  sha256 = "1fl5pagm9bdqvp7v54ilkr91m667rxw1jifwfdhrikr938aqrzx3";
-  buildDepends = [ languageHaskellExtract tasty ];
-  meta = {
-    homepage = "http://github.com/bennofs/tasty-th";
-    description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
deleted file mode 100644
index e99c8672c864..000000000000
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative
-, regexTdfaRc, stm, tagged, time, unboundedDelays
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty";
-  version = "0.10.1";
-  sha256 = "1l8ah7018f3m8css56h59fcly1jhanm5wd0hbgm8mg6pn7rrjml5";
-  buildDepends = [
-    ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm
-    tagged time unboundedDelays
-  ];
-  meta = {
-    homepage = "http://documentup.com/feuerbach/tasty";
-    description = "Modern and extensible testing framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tcache-AWS/default.nix b/pkgs/development/libraries/haskell/tcache-AWS/default.nix
deleted file mode 100644
index 5f1ae4938d1b..000000000000
--- a/pkgs/development/libraries/haskell/tcache-AWS/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aws, conduit, httpConduit, network, TCache, text }:
-
-cabal.mkDerivation (self: {
-  pname = "tcache-AWS";
-  version = "0.0.1";
-  sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv";
-  buildDepends = [ aws conduit httpConduit network TCache text ];
-  meta = {
-    description = "tcache using Amazon Web Services as default persistence mechanism";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/template-default/default.nix b/pkgs/development/libraries/haskell/template-default/default.nix
deleted file mode 100644
index 3a7e3f05bdd2..000000000000
--- a/pkgs/development/libraries/haskell/template-default/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault }:
-
-cabal.mkDerivation (self: {
-  pname = "template-default";
-  version = "0.1.1";
-  sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd";
-  buildDepends = [ dataDefault ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/haskell-pkg-janitors/template-default";
-    description = "declaring Default instances just got even easier";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/template/default.nix b/pkgs/development/libraries/haskell/template/default.nix
deleted file mode 100644
index 4eceef5729d4..000000000000
--- a/pkgs/development/libraries/haskell/template/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "template";
-  version = "0.2.0.10";
-  sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg";
-  buildDepends = [ mtl text ];
-  meta = {
-    description = "Simple string substitution";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/temporary-rc/default.nix b/pkgs/development/libraries/haskell/temporary-rc/default.nix
deleted file mode 100644
index 62931e168af9..000000000000
--- a/pkgs/development/libraries/haskell/temporary-rc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, filepath, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "temporary-rc";
-  version = "1.2.0.3";
-  sha256 = "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs";
-  buildDepends = [ exceptions filepath transformers ];
-  meta = {
-    homepage = "http://www.github.com/feuerbach/temporary";
-    description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix
deleted file mode 100644
index 8a048744636a..000000000000
--- a/pkgs/development/libraries/haskell/temporary/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, filepath, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "temporary";
-  version = "1.2.0.3";
-  sha256 = "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a";
-  buildDepends = [ exceptions filepath transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.github.com/batterseapower/temporary";
-    description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix
deleted file mode 100644
index 89cf249ecd40..000000000000
--- a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseUnicodeSymbols, HUnit, stm, stmChans, testFramework
-, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "terminal-progress-bar";
-  version = "0.0.1.4";
-  sha256 = "0ldvii23ks446xrd27aklh8s8pn1yi3dzhhzl05gipjqbhq3lsx3";
-  buildDepends = [ baseUnicodeSymbols stm stmChans ];
-  testDepends = [
-    baseUnicodeSymbols HUnit testFramework testFrameworkHunit
-  ];
-  meta = {
-    homepage = "https://github.com/roelvandijk/terminal-progress-bar";
-    description = "A simple progress bar in the terminal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/terminal-size/default.nix b/pkgs/development/libraries/haskell/terminal-size/default.nix
deleted file mode 100644
index d143a66713a0..000000000000
--- a/pkgs/development/libraries/haskell/terminal-size/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "terminal-size";
-  version = "0.3.0";
-  sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw";
-  meta = {
-    description = "Get terminal window height and width";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix
deleted file mode 100644
index 9bb59e14a1e6..000000000000
--- a/pkgs/development/libraries/haskell/terminfo/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ncurses }:
-
-cabal.mkDerivation (self: {
-  pname = "terminfo";
-  version = "0.4.0.0";
-  sha256 = "10y8mhpazcpwwvg1avc0zxq534rwavg82q69l7wm5np24sb5lrv8";
-  extraLibraries = [ ncurses ];
-  meta = {
-    homepage = "https://github.com/judah/terminfo";
-    description = "Haskell bindings to the terminfo library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
deleted file mode 100644
index 12919ec17b8b..000000000000
--- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, HUnit, testFramework }:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-hunit";
-  version = "0.3.0.1";
-  sha256 = "1h0h55kf6ff25nbfx1mhliwyknc0glwv3zi78wpzllbjbs7gvyfk";
-  buildDepends = [ extensibleExceptions HUnit testFramework ];
-  meta = {
-    homepage = "https://batterseapower.github.io/test-framework/";
-    description = "HUnit support for the test-framework package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
deleted file mode 100644
index a012d8a047e2..000000000000
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, QuickCheck, random, testFramework }:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-quickcheck2";
-  version = "0.3.0.3";
-  sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
-  buildDepends = [
-    extensibleExceptions QuickCheck random testFramework
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://batterseapower.github.io/test-framework/";
-    description = "QuickCheck2 support for the test-framework package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix
deleted file mode 100644
index 5837ea46741e..000000000000
--- a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, smallcheck, testFramework, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-smallcheck";
-  version = "0.2";
-  sha256 = "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0";
-  buildDepends = [ smallcheck testFramework transformers ];
-  meta = {
-    homepage = "https://github.com/feuerbach/smallcheck";
-    description = "Support for SmallCheck tests in test-framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
deleted file mode 100644
index a7881a7ebfce..000000000000
--- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, haskellSrcExts, testFramework }:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-th-prime";
-  version = "0.0.7";
-  sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p";
-  buildDepends = [ cpphs haskellSrcExts testFramework ];
-  meta = {
-    description = "Template Haskell for test framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix
deleted file mode 100644
index 21c719c538d8..000000000000
--- a/pkgs/development/libraries/haskell/test-framework-th/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, languageHaskellExtract, regexPosix
-, testFramework
-}:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-th";
-  version = "0.2.4";
-  sha256 = "12lw7yj02jb9s0i7rb98jjam43j2h0gzmnbj9zi933fx7sg0sy4b";
-  buildDepends = [
-    haskellSrcExts languageHaskellExtract regexPosix testFramework
-  ];
-  meta = {
-    homepage = "http://github.com/finnsson/test-generator";
-    description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
deleted file mode 100644
index b4ba1fd1009f..000000000000
--- a/pkgs/development/libraries/haskell/test-framework/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, ansiWlPprint, hostname, random, regexPosix
-, time, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework";
-  version = "0.8.1.0";
-  sha256 = "1js7jbdw0xijpjlca3yh7mw427s3rjkymm1qi565r928pbsbdkhm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal ansiWlPprint hostname random regexPosix time xml
-  ];
-  meta = {
-    homepage = "https://batterseapower.github.io/test-framework/";
-    description = "Framework for running and organising tests, with HUnit and QuickCheck support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-simple/default.nix b/pkgs/development/libraries/haskell/test-simple/default.nix
deleted file mode 100644
index 181c92147e3d..000000000000
--- a/pkgs/development/libraries/haskell/test-simple/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, executablePath, mtl, QuickCheck, statePlus }:
-
-cabal.mkDerivation (self: {
-  pname = "test-simple";
-  version = "0.1.7";
-  sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka";
-  buildDepends = [ mtl QuickCheck statePlus ];
-  testDepends = [ executablePath mtl QuickCheck ];
-  meta = {
-    description = "Simple Perl inspired testing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/testing-feat/default.nix b/pkgs/development/libraries/haskell/testing-feat/default.nix
deleted file mode 100644
index e45d49fb5a87..000000000000
--- a/pkgs/development/libraries/haskell/testing-feat/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, tagshare }:
-
-cabal.mkDerivation (self: {
-  pname = "testing-feat";
-  version = "0.4.0.2";
-  sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j";
-  buildDepends = [ mtl QuickCheck tagshare ];
-  meta = {
-    description = "Functional Enumeration of Algebraic Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
deleted file mode 100644
index f8bff923c6dd..000000000000
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, networkUri, pandocTypes, parsec, split, syb
-, temporary, text, utf8String, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "texmath";
-  version = "0.8.0.1";
-  sha256 = "1k68spamhqwq4afcd0283w731gq0k6j6jxbp5099y6bndh8ff9cn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl networkUri pandocTypes parsec syb xml ];
-  testDepends = [ filepath split temporary text utf8String xml ];
-  meta = {
-    homepage = "http://github.com/jgm/texmath";
-    description = "Conversion between formats used to represent mathematics";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text-binary/default.nix b/pkgs/development/libraries/haskell/text-binary/default.nix
deleted file mode 100644
index 9e6205b7001e..000000000000
--- a/pkgs/development/libraries/haskell/text-binary/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, text }:
-
-cabal.mkDerivation (self: {
-  pname = "text-binary";
-  version = "0.1.0";
-  sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z";
-  buildDepends = [ binary text ];
-  meta = {
-    homepage = "https://github.com/kawu/text-binary";
-    description = "Binary instances for text types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text-format/default.nix b/pkgs/development/libraries/haskell/text-format/default.nix
deleted file mode 100644
index c1bc8c8bc8e2..000000000000
--- a/pkgs/development/libraries/haskell/text-format/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doubleConversion, text, time, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "text-format";
-  version = "0.3.1.1";
-  sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd";
-  buildDepends = [ doubleConversion text time transformers ];
-  meta = {
-    homepage = "https://github.com/bos/text-format";
-    description = "Text formatting";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix
deleted file mode 100644
index 000b689b2767..000000000000
--- a/pkgs/development/libraries/haskell/text-icu/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, icu, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text-icu";
-  version = "0.7.0.0";
-  sha256 = "1fvq6qi9kvw722v2m9d40vwwa2irswfapqfjcrym9c2swdagxnry";
-  buildDepends = [ deepseq text ];
-  testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
-  ];
-  extraLibraries = [ icu ];
-  meta = {
-    homepage = "https://github.com/bos/text-icu";
-    description = "Bindings to the ICU library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
deleted file mode 100644
index 2f34dbb0b467..000000000000
--- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hspec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "text-stream-decode";
-  version = "0.1.0.5";
-  sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy";
-  buildDepends = [ text ];
-  testDepends = [ deepseq hspec text ];
-  meta = {
-    homepage = "http://github.com/fpco/text-stream-decode";
-    description = "Streaming decoding functions for UTF encodings. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix
deleted file mode 100644
index 05a0f899f93b..000000000000
--- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "0.11.2.3";
-  sha256 = "0jrl3qbi91gkcnws9crsa59jsmmbjy91fwvl07qka9m48nq3f9rm";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/1.1.1.3.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix
deleted file mode 100644
index 3908a7a0caef..000000000000
--- a/pkgs/development/libraries/haskell/text/1.1.1.3.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "1.1.1.3";
-  sha256 = "1yrzg449nbbzh2fb9mdmf2jjfhk2g87kr9m2ibssbsqx53p98z0c";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/1.2.0.3.nix b/pkgs/development/libraries/haskell/text/1.2.0.3.nix
deleted file mode 100644
index d0d2112a5e20..000000000000
--- a/pkgs/development/libraries/haskell/text/1.2.0.3.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, quickcheckUnicode, random
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "1.2.0.3";
-  sha256 = "11prz0vli6rclj04vpx5dnzfyznvsrq7i2jmh4sjy37nic5bqf0x";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck quickcheckUnicode random testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tf-random/default.nix b/pkgs/development/libraries/haskell/tf-random/default.nix
deleted file mode 100644
index 4b123bc31643..000000000000
--- a/pkgs/development/libraries/haskell/tf-random/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, primitive, random, time }:
-
-cabal.mkDerivation (self: {
-  pname = "tf-random";
-  version = "0.5";
-  sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
-  buildDepends = [ primitive random time ];
-  meta = {
-    description = "High-quality splittable pseudorandom number generator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix
deleted file mode 100644
index 94919bba6e43..000000000000
--- a/pkgs/development/libraries/haskell/th-desugar/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, mtl, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "th-desugar";
-  version = "1.4.2";
-  sha256 = "16l0khjx2wppnm9spp6mg659m95hxjkzfv3pjw5ays3z6clhx8b9";
-  buildDepends = [ mtl syb ];
-  testDepends = [ hspec HUnit mtl syb ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
-    description = "Functions to desugar Template Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-expand-syns/default.nix b/pkgs/development/libraries/haskell/th-expand-syns/default.nix
deleted file mode 100644
index 5cb842ab3882..000000000000
--- a/pkgs/development/libraries/haskell/th-expand-syns/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "th-expand-syns";
-  version = "0.3.0.4";
-  sha256 = "05qgfam7zq02848icvddds67ch5d8py7r30izg4lp0df0kzn08yq";
-  buildDepends = [ syb ];
-  meta = {
-    description = "Expands type synonyms in Template Haskell ASTs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix
deleted file mode 100644
index 285329912dfe..000000000000
--- a/pkgs/development/libraries/haskell/th-extras/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "th-extras";
-  version = "0.0.0.2";
-  sha256 = "15sqf2jjnqcssq8hp80fk0ysgwqykjjc31gvvmzg4sypskpjs8cl";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "https://github.com/mokus0/th-extras";
-    description = "A grab bag of functions for use with Template Haskell";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix
deleted file mode 100644
index e81a8cf921e3..000000000000
--- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, QuickCheck, text, thLift, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "th-lift-instances";
-  version = "0.1.4";
-  sha256 = "02sf7qn1rs33cdf1dl7vpwkhqzhmj8h3naw0ngh2kz05ymk2qng4";
-  buildDepends = [ text thLift vector ];
-  testDepends = [ doctest filepath QuickCheck text vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/bennofs/th-lift-instances/";
-    description = "Lift instances for template-haskell for common data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
deleted file mode 100644
index 28fdedbde750..000000000000
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "th-lift";
-  version = "0.7";
-  sha256 = "1mh5k6ifmc3mjavlrpkcq55ng737yb3nqv1q67fv8irkv5m6qpza";
-  meta = {
-    homepage = "http://github.com/mboes/th-lift";
-    description = "Derive Template Haskell's Lift class for datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
deleted file mode 100644
index 8f6da0bd038c..000000000000
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, thLift, thReifyMany }:
-
-cabal.mkDerivation (self: {
-  pname = "th-orphans";
-  version = "0.8.2";
-  sha256 = "19d4ls2plxmn5n9c99503mvi99ffp6y6zxi564zf6cdfgw8v73fy";
-  buildDepends = [ thLift thReifyMany ];
-  jailbreak = true;
-  meta = {
-    description = "Orphan instances for TH datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-reify-many/default.nix b/pkgs/development/libraries/haskell/th-reify-many/default.nix
deleted file mode 100644
index 940f8c8c29d7..000000000000
--- a/pkgs/development/libraries/haskell/th-reify-many/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, safe, thExpandSyns }:
-
-cabal.mkDerivation (self: {
-  pname = "th-reify-many";
-  version = "0.1.2";
-  sha256 = "1r7ran4vi2mrhcr6qil89cni6ci3dgm775lfw5ciml3gz1948vz9";
-  buildDepends = [ mtl safe thExpandSyns ];
-  meta = {
-    homepage = "http://github.com/mgsloan/th-reify-many";
-    description = "Recurseively reify template haskell datatype info";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/these/default.nix b/pkgs/development/libraries/haskell/these/default.nix
deleted file mode 100644
index 7b989c7ad387..000000000000
--- a/pkgs/development/libraries/haskell/these/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, mtl, profunctors, semigroupoids, semigroups
-, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "these";
-  version = "0.4.2";
-  sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7";
-  buildDepends = [
-    bifunctors mtl profunctors semigroupoids semigroups transformers
-    vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/isomorphism/these";
-    description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix
deleted file mode 100644
index 8d10ea06ae5f..000000000000
--- a/pkgs/development/libraries/haskell/thespian/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "thespian";
-  version = "0.999";
-  sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://bitbucket.org/alinabi/thespian";
-    description = "Lightweight Erlang-style actors for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/thread-local-storage/default.nix b/pkgs/development/libraries/haskell/thread-local-storage/default.nix
deleted file mode 100644
index 5405f903e1de..000000000000
--- a/pkgs/development/libraries/haskell/thread-local-storage/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, atomicPrimops }:
-
-cabal.mkDerivation (self: {
-  pname = "thread-local-storage";
-  version = "0.1.0.3";
-  sha256 = "0ka6xrxzsw2z95qcc4v2hh4ldb22zkd5s62lns3v1853g4dw7k3l";
-  testDepends = [ atomicPrimops ];
-  doCheck = false;
-  meta = {
-    description = "Several options for thread-local-storage (TLS) in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
deleted file mode 100644
index 92942a55e162..000000000000
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "threadmanager";
-  version = "0.1.7";
-  sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
-  meta = {
-    description = "(deprecated in favor of 'threads') Simple thread management";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix
deleted file mode 100644
index 96b6fbb172a4..000000000000
--- a/pkgs/development/libraries/haskell/threads/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseUnicodeSymbols, concurrentExtra, HUnit, stm
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "threads";
-  version = "0.5.1.2";
-  sha256 = "1bq2aza6sam4zkgpgf8x4lhkk2na1i8annx9cwad3j68p5vdg929";
-  buildDepends = [ baseUnicodeSymbols stm ];
-  testDepends = [
-    baseUnicodeSymbols concurrentExtra HUnit stm testFramework
-    testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/basvandijk/threads";
-    description = "Fork threads and wait for their result";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
deleted file mode 100644
index 5586c28079b9..000000000000
--- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsecEnumerator, dataDefault, deepseq
-, filepath, hashable, MonadCatchIOTransformers, networkUri, safe
-, snapCore, snapServer, stm, text, time, transformers
-, unorderedContainers, utf8String, vault, websockets
-, websocketsSnap
-}:
-
-cabal.mkDerivation (self: {
-  pname = "threepenny-gui";
-  version = "0.5.0.0";
-  sha256 = "0rr826k6p2hbp66qr12sci6km40krbi7lbs293r11jxi0ivj5drd";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsecEnumerator dataDefault deepseq filepath hashable
-    MonadCatchIOTransformers networkUri safe snapCore snapServer stm
-    text time transformers unorderedContainers utf8String vault
-    websockets websocketsSnap
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Threepenny-gui";
-    description = "GUI framework that uses the web browser as a display";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
deleted file mode 100644
index 7c18f2c555b6..000000000000
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, Cabal, cpphs, deepseq, filepath, mtl
-, profunctors, QuickCheck, random, systemPosixRedirect, text, time
-, vector, vectorSpace, vectorThUnbox
-}:
-
-cabal.mkDerivation (self: {
-  pname = "thyme";
-  version = "0.3.5.5";
-  sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4";
-  buildDepends = [
-    aeson attoparsec deepseq mtl profunctors QuickCheck random text
-    time vector vectorSpace vectorThUnbox
-  ];
-  testDepends = [
-    attoparsec Cabal filepath mtl profunctors QuickCheck random
-    systemPosixRedirect text time vectorSpace
-  ];
-  buildTools = [ cpphs ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/liyang/thyme";
-    description = "A faster time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time-compat/default.nix b/pkgs/development/libraries/haskell/time-compat/default.nix
deleted file mode 100644
index ed9da18c39ab..000000000000
--- a/pkgs/development/libraries/haskell/time-compat/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "time-compat";
-  version = "0.1.0.3";
-  sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr";
-  buildDepends = [ time ];
-  meta = {
-    homepage = "http://hub.darcs.net/dag/time-compat";
-    description = "Compatibility with old-time for the time package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time-recurrence/default.nix b/pkgs/development/libraries/haskell/time-recurrence/default.nix
deleted file mode 100644
index 8f0aa7111515..000000000000
--- a/pkgs/development/libraries/haskell/time-recurrence/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataOrdlist, HUnit, mtl, testFramework, testFrameworkHunit
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "time-recurrence";
-  version = "0.9.2";
-  sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm";
-  buildDepends = [ dataOrdlist mtl time ];
-  testDepends = [
-    dataOrdlist HUnit mtl testFramework testFrameworkHunit time
-  ];
-  meta = {
-    homepage = "http://github.com/hellertime/time-recurrence";
-    description = "Generate recurring dates";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
deleted file mode 100644
index 97bdaa852b58..000000000000
--- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "time";
-  version = "1.1.2.4";
-  sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3";
-  meta = {
-    homepage = "http://semantic.org/TimeLib/";
-    description = "A time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time/1.5.nix b/pkgs/development/libraries/haskell/time/1.5.nix
deleted file mode 100644
index ba77c73874dc..000000000000
--- a/pkgs/development/libraries/haskell/time/1.5.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "time";
-  version = "1.5";
-  sha256 = "0vj82msx650z473inhr8yav7k38zj7096wam477y77wardx57pdc";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/time";
-    description = "A time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/timeparsers/default.nix b/pkgs/development/libraries/haskell/timeparsers/default.nix
deleted file mode 100644
index 3259d706a68f..000000000000
--- a/pkgs/development/libraries/haskell/timeparsers/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, convertible, mtl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "timeparsers";
-  version = "0.3.2";
-  sha256 = "1dicp58f2amn5rgmnlfjpv4aj7ak6jrdlba2marglddvj4ycq1h7";
-  buildDepends = [ attoparsec convertible mtl time ];
-  jailbreak = true;
-  meta = {
-    description = "Attoparsec parsers for various Date/Time formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/timerep/default.nix b/pkgs/development/libraries/haskell/timerep/default.nix
deleted file mode 100644
index aea0fe91208e..000000000000
--- a/pkgs/development/libraries/haskell/timerep/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "timerep";
-  version = "1.0.3";
-  sha256 = "14lz8nzfy1j7snvifbwjkk1fjc8wy4jk67xk9n87r25v3cva3x0p";
-  buildDepends = [ time ];
-  meta = {
-    description = "Parse and display time according to some RFCs (RFC3339, RFC2822)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix
deleted file mode 100644
index 8b8704c0de78..000000000000
--- a/pkgs/development/libraries/haskell/timezone-olson/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, extensibleExceptions, time, timezoneSeries }:
-
-cabal.mkDerivation (self: {
-  pname = "timezone-olson";
-  version = "0.1.6";
-  sha256 = "0gg1fq85km5d48966a267q6z0wwl1dz88xq88v0l1jlkwd9jsb0z";
-  buildDepends = [ binary extensibleExceptions time timezoneSeries ];
-  meta = {
-    homepage = "http://projects.haskell.org/time-ng/";
-    description = "A pure Haskell parser and renderer for binary Olson timezone files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix
deleted file mode 100644
index d46f2d812548..000000000000
--- a/pkgs/development/libraries/haskell/timezone-series/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "timezone-series";
-  version = "0.1.4";
-  sha256 = "06p5v0dimhwmra100gwkhkz3ll492i2bvafw0qx2qzcxx4yxff40";
-  buildDepends = [ time ];
-  meta = {
-    homepage = "http://projects.haskell.org/time-ng/";
-    description = "Enhanced timezone handling for Data.Time";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
deleted file mode 100644
index d9b82d137693..000000000000
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, async, byteable, cereal
-, cipherAes, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes
-, cryptohash, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes
-, cryptoRandom, dataDefaultClass, hourglass, mtl, network
-, QuickCheck, tasty, tastyQuickcheck, transformers, x509, x509Store
-, x509Validation
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls";
-  version = "1.2.13";
-  sha256 = "1djjscmyn3wcnlzz1r0clz2nxa2y23rlyjk30xjsdp0m1sq0vdc3";
-  buildDepends = [
-    asn1Encoding asn1Types async byteable cereal cipherAes cipherDes
-    cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey
-    cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network
-    transformers x509 x509Store x509Validation
-  ];
-  testDepends = [
-    cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass
-    hourglass mtl QuickCheck tasty tastyQuickcheck x509 x509Validation
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS/SSL protocol native implementation (Server and Client)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/torrent/default.nix b/pkgs/development/libraries/haskell/torrent/default.nix
deleted file mode 100644
index 0133de6c2219..000000000000
--- a/pkgs/development/libraries/haskell/torrent/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bencode, binary, filepath, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "torrent";
-  version = "10000.0.0";
-  sha256 = "030ll4m80ljkvq72n1aa8a2ygqa56ykkndzy5g40vh9j9j5vq52r";
-  buildDepends = [ bencode binary filepath syb ];
-  meta = {
-    description = "BitTorrent file parser and generater";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix
deleted file mode 100644
index 8b6623d46396..000000000000
--- a/pkgs/development/libraries/haskell/tostring/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, text, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "tostring";
-  version = "0.2.1";
-  sha256 = "0lvfvjs1q6hndbchij3zn1xi6vb1v53r379jvyc2m92sqqcfnylw";
-  buildDepends = [ caseInsensitive text utf8String ];
-  meta = {
-    description = "The ToString class";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix
deleted file mode 100644
index d7b9f53951c5..000000000000
--- a/pkgs/development/libraries/haskell/transformers-base/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers-base";
-  version = "0.4.3";
-  sha256 = "0bklr7piiipnh99jnqx262pdyb9hzk852d6hzk5sqppvz5ndcf4y";
-  buildDepends = [ stm transformers ];
-  meta = {
-    homepage = "https://github.com/mvv/transformers-base";
-    description = "Lift computations from the bottom of a transformer stack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
deleted file mode 100644
index d0dc4ae024d2..000000000000
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers-compat";
-  version = "0.3.3.4";
-  sha256 = "1hab41ggyaxr4xn2szv8y9fg9np8zi8ifhimr33fspid1jz14xr5";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/transformers-compat/";
-    description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix
deleted file mode 100644
index c989d620f40c..000000000000
--- a/pkgs/development/libraries/haskell/transformers-free/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers-free";
-  version = "1.0.1";
-  sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Free monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
deleted file mode 100644
index fe2b0f91ef9c..000000000000
--- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers";
-  version = "0.3.0.0";
-  sha256 = "14cmfdi4cmirbrc3x2h6ly08j0mb4p59mxbqkqw8rnbsr4g0rap5";
-  meta = {
-    description = "Concrete functor and monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix
deleted file mode 100644
index 3557941a9a87..000000000000
--- a/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers";
-  version = "0.4.2.0";
-  sha256 = "0a364zfcm17mhpy0c4ms2j88sys4yvgd6071qsgk93la2wjm8mkr";
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    description = "Concrete functor and monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix
deleted file mode 100644
index 2ec410dc0a4d..000000000000
--- a/pkgs/development/libraries/haskell/traverse-with-class/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "traverse-with-class";
-  version = "0.2.0.3";
-  sha256 = "0snms19w3n9ni1wmf4ikwpp298nc6qk6phrjxi5g023ihqqdvr6g";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Generic applicative traversals";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tree-view/default.nix b/pkgs/development/libraries/haskell/tree-view/default.nix
deleted file mode 100644
index 6c3adfdb9f46..000000000000
--- a/pkgs/development/libraries/haskell/tree-view/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "tree-view";
-  version = "0.4";
-  sha256 = "0mzywp6nipc6zs98dy4ny2s3r9d745lqpjazfnj5y4hx8swyckgn";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Render trees as foldable HTML and Unicode art";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix
deleted file mode 100644
index a73f47afb1c2..000000000000
--- a/pkgs/development/libraries/haskell/trifecta/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml
-, blazeMarkup, charset, comonad, deepseq, doctest, filepath
-, fingertree, hashable, lens, mtl, parsers, QuickCheck, reducers
-, semigroups, transformers, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "trifecta";
-  version = "1.5.1";
-  sha256 = "1fayr6sd9m84rqpcygacafn9vr9zva7rmkpvyzz0bf1p1z7i6b2n";
-  buildDepends = [
-    ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
-    charset comonad deepseq fingertree hashable lens mtl parsers
-    reducers semigroups transformers unorderedContainers utf8String
-  ];
-  testDepends = [ doctest filepath parsers QuickCheck ];
-  meta = {
-    homepage = "http://github.com/ekmett/trifecta/";
-    description = "A modern parser combinator library with convenient diagnostics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/trivia/default.nix b/pkgs/development/libraries/haskell/trivia/default.nix
deleted file mode 100644
index b32653032b54..000000000000
--- a/pkgs/development/libraries/haskell/trivia/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, distributive }:
-
-cabal.mkDerivation (self: {
-  pname = "trivia";
-  version = "0.0";
-  sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
-  buildDepends = [ comonad distributive ];
-  meta = {
-    homepage = "https://github.com/fumieval/trivia";
-    description = "The trivial monad and comonad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix
deleted file mode 100644
index 6997d2229ce3..000000000000
--- a/pkgs/development/libraries/haskell/tuple/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, OneTuple }:
-
-cabal.mkDerivation (self: {
-  pname = "tuple";
-  version = "0.3.0.2";
-  sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg";
-  buildDepends = [ OneTuple ];
-  meta = {
-    description = "Various functions on tuples";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
deleted file mode 100644
index 31542d43ebcb..000000000000
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, authenticateOauth, caseInsensitive
-, conduit, conduitExtra, dataDefault, doctest, filepath, hlint
-, hspec, httpClient, httpConduit, httpTypes, lens, lensAeson
-, monadControl, networkUri, resourcet, text, time, transformers
-, transformersBase, twitterTypes, twitterTypesLens, fetchurl
-}:
-
-cabal.mkDerivation (self: {
-  pname = "twitter-conduit";
-  version = "0.1.0";
-  sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji";
-  editedCabalFile = "06z8dwvc17xhzpvb7cm0j6v63r5f3xirj36rr86bds3rw1zbnd0z";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec authenticateOauth conduit conduitExtra dataDefault
-    httpClient httpConduit httpTypes lens lensAeson networkUri
-    resourcet text time transformers twitterTypes twitterTypesLens
-  ];
-  testDepends = [
-    aeson attoparsec authenticateOauth caseInsensitive conduit
-    conduitExtra dataDefault doctest filepath hlint hspec httpClient
-    httpConduit httpTypes lens lensAeson monadControl networkUri
-    resourcet text time transformers transformersBase twitterTypes
-    twitterTypesLens
-  ];
-  meta = {
-    homepage = "https://github.com/himura/twitter-conduit";
-    description = "Twitter API package with conduit interface and Streaming API support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/twitter-types-lens/default.nix b/pkgs/development/libraries/haskell/twitter-types-lens/default.nix
deleted file mode 100644
index 85407fc00b28..000000000000
--- a/pkgs/development/libraries/haskell/twitter-types-lens/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, text, twitterTypes }:
-
-cabal.mkDerivation (self: {
-  pname = "twitter-types-lens";
-  version = "0.6.0";
-  sha256 = "0n2z7v2mcvj2czkszkp87sf7cv4zj82yccygs9ah5ax28dw823v3";
-  buildDepends = [ lens text twitterTypes ];
-  meta = {
-    homepage = "https://github.com/himura/twitter-types-lens";
-    description = "Twitter JSON types (lens powered)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
deleted file mode 100644
index 9ed6a77ac2de..000000000000
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, filepath, HUnit, testFramework
-, testFrameworkHunit, testFrameworkThPrime, text
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "twitter-types";
-  version = "0.6.0";
-  sha256 = "0yvs57f3m0nq11qpxziazp9r95g1v231d2djmch9c5d8g22cjvdn";
-  buildDepends = [ aeson text unorderedContainers ];
-  testDepends = [
-    aeson attoparsec filepath HUnit testFramework testFrameworkHunit
-    testFrameworkThPrime text unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/himura/twitter-types";
-    description = "Twitter JSON parser and types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-aligned/default.nix b/pkgs/development/libraries/haskell/type-aligned/default.nix
deleted file mode 100644
index a1e547ca0e26..000000000000
--- a/pkgs/development/libraries/haskell/type-aligned/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "type-aligned";
-  version = "0.9.3";
-  sha256 = "1wkjbb6giq71j5j72w4018hifn58gpgwxppbhgi5a8xdcxp8afl0";
-  meta = {
-    homepage = "https://github.com/atzeus/type-aligned";
-    description = "Various type-aligned sequence data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix
deleted file mode 100644
index 89b6398c5e06..000000000000
--- a/pkgs/development/libraries/haskell/type-eq/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs }:
-
-cabal.mkDerivation (self: {
-  pname = "type-eq";
-  version = "0.4.2";
-  sha256 = "0nyx3lqgrnlz0l3p615ln2dglqd39jwlk91ybz7blzhq1gpgayar";
-  buildTools = [ cpphs ];
-  meta = {
-    homepage = "http://github.com/glaebhoerl/type-eq";
-    description = "Type equality evidence you can carry around";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix
deleted file mode 100644
index de5bc73873f2..000000000000
--- a/pkgs/development/libraries/haskell/type-equality/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "type-equality";
-  version = "0.1.2";
-  sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr";
-  meta = {
-    homepage = "http://github.com/hesselink/type-equality/";
-    description = "Type equality, coercion/cast and other operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
deleted file mode 100644
index 7bc0c31b86dc..000000000000
--- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "type-level-natural-number";
-  version = "2.0";
-  sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk";
-  meta = {
-    description = "Simple type level natural numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-natural/default.nix b/pkgs/development/libraries/haskell/type-natural/default.nix
deleted file mode 100644
index 2e56f8c396b4..000000000000
--- a/pkgs/development/libraries/haskell/type-natural/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, constraints, equationalReasoning, monomorphic, singletons
-}:
-
-cabal.mkDerivation (self: {
-  pname = "type-natural";
-  version = "0.2.3.1";
-  sha256 = "0qi5b3d0vkm1b2kda3ifw6g7djx91wj7q36la02yadlvmb4jcp1g";
-  buildDepends = [
-    constraints equationalReasoning monomorphic singletons
-  ];
-  meta = {
-    homepage = "https://github.com/konn/type-natural";
-    description = "Type-level natural and proofs of their properties";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/typography-geometry/default.nix b/pkgs/development/libraries/haskell/typography-geometry/default.nix
deleted file mode 100644
index c0b5b5fb1ab9..000000000000
--- a/pkgs/development/libraries/haskell/typography-geometry/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parallel, polynomialsBernstein, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "typography-geometry";
-  version = "1.0.0";
-  sha256 = "1vvqch3pdwymjbmir7b208qyzdzljsw1gf8icmzw5pi3vn6wkihf";
-  buildDepends = [ parallel polynomialsBernstein vector ];
-  meta = {
-    description = "Drawings for printed text documents";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix
deleted file mode 100644
index 3f964f2ce3d1..000000000000
--- a/pkgs/development/libraries/haskell/tz/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, bindingsPosix, deepseq, HUnit, pkgs_tzdata
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, time, tzdata, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tz";
-  version = "0.0.0.8";
-  sha256 = "0rabdqwdj8hx17817zsfsih01agx7n3kja8s0axmm0drq22vlflv";
-  buildDepends = [ binary deepseq time tzdata vector ];
-  testDepends = [
-    bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh time tzdata vector
-  ];
-  preConfigure = "export TZDIR=${pkgs_tzdata}/share/zoneinfo";
-  meta = {
-    homepage = "https://github.com/nilcons/haskell-tz";
-    description = "Efficient time zone handling";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tzdata/default.nix b/pkgs/development/libraries/haskell/tzdata/default.nix
deleted file mode 100644
index ceae46792475..000000000000
--- a/pkgs/development/libraries/haskell/tzdata/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filemanip, filepath, HUnit, MissingH, testFramework
-, testFrameworkHunit, testFrameworkTh, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tzdata";
-  version = "0.1.20140612.0";
-  sha256 = "03fd3jiw89c8zf2jdz0qps8sb8ipgmjqbbaq4y2aqczv36ha74gh";
-  buildDepends = [ vector ];
-  testDepends = [
-    filemanip filepath HUnit MissingH testFramework testFrameworkHunit
-    testFrameworkTh
-  ];
-  meta = {
-    homepage = "https://github.com/nilcons/haskell-tzdata";
-    description = "Time zone database (as files and as a module)";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unbound-generics/default.nix b/pkgs/development/libraries/haskell/unbound-generics/default.nix
deleted file mode 100644
index 351df38fc0d1..000000000000
--- a/pkgs/development/libraries/haskell/unbound-generics/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, mtl, QuickCheck, tasty, tastyHunit
-, tastyQuickcheck, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "unbound-generics";
-  version = "0.0.2";
-  sha256 = "0zgajq411bp16xwv31i2igsz62lad923rylhfprklsism13rk5ai";
-  buildDepends = [ contravariant mtl transformers ];
-  testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ];
-  meta = {
-    homepage = "http://github.com/lambdageek/unbound-generics";
-    description = "Reimplementation of Unbound using GHC Generics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
deleted file mode 100644
index 41accd18586d..000000000000
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl, RepLib, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "unbound";
-  version = "0.4.3.1";
-  sha256 = "1xkp47y7yg8dl95gf4w3iwddc3yivrhcxj184cfhrx6a9rbsflpz";
-  buildDepends = [ binary mtl RepLib transformers ];
-  meta = {
-    homepage = "http://code.google.com/p/replib/";
-    description = "Generic support for programming with names and binders";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
deleted file mode 100644
index f03aedad4fd3..000000000000
--- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "unbounded-delays";
-  version = "0.1.0.8";
-  sha256 = "1jdlpg82kndz6g97bw8fb6sjyyvylrcrg982xnhgi36717f0pv40";
-  meta = {
-    homepage = "https://github.com/basvandijk/unbounded-delays";
-    description = "Unbounded thread delays and timeouts";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unification-fd/default.nix b/pkgs/development/libraries/haskell/unification-fd/default.nix
deleted file mode 100644
index 5489310e3320..000000000000
--- a/pkgs/development/libraries/haskell/unification-fd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, logict, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "unification-fd";
-  version = "0.9.0";
-  sha256 = "0fdnpcpcpjlxlwxpqlawwbgqhs1p9lrksy5ln5isyvr06hwqh7ki";
-  buildDepends = [ logict mtl ];
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Simple generic unification algorithms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/union-find/default.nix b/pkgs/development/libraries/haskell/union-find/default.nix
deleted file mode 100644
index f17b08b3ab6f..000000000000
--- a/pkgs/development/libraries/haskell/union-find/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ 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
deleted file mode 100644
index db85f4be78eb..000000000000
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, syb, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "uniplate";
-  version = "1.6.12";
-  sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw";
-  buildDepends = [ hashable syb unorderedContainers ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/uniplate/";
-    description = "Help writing simple, concise and fast generic operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unique/default.nix b/pkgs/development/libraries/haskell/unique/default.nix
deleted file mode 100644
index 0325a0da75d5..000000000000
--- a/pkgs/development/libraries/haskell/unique/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Unique";
-  version = "0.2";
-  sha256 = "0qylqb71gkvfwnnz4ij22x79y583y409fszqnyqd6dc90gycfm98";
-  meta = {
-    description = "It provides the functionality like unix \"uniq\" utility";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix
deleted file mode 100644
index c5834e3f87dc..000000000000
--- a/pkgs/development/libraries/haskell/uniqueid/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "uniqueid";
-  version = "0.1.1";
-  sha256 = "e69df591c1ab9901af24bf0e63032765eb2b1ba4ca4fb720a234e9f292e03268";
-  meta = {
-    homepage = "http://github.com/sebfisch/uniqueid/wikis";
-    description = "Splittable Unique Identifier Supply";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix
deleted file mode 100644
index 2024aacf7ff8..000000000000
--- a/pkgs/development/libraries/haskell/units/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnitApprox, mtl, multimap, parsec, singletons, syb, tasty
-, tastyHunit, thDesugar, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "units";
-  version = "2.2";
-  sha256 = "1hd7klv0h2rsq971rbghvgy2921bf0zxikdsl26qw08yb0zirvza";
-  buildDepends = [
-    mtl multimap parsec singletons syb thDesugar vectorSpace
-  ];
-  testDepends = [
-    HUnitApprox mtl multimap parsec singletons syb tasty tastyHunit
-    thDesugar vectorSpace
-  ];
-  meta = {
-    homepage = "https://github.com/goldfirere/units";
-    description = "A domain-specific type system for dimensional analysis";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
deleted file mode 100644
index 4219611f9107..000000000000
--- a/pkgs/development/libraries/haskell/unix-bytestring/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-bytestring";
-  version = "0.3.7.2";
-  sha256 = "0n1i7pcdwhs0wz6spf3pndr8i74qn0cdzr3p46w4r4mvvwr76i2s";
-  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-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
deleted file mode 100644
index 7ac3605e6fc7..000000000000
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-compat";
-  version = "0.4.1.3";
-  sha256 = "1vfw3ffzdk9mshhgyp3dnbn8rihkz8qg6n5zqak8966dsdqhm4xb";
-  meta = {
-    homepage = "http://github.com/jystic/unix-compat";
-    description = "Portable POSIX-compatibility layer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-memory/default.nix b/pkgs/development/libraries/haskell/unix-memory/default.nix
deleted file mode 100644
index c8fa0d244fbf..000000000000
--- a/pkgs/development/libraries/haskell/unix-memory/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, tasty, tastyHunit, tastyQuickcheck }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-memory";
-  version = "0.1.2";
-  sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
-  testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-unix-memory";
-    description = "Unix memory syscalls";
-    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
deleted file mode 100644
index dc71c43df877..000000000000
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, filepath, hspec, stm, time, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-process-conduit";
-  version = "0.2.2.3";
-  sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy";
-  buildDepends = [ conduit filepath stm time transformers ];
-  testDepends = [ conduit hspec transformers ];
-  meta = {
-    homepage = "https://github.com/snoyberg/conduit";
-    description = "Run processes on Unix systems, with a conduit interface (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
deleted file mode 100644
index 74bfb2927753..000000000000
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, doctest, hspec, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-time";
-  version = "0.3.4";
-  sha256 = "1bni03bzayg3vwj6mwcl4z41zixv8nida8jc3vkv41fr7mzb24g5";
-  buildDepends = [ binary ];
-  testDepends = [ doctest hspec QuickCheck time ];
-  meta = {
-    description = "Unix time parser/formatter and utilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
deleted file mode 100644
index 65419a22bb0e..000000000000
--- a/pkgs/development/libraries/haskell/unlambda/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "unlambda";
-  version = "0.1.3";
-  sha256 = "0clcpkhg23a7ma72rjjpl2w8jpg2mdn4rgm3vf0vqr7lbyma1h89";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl ];
-  hyperlinkSource = false;
-  meta = {
-    description = "Unlambda interpreter";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
deleted file mode 100644
index 07f1b8beb974..000000000000
--- a/pkgs/development/libraries/haskell/unordered-containers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "unordered-containers";
-  version = "0.2.5.1";
-  sha256 = "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f";
-  buildDepends = [ deepseq hashable ];
-  testDepends = [
-    ChasingBottoms hashable HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/tibbe/unordered-containers";
-    description = "Efficient hashing-based container types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uri-encode/default.nix b/pkgs/development/libraries/haskell/uri-encode/default.nix
deleted file mode 100644
index d6e445ebd4e6..000000000000
--- a/pkgs/development/libraries/haskell/uri-encode/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, networkUri, text, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "uri-encode";
-  version = "1.5.0.3";
-  sha256 = "115wnc7x7gx57qza5az4c1wy0n2f40634529jk0vpxw6bb9b1mzn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ networkUri text utf8String ];
-  jailbreak = true;
-  meta = {
-    description = "Unicode aware uri-encoding";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix
deleted file mode 100644
index 633818d9518d..000000000000
--- a/pkgs/development/libraries/haskell/uri/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec, safe, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "uri";
-  version = "0.1.6.3";
-  sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j";
-  buildDepends = [ parsec safe utf8String ];
-  meta = {
-    homepage = "http://gitorious.org/uri";
-    description = "Library for working with URIs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix
deleted file mode 100644
index bfa7f807c530..000000000000
--- a/pkgs/development/libraries/haskell/url/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "url";
-  version = "2.1.3";
-  sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
-  buildDepends = [ utf8String ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Url";
-    description = "A library for working with URLs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix
deleted file mode 100644
index e60af0e3152d..000000000000
--- a/pkgs/development/libraries/haskell/urlencoded/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, split }:
-
-cabal.mkDerivation (self: {
-  pname = "urlencoded";
-  version = "0.4.0";
-  sha256 = "0idh70apfxx8bkbsxda4xhb0b5xf4x237dwi4v55ildrhxx4b68k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl network split ];
-  meta = {
-    homepage = "https://github.com/pheaver/urlencoded";
-    description = "Generate or process x-www-urlencoded data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix
deleted file mode 100644
index 5f57d42a2b6a..000000000000
--- a/pkgs/development/libraries/haskell/usb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsLibusb, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "usb";
-  version = "1.2.0.1";
-  sha256 = "10bpkrsnin9f3g1p5a84nhxx5xlfjdxisc0q60iain30rn99g2mk";
-  buildDepends = [ bindingsLibusb text vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://basvandijk.github.com/usb";
-    description = "Communicate with USB devices";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix
deleted file mode 100644
index 056fe5b372c8..000000000000
--- a/pkgs/development/libraries/haskell/utf8-light/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "utf8-light";
-  version = "0.4.2";
-  sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q";
-  meta = {
-    description = "Unicode";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
deleted file mode 100644
index 405dbecb6ba4..000000000000
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "utf8-string";
-  version = "0.3.8";
-  sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0";
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  patchPhase = ''
-    sed -ir -e 's|Extensions: | Extensions: UndecidableInstances, |' utf8-string.cabal
-  '';
-  meta = {
-    homepage = "http://github.com/glguy/utf8-string/";
-    description = "Support for reading and writing UTF8 Strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
deleted file mode 100644
index 438b9c810d81..000000000000
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "utility-ht";
-  version = "0.0.10";
-  sha256 = "17ydzb0p8xhddvfvm4wjv5yjmy0v7nj6fsj11srnnpj91wc9k0xd";
-  testDepends = [ QuickCheck ];
-  meta = {
-    description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uu-interleaved/default.nix b/pkgs/development/libraries/haskell/uu-interleaved/default.nix
deleted file mode 100644
index 63873ab18c5f..000000000000
--- a/pkgs/development/libraries/haskell/uu-interleaved/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "uu-interleaved";
-  version = "0.1.0.0";
-  sha256 = "00zq89fjz3r5pj6qbci017cm9y2rsvl265y9d95q0rv6ljhsayzs";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
-    description = "Providing an interleaving combinator for use with applicative/alternative style implementations";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uu-options/default.nix b/pkgs/development/libraries/haskell/uu-options/default.nix
deleted file mode 100644
index e20058de46d7..000000000000
--- a/pkgs/development/libraries/haskell/uu-options/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lenses, mtl, transformers, uuInterleaved, uuParsinglib }:
-
-cabal.mkDerivation (self: {
-  pname = "uu-options";
-  version = "0.1.0.1";
-  sha256 = "0dygg4w3rlnf1pnmwq7i6vzz0v90b4g18ipfc5whn1ss1bixwxk4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    lenses mtl transformers uuInterleaved uuParsinglib
-  ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
-    description = "Parse command line options using uu-interleave and uu-parsinglib";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
deleted file mode 100644
index 405330142094..000000000000
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ListLike, time, uuInterleaved }:
-
-cabal.mkDerivation (self: {
-  pname = "uu-parsinglib";
-  version = "2.8.1.1";
-  sha256 = "1mz8sni7mj85b0ih0y1ld7lcj74iq5z2xi1lbwwndpqra9ahc5s6";
-  buildDepends = [ ListLike time uuInterleaved ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
-    description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
deleted file mode 100644
index 0c65e8dc1df8..000000000000
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cryptohash, deepseq, hashable, HUnit, networkInfo
-, QuickCheck, random, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "uuid";
-  version = "1.3.7";
-  sha256 = "01idfi9vdmcz8fkgnfa0bpz6khx4x2r0rzynzha42irl7881da21";
-  buildDepends = [
-    binary cryptohash deepseq hashable networkInfo random time
-  ];
-  testDepends = [
-    HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/aslatter/uuid";
-    description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
deleted file mode 100644
index 9cfcac5f904e..000000000000
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "uulib";
-  version = "0.9.16";
-  sha256 = "06d9i712flxj62j7rdxvy9b0ximhdfvdakwpmr886l6fi3xpajl3";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
-    description = "Haskell Utrecht Tools Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
deleted file mode 100644
index 343f73238ca4..000000000000
--- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, deepseq, gtk, strictConcurrency, svgcairo, vacuum
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vacuum-cairo";
-  version = "0.5";
-  sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc";
-  buildDepends = [
-    cairo deepseq gtk strictConcurrency svgcairo vacuum
-  ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/vacuum-cairo";
-    description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
deleted file mode 100644
index 9c719605537b..000000000000
--- a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, graphviz, vacuum }:
-
-cabal.mkDerivation (self: {
-  pname = "vacuum-graphviz";
-  version = "2.1.0.1";
-  sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
-  buildDepends = [ filepath graphviz vacuum ];
-  jailbreak = true;
-  meta = {
-    description = "A library for transforming vacuum graphs into GraphViz output";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
deleted file mode 100644
index 31e265e92eef..000000000000
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ghcPaths }:
-
-cabal.mkDerivation (self: {
-  pname = "vacuum";
-  version = "2.2.0.0";
-  sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
-  extraLibraries = [ ghcPaths ];
-  meta = {
-    homepage = "http://thoughtpolice.github.com/vacuum";
-    description = "Graph representation of the GHC heap";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix
deleted file mode 100644
index 87f0ed126fa4..000000000000
--- a/pkgs/development/libraries/haskell/vado/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, filepath, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "vado";
-  version = "0.0.3";
-  sha256 = "1s6fb19p3lc6g13ryh7bmxciv62v8m0ihvzrymsj0nn6jghiys5f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ attoparsec filepath text ];
-  testDepends = [ attoparsec filepath QuickCheck text ];
-  meta = {
-    homepage = "https://github.com/hamishmack/vado";
-    description = "Runs commands on remote machines using ssh";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix
deleted file mode 100644
index 903165b2f5fe..000000000000
--- a/pkgs/development/libraries/haskell/validation/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, doctest, filepath, lens, QuickCheck
-, semigroupoids, semigroups, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "validation";
-  version = "0.4.2";
-  sha256 = "0rsa3n3zawywbpi1gvhfrfglxf9mkmkidkc216ld3s02pmsdmclm";
-  buildDepends = [
-    bifunctors lens semigroupoids semigroups transformers
-  ];
-  testDepends = [ doctest filepath QuickCheck ];
-  meta = {
-    homepage = "https://github.com/tonymorris/validation";
-    description = "A data-type like Either but with an accumulating Applicative";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
deleted file mode 100644
index 9eca4f672cb4..000000000000
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "vault";
-  version = "0.3.0.3";
-  sha256 = "0wpj73jbwgcva1hfjc0bpf9l3lfc3iwdz70m29dh1785wvzxhsh5";
-  buildDepends = [ hashable unorderedContainers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/HeinrichApfelmus/vault";
-    description = "a persistent store for values of arbitrary types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix
deleted file mode 100644
index 804ee0191f30..000000000000
--- a/pkgs/development/libraries/haskell/vcs-revision/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "vcs-revision";
-  version = "0.0.2";
-  sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg";
-  meta = {
-    description = "Facilities for accessing the version control revision of the current directory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix
deleted file mode 100644
index 5e1d6ebf5b8e..000000000000
--- a/pkgs/development/libraries/haskell/vcsgui/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, gtk3, mtl, text, vcswrapper }:
-
-cabal.mkDerivation (self: {
-  pname = "vcsgui";
-  version = "0.1.1.0";
-  sha256 = "1sjkg1ncmpymv9m5ag1f4ia4pdak05bgb03d28jd84p24qvshqyk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath gtk3 mtl text vcswrapper ];
-  meta = {
-    homepage = "https://github.com/forste/haskellVCSGUI";
-    description = "GUI library for source code management systems";
-    license = "GPL";
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix
deleted file mode 100644
index 335c5b319bcf..000000000000
--- a/pkgs/development/libraries/haskell/vcswrapper/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hxt, mtl, parsec, split, text }:
-
-cabal.mkDerivation (self: {
-  pname = "vcswrapper";
-  version = "0.1.1";
-  sha256 = "056gdgmyprvbz61gfffkpwfyh4m7f9fnglk69jp4xh4jfx1wr7ni";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath hxt mtl parsec split text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/forste/haskellVCSWrapper";
-    description = "Wrapper for source code management systems";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix
deleted file mode 100644
index 00ee6dacb9e4..000000000000
--- a/pkgs/development/libraries/haskell/vect/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "vect";
-  version = "0.4.7";
-  sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "A low-dimensional linear algebra library, tailored to computer graphics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
deleted file mode 100644
index b13f6c09c80a..000000000000
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, mwcRandom, primitive, QuickCheck, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-algorithms";
-  version = "0.6.0.3";
-  sha256 = "1kz4b41y7swad6mbx0g3adc8lqma8pl3rnzah71cfdvb87gssbn4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl mwcRandom primitive vector ];
-  testDepends = [ QuickCheck vector ];
-  meta = {
-    homepage = "http://code.haskell.org/~dolio/";
-    description = "Efficient algorithms for vector arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix
deleted file mode 100644
index 1ef75f14a778..000000000000
--- a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cereal, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-binary-instances";
-  version = "0.2.1.0";
-  sha256 = "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l";
-  buildDepends = [ binary cereal vector ];
-  meta = {
-    homepage = "https://github.com/bos/vector-binary-instances";
-    description = "Instances of Data.Binary and Data.Serialize for vector";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-fftw/default.nix b/pkgs/development/libraries/haskell/vector-fftw/default.nix
deleted file mode 100644
index f1bdbfb3d1e6..000000000000
--- a/pkgs/development/libraries/haskell/vector-fftw/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fftw, primitive, storableComplex, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-fftw";
-  version = "0.1.3.2";
-  sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0";
-  buildDepends = [ primitive storableComplex vector ];
-  extraLibraries = [ fftw ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/vector-fftw";
-    description = "A binding to the fftw library for one-dimensional vectors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-instances/default.nix b/pkgs/development/libraries/haskell/vector-instances/default.nix
deleted file mode 100644
index c39dc6c371b9..000000000000
--- a/pkgs/development/libraries/haskell/vector-instances/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, keys, pointed, semigroupoids, semigroups, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vector-instances";
-  version = "3.3";
-  sha256 = "0iiw9p2ivcdfsh81vdy4yn6hbigdwclrkssd68hdsg9n6q3fmq5y";
-  buildDepends = [
-    comonad keys pointed semigroupoids semigroups vector
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/vector-instances";
-    description = "Orphan Instances for 'Data.Vector'";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
deleted file mode 100644
index e7eb15d6556d..000000000000
--- a/pkgs/development/libraries/haskell/vector-space-points/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, vectorSpace }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-space-points";
-  version = "0.2";
-  sha256 = "05wczgvcqwqhcr4v0md4x5vybq6ns8rk6459yqyrc96kaig0sf2i";
-  buildDepends = [ vectorSpace ];
-  meta = {
-    description = "A type for points, as distinct from vectors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
deleted file mode 100644
index 2eb7ca483169..000000000000
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Boolean, MemoTrie, NumInstances }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-space";
-  version = "0.8.7";
-  sha256 = "1i3c34b3ngksmw4blhldap8fiw1jddm2h1qyr92csn3cllj6j1vm";
-  buildDepends = [ Boolean MemoTrie NumInstances ];
-  meta = {
-    description = "Vector & affine spaces, linear maps, and derivatives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
deleted file mode 100644
index 8fdb0f1b2543..000000000000
--- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-th-unbox";
-  version = "0.2.1.0";
-  sha256 = "0r8yxj63hvkm923y8mk1b5kv1b15lqadxhlncc02glvmy8zf1prh";
-  buildDepends = [ vector ];
-  testDepends = [ dataDefault vector ];
-  meta = {
-    description = "Deriver for Data.Vector.Unboxed using Template Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.12.2.nix b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix
deleted file mode 100644
index 011c9b367fad..000000000000
--- a/pkgs/development/libraries/haskell/vector/0.10.12.2.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, primitive, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vector";
-  version = "0.10.12.2";
-  sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25";
-  buildDepends = [ deepseq primitive ];
-  testDepends = [
-    QuickCheck random testFramework testFrameworkQuickcheck2
-    transformers
-  ];
-  configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}";
-  meta = {
-    homepage = "https://github.com/haskell/vector";
-    description = "Efficient Arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
deleted file mode 100644
index 42796bea5481..000000000000
--- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "vector";
-  version = "0.10.9.3";
-  sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
-  buildDepends = [ deepseq primitive ];
-  configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}";
-  meta = {
-    homepage = "https://github.com/haskell/vector";
-    description = "Efficient Arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix
deleted file mode 100644
index 6ba3c4a86ce5..000000000000
--- a/pkgs/development/libraries/haskell/vinyl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, lens, singletons }:
-
-cabal.mkDerivation (self: {
-  pname = "vinyl";
-  version = "0.5";
-  sha256 = "0jm31cynhl8ggmi6ndj7lhfm85cqml67svxm4v3kc8mnw5gj3c59";
-  testDepends = [ doctest lens singletons ];
-  meta = {
-    description = "Extensible Records";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vk-aws-route53/default.nix b/pkgs/development/libraries/haskell/vk-aws-route53/default.nix
deleted file mode 100644
index 4d8188792acd..000000000000
--- a/pkgs/development/libraries/haskell/vk-aws-route53/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aws, httpConduit, httpTypes, resourcet, text, time
-, xmlConduit, xmlHamlet
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vk-aws-route53";
-  version = "0.1.2";
-  sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x";
-  buildDepends = [
-    aws httpConduit httpTypes resourcet text time xmlConduit xmlHamlet
-  ];
-  meta = {
-    description = "Amazon Route53 DNS service plugin for the aws package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix
deleted file mode 100644
index 52a57bd0cae7..000000000000
--- a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "vk-posix-pty";
-  version = "0.2.1";
-  sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "https://github.com/proger/posix-pty/tree/fork";
-    description = "Pseudo terminal interaction with subprocesses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
deleted file mode 100644
index 16f4bfeb8ef7..000000000000
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "void";
-  version = "0.7";
-  sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq";
-  buildDepends = [ hashable semigroups ];
-  meta = {
-    homepage = "http://github.com/ekmett/void";
-    description = "A Haskell 98 logically uninhabited data type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
deleted file mode 100644
index 33f0b9069733..000000000000
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, filepath, mtl, QuickCheck, random, regexBase
-, stm, text, time, vector, vty
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vty-ui";
-  version = "1.8";
-  sha256 = "08jrcwml5g74mp4wy7kqp9jd5mfbxl04517v5354jiwn4dc77azm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataDefault filepath mtl QuickCheck random regexBase stm text time
-    vector vty
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://jtdaugherty.github.com/vty-ui/";
-    description = "An interactive terminal user interface library for Vty";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
deleted file mode 100644
index d91f04f6f268..000000000000
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, Cabal, dataDefault, deepseq, filepath
-, hashable, HUnit, lens, mtl, parallel, parsec, QuickCheck
-, quickcheckAssertions, random, smallcheck, stringQq, terminfo
-, testFramework, testFrameworkHunit, testFrameworkSmallcheck, text
-, transformers, utf8String, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vty";
-  version = "5.2.6";
-  sha256 = "05d5vczifyzg36w1d4wwa9h27fpwgxaxws5ilmg47gq4zr1a6yxi";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeBuilder dataDefault deepseq filepath hashable lens mtl
-    parallel parsec terminfo text transformers utf8String vector
-  ];
-  testDepends = [
-    blazeBuilder Cabal dataDefault deepseq HUnit lens mtl QuickCheck
-    quickcheckAssertions random smallcheck stringQq terminfo
-    testFramework testFrameworkHunit testFrameworkSmallcheck text
-    utf8String vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/coreyoconnor/vty";
-    description = "A simple terminal UI library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
deleted file mode 100644
index ce99df0390eb..000000000000
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, cryptohash, cryptohashConduit, fileEmbed, filepath
-, hspec, httpDate, httpTypes, mimeTypes, network
-, optparseApplicative, systemFileio, systemFilepath, text, time
-, transformers, unixCompat, unorderedContainers, wai, waiExtra
-, warp, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-app-static";
-  version = "3.0.0.3";
-  sha256 = "0krvjnysmfaqds715mp6lhh5am327swi2vja5insmn08da87zhnb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable
-    cryptohash cryptohashConduit fileEmbed filepath httpDate httpTypes
-    mimeTypes optparseApplicative systemFileio systemFilepath text time
-    transformers unixCompat unorderedContainers wai waiExtra warp zlib
-  ];
-  testDepends = [
-    hspec httpDate httpTypes mimeTypes network text time transformers
-    unixCompat wai waiExtra zlib
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/web-application-interface";
-    description = "WAI application for static serving";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix
deleted file mode 100644
index 5c5c11343966..000000000000
--- a/pkgs/development/libraries/haskell/wai-conduit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, conduit, httpTypes, transformers, wai }:
-
-cabal.mkDerivation (self: {
-  pname = "wai-conduit";
-  version = "3.0.0.1";
-  sha256 = "0m5mfr6plzb873by4pab9d4g4cwfcpxl6g5c5qyljb8sydfzhhym";
-  buildDepends = [ blazeBuilder conduit httpTypes transformers wai ];
-  meta = {
-    homepage = "https://github.com/yesodweb/wai";
-    description = "conduit wrappers for WAI";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
deleted file mode 100644
index 480a61014876..000000000000
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, base64Bytestring, blazeBuilder
-, caseInsensitive, dataDefaultClass, deepseq, fastLogger, hspec
-, httpTypes, HUnit, liftedBase, network, resourcet
-, streamingCommons, stringsearch, text, time, transformers, void
-, wai, waiLogger, word8, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-extra";
-  version = "3.0.2.2";
-  sha256 = "0lbm5z4fzsss1y4749598ish967j64nfvlvdmgj27nvshi7qn4s9";
-  buildDepends = [
-    ansiTerminal base64Bytestring blazeBuilder caseInsensitive
-    dataDefaultClass deepseq fastLogger httpTypes liftedBase network
-    resourcet streamingCommons stringsearch text time transformers void
-    wai waiLogger word8
-  ];
-  testDepends = [
-    fastLogger hspec httpTypes HUnit resourcet text transformers wai
-    zlib
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/yesodweb/wai";
-    description = "Provides some basic WAI handlers and middleware";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
deleted file mode 100644
index 7e457ac30146..000000000000
--- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fcgi, wai, waiExtra }:
-
-cabal.mkDerivation (self: {
-  pname = "wai-handler-fastcgi";
-  version = "3.0.0";
-  sha256 = "1cvy95qmbrhc1yjcral7f8y2929xp623abc9xasz7j28m4wwmynh";
-  buildDepends = [ wai waiExtra ];
-  extraLibraries = [ fcgi ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/web-application-interface";
-    description = "Wai handler to fastcgi";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
deleted file mode 100644
index e37df498ac8c..000000000000
--- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, httpTypes, streamingCommons, transformers
-, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-handler-launch";
-  version = "3.0.0";
-  sha256 = "1dv7w151szjkg9968v870abz11a440pdzy50zwm0xl6blk392nmk";
-  buildDepends = [
-    blazeBuilder httpTypes streamingCommons transformers wai warp
-  ];
-  meta = {
-    description = "Launch a web app in the default browser";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
deleted file mode 100644
index 7acf82bd2fcc..000000000000
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, autoUpdate, blazeBuilder, byteorder, caseInsensitive
-, doctest, easyFile, fastLogger, httpTypes, network, unixTime, wai
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-logger";
-  version = "2.2.3";
-  sha256 = "0ljpzq3yfiz3xfglvj69jdk46lmgsg6nqncv9mhij4ih6qq0cx0w";
-  buildDepends = [
-    autoUpdate blazeBuilder byteorder caseInsensitive easyFile
-    fastLogger httpTypes network unixTime wai
-  ];
-  testDepends = [ doctest ];
-  doCheck = false;
-  meta = {
-    description = "A logging system for WAI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
deleted file mode 100644
index e9db0b365be6..000000000000
--- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, httpTypes, mtl, text, wai }:
-
-cabal.mkDerivation (self: {
-  pname = "wai-middleware-static";
-  version = "0.6.0.1";
-  sha256 = "1ylf2nm535d3dw0ksa9dfz1b4b78mqzkdrpdfd5pxswcqbgs266d";
-  buildDepends = [ filepath httpTypes mtl text wai ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/scotty-web/wai-middleware-static";
-    description = "WAI middleware that serves requests to static files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
deleted file mode 100644
index 8e08180b9e17..000000000000
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, wai }:
-
-cabal.mkDerivation (self: {
-  pname = "wai-test";
-  version = "3.0.0";
-  sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx";
-  buildDepends = [ wai ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/web-application-interface";
-    description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-util/default.nix b/pkgs/development/libraries/haskell/wai-util/default.nix
deleted file mode 100644
index fc9b964b26d7..000000000000
--- a/pkgs/development/libraries/haskell/wai-util/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, httpAccept
-, httpTypes, mimeMail, network, resourcet, text, transformers, wai
-, waiExtra
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-util";
-  version = "0.7";
-  sha256 = "1lmx4f7174hzy4a60r2hq9vm9xhbg8vnb9cyi77zyb5p59s53p73";
-  buildDepends = [
-    aeson blazeBuilder caseInsensitive conduit httpAccept httpTypes
-    mimeMail network resourcet text transformers wai waiExtra
-  ];
-  meta = {
-    homepage = "https://github.com/singpolyma/wai-util";
-    description = "Collection of utility functions for use with WAI";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix
deleted file mode 100644
index d225b70f0e7f..000000000000
--- a/pkgs/development/libraries/haskell/wai-websockets/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, caseInsensitive, fileEmbed, httpTypes
-, network, text, transformers, wai, waiAppStatic, warp, websockets
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-websockets";
-  version = "3.0.0.2";
-  sha256 = "1p0ylwc19g63z4qijnis1x5wys5h2avim6s2fn7m2ihrlc3pkhsb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeBuilder caseInsensitive fileEmbed httpTypes network text
-    transformers wai waiAppStatic warp websockets
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/yesodweb/wai";
-    description = "Provide a bridge betweeen WAI and the websockets package";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
deleted file mode 100644
index 2effc4fc83bf..000000000000
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, hspec, httpTypes, network, text, vault }:
-
-cabal.mkDerivation (self: {
-  pname = "wai";
-  version = "3.0.2";
-  sha256 = "0k67yzr05d6vjwqamnzzggk1mlj9wabqrm26dqbrrc40jj3kddgw";
-  buildDepends = [ blazeBuilder httpTypes network text vault ];
-  testDepends = [ blazeBuilder hspec ];
-  meta = {
-    homepage = "https://github.com/yesodweb/wai";
-    description = "Web Application Interface";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
deleted file mode 100644
index 8b4668dcf5a5..000000000000
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cprngAes, dataDefaultClass, network, streamingCommons, tls
-, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "warp-tls";
-  version = "3.0.1";
-  sha256 = "0s87ricslidyg6m17q5mllpl47v0d8mvvd6psq4izz5l27dg2xpy";
-  buildDepends = [
-    cprngAes dataDefaultClass network streamingCommons tls wai warp
-  ];
-  meta = {
-    homepage = "http://github.com/yesodweb/wai";
-    description = "HTTP over SSL/TLS support for Warp via the TLS package";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
deleted file mode 100644
index ae3632918033..000000000000
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, autoUpdate, blazeBuilder, caseInsensitive, doctest
-, hashable, hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase
-, network, QuickCheck, simpleSendfile, streamingCommons, text, time
-, transformers, unixCompat, void, wai
-}:
-
-cabal.mkDerivation (self: {
-  pname = "warp";
-  version = "3.0.4";
-  sha256 = "0kykf3nki9a7mqr1z9jhk4z0cbzlmk9lyc7zw5y36285mx9id0dr";
-  buildDepends = [
-    autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes
-    network simpleSendfile streamingCommons text unixCompat void wai
-  ];
-  testDepends = [
-    async autoUpdate blazeBuilder caseInsensitive doctest hashable
-    hspec HTTP httpDate httpTypes HUnit liftedBase network QuickCheck
-    simpleSendfile streamingCommons text time transformers unixCompat
-    void wai
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/yesodweb/wai";
-    description = "A fast, light-weight web server for WAI applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wcwidth/default.nix b/pkgs/development/libraries/haskell/wcwidth/default.nix
deleted file mode 100644
index 7c5c703533a4..000000000000
--- a/pkgs/development/libraries/haskell/wcwidth/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, setlocale, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "wcwidth";
-  version = "0.0.2";
-  sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ attoparsec setlocale utf8String ];
-  meta = {
-    homepage = "http://github.com/solidsnack/wcwidth/";
-    description = "Native wcwidth";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
deleted file mode 100644
index 88f268782805..000000000000
--- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, boomerang, mtl, parsec, text, webRoutes }:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes-boomerang";
-  version = "0.28.3";
-  sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn";
-  buildDepends = [ boomerang mtl parsec text webRoutes ];
-  meta = {
-    description = "Library for maintaining correctness and composability of URLs within an application";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/web-routes-happstack/default.nix b/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
deleted file mode 100644
index 299357e2073d..000000000000
--- a/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happstackServer, text, webRoutes }:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes-happstack";
-  version = "0.23.9";
-  sha256 = "0vsjm979z21858wk9z1b855jqmr4apm35b5ff8x6nynq6kiflrzw";
-  buildDepends = [ happstackServer text webRoutes ];
-  meta = {
-    description = "Adds support for using web-routes with Happstack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
deleted file mode 100644
index b29d42dc9611..000000000000
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, httpTypes, HUnit, mtl, parsec, QuickCheck
-, split, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes";
-  version = "0.27.7";
-  sha256 = "0q6rl8vasbkq24jdfdq6jrjivcqqmdy34w8zw5zczmscpyjqf0zb";
-  buildDepends = [
-    blazeBuilder httpTypes mtl parsec split text utf8String
-  ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh
-  ];
-  meta = {
-    description = "Library for maintaining correctness and composability of URLs within an application";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix
deleted file mode 100644
index 7433f165e4d1..000000000000
--- a/pkgs/development/libraries/haskell/webdriver/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault
-, directoryTree, exceptions, filepath, httpClient, httpTypes
-, liftedBase, monadControl, mtl, network, networkUri, parallel
-, scientific, temporary, text, time, transformers, transformersBase
-, unorderedContainers, vector, zipArchive
-}:
-
-cabal.mkDerivation (self: {
-  pname = "webdriver";
-  version = "0.6.0.4";
-  sha256 = "1miy65dl60gymf0a65kjykdmsl3cwcjrfg1iiyk6vkjz39y6y7qf";
-  buildDepends = [
-    aeson attoparsec base64Bytestring cond dataDefault directoryTree
-    exceptions filepath httpClient httpTypes liftedBase monadControl
-    mtl network networkUri scientific temporary text time transformers
-    transformersBase unorderedContainers vector zipArchive
-  ];
-  testDepends = [ parallel text ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/kallisti-dev/hs-webdriver";
-    description = "a Haskell client for the Selenium WebDriver protocol";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix
deleted file mode 100644
index 63b8566b924b..000000000000
--- a/pkgs/development/libraries/haskell/webkit/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango, text
-, webkit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "webkit";
-  version = "0.13.1.1";
-  sha256 = "0652as9wq0ajaqmcx14y2svishccgrywyagrbzga7m06r3h94dz5";
-  buildDepends = [ cairo glib gtk mtl pango text ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ webkit ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Webkit library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/webkitgtk3/default.nix b/pkgs/development/libraries/haskell/webkitgtk3/default.nix
deleted file mode 100644
index 4f1d8a15cf73..000000000000
--- a/pkgs/development/libraries/haskell/webkitgtk3/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk2hsBuildtools, gtk3, mtl, pango, text
-, webkitgtk
-}:
-
-cabal.mkDerivation (self: {
-  pname = "webkitgtk3";
-  version = "0.13.1.1";
-  sha256 = "0lm52xsgf3sayj5d32fyf9fy89zinn7c4z6rq4qw2bsnsdw8hcyb";
-  buildDepends = [ cairo glib gtk3 mtl pango text ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ webkitgtk ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Webkit library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix
deleted file mode 100644
index 72bd7feb7811..000000000000
--- a/pkgs/development/libraries/haskell/websockets-snap/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enumerator, mtl, snapCore, snapServer, websockets }:
-
-cabal.mkDerivation (self: {
-  pname = "websockets-snap";
-  version = "0.9.0.0";
-  sha256 = "051y62xga7drrfllv10giyr49z1z9ql8681dgwynmdad5x6asf85";
-  buildDepends = [ enumerator mtl snapCore snapServer websockets ];
-  jailbreak = true;
-  meta = {
-    description = "Snap integration for the websockets library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
deleted file mode 100644
index 79e03b748e62..000000000000
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base64Bytestring, binary, blazeBuilder
-, caseInsensitive, entropy, HUnit, mtl, network, QuickCheck, random
-, SHA, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "websockets";
-  version = "0.9.2.1";
-  sha256 = "11pdh5dc7r9svg789yx66lff5gcmzs6yg7m74ciz3ybb2i4p855s";
-  buildDepends = [
-    attoparsec base64Bytestring binary blazeBuilder caseInsensitive
-    entropy mtl network random SHA text
-  ];
-  testDepends = [
-    attoparsec base64Bytestring binary blazeBuilder caseInsensitive
-    entropy HUnit mtl network QuickCheck random SHA testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://jaspervdj.be/websockets";
-    description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wizards/default.nix b/pkgs/development/libraries/haskell/wizards/default.nix
deleted file mode 100644
index ce1dd5796973..000000000000
--- a/pkgs/development/libraries/haskell/wizards/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, controlMonadFree, haskeline, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "wizards";
-  version = "1.0.1";
-  sha256 = "08dn24injfzvhs34yw39y336pyi6p98bdrafx3lhd6lcbp531sca";
-  buildDepends = [ controlMonadFree haskeline mtl transformers ];
-  meta = {
-    description = "High level, generic library for interrogative user interfaces";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
deleted file mode 100644
index 0507b1ea1a64..000000000000
--- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, nats, semigroupoids, semigroups, testFramework
-, testFrameworkHunit, text, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wl-pprint-extras";
-  version = "3.5.0.3";
-  sha256 = "124wb4hqd97f3naha0589v18lvi9xbn39bmn8jwaylvyg6s5fyyp";
-  buildDepends = [ nats semigroupoids semigroups text utf8String ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  meta = {
-    homepage = "http://github.com/ekmett/wl-pprint-extras/";
-    description = "A free monad based on the Wadler/Leijen pretty printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
deleted file mode 100644
index 6f2e62008f58..000000000000
--- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, nats, semigroups, terminfo, text, transformers
-, wlPprintExtras
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wl-pprint-terminfo";
-  version = "3.7.1.3";
-  sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv";
-  buildDepends = [
-    nats semigroups terminfo text transformers wlPprintExtras
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/wl-pprint-terminfo/";
-    description = "A color pretty printer with terminfo support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
deleted file mode 100644
index 9ec7c2e1743e..000000000000
--- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "wl-pprint-text";
-  version = "1.1.0.3";
-  sha256 = "1ghrkqdfsdkn71mpipbxiaar2gd8mdyd3dxbsz68awwnlpapy4f3";
-  buildDepends = [ text ];
-  jailbreak = true;
-  meta = {
-    description = "A Wadler/Leijen Pretty Printer for Text values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wl-pprint/default.nix b/pkgs/development/libraries/haskell/wl-pprint/default.nix
deleted file mode 100644
index a0ee669395d2..000000000000
--- a/pkgs/development/libraries/haskell/wl-pprint/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "wl-pprint";
-  version = "1.1";
-  sha256 = "16kp3fkh0x9kgzk6fdqrm8m0v7b5cgbv0m3x63ybbp5vxbhand06";
-  meta = {
-    description = "The Wadler/Leijen Pretty Printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/word-trie/default.nix b/pkgs/development/libraries/haskell/word-trie/default.nix
deleted file mode 100644
index f817254aa629..000000000000
--- a/pkgs/development/libraries/haskell/word-trie/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, derive, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "word-trie";
-  version = "0.2.0.4";
-  sha256 = "0qgljhl2pj54mhsan9w6gchf3l94rs2c5bi9f93q1nz55va1027f";
-  buildDepends = [ binary derive ];
-  testDepends = [ binary derive hspec QuickCheck ];
-  meta = {
-    homepage = "https://github.com/yi-editor/word-trie";
-    description = "Implementation of a finite trie over words";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix
deleted file mode 100644
index ad6b59153834..000000000000
--- a/pkgs/development/libraries/haskell/word8/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec }:
-
-cabal.mkDerivation (self: {
-  pname = "word8";
-  version = "0.1.1";
-  sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r";
-  testDepends = [ hspec ];
-  meta = {
-    description = "Word8 library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wordexp/default.nix b/pkgs/development/libraries/haskell/wordexp/default.nix
deleted file mode 100644
index 7d03b1adea54..000000000000
--- a/pkgs/development/libraries/haskell/wordexp/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "wordexp";
-  version = "0.2.0.0";
-  sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki";
-  buildDepends = [ semigroups ];
-  buildTools = [ c2hs ];
-  meta = {
-    description = "wordexp(3) wrappers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
deleted file mode 100644
index 8b6e71512732..000000000000
--- a/pkgs/development/libraries/haskell/wreq/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, aesonQq, attoparsec, base16Bytestring
-, base64Bytestring, byteable, caseInsensitive, cryptohash, doctest
-, exceptions, filepath, hashable, httpClient, httpClientTls
-, httpTypes, HUnit, lens, lensAeson, mimeTypes, networkInfo
-, PSQueue, QuickCheck, snapCore, snapServer, temporary
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, time, transformers, unixCompat, unorderedContainers, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wreq";
-  version = "0.3.0.1";
-  sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec base16Bytestring byteable caseInsensitive
-    cryptohash exceptions hashable httpClient httpClientTls httpTypes
-    lens lensAeson mimeTypes PSQueue text time unorderedContainers
-  ];
-  testDepends = [
-    aeson aesonPretty aesonQq base64Bytestring caseInsensitive doctest
-    filepath hashable httpClient httpTypes HUnit lens lensAeson
-    networkInfo QuickCheck snapCore snapServer temporary testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text transformers
-    unixCompat uuid
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.serpentine.com/wreq";
-    description = "An easy-to-use HTTP client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch b/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch
deleted file mode 100644
index 72a8648cab67..000000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Only in wxc-0.91.0.0: dist
-diff -ubr wxc-0.91.0.0-orig/Setup.hs wxc-0.91.0.0/Setup.hs
---- wxc-0.91.0.0-orig/Setup.hs	2014-10-31 13:30:15.514809137 +0100
-+++ wxc-0.91.0.0/Setup.hs	2014-10-31 13:33:53.606372005 +0100
-@@ -507,5 +507,3 @@
-         inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest
- 
-     installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name)
--    ldconfig inst_lib_dir
--
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
deleted file mode 100644
index 4e8241240508..000000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, wxcore }:
-
-cabal.mkDerivation (self: {
-  pname = "wx";
-  version = "0.91.0.0";
-  sha256 = "133cjc3vfqxyw71a5x99flzg23qa2k28p2zajw6vp0z7qhv8kfjy";
-  buildDepends = [ stm wxcore ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/WxHaskell";
-    description = "wxHaskell";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
deleted file mode 100644
index 2a1840432515..000000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa, wxdirect, wxGTK }:
-
-cabal.mkDerivation (self: {
-  pname = "wxc";
-  version = "0.91.0.0";
-  sha256 = "0siab2h28dlyliznydxll22l9hdgwbmgddj01k1xw8hj4g7b53sa";
-  buildDepends = [ wxdirect ];
-  extraLibraries = [ libX11 mesa wxGTK ];
-  noHaddock = true;
-  patches = [ ./no-ldconfig.patch ];
-  postInstall = ''
-    cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
-  '';
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/WxHaskell";
-    description = "wxHaskell C++ wrapper";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
deleted file mode 100644
index 7d1bebe1d88a..000000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect
-, wxGTK
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wxcore";
-  version = "0.91.0.0";
-  sha256 = "01pvaysihyijklyw129vcafjqyh8bpafjzvscxvzll1g86qbqlkz";
-  buildDepends = [ filepath parsec stm time wxc wxdirect ];
-  extraLibraries = [ libX11 mesa wxGTK ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/WxHaskell";
-    description = "wxHaskell core";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
deleted file mode 100644
index c178207e6995..000000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, parsec, strict, time }:
-
-cabal.mkDerivation (self: {
-  pname = "wxdirect";
-  version = "0.91.0.0";
-  sha256 = "17xlviyyagcvmc7m1f4djnsw0wdakirarmv12j4fmwbnfnbryp27";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath parsec strict time ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/WxHaskell";
-    description = "helper tool for building wxHaskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix
deleted file mode 100644
index 36486dbf40e7..000000000000
--- a/pkgs/development/libraries/haskell/x509-store/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl
-, pem, x509
-}:
-
-cabal.mkDerivation (self: {
-  pname = "x509-store";
-  version = "1.5.0";
-  sha256 = "1w9sqb007s4avjzvrdwq13a4c528h7h2lg3m8cl31syrgznc9ny5";
-  buildDepends = [
-    asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem x509
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "X.509 collection accessing and storing methods";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix
deleted file mode 100644
index 87bb4ed1fecc..000000000000
--- a/pkgs/development/libraries/haskell/x509-system/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, pem, x509, x509Store }:
-
-cabal.mkDerivation (self: {
-  pname = "x509-system";
-  version = "1.5.0";
-  sha256 = "159zwg35nq42j1rl0p4x00hdf3iy48hd7kavz0rnpwd2p7ljamr3";
-  buildDepends = [ filepath mtl pem x509 x509Store ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "Handle per-operating-system X.509 accessors and storage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix
deleted file mode 100644
index 1caec0606bc6..000000000000
--- a/pkgs/development/libraries/haskell/x509-validation/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, byteable, cryptohash
-, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath
-, hourglass, mtl, network, pem, x509, x509Store
-}:
-
-cabal.mkDerivation (self: {
-  pname = "x509-validation";
-  version = "1.5.1";
-  sha256 = "19cp187id9hdlzkr7sbv2sdxqxnpjv0db09hwf3zdqqqxr30mn6x";
-  buildDepends = [
-    asn1Encoding asn1Types byteable cryptohash cryptoPubkey
-    cryptoPubkeyTypes dataDefaultClass filepath hourglass mtl network
-    pem x509 x509Store
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "X.509 Certificate and CRL validation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
deleted file mode 100644
index 201b727e2fc3..000000000000
--- a/pkgs/development/libraries/haskell/x509/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash
-, cryptoPubkeyTypes, filepath, hourglass, mtl, pem, tasty
-, tastyQuickcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "x509";
-  version = "1.5.0.1";
-  sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba";
-  buildDepends = [
-    asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
-    filepath hourglass mtl pem
-  ];
-  testDepends = [
-    asn1Types cryptoPubkeyTypes hourglass mtl tasty tastyQuickcheck
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "X509 reader and writer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix
deleted file mode 100644
index bc92d97b1ca5..000000000000
--- a/pkgs/development/libraries/haskell/xdg-basedir/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "xdg-basedir";
-  version = "0.2.2";
-  sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4";
-  buildDepends = [ filepath ];
-  meta = {
-    homepage = "http://github.com/willdonnelly/xdg-basedir";
-    description = "A basic implementation of the XDG Base Directory specification";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
deleted file mode 100644
index 1ced4424f533..000000000000
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, graphviz, gtk, mtl, polyparse, text }:
-
-cabal.mkDerivation (self: {
-  pname = "xdot";
-  version = "0.2.4.6";
-  sha256 = "123vygzkqlycc298zh3321y7w85xnynbavzqms6cb8zgzya42wrs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cairo graphviz gtk mtl polyparse text ];
-  jailbreak = true;
-  meta = {
-    description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix
deleted file mode 100644
index be1e32afbe35..000000000000
--- a/pkgs/development/libraries/haskell/xhtml/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "xhtml";
-  version = "3000.2.1";
-  sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik";
-  meta = {
-    homepage = "https://github.com/haskell/xhtml";
-    description = "An XHTML combinator library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xlsx/default.nix b/pkgs/development/libraries/haskell/xlsx/default.nix
deleted file mode 100644
index e2fdfa0d1a75..000000000000
--- a/pkgs/development/libraries/haskell/xlsx/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, dataDefault, digest, HUnit, lens, smallcheck
-, tasty, tastyHunit, tastySmallcheck, text, time, transformers
-, utf8String, xmlConduit, xmlTypes, zipArchive, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xlsx";
-  version = "0.1.0.3";
-  sha256 = "1i1dfb6gv4h3nc9ja7yxjzb8g207vzp58dnk4rgfcfglyvadn8kp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    conduit dataDefault digest lens text time transformers utf8String
-    xmlConduit xmlTypes zipArchive zlib
-  ];
-  testDepends = [
-    HUnit smallcheck tasty tastyHunit tastySmallcheck time
-  ];
-  meta = {
-    homepage = "https://github.com/qrilka/xlsx";
-    description = "Simple and incomplete Excel file parser/writer";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix b/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix
deleted file mode 100644
index fc0efcff226d..000000000000
--- a/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, mtl, text, xmlConduit, xmlTypes }:
-
-cabal.mkDerivation (self: {
-  pname = "xml-conduit-writer";
-  version = "0.1.1.1";
-  sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b";
-  buildDepends = [ dlist mtl text xmlConduit xmlTypes ];
-  testDepends = [ text ];
-  meta = {
-    homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer";
-    description = "Warm and fuzzy creation of XML documents";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
deleted file mode 100644
index 8a352a27ba3a..000000000000
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, conduit
-, conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl
-, resourcet, systemFilepath, text, transformers, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xml-conduit";
-  version = "1.2.3.1";
-  sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8";
-  buildDepends = [
-    attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra
-    dataDefault deepseq monadControl resourcet systemFilepath text
-    transformers xmlTypes
-  ];
-  testDepends = [
-    blazeMarkup conduit hspec HUnit resourcet text transformers
-    xmlTypes
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/xml";
-    description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
deleted file mode 100644
index e1c0c8620784..000000000000
--- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, parsec, shakespeare, text, xmlConduit }:
-
-cabal.mkDerivation (self: {
-  pname = "xml-hamlet";
-  version = "0.4.0.9";
-  sha256 = "0vm4jhvjf53a33sisnhghg0m9pcv2fx676rl90vbm2xcd9rqlj82";
-  buildDepends = [ parsec shakespeare text xmlConduit ];
-  testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Hamlet-style quasiquoter for XML content";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
deleted file mode 100644
index 405f165c6a79..000000000000
--- a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, hspec, hspecExpectationsLens, htmlConduit, lens
-, text, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xml-html-conduit-lens";
-  version = "0.3.2.1";
-  sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12";
-  buildDepends = [ htmlConduit lens text xmlConduit ];
-  testDepends = [
-    doctest hspec hspecExpectationsLens lens xmlConduit
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/supki/xml-html-conduit-lens#readme";
-    description = "Optics for xml-conduit and html-conduit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix
deleted file mode 100644
index 033afd9ee53d..000000000000
--- a/pkgs/development/libraries/haskell/xml-lens/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, text, xmlConduit }:
-
-cabal.mkDerivation (self: {
-  pname = "xml-lens";
-  version = "0.1.6.2";
-  sha256 = "14x3xz4rydl8x7ddznz90n3z5csy12c7l0r7bms8s7yqv4qzf6hz";
-  buildDepends = [ lens text xmlConduit ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/fumieval/xml-lens";
-    description = "Lenses, traversals, prisms for xml-conduit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix
deleted file mode 100644
index a673fa2eddd8..000000000000
--- a/pkgs/development/libraries/haskell/xml-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, text }:
-
-cabal.mkDerivation (self: {
-  pname = "xml-types";
-  version = "0.3.4";
-  sha256 = "1689ijr4xxh4shxxvd51wdkpc535kzv6liqg4m1prag96aq05r8y";
-  buildDepends = [ deepseq text ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-xml/";
-    description = "Basic types for representing XML";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
deleted file mode 100644
index 9066dc8b5534..000000000000
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "xml";
-  version = "1.3.13";
-  sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://code.galois.com";
-    description = "A simple XML library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xmlgen/default.nix b/pkgs/development/libraries/haskell/xmlgen/default.nix
deleted file mode 100644
index 9f4b08d5bbcf..000000000000
--- a/pkgs/development/libraries/haskell/xmlgen/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, filepath, HUnit, hxt, mtl, QuickCheck, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xmlgen";
-  version = "0.6.2.1";
-  sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
-  buildDepends = [ blazeBuilder mtl text ];
-  testDepends = [ filepath HUnit hxt QuickCheck text ];
-  doCheck = false;
-  meta = {
-    description = "Fast XML generation library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
deleted file mode 100644
index 1f4b2474d75c..000000000000
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xmlhtml";
-  version = "0.2.3.3";
-  sha256 = "0n95284z24ddgw7v8zjqzanyrshxydcxs4ivchpj88gh5r3ryv5j";
-  buildDepends = [
-    blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
-  ];
-  meta = {
-    description = "XML parser and renderer with HTML 5 quirks mode";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix b/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix
deleted file mode 100644
index 80a503704cb7..000000000000
--- a/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gtk, xmonad }:
-
-cabal.mkDerivation (self: {
-  pname = "xmonad-screenshot";
-  version = "0.1.1.0";
-  sha256 = "1iy6c8dis5jkgamkbbgxvbajz8f03bwhwdwk46l6wvlgmb072wl4";
-  buildDepends = [ gtk xmonad ];
-  meta = {
-    homepage = "http://github.com/supki/xmonad-screenshot";
-    description = "Workspaces screenshooting utility for XMonad";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xorshift/default.nix b/pkgs/development/libraries/haskell/xorshift/default.nix
deleted file mode 100644
index 7fe91aad0e70..000000000000
--- a/pkgs/development/libraries/haskell/xorshift/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, time }:
-
-cabal.mkDerivation (self: {
-  pname = "xorshift";
-  version = "2.0.1";
-  sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf";
-  buildDepends = [ random time ];
-  meta = {
-    description = "Haskell implementation of the xorshift random generator";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix
deleted file mode 100644
index 906db96ba5c2..000000000000
--- a/pkgs/development/libraries/haskell/xournal-parser/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, attoparsecConduit, conduit, conduitExtra
-, exceptions, lens, mtl, strict, text, transformers, xmlConduit
-, xmlTypes, xournalTypes, zlibConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xournal-parser";
-  version = "0.5.0.3";
-  sha256 = "1r99xv7w2gxms1ff5qpj36dcb3gb5lpccr1mjjdnkcij81i748ly";
-  buildDepends = [
-    attoparsec attoparsecConduit conduit conduitExtra exceptions lens
-    mtl strict text transformers xmlConduit xmlTypes xournalTypes
-    zlibConduit
-  ];
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "Xournal file parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix
deleted file mode 100644
index 9f0be91114ab..000000000000
--- a/pkgs/development/libraries/haskell/xournal-types/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, lens, strict, TypeCompose }:
-
-cabal.mkDerivation (self: {
-  pname = "xournal-types";
-  version = "0.5.0.2";
-  sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm";
-  buildDepends = [ cereal lens strict TypeCompose ];
-  jailbreak = true;
-  meta = {
-    description = "Data types for programs for xournal file format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
deleted file mode 100644
index 4b1edfb5e8bc..000000000000
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, cssText, hspec, HUnit, networkUri, tagsoup
-, text, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xss-sanitize";
-  version = "0.3.5.4";
-  sha256 = "1h9dj234sj216g676la0h73nwm0fw4snik31qi0s754vyy6bcygf";
-  buildDepends = [
-    attoparsec cssText networkUri tagsoup text utf8String
-  ];
-  testDepends = [
-    attoparsec cssText hspec HUnit networkUri tagsoup text utf8String
-  ];
-  meta = {
-    homepage = "http://github.com/yesodweb/haskell-xss-sanitize";
-    description = "sanitize untrusted HTML to prevent XSS attacks";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xtest/default.nix b/pkgs/development/libraries/haskell/xtest/default.nix
deleted file mode 100644
index dd381439d678..000000000000
--- a/pkgs/development/libraries/haskell/xtest/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libXtst, X11 }:
-
-cabal.mkDerivation (self: {
-  pname = "xtest";
-  version = "0.2";
-  sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7";
-  buildDepends = [ X11 ];
-  extraLibraries = [ libXtst ];
-  meta = {
-    description = "Thin FFI bindings to X11 XTest library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yaml-light/default.nix b/pkgs/development/libraries/haskell/yaml-light/default.nix
deleted file mode 100644
index 460e2833d992..000000000000
--- a/pkgs/development/libraries/haskell/yaml-light/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HsSyck }:
-
-cabal.mkDerivation (self: {
-  pname = "yaml-light";
-  version = "0.1.4";
-  sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk";
-  buildDepends = [ HsSyck ];
-  meta = {
-    description = "A light-weight wrapper with utility functions around HsSyck";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
deleted file mode 100644
index bf63586eed44..000000000000
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonQq, attoparsec, conduit, enclosedExceptions
-, filepath, hspec, hspecExpectations, HUnit, resourcet, scientific
-, text, transformers, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yaml";
-  version = "0.8.10.1";
-  sha256 = "1a8v8digg6mcc4gx4kgfg8wzgj18wdf40wv1b7n72dg1c8kr2xz9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec conduit enclosedExceptions filepath resourcet
-    scientific text transformers unorderedContainers vector
-  ];
-  testDepends = [
-    aeson aesonQq conduit hspec hspecExpectations HUnit resourcet text
-    transformers unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/yaml/";
-    description = "Support for parsing and rendering YAML documents";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
deleted file mode 100644
index a52a921ed649..000000000000
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "yap";
-  version = "0.2";
-  sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
-  jailbreak = true;
-  meta = {
-    description = "yet another prelude - a simplistic refactoring with algebraic classes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
deleted file mode 100644
index 2cb6609ab77a..000000000000
--- a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cryptohash, hspec, persistent, pwstoreFast, text
-, yesodAuth, yesodCore, yesodForm, yesodPersistent
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-auth-hashdb";
-  version = "1.4.1.1";
-  sha256 = "0bb37iawsdq3m5p1sjdnz954f3nfdmvvhm0hxap1z2hf9dk516ci";
-  buildDepends = [
-    cryptohash persistent pwstoreFast text yesodAuth yesodCore
-    yesodForm yesodPersistent
-  ];
-  testDepends = [ hspec text ];
-  meta = {
-    homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
-    description = "Authentication plugin for Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
deleted file mode 100644
index cf705ac8fc9e..000000000000
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, authenticate, base16Bytestring, base64Bytestring
-, binary, blazeBuilder, blazeHtml, blazeMarkup, byteable, conduit
-, conduitExtra, cryptohash, dataDefault, emailValidate, fileEmbed
-, httpClient, httpConduit, httpTypes, liftedBase, mimeMail
-, networkUri, persistent, persistentTemplate, random, resourcet
-, safe, shakespeare, text, time, transformers, unorderedContainers
-, wai, yesodCore, yesodForm, yesodPersistent
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-auth";
-  version = "1.4.1";
-  sha256 = "1nvc5ni4bwhb10ayr75s3z44ynv9kq3lp6kgd536xyagbi054gdp";
-  buildDepends = [
-    aeson authenticate base16Bytestring base64Bytestring binary
-    blazeBuilder blazeHtml blazeMarkup byteable conduit conduitExtra
-    cryptohash dataDefault emailValidate fileEmbed httpClient
-    httpConduit httpTypes liftedBase mimeMail networkUri persistent
-    persistentTemplate random resourcet safe shakespeare text time
-    transformers unorderedContainers wai yesodCore yesodForm
-    yesodPersistent
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Authentication for Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
deleted file mode 100644
index 7033bff4d158..000000000000
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
-, conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify
-, ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase
-, network, optparseApplicative, parsec, projectTemplate, resourcet
-, shakespeare, split, streamingCommons, systemFileio
-, systemFilepath, tar, text, time, transformers, transformersCompat
-, unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-bin";
-  version = "1.4.1";
-  sha256 = "0kzhnq0mv8s4qdkzqj05c7jdmp2xllv02kqgihwhyr2s4wvqmviw";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec base64Bytestring blazeBuilder Cabal conduit conduitExtra
-    dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
-    httpReverseProxy httpTypes liftedBase network optparseApplicative
-    parsec projectTemplate resourcet shakespeare split streamingCommons
-    systemFileio systemFilepath tar text time transformers
-    transformersCompat unixCompat unorderedContainers wai waiExtra warp
-    yaml zlib
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "The yesod helper executable";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
deleted file mode 100644
index 571778cfdc4e..000000000000
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml
-, blazeMarkup, caseInsensitive, cereal, clientsession, conduit
-, conduitExtra, cookie, dataDefault, deepseq, exceptions
-, fastLogger, hspec, hspecExpectations, httpTypes, HUnit
-, liftedBase, monadControl, monadLogger, mtl, mwcRandom, network
-, parsec, pathPieces, primitive, QuickCheck, random, resourcet
-, safe, shakespeare, streamingCommons, text, time, transformers
-, transformersBase, unixCompat, unorderedContainers, vector, wai
-, waiExtra, waiLogger, warp, word8
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-core";
-  version = "1.4.7.2";
-  sha256 = "0k6zsjds594zy0cvnryz071nis3zmv1sjiyn14cc80j0rvjll46y";
-  buildDepends = [
-    aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive
-    cereal clientsession conduit conduitExtra cookie dataDefault
-    deepseq exceptions fastLogger httpTypes liftedBase monadControl
-    monadLogger mtl mwcRandom parsec pathPieces primitive random
-    resourcet safe shakespeare text time transformers transformersBase
-    unixCompat unorderedContainers vector wai waiExtra waiLogger warp
-    word8
-  ];
-  testDepends = [
-    async blazeBuilder clientsession conduit conduitExtra cookie hspec
-    hspecExpectations httpTypes HUnit liftedBase mwcRandom network
-    pathPieces QuickCheck random resourcet shakespeare streamingCommons
-    text transformers wai waiExtra
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Creation of type-safe, RESTful web applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
deleted file mode 100644
index 6a65dfefe216..000000000000
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, yesodCore }:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-default";
-  version = "1.2.0";
-  sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
-  buildDepends = [ yesodCore ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Default config and main functions for your yesod application (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
deleted file mode 100644
index f052a38357d0..000000000000
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, dataDefault, emailValidate, hspec, networkUri
-, persistent, resourcet, shakespeare, text, time, transformers, wai
-, xssSanitize, yesodCore, yesodPersistent
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-form";
-  version = "1.4.3";
-  sha256 = "08ivcqq4glyyvjm60fsmd4linqr6kkh6wn4bbcpzinvpv6asr6mr";
-  buildDepends = [
-    aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
-    dataDefault emailValidate networkUri persistent resourcet
-    shakespeare text time transformers wai xssSanitize yesodCore
-    yesodPersistent
-  ];
-  testDepends = [ hspec text time ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Form handling support for Yesod Web Framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
deleted file mode 100644
index 1964abe7dc8c..000000000000
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, yesodCore }:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-json";
-  version = "1.2.0";
-  sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
-  buildDepends = [ yesodCore ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Generate content for Yesod using the aeson package. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-markdown/default.nix b/pkgs/development/libraries/haskell/yesod-markdown/default.nix
deleted file mode 100644
index bf77f9fea9d9..000000000000
--- a/pkgs/development/libraries/haskell/yesod-markdown/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, blazeMarkup, pandoc, persistent, shakespeare
-, texmath, text, xssSanitize, yesodCore, yesodForm
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-markdown";
-  version = "0.9.3.1";
-  sha256 = "1spbgcsq1lkywp19k7ksiy6rsh2n060mxzh33k0ngbxxg566n08i";
-  buildDepends = [
-    blazeHtml blazeMarkup pandoc persistent shakespeare texmath text
-    xssSanitize yesodCore yesodForm
-  ];
-  meta = {
-    homepage = "http://github.com/pbrisbin/yesod-markdown";
-    description = "Tools for using markdown in a yesod application";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix b/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix
deleted file mode 100644
index a6bf924c3c80..000000000000
--- a/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, blazeMarkup, shakespeare, text, time
-, xmlConduit, yesodCore
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-newsfeed";
-  version = "1.4.0.1";
-  sha256 = "02ydkri23vrm7mak2b1ybfhkdgc2dmv9vq3ki2d7sd005sp3zdly";
-  buildDepends = [
-    blazeHtml blazeMarkup shakespeare text time xmlConduit yesodCore
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Helper functions and data types for producing News feeds";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-pagination/default.nix b/pkgs/development/libraries/haskell/yesod-pagination/default.nix
deleted file mode 100644
index 38b89445cb71..000000000000
--- a/pkgs/development/libraries/haskell/yesod-pagination/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, esqueleto, hspec, monadLogger, persistent
-, persistentSqlite, resourcePool, resourcet, shakespeare
-, utf8String, waiTest, yesod, yesodTest
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-pagination";
-  version = "2.0.0";
-  sha256 = "0d42b8y7zpl624d7wa2caarni9g10hg14xsbamlkykki3bl197m1";
-  buildDepends = [ esqueleto yesod ];
-  testDepends = [
-    hspec monadLogger persistent persistentSqlite resourcePool
-    resourcet shakespeare utf8String waiTest yesod yesodTest
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/joelteon/yesod-pagination";
-    description = "Pagination in Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
deleted file mode 100644
index 845fc1c18ff0..000000000000
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite
-, persistentTemplate, resourcePool, resourcet, text, transformers
-, waiExtra, yesodCore
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-persistent";
-  version = "1.4.0.1";
-  sha256 = "08648n6b4xhsqbvqh8vpsf3481hvzhrkyqbzs303s6fz683mn0zw";
-  buildDepends = [
-    blazeBuilder conduit persistent persistentTemplate resourcePool
-    resourcet transformers yesodCore
-  ];
-  testDepends = [
-    blazeBuilder conduit hspec persistent persistentSqlite text
-    waiExtra yesodCore
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Some helpers for using Persistent from Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
deleted file mode 100644
index 668cbfda1eb5..000000000000
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, pathPieces, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-routes";
-  version = "1.2.0.7";
-  sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j";
-  buildDepends = [ pathPieces text vector ];
-  testDepends = [ hspec HUnit pathPieces text ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Efficient routing for Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
deleted file mode 100644
index 60a94cfb20d2..000000000000
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, attoparsec, base64Bytestring, blazeBuilder
-, byteable, conduit, conduitExtra, cryptohash, cryptohashConduit
-, cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin
-, hspec, httpTypes, HUnit, mimeTypes, resourcet, systemFileio
-, systemFilepath, text, transformers, unixCompat
-, unorderedContainers, wai, waiAppStatic, waiExtra, yesodCore
-, yesodTest
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-static";
-  version = "1.4.0.3";
-  sha256 = "15rwlw76rfh18l3ap73aqmwz4bafmxbr5pchyarll14ps0rjs74g";
-  buildDepends = [
-    async attoparsec base64Bytestring blazeBuilder byteable conduit
-    conduitExtra cryptohash cryptohashConduit cssText dataDefault
-    fileEmbed filepath hashable hjsmin httpTypes mimeTypes resourcet
-    systemFileio systemFilepath text transformers unixCompat
-    unorderedContainers wai waiAppStatic yesodCore
-  ];
-  testDepends = [
-    async base64Bytestring byteable conduit conduitExtra cryptohash
-    cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec
-    httpTypes HUnit mimeTypes resourcet systemFileio systemFilepath
-    text transformers unixCompat unorderedContainers wai waiAppStatic
-    waiExtra yesodCore yesodTest
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Static file serving subsite for Yesod Web Framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
deleted file mode 100644
index 50a6369f1868..000000000000
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
-, caseInsensitive, cookie, hspec, hspecCore, htmlConduit, httpTypes
-, HUnit, monadControl, network, persistent, text, time
-, transformers, wai, waiExtra, xmlConduit, xmlTypes, yesodCore
-, yesodForm
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-test";
-  version = "1.4.2";
-  sha256 = "09iia8vligw41ayhp1fp797n783avb0sf89z8midindrhb5plfbl";
-  buildDepends = [
-    attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
-    cookie hspecCore htmlConduit httpTypes HUnit monadControl network
-    persistent text time transformers wai waiExtra xmlConduit xmlTypes
-    yesodCore
-  ];
-  testDepends = [
-    hspec htmlConduit HUnit text wai xmlConduit yesodCore yesodForm
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com";
-    description = "integration testing for WAI/Yesod Applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
deleted file mode 100644
index 4b5679512a9f..000000000000
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault
-, fastLogger, monadControl, monadLogger, safe, semigroups
-, shakespeare, streamingCommons, text, transformers
-, unorderedContainers, wai, waiExtra, waiLogger, warp, yaml
-, yesodAuth, yesodCore, yesodForm, yesodPersistent
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod";
-  version = "1.4.1.4";
-  sha256 = "1av6s5nanq5y9fqlzq2yq95989gg1fyqlpzg6y5pl4dcc45srm1x";
-  buildDepends = [
-    aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger
-    monadControl monadLogger safe semigroups shakespeare
-    streamingCommons text transformers unorderedContainers wai waiExtra
-    waiLogger warp yaml yesodAuth yesodCore yesodForm yesodPersistent
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Creation of type-safe, RESTful web applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix b/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix
deleted file mode 100644
index 4685a08511ae..000000000000
--- a/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataDefault, filepath, mtl, text, transformersBase
-, vector, yi, yiLanguage, yiRope
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yi-fuzzy-open";
-  version = "0.1.0";
-  sha256 = "03y7ddas8w380asx4ldafp1r3h4nlyjky7n4n5sdyvwbi0rix1gc";
-  buildDepends = [
-    binary dataDefault filepath mtl text transformersBase vector yi
-    yiLanguage yiRope
-  ];
-  meta = {
-    homepage = "https://github.com/yi-editor/yi-fuzzy-open";
-    description = "Fuzzy open plugin for Yi";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-language/default.nix b/pkgs/development/libraries/haskell/yi-language/default.nix
deleted file mode 100644
index ec5070cac995..000000000000
--- a/pkgs/development/libraries/haskell/yi-language/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, binary, dataDefault, derive, filepath, hashable
-, hspec, lens, ooPrototypes, pointedlist, QuickCheck, regexBase
-, regexTdfa, transformersBase, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yi-language";
-  version = "0.1.1.0";
-  sha256 = "1gsh0njslncfh0r5wg1rq9w4f03ixkk5grd9zigkspsndhij7379";
-  buildDepends = [
-    binary dataDefault derive hashable lens ooPrototypes pointedlist
-    regexBase regexTdfa transformersBase unorderedContainers
-  ];
-  testDepends = [
-    binary dataDefault derive filepath hashable hspec lens pointedlist
-    QuickCheck regexBase regexTdfa transformersBase unorderedContainers
-  ];
-  buildTools = [ alex ];
-  meta = {
-    homepage = "https://github.com/yi-editor/yi-language";
-    description = "Collection of language-related Yi libraries";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-monokai/default.nix b/pkgs/development/libraries/haskell/yi-monokai/default.nix
deleted file mode 100644
index ddae06b7f22b..000000000000
--- a/pkgs/development/libraries/haskell/yi-monokai/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, yi }:
-
-cabal.mkDerivation (self: {
-  pname = "yi-monokai";
-  version = "0.1.1.2";
-  sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
-  buildDepends = [ yi ];
-  meta = {
-    homepage = "https://github.com/Fuuzetsu/yi-monokai";
-    description = "Monokai colour theme for the Yi text editor";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-rope/default.nix b/pkgs/development/libraries/haskell/yi-rope/default.nix
deleted file mode 100644
index a92f086f3a6e..000000000000
--- a/pkgs/development/libraries/haskell/yi-rope/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, charsetdetectAe, dataDefault, deepseq, fingertree
-, hspec, QuickCheck, quickcheckInstances, text, textIcu
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yi-rope";
-  version = "0.7.0.0";
-  sha256 = "123p0m31h8qa53jl2sd646s1hrs5qnb7y82y7bzgg2zny4qqw9a2";
-  buildDepends = [
-    binary charsetdetectAe dataDefault deepseq fingertree text textIcu
-  ];
-  testDepends = [ hspec QuickCheck quickcheckInstances text ];
-  meta = {
-    description = "A rope data structure used by Yi";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-snippet/default.nix b/pkgs/development/libraries/haskell/yi-snippet/default.nix
deleted file mode 100644
index b1cb7041ff02..000000000000
--- a/pkgs/development/libraries/haskell/yi-snippet/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, yi, yiRope }:
-
-cabal.mkDerivation (self: {
-  pname = "yi-snippet";
-  version = "0.1.0.0";
-  sha256 = "0qbn5x7lbvb9h6gdqgvldzyy7z5y5aa9a02ss48zkccss5p6939d";
-  buildDepends = [ yi yiRope ];
-  meta = {
-    homepage = "https://github.com/yi-editor/yi-snippet";
-    description = "Snippet support for Yi";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
deleted file mode 100644
index ea3991eebe9d..000000000000
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, csv, filepath, HDBC, HDBCSqlite3, HStringTemplate
-, pandoc, parsec, scientific, split, text, time
-, unorderedContainers, xhtml, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yst";
-  version = "0.4.1.1";
-  sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson csv filepath HDBC HDBCSqlite3 HStringTemplate pandoc parsec
-    scientific split text time unorderedContainers xhtml yaml
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jgm/yst";
-    description = "Builds a static website from templates and data in YAML or CSV files";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
deleted file mode 100644
index 37528689a387..000000000000
--- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2
-, zeromq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "zeromq-haskell";
-  version = "0.8.4";
-  sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3";
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  extraLibraries = [ zeromq ];
-  meta = {
-    homepage = "http://github.com/twittner/zeromq-haskell/";
-    description = "Bindings to ZeroMQ 2.1.x";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
deleted file mode 100644
index f4449cdc8563..000000000000
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, async, checkers, MonadCatchIOTransformers
-, QuickCheck, semigroups, transformers, zeromq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "zeromq3-haskell";
-  version = "0.5.2";
-  sha256 = "1ky92qwyk27qsxnvaj0mc9yyhk7g19ry2nq55666ayahc899z213";
-  buildDepends = [
-    async MonadCatchIOTransformers semigroups transformers
-  ];
-  testDepends = [
-    ansiTerminal async checkers MonadCatchIOTransformers QuickCheck
-    transformers
-  ];
-  pkgconfigDepends = [ zeromq ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/twittner/zeromq-haskell/";
-    description = "Bindings to ZeroMQ 3.x";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
deleted file mode 100644
index 4b7c333c07cc..000000000000
--- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, exceptions, QuickCheck, semigroups, tasty
-, tastyHunit, tastyQuickcheck, transformers, zeromq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "zeromq4-haskell";
-  version = "0.6.2";
-  sha256 = "07dbsapzc4hqq9sg63v4wyjad13sqh9zsx3ckwc5hg5z6vknpafb";
-  buildDepends = [ async exceptions semigroups transformers ];
-  testDepends = [
-    async QuickCheck tasty tastyHunit tastyQuickcheck
-  ];
-  pkgconfigDepends = [ zeromq ];
-  meta = {
-    homepage = "http://github.com/twittner/zeromq-haskell/";
-    description = "Bindings to ZeroMQ 4.x";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix
deleted file mode 100644
index 67f2c2453b66..000000000000
--- a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zip-archive";
-  version = "0.2.2.1";
-  sha256 = "0w9l3kdlwkc3yvyxb152s9qwzmc0kjp6d1cbk7yfkpw3081qgckn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary digest filepath mtl text time zlib ];
-  testDepends = [ HUnit time ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/jgm/zip-archive";
-    description = "Library for creating and modifying zip archives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix
deleted file mode 100644
index 8369b2a3eb50..000000000000
--- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zip-archive";
-  version = "0.2.3.5";
-  sha256 = "0qa3qvaj0xkh4qw7s96rkbdmkyhnql6g92yplm7m6n7z7nxrcs18";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary digest filepath mtl text time zlib ];
-  testDepends = [ HUnit time ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/jgm/zip-archive";
-    description = "Library for creating and modifying zip archives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix
deleted file mode 100644
index f2db123aa179..000000000000
--- a/pkgs/development/libraries/haskell/zipper/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, multirec }:
-
-cabal.mkDerivation (self: {
-  pname = "zipper";
-  version = "0.4.2";
-  sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44";
-  buildDepends = [ multirec ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
-    description = "Generic zipper for families of recursive datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zippers/default.nix b/pkgs/development/libraries/haskell/zippers/default.nix
deleted file mode 100644
index 939de519fb10..000000000000
--- a/pkgs/development/libraries/haskell/zippers/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, lens, profunctors, semigroupoids }:
-
-cabal.mkDerivation (self: {
-  pname = "zippers";
-  version = "0.2";
-  sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls";
-  buildDepends = [ lens profunctors semigroupoids ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/zippers/";
-    description = "Traversal based zippers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
deleted file mode 100644
index a14d685e9681..000000000000
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, QuickCheck, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib-bindings";
-  version = "0.1.1.5";
-  sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
-  buildDepends = [ zlib ];
-  testDepends = [ hspec QuickCheck zlib ];
-  meta = {
-    homepage = "http://github.com/snoyberg/zlib-bindings";
-    description = "Low-level bindings to the zlib package. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
deleted file mode 100644
index 3d91442022da..000000000000
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib-conduit";
-  version = "1.1.0";
-  sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a";
-  buildDepends = [ conduit ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Streaming compression/decompression via conduits. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
deleted file mode 100644
index 4b133b4c0557..000000000000
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enumerator, transformers, zlibBindings }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib-enum";
-  version = "0.2.3.1";
-  sha256 = "1nfczminxafzk69ry1sqkj1ha0jlv3l9ak10yk205snfhpmcjgg4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ enumerator transformers zlibBindings ];
-  meta = {
-    homepage = "http://github.com/maltem/zlib-enum";
-    description = "Enumerator interface for zlib compression";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib/default.nix b/pkgs/development/libraries/haskell/zlib/default.nix
deleted file mode 100644
index dad288c8fd02..000000000000
--- a/pkgs/development/libraries/haskell/zlib/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib";
-  version = "0.5.4.2";
-  sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm";
-  extraLibraries = [ zlib ];
-  meta = {
-    description = "Compression and decompression in the gzip and zlib formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})

From 11bf7502ccbc0fc1943f5f87594a2ec697548b2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 19 Apr 2015 18:54:50 +0200
Subject: [PATCH 0370/1143] Remove obsolete entries from
 pkgs/development/tools/haskell.

---
 .../tools/haskell/BNFC/default.nix            | 25 ------------
 .../tools/haskell/DrIFT/default.nix           | 18 ---------
 .../tools/haskell/PastePipe/default.nix       | 19 ---------
 .../tools/haskell/SourceGraph/default.nix     | 23 -----------
 .../tools/haskell/c2hs/default.nix            | 24 -----------
 .../tools/haskell/c2hsc/default.nix           | 22 ----------
 .../tools/haskell/cabal-bounds/default.nix    | 27 -------------
 .../tools/haskell/cabal-db/default.nix        | 22 ----------
 .../tools/haskell/cabal-delete/default.nix    | 36 -----------------
 .../tools/haskell/cabal-ghci/default.nix      | 18 ---------
 .../tools/haskell/cabal-meta/default.nix      | 20 ----------
 .../tools/haskell/cabal2ghci/default.nix      | 23 -----------
 .../tools/haskell/cake3/default.nix           | 25 ------------
 .../tools/haskell/codex/default.nix           | 26 ------------
 .../haskell/ghc-events-analyze/default.nix    | 24 -----------
 .../tools/haskell/ghc-gc-tune/default.nix     | 18 ---------
 .../tools/haskell/ghcid/default.nix           | 24 -----------
 .../tools/haskell/graphmod/default.nix        | 18 ---------
 .../tools/haskell/happy-meta/default.nix      | 16 --------
 .../tools/haskell/haskdogs/default.nix        | 18 ---------
 .../tools/haskell/haskell-docs/default.nix    | 26 ------------
 .../tools/haskell/hasktags/default.nix        | 19 ---------
 .../tools/haskell/hdevtools/default.nix       | 17 --------
 .../tools/haskell/hlint/default.nix           | 23 -----------
 .../tools/haskell/hobbes/default.nix          | 18 ---------
 .../tools/haskell/hp2any-manager/default.nix  | 24 -----------
 .../tools/haskell/hsb2hs/default.nix          | 17 --------
 .../tools/haskell/hscolour/default.nix        | 17 --------
 .../tools/haskell/hscope/default.nix          | 23 -----------
 .../tools/haskell/hslogger/default.nix        | 18 ---------
 .../tools/haskell/ihaskell/default.nix        | 40 -------------------
 .../tools/haskell/jailbreak-cabal/default.nix | 18 ---------
 .../tools/haskell/keter/default.nix           | 33 ---------------
 .../tools/haskell/liquid-fixpoint/default.nix | 26 ------------
 .../tools/haskell/liquidhaskell/default.nix   | 32 ---------------
 .../tools/haskell/packdeps/default.nix        | 19 ---------
 .../tools/haskell/packunused/default.nix      | 23 -----------
 .../tools/haskell/pointfree/default.nix       | 19 ---------
 .../tools/haskell/pointful/default.nix        | 18 ---------
 .../tools/haskell/profiteur/default.nix       | 24 -----------
 .../tools/haskell/rehoo/default.nix           | 21 ----------
 .../tools/haskell/splot/default.nix           | 22 ----------
 .../tools/haskell/threadscope/default.nix     | 24 -----------
 .../tools/haskell/timeplot/default.nix        | 24 -----------
 .../development/tools/haskell/una/default.nix | 18 ---------
 .../tools/haskell/uuagc/bootstrap.nix         | 18 ---------
 .../development/tools/haskell/uuagc/cabal.nix | 16 --------
 .../tools/haskell/uuagc/default.nix           | 18 ---------
 48 files changed, 1061 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/BNFC/default.nix
 delete mode 100644 pkgs/development/tools/haskell/DrIFT/default.nix
 delete mode 100644 pkgs/development/tools/haskell/PastePipe/default.nix
 delete mode 100644 pkgs/development/tools/haskell/SourceGraph/default.nix
 delete mode 100644 pkgs/development/tools/haskell/c2hs/default.nix
 delete mode 100644 pkgs/development/tools/haskell/c2hsc/default.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal-bounds/default.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal-db/default.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal-delete/default.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal-ghci/default.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal-meta/default.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal2ghci/default.nix
 delete mode 100644 pkgs/development/tools/haskell/cake3/default.nix
 delete mode 100644 pkgs/development/tools/haskell/codex/default.nix
 delete mode 100644 pkgs/development/tools/haskell/ghc-events-analyze/default.nix
 delete mode 100644 pkgs/development/tools/haskell/ghc-gc-tune/default.nix
 delete mode 100644 pkgs/development/tools/haskell/ghcid/default.nix
 delete mode 100644 pkgs/development/tools/haskell/graphmod/default.nix
 delete mode 100644 pkgs/development/tools/haskell/happy-meta/default.nix
 delete mode 100644 pkgs/development/tools/haskell/haskdogs/default.nix
 delete mode 100644 pkgs/development/tools/haskell/haskell-docs/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hasktags/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hdevtools/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hlint/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hobbes/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hp2any-manager/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hsb2hs/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hscolour/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hscope/default.nix
 delete mode 100644 pkgs/development/tools/haskell/hslogger/default.nix
 delete mode 100644 pkgs/development/tools/haskell/ihaskell/default.nix
 delete mode 100644 pkgs/development/tools/haskell/jailbreak-cabal/default.nix
 delete mode 100644 pkgs/development/tools/haskell/keter/default.nix
 delete mode 100644 pkgs/development/tools/haskell/liquid-fixpoint/default.nix
 delete mode 100644 pkgs/development/tools/haskell/liquidhaskell/default.nix
 delete mode 100644 pkgs/development/tools/haskell/packdeps/default.nix
 delete mode 100644 pkgs/development/tools/haskell/packunused/default.nix
 delete mode 100644 pkgs/development/tools/haskell/pointfree/default.nix
 delete mode 100644 pkgs/development/tools/haskell/pointful/default.nix
 delete mode 100644 pkgs/development/tools/haskell/profiteur/default.nix
 delete mode 100644 pkgs/development/tools/haskell/rehoo/default.nix
 delete mode 100644 pkgs/development/tools/haskell/splot/default.nix
 delete mode 100644 pkgs/development/tools/haskell/threadscope/default.nix
 delete mode 100644 pkgs/development/tools/haskell/timeplot/default.nix
 delete mode 100644 pkgs/development/tools/haskell/una/default.nix
 delete mode 100644 pkgs/development/tools/haskell/uuagc/bootstrap.nix
 delete mode 100644 pkgs/development/tools/haskell/uuagc/cabal.nix
 delete mode 100644 pkgs/development/tools/haskell/uuagc/default.nix

diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix
deleted file mode 100644
index 4a2ed055cf8f..000000000000
--- a/pkgs/development/tools/haskell/BNFC/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, deepseq, doctest, filepath, happy, hspec, HUnit, mtl
-, QuickCheck, temporary
-}:
-
-cabal.mkDerivation (self: {
-  pname = "BNFC";
-  version = "2.7.1";
-  sha256 = "1n9l64wzga3i7ifh2k5rwhxp60gb0av5fszygw5mvr31r64cf4fp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ deepseq filepath mtl ];
-  testDepends = [
-    deepseq doctest filepath hspec HUnit mtl QuickCheck temporary
-  ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://bnfc.digitalgrammars.com/";
-    description = "A compiler front-end generator";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres simons ];
-  };
-})
diff --git a/pkgs/development/tools/haskell/DrIFT/default.nix b/pkgs/development/tools/haskell/DrIFT/default.nix
deleted file mode 100644
index 6f0f8fb0c600..000000000000
--- a/pkgs/development/tools/haskell/DrIFT/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, random }:
-
-cabal.mkDerivation (self: {
-  pname = "DrIFT";
-  version = "2.4.2";
-  sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath random ];
-  meta = {
-    homepage = "http://repetae.net/computer/haskell/DrIFT/";
-    description = "Program to derive type class instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/PastePipe/default.nix b/pkgs/development/tools/haskell/PastePipe/default.nix
deleted file mode 100644
index 9d967c30f1cf..000000000000
--- a/pkgs/development/tools/haskell/PastePipe/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, HTTP, network, networkUri }:
-
-cabal.mkDerivation (self: {
-  pname = "PastePipe";
-  version = "1.7";
-  sha256 = "0had11n44y7zjhhymdbvahwmxcxxrbxy7c9jxijhw3n7xqhdmva0";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cmdargs HTTP network networkUri ];
-  meta = {
-    homepage = "http://github.com/Fuuzetsu/pastepipe";
-    description = "CLI for pasting to lpaste.net";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
deleted file mode 100644
index 0ce5872d26a2..000000000000
--- a/pkgs/development/tools/haskell/SourceGraph/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, fgl, filepath, Graphalyze, graphviz, haskellSrcExts
-, mtl, multiset, random
-}:
-
-cabal.mkDerivation (self: {
-  pname = "SourceGraph";
-  version = "0.7.0.6";
-  sha256 = "03psglm6xyqvcgnbimidafy51kwpipk5q6s8ip5vhjm2d5makkhm";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal fgl filepath Graphalyze graphviz haskellSrcExts mtl multiset
-    random
-  ];
-  meta = {
-    description = "Static code analysis using graph-theoretic techniques";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/tools/haskell/c2hs/default.nix b/pkgs/development/tools/haskell/c2hs/default.nix
deleted file mode 100644
index 830283d6420a..000000000000
--- a/pkgs/development/tools/haskell/c2hs/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, filepath, HUnit, languageC, shelly, testFramework
-, testFrameworkHunit, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "c2hs";
-  version = "0.20.1";
-  sha256 = "1w2w9zxirzjd5lniwqakq59glgsh4mw3565x2l9qrin0bfjxkn3h";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ dlist filepath languageC ];
-  testDepends = [
-    filepath HUnit shelly testFramework testFrameworkHunit text
-    transformers
-  ];
-  meta = {
-    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/tools/haskell/c2hsc/default.nix b/pkgs/development/tools/haskell/c2hsc/default.nix
deleted file mode 100644
index cf56c0bf545f..000000000000
--- a/pkgs/development/tools/haskell/c2hsc/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, filepath, HStringTemplate, languageC, mtl, split
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "c2hsc";
-  version = "0.6.5";
-  sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs filepath HStringTemplate languageC mtl split transformers
-  ];
-  meta = {
-    homepage = "https://github.com/jwiegley/c2hsc";
-    description = "Convert C API header files to .hsc and .hsc.helper.c files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
deleted file mode 100644
index 0f10b13c5d11..000000000000
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, cabalInstall, cabalLenses, cmdargs, either
-, filepath, Glob, lens, strict, tasty, tastyGolden, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-bounds";
-  version = "0.8.9";
-  sha256 = "1vprf6nsw3qnppqxcm5jwvwxyalkaq364xcmig54ma47rsk23nzk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal cabalLenses cmdargs either lens strict transformers
-    unorderedContainers
-  ];
-  testDepends = [ filepath Glob tasty tastyGolden ];
-  buildTools = [ cabalInstall ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/cabal-db/default.nix b/pkgs/development/tools/haskell/cabal-db/default.nix
deleted file mode 100644
index 61e3cbdd04c9..000000000000
--- a/pkgs/development/tools/haskell/cabal-db/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiWlPprint, Cabal, filepath, mtl, optparseApplicative
-, tar, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-db";
-  version = "0.1.11";
-  sha256 = "0kxj7xf0r1waxxi25g46a2wj43dcd3b1lkdn20l4r7m3r44y1nd7";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    ansiWlPprint Cabal filepath mtl optparseApplicative tar utf8String
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/cabal-db";
-    description = "query tools for the local cabal database";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/cabal-delete/default.nix b/pkgs/development/tools/haskell/cabal-delete/default.nix
deleted file mode 100644
index 7de6c0e6f1c2..000000000000
--- a/pkgs/development/tools/haskell/cabal-delete/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ cabal, fetchgit, bytestring ? null, containers ? null, directory ? null,
-  filepath, process ? null, attoparsec, ghcPaths, transformers }:
-
-let
-  tag = "0.5.2.0";
-in
-
-cabal.mkDerivation (self: {
-  pname = "cabal-delete";
-  version = "${tag}";
-  src = fetchgit {
-    url = git://github.com/iquiw/cabal-delete.git;
-    rev = "refs/tags/v${tag}";
-    sha256 = "1ap319isjg8bafm4jz2krfwvvg11hj5yk0g99a3l1a3a36hpdgzw";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-      bytestring
-      containers
-      directory
-      filepath
-      process
-      attoparsec
-      ghcPaths
-      transformers
-  ];
-  meta = {
-    homepage = "https://github.com/iquiw/cabal-delete";
-    description = "Uninstall packages installed by cabal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix
deleted file mode 100644
index 389318978dac..000000000000
--- a/pkgs/development/tools/haskell/cabal-ghci/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-ghci";
-  version = "0.3";
-  sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ Cabal filepath ];
-  meta = {
-    homepage = "http://github.com/atnnn/cabal-ghci";
-    description = "Set up ghci with options taken from a .cabal file";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/cabal-meta/default.nix b/pkgs/development/tools/haskell/cabal-meta/default.nix
deleted file mode 100644
index 9dc0a4fb9af5..000000000000
--- a/pkgs/development/tools/haskell/cabal-meta/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, shelly, systemFileio, systemFilepath, text }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-meta";
-  version = "0.4.1.2";
-  sha256 = "17ln9j0n9rb0kbnp37fi9yaf932dacrdmf3jrp301r886kh2a7kk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ shelly systemFileio systemFilepath text ];
-  testDepends = [ hspec shelly systemFilepath text ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "build multiple packages at once";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix
deleted file mode 100644
index deb9e8d18d98..000000000000
--- a/pkgs/development/tools/haskell/cabal2ghci/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, cmdargs, stylishHaskell, systemFileio
-, systemFilepath, text, unorderedContainers, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal2ghci";
-  version = "0.0.1.1";
-  sha256 = "1fg3pr25f78a6b8nqxvxki4z3fvgx4i6zkmpl992a0iarycqdrsg";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal cmdargs stylishHaskell systemFileio systemFilepath text
-    unorderedContainers yaml
-  ];
-  jailbreak = true;
-  meta = {
-    description = "A tool to generate .ghci file from .cabal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/cake3/default.nix b/pkgs/development/tools/haskell/cake3/default.nix
deleted file mode 100644
index fba7d2e4d2a6..000000000000
--- a/pkgs/development/tools/haskell/cake3/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, deepseq, filepath, haskellSrcMeta
-, languageJavascript, mimeTypes, monadloc, mtl, optparseApplicative
-, parsec, syb, systemFilepath, text, textFormat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cake3";
-  version = "0.5.2.0";
-  sha256 = "0wr797r7sg8f48r2pjl2nw70vcdkiamqghz2zpfr6awy9018fhgw";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec deepseq filepath haskellSrcMeta languageJavascript
-    mimeTypes monadloc mtl optparseApplicative parsec syb
-    systemFilepath text textFormat
-  ];
-  meta = {
-    homepage = "https://github.com/grwlf/cake3";
-    description = "Third cake the Makefile EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix
deleted file mode 100644
index 902faca957f5..000000000000
--- a/pkgs/development/tools/haskell/codex/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, machines
-, machinesDirectory, MissingH, monadLoops, monoTraversable, tar
-, text, transformers, yaml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "codex";
-  version = "0.2.0.2";
-  sha256 = "0an043cmsxc296i90pv19d8xdl7fg2fvf026lx4rly7bwskzn99x";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal downloadCurl either filepath hackageDb machines
-    machinesDirectory MissingH monadLoops monoTraversable tar text
-    transformers yaml zlib
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/aloiscochard/codex";
-    description = "A ctags file generator for cabal project dependencies";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix
deleted file mode 100644
index cbf871820ff8..000000000000
--- a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, diagramsLib, diagramsSvg, filepath, ghcEvents, lens, mtl
-, optparseApplicative, parsec, SVGFonts, thLift, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-events-analyze";
-  version = "0.2.1";
-  sha256 = "0lf063p2wj2d1hxb5hx4bcid3a3ni3g9x8sglm5q5kfbmdk7awj4";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    diagramsLib diagramsSvg filepath ghcEvents lens mtl
-    optparseApplicative parsec SVGFonts thLift transformers
-  ];
-  meta = {
-    description = "Analyze and visualize event logs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/tools/haskell/ghc-gc-tune/default.nix b/pkgs/development/tools/haskell/ghc-gc-tune/default.nix
deleted file mode 100644
index e5517854c34d..000000000000
--- a/pkgs/development/tools/haskell/ghc-gc-tune/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-gc-tune";
-  version = "0.3";
-  sha256 = "0ghp3f86m91zi6kl8zq157717s2p73nwdgln4aiclq830m72ys9w";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/ghc-gc-tune";
-    description = "Graph performance of Haskell programs with different GC flags";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/ghcid/default.nix b/pkgs/development/tools/haskell/ghcid/default.nix
deleted file mode 100644
index 2ce069f53c37..000000000000
--- a/pkgs/development/tools/haskell/ghcid/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, extra, filepath, tasty, tastyHunit, terminalSize
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghcid";
-  version = "0.3.2";
-  sha256 = "1kx20la4snldhd709y69za8bs57v90nblghfrxrvmzhrmpvh4bn3";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cmdargs extra filepath terminalSize time ];
-  testDepends = [
-    cmdargs extra filepath tasty tastyHunit terminalSize time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/ndmitchell/ghcid#readme";
-    description = "GHCi based bare bones IDE";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/graphmod/default.nix b/pkgs/development/tools/haskell/graphmod/default.nix
deleted file mode 100644
index 496e854fb864..000000000000
--- a/pkgs/development/tools/haskell/graphmod/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dotgen, filepath, haskellLexer }:
-
-cabal.mkDerivation (self: {
-  pname = "graphmod";
-  version = "1.2.6";
-  sha256 = "02p1x44ywv2mb4l2dsz9z3ybnvv4nns3882lqm3nc8sw2hkib8z3";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ dotgen filepath haskellLexer ];
-  meta = {
-    homepage = "http://github.com/yav/graphmod/wiki";
-    description = "Present the module dependencies of a program as a \"dot\" graph";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
deleted file mode 100644
index 8241bf121033..000000000000
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy, haskellSrcMeta, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "happy-meta";
-  version = "0.2.0.7";
-  sha256 = "12599233lh0ffmvlim0gs5jzg8lly1g11i1cg44lb37bz3l7psh9";
-  buildDepends = [ haskellSrcMeta mtl ];
-  buildTools = [ happy ];
-  meta = {
-    description = "Quasi-quoter for Happy parsers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix
deleted file mode 100644
index 27e4876ea093..000000000000
--- a/pkgs/development/tools/haskell/haskdogs/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HSH }:
-
-cabal.mkDerivation (self: {
-  pname = "haskdogs";
-  version = "0.3.2";
-  sha256 = "0vl3c66ki9j9ncs2rapdn80kbfk0l3y97qwfraqlnjycdl10sm6r";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Cabal filepath HSH ];
-  meta = {
-    homepage = "http://github.com/ierton/haskdogs";
-    description = "Generate ctags file for haskell project directory and it's deps";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/haskell-docs/default.nix b/pkgs/development/tools/haskell/haskell-docs/default.nix
deleted file mode 100644
index 9cc92aafc219..000000000000
--- a/pkgs/development/tools/haskell/haskell-docs/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, Cabal, filepath, ghcPaths, haddock, monadLoops
-, text, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-docs";
-  version = "4.2.2";
-  sha256 = "0w52kzwjzd5jl8v55rjy5550cy2fcyj9j5b7b33vbwjyh06gfrk1";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson Cabal filepath ghcPaths haddock monadLoops text
-    unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/chrisdone/haskell-docs";
-    description = "A program to find and display the docs and type of a name";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix
deleted file mode 100644
index 03dfaee87861..000000000000
--- a/pkgs/development/tools/haskell/hasktags/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, json, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "hasktags";
-  version = "0.69.0";
-  sha256 = "1bba6w5h5a5frc899cdlxcyshiqdni6lcqby618akr1917ih1qh8";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath json utf8String ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/MarcWeber/hasktags";
-    description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix
deleted file mode 100644
index 8f1397775b7e..000000000000
--- a/pkgs/development/tools/haskell/hdevtools/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, cmdargs, ghcPaths, network, syb, time, fetchurl }:
-
-cabal.mkDerivation (self: {
-  pname = "hdevtools";
-  version = "0.1.0.6-pre-github-schell-9e34f7dd";
-  sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7";
-  isLibrary = false;
-  isExecutable = true;
-  patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; sha256 = "104vdw6qxl71fdg43ppv0hrg6k17zaijq73vap794178d3gb35al"; }) ];
-  buildDepends = [ cmdargs ghcPaths network syb time ];
-  meta = {
-    homepage = "https://github.com/bitc/hdevtools/";
-    description = "Persistent GHC powered background server for FAST haskell development tools";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
deleted file mode 100644
index 17813ac1a33a..000000000000
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, cmdargs, cpphs, extra, filepath
-, haskellSrcExts, hscolour, transformers, uniplate
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hlint";
-  version = "1.9.13";
-  sha256 = "1cj487l3jvrp43acwk3ihc5mzyqwxxa0nqahad27sd3bbmx86p4a";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal cmdargs cpphs extra filepath haskellSrcExts hscolour
-    transformers uniplate
-  ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/hlint/";
-    description = "Source code suggestions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hobbes/default.nix b/pkgs/development/tools/haskell/hobbes/default.nix
deleted file mode 100644
index a9b48f922c86..000000000000
--- a/pkgs/development/tools/haskell/hobbes/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filemanip, filepath, fsnotify, systemFilepath, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hobbes";
-  version = "0.2.2";
-  sha256 = "1pri63d59q918jv1hdp2ib06m6lzw9a2b6bjyn86b2qrrx2512xd";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filemanip filepath fsnotify systemFilepath text ];
-  meta = {
-    homepage = "http://github.com/jhickner/hobbes";
-    description = "A small file watcher for OSX";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hp2any-manager/default.nix b/pkgs/development/tools/haskell/hp2any-manager/default.nix
deleted file mode 100644
index 537550e989fb..000000000000
--- a/pkgs/development/tools/haskell/hp2any-manager/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, filepath, glade, glib, gtk, gtkglext, hp2anyCore
-, hp2anyGraph, OpenGL, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hp2any-manager";
-  version = "0.4.6";
-  sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cairo filepath glade glib gtk gtkglext hp2anyCore hp2anyGraph
-    OpenGL time
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Hp2any";
-    description = "A utility to visualise and compare heap profiles";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hsb2hs/default.nix b/pkgs/development/tools/haskell/hsb2hs/default.nix
deleted file mode 100644
index 9efebdf1db76..000000000000
--- a/pkgs/development/tools/haskell/hsb2hs/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, preprocessorTools }:
-
-cabal.mkDerivation (self: {
-  pname = "hsb2hs";
-  version = "0.2";
-  sha256 = "013n3l80449wxmbfmcidg8mdjk4nkxv7s3jcbfy5g4jps6gsg1fx";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath preprocessorTools ];
-  meta = {
-    description = "Preprocesses a file, adding blobs from files as string literals";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hscolour/default.nix b/pkgs/development/tools/haskell/hscolour/default.nix
deleted file mode 100644
index bb00ade3d4c2..000000000000
--- a/pkgs/development/tools/haskell/hscolour/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hscolour";
-  version = "1.20.3";
-  sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://code.haskell.org/~malcolm/hscolour/";
-    description = "Colourise Haskell code";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hscope/default.nix b/pkgs/development/tools/haskell/hscope/default.nix
deleted file mode 100644
index a295cc4896ca..000000000000
--- a/pkgs/development/tools/haskell/hscope/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cpphs, deepseq, haskellSrcExts, mtl, pureCdb
-, testSimple, uniplate, Unixutils, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hscope";
-  version = "0.4.1";
-  sha256 = "1m5mp45pvf64pnpc3lsig382177vfc232bbm9g3a8q58jrwridy7";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cereal cpphs deepseq haskellSrcExts mtl pureCdb uniplate vector
-  ];
-  testDepends = [ mtl testSimple Unixutils ];
-  meta = {
-    homepage = "https://github.com/bosu/hscope";
-    description = "cscope like browser for Haskell code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
deleted file mode 100644
index 40ce0f342331..000000000000
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, time }:
-
-cabal.mkDerivation (self: {
-  pname = "hslogger";
-  version = "1.2.6";
-  sha256 = "0yqw7824bn8vb9iynx8lkgswxd0nz484k4bvcwd02wvakbbfawkk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl network time ];
-  meta = {
-    homepage = "http://software.complete.org/hslogger";
-    description = "Versatile logging framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/ihaskell/default.nix b/pkgs/development/tools/haskell/ihaskell/default.nix
deleted file mode 100644
index 53956a3e098a..000000000000
--- a/pkgs/development/tools/haskell/ihaskell/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, cereal, classyPrelude, cmdargs
-, filepath, ghcParser, ghcPaths, haskeline, haskellSrcExts, here
-, hlint, hspec, HTTP, HUnit, MissingH, monoTraversable, mtl, parsec
-, random, setenv, shelly, split, stm, strict, systemArgv0
-, systemFilepath, tar, text, transformers, unorderedContainers
-, utf8String, uuid, vector, zeromq4Haskell
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ihaskell";
-  version = "0.4.3.0";
-  sha256 = "1k6i56cdzv5ikci20brq7qj07nqdpzkfj7xr69lh1gvx7xb24ida";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson base64Bytestring cereal classyPrelude cmdargs filepath
-    ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP
-    HUnit MissingH monoTraversable mtl parsec random shelly split stm
-    strict systemArgv0 systemFilepath tar text transformers
-    unorderedContainers utf8String uuid vector zeromq4Haskell
-  ];
-  testDepends = [
-    aeson base64Bytestring cereal classyPrelude cmdargs filepath
-    ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP
-    HUnit MissingH monoTraversable mtl parsec random setenv shelly
-    split stm strict systemArgv0 systemFilepath tar text transformers
-    unorderedContainers utf8String uuid vector zeromq4Haskell
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://gibiansky.github.io/IHaskell/";
-    description = "A Haskell backend kernel for the IPython project";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ edwtjo ];
-  };
-})
diff --git a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix
deleted file mode 100644
index a6986c1cdc54..000000000000
--- a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "jailbreak-cabal";
-  version = "1.1";
-  sha256 = "0x0dkzfjsgqpjmldgami46ki9k7pgy7ll4slms0kdc89qryzp7dg";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Cabal ];
-  meta = {
-    homepage = "http://github.com/peti/jailbreak-cabal";
-    description = "Strip version restrictions from build dependencies in Cabal files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
deleted file mode 100644
index 9aa35ea940ff..000000000000
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
-, conduit, conduitExtra, dataDefault, filepath, fsnotify, hspec
-, httpClient, httpConduit, httpReverseProxy, httpTypes, liftedBase
-, mtl, network, networkConduitTls, random, regexTdfa, stm
-, systemFileio, systemFilepath, tar, text, time, transformers
-, unixCompat, unorderedContainers, vector, wai, waiAppStatic
-, waiExtra, warp, warpTls, yaml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "keter";
-  version = "1.3.6";
-  sha256 = "00g34gazj3kk39nk34vzw88dy04rr3swb0hcl6k6gafwqrpv3i79";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson async attoparsec blazeBuilder caseInsensitive conduit
-    conduitExtra dataDefault filepath fsnotify httpClient httpConduit
-    httpReverseProxy httpTypes liftedBase mtl network networkConduitTls
-    random regexTdfa stm systemFileio systemFilepath tar text time
-    transformers unixCompat unorderedContainers vector wai waiAppStatic
-    waiExtra warp warpTls yaml zlib
-  ];
-  testDepends = [ conduit hspec transformers ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Web application deployment manager, focusing on Haskell web frameworks";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/liquid-fixpoint/default.nix b/pkgs/development/tools/haskell/liquid-fixpoint/default.nix
deleted file mode 100644
index 60a653ef36b5..000000000000
--- a/pkgs/development/tools/haskell/liquid-fixpoint/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, attoparsec, bifunctors, cmdargs, deepseq
-, filemanip, filepath, hashable, intern, mtl, ocaml, parsec, syb
-, text, textFormat, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "liquid-fixpoint";
-  version = "0.2.1.0";
-  sha256 = "11l9750ldxcb5jq34dl0iggpi9dh1zwjnlzgmwg4qvsgcq8cakdf";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal attoparsec bifunctors cmdargs deepseq filemanip
-    filepath hashable intern mtl parsec syb text textFormat
-    transformers unorderedContainers
-  ];
-  buildTools = [ ocaml ];
-  meta = {
-    homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
-    description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/liquidhaskell/default.nix b/pkgs/development/tools/haskell/liquidhaskell/default.nix
deleted file mode 100644
index 0fd9408324c0..000000000000
--- a/pkgs/development/tools/haskell/liquidhaskell/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ansiTerminal, bifunctors, cmdargs, cpphs
-, dataDefault, deepseq, Diff, filemanip, filepath, fingertree
-, ghcPaths, hashable, hscolour, intern, liquidFixpoint, mtl
-, optparseApplicative, parsec, syb, tagged, tasty, tastyHunit
-, tastyRerun, text, time, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "liquidhaskell";
-  version = "0.2.1.0";
-  sha256 = "172ki1pr096jc1azs6hq1p6czjr2gxb0zafmlg9bicn4nwp2h7vy";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson ansiTerminal bifunctors cmdargs cpphs dataDefault deepseq
-    Diff filemanip filepath fingertree ghcPaths hashable hscolour
-    intern liquidFixpoint mtl parsec syb text time unorderedContainers
-    vector
-  ];
-  testDepends = [
-    filepath optparseApplicative tagged tasty tastyHunit tastyRerun
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://goto.ucsd.edu/liquidhaskell";
-    description = "Liquid Types for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/packdeps/default.nix b/pkgs/development/tools/haskell/packdeps/default.nix
deleted file mode 100644
index 292f6af944fc..000000000000
--- a/pkgs/development/tools/haskell/packdeps/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, split, tar, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "packdeps";
-  version = "0.4.0.3";
-  sha256 = "08an9nwg448d3w4yds67l02mgikmjmn52pvva3i386fv4hfkabhp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ Cabal filepath split tar text time ];
-  meta = {
-    homepage = "http://packdeps.haskellers.com/";
-    description = "Check your cabal packages for lagging dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix
deleted file mode 100644
index 9df5b2472bf8..000000000000
--- a/pkgs/development/tools/haskell/packunused/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, haskellSrcExts, optparseApplicative
-, split
-}:
-
-cabal.mkDerivation (self: {
-  pname = "packunused";
-  version = "0.1.1.3";
-  sha256 = "1f8lc9lzqwyzdz1j8czdan04d4bj393xk1rxfhr39j4a56qskp1c";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath haskellSrcExts optparseApplicative split
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/hvr/packunused";
-    description = "Tool for detecting redundant Cabal package dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/pointfree/default.nix b/pkgs/development/tools/haskell/pointfree/default.nix
deleted file mode 100644
index 4eb911ebd621..000000000000
--- a/pkgs/development/tools/haskell/pointfree/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, HUnit, QuickCheck, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pointfree";
-  version = "1.0.4.8";
-  sha256 = "0nb3mqp6zwnnq6fs27xhcqv4w8h6sr5k01hldkqnkgwz0yyy7ljy";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ haskellSrcExts transformers ];
-  testDepends = [ haskellSrcExts HUnit QuickCheck transformers ];
-  jailbreak = true;
-  meta = {
-    description = "Tool for refactoring expressions into pointfree form";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/pointful/default.nix b/pkgs/development/tools/haskell/pointful/default.nix
deleted file mode 100644
index 7f077d160a3c..000000000000
--- a/pkgs/development/tools/haskell/pointful/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrc, mtl, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "pointful";
-  version = "1.0.2";
-  sha256 = "00xlxgdajkbi5d6gv88wdpwm16xdryshszz5qklryi0p65mmp99p";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ haskellSrc mtl syb ];
-  meta = {
-    homepage = "http://github.com/23Skidoo/pointful";
-    description = "Pointful refactoring tool";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/profiteur/default.nix b/pkgs/development/tools/haskell/profiteur/default.nix
deleted file mode 100644
index b637e563ffb2..000000000000
--- a/pkgs/development/tools/haskell/profiteur/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, filepath, text, unorderedContainers
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "profiteur";
-  version = "0.1.2.1";
-  sha256 = "1108hhh2ivhs85jkga4wps2yscgjnp211sw5w45j4wp9dgpz2hak";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec filepath text unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/jaspervdj/profiteur";
-    description = "Treemap visualiser for GHC prof files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/tools/haskell/rehoo/default.nix b/pkgs/development/tools/haskell/rehoo/default.nix
deleted file mode 100644
index f7993feddf88..000000000000
--- a/pkgs/development/tools/haskell/rehoo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, parallelIo, shelly, split, systemFilepath, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rehoo";
-  version = "0.3.1";
-  sha256 = "0pwmz1q2866yj8hxbvha4v1smhppkd3jsrrhbhmbxw137l54ijgf";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs parallelIo shelly split systemFilepath text
-  ];
-  meta = {
-    homepage = "https://github.com/jwiegley/rehoo";
-    description = "Rebuild default.hoo from many .hoo files in the current directory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
deleted file mode 100644
index 0e984778579d..000000000000
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bytestringLexing, cairo, colour, HUnit, mtl, strptime
-, time, vcsRevision
-}:
-
-cabal.mkDerivation (self: {
-  pname = "splot";
-  version = "0.3.12";
-  sha256 = "0xk5p2ikrzrmhvl69cl36sskcqgfnhxbbdlyp7bzl5pny0l0h9in";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    bytestringLexing cairo colour HUnit mtl strptime time vcsRevision
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Splot";
-    description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
deleted file mode 100644
index f31ef0d52fa8..000000000000
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk
-, mtl, pango, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "threadscope";
-  version = "0.2.6";
-  sha256 = "0pycxvf3gjx86yp948anczxidhi6ra95szkqyvvlfpriay7klfya";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    binary cairo deepseq filepath ghcEvents glib gtk mtl pango text
-    time
-  ];
-  configureFlags = "--ghc-options=-rtsopts";
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
-    description = "A graphical tool for profiling parallel Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
deleted file mode 100644
index bcc7b7c35d69..000000000000
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bytestringLexing, cairo, Chart, ChartCairo, colour
-, dataDefault, lens, regexTdfa, strptime, time, transformers
-, vcsRevision
-}:
-
-cabal.mkDerivation (self: {
-  pname = "timeplot";
-  version = "1.0.27";
-  sha256 = "072bxa0pfxyia4xvj0w0h8v3yfk05bbq5j905sj6jf9apjr9h558";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    bytestringLexing cairo Chart ChartCairo colour dataDefault lens
-    regexTdfa strptime time transformers vcsRevision
-  ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Timeplot";
-    description = "A tool for visualizing time series from log files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/una/default.nix b/pkgs/development/tools/haskell/una/default.nix
deleted file mode 100644
index 9b80f6d478a2..000000000000
--- a/pkgs/development/tools/haskell/una/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, filepath, ioStorage }:
-
-cabal.mkDerivation (self: {
-  pname = "una";
-  version = "2.1.0";
-  sha256 = "0gpycwd0dgnw7cdicpn19wv1xb4jq3j9dfzry2ilv85h02zkwfvh";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ cmdargs filepath ioStorage ];
-  meta = {
-    homepage = "https://github.com/jwiegley/una";
-    description = "Universal un-archiver utility";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix
deleted file mode 100644
index 5e954c526c41..000000000000
--- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, haskellSrcExts, mtl, uulib }:
-
-cabal.mkDerivation (self: {
-  pname = "uuagc-bootstrap";
-  version = "0.9.40.2";
-  sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath haskellSrcExts mtl uulib ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
-    description = "Attribute Grammar System of Universiteit Utrecht";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
deleted file mode 100644
index ab85b50688b4..000000000000
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, mtl, uulib }:
-
-cabal.mkDerivation (self: {
-  pname = "uuagc-cabal";
-  version = "1.0.6.0";
-  sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w";
-  buildDepends = [ Cabal filepath mtl uulib ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
-    description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
deleted file mode 100644
index 230174dccbc6..000000000000
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, haskellSrcExts, mtl, uuagcCabal, uulib }:
-
-cabal.mkDerivation (self: {
-  pname = "uuagc";
-  version = "0.9.51";
-  sha256 = "07nymg525x41y8pl94d0n990h1yz5km8v0fasiggqv94sd04j22w";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
-    description = "Attribute Grammar System of Universiteit Utrecht";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})

From c0f0a209619a65d1c9e3848336fa201f65329c1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 19 Apr 2015 18:57:11 +0200
Subject: [PATCH 0371/1143] pkgs/top-level/release.nix: haskell-ng --> haskell

---
 pkgs/top-level/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 361b9ab6cc32..b2f1fb152624 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -213,7 +213,7 @@ let
         gnome_vfs = linux;
       };
 
-      haskell-ng.compiler = packagePlatforms pkgs.haskell-ng.compiler;
+      haskell.compiler = packagePlatforms pkgs.haskell-ng.compiler;
 
       strategoPackages = {
         sdf = linux;

From acb628a07fd0a048353bbec71dbdacd880e7f8a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 19 Apr 2015 19:24:12 +0200
Subject: [PATCH 0372/1143] Drop obsolete
 pkgs/development/compilers/ghc/wrapper.nix.

Resolves https://github.com/NixOS/nixpkgs/issues/6575.
---
 pkgs/development/compilers/ghc/wrapper.nix | 86 ----------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/wrapper.nix

diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
deleted file mode 100644
index bcfbd49b98a0..000000000000
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ stdenv, ghc, makeWrapper, coreutils, writeScript }:
-
-let
-  ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1";
-  packageDBFlag = if ghc761OrLater then "-package-db" else "-package-conf";
-
-  GHCGetPackages = writeScript "ghc-get-packages.sh" ''
-    #! ${stdenv.shell}
-    # Usage:
-    #  $1: version of GHC
-    #  $2: invocation path of GHC
-    #  $3: prefix
-    version="$1"
-    if test -z "$3"; then
-      prefix="${packageDBFlag} "
-    else
-      prefix="$3"
-    fi
-    PATH="$2:$PATH"
-    IFS=":"
-    for p in $PATH; do
-      PkgDir="$p/../lib/ghc-$version/package.conf.d"
-      for i in "$PkgDir/"*.installedconf; do
-        # output takes place here
-        test -f $i && echo -n " $prefix$i"
-      done
-    done
-    test -f "$2/../lib/ghc-$version/package.conf" && echo -n " $prefix$2/../lib/ghc-$version/package.conf"
-  '';
-
-  GHCPackages = writeScript "ghc-packages.sh" ''
-    #! ${stdenv.shell} -e
-    declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths
-
-    for arg in $(${GHCGetPackages} ${ghc.version} "$(dirname $0)"); do
-      case "$arg" in
-        ${packageDBFlag}) ;;
-        *)
-          CANONICALIZED="$(${coreutils}/bin/readlink -f -- "$arg")"
-          GHC_PACKAGES_HASH["$CANONICALIZED"]= ;;
-      esac
-    done
-
-    for path in ''${!GHC_PACKAGES_HASH[@]}; do
-      echo -n "$path:"
-    done
-  '';
-
-in
-stdenv.mkDerivation {
-  name = "ghc-${ghc.version}-wrapper";
-
-  buildInputs = [makeWrapper];
-  propagatedBuildInputs = [ghc];
-
-  unpackPhase = "true";
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\")"
-    done
-    for prg in runghc runhaskell; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\" \" ${packageDBFlag} --ghc-arg=\")"
-    done
-    for prg in ghc-pkg ghc-pkg-${ghc.version}; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\" -${packageDBFlag}=)"
-    done
-    for prg in hp2ps hpc hasktags hsc2hs; do
-      test -x $ghc/bin/$prg && ln -s $ghc/bin/$prg $out/bin/$prg
-    done
-
-    mkdir -p $out/nix-support
-    ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
-
-    mkdir -p $out/share/doc
-    ln -s $ghc/lib $out/lib
-    ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghc.version}
-
-    runHook postInstall
-  '';
-
-  inherit ghc GHCGetPackages GHCPackages;
-  inherit (ghc) meta version;
-}

From 72991187248ed0db5bc59e0e2ded143646ce8cd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 19 Apr 2015 19:39:05 +0200
Subject: [PATCH 0373/1143] Remove obsolete Haskell attribute name
 compatibility layer.

---
 .../haskell-modules/compat-layer.nix          | 3846 -----------------
 pkgs/development/haskell-modules/default.nix  |    4 +-
 pkgs/top-level/all-packages.nix               |    1 -
 3 files changed, 1 insertion(+), 3850 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/compat-layer.nix

diff --git a/pkgs/development/haskell-modules/compat-layer.nix b/pkgs/development/haskell-modules/compat-layer.nix
deleted file mode 100644
index badbb354655a..000000000000
--- a/pkgs/development/haskell-modules/compat-layer.nix
+++ /dev/null
@@ -1,3846 +0,0 @@
-/* compat-layer.nix maps new Haskell attribute names to the camel-case
-   versions we used to have before. */
-
-self: super: {
-
-  "3dGraphicsExamples" = self."3d-graphics-examples";
-  "abcPuzzle" = self."abc-puzzle";
-  "AbortTMonadstf" = self."AbortT-monadstf";
-  "AbortTMtl" = self."AbortT-mtl";
-  "AbortTTransformers" = self."AbortT-transformers";
-  "abstractDeque" = self."abstract-deque";
-  "abstractDequeTests" = self."abstract-deque-tests";
-  "abstractParAccelerate" = self."abstract-par-accelerate";
-  "abstractPar" = self."abstract-par";
-  "ACAngle" = self."AC-Angle";
-  "ACBoolean" = self."AC-Boolean";
-  "ACBuildPlatform" = self."AC-BuildPlatform";
-  "accelerateArithmetic" = self."accelerate-arithmetic";
-  "accelerateCublas" = self."accelerate-cublas";
-  "accelerateCuda" = self."accelerate-cuda";
-  "accelerateCufft" = self."accelerate-cufft";
-  "accelerateExamples" = self."accelerate-examples";
-  "accelerateFft" = self."accelerate-fft";
-  "accelerateFftw" = self."accelerate-fftw";
-  "accelerateFourierBenchmark" = self."accelerate-fourier-benchmark";
-  "accelerateFourier" = self."accelerate-fourier";
-  "accelerateIo" = self."accelerate-io";
-  "accelerateUtility" = self."accelerate-utility";
-  "accessTime" = self."access-time";
-  "ACColour" = self."AC-Colour";
-  "ACEasyRasterGTK" = self."AC-EasyRaster-GTK";
-  "ACHalfInteger" = self."AC-HalfInteger";
-  "acidState" = self."acid-state";
-  "acidStateTls" = self."acid-state-tls";
-  "acMachineConduit" = self."ac-machine-conduit";
-  "acMachine" = self."ac-machine";
-  "acmeCadre" = self."acme-cadre";
-  "acmeCofunctor" = self."acme-cofunctor";
-  "acmeColosson" = self."acme-colosson";
-  "acmeComonad" = self."acme-comonad";
-  "acmeCutegirl" = self."acme-cutegirl";
-  "acmeDont" = self."acme-dont";
-  "acmeHq9plus" = self."acme-hq9plus";
-  "acmeHttp" = self."acme-http";
-  "acmeInator" = self."acme-inator";
-  "acmeIo" = self."acme-io";
-  "acmeLolcat" = self."acme-lolcat";
-  "acmeLookofdisapproval" = self."acme-lookofdisapproval";
-  "acmeMicrowave" = self."acme-microwave";
-  "acmeMissiles" = self."acme-missiles";
-  "acmeNow" = self."acme-now";
-  "acmeNumbersystem" = self."acme-numbersystem";
-  "acmeOmitted" = self."acme-omitted";
-  "acmePhp" = self."acme-php";
-  "acmePointfulNumbers" = self."acme-pointful-numbers";
-  "acmeRealworld" = self."acme-realworld";
-  "acmeSchoenfinkel" = self."acme-schoenfinkel";
-  "acmeStrfry" = self."acme-strfry";
-  "acmeStringlyTyped" = self."acme-stringly-typed";
-  "acmeStrtok" = self."acme-strtok";
-  "acmeYear" = self."acme-year";
-  "ACMiniTest" = self."AC-MiniTest";
-  "ACPPM" = self."AC-PPM";
-  "ACRandom" = self."AC-Random";
-  "ACTerminal" = self."AC-Terminal";
-  "actionPermutations" = self."action-permutations";
-  "activehsBase" = self."activehs-base";
-  "activitystreamsAeson" = self."activitystreams-aeson";
-  "ACVanillaArray" = self."AC-VanillaArray";
-  "ACVectorFancy" = self."AC-Vector-Fancy";
-  "ACVector" = self."AC-Vector";
-  "AdaptiveBlaisorblade" = self."Adaptive-Blaisorblade";
-  "adaptiveContainers" = self."adaptive-containers";
-  "adaptiveTuple" = self."adaptive-tuple";
-  "adhocNetwork" = self."adhoc-network";
-  "adobeSwatchExchange" = self."adobe-swatch-exchange";
-  "adpMultiMonadiccp" = self."adp-multi-monadiccp";
-  "adpMulti" = self."adp-multi";
-  "AERNBasics" = self."AERN-Basics";
-  "AERNNet" = self."AERN-Net";
-  "AERNRealDouble" = self."AERN-Real-Double";
-  "AERNRealInterval" = self."AERN-Real-Interval";
-  "AERNReal" = self."AERN-Real";
-  "AERNRnToRmPlot" = self."AERN-RnToRm-Plot";
-  "AERNRnToRm" = self."AERN-RnToRm";
-  "aesonBson" = self."aeson-bson";
-  "aesonLens" = self."aeson-lens";
-  "aesonNative" = self."aeson-native";
-  "aesonPretty" = self."aeson-pretty";
-  "aesonQq" = self."aeson-qq";
-  "aesonSchema" = self."aeson-schema";
-  "aesonSerialize" = self."aeson-serialize";
-  "aesonSmart" = self."aeson-smart";
-  "aesonStreams" = self."aeson-streams";
-  "aesonToolkit" = self."aeson-toolkit";
-  "aesonT" = self."aeson-t";
-  "aesonUtils" = self."aeson-utils";
-  "affineInvariantEnsembleMcmc" = self."affine-invariant-ensemble-mcmc";
-  "AgdaExecutable" = self."Agda-executable";
-  "agdaServer" = self."agda-server";
-  "airExtra" = self."air-extra";
-  "airSpec" = self."air-spec";
-  "airTh" = self."air-th";
-  "aivikaExperimentCairo" = self."aivika-experiment-cairo";
-  "aivikaExperimentChart" = self."aivika-experiment-chart";
-  "aivikaExperimentDiagrams" = self."aivika-experiment-diagrams";
-  "aivikaExperiment" = self."aivika-experiment";
-  "aivikaTransformers" = self."aivika-transformers";
-  "alexMeta" = self."alex-meta";
-  "algebraicClasses" = self."algebraic-classes";
-  "alignedForeignptr" = self."aligned-foreignptr";
-  "allocatedProcessor" = self."allocated-processor";
-  "alloyProxyFd" = self."alloy-proxy-fd";
-  "alpinoTools" = self."alpino-tools";
-  "alsaCore" = self."alsa-core";
-  "alsaGui" = self."alsa-gui";
-  "alsaMidi" = self."alsa-midi";
-  "alsaMixer" = self."alsa-mixer";
-  "alsaPcm" = self."alsa-pcm";
-  "alsaPcmTests" = self."alsa-pcm-tests";
-  "alsaSeq" = self."alsa-seq";
-  "alsaSeqTests" = self."alsa-seq-tests";
-  "alternativeIo" = self."alternative-io";
-  "amazonEmailerClientSnap" = self."amazon-emailer-client-snap";
-  "amazonEmailer" = self."amazon-emailer";
-  "amazonkaAutoscaling" = self."amazonka-autoscaling";
-  "amazonkaCloudformation" = self."amazonka-cloudformation";
-  "amazonkaCloudfront" = self."amazonka-cloudfront";
-  "amazonkaCloudsearchDomains" = self."amazonka-cloudsearch-domains";
-  "amazonkaCloudsearch" = self."amazonka-cloudsearch";
-  "amazonkaCloudtrail" = self."amazonka-cloudtrail";
-  "amazonkaCloudwatchLogs" = self."amazonka-cloudwatch-logs";
-  "amazonkaCloudwatch" = self."amazonka-cloudwatch";
-  "amazonkaCodedeploy" = self."amazonka-codedeploy";
-  "amazonkaCognitoIdentity" = self."amazonka-cognito-identity";
-  "amazonkaCognitoSync" = self."amazonka-cognito-sync";
-  "amazonkaConfig" = self."amazonka-config";
-  "amazonkaCore" = self."amazonka-core";
-  "amazonkaDatapipeline" = self."amazonka-datapipeline";
-  "amazonkaDirectconnect" = self."amazonka-directconnect";
-  "amazonkaDynamodb" = self."amazonka-dynamodb";
-  "amazonkaEc2" = self."amazonka-ec2";
-  "amazonkaElasticache" = self."amazonka-elasticache";
-  "amazonkaElasticbeanstalk" = self."amazonka-elasticbeanstalk";
-  "amazonkaElastictranscoder" = self."amazonka-elastictranscoder";
-  "amazonkaElb" = self."amazonka-elb";
-  "amazonkaEmr" = self."amazonka-emr";
-  "amazonkaIam" = self."amazonka-iam";
-  "amazonkaImportexport" = self."amazonka-importexport";
-  "amazonkaKinesis" = self."amazonka-kinesis";
-  "amazonkaKms" = self."amazonka-kms";
-  "amazonkaLambda" = self."amazonka-lambda";
-  "amazonkaOpsworks" = self."amazonka-opsworks";
-  "amazonkaRds" = self."amazonka-rds";
-  "amazonkaRedshift" = self."amazonka-redshift";
-  "amazonkaRoute53Domains" = self."amazonka-route53-domains";
-  "amazonkaRoute53" = self."amazonka-route53";
-  "amazonkaS3" = self."amazonka-s3";
-  "amazonkaSdb" = self."amazonka-sdb";
-  "amazonkaSes" = self."amazonka-ses";
-  "amazonkaSns" = self."amazonka-sns";
-  "amazonkaSqs" = self."amazonka-sqs";
-  "amazonkaStoragegateway" = self."amazonka-storagegateway";
-  "amazonkaSts" = self."amazonka-sts";
-  "amazonkaSupport" = self."amazonka-support";
-  "amazonkaSwf" = self."amazonka-swf";
-  "amazonProducts" = self."amazon-products";
-  "analyzeClient" = self."analyze-client";
-  "anansiHscolour" = self."anansi-hscolour";
-  "anansiPandoc" = self."anansi-pandoc";
-  "annotatedWlPprint" = self."annotated-wl-pprint";
-  "anonymousSums" = self."anonymous-sums";
-  "anonymousSumsTests" = self."anonymous-sums-tests";
-  "ansiTerminal" = self."ansi-terminal";
-  "ansiWlPprint" = self."ansi-wl-pprint";
-  "apacheMd5" = self."apache-md5";
-  "apiaryAuthenticate" = self."apiary-authenticate";
-  "apiaryClientsession" = self."apiary-clientsession";
-  "apiaryCookie" = self."apiary-cookie";
-  "apiaryEventsource" = self."apiary-eventsource";
-  "apiaryHelics" = self."apiary-helics";
-  "apiaryLogger" = self."apiary-logger";
-  "apiaryMemcached" = self."apiary-memcached";
-  "apiaryMongoDB" = self."apiary-mongoDB";
-  "apiaryPersistent" = self."apiary-persistent";
-  "apiaryPurescript" = self."apiary-purescript";
-  "apiarySession" = self."apiary-session";
-  "apiaryWebsockets" = self."apiary-websockets";
-  "apiBuilder" = self."api-builder";
-  "apiTools" = self."api-tools";
-  "applicativeExtras" = self."applicative-extras";
-  "applicativeNumbers" = self."applicative-numbers";
-  "applicativeQuoters" = self."applicative-quoters";
-  "approximateEquality" = self."approximate-equality";
-  "approxRandTest" = self."approx-rand-test";
-  "appSettings" = self."app-settings";
-  "apReflect" = self."ap-reflect";
-  "arbbVm" = self."arbb-vm";
-  "arbFft" = self."arb-fft";
-  "archlinuxWeb" = self."archlinux-web";
-  "arithEncode" = self."arith-encode";
-  "arrayForth" = self."array-forth";
-  "arrayMemoize" = self."array-memoize";
-  "arrayUtils" = self."array-utils";
-  "arrowapplyUtils" = self."arrowapply-utils";
-  "arrowImprove" = self."arrow-improve";
-  "arrowList" = self."arrow-list";
-  "arTimestampWiper" = self."ar-timestamp-wiper";
-  "ascii85Conduit" = self."ascii85-conduit";
-  "asciiVectorAvc" = self."ascii-vector-avc";
-  "asn1Data" = self."asn1-data";
-  "asn1Encoding" = self."asn1-encoding";
-  "asn1Parse" = self."asn1-parse";
-  "asn1Types" = self."asn1-types";
-  "assertFailure" = self."assert-failure";
-  "astviewUtils" = self."astview-utils";
-  "asyncExtras" = self."async-extras";
-  "asynchronousExceptions" = self."asynchronous-exceptions";
-  "asyncManager" = self."async-manager";
-  "asyncPool" = self."async-pool";
-  "atermUtils" = self."aterm-utils";
-  "atlassianConnectCore" = self."atlassian-connect-core";
-  "atlassianConnectDescriptor" = self."atlassian-connect-descriptor";
-  "atmosDimensional" = self."atmos-dimensional";
-  "atmosDimensionalTf" = self."atmos-dimensional-tf";
-  "atomicPrimopsForeign" = self."atomic-primops-foreign";
-  "atomicPrimops" = self."atomic-primops";
-  "atomMsp430" = self."atom-msp430";
-  "attoLisp" = self."atto-lisp";
-  "attoparsecArff" = self."attoparsec-arff";
-  "attoparsecBinary" = self."attoparsec-binary";
-  "attoparsecConduit" = self."attoparsec-conduit";
-  "attoparsecCsv" = self."attoparsec-csv";
-  "attoparsecEnumerator" = self."attoparsec-enumerator";
-  "attoparsecExpr" = self."attoparsec-expr";
-  "attoparsecIteratee" = self."attoparsec-iteratee";
-  "attoparsecParsec" = self."attoparsec-parsec";
-  "attoparsecTextEnumerator" = self."attoparsec-text-enumerator";
-  "attoparsecText" = self."attoparsec-text";
-  "authenticateKerberos" = self."authenticate-kerberos";
-  "authenticateLdap" = self."authenticate-ldap";
-  "authenticateOauth" = self."authenticate-oauth";
-  "authinfoHs" = self."authinfo-hs";
-  "autonixDepsKf5" = self."autonix-deps-kf5";
-  "autonixDeps" = self."autonix-deps";
-  "autoUpdate" = self."auto-update";
-  "avlStatic" = self."avl-static";
-  "avrShake" = self."avr-shake";
-  "awesomiumGlut" = self."awesomium-glut";
-  "awesomiumRaw" = self."awesomium-raw";
-  "awsCloudfrontSigner" = self."aws-cloudfront-signer";
-  "awsDynamodbStreams" = self."aws-dynamodb-streams";
-  "awsEc2" = self."aws-ec2";
-  "awsElasticTranscoder" = self."aws-elastic-transcoder";
-  "awsGeneral" = self."aws-general";
-  "awsKinesisReshard" = self."aws-kinesis-reshard";
-  "awsKinesis" = self."aws-kinesis";
-  "awsPerformanceTests" = self."aws-performance-tests";
-  "awsRoute53" = self."aws-route53";
-  "awsSdk" = self."aws-sdk";
-  "awsSdkTextConverter" = self."aws-sdk-text-converter";
-  "awsSdkXmlUnordered" = self."aws-sdk-xml-unordered";
-  "awsSign4" = self."aws-sign4";
-  "awsSns" = self."aws-sns";
-  "azureAcs" = self."azure-acs";
-  "azureServiceApi" = self."azure-service-api";
-  "azureServicebus" = self."azure-servicebus";
-  "backtrackingExceptions" = self."backtracking-exceptions";
-  "backwardState" = self."backward-state";
-  "bambooLauncher" = self."bamboo-launcher";
-  "bambooPluginHighlight" = self."bamboo-plugin-highlight";
-  "bambooPluginPhoto" = self."bamboo-plugin-photo";
-  "bambooThemeBlueprint" = self."bamboo-theme-blueprint";
-  "bambooThemeMiniHtml5" = self."bamboo-theme-mini-html5";
-  "barcodesCode128" = self."barcodes-code128";
-  "barrierMonad" = self."barrier-monad";
-  "base16Bytestring" = self."base16-bytestring";
-  "base32Bytestring" = self."base32-bytestring";
-  "base64Bytestring" = self."base64-bytestring";
-  "base64Conduit" = self."base64-conduit";
-  "base64String" = self."base64-string";
-  "baseCompat" = self."base-compat";
-  "baseIoAccess" = self."base-io-access";
-  "basePrelude" = self."base-prelude";
-  "baseUnicodeSymbols" = self."base-unicode-symbols";
-  "basicPrelude" = self."basic-prelude";
-  "basicSop" = self."basic-sop";
-  "battlenetYesod" = self."battlenet-yesod";
-  "bayesStack" = self."bayes-stack";
-  "bedAndBreakfast" = self."bed-and-breakfast";
-  "benchmarkFunction" = self."benchmark-function";
-  "bfCata" = self."bf-cata";
-  "bffMono" = self."bff-mono";
-  "bidirectionalizationCombined" = self."bidirectionalization-combined";
-  "bidispecExtras" = self."bidispec-extras";
-  "billboardParser" = self."billboard-parser";
-  "billeksahForms" = self."billeksah-forms";
-  "billeksahMain" = self."billeksah-main";
-  "billeksahMainStatic" = self."billeksah-main-static";
-  "billeksahPane" = self."billeksah-pane";
-  "billeksahServices" = self."billeksah-services";
-  "binaryBits" = self."binary-bits";
-  "binaryCommunicator" = self."binary-communicator";
-  "binaryConduit" = self."binary-conduit";
-  "binaryDerive" = self."binary-derive";
-  "binaryFile" = self."binary-file";
-  "binaryGeneric" = self."binary-generic";
-  "binaryIndexedTree" = self."binary-indexed-tree";
-  "binaryList" = self."binary-list";
-  "binaryLiteralQq" = self."binary-literal-qq";
-  "binaryProtocol" = self."binary-protocol";
-  "binaryProtocolZmq" = self."binary-protocol-zmq";
-  "binarySearch" = self."binary-search";
-  "binaryShared" = self."binary-shared";
-  "binaryState" = self."binary-state";
-  "binaryStreams" = self."binary-streams";
-  "binaryStrict" = self."binary-strict";
-  "binaryTyped" = self."binary-typed";
-  "bindingCore" = self."binding-core";
-  "bindingGtk" = self."binding-gtk";
-  "bindingsApr" = self."bindings-apr";
-  "bindingsAprUtil" = self."bindings-apr-util";
-  "bindingsAudiofile" = self."bindings-audiofile";
-  "bindingsBfd" = self."bindings-bfd";
-  "bindingsCctools" = self."bindings-cctools";
-  "bindingsCodec2" = self."bindings-codec2";
-  "bindingsCommon" = self."bindings-common";
-  "bindingsDc1394" = self."bindings-dc1394";
-  "bindingsDirectfb" = self."bindings-directfb";
-  "bindingsDSL" = self."bindings-DSL";
-  "bindingsEskit" = self."bindings-eskit";
-  "bindingsEsounD" = self."bindings-EsounD";
-  "bindingsFann" = self."bindings-fann";
-  "bindingsFriso" = self."bindings-friso";
-  "bindingsGLFW" = self."bindings-GLFW";
-  "bindingsGlib" = self."bindings-glib";
-  "bindingsGobject" = self."bindings-gobject";
-  "bindingsGpgme" = self."bindings-gpgme";
-  "bindingsGsl" = self."bindings-gsl";
-  "bindingsGts" = self."bindings-gts";
-  "bindingsHamlib" = self."bindings-hamlib";
-  "bindingsHdf5" = self."bindings-hdf5";
-  "bindingsK8055" = self."bindings-K8055";
-  "bindingsLevmar" = self."bindings-levmar";
-  "bindingsLibcddb" = self."bindings-libcddb";
-  "bindingsLibffi" = self."bindings-libffi";
-  "bindingsLibftdi" = self."bindings-libftdi";
-  "bindingsLibrrd" = self."bindings-librrd";
-  "bindingsLibstemmer" = self."bindings-libstemmer";
-  "bindingsLibusb" = self."bindings-libusb";
-  "bindingsLibv4l2" = self."bindings-libv4l2";
-  "bindingsLibzip" = self."bindings-libzip";
-  "bindingsLinuxVideodev2" = self."bindings-linux-videodev2";
-  "bindingsLxc" = self."bindings-lxc";
-  "bindingsMmap" = self."bindings-mmap";
-  "bindingsMpdecimal" = self."bindings-mpdecimal";
-  "bindingsNettle" = self."bindings-nettle";
-  "bindingsParport" = self."bindings-parport";
-  "bindingsPortaudio" = self."bindings-portaudio";
-  "bindingsPosix" = self."bindings-posix";
-  "bindingsPpdev" = self."bindings-ppdev";
-  "bindingsSagaCmd" = self."bindings-saga-cmd";
-  "bindingsSane" = self."bindings-sane";
-  "bindingsSc3" = self."bindings-sc3";
-  "bindingsSipc" = self."bindings-sipc";
-  "bindingsSophia" = self."bindings-sophia";
-  "bindingsSqlite3" = self."bindings-sqlite3";
-  "bindingsSvm" = self."bindings-svm";
-  "bindingsUname" = self."bindings-uname";
-  "bindingsYices" = self."bindings-yices";
-  "bindingWx" = self."binding-wx";
-  "bindMarshal" = self."bind-marshal";
-  "binembedExample" = self."binembed-example";
-  "bitArray" = self."bit-array";
-  "bitcoinRpc" = self."bitcoin-rpc";
-  "bitlyCli" = self."bitly-cli";
-  "bitmapOpengl" = self."bitmap-opengl";
-  "bitsAtomic" = self."bits-atomic";
-  "bitsConduit" = self."bits-conduit";
-  "bitsExtras" = self."bits-extras";
-  "bitVector" = self."bit-vector";
-  "bkTree" = self."bk-tree";
-  "blackJewel" = self."black-jewel";
-  "blakesumDemo" = self."blakesum-demo";
-  "blankCanvas" = self."blank-canvas";
-  "blasHs" = self."blas-hs";
-  "blazeBootstrap" = self."blaze-bootstrap";
-  "blazeBuilderConduit" = self."blaze-builder-conduit";
-  "blazeBuilderEnumerator" = self."blaze-builder-enumerator";
-  "blazeBuilder" = self."blaze-builder";
-  "blazeFromHtml" = self."blaze-from-html";
-  "blazeHtmlContrib" = self."blaze-html-contrib";
-  "blazeHtmlHexpat" = self."blaze-html-hexpat";
-  "blazeHtml" = self."blaze-html";
-  "blazeHtmlTruncate" = self."blaze-html-truncate";
-  "blazeMarkup" = self."blaze-markup";
-  "blazeSvg" = self."blaze-svg";
-  "blazeTextualNative" = self."blaze-textual-native";
-  "blazeTextual" = self."blaze-textual";
-  "blockingTransactions" = self."blocking-transactions";
-  "BlogLiteratelyDiagrams" = self."BlogLiterately-diagrams";
-  "BNFCMeta" = self."BNFC-meta";
-  "boardGames" = self."board-games";
-  "bogreBanana" = self."bogre-banana";
-  "booleanList" = self."boolean-list";
-  "booleanNormalForms" = self."boolean-normal-forms";
-  "boolExtras" = self."bool-extras";
-  "boundedTchan" = self."bounded-tchan";
-  "brainfuckMonad" = self."brainfuck-monad";
-  "brainfuckTut" = self."brainfuck-tut";
-  "briansBrain" = self."brians-brain";
-  "broadcastChan" = self."broadcast-chan";
-  "bsdSysctl" = self."bsd-sysctl";
-  "bsonGeneric" = self."bson-generic";
-  "bsonGenerics" = self."bson-generics";
-  "bsonMapping" = self."bson-mapping";
-  "btreeConcurrent" = self."btree-concurrent";
-  "bTree" = self."b-tree";
-  "buildboxTools" = self."buildbox-tools";
-  "burstDetection" = self."burst-detection";
-  "busPirate" = self."bus-pirate";
-  "busterGtk" = self."buster-gtk";
-  "busterNetwork" = self."buster-network";
-  "bytestringArbitrary" = self."bytestring-arbitrary";
-  "bytestringBuilder" = self."bytestring-builder";
-  "bytestringClass" = self."bytestring-class";
-  "bytestringConversion" = self."bytestring-conversion";
-  "bytestringCsv" = self."bytestring-csv";
-  "bytestringDelta" = self."bytestring-delta";
-  "bytestringFrom" = self."bytestring-from";
-  "bytestringHandle" = self."bytestring-handle";
-  "bytestringLexing" = self."bytestring-lexing";
-  "bytestringMmap" = self."bytestring-mmap";
-  "bytestringNums" = self."bytestring-nums";
-  "bytestringparserTemporary" = self."bytestringparser-temporary";
-  "bytestringPlain" = self."bytestring-plain";
-  "bytestringProgress" = self."bytestring-progress";
-  "bytestringRematch" = self."bytestring-rematch";
-  "bytestringShow" = self."bytestring-show";
-  "bytestringTrie" = self."bytestring-trie";
-  "bzlibConduit" = self."bzlib-conduit";
-  "cabalAudit" = self."cabal-audit";
-  "cabalBounds" = self."cabal-bounds";
-  "cabalCargs" = self."cabal-cargs";
-  "cabalConstraints" = self."cabal-constraints";
-  "cabalDb" = self."cabal-db";
-  "cabalDebian" = self."cabal-debian";
-  "cabalDependencyLicenses" = self."cabal-dependency-licenses";
-  "cabalDev" = self."cabal-dev";
-  "cabalDir" = self."cabal-dir";
-  "cabalFileTh" = self."cabal-file-th";
-  "cabalGhci" = self."cabal-ghci";
-  "cabalGraphdeps" = self."cabal-graphdeps";
-  "cabalInstallBundle" = self."cabal-install-bundle";
-  "cabalInstallGhc72" = self."cabal-install-ghc72";
-  "cabalInstallGhc74" = self."cabal-install-ghc74";
-  "cabalInstall" = self."cabal-install";
-  "cabalLenses" = self."cabal-lenses";
-  "cabalMacosx" = self."cabal-macosx";
-  "cabalMeta" = self."cabal-meta";
-  "cabalNirvana" = self."cabal-nirvana";
-  "cabalProgdeps" = self."cabal-progdeps";
-  "cabalQuery" = self."cabal-query";
-  "cabalRpm" = self."cabal-rpm";
-  "cabalScripts" = self."cabal-scripts";
-  "cabalSetup" = self."cabal-setup";
-  "cabalSign" = self."cabal-sign";
-  "cabalSort" = self."cabal-sort";
-  "cabalSrc" = self."cabal-src";
-  "cabalTestQuickcheck" = self."cabal-test-quickcheck";
-  "cabalTest" = self."cabal-test";
-  "cabalUninstall" = self."cabal-uninstall";
-  "cabalUpload" = self."cabal-upload";
-  "cachedTraversable" = self."cached-traversable";
-  "cairoAppbase" = self."cairo-appbase";
-  "cal3dExamples" = self."cal3d-examples";
-  "cal3dOpengl" = self."cal3d-opengl";
-  "canonicalFilepath" = self."canonical-filepath";
-  "cappedList" = self."capped-list";
-  "casadiBindingsControl" = self."casadi-bindings-control";
-  "casadiBindingsCore" = self."casadi-bindings-core";
-  "casadiBindingsInternal" = self."casadi-bindings-internal";
-  "casadiBindingsIpoptInterface" = self."casadi-bindings-ipopt-interface";
-  "casadiBindings" = self."casadi-bindings";
-  "casadiBindingsSnoptInterface" = self."casadi-bindings-snopt-interface";
-  "caseConversion" = self."case-conversion";
-  "caseInsensitive" = self."case-insensitive";
-  "cassandraCql" = self."cassandra-cql";
-  "cassandraThrift" = self."cassandra-thrift";
-  "cassavaStreams" = self."cassava-streams";
-  "catchFd" = self."catch-fd";
-  "categoricalAlgebra" = self."categorical-algebra";
-  "categoryExtras" = self."category-extras";
-  "cautiousFile" = self."cautious-file";
-  "CCDelcontAlt" = self."CC-delcont-alt";
-  "CCDelcontCxe" = self."CC-delcont-cxe";
-  "CCDelcontExc" = self."CC-delcont-exc";
-  "CCDelcontRef" = self."CC-delcont-ref";
-  "CCDelcontRefTf" = self."CC-delcont-ref-tf";
-  "CCDelcont" = self."CC-delcont";
-  "cctoolsWorkqueue" = self."cctools-workqueue";
-  "cDsl" = self."c-dsl";
-  "cellrendererCairo" = self."cellrenderer-cairo";
-  "cerealConduit" = self."cereal-conduit";
-  "cerealDerive" = self."cereal-derive";
-  "cerealEnumerator" = self."cereal-enumerator";
-  "cerealIeee754" = self."cereal-ieee754";
-  "cerealPlus" = self."cereal-plus";
-  "cerealText" = self."cereal-text";
-  "cerealVector" = self."cereal-vector";
-  "cgiUndecidable" = self."cgi-undecidable";
-  "cgiUtils" = self."cgi-utils";
-  "chainCodes" = self."chain-codes";
-  "chalkboardViewer" = self."chalkboard-viewer";
-  "chalmersLava2000" = self."chalmers-lava2000";
-  "changeMonger" = self."change-monger";
-  "chanSplit" = self."chan-split";
-  "charsetdetectAe" = self."charsetdetect-ae";
-  "ChartCairo" = self."Chart-cairo";
-  "ChartDiagrams" = self."Chart-diagrams";
-  "ChartGtk" = self."Chart-gtk";
-  "chartHistogram" = self."chart-histogram";
-  "ChartSimple" = self."Chart-simple";
-  "chaselevDeque" = self."chaselev-deque";
-  "chattyText" = self."chatty-text";
-  "chattyUtils" = self."chatty-utils";
-  "checkEmail" = self."check-email";
-  "checkPvp" = self."check-pvp";
-  "chellHunit" = self."chell-hunit";
-  "chellQuickcheck" = self."chell-quickcheck";
-  "chpMtl" = self."chp-mtl";
-  "chpPlus" = self."chp-plus";
-  "chpSpec" = self."chp-spec";
-  "chpTransformers" = self."chp-transformers";
-  "chunkedData" = self."chunked-data";
-  "churchList" = self."church-list";
-  "cIo" = self."c-io";
-  "cipherAes128" = self."cipher-aes128";
-  "cipherAes" = self."cipher-aes";
-  "cipherBlowfish" = self."cipher-blowfish";
-  "cipherCamellia" = self."cipher-camellia";
-  "cipherDes" = self."cipher-des";
-  "cipherRc4" = self."cipher-rc4";
-  "cipherRc5" = self."cipher-rc5";
-  "circlePacking" = self."circle-packing";
-  "citationResolve" = self."citation-resolve";
-  "citeprocHs" = self."citeproc-hs";
-  "clashGhc" = self."clash-ghc";
-  "clashLib" = self."clash-lib";
-  "clashPrelude" = self."clash-prelude";
-  "classyParallel" = self."classy-parallel";
-  "classyPreludeConduit" = self."classy-prelude-conduit";
-  "classyPrelude" = self."classy-prelude";
-  "classyPreludeYesod" = self."classy-prelude-yesod";
-  "clckwrksCli" = self."clckwrks-cli";
-  "clckwrksDotCom" = self."clckwrks-dot-com";
-  "clckwrksPluginBugs" = self."clckwrks-plugin-bugs";
-  "clckwrksPluginIrcbot" = self."clckwrks-plugin-ircbot";
-  "clckwrksPluginMedia" = self."clckwrks-plugin-media";
-  "clckwrksPluginPage" = self."clckwrks-plugin-page";
-  "clckwrksThemeBootstrap" = self."clckwrks-theme-bootstrap";
-  "clckwrksThemeClckwrks" = self."clckwrks-theme-clckwrks";
-  "clckwrksThemeGeoBootstrap" = self."clckwrks-theme-geo-bootstrap";
-  "cleanHome" = self."clean-home";
-  "cleanUnions" = self."clean-unions";
-  "clickClack" = self."click-clack";
-  "cloneAll" = self."clone-all";
-  "cloudfrontSigner" = self."cloudfront-signer";
-  "cloudHaskell" = self."cloud-haskell";
-  "cmdargsBrowser" = self."cmdargs-browser";
-  "cncSpecCompiler" = self."cnc-spec-compiler";
-  "codeBuilder" = self."code-builder";
-  "CodecCompressionLZF" = self."Codec-Compression-LZF";
-  "CodecImageDevIL" = self."Codec-Image-DevIL";
-  "codecLibevent" = self."codec-libevent";
-  "codecMbox" = self."codec-mbox";
-  "codecovHaskell" = self."codecov-haskell";
-  "codoNotation" = self."codo-notation";
-  "cognimetaUtils" = self."cognimeta-utils";
-  "colladaOutput" = self."collada-output";
-  "colladaTypes" = self."collada-types";
-  "collapseUtil" = self."collapse-util";
-  "collectionsApi" = self."collections-api";
-  "collectionsBaseInstances" = self."collections-base-instances";
-  "colorizeHaskell" = self."colorize-haskell";
-  "combinatDiagrams" = self."combinat-diagrams";
-  "combinatorialProblems" = self."combinatorial-problems";
-  "combinatorInteractive" = self."combinator-interactive";
-  "commandQq" = self."command-qq";
-  "commsecKeyexchange" = self."commsec-keyexchange";
-  "comonadExtras" = self."comonad-extras";
-  "comonadRandom" = self."comonad-random";
-  "comonadsFd" = self."comonads-fd";
-  "comonadTransformers" = self."comonad-transformers";
-  "compactMap" = self."compact-map";
-  "compactStringFix" = self."compact-string-fix";
-  "compactString" = self."compact-string";
-  "compdataAutomata" = self."compdata-automata";
-  "compdataDags" = self."compdata-dags";
-  "compdataParam" = self."compdata-param";
-  "complexGeneric" = self."complex-generic";
-  "complexIntegrate" = self."complex-integrate";
-  "composeTrans" = self."compose-trans";
-  "computationalAlgebra" = self."computational-algebra";
-  "concraftPl" = self."concraft-pl";
-  "concreteRelaxngParser" = self."concrete-relaxng-parser";
-  "concreteTyperep" = self."concrete-typerep";
-  "concurrentBarrier" = self."concurrent-barrier";
-  "concurrentDnsCache" = self."concurrent-dns-cache";
-  "concurrentExtra" = self."concurrent-extra";
-  "concurrentSa" = self."concurrent-sa";
-  "concurrentSplit" = self."concurrent-split";
-  "concurrentState" = self."concurrent-state";
-  "concurrentSupply" = self."concurrent-supply";
-  "conductiveBase" = self."conductive-base";
-  "conductiveClock" = self."conductive-clock";
-  "conductiveHsc3" = self."conductive-hsc3";
-  "conductiveSong" = self."conductive-song";
-  "conduitCombinators" = self."conduit-combinators";
-  "conduitConnection" = self."conduit-connection";
-  "conduitExtra" = self."conduit-extra";
-  "conduitIconv" = self."conduit-iconv";
-  "conduitNetworkStream" = self."conduit-network-stream";
-  "conduitResumablesink" = self."conduit-resumablesink";
-  "configSelect" = self."config-select";
-  "configurationTools" = self."configuration-tools";
-  "congruenceRelation" = self."congruence-relation";
-  "connectionPool" = self."connection-pool";
-  "consoleProgram" = self."console-program";
-  "constMathGhcPlugin" = self."const-math-ghc-plugin";
-  "constrainedNormal" = self."constrained-normal";
-  "constructiveAlgebra" = self."constructive-algebra";
-  "containerClasses" = self."container-classes";
-  "containersBenchmark" = self."containers-benchmark";
-  "containersDeepseq" = self."containers-deepseq";
-  "containersUnicodeSymbols" = self."containers-unicode-symbols";
-  "contextStack" = self."context-stack";
-  "continuedFractions" = self."continued-fractions";
-  "continuumClient" = self."continuum-client";
-  "controlBool" = self."control-bool";
-  "ControlEngine" = self."Control-Engine";
-  "controlEvent" = self."control-event";
-  "controlMonadAttempt" = self."control-monad-attempt";
-  "controlMonadExceptionMonadsfd" = self."control-monad-exception-monadsfd";
-  "controlMonadExceptionMonadstf" = self."control-monad-exception-monadstf";
-  "controlMonadExceptionMtl" = self."control-monad-exception-mtl";
-  "controlMonadException" = self."control-monad-exception";
-  "controlMonadFailureMtl" = self."control-monad-failure-mtl";
-  "controlMonadFailure" = self."control-monad-failure";
-  "controlMonadFree" = self."control-monad-free";
-  "controlMonadLoop" = self."control-monad-loop";
-  "ControlMonadMultiPass" = self."Control-Monad-MultiPass";
-  "controlMonadOmega" = self."control-monad-omega";
-  "controlMonadQueue" = self."control-monad-queue";
-  "ControlMonadST2" = self."Control-Monad-ST2";
-  "controlTimeout" = self."control-timeout";
-  "contstuffMonadsTf" = self."contstuff-monads-tf";
-  "contstuffTransformers" = self."contstuff-transformers";
-  "convertibleAscii" = self."convertible-ascii";
-  "convertibleText" = self."convertible-text";
-  "copilotC99" = self."copilot-c99";
-  "copilotCbmc" = self."copilot-cbmc";
-  "copilotCore" = self."copilot-core";
-  "copilotLanguage" = self."copilot-language";
-  "copilotLibraries" = self."copilot-libraries";
-  "copilotSbv" = self."copilot-sbv";
-  "corebotBliki" = self."corebot-bliki";
-  "coreHaskell" = self."core-haskell";
-  "coroutineEnumerator" = self."coroutine-enumerator";
-  "coroutineIteratee" = self."coroutine-iteratee";
-  "coroutineObject" = self."coroutine-object";
-  "couchdbConduit" = self."couchdb-conduit";
-  "couchdbEnumerator" = self."couchdb-enumerator";
-  "couchHs" = self."couch-hs";
-  "countryCodes" = self."country-codes";
-  "cplusplusTh" = self."cplusplus-th";
-  "cprngAesEffect" = self."cprng-aes-effect";
-  "cprngAes" = self."cprng-aes";
-  "cqlIo" = self."cql-io";
-  "cqrsExample" = self."cqrs-example";
-  "cqrsPostgresql" = self."cqrs-postgresql";
-  "cqrsSqlite3" = self."cqrs-sqlite3";
-  "cqrsTest" = self."cqrs-test";
-  "cqrsTypes" = self."cqrs-types";
-  "craftwerkCairo" = self."craftwerk-cairo";
-  "craftwerkGtk" = self."craftwerk-gtk";
-  "crc16Table" = self."crc16-table";
-  "crfChain1Constrained" = self."crf-chain1-constrained";
-  "crfChain1" = self."crf-chain1";
-  "crfChain2Generic" = self."crf-chain2-generic";
-  "crfChain2Tiers" = self."crf-chain2-tiers";
-  "criterionPlus" = self."criterion-plus";
-  "criterionToHtml" = self."criterion-to-html";
-  "cruncherTypes" = self."cruncher-types";
-  "cryptoApi" = self."crypto-api";
-  "cryptoApiTests" = self."crypto-api-tests";
-  "cryptoCipherBenchmarks" = self."crypto-cipher-benchmarks";
-  "cryptoCipherTests" = self."crypto-cipher-tests";
-  "cryptoCipherTypes" = self."crypto-cipher-types";
-  "cryptoConduit" = self."crypto-conduit";
-  "cryptohashConduit" = self."cryptohash-conduit";
-  "cryptohashCryptoapi" = self."cryptohash-cryptoapi";
-  "cryptoNumbers" = self."crypto-numbers";
-  "cryptoPubkeyOpenssh" = self."crypto-pubkey-openssh";
-  "cryptoPubkey" = self."crypto-pubkey";
-  "cryptoPubkeyTypes" = self."crypto-pubkey-types";
-  "cryptoRandomApi" = self."crypto-random-api";
-  "cryptoRandomEffect" = self."crypto-random-effect";
-  "cryptoRandom" = self."crypto-random";
-  "cryptoTotp" = self."crypto-totp";
-  "cryptsyApi" = self."cryptsy-api";
-  "cseGhcPlugin" = self."cse-ghc-plugin";
-  "csoundCatalog" = self."csound-catalog";
-  "csoundExpressionDynamic" = self."csound-expression-dynamic";
-  "csoundExpressionOpcodes" = self."csound-expression-opcodes";
-  "csoundExpression" = self."csound-expression";
-  "csoundExpressionTyped" = self."csound-expression-typed";
-  "csoundSampler" = self."csound-sampler";
-  "CSPMCoreLanguage" = self."CSPM-CoreLanguage";
-  "CSPMCspm" = self."CSPM-cspm";
-  "CSPMFiringRules" = self."CSPM-FiringRules";
-  "CSPMFrontend" = self."CSPM-Frontend";
-  "CSPMInterpreter" = self."CSPM-Interpreter";
-  "CSPMToProlog" = self."CSPM-ToProlog";
-  "cssText" = self."css-text";
-  "cStorableDeriving" = self."c-storable-deriving";
-  "csvConduit" = self."csv-conduit";
-  "csvEnumerator" = self."csv-enumerator";
-  "csvNptools" = self."csv-nptools";
-  "csvToQif" = self."csv-to-qif";
-  "curlAeson" = self."curl-aeson";
-  "currentLocale" = self."current-locale";
-  "curryBase" = self."curry-base";
-  "curryFrontend" = self."curry-frontend";
-  "customPrelude" = self."custom-prelude";
-  "cvCombinators" = self."cv-combinators";
-  "daemonizeDoublefork" = self."daemonize-doublefork";
-  "DAGTournament" = self."DAG-Tournament";
-  "darcsBenchmark" = self."darcs-benchmark";
-  "darcsBeta" = self."darcs-beta";
-  "darcsBuildpackage" = self."darcs-buildpackage";
-  "darcsCabalized" = self."darcs-cabalized";
-  "darcsFastconvert" = self."darcs-fastconvert";
-  "darcsGraph" = self."darcs-graph";
-  "darcsMonitor" = self."darcs-monitor";
-  "darcsScripts" = self."darcs-scripts";
-  "dashHaskell" = self."dash-haskell";
-  "dataAccessorMonadLib" = self."data-accessor-monadLib";
-  "dataAccessorMonadsFd" = self."data-accessor-monads-fd";
-  "dataAccessorMonadsTf" = self."data-accessor-monads-tf";
-  "dataAccessorMtl" = self."data-accessor-mtl";
-  "dataAccessor" = self."data-accessor";
-  "dataAccessorTemplate" = self."data-accessor-template";
-  "dataAccessorTransformers" = self."data-accessor-transformers";
-  "dataAviary" = self."data-aviary";
-  "databaseMigrate" = self."database-migrate";
-  "databaseStudy" = self."database-study";
-  "dataBinaryIeee754" = self."data-binary-ieee754";
-  "dataBword" = self."data-bword";
-  "dataCarousel" = self."data-carousel";
-  "dataCategory" = self."data-category";
-  "dataChecked" = self."data-checked";
-  "dataClist" = self."data-clist";
-  "dataConcurrentQueue" = self."data-concurrent-queue";
-  "dataCycle" = self."data-cycle";
-  "dataDefaultClass" = self."data-default-class";
-  "dataDefaultGenerics" = self."data-default-generics";
-  "dataDefaultInstancesBase" = self."data-default-instances-base";
-  "dataDefaultInstancesContainers" = self."data-default-instances-containers";
-  "dataDefaultInstancesDlist" = self."data-default-instances-dlist";
-  "dataDefaultInstancesOldLocale" = self."data-default-instances-old-locale";
-  "dataDefault" = self."data-default";
-  "dataDispersal" = self."data-dispersal";
-  "dataDword" = self."data-dword";
-  "dataEasy" = self."data-easy";
-  "dataEndian" = self."data-endian";
-  "dataExtra" = self."data-extra";
-  "dataFilepath" = self."data-filepath";
-  "dataFin" = self."data-fin";
-  "dataFixCse" = self."data-fix-cse";
-  "dataFix" = self."data-fix";
-  "dataFlags" = self."data-flags";
-  "dataFresh" = self."data-fresh";
-  "DataHashConsistent" = self."Data-Hash-Consistent";
-  "dataHash" = self."data-hash";
-  "dataInterval" = self."data-interval";
-  "dataInttrie" = self."data-inttrie";
-  "dataIvar" = self."data-ivar";
-  "dataLayout" = self."data-layout";
-  "dataLensFd" = self."data-lens-fd";
-  "dataLensIxset" = self."data-lens-ixset";
-  "dataLensLight" = self."data-lens-light";
-  "dataLens" = self."data-lens";
-  "dataLensTemplate" = self."data-lens-template";
-  "dataListSequences" = self."data-list-sequences";
-  "dataMemocombinators" = self."data-memocombinators";
-  "dataNamed" = self."data-named";
-  "dataNat" = self."data-nat";
-  "dataObjectJson" = self."data-object-json";
-  "dataObject" = self."data-object";
-  "dataObjectYaml" = self."data-object-yaml";
-  "dataOrdlist" = self."data-ordlist";
-  "dataOr" = self."data-or";
-  "dataPartition" = self."data-partition";
-  "dataPprint" = self."data-pprint";
-  "dataQuotientref" = self."data-quotientref";
-  "dataRef" = self."data-ref";
-  "dataReifyCse" = self."data-reify-cse";
-  "dataReify" = self."data-reify";
-  "dataRope" = self."data-rope";
-  "DataRope" = self."Data-Rope";
-  "dataRTree" = self."data-r-tree";
-  "dataSize" = self."data-size";
-  "dataSpacepart" = self."data-spacepart";
-  "dataStore" = self."data-store";
-  "dataStringmap" = self."data-stringmap";
-  "dataStructureInferrer" = self."data-structure-inferrer";
-  "dataTextual" = self."data-textual";
-  "dataTimeout" = self."data-timeout";
-  "dataTransform" = self."data-transform";
-  "dataTreify" = self."data-treify";
-  "dataType" = self."data-type";
-  "dataUtil" = self."data-util";
-  "dataVariant" = self."data-variant";
-  "dateCache" = self."date-cache";
-  "dbusClient" = self."dbus-client";
-  "dbusCore" = self."dbus-core";
-  "dbusQq" = self."dbus-qq";
-  "dBus" = self."d-bus";
-  "dbusTh" = self."dbus-th";
-  "dclabelEci11" = self."dclabel-eci11";
-  "ddcBase" = self."ddc-base";
-  "ddcBuild" = self."ddc-build";
-  "ddcCode" = self."ddc-code";
-  "ddcCoreEval" = self."ddc-core-eval";
-  "ddcCoreFlow" = self."ddc-core-flow";
-  "ddcCoreLlvm" = self."ddc-core-llvm";
-  "ddcCoreSalt" = self."ddc-core-salt";
-  "ddcCore" = self."ddc-core";
-  "ddcCoreSimpl" = self."ddc-core-simpl";
-  "ddcCoreTetra" = self."ddc-core-tetra";
-  "ddcDriver" = self."ddc-driver";
-  "ddciCore" = self."ddci-core";
-  "ddcInterface" = self."ddc-interface";
-  "ddcSourceTetra" = self."ddc-source-tetra";
-  "ddcTools" = self."ddc-tools";
-  "ddcWar" = self."ddc-war";
-  "DeadpanDDP" = self."Deadpan-DDP";
-  "deadSimpleJson" = self."dead-simple-json";
-  "debianBinary" = self."debian-binary";
-  "debianBuild" = self."debian-build";
-  "debugDiff" = self."debug-diff";
-  "decoderConduit" = self."decoder-conduit";
-  "deeplearningHs" = self."deeplearning-hs";
-  "deepseqGenerics" = self."deepseq-generics";
-  "deepseqTh" = self."deepseq-th";
-  "definitiveBase" = self."definitive-base";
-  "definitiveFilesystem" = self."definitive-filesystem";
-  "definitiveGraphics" = self."definitive-graphics";
-  "definitiveParser" = self."definitive-parser";
-  "definitiveReactive" = self."definitive-reactive";
-  "definitiveSound" = self."definitive-sound";
-  "deikoConfig" = self."deiko-config";
-  "dekaTests" = self."deka-tests";
-  "delimitedText" = self."delimited-text";
-  "deltaH" = self."delta-h";
-  "dependentMap" = self."dependent-map";
-  "dependentSum" = self."dependent-sum";
-  "dependentSumTemplate" = self."dependent-sum-template";
-  "derivationTrees" = self."derivation-trees";
-  "deriveGadt" = self."derive-gadt";
-  "deriveIG" = self."derive-IG";
-  "deriveTrie" = self."derive-trie";
-  "derpLib" = self."derp-lib";
-  "diaBase" = self."dia-base";
-  "diaFunctions" = self."dia-functions";
-  "diagramsBuilder" = self."diagrams-builder";
-  "diagramsCairo" = self."diagrams-cairo";
-  "diagramsCanvas" = self."diagrams-canvas";
-  "diagramsContrib" = self."diagrams-contrib";
-  "diagramsCore" = self."diagrams-core";
-  "diagramsGtk" = self."diagrams-gtk";
-  "diagramsHaddock" = self."diagrams-haddock";
-  "diagramsLib" = self."diagrams-lib";
-  "diagramsPdf" = self."diagrams-pdf";
-  "diagramsPostscript" = self."diagrams-postscript";
-  "diagramsQrcode" = self."diagrams-qrcode";
-  "diagramsRasterific" = self."diagrams-rasterific";
-  "diagramsSvg" = self."diagrams-svg";
-  "diagramsTikz" = self."diagrams-tikz";
-  "diceEntropyConduit" = self."dice-entropy-conduit";
-  "diffParse" = self."diff-parse";
-  "digestiveBootstrap" = self."digestive-bootstrap";
-  "digestiveFunctorsAeson" = self."digestive-functors-aeson";
-  "digestiveFunctorsBlaze" = self."digestive-functors-blaze";
-  "digestiveFunctorsHappstack" = self."digestive-functors-happstack";
-  "digestiveFunctorsHeist" = self."digestive-functors-heist";
-  "digestiveFunctorsHsp" = self."digestive-functors-hsp";
-  "digestiveFunctorsScotty" = self."digestive-functors-scotty";
-  "digestiveFunctors" = self."digestive-functors";
-  "digestiveFunctorsSnap" = self."digestive-functors-snap";
-  "digestPure" = self."digest-pure";
-  "dimensionalTf" = self."dimensional-tf";
-  "dingoCore" = self."dingo-core";
-  "dingoExample" = self."dingo-example";
-  "dingoWidgets" = self."dingo-widgets";
-  "directBinaryFiles" = self."direct-binary-files";
-  "directDaemonize" = self."direct-daemonize";
-  "directedCubical" = self."directed-cubical";
-  "directFastcgi" = self."direct-fastcgi";
-  "directHttp" = self."direct-http";
-  "directMurmurHash" = self."direct-murmur-hash";
-  "directoryLayout" = self."directory-layout";
-  "directoryTree" = self."directory-tree";
-  "directPlugins" = self."direct-plugins";
-  "directSqlite" = self."direct-sqlite";
-  "discordianCalendar" = self."discordian-calendar";
-  "discreteSpaceMap" = self."discrete-space-map";
-  "disjointSet" = self."disjoint-set";
-  "disjointSetsSt" = self."disjoint-sets-st";
-  "diskFreeSpace" = self."disk-free-space";
-  "distributedProcessAzure" = self."distributed-process-azure";
-  "distributedProcessMonadControl" = self."distributed-process-monad-control";
-  "distributedProcessP2p" = self."distributed-process-p2p";
-  "distributedProcessPlatform" = self."distributed-process-platform";
-  "distributedProcess" = self."distributed-process";
-  "distributedProcessSimplelocalnet" = self."distributed-process-simplelocalnet";
-  "distributedProcessTests" = self."distributed-process-tests";
-  "distributedStatic" = self."distributed-static";
-  "distributionPlot" = self."distribution-plot";
-  "distUpload" = self."dist-upload";
-  "djinnGhc" = self."djinn-ghc";
-  "djinnLib" = self."djinn-lib";
-  "djinnTh" = self."djinn-th";
-  "dlistInstances" = self."dlist-instances";
-  "docReview" = self."doc-review";
-  "doctestDiscoverConfigurator" = self."doctest-discover-configurator";
-  "doctestDiscover" = self."doctest-discover";
-  "doctestProp" = self."doctest-prop";
-  "domainAuth" = self."domain-auth";
-  "domLt" = self."dom-lt";
-  "domSelector" = self."dom-selector";
-  "doubleConversion" = self."double-conversion";
-  "downloadCurl" = self."download-curl";
-  "downloadMediaContent" = self."download-media-content";
-  "dphBase" = self."dph-base";
-  "dphExamples" = self."dph-examples";
-  "dphLiftedBase" = self."dph-lifted-base";
-  "dphLiftedCopy" = self."dph-lifted-copy";
-  "dphLiftedVseg" = self."dph-lifted-vseg";
-  "dphPar" = self."dph-par";
-  "dphPrimInterface" = self."dph-prim-interface";
-  "dphPrimPar" = self."dph-prim-par";
-  "dphPrimSeq" = self."dph-prim-seq";
-  "dphSeq" = self."dph-seq";
-  "DrIFTCabalized" = self."DrIFT-cabalized";
-  "dropboxSdk" = self."dropbox-sdk";
-  "dsKanren" = self."ds-kanren";
-  "dsmcTools" = self."dsmc-tools";
-  "dsonParsec" = self."dson-parsec";
-  "dtdText" = self."dtd-text";
-  "dtdTypes" = self."dtd-types";
-  "dualTree" = self."dual-tree";
-  "DustCrypto" = self."Dust-crypto";
-  "DustToolsPcap" = self."Dust-tools-pcap";
-  "DustTools" = self."Dust-tools";
-  "dviProcessing" = self."dvi-processing";
-  "dwarfEl" = self."dwarf-el";
-  "dynamicCabal" = self."dynamic-cabal";
-  "dynamicGraph" = self."dynamic-graph";
-  "dynamicLinkerTemplate" = self."dynamic-linker-template";
-  "dynamicLoader" = self."dynamic-loader";
-  "dynamicMvector" = self."dynamic-mvector";
-  "dynamicObject" = self."dynamic-object";
-  "dynamicState" = self."dynamic-state";
-  "DysFRPCairo" = self."DysFRP-Cairo";
-  "DysFRPCraftwerk" = self."DysFRP-Craftwerk";
-  "dzenUtils" = self."dzen-utils";
-  "eagerSockets" = self."eager-sockets";
-  "easyApi" = self."easy-api";
-  "easyFile" = self."easy-file";
-  "ec2Signature" = self."ec2-signature";
-  "editDistance" = self."edit-distance";
-  "editLensesDemo" = self."edit-lenses-demo";
-  "editLenses" = self."edit-lenses";
-  "effectiveAspectsMzv" = self."effective-aspects-mzv";
-  "effectiveAspects" = self."effective-aspects";
-  "effectMonad" = self."effect-monad";
-  "effectsParser" = self."effects-parser";
-  "egisonQuote" = self."egison-quote";
-  "egisonTutorial" = self."egison-tutorial";
-  "eibdClientSimple" = self."eibd-client-simple";
-  "eitherUnwrap" = self."either-unwrap";
-  "ekgBosun" = self."ekg-bosun";
-  "ekgCarbon" = self."ekg-carbon";
-  "ekgCore" = self."ekg-core";
-  "ekgLog" = self."ekg-log";
-  "ekgRrd" = self."ekg-rrd";
-  "ekgStatsd" = self."ekg-statsd";
-  "electrumMnemonic" = self."electrum-mnemonic";
-  "elereaExamples" = self."elerea-examples";
-  "elereaSdl" = self."elerea-sdl";
-  "elmBuildLib" = self."elm-build-lib";
-  "elmCompiler" = self."elm-compiler";
-  "elmCoreSources" = self."elm-core-sources";
-  "elmGet" = self."elm-get";
-  "elmMake" = self."elm-make";
-  "elmPackage" = self."elm-package";
-  "elmReactor" = self."elm-reactor";
-  "elmRepl" = self."elm-repl";
-  "elmServer" = self."elm-server";
-  "elmYesod" = self."elm-yesod";
-  "emailHeader" = self."email-header";
-  "emailPostmark" = self."email-postmark";
-  "emailValidate" = self."email-validate";
-  "emailValidator" = self."email-validator";
-  "embeddockExample" = self."embeddock-example";
-  "enclosedExceptions" = self."enclosed-exceptions";
-  "engineeringUnits" = self."engineering-units";
-  "engineIo" = self."engine-io";
-  "engineIoSnap" = self."engine-io-snap";
-  "engineIoYesod" = self."engine-io-yesod";
-  "enumeratorFd" = self."enumerator-fd";
-  "enumeratorTf" = self."enumerator-tf";
-  "enummapsetTh" = self."enummapset-th";
-  "envParser" = self."env-parser";
-  "epanetHaskell" = self."epanet-haskell";
-  "epubMetadata" = self."epub-metadata";
-  "epubTools" = self."epub-tools";
-  "equalFiles" = self."equal-files";
-  "equationalReasoning" = self."equational-reasoning";
-  "erfNative" = self."erf-native";
-  "erosClient" = self."eros-client";
-  "erosHttp" = self."eros-http";
-  "errorcallEqInstance" = self."errorcall-eq-instance";
-  "errorLocation" = self."error-location";
-  "errorLoc" = self."error-loc";
-  "errorMessage" = self."error-message";
-  "EtageGraph" = self."Etage-Graph";
-  "eventDriven" = self."event-driven";
-  "eventHandlers" = self."event-handlers";
-  "eventList" = self."event-list";
-  "eventMonad" = self."event-monad";
-  "everyBitCounts" = self."every-bit-counts";
-  "exactCombinatorics" = self."exact-combinatorics";
-  "exceptionMailer" = self."exception-mailer";
-  "exceptionMonadsFd" = self."exception-monads-fd";
-  "exceptionMonadsTf" = self."exception-monads-tf";
-  "exceptionMtl" = self."exception-mtl";
-  "exceptionTransformers" = self."exception-transformers";
-  "executablePath" = self."executable-path";
-  "expatEnumerator" = self."expat-enumerator";
-  "expiringCacheMap" = self."expiring-cache-map";
-  "expiringMvar" = self."expiring-mvar";
-  "explicitDeterminant" = self."explicit-determinant";
-  "explicitException" = self."explicit-exception";
-  "explicitIomodesBytestring" = self."explicit-iomodes-bytestring";
-  "explicitIomodes" = self."explicit-iomodes";
-  "explicitIomodesText" = self."explicit-iomodes-text";
-  "explicitSharing" = self."explicit-sharing";
-  "exPool" = self."ex-pool";
-  "exposedContainers" = self."exposed-containers";
-  "expressionParser" = self."expression-parser";
-  "extendedCategories" = self."extended-categories";
-  "extendedReals" = self."extended-reals";
-  "extensibleData" = self."extensible-data";
-  "extensibleEffects" = self."extensible-effects";
-  "extensibleExceptions" = self."extensible-exceptions";
-  "externalSort" = self."external-sort";
-  "ezCouch" = self."ez-couch";
-  "factualApi" = self."factual-api";
-  "failableList" = self."failable-list";
-  "fairPredicates" = self."fair-predicates";
-  "fallingTurnip" = self."falling-turnip";
-  "familyTree" = self."family-tree";
-  "fastLogger" = self."fast-logger";
-  "fastMath" = self."fast-math";
-  "fastTagsoup" = self."fast-tagsoup";
-  "fastTagsoupUtf8Only" = self."fast-tagsoup-utf8-only";
-  "fastTags" = self."fast-tags";
-  "faultTree" = self."fault-tree";
-  "fayBase" = self."fay-base";
-  "fayBuilder" = self."fay-builder";
-  "fayDom" = self."fay-dom";
-  "fayHsx" = self."fay-hsx";
-  "fayJquery" = self."fay-jquery";
-  "fayRef" = self."fay-ref";
-  "fayText" = self."fay-text";
-  "fayUri" = self."fay-uri";
-  "fbPersistent" = self."fb-persistent";
-  "fclabelsMonadlib" = self."fclabels-monadlib";
-  "fdoNotify" = self."fdo-notify";
-  "fdoTrash" = self."fdo-trash";
-  "featureFlags" = self."feature-flags";
-  "fedoraPackages" = self."fedora-packages";
-  "feedCli" = self."feed-cli";
-  "feldsparCompiler" = self."feldspar-compiler";
-  "feldsparLanguage" = self."feldspar-language";
-  "fezConf" = self."fez-conf";
-  "fficxxRuntime" = self."fficxx-runtime";
-  "ffmpegLight" = self."ffmpeg-light";
-  "ffmpegTutorials" = self."ffmpeg-tutorials";
-  "fglExtrasDecompositions" = self."fgl-extras-decompositions";
-  "fglVisualize" = self."fgl-visualize";
-  "fieldsJson" = self."fields-json";
-  "fileCommandQq" = self."file-command-qq";
-  "fileEmbed" = self."file-embed";
-  "fileLocation" = self."file-location";
-  "filepathIoAccess" = self."filepath-io-access";
-  "filesystemConduit" = self."filesystem-conduit";
-  "filesystemEnumerator" = self."filesystem-enumerator";
-  "filesystemTrees" = self."filesystem-trees";
-  "FinanceQuoteYahoo" = self."Finance-Quote-Yahoo";
-  "FinanceTreasury" = self."Finance-Treasury";
-  "findConduit" = self."find-conduit";
-  "fingertreePsqueue" = self."fingertree-psqueue";
-  "fingertreeTf" = self."fingertree-tf";
-  "finiteField" = self."finite-field";
-  "firstClassPatterns" = self."first-class-patterns";
-  "fixedList" = self."fixed-list";
-  "fixedPoint" = self."fixed-point";
-  "FixedPointSimple" = self."FixedPoint-simple";
-  "fixedPointVector" = self."fixed-point-vector";
-  "fixedPointVectorSpace" = self."fixed-point-vector-space";
-  "fixedPrecision" = self."fixed-precision";
-  "fixedStorableArray" = self."fixed-storable-array";
-  "fixedVectorBinary" = self."fixed-vector-binary";
-  "fixedVectorCereal" = self."fixed-vector-cereal";
-  "fixedVectorHetero" = self."fixed-vector-hetero";
-  "fixedVector" = self."fixed-vector";
-  "fixImports" = self."fix-imports";
-  "fixParserSimple" = self."fix-parser-simple";
-  "fixSymbolsGitit" = self."fix-symbols-gitit";
-  "fizzBuzz" = self."fizz-buzz";
-  "flatMcmc" = self."flat-mcmc";
-  "flexibleDefaults" = self."flexible-defaults";
-  "flexibleUnlit" = self."flexible-unlit";
-  "flexiwrapSmallcheck" = self."flexiwrap-smallcheck";
-  "floatBinstring" = self."float-binstring";
-  "flowdockApi" = self."flowdock-api";
-  "fluentLoggerConduit" = self."fluent-logger-conduit";
-  "fluentLogger" = self."fluent-logger";
-  "FMSBLEX" = self."FM-SBLEX";
-  "foldlIncremental" = self."foldl-incremental";
-  "fontOpenglBasic4x6" = self."font-opengl-basic4x6";
-  "forceLayout" = self."force-layout";
-  "foreignStorableAsymmetric" = self."foreign-storable-asymmetric";
-  "foreignStore" = self."foreign-store";
-  "forFree" = self."for-free";
-  "forkableMonad" = self."forkable-monad";
-  "formatStatus" = self."format-status";
-  "formletsHsp" = self."formlets-hsp";
-  "forthHll" = self."forth-hll";
-  "fpcoApi" = self."fpco-api";
-  "fpnlaExamples" = self."fpnla-examples";
-  "frameMarkdown" = self."frame-markdown";
-  "freeFunctors" = self."free-functors";
-  "freeGame" = self."free-game";
-  "freeOperational" = self."free-operational";
-  "freeTheoremsCounterexamples" = self."free-theorems-counterexamples";
-  "freeTheorems" = self."free-theorems";
-  "freeTheoremsSeq" = self."free-theorems-seq";
-  "freeTheoremsSeqWebui" = self."free-theorems-seq-webui";
-  "freeTheoremsWebui" = self."free-theorems-webui";
-  "freetypeSimple" = self."freetype-simple";
-  "friendlyTime" = self."friendly-time";
-  "fsEvents" = self."fs-events";
-  "FTGLBytestring" = self."FTGL-bytestring";
-  "ftpConduit" = self."ftp-conduit";
-  "fullSessions" = self."full-sessions";
-  "fullTextSearch" = self."full-text-search";
-  "functionalArrow" = self."functional-arrow";
-  "functionCombine" = self."function-combine";
-  "functionInstancesAlgebra" = self."function-instances-algebra";
-  "functorApply" = self."functor-apply";
-  "functorCombo" = self."functor-combo";
-  "functorInfix" = self."functor-infix";
-  "futureResource" = self."future-resource";
-  "fuzzyTimings" = self."fuzzy-timings";
-  "gameProbability" = self."game-probability";
-  "gameTree" = self."game-tree";
-  "gangOfThreads" = self."gang-of-threads";
-  "garsiaWachs" = self."garsia-wachs";
-  "gcMonitoringWai" = self."gc-monitoring-wai";
-  "gdiffIg" = self."gdiff-ig";
-  "gdiffTh" = self."gdiff-th";
-  "geekServer" = self."geek-server";
-  "generalPrelude" = self."general-prelude";
-  "genericAeson" = self."generic-aeson";
-  "genericBinary" = self."generic-binary";
-  "genericChurch" = self."generic-church";
-  "genericDeepseq" = self."generic-deepseq";
-  "genericDeriving" = self."generic-deriving";
-  "genericLucidScaffold" = self."generic-lucid-scaffold";
-  "genericMaybe" = self."generic-maybe";
-  "genericServer" = self."generic-server";
-  "genericsSop" = self."generics-sop";
-  "genericStorable" = self."generic-storable";
-  "genericTree" = self."generic-tree";
-  "genericXml" = self."generic-xml";
-  "geniGui" = self."geni-gui";
-  "geniUtil" = self."geni-util";
-  "GeomPredicatesSSE" = self."GeomPredicates-SSE";
-  "getoptSimple" = self."getopt-simple";
-  "ghcCoreHtml" = self."ghc-core-html";
-  "ghcCore" = self."ghc-core";
-  "ghcDatasize" = self."ghc-datasize";
-  "ghcDup" = self."ghc-dup";
-  "ghcEventsAnalyze" = self."ghc-events-analyze";
-  "ghcEventsParallel" = self."ghc-events-parallel";
-  "ghcEvents" = self."ghc-events";
-  "ghcGcTune" = self."ghc-gc-tune";
-  "ghcHeapView" = self."ghc-heap-view";
-  "ghciDiagrams" = self."ghci-diagrams";
-  "ghciHaskeline" = self."ghci-haskeline";
-  "ghciLib" = self."ghci-lib";
-  "ghcImportedFrom" = self."ghc-imported-from";
-  "ghciNg" = self."ghci-ng";
-  "ghciPretty" = self."ghci-pretty";
-  "ghcjsCodemirror" = self."ghcjs-codemirror";
-  "ghcjsDomHello" = self."ghcjs-dom-hello";
-  "ghcjsDom" = self."ghcjs-dom";
-  "ghcMake" = self."ghc-make";
-  "ghcManCompletion" = self."ghc-man-completion";
-  "ghcMod" = self."ghc-mod";
-  "ghcMtl" = self."ghc-mtl";
-  "ghcParmake" = self."ghc-parmake";
-  "ghcParser" = self."ghc-parser";
-  "ghcPaths" = self."ghc-paths";
-  "ghcPkgAutofix" = self."ghc-pkg-autofix";
-  "ghcPkgLib" = self."ghc-pkg-lib";
-  "ghcPrim" = self."ghc-prim";
-  "ghcServer" = self."ghc-server";
-  "ghcSrcspanPlugin" = self."ghc-srcspan-plugin";
-  "ghcSyb" = self."ghc-syb";
-  "ghcSybUtils" = self."ghc-syb-utils";
-  "ghcTimeAllocProf" = self."ghc-time-alloc-prof";
-  "ghcVis" = self."ghc-vis";
-  "gitAll" = self."git-all";
-  "gitAnnex" = self."git-annex";
-  "gitChecklist" = self."git-checklist";
-  "gitDate" = self."git-date";
-  "gitEmbed" = self."git-embed";
-  "gitFreq" = self."git-freq";
-  "gitGpush" = self."git-gpush";
-  "githubBackup" = self."github-backup";
-  "githubPostReceive" = self."github-post-receive";
-  "githubTypes" = self."github-types";
-  "gitlibCmdline" = self."gitlib-cmdline";
-  "gitlibCross" = self."gitlib-cross";
-  "gitlibLibgit2" = self."gitlib-libgit2";
-  "gitlibS3" = self."gitlib-s3";
-  "gitlibSample" = self."gitlib-sample";
-  "gitlibTest" = self."gitlib-test";
-  "gitlibUtils" = self."gitlib-utils";
-  "gitMonitor" = self."git-monitor";
-  "gitObject" = self."git-object";
-  "gitRepair" = self."git-repair";
-  "gitSanity" = self."git-sanity";
-  "gladexmlAccessor" = self."gladexml-accessor";
-  "glCapture" = self."gl-capture";
-  "GLFWBDemo" = self."GLFW-b-demo";
-  "GLFWB" = self."GLFW-b";
-  "GLFWOGL" = self."GLFW-OGL";
-  "GLFWTask" = self."GLFW-task";
-  "gliderNlp" = self."glider-nlp";
-  "globalConfig" = self."global-config";
-  "globalLock" = self."global-lock";
-  "globalVariables" = self."global-variables";
-  "glomeHs" = self."glome-hs";
-  "glossAccelerate" = self."gloss-accelerate";
-  "glossAlgorithms" = self."gloss-algorithms";
-  "glossBanana" = self."gloss-banana";
-  "glossDevil" = self."gloss-devil";
-  "glossExamples" = self."gloss-examples";
-  "glossGame" = self."gloss-game";
-  "glossJuicy" = self."gloss-juicy";
-  "glossRasterAccelerate" = self."gloss-raster-accelerate";
-  "glossRaster" = self."gloss-raster";
-  "glossRendering" = self."gloss-rendering";
-  "glossSodium" = self."gloss-sodium";
-  "glpkHs" = self."glpk-hs";
-  "gnomeDesktop" = self."gnome-desktop";
-  "gnomeKeyring" = self."gnome-keyring";
-  "gNpm" = self."g-npm";
-  "goateeGtk" = self."goatee-gtk";
-  "goferPrelude" = self."gofer-prelude";
-  "googleDictionary" = self."google-dictionary";
-  "googleDrive" = self."google-drive";
-  "googleHtml5Slide" = self."google-html5-slide";
-  "googleMailFilters" = self."google-mail-filters";
-  "googleOauth2" = self."google-oauth2";
-  "googleSearch" = self."google-search";
-  "GotoTTransformers" = self."GotoT-transformers";
-  "GPipeCollada" = self."GPipe-Collada";
-  "GPipeExamples" = self."GPipe-Examples";
-  "GPipeTextureLoad" = self."GPipe-TextureLoad";
-  "gpxConduit" = self."gpx-conduit";
-  "grammarCombinators" = self."grammar-combinators";
-  "grapefruitExamples" = self."grapefruit-examples";
-  "grapefruitFrp" = self."grapefruit-frp";
-  "grapefruitRecords" = self."grapefruit-records";
-  "grapefruitUiGtk" = self."grapefruit-ui-gtk";
-  "grapefruitUi" = self."grapefruit-ui";
-  "graphCore" = self."graph-core";
-  "graphGenerators" = self."graph-generators";
-  "GraphHammerExamples" = self."GraphHammer-examples";
-  "graphicsDrawingcombinators" = self."graphics-drawingcombinators";
-  "graphicsFormatsCollada" = self."graphics-formats-collada";
-  "graphMatchings" = self."graph-matchings";
-  "graphRewritingCl" = self."graph-rewriting-cl";
-  "graphRewritingGl" = self."graph-rewriting-gl";
-  "graphRewritingLambdascope" = self."graph-rewriting-lambdascope";
-  "graphRewritingLayout" = self."graph-rewriting-layout";
-  "graphRewriting" = self."graph-rewriting";
-  "graphRewritingSki" = self."graph-rewriting-ski";
-  "graphRewritingStrategies" = self."graph-rewriting-strategies";
-  "graphRewritingTrs" = self."graph-rewriting-trs";
-  "graphRewritingWw" = self."graph-rewriting-ww";
-  "graphSerialize" = self."graph-serialize";
-  "graphUtils" = self."graph-utils";
-  "graphVisit" = self."graph-visit";
-  "graphWrapper" = self."graph-wrapper";
-  "grayCode" = self."gray-code";
-  "grayExtended" = self."gray-extended";
-  "greencardLib" = self."greencard-lib";
-  "gregClient" = self."greg-client";
-  "groundhogInspector" = self."groundhog-inspector";
-  "groundhogMysql" = self."groundhog-mysql";
-  "groundhogPostgresql" = self."groundhog-postgresql";
-  "groundhogSqlite" = self."groundhog-sqlite";
-  "groundhogTh" = self."groundhog-th";
-  "groupWith" = self."group-with";
-  "gruffExamples" = self."gruff-examples";
-  "gscWeighting" = self."gsc-weighting";
-  "gslRandomFu" = self."gsl-random-fu";
-  "gslRandom" = self."gsl-random";
-  "gtk2hsBuildtools" = self."gtk2hs-buildtools";
-  "gtk2hsCastGlade" = self."gtk2hs-cast-glade";
-  "gtk2hsCastGlib" = self."gtk2hs-cast-glib";
-  "gtk2hsCastGnomevfs" = self."gtk2hs-cast-gnomevfs";
-  "gtk2hsCastGtkglext" = self."gtk2hs-cast-gtkglext";
-  "gtk2hsCastGtk" = self."gtk2hs-cast-gtk";
-  "gtk2hsCastGtksourceview2" = self."gtk2hs-cast-gtksourceview2";
-  "gtk2hsCastTh" = self."gtk2hs-cast-th";
-  "gtk2hsHello" = self."gtk2hs-hello";
-  "gtk2hsRpn" = self."gtk2hs-rpn";
-  "gtk3MacIntegration" = self."gtk3-mac-integration";
-  "gtkJsinput" = self."gtk-jsinput";
-  "gtkLargeTreeStore" = self."gtk-largeTreeStore";
-  "gtkMacIntegration" = self."gtk-mac-integration";
-  "gtkSerializedEvent" = self."gtk-serialized-event";
-  "gtkSimpleListView" = self."gtk-simple-list-view";
-  "gtkToggleButtonList" = self."gtk-toggle-button-list";
-  "gtkToy" = self."gtk-toy";
-  "gtkTraymanager" = self."gtk-traymanager";
-  "gtTools" = self."gt-tools";
-  "guardedRewriting" = self."guarded-rewriting";
-  "guessCombinator" = self."guess-combinator";
-  "gutenbergFibonaccis" = self."gutenberg-fibonaccis";
-  "hacanonLight" = self."hacanon-light";
-  "hack2ContribExtra" = self."hack2-contrib-extra";
-  "hack2Contrib" = self."hack2-contrib";
-  "hack2HandlerHappstackServer" = self."hack2-handler-happstack-server";
-  "hack2HandlerMongrel2Http" = self."hack2-handler-mongrel2-http";
-  "hack2HandlerSnapServer" = self."hack2-handler-snap-server";
-  "hack2HandlerWarp" = self."hack2-handler-warp";
-  "hack2InterfaceWai" = self."hack2-interface-wai";
-  "hackageDb" = self."hackage-db";
-  "hackageDiff" = self."hackage-diff";
-  "hackagePlot" = self."hackage-plot";
-  "hackageProxy" = self."hackage-proxy";
-  "hackageServer" = self."hackage-server";
-  "hackageSparks" = self."hackage-sparks";
-  "hackContribPress" = self."hack-contrib-press";
-  "hackContrib" = self."hack-contrib";
-  "hackFrontendHappstack" = self."hack-frontend-happstack";
-  "hackFrontendMonadcgi" = self."hack-frontend-monadcgi";
-  "hackHandlerCgi" = self."hack-handler-cgi";
-  "hackHandlerEpoll" = self."hack-handler-epoll";
-  "hackHandlerEvhttp" = self."hack-handler-evhttp";
-  "hackHandlerFastcgi" = self."hack-handler-fastcgi";
-  "hackHandlerHappstack" = self."hack-handler-happstack";
-  "hackHandlerHyena" = self."hack-handler-hyena";
-  "hackHandlerKibro" = self."hack-handler-kibro";
-  "hackHandlerSimpleserver" = self."hack-handler-simpleserver";
-  "hackMiddlewareCleanpath" = self."hack-middleware-cleanpath";
-  "hackMiddlewareClientsession" = self."hack-middleware-clientsession";
-  "hackMiddlewareGzip" = self."hack-middleware-gzip";
-  "hackMiddlewareJsonp" = self."hack-middleware-jsonp";
-  "haddockApi" = self."haddock-api";
-  "haddockLeksah" = self."haddock-leksah";
-  "haddockLibrary" = self."haddock-library";
-  "hadoopFormats" = self."hadoop-formats";
-  "hadoopRpc" = self."hadoop-rpc";
-  "hadoopTools" = self."hadoop-tools";
-  "hailgunSend" = self."hailgun-send";
-  "hailsBin" = self."hails-bin";
-  "hakyllAgda" = self."hakyll-agda";
-  "hakyllBlazeTemplates" = self."hakyll-blaze-templates";
-  "hakyllContribHyphenation" = self."hakyll-contrib-hyphenation";
-  "hakyllContribLinks" = self."hakyll-contrib-links";
-  "hakyllContrib" = self."hakyll-contrib";
-  "hakyllConvert" = self."hakyll-convert";
-  "hakyllElm" = self."hakyll-elm";
-  "handaGdata" = self."handa-gdata";
-  "handaGeodata" = self."handa-geodata";
-  "handleLike" = self."handle-like";
-  "hansPcap" = self."hans-pcap";
-  "HAppSData" = self."HAppS-Data";
-  "happsHsp" = self."happs-hsp";
-  "happsHspTemplate" = self."happs-hsp-template";
-  "HAppSIxSet" = self."HAppS-IxSet";
-  "HAppSServer" = self."HAppS-Server";
-  "HAppSState" = self."HAppS-State";
-  "happstackAuthenticate" = self."happstack-authenticate";
-  "happstackAuth" = self."happstack-auth";
-  "happstackClientsession" = self."happstack-clientsession";
-  "happstackContrib" = self."happstack-contrib";
-  "happstackData" = self."happstack-data";
-  "happstackDlg" = self."happstack-dlg";
-  "happstackFacebook" = self."happstack-facebook";
-  "happstackFastcgi" = self."happstack-fastcgi";
-  "happstackFayAjax" = self."happstack-fay-ajax";
-  "happstackFay" = self."happstack-fay";
-  "happstackFoundation" = self."happstack-foundation";
-  "happstackHamlet" = self."happstack-hamlet";
-  "happstackHeist" = self."happstack-heist";
-  "happstackHelpers" = self."happstack-helpers";
-  "happstackHsp" = self."happstack-hsp";
-  "happstackHstringtemplate" = self."happstack-hstringtemplate";
-  "happstackIxset" = self."happstack-ixset";
-  "happstackJmacro" = self."happstack-jmacro";
-  "happstackLite" = self."happstack-lite";
-  "happstackMonadPeel" = self."happstack-monad-peel";
-  "happstackPlugins" = self."happstack-plugins";
-  "happstackServer" = self."happstack-server";
-  "happstackServerTls" = self."happstack-server-tls";
-  "happstackState" = self."happstack-state";
-  "happstackStaticRouting" = self."happstack-static-routing";
-  "happstackUtil" = self."happstack-util";
-  "happstackYui" = self."happstack-yui";
-  "happsTutorial" = self."happs-tutorial";
-  "HAppSUtil" = self."HAppS-Util";
-  "happybaraWebkit" = self."happybara-webkit";
-  "happybaraWebkitServer" = self."happybara-webkit-server";
-  "happyMeta" = self."happy-meta";
-  "HarmTraceBase" = self."HarmTrace-Base";
-  "hascatLib" = self."hascat-lib";
-  "hascatSetup" = self."hascat-setup";
-  "hascatSystem" = self."hascat-system";
-  "hashableExtras" = self."hashable-extras";
-  "hashableGenerics" = self."hashable-generics";
-  "hashedStorage" = self."hashed-storage";
-  "hashtablesPlus" = self."hashtables-plus";
-  "haskbotCore" = self."haskbot-core";
-  "haskelineClass" = self."haskeline-class";
-  "haskellAliyun" = self."haskell-aliyun";
-  "haskellAwk" = self."haskell-awk";
-  "haskellBcrypt" = self."haskell-bcrypt";
-  "haskellBrainfuck" = self."haskell-brainfuck";
-  "haskellCnc" = self."haskell-cnc";
-  "haskellCoffee" = self."haskell-coffee";
-  "haskellCompression" = self."haskell-compression";
-  "haskellCoursePreludes" = self."haskell-course-preludes";
-  "haskelldbConnectHdbcCatchioMtl" = self."haskelldb-connect-hdbc-catchio-mtl";
-  "haskelldbConnectHdbcCatchioTf" = self."haskelldb-connect-hdbc-catchio-tf";
-  "haskelldbConnectHdbcCatchioTransformers" = self."haskelldb-connect-hdbc-catchio-transformers";
-  "haskelldbConnectHdbcLifted" = self."haskelldb-connect-hdbc-lifted";
-  "haskelldbConnectHdbc" = self."haskelldb-connect-hdbc";
-  "haskelldbDynamic" = self."haskelldb-dynamic";
-  "haskelldbFlat" = self."haskelldb-flat";
-  "haskelldbHdbcMysql" = self."haskelldb-hdbc-mysql";
-  "haskelldbHdbcOdbc" = self."haskelldb-hdbc-odbc";
-  "haskelldbHdbcPostgresql" = self."haskelldb-hdbc-postgresql";
-  "haskelldbHdbc" = self."haskelldb-hdbc";
-  "haskelldbHdbcSqlite3" = self."haskelldb-hdbc-sqlite3";
-  "haskelldbHsqlMysql" = self."haskelldb-hsql-mysql";
-  "haskelldbHsqlOdbc" = self."haskelldb-hsql-odbc";
-  "haskelldbHsqlOracle" = self."haskelldb-hsql-oracle";
-  "haskelldbHsqlPostgresql" = self."haskelldb-hsql-postgresql";
-  "haskelldbHsql" = self."haskelldb-hsql";
-  "haskelldbHsqlSqlite3" = self."haskelldb-hsql-sqlite3";
-  "haskelldbHsqlSqlite" = self."haskelldb-hsql-sqlite";
-  "haskelldbTh" = self."haskelldb-th";
-  "haskelldbWx" = self."haskelldb-wx";
-  "haskellDocs" = self."haskell-docs";
-  "haskellFormatter" = self."haskell-formatter";
-  "haskellFtp" = self."haskell-ftp";
-  "haskellGenerate" = self."haskell-generate";
-  "haskellInSpace" = self."haskell-in-space";
-  "haskellLexer" = self."haskell-lexer";
-  "haskellModbus" = self."haskell-modbus";
-  "haskellMpi" = self."haskell-mpi";
-  "haskellNames" = self."haskell-names";
-  "haskellNeo4jClient" = self."haskell-neo4j-client";
-  "HaskellNetSSL" = self."HaskellNet-SSL";
-  "haskellOpenflow" = self."haskell-openflow";
-  "haskellPackages" = self."haskell-packages";
-  "haskellPdfPresenter" = self."haskell-pdf-presenter";
-  "haskellPlatformTest" = self."haskell-platform-test";
-  "haskellPlot" = self."haskell-plot";
-  "haskellQrencode" = self."haskell-qrencode";
-  "haskellReflect" = self."haskell-reflect";
-  "haskellSpacegoo" = self."haskell-spacegoo";
-  "haskellSrcExtsQq" = self."haskell-src-exts-qq";
-  "haskellSrcExts" = self."haskell-src-exts";
-  "haskellSrcMetaMwotton" = self."haskell-src-meta-mwotton";
-  "haskellSrcMeta" = self."haskell-src-meta";
-  "haskellSrc" = self."haskell-src";
-  "haskellTokenUtils" = self."haskell-token-utils";
-  "haskellTypeExts" = self."haskell-type-exts";
-  "haskellTypescript" = self."haskell-typescript";
-  "haskellTyrant" = self."haskell-tyrant";
-  "haskellUpdater" = self."haskell-updater";
-  "haskellXmpp" = self."haskell-xmpp";
-  "haskholCore" = self."haskhol-core";
-  "haskHome" = self."hask-home";
-  "haskoinCrypto" = self."haskoin-crypto";
-  "haskoinProtocol" = self."haskoin-protocol";
-  "haskoinScript" = self."haskoin-script";
-  "haskoinUtil" = self."haskoin-util";
-  "haskoinWallet" = self."haskoin-wallet";
-  "haskoonHttpspec" = self."haskoon-httpspec";
-  "haskoonSalvia" = self."haskoon-salvia";
-  "haskoreRealtime" = self."haskore-realtime";
-  "haskoreSupercollider" = self."haskore-supercollider";
-  "haskoreSynthesizer" = self."haskore-synthesizer";
-  "haskoreVintage" = self."haskore-vintage";
-  "hasparqlClient" = self."hasparql-client";
-  "hasqlBackend" = self."hasql-backend";
-  "hasqlPostgres" = self."hasql-postgres";
-  "hastacheAeson" = self."hastache-aeson";
-  "hasteCompiler" = self."haste-compiler";
-  "hasteMarkup" = self."haste-markup";
-  "hastePerch" = self."haste-perch";
-  "hasTh" = self."has-th";
-  "hatexGuide" = self."hatex-guide";
-  "HaTeXMeta" = self."HaTeX-meta";
-  "haxlFacebook" = self."haxl-facebook";
-  "haxrTh" = self."haxr-th";
-  "hayooCli" = self."hayoo-cli";
-  "hBDDCUDD" = self."hBDD-CUDD";
-  "hBooru" = self."h-booru";
-  "hbroContrib" = self."hbro-contrib";
-  "hcgMinusCairo" = self."hcg-minus-cairo";
-  "hcgMinus" = self."hcg-minus";
-  "hdaemonizeBuildfix" = self."hdaemonize-buildfix";
-  "HDBCMysql" = self."HDBC-mysql";
-  "HDBCOdbc" = self."HDBC-odbc";
-  "hdbcPostgresqlHstore" = self."hdbc-postgresql-hstore";
-  "HDBCPostgresqlHstore" = self."HDBC-postgresql-hstore";
-  "HDBCPostgresql" = self."HDBC-postgresql";
-  "HDBCSession" = self."HDBC-session";
-  "HDBCSqlite3" = self."HDBC-sqlite3";
-  "hdbcTuple" = self."hdbc-tuple";
-  "hdbiConduit" = self."hdbi-conduit";
-  "hdbiPostgresql" = self."hdbi-postgresql";
-  "hdbiSqlite" = self."hdbi-sqlite";
-  "hdbiTests" = self."hdbi-tests";
-  "hdphClosure" = self."hdph-closure";
-  "hebrewTime" = self."hebrew-time";
-  "hedisPile" = self."hedis-pile";
-  "hedisSimple" = self."hedis-simple";
-  "hedisTags" = self."hedis-tags";
-  "heistAeson" = self."heist-aeson";
-  "heistAsync" = self."heist-async";
-  "helicsWai" = self."helics-wai";
-  "helpEsb" = self."help-esb";
-  "hemkayCore" = self."hemkay-core";
-  "herLexerParsec" = self."her-lexer-parsec";
-  "herLexer" = self."her-lexer";
-  "hermitSyb" = self."hermit-syb";
-  "herringboneEmbed" = self."herringbone-embed";
-  "herringboneWai" = self."herringbone-wai";
-  "heteroMap" = self."hetero-map";
-  "hevolisaDph" = self."hevolisa-dph";
-  "hexpatIteratee" = self."hexpat-iteratee";
-  "hexpatLens" = self."hexpat-lens";
-  "hexpatPickleGeneric" = self."hexpat-pickle-generic";
-  "hexpatPickle" = self."hexpat-pickle";
-  "hexpatTagsoup" = self."hexpat-tagsoup";
-  "HGamer3DAPI" = self."HGamer3D-API";
-  "HGamer3DAudio" = self."HGamer3D-Audio";
-  "HGamer3DBulletBinding" = self."HGamer3D-Bullet-Binding";
-  "HGamer3DCAudioBinding" = self."HGamer3D-CAudio-Binding";
-  "HGamer3DCEGUIBinding" = self."HGamer3D-CEGUI-Binding";
-  "HGamer3DData" = self."HGamer3D-Data";
-  "HGamer3DEnetBinding" = self."HGamer3D-Enet-Binding";
-  "HGamer3DGraphics3D" = self."HGamer3D-Graphics3D";
-  "HGamer3DGUI" = self."HGamer3D-GUI";
-  "HGamer3DInputSystem" = self."HGamer3D-InputSystem";
-  "HGamer3DNetwork" = self."HGamer3D-Network";
-  "HGamer3DOgreBinding" = self."HGamer3D-Ogre-Binding";
-  "HGamer3DOISBinding" = self."HGamer3D-OIS-Binding";
-  "HGamer3DSDL2Binding" = self."HGamer3D-SDL2-Binding";
-  "HGamer3DSFMLBinding" = self."HGamer3D-SFML-Binding";
-  "HGamer3DWinEvent" = self."HGamer3D-WinEvent";
-  "HGamer3DWire" = self."HGamer3D-Wire";
-  "hgBuildpackage" = self."hg-buildpackage";
-  "hglExample" = self."hgl-example";
-  "hGpgme" = self."h-gpgme";
-  "hierarchicalClusteringDiagrams" = self."hierarchical-clustering-diagrams";
-  "hierarchicalClustering" = self."hierarchical-clustering";
-  "hierarchicalExceptions" = self."hierarchical-exceptions";
-  "higherLeveldb" = self."higher-leveldb";
-  "highlightingKate" = self."highlighting-kate";
-  "highlightVersions" = self."highlight-versions";
-  "hinduceAssociationsApriori" = self."hinduce-associations-apriori";
-  "hinduceClassifierDecisiontree" = self."hinduce-classifier-decisiontree";
-  "hinduceClassifier" = self."hinduce-classifier";
-  "hinduceExamples" = self."hinduce-examples";
-  "hinduceMissingh" = self."hinduce-missingh";
-  "hintServer" = self."hint-server";
-  "hinzeStreams" = self."hinze-streams";
-  "histogramFillBinary" = self."histogram-fill-binary";
-  "histogramFillCereal" = self."histogram-fill-cereal";
-  "histogramFill" = self."histogram-fill";
-  "histPlDawg" = self."hist-pl-dawg";
-  "histPlFusion" = self."hist-pl-fusion";
-  "histPlLexicon" = self."hist-pl-lexicon";
-  "histPlLmf" = self."hist-pl-lmf";
-  "histPl" = self."hist-pl";
-  "histPlTransliter" = self."hist-pl-transliter";
-  "histPlTypes" = self."hist-pl-types";
-  "hjsonQuery" = self."hjson-query";
-  "HLearnAlgebra" = self."HLearn-algebra";
-  "HLearnApproximation" = self."HLearn-approximation";
-  "HLearnClassification" = self."HLearn-classification";
-  "HLearnDatastructures" = self."HLearn-datastructures";
-  "HLearnDistributions" = self."HLearn-distributions";
-  "hledgerChart" = self."hledger-chart";
-  "hledgerDiff" = self."hledger-diff";
-  "hledgerInterest" = self."hledger-interest";
-  "hledgerIrr" = self."hledger-irr";
-  "hledgerLib" = self."hledger-lib";
-  "hledgerVty" = self."hledger-vty";
-  "hledgerWeb" = self."hledger-web";
-  "hmatrixBanded" = self."hmatrix-banded";
-  "hmatrixCsv" = self."hmatrix-csv";
-  "hmatrixGlpk" = self."hmatrix-glpk";
-  "hmatrixGsl" = self."hmatrix-gsl";
-  "hmatrixGslStats" = self."hmatrix-gsl-stats";
-  "hmatrixMmap" = self."hmatrix-mmap";
-  "hmatrixNipals" = self."hmatrix-nipals";
-  "hmatrixQuadprogpp" = self."hmatrix-quadprogpp";
-  "hmatrixRepa" = self."hmatrix-repa";
-  "hmatrixSpecial" = self."hmatrix-special";
-  "hmatrixStatic" = self."hmatrix-static";
-  "hmatrixSvdlibc" = self."hmatrix-svdlibc";
-  "hmatrixSyntax" = self."hmatrix-syntax";
-  "hmatrixTests" = self."hmatrix-tests";
-  "hmeapUtils" = self."hmeap-utils";
-  "hmtDiagrams" = self."hmt-diagrams";
-  "hofixMtl" = self."hofix-mtl";
-  "hogreExamples" = self."hogre-examples";
-  "hoistError" = self."hoist-error";
-  "holdEm" = self."hold-em";
-  "holeyFormat" = self."holey-format";
-  "HolumbusDistribution" = self."Holumbus-Distribution";
-  "HolumbusMapReduce" = self."Holumbus-MapReduce";
-  "HolumbusSearchengine" = self."Holumbus-Searchengine";
-  "HolumbusStorage" = self."Holumbus-Storage";
-  "holyProject" = self."holy-project";
-  "hommageDs" = self."hommage-ds";
-  "hoodleBuilder" = self."hoodle-builder";
-  "hoodleCore" = self."hoodle-core";
-  "hoodleExtra" = self."hoodle-extra";
-  "hoodleParser" = self."hoodle-parser";
-  "hoodlePublish" = self."hoodle-publish";
-  "hoodleRender" = self."hoodle-render";
-  "hoodleTypes" = self."hoodle-types";
-  "hoodOff" = self."hood-off";
-  "hoogleIndex" = self."hoogle-index";
-  "hooksDir" = self."hooks-dir";
-  "hopenpgpTools" = self."hopenpgp-tools";
-  "hopfieldNetworks" = self."hopfield-networks";
-  "hoscJson" = self."hosc-json";
-  "hoscUtils" = self."hosc-utils";
-  "hostnameValidate" = self."hostname-validate";
-  "hostsServer" = self."hosts-server";
-  "hp2anyCore" = self."hp2any-core";
-  "hp2anyGraph" = self."hp2any-graph";
-  "hp2anyManager" = self."hp2any-manager";
-  "hpacoLib" = self."hpaco-lib";
-  "hpcCoveralls" = self."hpc-coveralls";
-  "hpcStrobe" = self."hpc-strobe";
-  "hpcTracer" = self."hpc-tracer";
-  "hPDBExamples" = self."hPDB-examples";
-  "hprotocFork" = self."hprotoc-fork";
-  "hpsCairo" = self."hps-cairo";
-  "hpsKmeans" = self."hps-kmeans";
-  "HROOTCore" = self."HROOT-core";
-  "HROOTGraf" = self."HROOT-graf";
-  "HROOTHist" = self."HROOT-hist";
-  "HROOTIo" = self."HROOT-io";
-  "HROOTMath" = self."HROOT-math";
-  "hsbencherCodespeed" = self."hsbencher-codespeed";
-  "hsbencherFusion" = self."hsbencher-fusion";
-  "hsBibutils" = self."hs-bibutils";
-  "hsBlake2" = self."hs-blake2";
-  "hsc3Auditor" = self."hsc3-auditor";
-  "hsc3Cairo" = self."hsc3-cairo";
-  "hsc3Data" = self."hsc3-data";
-  "hsc3Db" = self."hsc3-db";
-  "hsc3Dot" = self."hsc3-dot";
-  "hsc3Forth" = self."hsc3-forth";
-  "hsc3Graphs" = self."hsc3-graphs";
-  "hsc3Lang" = self."hsc3-lang";
-  "hsc3Lisp" = self."hsc3-lisp";
-  "hsc3Plot" = self."hsc3-plot";
-  "hsc3Process" = self."hsc3-process";
-  "hsc3Rec" = self."hsc3-rec";
-  "hsc3Rw" = self."hsc3-rw";
-  "hsc3Server" = self."hsc3-server";
-  "hsc3SfHsndfile" = self."hsc3-sf-hsndfile";
-  "hsc3Sf" = self."hsc3-sf";
-  "hsc3Unsafe" = self."hsc3-unsafe";
-  "hsc3Utils" = self."hsc3-utils";
-  "hsCaptcha" = self."hs-captcha";
-  "hsCarbonExamples" = self."hs-carbon-examples";
-  "hsCarbon" = self."hs-carbon";
-  "hsCdb" = self."hs-cdb";
-  "hscursesFishEx" = self."hscurses-fish-ex";
-  "hsdnsCache" = self."hsdns-cache";
-  "hsDotnet" = self."hs-dotnet";
-  "hseCpp" = self."hse-cpp";
-  "hsemailNs" = self."hsemail-ns";
-  "hsExcelx" = self."hs-excelx";
-  "hsFfmpeg" = self."hs-ffmpeg";
-  "hsFltk" = self."hs-fltk";
-  "hsGchart" = self."hs-gchart";
-  "hsGenIface" = self."hs-gen-iface";
-  "hsGeoIP" = self."hs-GeoIP";
-  "hsGizapp" = self."hs-gizapp";
-  "hsgnutlsYj" = self."hsgnutls-yj";
-  "hsJava" = self."hs-java";
-  "hsJsonRpc" = self."hs-json-rpc";
-  "hsloggerTemplate" = self."hslogger-template";
-  "hsLogo" = self."hs-logo";
-  "hsMesos" = self."hs-mesos";
-  "hsndfileStorablevector" = self."hsndfile-storablevector";
-  "hsndfileVector" = self."hsndfile-vector";
-  "hsNombreGenerator" = self."hs-nombre-generator";
-  "hspCgi" = self."hsp-cgi";
-  "hspecAttoparsec" = self."hspec-attoparsec";
-  "hspecCheckers" = self."hspec-checkers";
-  "hspecContrib" = self."hspec-contrib";
-  "hspecCore" = self."hspec-core";
-  "hspecDiscover" = self."hspec-discover";
-  "hspecExpectationsLens" = self."hspec-expectations-lens";
-  "hspecExpectationsLifted" = self."hspec-expectations-lifted";
-  "hspecExpectationsPretty" = self."hspec-expectations-pretty";
-  "hspecExpectations" = self."hspec-expectations";
-  "hspecExperimental" = self."hspec-experimental";
-  "hspecJenkins" = self."hspec-jenkins";
-  "hspecLaws" = self."hspec-laws";
-  "hspecMeta" = self."hspec-meta";
-  "hspecShouldbe" = self."hspec-shouldbe";
-  "hspecSmallcheck" = self."hspec-smallcheck";
-  "hspecSnap" = self."hspec-snap";
-  "hspecTestFramework" = self."hspec-test-framework";
-  "hspecTestFrameworkTh" = self."hspec-test-framework-th";
-  "hspecWaiJson" = self."hspec-wai-json";
-  "hspecWai" = self."hspec-wai";
-  "hspecWebdriver" = self."hspec-webdriver";
-  "hsPgms" = self."hs-pgms";
-  "hsPhpSession" = self."hs-php-session";
-  "hsPkpass" = self."hs-pkpass";
-  "hsprSh" = self."hspr-sh";
-  "hsqlMysql" = self."hsql-mysql";
-  "hsqlOdbc" = self."hsql-odbc";
-  "hsqlPostgresql" = self."hsql-postgresql";
-  "hsqlSqlite3" = self."hsql-sqlite3";
-  "hsqmlDemoMorris" = self."hsqml-demo-morris";
-  "hsqmlDemoNotes" = self."hsqml-demo-notes";
-  "hsqmlDemoSamples" = self."hsqml-demo-samples";
-  "hsqmlMorris" = self."hsqml-morris";
-  "hsTwitterarchiver" = self."hs-twitterarchiver";
-  "hsTwitter" = self."hs-twitter";
-  "hsVcard" = self."hs-vcard";
-  "hsxJmacro" = self."hsx-jmacro";
-  "hsxXhtml" = self."hsx-xhtml";
-  "htmlConduit" = self."html-conduit";
-  "htmlKure" = self."html-kure";
-  "htmlMinimalist" = self."html-minimalist";
-  "htmlRules" = self."html-rules";
-  "htmlTruncate" = self."html-truncate";
-  "htsnCommon" = self."htsn-common";
-  "htsnImport" = self."htsn-import";
-  "httpAccept" = self."http-accept";
-  "httpAttoparsec" = self."http-attoparsec";
-  "httpClientAuth" = self."http-client-auth";
-  "httpClientConduit" = self."http-client-conduit";
-  "httpClientLens" = self."http-client-lens";
-  "httpClientMultipart" = self."http-client-multipart";
-  "httpClientOpenssl" = self."http-client-openssl";
-  "httpClientRequestModifiers" = self."http-client-request-modifiers";
-  "httpClient" = self."http-client";
-  "httpClientTls" = self."http-client-tls";
-  "httpCommon" = self."http-common";
-  "httpConduitBrowser" = self."http-conduit-browser";
-  "httpConduitDownloader" = self."http-conduit-downloader";
-  "httpConduit" = self."http-conduit";
-  "httpDate" = self."http-date";
-  "httpdShed" = self."httpd-shed";
-  "httpEncodings" = self."http-encodings";
-  "httpEnumerator" = self."http-enumerator";
-  "httpKit" = self."http-kit";
-  "httpLinkHeader" = self."http-link-header";
-  "httpMedia" = self."http-media";
-  "httpMonad" = self."http-monad";
-  "httpProxy" = self."http-proxy";
-  "httpQuerystring" = self."http-querystring";
-  "httpReverseProxy" = self."http-reverse-proxy";
-  "httpServer" = self."http-server";
-  "httpsEverywhereRulesRaw" = self."https-everywhere-rules-raw";
-  "httpsEverywhereRules" = self."https-everywhere-rules";
-  "httpShed" = self."http-shed";
-  "HTTPSimple" = self."HTTP-Simple";
-  "httpStreams" = self."http-streams";
-  "httpTest" = self."http-test";
-  "httpTypes" = self."http-types";
-  "httpWget" = self."http-wget";
-  "HungarianMunkres" = self."Hungarian-Munkres";
-  "HUnitApprox" = self."HUnit-approx";
-  "HUnitDiff" = self."HUnit-Diff";
-  "hunitGui" = self."hunit-gui";
-  "hunitParsec" = self."hunit-parsec";
-  "HUnitPlus" = self."HUnit-Plus";
-  "hunitRematch" = self."hunit-rematch";
-  "huskSchemeLibs" = self."husk-scheme-libs";
-  "huskScheme" = self."husk-scheme";
-  "hwallAuthIitk" = self."hwall-auth-iitk";
-  "hxtBinary" = self."hxt-binary";
-  "hxtCache" = self."hxt-cache";
-  "hxtCharproperties" = self."hxt-charproperties";
-  "hxtCss" = self."hxt-css";
-  "hxtCurl" = self."hxt-curl";
-  "hxtExpat" = self."hxt-expat";
-  "hxtExtras" = self."hxt-extras";
-  "hxtFilter" = self."hxt-filter";
-  "hxtHttp" = self."hxt-http";
-  "hxtPickleUtils" = self."hxt-pickle-utils";
-  "hxtRegexXmlschema" = self."hxt-regex-xmlschema";
-  "hxtRelaxng" = self."hxt-relaxng";
-  "hxtTagsoup" = self."hxt-tagsoup";
-  "hxtUnicode" = self."hxt-unicode";
-  "hxtXpath" = self."hxt-xpath";
-  "hxtXslt" = self."hxt-xslt";
-  "hybridVectors" = self."hybrid-vectors";
-  "hydraHs" = self."hydra-hs";
-  "hydraPrint" = self."hydra-print";
-  "hydrogenData" = self."hydrogen-data";
-  "hydrogenPrelude" = self."hydrogen-prelude";
-  "hydrogenSyntax" = self."hydrogen-syntax";
-  "hydrogenUtil" = self."hydrogen-util";
-  "hydrogenVersion" = self."hydrogen-version";
-  "ideasMath" = self."ideas-math";
-  "ieee754Parser" = self."ieee754-parser";
-  "ieeeUtils" = self."ieee-utils";
-  "ieeeUtilsTempfix" = self."ieee-utils-tempfix";
-  "igeMacIntegration" = self."ige-mac-integration";
-  "ihaskellAeson" = self."ihaskell-aeson";
-  "ihaskellBlaze" = self."ihaskell-blaze";
-  "ihaskellCharts" = self."ihaskell-charts";
-  "ihaskellDiagrams" = self."ihaskell-diagrams";
-  "ihaskellDisplay" = self."ihaskell-display";
-  "ihaskellMagic" = self."ihaskell-magic";
-  "imagesizeConduit" = self."imagesize-conduit";
-  "imageType" = self."image-type";
-  "implicitParams" = self."implicit-params";
-  "includeFile" = self."include-file";
-  "incRef" = self."inc-ref";
-  "incrementalParser" = self."incremental-parser";
-  "incrementalSatSolver" = self."incremental-sat-solver";
-  "indexCore" = self."index-core";
-  "indexedDoNotation" = self."indexed-do-notation";
-  "indexedExtras" = self."indexed-extras";
-  "indexedFree" = self."indexed-free";
-  "indianLanguageFontConverter" = self."indian-language-font-converter";
-  "inferUpstream" = self."infer-upstream";
-  "infiniteSearch" = self."infinite-search";
-  "injectFunction" = self."inject-function";
-  "inspectionProxy" = self."inspection-proxy";
-  "instantGenerics" = self."instant-generics";
-  "instantZipper" = self."instant-zipper";
-  "instrumentChord" = self."instrument-chord";
-  "intCast" = self."int-cast";
-  "integerGmp" = self."integer-gmp";
-  "integerPure" = self."integer-pure";
-  "intelAes" = self."intel-aes";
-  "interpolatedstringPerl6" = self."interpolatedstring-perl6";
-  "interpolatedstringQqMwotton" = self."interpolatedstring-qq-mwotton";
-  "interpolatedstringQq" = self."interpolatedstring-qq";
-  "InterpolationMaxs" = self."Interpolation-maxs";
-  "invertibleSyntax" = self."invertible-syntax";
-  "ioCapture" = self."io-capture";
-  "ioChoice" = self."io-choice";
-  "ioManager" = self."io-manager";
-  "ioMemoize" = self."io-memoize";
-  "ioReactive" = self."io-reactive";
-  "ioStorage" = self."io-storage";
-  "ioStreams" = self."io-streams";
-  "ioThrottle" = self."io-throttle";
-  "ipoptHs" = self."ipopt-hs";
-  "iptablesHelpers" = self."iptables-helpers";
-  "ipythonKernel" = self."ipython-kernel";
-  "ircBytestring" = self."irc-bytestring";
-  "ircConduit" = self."irc-conduit";
-  "ircCtcp" = self."irc-ctcp";
-  "iso3166CountryCodes" = self."iso3166-country-codes";
-  "iso8583Bitmaps" = self."iso8583-bitmaps";
-  "iso8601Time" = self."iso8601-time";
-  "itaniumAbi" = self."itanium-abi";
-  "iterateeCompress" = self."iteratee-compress";
-  "iterateeMtl" = self."iteratee-mtl";
-  "iterateeParsec" = self."iteratee-parsec";
-  "iterateeStm" = self."iteratee-stm";
-  "iterioServer" = self."iterio-server";
-  "iterStats" = self."iter-stats";
-  "ivarSimple" = self."ivar-simple";
-  "ivoryBackendC" = self."ivory-backend-c";
-  "ivoryBitdata" = self."ivory-bitdata";
-  "ivoryExamples" = self."ivory-examples";
-  "ivoryHw" = self."ivory-hw";
-  "ivoryOpts" = self."ivory-opts";
-  "ivoryQuickcheck" = self."ivory-quickcheck";
-  "ivoryStdlib" = self."ivory-stdlib";
-  "ivyWeb" = self."ivy-web";
-  "ixsetTyped" = self."ixset-typed";
-  "ixShapable" = self."ix-shapable";
-  "jackBindings" = self."jack-bindings";
-  "jacobiRoots" = self."jacobi-roots";
-  "jailbreakCabal" = self."jailbreak-cabal";
-  "javaBridgeExtras" = self."java-bridge-extras";
-  "javaBridge" = self."java-bridge";
-  "javaCharacter" = self."java-character";
-  "javaReflect" = self."java-reflect";
-  "jcdecauxVls" = self."jcdecaux-vls";
-  "jmacroRpcHappstack" = self."jmacro-rpc-happstack";
-  "jmacroRpc" = self."jmacro-rpc";
-  "jmacroRpcSnap" = self."jmacro-rpc-snap";
-  "joseJwt" = self."jose-jwt";
-  "jsaddleHello" = self."jsaddle-hello";
-  "jsFlot" = self."js-flot";
-  "jsGoodParts" = self."js-good-parts";
-  "jsJquery" = self."js-jquery";
-  "json2Hdbc" = self."json2-hdbc";
-  "json2Types" = self."json2-types";
-  "jsonAssertions" = self."json-assertions";
-  "jsonAutotype" = self."json-autotype";
-  "jsonB" = self."json-b";
-  "jsonBuilder" = self."json-builder";
-  "JSONCombinatorExamples" = self."JSON-Combinator-Examples";
-  "JSONCombinator" = self."JSON-Combinator";
-  "jsonEnumerator" = self."json-enumerator";
-  "jsonExtra" = self."json-extra";
-  "jsonFu" = self."json-fu";
-  "jsonPython" = self."json-python";
-  "jsonQq" = self."json-qq";
-  "jsonrpcConduit" = self."jsonrpc-conduit";
-  "jsonRpc" = self."json-rpc";
-  "jsonRpcServer" = self."json-rpc-server";
-  "jsonSchema" = self."json-schema";
-  "jsonSop" = self."json-sop";
-  "jsonTools" = self."json-tools";
-  "jsonTypes" = self."json-types";
-  "JuicyPixelsCanvas" = self."JuicyPixels-canvas";
-  "JuicyPixelsRepa" = self."JuicyPixels-repa";
-  "JuicyPixelsUtil" = self."JuicyPixels-util";
-  "JunkDBDriverGdbm" = self."JunkDB-driver-gdbm";
-  "JunkDBDriverHashtables" = self."JunkDB-driver-hashtables";
-  "jvmParser" = self."jvm-parser";
-  "JYUUtils" = self."JYU-Utils";
-  "kanExtensions" = self."kan-extensions";
-  "kansasComet" = self."kansas-comet";
-  "kansasLavaCores" = self."kansas-lava-cores";
-  "kansasLavaPapilio" = self."kansas-lava-papilio";
-  "kansasLava" = self."kansas-lava";
-  "kansasLavaShake" = self."kansas-lava-shake";
-  "kbqGu" = self."kbq-gu";
-  "kdesrcBuildExtra" = self."kdesrc-build-extra";
-  "kdTree" = self."kd-tree";
-  "kicadData" = self."kicad-data";
-  "kickassTorrentsDumpParser" = self."kickass-torrents-dump-parser";
-  "KiCSDebugger" = self."KiCS-debugger";
-  "KiCSProphecy" = self."KiCS-prophecy";
-  "kifParser" = self."kif-parser";
-  "kmeansPar" = self."kmeans-par";
-  "kmeansVector" = self."kmeans-vector";
-  "koellnerPhonetic" = self."koellner-phonetic";
-  "kontrakcjaTemplates" = self."kontrakcja-templates";
-  "koofrClient" = self."koofr-client";
-  "ksTest" = self."ks-test";
-  "kureYourBoilerplate" = self."kure-your-boilerplate";
-  "labeledGraph" = self."labeled-graph";
-  "labeledTree" = self."labeled-tree";
-  "laborantinHs" = self."laborantin-hs";
-  "labyrinthServer" = self."labyrinth-server";
-  "lambdaAst" = self."lambda-ast";
-  "lambdabotUtils" = self."lambdabot-utils";
-  "lambdaBridge" = self."lambda-bridge";
-  "lambdaCanvas" = self."lambda-canvas";
-  "lambdacubeBullet" = self."lambdacube-bullet";
-  "lambdacubeCore" = self."lambdacube-core";
-  "lambdacubeEdsl" = self."lambdacube-edsl";
-  "lambdacubeEngine" = self."lambdacube-engine";
-  "lambdacubeExamples" = self."lambdacube-examples";
-  "lambdacubeGl" = self."lambdacube-gl";
-  "lambdacubeSamples" = self."lambdacube-samples";
-  "lambdaDevs" = self."lambda-devs";
-  "lambdaPlaceholders" = self."lambda-placeholders";
-  "lambdaToolbox" = self."lambda-toolbox";
-  "lameTester" = self."lame-tester";
-  "languageAsn1" = self."language-asn1";
-  "languageBash" = self."language-bash";
-  "languageBoogie" = self."language-boogie";
-  "languageCComments" = self."language-c-comments";
-  "languageCil" = self."language-cil";
-  "languageCInline" = self."language-c-inline";
-  "languageCQuote" = self."language-c-quote";
-  "languageC" = self."language-c";
-  "languageCss" = self."language-css";
-  "languageDot" = self."language-dot";
-  "languageEcmascriptAnalysis" = self."language-ecmascript-analysis";
-  "languageEcmascript" = self."language-ecmascript";
-  "languageEiffel" = self."language-eiffel";
-  "languageFortran" = self."language-fortran";
-  "languageGcl" = self."language-gcl";
-  "languageGlsl" = self."language-glsl";
-  "languageGo" = self."language-go";
-  "languageGuess" = self."language-guess";
-  "languageHaskellExtract" = self."language-haskell-extract";
-  "languageJavaClassfile" = self."language-java-classfile";
-  "languageJavascript" = self."language-javascript";
-  "languageJava" = self."language-java";
-  "languageLua" = self."language-lua";
-  "languageMixal" = self."language-mixal";
-  "languageObjc" = self."language-objc";
-  "languageOpenscad" = self."language-openscad";
-  "languagePig" = self."language-pig";
-  "languagePuppet" = self."language-puppet";
-  "languagePythonColour" = self."language-python-colour";
-  "languagePython" = self."language-python";
-  "languageSh" = self."language-sh";
-  "languageSlice" = self."language-slice";
-  "languageSpelling" = self."language-spelling";
-  "languageSqlite" = self."language-sqlite";
-  "languageTypescript" = self."language-typescript";
-  "latestNpmVersion" = self."latest-npm-version";
-  "launchpadControl" = self."launchpad-control";
-  "layersGame" = self."layers-game";
-  "layoutBootstrap" = self."layout-bootstrap";
-  "lazyCsv" = self."lazy-csv";
-  "lazyIo" = self."lazy-io";
-  "lBfgsB" = self."l-bfgs-b";
-  "leankitApi" = self."leankit-api";
-  "leapsecondsAnnounced" = self."leapseconds-announced";
-  "learningHmm" = self."learning-hmm";
-  "learnPhysicsExamples" = self."learn-physics-examples";
-  "learnPhysics" = self."learn-physics";
-  "leksahServer" = self."leksah-server";
-  "lensAeson" = self."lens-aeson";
-  "lensDatetime" = self."lens-datetime";
-  "lensFamilyCore" = self."lens-family-core";
-  "lensFamily" = self."lens-family";
-  "lensFamilyTh" = self."lens-family-th";
-  "lensProperties" = self."lens-properties";
-  "lensSop" = self."lens-sop";
-  "lensTextEncoding" = self."lens-text-encoding";
-  "lensTime" = self."lens-time";
-  "leveldbHaskellFork" = self."leveldb-haskell-fork";
-  "leveldbHaskell" = self."leveldb-haskell";
-  "levelMonad" = self."level-monad";
-  "levmarChart" = self."levmar-chart";
-  "lhs2TeXHl" = self."lhs2TeX-hl";
-  "libarchiveConduit" = self."libarchive-conduit";
-  "liblinearEnumerator" = self."liblinear-enumerator";
-  "libssh2Conduit" = self."libssh2-conduit";
-  "libsystemdDaemon" = self."libsystemd-daemon";
-  "libsystemdJournal" = self."libsystemd-journal";
-  "libvirtHs" = self."libvirt-hs";
-  "libxmlEnumerator" = self."libxml-enumerator";
-  "libxmlSax" = self."libxml-sax";
-  "liftedAsync" = self."lifted-async";
-  "liftedBase" = self."lifted-base";
-  "lighttpdConfQq" = self."lighttpd-conf-qq";
-  "lighttpdConf" = self."lighttpd-conf";
-  "limpCbc" = self."limp-cbc";
-  "linAlg" = self."lin-alg";
-  "linearAccelerate" = self."linear-accelerate";
-  "linearAlgebraCblas" = self."linear-algebra-cblas";
-  "linearMaps" = self."linear-maps";
-  "linearOpengl" = self."linear-opengl";
-  "linearVect" = self."linear-vect";
-  "linguisticOrdinals" = self."linguistic-ordinals";
-  "linuxBlkid" = self."linux-blkid";
-  "linuxCgroup" = self."linux-cgroup";
-  "linuxEvdev" = self."linux-evdev";
-  "linuxFileExtents" = self."linux-file-extents";
-  "linuxInotify" = self."linux-inotify";
-  "linuxKmod" = self."linux-kmod";
-  "linuxMount" = self."linux-mount";
-  "linuxNamespaces" = self."linux-namespaces";
-  "linuxPerf" = self."linux-perf";
-  "linuxPtrace" = self."linux-ptrace";
-  "linuxXattr" = self."linux-xattr";
-  "linxGateway" = self."linx-gateway";
-  "lioEci11" = self."lio-eci11";
-  "lioFs" = self."lio-fs";
-  "lioSimple" = self."lio-simple";
-  "liquidFixpoint" = self."liquid-fixpoint";
-  "listExtras" = self."list-extras";
-  "listFusionProbe" = self."list-fusion-probe";
-  "listGrouping" = self."list-grouping";
-  "listlikeInstances" = self."listlike-instances";
-  "listMux" = self."list-mux";
-  "listRemoteForwards" = self."list-remote-forwards";
-  "listTries" = self."list-tries";
-  "listT" = self."list-t";
-  "liveSequencer" = self."live-sequencer";
-  "llvmAnalysis" = self."llvm-analysis";
-  "llvmBase" = self."llvm-base";
-  "llvmBaseTypes" = self."llvm-base-types";
-  "llvmBaseUtil" = self."llvm-base-util";
-  "llvmDataInterop" = self."llvm-data-interop";
-  "llvmExtra" = self."llvm-extra";
-  "llvmGeneralPure" = self."llvm-general-pure";
-  "llvmGeneralQuote" = self."llvm-general-quote";
-  "llvmGeneral" = self."llvm-general";
-  "llvmHt" = self."llvm-ht";
-  "llvmPkgConfig" = self."llvm-pkg-config";
-  "llvmPrettyBcParser" = self."llvm-pretty-bc-parser";
-  "llvmPretty" = self."llvm-pretty";
-  "llvmTf" = self."llvm-tf";
-  "llvmTools" = self."llvm-tools";
-  "loadEnv" = self."load-env";
-  "localAddress" = self."local-address";
-  "localSearch" = self."local-search";
-  "lochTh" = self."loch-th";
-  "lockfreeQueue" = self."lockfree-queue";
-  "logDomain" = self."log-domain";
-  "logEffect" = self."log-effect";
-  "loggingFacadeJournald" = self."logging-facade-journald";
-  "loggingFacade" = self."logging-facade";
-  "logicClasses" = self."logic-classes";
-  "LogicGrowsOnTreesMPI" = self."LogicGrowsOnTrees-MPI";
-  "LogicGrowsOnTreesNetwork" = self."LogicGrowsOnTrees-network";
-  "LogicGrowsOnTreesProcesses" = self."LogicGrowsOnTrees-processes";
-  "logicTPTP" = self."logic-TPTP";
-  "loopEffin" = self."loop-effin";
-  "loopWhile" = self."loop-while";
-  "LSeed" = self."L-seed";
-  "lsUsb" = self."ls-usb";
-  "luaBytecode" = self."lua-bytecode";
-  "lzmaConduit" = self."lzma-conduit";
-  "lzmaEnumerator" = self."lzma-enumerator";
-  "machinesDirectory" = self."machines-directory";
-  "machinesIo" = self."machines-io";
-  "machinesProcess" = self."machines-process";
-  "macosxMakeStandalone" = self."macosx-make-standalone";
-  "mailboxCount" = self."mailbox-count";
-  "mailchimpSubscribe" = self."mailchimp-subscribe";
-  "mainlandPretty" = self."mainland-pretty";
-  "makeHardLinks" = self."make-hard-links";
-  "makePackage" = self."make-package";
-  "manateeAll" = self."manatee-all";
-  "manateeAnything" = self."manatee-anything";
-  "manateeBrowser" = self."manatee-browser";
-  "manateeCore" = self."manatee-core";
-  "manateeCurl" = self."manatee-curl";
-  "manateeEditor" = self."manatee-editor";
-  "manateeFilemanager" = self."manatee-filemanager";
-  "manateeImageviewer" = self."manatee-imageviewer";
-  "manateeIrcclient" = self."manatee-ircclient";
-  "manateeMplayer" = self."manatee-mplayer";
-  "manateePdfviewer" = self."manatee-pdfviewer";
-  "manateeProcessmanager" = self."manatee-processmanager";
-  "manateeReader" = self."manatee-reader";
-  "manateeTemplate" = self."manatee-template";
-  "manateeTerminal" = self."manatee-terminal";
-  "manateeWelcome" = self."manatee-welcome";
-  "mapSyntax" = self."map-syntax";
-  "markdownKate" = self."markdown-kate";
-  "markdownPap" = self."markdown-pap";
-  "markdownUnlit" = self."markdown-unlit";
-  "markedPretty" = self."marked-pretty";
-  "markovChain" = self."markov-chain";
-  "markovProcesses" = self."markov-processes";
-  "markupPreview" = self."markup-preview";
-  "marmaladeUpload" = self."marmalade-upload";
-  "masakazuBot" = self."masakazu-bot";
-  "mathFunctions" = self."math-functions";
-  "matrixMarketPure" = self."matrix-market-pure";
-  "matrixMarket" = self."matrix-market";
-  "maximalCliques" = self."maximal-cliques";
-  "MaybeTMonadsTf" = self."MaybeT-monads-tf";
-  "MaybeTTransformers" = self."MaybeT-transformers";
-  "mboxTools" = self."mbox-tools";
-  "MCFoldDP" = self."MC-Fold-DP";
-  "mcmasterGlossExamples" = self."mcmaster-gloss-examples";
-  "mcmcSamplers" = self."mcmc-samplers";
-  "mcmcSynthesis" = self."mcmc-synthesis";
-  "megaSdist" = self."mega-sdist";
-  "meldableHeap" = self."meldable-heap";
-  "memcachedBinary" = self."memcached-binary";
-  "memoSqlite" = self."memo-sqlite";
-  "mersenneRandomPure64" = self."mersenne-random-pure64";
-  "mersenneRandom" = self."mersenne-random";
-  "messagepackRpc" = self."messagepack-rpc";
-  "metaMisc" = self."meta-misc";
-  "metaParAccelerate" = self."meta-par-accelerate";
-  "metaPar" = self."meta-par";
-  "metricsdClient" = self."metricsd-client";
-  "microformats2Types" = self."microformats2-types";
-  "midiAlsa" = self."midi-alsa";
-  "mimeDirectory" = self."mime-directory";
-  "mimeMail" = self."mime-mail";
-  "mimeMailSes" = self."mime-mail-ses";
-  "mimeString" = self."mime-string";
-  "mimeTypes" = self."mime-types";
-  "minimalConfiguration" = self."minimal-configuration";
-  "mirrorTweet" = self."mirror-tweet";
-  "missingForeign" = self."missing-foreign";
-  "missingPy2" = self."missing-py2";
-  "mixArrows" = self."mix-arrows";
-  "mixedStrategies" = self."mixed-strategies";
-  "mlW" = self."ml-w";
-  "mmtlBase" = self."mmtl-base";
-  "modbusTcp" = self."modbus-tcp";
-  "modularArithmetic" = self."modular-arithmetic";
-  "modularPreludeClassy" = self."modular-prelude-classy";
-  "modularPrelude" = self."modular-prelude";
-  "moduleManagement" = self."module-management";
-  "monadAbortFd" = self."monad-abort-fd";
-  "monadAtom" = self."monad-atom";
-  "monadAtomSimple" = self."monad-atom-simple";
-  "monadBool" = self."monad-bool";
-  "MonadCatchIOMtlForeign" = self."MonadCatchIO-mtl-foreign";
-  "MonadCatchIOMtl" = self."MonadCatchIO-mtl";
-  "MonadCatchIOTransformersForeign" = self."MonadCatchIO-transformers-foreign";
-  "MonadCatchIOTransformers" = self."MonadCatchIO-transformers";
-  "monadCodec" = self."monad-codec";
-  "monadControl" = self."monad-control";
-  "monadCoroutine" = self."monad-coroutine";
-  "monadException" = self."monad-exception";
-  "monadExtras" = self."monad-extras";
-  "monadFork" = self."monad-fork";
-  "monadGen" = self."monad-gen";
-  "monadicArrays" = self."monadic-arrays";
-  "monadiccpGecode" = self."monadiccp-gecode";
-  "monadInterleave" = self."monad-interleave";
-  "monadioUnwrappable" = self."monadio-unwrappable";
-  "monadJournal" = self."monad-journal";
-  "monadLibCompose" = self."monadLib-compose";
-  "monadlocPp" = self."monadloc-pp";
-  "monadLogger" = self."monad-logger";
-  "monadLoggerSyslog" = self."monad-logger-syslog";
-  "monadLoops" = self."monad-loops";
-  "monadLoopsStm" = self."monad-loops-stm";
-  "monadLrs" = self."monad-lrs";
-  "monadMemo" = self."monad-memo";
-  "monadMersenneRandom" = self."monad-mersenne-random";
-  "monadOx" = self."monad-ox";
-  "monadParallel" = self."monad-parallel";
-  "monadParam" = self."monad-param";
-  "monadParExtras" = self."monad-par-extras";
-  "monadPar" = self."monad-par";
-  "monadPeel" = self."monad-peel";
-  "monadPrimitive" = self."monad-primitive";
-  "monadProducts" = self."monad-products";
-  "monadRan" = self."monad-ran";
-  "monadResumption" = self."monad-resumption";
-  "monadsFd" = self."monads-fd";
-  "monadState" = self."monad-state";
-  "monadStatevar" = self."monad-statevar";
-  "monadsTf" = self."monads-tf";
-  "monadStlikeIo" = self."monad-stlike-io";
-  "monadStlikeStm" = self."monad-stlike-stm";
-  "monadStm" = self."monad-stm";
-  "monadSt" = self."monad-st";
-  "monadSupply" = self."monad-supply";
-  "monadTask" = self."monad-task";
-  "monadTx" = self."monad-tx";
-  "monadUnify" = self."monad-unify";
-  "monadWrap" = self."monad-wrap";
-  "MonatronIO" = self."Monatron-IO";
-  "mongodbQueue" = self."mongodb-queue";
-  "mongrel2Handler" = self."mongrel2-handler";
-  "monoFoldable" = self."mono-foldable";
-  "monoidExtras" = self."monoid-extras";
-  "monoidOwns" = self."monoid-owns";
-  "monoidRecord" = self."monoid-record";
-  "monoidStatistics" = self."monoid-statistics";
-  "monoidSubclasses" = self."monoid-subclasses";
-  "monoidTransformer" = self."monoid-transformer";
-  "monoTraversable" = self."mono-traversable";
-  "montageClient" = self."montage-client";
-  "monteCarlo" = self."monte-carlo";
-  "mqttHs" = self."mqtt-hs";
-  "msgpackIdl" = self."msgpack-idl";
-  "msgpackRpc" = self."msgpack-rpc";
-  "mtlEvilInstances" = self."mtl-evil-instances";
-  "mtlPrelude" = self."mtl-prelude";
-  "mtlTf" = self."mtl-tf";
-  "multextEastMsd" = self."multext-east-msd";
-  "multiplateSimplified" = self."multiplate-simplified";
-  "multirecAltDeriver" = self."multirec-alt-deriver";
-  "multirecBinary" = self."multirec-binary";
-  "multisetComb" = self."multiset-comb";
-  "MunkresSimple" = self."Munkres-simple";
-  "murmurHash" = self."murmur-hash";
-  "musicArticulation" = self."music-articulation";
-  "musicbrainzEmail" = self."musicbrainz-email";
-  "MusicBrainzLibdiscid" = self."MusicBrainz-libdiscid";
-  "musicDiatonic" = self."music-diatonic";
-  "musicDynamicsLiteral" = self."music-dynamics-literal";
-  "musicDynamics" = self."music-dynamics";
-  "musicGraphics" = self."music-graphics";
-  "musicParts" = self."music-parts";
-  "musicPitchLiteral" = self."music-pitch-literal";
-  "musicPitch" = self."music-pitch";
-  "musicPreludes" = self."music-preludes";
-  "musicScore" = self."music-score";
-  "musicSibelius" = self."music-sibelius";
-  "musicSuite" = self."music-suite";
-  "musicUtil" = self."music-util";
-  "mustacheHaskell" = self."mustache-haskell";
-  "mutableIter" = self."mutable-iter";
-  "muteUnmute" = self."mute-unmute";
-  "mvcUpdates" = self."mvc-updates";
-  "mwcRandomMonad" = self."mwc-random-monad";
-  "mwcRandom" = self."mwc-random";
-  "mybitcoinSci" = self."mybitcoin-sci";
-  "mysnapsessionExample" = self."mysnapsession-example";
-  "mysqlEffect" = self."mysql-effect";
-  "mysqlSimpleQuasi" = self."mysql-simple-quasi";
-  "mysqlSimple" = self."mysql-simple";
-  "nagiosCheck" = self."nagios-check";
-  "nagiosPerfdata" = self."nagios-perfdata";
-  "namedFormlet" = self."named-formlet";
-  "namedLock" = self."named-lock";
-  "namedRecords" = self."named-records";
-  "namesTh" = self."names-th";
-  "nanoCryptr" = self."nano-cryptr";
-  "nanoHmac" = self."nano-hmac";
-  "nanoMd5" = self."nano-md5";
-  "nanomsgHaskell" = self."nanomsg-haskell";
-  "natsQueue" = self."nats-queue";
-  "naturalNumber" = self."natural-number";
-  "naturalNumbers" = self."natural-numbers";
-  "naturalSort" = self."natural-sort";
-  "ncIndicators" = self."nc-indicators";
-  "neatInterpolation" = self."neat-interpolation";
-  "neheTuts" = self."nehe-tuts";
-  "nemesisTitan" = self."nemesis-titan";
-  "nestedSets" = self."nested-sets";
-  "netConcurrent" = self."net-concurrent";
-  "netlistToVhdl" = self."netlist-to-vhdl";
-  "netstringEnumerator" = self."netstring-enumerator";
-  "nettleFrp" = self."nettle-frp";
-  "nettleNetkit" = self."nettle-netkit";
-  "nettleOpenflow" = self."nettle-openflow";
-  "netwireInputGlfw" = self."netwire-input-glfw";
-  "netwireInput" = self."netwire-input";
-  "networkAddress" = self."network-address";
-  "networkApiSupport" = self."network-api-support";
-  "networkBitcoin" = self."network-bitcoin";
-  "networkBytestring" = self."network-bytestring";
-  "networkCarbon" = self."network-carbon";
-  "networkConduit" = self."network-conduit";
-  "networkConduitTls" = self."network-conduit-tls";
-  "networkConnection" = self."network-connection";
-  "networkData" = self."network-data";
-  "networkDbus" = self."network-dbus";
-  "networkDns" = self."network-dns";
-  "networkedGame" = self."networked-game";
-  "networkEnumerator" = self."network-enumerator";
-  "networkFancy" = self."network-fancy";
-  "networkHouse" = self."network-house";
-  "networkInfo" = self."network-info";
-  "networkInterfacerequest" = self."network-interfacerequest";
-  "networkIp" = self."network-ip";
-  "networkMetrics" = self."network-metrics";
-  "networkMinihttp" = self."network-minihttp";
-  "networkMsg" = self."network-msg";
-  "networkMulticast" = self."network-multicast";
-  "networkNetpacket" = self."network-netpacket";
-  "NetworkNineP" = self."Network-NineP";
-  "networkPgi" = self."network-pgi";
-  "networkProtocolXmpp" = self."network-protocol-xmpp";
-  "networkRpca" = self."network-rpca";
-  "networkServer" = self."network-server";
-  "networkService" = self."network-service";
-  "networkSimple" = self."network-simple";
-  "networkSimpleSockaddr" = self."network-simple-sockaddr";
-  "networkSimpleTls" = self."network-simple-tls";
-  "networkSocketOptions" = self."network-socket-options";
-  "networkStream" = self."network-stream";
-  "networkTopicModels" = self."network-topic-models";
-  "networkTransport" = self."network-transport";
-  "networkTransportTcp" = self."network-transport-tcp";
-  "networkTransportTests" = self."network-transport-tests";
-  "networkTransportZeromq" = self."network-transport-zeromq";
-  "networkUri" = self."network-uri";
-  "networkWaiRouter" = self."network-wai-router";
-  "networkWebsocket" = self."network-websocket";
-  "newtypeGenerics" = self."newtype-generics";
-  "newtypeTh" = self."newtype-th";
-  "nextstepPlist" = self."nextstep-plist";
-  "ngramsLoader" = self."ngrams-loader";
-  "nixosTypes" = self."nixos-types";
-  "nlpScoresScripts" = self."nlp-scores-scripts";
-  "nlpScores" = self."nlp-scores";
-  "nM" = self."n-m";
-  "NomyxCore" = self."Nomyx-Core";
-  "NomyxLanguage" = self."Nomyx-Language";
-  "NomyxRules" = self."Nomyx-Rules";
-  "NomyxWeb" = self."Nomyx-Web";
-  "nonEmpty" = self."non-empty";
-  "nonlinearOptimizationAd" = self."nonlinear-optimization-ad";
-  "nonlinearOptimization" = self."nonlinear-optimization";
-  "nonNegative" = self."non-negative";
-  "noRoleAnnots" = self."no-role-annots";
-  "notGlossExamples" = self."not-gloss-examples";
-  "notGloss" = self."not-gloss";
-  "notInBase" = self."not-in-base";
-  "notmuchHaskell" = self."notmuch-haskell";
-  "notmuchWeb" = self."notmuch-web";
-  "npExtras" = self."np-extras";
-  "npLinear" = self."np-linear";
-  "ntpControl" = self."ntp-control";
-  "nullCanvas" = self."null-canvas";
-  "numeralsBase" = self."numerals-base";
-  "numericExtras" = self."numeric-extras";
-  "numericLimits" = self."numeric-limits";
-  "numericPrelude" = self."numeric-prelude";
-  "numericQq" = self."numeric-qq";
-  "numericQuest" = self."numeric-quest";
-  "numericTools" = self."numeric-tools";
-  "numtypeTf" = self."numtype-tf";
-  "offSimple" = self."off-simple";
-  "ohlohHs" = self."ohloh-hs";
-  "oisInputManager" = self."ois-input-manager";
-  "oldLocale" = self."old-locale";
-  "oldTime" = self."old-time";
-  "onAHorse" = self."on-a-horse";
-  "onDemandSshTunnel" = self."on-demand-ssh-tunnel";
-  "oneLiner" = self."one-liner";
-  "onuCourse" = self."onu-course";
-  "ooPrototypes" = self."oo-prototypes";
-  "OpenAFPUtils" = self."OpenAFP-Utils";
-  "opencvRaw" = self."opencv-raw";
-  "openPandoc" = self."open-pandoc";
-  "openpgpAsciiarmor" = self."openpgp-asciiarmor";
-  "openpgpCryptoApi" = self."openpgp-crypto-api";
-  "openpgpCrypto" = self."openpgp-Crypto";
-  "opensoundcontrolHt" = self."opensoundcontrol-ht";
-  "opensslCreatekey" = self."openssl-createkey";
-  "opensslStreams" = self."openssl-streams";
-  "opentheoryChar" = self."opentheory-char";
-  "opentheoryParser" = self."opentheory-parser";
-  "opentheoryPrime" = self."opentheory-prime";
-  "opentheoryPrimitive" = self."opentheory-primitive";
-  "openTyperep" = self."open-typerep";
-  "openUnion" = self."open-union";
-  "openWitness" = self."open-witness";
-  "optimalBlocks" = self."optimal-blocks";
-  "optionsTime" = self."options-time";
-  "optparseApplicative" = self."optparse-applicative";
-  "orchidDemo" = self."orchid-demo";
-  "ordAdhoc" = self."ord-adhoc";
-  "orderStatistics" = self."order-statistics";
-  "organizeImports" = self."organize-imports";
-  "orgmodeParse" = self."orgmode-parse";
-  "osmDownload" = self."osm-download";
-  "osRelease" = self."os-release";
-  "osxAr" = self."osx-ar";
-  "ottparsePretty" = self."ottparse-pretty";
-  "packageOTron" = self."package-o-tron";
-  "packageVt" = self."package-vt";
-  "packedDawg" = self."packed-dawg";
-  "pacmanMemcache" = self."pacman-memcache";
-  "pandocCiteproc" = self."pandoc-citeproc";
-  "pandocLens" = self."pandoc-lens";
-  "pandocTypes" = self."pandoc-types";
-  "pandocUnlit" = self."pandoc-unlit";
-  "parallelIo" = self."parallel-io";
-  "parallelTasks" = self."parallel-tasks";
-  "parallelTreeSearch" = self."parallel-tree-search";
-  "parameterizedData" = self."parameterized-data";
-  "parcoAttoparsec" = self."parco-attoparsec";
-  "parcomLib" = self."parcom-lib";
-  "parconcExamples" = self."parconc-examples";
-  "parcoParsec" = self."parco-parsec";
-  "parsec3Numbers" = self."parsec3-numbers";
-  "parsecExtra" = self."parsec-extra";
-  "parsecNumbers" = self."parsec-numbers";
-  "parsecParsers" = self."parsec-parsers";
-  "parsecPermutation" = self."parsec-permutation";
-  "parsecTagsoup" = self."parsec-tagsoup";
-  "parsecUtils" = self."parsec-utils";
-  "parseDimacs" = self."parse-dimacs";
-  "parseHelp" = self."parse-help";
-  "parserHelper" = self."parser-helper";
-  "partialHandler" = self."partial-handler";
-  "partialIsomorphisms" = self."partial-isomorphisms";
-  "partialLens" = self."partial-lens";
-  "partialUri" = self."partial-uri";
-  "patchCombinators" = self."patch-combinators";
-  "patchImage" = self."patch-image";
-  "pathPieces" = self."path-pieces";
-  "patternArrows" = self."pattern-arrows";
-  "paypalApi" = self."paypal-api";
-  "pcapConduit" = self."pcap-conduit";
-  "pcapEnumerator" = self."pcap-enumerator";
-  "pcdLoader" = self."pcd-loader";
-  "PCLTDB" = self."PCLT-DB";
-  "pcreLess" = self."pcre-less";
-  "pcreLightExtra" = self."pcre-light-extra";
-  "pcreLight" = self."pcre-light";
-  "pcreUtils" = self."pcre-utils";
-  "pdfToolboxContent" = self."pdf-toolbox-content";
-  "pdfToolboxCore" = self."pdf-toolbox-core";
-  "pdfToolboxDocument" = self."pdf-toolbox-document";
-  "pdfToolboxViewer" = self."pdf-toolbox-viewer";
-  "peanoInf" = self."peano-inf";
-  "pennTreebank" = self."penn-treebank";
-  "pennyBin" = self."penny-bin";
-  "pennyLib" = self."penny-lib";
-  "persistableRecord" = self."persistable-record";
-  "persistentCereal" = self."persistent-cereal";
-  "persistentEquivalence" = self."persistent-equivalence";
-  "persistentHssqlppp" = self."persistent-hssqlppp";
-  "persistentMap" = self."persistent-map";
-  "persistentMongoDB" = self."persistent-mongoDB";
-  "persistentMysql" = self."persistent-mysql";
-  "persistentOdbc" = self."persistent-odbc";
-  "persistentPostgresql" = self."persistent-postgresql";
-  "persistentProtobuf" = self."persistent-protobuf";
-  "persistentRedis" = self."persistent-redis";
-  "persistentRefs" = self."persistent-refs";
-  "persistentSqlite" = self."persistent-sqlite";
-  "persistentTemplate" = self."persistent-template";
-  "persistentVector" = self."persistent-vector";
-  "persistentZookeeper" = self."persistent-zookeeper";
-  "pgHarness" = self."pg-harness";
-  "pgsqlSimple" = self."pgsql-simple";
-  "phantomState" = self."phantom-state";
-  "phonePush" = self."phone-push";
-  "phoneticCode" = self."phonetic-code";
-  "piCalculus" = self."pi-calculus";
-  "pipesAeson" = self."pipes-aeson";
-  "pipesAttoparsec" = self."pipes-attoparsec";
-  "pipesAttoparsecStreaming" = self."pipes-attoparsec-streaming";
-  "pipesBinary" = self."pipes-binary";
-  "pipesBytestring" = self."pipes-bytestring";
-  "pipesCerealPlus" = self."pipes-cereal-plus";
-  "pipesConcurrency" = self."pipes-concurrency";
-  "pipesConduit" = self."pipes-conduit";
-  "pipesCore" = self."pipes-core";
-  "pipesCourier" = self."pipes-courier";
-  "pipesCsv" = self."pipes-csv";
-  "pipesErrors" = self."pipes-errors";
-  "pipesExtra" = self."pipes-extra";
-  "pipesExtras" = self."pipes-extras";
-  "pipesGroup" = self."pipes-group";
-  "pipesHttp" = self."pipes-http";
-  "pipesInterleave" = self."pipes-interleave";
-  "pipesNetwork" = self."pipes-network";
-  "pipesNetworkTls" = self."pipes-network-tls";
-  "pipesP2pExamples" = self."pipes-p2p-examples";
-  "pipesP2p" = self."pipes-p2p";
-  "pipesParse" = self."pipes-parse";
-  "pipesPostgresqlSimple" = self."pipes-postgresql-simple";
-  "pipesRt" = self."pipes-rt";
-  "pipesSafe" = self."pipes-safe";
-  "pipesShell" = self."pipes-shell";
-  "pipesText" = self."pipes-text";
-  "pipesVector" = self."pipes-vector";
-  "pipesWai" = self."pipes-wai";
-  "pipesWebsockets" = self."pipes-websockets";
-  "pipesZlib" = self."pipes-zlib";
-  "planarGraph" = self."planar-graph";
-  "plotGtk3" = self."plot-gtk3";
-  "plotGtk" = self."plot-gtk";
-  "PlotHoMatic" = self."Plot-ho-matic";
-  "plotLab" = self."plot-lab";
-  "plotserverApi" = self."plotserver-api";
-  "pluginsAuto" = self."plugins-auto";
-  "pluginsMultistage" = self."plugins-multistage";
-  "plyLoader" = self."ply-loader";
-  "pngFile" = self."png-file";
-  "pngloadFixed" = self."pngload-fixed";
-  "pointlessFun" = self."pointless-fun";
-  "pointlessHaskell" = self."pointless-haskell";
-  "pointlessLenses" = self."pointless-lenses";
-  "pointlessRewrite" = self."pointless-rewrite";
-  "pokerEval" = self."poker-eval";
-  "polhLexicon" = self."polh-lexicon";
-  "polynomialsBernstein" = self."polynomials-bernstein";
-  "polytypeableUtils" = self."polytypeable-utils";
-  "pontariusMediaserver" = self."pontarius-mediaserver";
-  "pontariusXmpp" = self."pontarius-xmpp";
-  "pontariusXpmn" = self."pontarius-xpmn";
-  "poolConduit" = self."pool-conduit";
-  "pooledIo" = self."pooled-io";
-  "pop3Client" = self."pop3-client";
-  "populateSetupExeCache" = self."populate-setup-exe-cache";
-  "portableLines" = self."portable-lines";
-  "posixAcl" = self."posix-acl";
-  "posixEscape" = self."posix-escape";
-  "posixFilelock" = self."posix-filelock";
-  "posixPaths" = self."posix-paths";
-  "posixPty" = self."posix-pty";
-  "posixRealtime" = self."posix-realtime";
-  "posixTimer" = self."posix-timer";
-  "posixWaitpid" = self."posix-waitpid";
-  "postgresqlBinary" = self."postgresql-binary";
-  "postgresqlCopyEscape" = self."postgresql-copy-escape";
-  "postgresqlLibpq" = self."postgresql-libpq";
-  "postgresqlOrm" = self."postgresql-orm";
-  "postgresqlSimpleMigration" = self."postgresql-simple-migration";
-  "postgresqlSimple" = self."postgresql-simple";
-  "postgresqlSimpleSop" = self."postgresql-simple-sop";
-  "postMessAge" = self."post-mess-age";
-  "pqueueMtl" = self."pqueue-mtl";
-  "practiceRoom" = self."practice-room";
-  "prednoteTest" = self."prednote-test";
-  "prefixUnits" = self."prefix-units";
-  "preludeExtras" = self."prelude-extras";
-  "preludeGeneralize" = self."prelude-generalize";
-  "preludePlus" = self."prelude-plus";
-  "preludePrime" = self."prelude-prime";
-  "preludeSafeenum" = self."prelude-safeenum";
-  "preprocessorTools" = self."preprocessor-tools";
-  "prettyClass" = self."pretty-class";
-  "prettyCompact" = self."pretty-compact";
-  "prettyHex" = self."pretty-hex";
-  "prettyNcols" = self."pretty-ncols";
-  "prettyShow" = self."pretty-show";
-  "prettySop" = self."pretty-sop";
-  "prettyTree" = self."pretty-tree";
-  "primulaBoard" = self."primula-board";
-  "primulaBot" = self."primula-bot";
-  "primUniq" = self."prim-uniq";
-  "printfMauke" = self."printf-mauke";
-  "PrintfTH" = self."Printf-TH";
-  "priorityQueue" = self."priority-queue";
-  "prioritySync" = self."priority-sync";
-  "privilegedConcurrency" = self."privileged-concurrency";
-  "processConduit" = self."process-conduit";
-  "processExtras" = self."process-extras";
-  "processIterio" = self."process-iterio";
-  "processLeksah" = self."process-leksah";
-  "processListlike" = self."process-listlike";
-  "processProgress" = self."process-progress";
-  "processQq" = self."process-qq";
-  "processStreaming" = self."process-streaming";
-  "procrastinatingStructure" = self."procrastinating-structure";
-  "procrastinatingVariable" = self."procrastinating-variable";
-  "productProfunctors" = self."product-profunctors";
-  "profunctorExtras" = self."profunctor-extras";
-  "proj4HsBindings" = self."proj4-hs-bindings";
-  "projectTemplate" = self."project-template";
-  "prologGraphLib" = self."prolog-graph-lib";
-  "prologGraph" = self."prolog-graph";
-  "propertyList" = self."property-list";
-  "protobufNative" = self."protobuf-native";
-  "protocolBuffersDescriptorFork" = self."protocol-buffers-descriptor-fork";
-  "protocolBuffersDescriptor" = self."protocol-buffers-descriptor";
-  "protocolBuffersFork" = self."protocol-buffers-fork";
-  "protocolBuffers" = self."protocol-buffers";
-  "proveEverywhereServer" = self."prove-everywhere-server";
-  "proxyKindness" = self."proxy-kindness";
-  "pugsCompat" = self."pugs-compat";
-  "pugsDrIFT" = self."pugs-DrIFT";
-  "pugsHsregex" = self."pugs-hsregex";
-  "pugsHsSyck" = self."pugs-HsSyck";
-  "pulseSimple" = self."pulse-simple";
-  "PupEventsClient" = self."Pup-Events-Client";
-  "PupEventsDemo" = self."Pup-Events-Demo";
-  "PupEventsPQueue" = self."Pup-Events-PQueue";
-  "PupEvents" = self."Pup-Events";
-  "PupEventsServer" = self."Pup-Events-Server";
-  "pureCdb" = self."pure-cdb";
-  "pureFft" = self."pure-fft";
-  "pureIo" = self."pure-io";
-  "purePriorityQueue" = self."pure-priority-queue";
-  "purePriorityQueueTests" = self."pure-priority-queue-tests";
-  "pureZlib" = self."pure-zlib";
-  "pushNotifyCcs" = self."push-notify-ccs";
-  "pushNotifyGeneral" = self."push-notify-general";
-  "pushNotify" = self."push-notify";
-  "puzzleDrawCmdline" = self."puzzle-draw-cmdline";
-  "puzzleDraw" = self."puzzle-draw";
-  "pwstoreCli" = self."pwstore-cli";
-  "pwstoreFast" = self."pwstore-fast";
-  "pwstorePurehaskell" = self."pwstore-purehaskell";
-  "pxslTools" = self."pxsl-tools";
-  "pythonPickle" = self."python-pickle";
-  "qcOiTestgenerator" = self."qc-oi-testgenerator";
-  "qdVec" = self."qd-vec";
-  "qhullSimple" = self."qhull-simple";
-  "quadraticIrrational" = self."quadratic-irrational";
-  "quandlApi" = self."quandl-api";
-  "quantumArrow" = self."quantum-arrow";
-  "querystringPickle" = self."querystring-pickle";
-  "quickcheckAssertions" = self."quickcheck-assertions";
-  "QuickCheckGenT" = self."QuickCheck-GenT";
-  "quickcheckInstances" = self."quickcheck-instances";
-  "quickcheckIo" = self."quickcheck-io";
-  "quickcheckPoly" = self."quickcheck-poly";
-  "quickcheckProperties" = self."quickcheck-properties";
-  "quickcheckPropertyComb" = self."quickcheck-property-comb";
-  "quickcheckPropertyMonad" = self."quickcheck-property-monad";
-  "quickcheckRegex" = self."quickcheck-regex";
-  "quickcheckRelaxng" = self."quickcheck-relaxng";
-  "quickcheckRematch" = self."quickcheck-rematch";
-  "quickcheckScript" = self."quickcheck-script";
-  "quickcheckUnicode" = self."quickcheck-unicode";
-  "quickcheckWebdriver" = self."quickcheck-webdriver";
-  "quickGenerator" = self."quick-generator";
-  "radiumFormulaParser" = self."radium-formula-parser";
-  "radosHaskell" = self."rados-haskell";
-  "railCompilerEditor" = self."rail-compiler-editor";
-  "rainbowTests" = self."rainbow-tests";
-  "randomAccessList" = self."random-access-list";
-  "randomEffin" = self."random-effin";
-  "randomEff" = self."random-eff";
-  "randomExtras" = self."random-extras";
-  "randomFu" = self."random-fu";
-  "randomShuffle" = self."random-shuffle";
-  "randomSource" = self."random-source";
-  "randomStream" = self."random-stream";
-  "randVars" = self."rand-vars";
-  "RangedSets" = self."Ranged-sets";
-  "rangeSetList" = self."range-set-list";
-  "rangeSpace" = self."range-space";
-  "rateLimit" = self."rate-limit";
-  "ratioInt" = self."ratio-int";
-  "ravenHaskellScotty" = self."raven-haskell-scotty";
-  "ravenHaskell" = self."raven-haskell";
-  "rawstringQm" = self."rawstring-qm";
-  "rawStringsQq" = self."raw-strings-qq";
-  "rdtscEnolan" = self."rdtsc-enolan";
-  "reactHaskell" = self."react-haskell";
-  "reactionLogic" = self."reaction-logic";
-  "reactiveBacon" = self."reactive-bacon";
-  "reactiveBalsa" = self."reactive-balsa";
-  "reactiveBananaSdl" = self."reactive-banana-sdl";
-  "reactiveBanana" = self."reactive-banana";
-  "reactiveBananaThreepenny" = self."reactive-banana-threepenny";
-  "reactiveBananaWx" = self."reactive-banana-wx";
-  "reactiveFieldtrip" = self."reactive-fieldtrip";
-  "reactiveGlut" = self."reactive-glut";
-  "reactiveHaskell" = self."reactive-haskell";
-  "reactiveIo" = self."reactive-io";
-  "reactiveThread" = self."reactive-thread";
-  "readBounded" = self."read-bounded";
-  "readlineStatevar" = self."readline-statevar";
-  "reallySimpleXmlParser" = self."really-simple-xml-parser";
-  "reasonableLens" = self."reasonable-lens";
-  "recordsTh" = self."records-th";
-  "recursionSchemes" = self."recursion-schemes";
-  "recursiveLineCount" = self."recursive-line-count";
-  "redisHs" = self."redis-hs";
-  "redisIo" = self."redis-io";
-  "redisResp" = self."redis-resp";
-  "redisSimple" = self."redis-simple";
-  "refFd" = self."ref-fd";
-  "reflectionExtras" = self."reflection-extras";
-  "reflectionWithoutRemorse" = self."reflection-without-remorse";
-  "refMtl" = self."ref-mtl";
-  "reformBlaze" = self."reform-blaze";
-  "reformHamlet" = self."reform-hamlet";
-  "reformHappstack" = self."reform-happstack";
-  "reformHsp" = self."reform-hsp";
-  "refTf" = self."ref-tf";
-  "regexApplicative" = self."regex-applicative";
-  "regexBase" = self."regex-base";
-  "regexCompat" = self."regex-compat";
-  "regexCompatTdfa" = self."regex-compat-tdfa";
-  "regexDeriv" = self."regex-deriv";
-  "regexDfa" = self."regex-dfa";
-  "regexEasy" = self."regex-easy";
-  "regexGenex" = self."regex-genex";
-  "regexParsec" = self."regex-parsec";
-  "regexPcreBuiltin" = self."regex-pcre-builtin";
-  "regexPcre" = self."regex-pcre";
-  "regexPderiv" = self."regex-pderiv";
-  "regexPosix" = self."regex-posix";
-  "regexPosixUnittest" = self."regex-posix-unittest";
-  "regexprSymbolic" = self."regexpr-symbolic";
-  "regexpTries" = self."regexp-tries";
-  "regexTdfaRc" = self."regex-tdfa-rc";
-  "regexTdfa" = self."regex-tdfa";
-  "regexTdfaText" = self."regex-tdfa-text";
-  "regexTdfaUnittest" = self."regex-tdfa-unittest";
-  "regexTdfaUtf8" = self."regex-tdfa-utf8";
-  "regexTre" = self."regex-tre";
-  "regexXmlschema" = self."regex-xmlschema";
-  "regionalPointers" = self."regional-pointers";
-  "regionsMonadsfd" = self."regions-monadsfd";
-  "regionsMonadstf" = self."regions-monadstf";
-  "regionsMtl" = self."regions-mtl";
-  "regularExtras" = self."regular-extras";
-  "regularWeb" = self."regular-web";
-  "regularXmlpickler" = self."regular-xmlpickler";
-  "reifiedRecords" = self."reified-records";
-  "reinterpretCast" = self."reinterpret-cast";
-  "relationalQueryHDBC" = self."relational-query-HDBC";
-  "relationalQuery" = self."relational-query";
-  "relationalRecordExamples" = self."relational-record-examples";
-  "relationalRecord" = self."relational-record";
-  "relationalSchemas" = self."relational-schemas";
-  "relativeDate" = self."relative-date";
-  "rematchText" = self."rematch-text";
-  "remoteDebugger" = self."remote-debugger";
-  "repaAlgorithms" = self."repa-algorithms";
-  "repaBytestring" = self."repa-bytestring";
-  "repaDevil" = self."repa-devil";
-  "repaExamples" = self."repa-examples";
-  "repaFftw" = self."repa-fftw";
-  "repaIo" = self."repa-io";
-  "repaPlugin" = self."repa-plugin";
-  "repaSeries" = self."repa-series";
-  "repaSndfile" = self."repa-sndfile";
-  "repaV4l2" = self."repa-v4l2";
-  "repoBasedBlog" = self."repo-based-blog";
-  "representableFunctors" = self."representable-functors";
-  "representableProfunctors" = self."representable-profunctors";
-  "representableTries" = self."representable-tries";
-  "reprTreeSyb" = self."repr-tree-syb";
-  "requestMonad" = self."request-monad";
-  "resourceEffect" = self."resource-effect";
-  "resourcePoolCatchio" = self."resource-pool-catchio";
-  "resourcePool" = self."resource-pool";
-  "resourceSimple" = self."resource-simple";
-  "restClient" = self."rest-client";
-  "restCore" = self."rest-core";
-  "restExample" = self."rest-example";
-  "restfulSnap" = self."restful-snap";
-  "restGen" = self."rest-gen";
-  "restHappstack" = self."rest-happstack";
-  "restrictedWorkers" = self."restricted-workers";
-  "restSnap" = self."rest-snap";
-  "restStringmap" = self."rest-stringmap";
-  "restTypes" = self."rest-types";
-  "restWai" = self."rest-wai";
-  "resumableExceptions" = self."resumable-exceptions";
-  "rethinkdbClientDriver" = self."rethinkdb-client-driver";
-  "rethinkdbWereHamster" = self."rethinkdb-wereHamster";
-  "reverseApply" = self."reverse-apply";
-  "revState" = self."rev-state";
-  "riakProtobuf" = self."riak-protobuf";
-  "rippleFederation" = self."ripple-federation";
-  "RlangQQ" = self."Rlang-QQ";
-  "rngUtils" = self."rng-utils";
-  "robotsTxt" = self."robots-txt";
-  "rocksdbHaskell" = self."rocksdb-haskell";
-  "roguestarEngine" = self."roguestar-engine";
-  "roguestarGl" = self."roguestar-gl";
-  "roguestarGlut" = self."roguestar-glut";
-  "rollingQueue" = self."rolling-queue";
-  "romanNumerals" = self."roman-numerals";
-  "rotatingLog" = self."rotating-log";
-  "roundtripString" = self."roundtrip-string";
-  "roundtripXml" = self."roundtrip-xml";
-  "routeGenerator" = self."route-generator";
-  "routePlanning" = self."route-planning";
-  "rpcFramework" = self."rpc-framework";
-  "rsaglFrp" = self."rsagl-frp";
-  "rsaglMath" = self."rsagl-math";
-  "rtorrentRpc" = self."rtorrent-rpc";
-  "rtorrentState" = self."rtorrent-state";
-  "rubyQq" = self."ruby-qq";
-  "rulerCore" = self."ruler-core";
-  "s3Signer" = self."s3-signer";
-  "safeAccess" = self."safe-access";
-  "safeFailureCme" = self."safe-failure-cme";
-  "safeFailure" = self."safe-failure";
-  "safeFreeze" = self."safe-freeze";
-  "safeGlobals" = self."safe-globals";
-  "safeLazyIo" = self."safe-lazy-io";
-  "safePlugins" = self."safe-plugins";
-  "saferFileHandlesBytestring" = self."safer-file-handles-bytestring";
-  "saferFileHandles" = self."safer-file-handles";
-  "saferFileHandlesText" = self."safer-file-handles-text";
-  "saiShapeSyb" = self."sai-shape-syb";
-  "salviaDemo" = self."salvia-demo";
-  "salviaExtras" = self."salvia-extras";
-  "salviaProtocol" = self."salvia-protocol";
-  "salviaSessions" = self."salvia-sessions";
-  "salviaWebsocket" = self."salvia-websocket";
-  "sampleFrameNp" = self."sample-frame-np";
-  "sampleFrame" = self."sample-frame";
-  "samtoolsConduit" = self."samtools-conduit";
-  "samtoolsEnumerator" = self."samtools-enumerator";
-  "samtoolsIteratee" = self."samtools-iteratee";
-  "satchmoBackends" = self."satchmo-backends";
-  "satchmoExamples" = self."satchmo-examples";
-  "satchmoFunsat" = self."satchmo-funsat";
-  "satchmoMinisat" = self."satchmo-minisat";
-  "satMicroHs" = self."sat-micro-hs";
-  "sc3Rdu" = self."sc3-rdu";
-  "scalableServer" = self."scalable-server";
-  "scanVectorMachine" = self."scan-vector-machine";
-  "scholdocCiteproc" = self."scholdoc-citeproc";
-  "scholdocTexmath" = self."scholdoc-texmath";
-  "scholdocTypes" = self."scholdoc-types";
-  "scienceConstantsDimensional" = self."science-constants-dimensional";
-  "scienceConstants" = self."science-constants";
-  "scionBrowser" = self."scion-browser";
-  "sciRatio" = self."sci-ratio";
-  "scopeCairo" = self."scope-cairo";
-  "scottyBindingPlay" = self."scotty-binding-play";
-  "scottyBlaze" = self."scotty-blaze";
-  "scottyCookie" = self."scotty-cookie";
-  "scottyFay" = self."scotty-fay";
-  "scottyHastache" = self."scotty-hastache";
-  "scottySession" = self."scotty-session";
-  "scottyTls" = self."scotty-tls";
-  "scpStreams" = self."scp-streams";
-  "scrabbleBot" = self."scrabble-bot";
-  "scytherProof" = self."scyther-proof";
-  "sdeSolver" = self."sde-solver";
-  "sdl2Image" = self."sdl2-image";
-  "SDL2Ttf" = self."SDL2-ttf";
-  "SDLGfx" = self."SDL-gfx";
-  "SDLImage" = self."SDL-image";
-  "SDLMixer" = self."SDL-mixer";
-  "SDLMpeg" = self."SDL-mpeg";
-  "SDLTtf" = self."SDL-ttf";
-  "sealModule" = self."seal-module";
-  "secretSanta" = self."secret-santa";
-  "secretSharing" = self."secret-sharing";
-  "secureSockets" = self."secure-sockets";
-  "seleniumServer" = self."selenium-server";
-  "semaphorePlus" = self."semaphore-plus";
-  "semigroupoidExtras" = self."semigroupoid-extras";
-  "semigroupoidsSyntax" = self."semigroupoids-syntax";
-  "semigroupsActions" = self."semigroups-actions";
-  "semiIso" = self."semi-iso";
-  "semiringSimple" = self."semiring-simple";
-  "seqlocDatafiles" = self."seqloc-datafiles";
-  "sequentCore" = self."sequent-core";
-  "sequentialIndex" = self."sequential-index";
-  "serialTestGenerators" = self."serial-test-generators";
-  "servantClient" = self."servant-client";
-  "servantDocs" = self."servant-docs";
-  "servantJquery" = self."servant-jquery";
-  "servantPool" = self."servant-pool";
-  "servantPostgresql" = self."servant-postgresql";
-  "servantResponse" = self."servant-response";
-  "servantScotty" = self."servant-scotty";
-  "servantServer" = self."servant-server";
-  "sesHtml" = self."ses-html";
-  "sesHtmlSnaplet" = self."ses-html-snaplet";
-  "setCover" = self."set-cover";
-  "setExtra" = self."set-extra";
-  "setMonad" = self."set-monad";
-  "sexpShow" = self."sexp-show";
-  "sfmlAudio" = self."sfml-audio";
-  "SFMLControl" = self."SFML-control";
-  "shadyGen" = self."shady-gen";
-  "shadyGraphics" = self."shady-graphics";
-  "shakeCabalBuild" = self."shake-cabal-build";
-  "shakeExtras" = self."shake-extras";
-  "shakeLanguageC" = self."shake-language-c";
-  "shakespeareCss" = self."shakespeare-css";
-  "shakespeareI18n" = self."shakespeare-i18n";
-  "shakespeareJs" = self."shakespeare-js";
-  "shakespeareText" = self."shakespeare-text";
-  "shapelyData" = self."shapely-data";
-  "sharedBuffer" = self."shared-buffer";
-  "sharedMemory" = self."shared-memory";
-  "shaStreams" = self."sha-streams";
-  "ShellacCompatline" = self."Shellac-compatline";
-  "ShellacEditline" = self."Shellac-editline";
-  "ShellacHaskeline" = self."Shellac-haskeline";
-  "ShellacReadline" = self."Shellac-readline";
-  "shellConduit" = self."shell-conduit";
-  "shellEscape" = self."shell-escape";
-  "shellPipe" = self."shell-pipe";
-  "shellyExtra" = self."shelly-extra";
-  "shiversCfg" = self."shivers-cfg";
-  "shortenStrings" = self."shorten-strings";
-  "ShuThing" = self."Shu-thing";
-  "siffletLib" = self."sifflet-lib";
-  "signedMultiset" = self."signed-multiset";
-  "simpleActors" = self."simple-actors";
-  "simpleAtom" = self."simple-atom";
-  "simpleBluetooth" = self."simple-bluetooth";
-  "simpleConduit" = self."simple-conduit";
-  "simpleConfig" = self."simple-config";
-  "simpleCss" = self."simple-css";
-  "simpleCValue" = self."simple-c-value";
-  "simpleEval" = self."simple-eval";
-  "simpleFirewire" = self."simple-firewire";
-  "simpleForm" = self."simple-form";
-  "simpleGeneticAlgorithm" = self."simple-genetic-algorithm";
-  "simpleIndex" = self."simple-index";
-  "simpleircLens" = self."simpleirc-lens";
-  "simpleLog" = self."simple-log";
-  "simpleLogSyslog" = self."simple-log-syslog";
-  "simpleNeuralNetworks" = self."simple-neural-networks";
-  "simpleObserver" = self."simple-observer";
-  "simplePascal" = self."simple-pascal";
-  "simplePipe" = self."simple-pipe";
-  "simplePostgresqlOrm" = self."simple-postgresql-orm";
-  "simpleReflect" = self."simple-reflect";
-  "simpleRope" = self."simple-rope";
-  "simpleSendfile" = self."simple-sendfile";
-  "simpleServer" = self."simple-server";
-  "simpleSession" = self."simple-session";
-  "simpleSessions" = self."simple-sessions";
-  "simpleSmt" = self."simple-smt";
-  "simpleSqlParser" = self."simple-sql-parser";
-  "simpleStackedVm" = self."simple-stacked-vm";
-  "simpleTabular" = self."simple-tabular";
-  "simpleTemplates" = self."simple-templates";
-  "simpleVec3" = self."simple-vec3";
-  "sizedTypes" = self."sized-types";
-  "sizedVector" = self."sized-vector";
-  "slaveThread" = self."slave-thread";
-  "sliceCppGen" = self."slice-cpp-gen";
-  "slotLambda" = self."slot-lambda";
-  "smallptHs" = self."smallpt-hs";
-  "smtLib" = self."smt-lib";
-  "smtpMail" = self."smtp-mail";
-  "smtpsGmail" = self."smtps-gmail";
-  "snakeGame" = self."snake-game";
-  "snapAccept" = self."snap-accept";
-  "snapApp" = self."snap-app";
-  "snapAuthCli" = self."snap-auth-cli";
-  "snapBlazeClay" = self."snap-blaze-clay";
-  "snapBlaze" = self."snap-blaze";
-  "snapConfigurationUtilities" = self."snap-configuration-utilities";
-  "snapCore" = self."snap-core";
-  "snapCors" = self."snap-cors";
-  "snapElm" = self."snap-elm";
-  "snapErrorCollector" = self."snap-error-collector";
-  "snapExtras" = self."snap-extras";
-  "snapletAcidState" = self."snaplet-acid-state";
-  "snapletActionlog" = self."snaplet-actionlog";
-  "snapletAmqp" = self."snaplet-amqp";
-  "snapletAuthAcid" = self."snaplet-auth-acid";
-  "snapletCoffee" = self."snaplet-coffee";
-  "snapletCssMin" = self."snaplet-css-min";
-  "snapletEnvironments" = self."snaplet-environments";
-  "snapletFay" = self."snaplet-fay";
-  "snapletHaxl" = self."snaplet-haxl";
-  "snapletHdbc" = self."snaplet-hdbc";
-  "snapletHslogger" = self."snaplet-hslogger";
-  "snapletI18n" = self."snaplet-i18n";
-  "snapletInfluxdb" = self."snaplet-influxdb";
-  "snapletLss" = self."snaplet-lss";
-  "snapletMandrill" = self."snaplet-mandrill";
-  "snapletMongodbMinimalistic" = self."snaplet-mongodb-minimalistic";
-  "snapletMongoDB" = self."snaplet-mongoDB";
-  "snapletMysqlSimple" = self."snaplet-mysql-simple";
-  "snapletOauth" = self."snaplet-oauth";
-  "snapletPersistent" = self."snaplet-persistent";
-  "snapletPostgresqlSimple" = self."snaplet-postgresql-simple";
-  "snapletPostmark" = self."snaplet-postmark";
-  "snapletRecaptcha" = self."snaplet-recaptcha";
-  "snapletRedis" = self."snaplet-redis";
-  "snapletRedson" = self."snaplet-redson";
-  "snapletRest" = self."snaplet-rest";
-  "snapletRiak" = self."snaplet-riak";
-  "snapletSass" = self."snaplet-sass";
-  "snapletSedna" = self."snaplet-sedna";
-  "snapletSesHtml" = self."snaplet-ses-html";
-  "snapletSqliteSimple" = self."snaplet-sqlite-simple";
-  "snapletStripe" = self."snaplet-stripe";
-  "snapletTasks" = self."snaplet-tasks";
-  "snapletTypedSessions" = self."snaplet-typed-sessions";
-  "snapLoaderDynamic" = self."snap-loader-dynamic";
-  "snapLoaderStatic" = self."snap-loader-static";
-  "snapPredicates" = self."snap-predicates";
-  "snappyFraming" = self."snappy-framing";
-  "snappyIteratee" = self."snappy-iteratee";
-  "snapServer" = self."snap-server";
-  "snapTesting" = self."snap-testing";
-  "snapUtils" = self."snap-utils";
-  "snapWebRoutes" = self."snap-web-routes";
-  "sndfileEnumerators" = self."sndfile-enumerators";
-  "snippetExtractor" = self."snippet-extractor";
-  "snowWhite" = self."snow-white";
-  "soapOpenssl" = self."soap-openssl";
-  "soapTls" = self."soap-tls";
-  "socketActivation" = self."socket-activation";
-  "socketIo" = self."socket-io";
-  "sonicVisualiser" = self."sonic-visualiser";
-  "sortByPinyin" = self."sort-by-pinyin";
-  "sourceCodeServer" = self."source-code-server";
-  "sparseLinAlg" = self."sparse-lin-alg";
-  "spatialMath" = self."spatial-math";
-  "specialFunctors" = self."special-functors";
-  "specializeTh" = self."specialize-th";
-  "specialKeys" = self."special-keys";
-  "speculationTransformers" = self."speculation-transformers";
-  "spellingSuggest" = self."spelling-suggest";
-  "sphinxCli" = self."sphinx-cli";
-  "splitChannel" = self."split-channel";
-  "splitRecord" = self."split-record";
-  "splitTchan" = self."split-tchan";
-  "SpockAuth" = self."Spock-auth";
-  "SpockWorker" = self."Spock-worker";
-  "sqliteSimple" = self."sqlite-simple";
-  "sqlSimpleMysql" = self."sql-simple-mysql";
-  "sqlSimplePool" = self."sql-simple-pool";
-  "sqlSimplePostgresql" = self."sql-simple-postgresql";
-  "sqlSimple" = self."sql-simple";
-  "sqlSimpleSqlite" = self."sql-simple-sqlite";
-  "sqlvalueList" = self."sqlvalue-list";
-  "sqlWords" = self."sql-words";
-  "stableMaps" = self."stable-maps";
-  "stableMemo" = self."stable-memo";
-  "stableTree" = self."stable-tree";
-  "stackPrism" = self."stack-prism";
-  "standaloneHaddock" = self."standalone-haddock";
-  "starToStarContra" = self."star-to-star-contra";
-  "starToStar" = self."star-to-star";
-  "statefulMtl" = self."stateful-mtl";
-  "statePlus" = self."state-plus";
-  "stateRecord" = self."state-record";
-  "StateVarTransformer" = self."StateVar-transformer";
-  "staticHash" = self."static-hash";
-  "staticResources" = self."static-resources";
-  "statisticsDirichlet" = self."statistics-dirichlet";
-  "statisticsFusion" = self."statistics-fusion";
-  "statisticsLinreg" = self."statistics-linreg";
-  "stbImage" = self."stb-image";
-  "stbTruetype" = self."stb-truetype";
-  "stmChannelize" = self."stm-channelize";
-  "stmChans" = self."stm-chans";
-  "stmChunkedQueues" = self."stm-chunked-queues";
-  "stmConduit" = self."stm-conduit";
-  "stmContainers" = self."stm-containers";
-  "stmDelay" = self."stm-delay";
-  "stmFirehose" = self."stm-firehose";
-  "stmIoHooks" = self."stm-io-hooks";
-  "stmLifted" = self."stm-lifted";
-  "stmLinkedlist" = self."stm-linkedlist";
-  "stmOrelseIo" = self."stm-orelse-io";
-  "stmPromise" = self."stm-promise";
-  "stmQueueExtras" = self."stm-queue-extras";
-  "stmSbchan" = self."stm-sbchan";
-  "stmSplit" = self."stm-split";
-  "stmStats" = self."stm-stats";
-  "stmTlist" = self."stm-tlist";
-  "stompConduit" = self."stomp-conduit";
-  "stompPatterns" = self."stomp-patterns";
-  "stompQueue" = self."stomp-queue";
-  "storableComplex" = self."storable-complex";
-  "storableEndian" = self."storable-endian";
-  "storableRecord" = self."storable-record";
-  "storableStaticArray" = self."storable-static-array";
-  "storableTuple" = self."storable-tuple";
-  "storablevectorCarray" = self."storablevector-carray";
-  "storablevectorStreamfusion" = self."storablevector-streamfusion";
-  "StrafunskiATermLib" = self."Strafunski-ATermLib";
-  "StrafunskiSdf2Haskell" = self."Strafunski-Sdf2Haskell";
-  "StrafunskiStrategyLib" = self."Strafunski-StrategyLib";
-  "streamFusion" = self."stream-fusion";
-  "streamingCommons" = self."streaming-commons";
-  "streamMonad" = self."stream-monad";
-  "strictBaseTypes" = self."strict-base-types";
-  "strictConcurrency" = self."strict-concurrency";
-  "strictGhcPlugin" = self."strict-ghc-plugin";
-  "strictIdentity" = self."strict-identity";
-  "strictIo" = self."strict-io";
-  "stringClass" = self."string-class";
-  "stringCombinators" = self."string-combinators";
-  "stringConversions" = self."string-conversions";
-  "stringConvert" = self."string-convert";
-  "stringQq" = self."string-qq";
-  "stringQuote" = self."string-quote";
-  "stringSimilarity" = self."string-similarity";
-  "stringtableAtom" = self."stringtable-atom";
-  "stripeHaskell" = self."stripe-haskell";
-  "structuralInduction" = self."structural-induction";
-  "structuredHaskellMode" = self."structured-haskell-mode";
-  "structuredMongoDB" = self."structured-mongoDB";
-  "stylishHaskell" = self."stylish-haskell";
-  "sunroofCompiler" = self."sunroof-compiler";
-  "sunroofExamples" = self."sunroof-examples";
-  "sunroofServer" = self."sunroof-server";
-  "supercolliderHt" = self."supercollider-ht";
-  "supercolliderMidi" = self."supercollider-midi";
-  "svmLightUtils" = self."svm-light-utils";
-  "svmSimple" = self."svm-simple";
-  "swiftLda" = self."swift-lda";
-  "sybExtras" = self."syb-extras";
-  "sybWithClassInstancesText" = self."syb-with-class-instances-text";
-  "sybWithClass" = self."syb-with-class";
-  "symPlot" = self."sym-plot";
-  "synchronousChannels" = self."synchronous-channels";
-  "syntaxAttoparsec" = self."syntax-attoparsec";
-  "syntaxExampleJson" = self."syntax-example-json";
-  "syntaxExample" = self."syntax-example";
-  "syntaxPretty" = self."syntax-pretty";
-  "syntaxPrinter" = self."syntax-printer";
-  "syntaxTreesForkBairyn" = self."syntax-trees-fork-bairyn";
-  "syntaxTrees" = self."syntax-trees";
-  "synthesizerAlsa" = self."synthesizer-alsa";
-  "synthesizerCore" = self."synthesizer-core";
-  "synthesizerDimensional" = self."synthesizer-dimensional";
-  "synthesizerInference" = self."synthesizer-inference";
-  "synthesizerLlvm" = self."synthesizer-llvm";
-  "synthesizerMidi" = self."synthesizer-midi";
-  "sysAuthSmbclient" = self."sys-auth-smbclient";
-  "systemArgv0" = self."system-argv0";
-  "systemCanonicalpath" = self."system-canonicalpath";
-  "systemCommand" = self."system-command";
-  "systemFileio" = self."system-fileio";
-  "systemFilepath" = self."system-filepath";
-  "systemGpio" = self."system-gpio";
-  "systemInotify" = self."system-inotify";
-  "systemLifted" = self."system-lifted";
-  "systemPosixRedirect" = self."system-posix-redirect";
-  "systemRandomEffect" = self."system-random-effect";
-  "systemTimeMonotonic" = self."system-time-monotonic";
-  "systemUtil" = self."system-util";
-  "systemUuid" = self."system-uuid";
-  "tagBits" = self."tag-bits";
-  "taggedBinary" = self."tagged-binary";
-  "taggedExceptionCore" = self."tagged-exception-core";
-  "taggedList" = self."tagged-list";
-  "taggedTh" = self."tagged-th";
-  "taggedTransformer" = self."tagged-transformer";
-  "taggyLens" = self."taggy-lens";
-  "taglibApi" = self."taglib-api";
-  "tagsetPositional" = self."tagset-positional";
-  "tagsoupHt" = self."tagsoup-ht";
-  "tagsoupParsec" = self."tagsoup-parsec";
-  "tagstreamConduit" = self."tagstream-conduit";
-  "tagStream" = self."tag-stream";
-  "takusenOracle" = self."takusen-oracle";
-  "tamarinProver" = self."tamarin-prover";
-  "tamarinProverTerm" = self."tamarin-prover-term";
-  "tamarinProverTheory" = self."tamarin-prover-theory";
-  "tamarinProverUtils" = self."tamarin-prover-utils";
-  "tastyAntXml" = self."tasty-ant-xml";
-  "tastyGolden" = self."tasty-golden";
-  "tastyHspec" = self."tasty-hspec";
-  "tastyHtml" = self."tasty-html";
-  "tastyHunitAdapter" = self."tasty-hunit-adapter";
-  "tastyHunit" = self."tasty-hunit";
-  "tastyIntegrate" = self."tasty-integrate";
-  "tastyProgram" = self."tasty-program";
-  "tastyQuickcheck" = self."tasty-quickcheck";
-  "tastyRerun" = self."tasty-rerun";
-  "tastySmallcheck" = self."tasty-smallcheck";
-  "tastyTh" = self."tasty-th";
-  "tcacheAWS" = self."tcache-AWS";
-  "tddUtil" = self."tdd-util";
-  "templateDefault" = self."template-default";
-  "templateHaskell" = self."template-haskell";
-  "templateHsml" = self."template-hsml";
-  "temporalCsound" = self."temporal-csound";
-  "temporalMedia" = self."temporal-media";
-  "temporalMusicNotationDemo" = self."temporal-music-notation-demo";
-  "temporalMusicNotation" = self."temporal-music-notation";
-  "temporalMusicNotationWestern" = self."temporal-music-notation-western";
-  "temporaryRc" = self."temporary-rc";
-  "terminalProgressBar" = self."terminal-progress-bar";
-  "terminalSize" = self."terminal-size";
-  "terminationCombinators" = self."termination-combinators";
-  "terminfoHs" = self."terminfo-hs";
-  "termRewriting" = self."term-rewriting";
-  "testFrameworkDoctest" = self."test-framework-doctest";
-  "testFrameworkGolden" = self."test-framework-golden";
-  "testFrameworkHunit" = self."test-framework-hunit";
-  "testFrameworkProgram" = self."test-framework-program";
-  "testFrameworkQuickcheck2" = self."test-framework-quickcheck2";
-  "testFrameworkQuickcheck" = self."test-framework-quickcheck";
-  "testFrameworkSandbox" = self."test-framework-sandbox";
-  "testFramework" = self."test-framework";
-  "testFrameworkSkip" = self."test-framework-skip";
-  "testFrameworkSmallcheck" = self."test-framework-smallcheck";
-  "testFrameworkTestingFeat" = self."test-framework-testing-feat";
-  "testFrameworkThPrime" = self."test-framework-th-prime";
-  "testFrameworkTh" = self."test-framework-th";
-  "testingFeat" = self."testing-feat";
-  "testPkg" = self."test-pkg";
-  "testSandboxHunit" = self."test-sandbox-hunit";
-  "testSandboxQuickcheck" = self."test-sandbox-quickcheck";
-  "testSandbox" = self."test-sandbox";
-  "testShouldbe" = self."test-shouldbe";
-  "testSimple" = self."test-simple";
-  "textBinary" = self."text-binary";
-  "textFormat" = self."text-format";
-  "textFormatSimple" = self."text-format-simple";
-  "textIcu" = self."text-icu";
-  "textIcuTranslit" = self."text-icu-translit";
-  "textJsonQq" = self."text-json-qq";
-  "textLatin1" = self."text-latin1";
-  "textLdap" = self."text-ldap";
-  "textLocaleEncoding" = self."text-locale-encoding";
-  "textManipulate" = self."text-manipulate";
-  "textNormal" = self."text-normal";
-  "textPrinter" = self."text-printer";
-  "textRegisterMachine" = self."text-register-machine";
-  "textShow" = self."text-show";
-  "textStreamDecode" = self."text-stream-decode";
-  "textUtf7" = self."text-utf7";
-  "textXmlGeneric" = self."text-xml-generic";
-  "textXmlQq" = self."text-xml-qq";
-  "tfpTh" = self."tfp-th";
-  "tfRandom" = self."tf-random";
-  "thAlpha" = self."th-alpha";
-  "thBuild" = self."th-build";
-  "thDesugar" = self."th-desugar";
-  "theoremquestClient" = self."theoremquest-client";
-  "thetaFunctions" = self."theta-functions";
-  "thExpandSyns" = self."th-expand-syns";
-  "thExtras" = self."th-extras";
-  "thFold" = self."th-fold";
-  "thInstanceReification" = self."th-instance-reification";
-  "thInstances" = self."th-instances";
-  "thKinds" = self."th-kinds";
-  "thLiftInstances" = self."th-lift-instances";
-  "thLift" = self."th-lift";
-  "thOrphans" = self."th-orphans";
-  "thPrintf" = self."th-printf";
-  "threadLocalStorage" = self."thread-local-storage";
-  "threadsPool" = self."threads-pool";
-  "threepennyGui" = self."threepenny-gui";
-  "thReifyMany" = self."th-reify-many";
-  "thSccs" = self."th-sccs";
-  "thumbnailPlus" = self."thumbnail-plus";
-  "ticTacToe" = self."tic-tac-toe";
-  "tidalVis" = self."tidal-vis";
-  "tieKnot" = self."tie-knot";
-  "timeCompat" = self."time-compat";
-  "timeExtras" = self."time-extras";
-  "timeExts" = self."time-exts";
-  "timeHttp" = self."time-http";
-  "timeIoAccess" = self."time-io-access";
-  "timeLens" = self."time-lens";
-  "timeoutControl" = self."timeout-control";
-  "timeoutWithResults" = self."timeout-with-results";
-  "timePatterns" = self."time-patterns";
-  "timeRecurrence" = self."time-recurrence";
-  "timersUpdatable" = self."timers-updatable";
-  "timeSeries" = self."time-series";
-  "timestampSubprocessLines" = self."timestamp-subprocess-lines";
-  "timeUnits" = self."time-units";
-  "timeW3c" = self."time-w3c";
-  "timezoneOlson" = self."timezone-olson";
-  "timezoneSeries" = self."timezone-series";
-  "timingConvenience" = self."timing-convenience";
-  "tlsDebug" = self."tls-debug";
-  "tlsExtra" = self."tls-extra";
-  "toHaskell" = self."to-haskell";
-  "tokenBucket" = self."token-bucket";
-  "tokyocabinetHaskell" = self."tokyocabinet-haskell";
-  "tokyotyrantHaskell" = self."tokyotyrant-haskell";
-  "tomatoRubatoOpenal" = self."tomato-rubato-openal";
-  "toStringClass" = self."to-string-class";
-  "toStringInstances" = self."to-string-instances";
-  "totalMap" = self."total-map";
-  "traceCall" = self."trace-call";
-  "traceFunctionCall" = self."trace-function-call";
-  "transactionalEvents" = self."transactional-events";
-  "transformersAbort" = self."transformers-abort";
-  "transformersBase" = self."transformers-base";
-  "transformersCompat" = self."transformers-compat";
-  "transformersCompose" = self."transformers-compose";
-  "transformersConvert" = self."transformers-convert";
-  "transformersFree" = self."transformers-free";
-  "transformersRunnable" = self."transformers-runnable";
-  "transformersSupply" = self."transformers-supply";
-  "translatableIntset" = self."translatable-intset";
-  "traverseWithClass" = self."traverse-with-class";
-  "treemapHtml" = self."treemap-html";
-  "treemapHtmlTools" = self."treemap-html-tools";
-  "treeMonad" = self."tree-monad";
-  "treeView" = self."tree-view";
-  "tremulousQuery" = self."tremulous-query";
-  "trivialConstraint" = self."trivial-constraint";
-  "trueName" = self."true-name";
-  "tsessionHappstack" = self."tsession-happstack";
-  "tspViz" = self."tsp-viz";
-  "tupFunctor" = self."tup-functor";
-  "tupleGen" = self."tuple-gen";
-  "tupleHlist" = self."tuple-hlist";
-  "tupleLenses" = self."tuple-lenses";
-  "tupleMorph" = self."tuple-morph";
-  "tuplesHomogenousH98" = self."tuples-homogenous-h98";
-  "tupleTh" = self."tuple-th";
-  "turingMusic" = self."turing-music";
-  "twentefpEventloopGraphics" = self."twentefp-eventloop-graphics";
-  "twentefpGraphs" = self."twentefp-graphs";
-  "twentefpNumber" = self."twentefp-number";
-  "twentefpRosetree" = self."twentefp-rosetree";
-  "twentefpTrees" = self."twentefp-trees";
-  "twentefpWebsockets" = self."twentefp-websockets";
-  "twilightStm" = self."twilight-stm";
-  "twitterConduit" = self."twitter-conduit";
-  "twitterEnumerator" = self."twitter-enumerator";
-  "twitterFeed" = self."twitter-feed";
-  "twitterTypesLens" = self."twitter-types-lens";
-  "twitterTypes" = self."twitter-types";
-  "txtSushi" = self."txt-sushi";
-  "typeableTh" = self."typeable-th";
-  "typeAligned" = self."type-aligned";
-  "typeBooleans" = self."type-booleans";
-  "typeCereal" = self."type-cereal";
-  "typeDigits" = self."type-digits";
-  "typeEq" = self."type-eq";
-  "typeEqualityCheck" = self."type-equality-check";
-  "typeEquality" = self."type-equality";
-  "typeFunctions" = self."type-functions";
-  "typeHint" = self."type-hint";
-  "typeInt" = self."type-int";
-  "typeLevelBst" = self."type-level-bst";
-  "typeLevelNaturalNumberInduction" = self."type-level-natural-number-induction";
-  "typeLevelNaturalNumberOperations" = self."type-level-natural-number-operations";
-  "typeLevelNaturalNumber" = self."type-level-natural-number";
-  "typeLevelNumbers" = self."type-level-numbers";
-  "typeLevel" = self."type-level";
-  "typeLevelSets" = self."type-level-sets";
-  "typelevelTensor" = self."typelevel-tensor";
-  "typeLevelTf" = self."type-level-tf";
-  "typeList" = self."type-list";
-  "typeNatural" = self."type-natural";
-  "typeOrd" = self."type-ord";
-  "typeOrdSpineCereal" = self."type-ord-spine-cereal";
-  "typePrelude" = self."type-prelude";
-  "typesafeEndian" = self."typesafe-endian";
-  "typescriptDocs" = self."typescript-docs";
-  "typeSettheory" = self."type-settheory";
-  "typeSpine" = self."type-spine";
-  "typeStructure" = self."type-structure";
-  "typeSubTh" = self."type-sub-th";
-  "typeUnary" = self."type-unary";
-  "typographyGeometry" = self."typography-geometry";
-  "uaParser" = self."ua-parser";
-  "udbusModel" = self."udbus-model";
-  "uhcLight" = self."uhc-light";
-  "uhcUtil" = self."uhc-util";
-  "uiCommand" = self."ui-command";
-  "unagiChan" = self."unagi-chan";
-  "unagiStreams" = self."unagi-streams";
-  "unambCustom" = self."unamb-custom";
-  "unboundedDelays" = self."unbounded-delays";
-  "unboundedDelaysUnits" = self."unbounded-delays-units";
-  "unboundGenerics" = self."unbound-generics";
-  "unboxedContainers" = self."unboxed-containers";
-  "unicodeNames" = self."unicode-names";
-  "unicodeNormalization" = self."unicode-normalization";
-  "unicodePrelude" = self."unicode-prelude";
-  "unicodeProperties" = self."unicode-properties";
-  "unicodeSymbols" = self."unicode-symbols";
-  "uniEvents" = self."uni-events";
-  "unificationFd" = self."unification-fd";
-  "uniformPair" = self."uniform-pair";
-  "uniGraphs" = self."uni-graphs";
-  "uniHtk" = self."uni-htk";
-  "unionFindArray" = self."union-find-array";
-  "unionFind" = self."union-find";
-  "unionMap" = self."union-map";
-  "uniPosixutil" = self."uni-posixutil";
-  "uniqueLogic" = self."unique-logic";
-  "uniqueLogicTf" = self."unique-logic-tf";
-  "uniReactor" = self."uni-reactor";
-  "unitsDefs" = self."units-defs";
-  "unitsParser" = self."units-parser";
-  "uniUDrawGraph" = self."uni-uDrawGraph";
-  "uniUtil" = self."uni-util";
-  "universalBinary" = self."universal-binary";
-  "universeBase" = self."universe-base";
-  "universeInstancesBase" = self."universe-instances-base";
-  "universeInstancesExtended" = self."universe-instances-extended";
-  "universeInstancesTrans" = self."universe-instances-trans";
-  "universeReverseInstances" = self."universe-reverse-instances";
-  "universeTh" = self."universe-th";
-  "unixBytestring" = self."unix-bytestring";
-  "unixCompat" = self."unix-compat";
-  "unixHandle" = self."unix-handle";
-  "unixIoExtra" = self."unix-io-extra";
-  "unixMemory" = self."unix-memory";
-  "unixProcessConduit" = self."unix-process-conduit";
-  "unixPtyLight" = self."unix-pty-light";
-  "unixTime" = self."unix-time";
-  "UnixutilsShadow" = self."Unixutils-shadow";
-  "unmHip" = self."unm-hip";
-  "unorderedContainersRematch" = self."unordered-containers-rematch";
-  "unorderedContainers" = self."unordered-containers";
-  "unpackFuncs" = self."unpack-funcs";
-  "unrollGhcPlugin" = self."unroll-ghc-plugin";
-  "unsafePromises" = self."unsafe-promises";
-  "unusablePkg" = self."unusable-pkg";
-  "uriConduit" = self."uri-conduit";
-  "uriEncode" = self."uri-encode";
-  "uriEnumeratorFile" = self."uri-enumerator-file";
-  "uriEnumerator" = self."uri-enumerator";
-  "uriTemplater" = self."uri-templater";
-  "uriTemplate" = self."uri-template";
-  "urldispHappstack" = self."urldisp-happstack";
-  "urlGeneric" = self."url-generic";
-  "usbEnumerator" = self."usb-enumerator";
-  "usbIdDatabase" = self."usb-id-database";
-  "usbIteratee" = self."usb-iteratee";
-  "usbSafe" = self."usb-safe";
-  "utf8Env" = self."utf8-env";
-  "utf8Light" = self."utf8-light";
-  "utf8Prelude" = self."utf8-prelude";
-  "utf8String" = self."utf8-string";
-  "utilityHt" = self."utility-ht";
-  "uuagcBootstrap" = self."uuagc-bootstrap";
-  "uuagcCabal" = self."uuagc-cabal";
-  "uuagcDiagrams" = self."uuagc-diagrams";
-  "uuCcoExamples" = self."uu-cco-examples";
-  "uuCcoHutParsing" = self."uu-cco-hut-parsing";
-  "uuCco" = self."uu-cco";
-  "uuCcoUuParsinglib" = self."uu-cco-uu-parsinglib";
-  "uuidAeson" = self."uuid-aeson";
-  "uuidLe" = self."uuid-le";
-  "uuidQuasi" = self."uuid-quasi";
-  "uuInterleaved" = self."uu-interleaved";
-  "uuOptions" = self."uu-options";
-  "uuParsinglib" = self."uu-parsinglib";
-  "uuTc" = self."uu-tc";
-  "uvectorAlgorithms" = self."uvector-algorithms";
-  "uzblWithSource" = self."uzbl-with-source";
-  "v4l2Examples" = self."v4l2-examples";
-  "vacuumCairo" = self."vacuum-cairo";
-  "vacuumGraphviz" = self."vacuum-graphviz";
-  "vacuumOpengl" = self."vacuum-opengl";
-  "vacuumUbigraph" = self."vacuum-ubigraph";
-  "validNames" = self."valid-names";
-  "valueSupply" = self."value-supply";
-  "variablePrecision" = self."variable-precision";
-  "vcsRevision" = self."vcs-revision";
-  "VecBoolean" = self."Vec-Boolean";
-  "VecOpenGLRaw" = self."Vec-OpenGLRaw";
-  "vectFloatingAccelerate" = self."vect-floating-accelerate";
-  "vectFloating" = self."vect-floating";
-  "vectOpengl" = self."vect-opengl";
-  "vectorAlgorithms" = self."vector-algorithms";
-  "vectorBinaryInstances" = self."vector-binary-instances";
-  "vectorBinary" = self."vector-binary";
-  "vectorBuffer" = self."vector-buffer";
-  "vectorBytestring" = self."vector-bytestring";
-  "vectorClock" = self."vector-clock";
-  "vectorConduit" = self."vector-conduit";
-  "vectorFftw" = self."vector-fftw";
-  "vectorFunctorlazy" = self."vector-functorlazy";
-  "vectorHeterogenous" = self."vector-heterogenous";
-  "vectorInstancesCollections" = self."vector-instances-collections";
-  "vectorInstances" = self."vector-instances";
-  "vectorMmap" = self."vector-mmap";
-  "vectorRandom" = self."vector-random";
-  "vectorReadInstances" = self."vector-read-instances";
-  "vectorSpaceMap" = self."vector-space-map";
-  "vectorSpaceOpengl" = self."vector-space-opengl";
-  "vectorSpacePoints" = self."vector-space-points";
-  "vectorSpace" = self."vector-space";
-  "vectorStatic" = self."vector-static";
-  "vectorStrategies" = self."vector-strategies";
-  "vectorThUnbox" = self."vector-th-unbox";
-  "VecTransform" = self."Vec-Transform";
-  "ViennaRNABindings" = self."ViennaRNA-bindings";
-  "vintageBasic" = self."vintage-basic";
-  "vinylGl" = self."vinyl-gl";
-  "vinylJson" = self."vinyl-json";
-  "visualGraphrewrite" = self."visual-graphrewrite";
-  "visualProf" = self."visual-prof";
-  "vkAwsRoute53" = self."vk-aws-route53";
-  "vkPosixPty" = self."vk-posix-pty";
-  "vowpalUtils" = self."vowpal-utils";
-  "vtyExamples" = self."vty-examples";
-  "vtyMenu" = self."vty-menu";
-  "vtyUiExtras" = self."vty-ui-extras";
-  "vtyUi" = self."vty-ui";
-  "waiAppFileCgi" = self."wai-app-file-cgi";
-  "waiAppStatic" = self."wai-app-static";
-  "waiConduit" = self."wai-conduit";
-  "waiCors" = self."wai-cors";
-  "waiDigestiveFunctors" = self."wai-digestive-functors";
-  "waiDispatch" = self."wai-dispatch";
-  "waiEventsource" = self."wai-eventsource";
-  "waiExtra" = self."wai-extra";
-  "waiFrontendMonadcgi" = self."wai-frontend-monadcgi";
-  "waiGraceful" = self."wai-graceful";
-  "waiHandlerDevel" = self."wai-handler-devel";
-  "waiHandlerFastcgi" = self."wai-handler-fastcgi";
-  "waiHandlerLaunch" = self."wai-handler-launch";
-  "waiHandlerScgi" = self."wai-handler-scgi";
-  "waiHandlerSnap" = self."wai-handler-snap";
-  "waiHandlerWebkit" = self."wai-handler-webkit";
-  "waiHastache" = self."wai-hastache";
-  "waiLite" = self."wai-lite";
-  "waiLoggerPrefork" = self."wai-logger-prefork";
-  "waiLogger" = self."wai-logger";
-  "waiMiddlewareCacheRedis" = self."wai-middleware-cache-redis";
-  "waiMiddlewareCache" = self."wai-middleware-cache";
-  "waiMiddlewareCatch" = self."wai-middleware-catch";
-  "waiMiddlewareEtag" = self."wai-middleware-etag";
-  "waiMiddlewareHeaders" = self."wai-middleware-headers";
-  "waiMiddlewareRoute" = self."wai-middleware-route";
-  "waiMiddlewareStatic" = self."wai-middleware-static";
-  "waiPredicates" = self."wai-predicates";
-  "waiResponsible" = self."wai-responsible";
-  "waiRouter" = self."wai-router";
-  "waiRoute" = self."wai-route";
-  "waiRoutes" = self."wai-routes";
-  "waiRouting" = self."wai-routing";
-  "waiSessionClientsession" = self."wai-session-clientsession";
-  "waiSession" = self."wai-session";
-  "waiSessionTokyocabinet" = self."wai-session-tokyocabinet";
-  "waiStaticCache" = self."wai-static-cache";
-  "waiStaticPages" = self."wai-static-pages";
-  "waiTest" = self."wai-test";
-  "waitHandle" = self."wait-handle";
-  "waiThrottler" = self."wai-throttler";
-  "waiUtil" = self."wai-util";
-  "waiWebsockets" = self."wai-websockets";
-  "warpDynamic" = self."warp-dynamic";
-  "warpStatic" = self."warp-static";
-  "warpTls" = self."warp-tls";
-  "warpTlsUid" = self."warp-tls-uid";
-  "weatherApi" = self."weather-api";
-  "WebBitsHtml" = self."WebBits-Html";
-  "WebBitsMultiplate" = self."WebBits-multiplate";
-  "webBrowserInHaskell" = self."web-browser-in-haskell";
-  "webCss" = self."web-css";
-  "webdriverAngular" = self."webdriver-angular";
-  "webdriverSnoy" = self."webdriver-snoy";
-  "webEncodings" = self."web-encodings";
-  "webFpco" = self."web-fpco";
-  "webkitgtk3Javascriptcore" = self."webkitgtk3-javascriptcore";
-  "webkitJavascriptcore" = self."webkit-javascriptcore";
-  "webMongrel2" = self."web-mongrel2";
-  "webPage" = self."web-page";
-  "webPlugins" = self."web-plugins";
-  "webRoutesBoomerang" = self."web-routes-boomerang";
-  "webRoutesHappstack" = self."web-routes-happstack";
-  "webRoutesHsp" = self."web-routes-hsp";
-  "webRoutesMtl" = self."web-routes-mtl";
-  "webRoutesQuasi" = self."web-routes-quasi";
-  "webRoutesRegular" = self."web-routes-regular";
-  "webRoutes" = self."web-routes";
-  "webRoutesTh" = self."web-routes-th";
-  "webRoutesTransformers" = self."web-routes-transformers";
-  "webRoutesWai" = self."web-routes-wai";
-  "websocketsSnap" = self."websockets-snap";
-  "weddingAnnouncement" = self."wedding-announcement";
-  "weightedRegexp" = self."weighted-regexp";
-  "weightedSearch" = self."weighted-search";
-  "whebMongo" = self."wheb-mongo";
-  "whebRedis" = self."wheb-redis";
-  "whebStrapped" = self."wheb-strapped";
-  "whileLangParser" = self."while-lang-parser";
-  "Win32DhcpServer" = self."Win32-dhcp-server";
-  "Win32Errors" = self."Win32-errors";
-  "Win32Extras" = self."Win32-extras";
-  "Win32JunctionPoint" = self."Win32-junction-point";
-  "Win32Notify" = self."Win32-notify";
-  "Win32Services" = self."Win32-services";
-  "Win32ServicesWrapper" = self."Win32-services-wrapper";
-  "winHpPath" = self."win-hp-path";
-  "wlPprintExtras" = self."wl-pprint-extras";
-  "wlPprint" = self."wl-pprint";
-  "wlPprintTerminfo" = self."wl-pprint-terminfo";
-  "wlPprintText" = self."wl-pprint-text";
-  "WordNetGhc74" = self."WordNet-ghc74";
-  "wordTrie" = self."word-trie";
-  "wpArchivebot" = self."wp-archivebot";
-  "wtkGtk" = self."wtk-gtk";
-  "wumpusBasic" = self."wumpus-basic";
-  "wumpusCore" = self."wumpus-core";
-  "wumpusDrawing" = self."wumpus-drawing";
-  "wumpusMicroprint" = self."wumpus-microprint";
-  "wumpusTree" = self."wumpus-tree";
-  "X11Extras" = self."X11-extras";
-  "X11Rm" = self."X11-rm";
-  "X11Xdamage" = self."X11-xdamage";
-  "X11Xfixes" = self."X11-xfixes";
-  "X11Xft" = self."X11-xft";
-  "x11Xim" = self."x11-xim";
-  "x11Xinput" = self."x11-xinput";
-  "X11Xshape" = self."X11-xshape";
-  "x509Store" = self."x509-store";
-  "x509System" = self."x509-system";
-  "x509Util" = self."x509-util";
-  "x509Validation" = self."x509-validation";
-  "xcbTypes" = self."xcb-types";
-  "xchatPlugin" = self."xchat-plugin";
-  "xdgBasedir" = self."xdg-basedir";
-  "xdgUserdirs" = self."xdg-userdirs";
-  "xDsp" = self."x-dsp";
-  "xhaskellLibrary" = self."xhaskell-library";
-  "xhtmlCombinators" = self."xhtml-combinators";
-  "xilinxLava" = self."xilinx-lava";
-  "xingApi" = self."xing-api";
-  "xlsxTemplater" = self."xlsx-templater";
-  "xmlBasic" = self."xml-basic";
-  "xmlCatalog" = self."xml-catalog";
-  "xmlConduit" = self."xml-conduit";
-  "xmlConduitWriter" = self."xml-conduit-writer";
-  "xmlEnumeratorCombinators" = self."xml-enumerator-combinators";
-  "xmlEnumerator" = self."xml-enumerator";
-  "xmlHamlet" = self."xml-hamlet";
-  "xmlHelpers" = self."xml-helpers";
-  "xmlHtmlConduitLens" = self."xml-html-conduit-lens";
-  "xmlLens" = self."xml-lens";
-  "xmlMonad" = self."xml-monad";
-  "xmlParsec" = self."xml-parsec";
-  "xmlPicklers" = self."xml-picklers";
-  "xmlPipe" = self."xml-pipe";
-  "xmlPrettify" = self."xml-prettify";
-  "xmlPush" = self."xml-push";
-  "xmlToJsonFast" = self."xml-to-json-fast";
-  "xmlToJson" = self."xml-to-json";
-  "xmlTypes" = self."xml-types";
-  "xmms2ClientGlib" = self."xmms2-client-glib";
-  "xmms2Client" = self."xmms2-client";
-  "xmonadBluetilebranch" = self."xmonad-bluetilebranch";
-  "xmonadContribBluetilebranch" = self."xmonad-contrib-bluetilebranch";
-  "xmonadContribGpl" = self."xmonad-contrib-gpl";
-  "xmonadContrib" = self."xmonad-contrib";
-  "xmonadEval" = self."xmonad-eval";
-  "xmonadExtras" = self."xmonad-extras";
-  "xmonadScreenshot" = self."xmonad-screenshot";
-  "xmonadUtils" = self."xmonad-utils";
-  "xournalBuilder" = self."xournal-builder";
-  "xournalConvert" = self."xournal-convert";
-  "xournalParser" = self."xournal-parser";
-  "xournalRender" = self."xournal-render";
-  "xournalTypes" = self."xournal-types";
-  "xssSanitize" = self."xss-sanitize";
-  "yahooFinanceConduit" = self."yahoo-finance-conduit";
-  "yahooWebSearch" = self."yahoo-web-search";
-  "yajlEnumerator" = self."yajl-enumerator";
-  "yamlConfig" = self."yaml-config";
-  "yamlLightLens" = self."yaml-light-lens";
-  "yamlLight" = self."yaml-light";
-  "yamlRpcScotty" = self."yaml-rpc-scotty";
-  "yamlRpc" = self."yaml-rpc";
-  "yamlRpcSnap" = self."yaml-rpc-snap";
-  "yampaCanvas" = self."yampa-canvas";
-  "yampaGlfw" = self."yampa-glfw";
-  "yampaGlut" = self."yampa-glut";
-  "yarrImageIo" = self."yarr-image-io";
-  "yesodAngular" = self."yesod-angular";
-  "yesodAuthAccount" = self."yesod-auth-account";
-  "yesodAuthBcrypt" = self."yesod-auth-bcrypt";
-  "yesodAuthDeskcom" = self."yesod-auth-deskcom";
-  "yesodAuthFb" = self."yesod-auth-fb";
-  "yesodAuthHashdb" = self."yesod-auth-hashdb";
-  "yesodAuthKerberos" = self."yesod-auth-kerberos";
-  "yesodAuthLdap" = self."yesod-auth-ldap";
-  "yesodAuthOauth2" = self."yesod-auth-oauth2";
-  "yesodAuthOauth" = self."yesod-auth-oauth";
-  "yesodAuthPam" = self."yesod-auth-pam";
-  "yesodAuth" = self."yesod-auth";
-  "yesodAuthSmbclient" = self."yesod-auth-smbclient";
-  "yesodAuthZendesk" = self."yesod-auth-zendesk";
-  "yesodBin" = self."yesod-bin";
-  "yesodComments" = self."yesod-comments";
-  "yesodContinuations" = self."yesod-continuations";
-  "yesodCore" = self."yesod-core";
-  "yesodDatatables" = self."yesod-datatables";
-  "yesodDefault" = self."yesod-default";
-  "yesodDsl" = self."yesod-dsl";
-  "yesodEventsource" = self."yesod-eventsource";
-  "yesodExamples" = self."yesod-examples";
-  "yesodFay" = self."yesod-fay";
-  "yesodFb" = self."yesod-fb";
-  "yesodFormJson" = self."yesod-form-json";
-  "yesodForm" = self."yesod-form";
-  "yesodGitrepo" = self."yesod-gitrepo";
-  "yesodGoodies" = self."yesod-goodies";
-  "yesodJson" = self."yesod-json";
-  "yesodLinks" = self."yesod-links";
-  "yesodMangopay" = self."yesod-mangopay";
-  "yesodMarkdown" = self."yesod-markdown";
-  "yesodNewsfeed" = self."yesod-newsfeed";
-  "yesodPaginate" = self."yesod-paginate";
-  "yesodPagination" = self."yesod-pagination";
-  "yesodPaginator" = self."yesod-paginator";
-  "yesodPersistent" = self."yesod-persistent";
-  "yesodPlatform" = self."yesod-platform";
-  "yesodPnotify" = self."yesod-pnotify";
-  "yesodPure" = self."yesod-pure";
-  "yesodRecaptcha" = self."yesod-recaptcha";
-  "yesodRoutes" = self."yesod-routes";
-  "yesodRoutesTypescript" = self."yesod-routes-typescript";
-  "yesodRst" = self."yesod-rst";
-  "yesodS3" = self."yesod-s3";
-  "yesodSessionRedis" = self."yesod-session-redis";
-  "yesodSitemap" = self."yesod-sitemap";
-  "yesodStaticAngular" = self."yesod-static-angular";
-  "yesodStatic" = self."yesod-static";
-  "yesodTableview" = self."yesod-tableview";
-  "yesodTestJson" = self."yesod-test-json";
-  "yesodTest" = self."yesod-test";
-  "yesodTextMarkdown" = self."yesod-text-markdown";
-  "yesodTls" = self."yesod-tls";
-  "yesodVend" = self."yesod-vend";
-  "yesodWebsockets" = self."yesod-websockets";
-  "yesodWorker" = self."yesod-worker";
-  "yesPrecure5Command" = self."yes-precure5-command";
-  "yicesEasy" = self."yices-easy";
-  "yicesPainless" = self."yices-painless";
-  "yiContrib" = self."yi-contrib";
-  "yiEmacsColours" = self."yi-emacs-colours";
-  "yiFuzzyOpen" = self."yi-fuzzy-open";
-  "yiGtk" = self."yi-gtk";
-  "yiLanguage" = self."yi-language";
-  "yiMonokai" = self."yi-monokai";
-  "yiRope" = self."yi-rope";
-  "yiSnippet" = self."yi-snippet";
-  "yiSpolsky" = self."yi-spolsky";
-  "yiVty" = self."yi-vty";
-  "yjftpLibs" = self."yjftp-libs";
-  "YogurtStandalone" = self."Yogurt-Standalone";
-  "yorkLava" = self."york-lava";
-  "zasniGerna" = self."zasni-gerna";
-  "zendeskApi" = self."zendesk-api";
-  "zeromq3Conduit" = self."zeromq3-conduit";
-  "zeromq3Haskell" = self."zeromq3-haskell";
-  "zeromq4Haskell" = self."zeromq4-haskell";
-  "zeromqHaskell" = self."zeromq-haskell";
-  "zigbeeZnet25" = self."zigbee-znet25";
-  "zipArchive" = self."zip-archive";
-  "zipConduit" = self."zip-conduit";
-  "zlibBindings" = self."zlib-bindings";
-  "zlibConduit" = self."zlib-conduit";
-  "zlibEnum" = self."zlib-enum";
-  "zlibLens" = self."zlib-lens";
-  "zmidiCore" = self."zmidi-core";
-  "zmidiScore" = self."zmidi-score";
-  "zoomCachePcm" = self."zoom-cache-pcm";
-  "zoomCache" = self."zoom-cache";
-  "zoomCacheSndfile" = self."zoom-cache-sndfile";
-  "zshBattery" = self."zsh-battery";
-
-}
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 673855227b88..e4e077def96f 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -1,7 +1,6 @@
 { pkgs, stdenv, ghc
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
-, provideOldAttributeNames ? false
 }:
 
 with ./lib.nix;
@@ -63,9 +62,8 @@ let
 
       };
 
-  compatLayer = if provideOldAttributeNames then import ./compat-layer.nix else (self: super: {});
   commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
 
 in
 
-  fix (extend (extend (extend (extend haskellPackages commonConfiguration) packageSetConfig) overrides) compatLayer)
+  fix (extend (extend (extend haskellPackages commonConfiguration) packageSetConfig) overrides)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efac01952850..00b791225f85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3779,7 +3779,6 @@ let
 
   haskellPackages = haskell.packages.ghc7101.override {
     overrides = config.haskellPackageOverrides or (self: super: {});
-    provideOldAttributeNames = config.provideOldHaskellAttributeNames or false;
   };
 
   haxe = callPackage ../development/compilers/haxe { };

From a1865004172bace7342d1d3b0f76392dc29d5075 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Apr 2015 15:20:34 +0200
Subject: [PATCH 0374/1143] jhc: convert build to Haskell NG

---
 pkgs/development/compilers/jhc/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix            |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
index 08ac509a2456..091b81b16416 100644
--- a/pkgs/development/compilers/jhc/default.nix
+++ b/pkgs/development/compilers/jhc/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl,
-  regexCompat, HsSyck, random }:
+{ stdenv, fetchurl, perl, ghcWithPackages }:
+
+let ghc = ghcWithPackages (hpkgs: with hpkgs; [
+            binary zlib utf8-string readline fgl regex-compat HsSyck random
+          ]);
+in
 
 stdenv.mkDerivation rec {
   name = "jhc-${version}";
@@ -10,10 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz";
   };
 
-  buildInputs =
-    [ perl ghc binary zlib utf8String
-      readline fgl regexCompat HsSyck random
-    ];
+  buildInputs = [ perl ghc ];
 
   meta = {
     description = "Whole-program, globally optimizing Haskell compiler";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00b791225f85..d1b0dba83d20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3744,8 +3744,7 @@ let
   };
 
   jhc = callPackage ../development/compilers/jhc {
-    inherit (haskellPackages_ghc763) ghc binary zlib utf8String readline fgl
-      regexCompat HsSyck random;
+    inherit (haskell.packages.ghc763) ghcWithPackages;
   };
 
   uhc = callPackage ../development/compilers/uhc/default.nix ({

From 436fbf8564077ca84c2c8aaf8f538d1b425f42b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Apr 2015 15:21:15 +0200
Subject: [PATCH 0375/1143] uhc: convert build to Haskell NG

---
 pkgs/development/compilers/uhc/default.nix | 9 +++------
 pkgs/top-level/all-packages.nix            | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index d2b9ec63a73d..6096fc4e4c4a 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -1,9 +1,6 @@
-{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages,
-  shuffle,
-  hashable, mtl, network, uhc-util, uulib
-}:
+{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
 
-let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] );
+let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
 in stdenv.mkDerivation rec {
   version = "1.1.8.10";
   name = "uhc-${version}";
@@ -16,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";
 
-  buildInputs = [ m4 wrappedGhc clang libtool shuffle ];
+  buildInputs = [ m4 wrappedGhc clang libtool ];
 
   configureFlags = [ "--with-gcc=${clang}/bin/clang" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1b0dba83d20..adf83147d4b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3749,8 +3749,7 @@ let
 
   uhc = callPackage ../development/compilers/uhc/default.nix ({
     stdenv = clangStdenv;
-    ghcWithPackages = haskellngPackages.ghcWithPackages;
-    inherit (haskellngPackages) shuffle hashable mtl network uhc-util uulib;
+    inherit (haskellPackages) ghcWithPackages;
   });
 
   gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {

From c34b6df8d88a6a88b76492447c7cbb44cab40410 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Apr 2015 15:21:28 +0200
Subject: [PATCH 0376/1143] all-packages.nix: drop the NG bit from Haskell

Renamed haskell-ng --> haskell and haskellngPackages --> haskellPackages.
---
 pkgs/top-level/all-packages.nix | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adf83147d4b6..3cdc9dd0bc21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -728,7 +728,7 @@ let
 
   byobu = callPackage ../tools/misc/byobu { };
 
-  cabal2nix = haskellngPackages.callPackage ../development/tools/haskell/cabal2nix {};
+  cabal2nix = haskellPackages.callPackage ../development/tools/haskell/cabal2nix {};
 
   capstone = callPackage ../development/libraries/capstone { };
 
@@ -1736,7 +1736,7 @@ let
 
   ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
     inherit (pythonPackages) ipython;
-    inherit (haskellngPackages) ihaskell ghcWithPackages;
+    inherit (haskellPackages) ihaskell ghcWithPackages;
     packages = config.ihaskell.packages or (self: []);
   };
 
@@ -2362,9 +2362,9 @@ let
 
   pal = callPackage ../tools/misc/pal { };
 
-  pandoc = haskell-ng.lib.overrideCabal haskellngPackages.pandoc (drv: {
+  pandoc = haskell.lib.overrideCabal haskellPackages.pandoc (drv: {
     configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
-    buildTools = drv.buildTools or [] ++ [haskellngPackages.hsb2hs];
+    buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs];
     enableSharedExecutables = false;
     enableSharedLibraries = false;
     isLibrary = false;
@@ -3302,9 +3302,7 @@ let
   };
 
   # To expose more packages for Yi, override the extraPackages arg.
-  yi = callPackage ../applications/editors/yi/wrapper.nix {
-    haskellPackages = haskellngPackages;
-  };
+  yi = callPackage ../applications/editors/yi/wrapper.nix { };
 
   youtube-dl = callPackage ../tools/misc/youtube-dl { };
 
@@ -3445,7 +3443,7 @@ let
 
   compcert = callPackage ../development/compilers/compcert {};
 
-  cryptol = haskellngPackages.cryptol;
+  cryptol = haskellPackages.cryptol;
 
   cython = pythonPackages.cython;
   cython3 = python3Packages.cython;
@@ -7510,7 +7508,7 @@ let
   lambdabot = callPackage ../development/tools/haskell/lambdabot { };
 
   leksah = callPackage ../development/tools/haskell/leksah {
-    inherit (haskellngPackages) ghcWithPackages;
+    inherit (haskellPackages) ghcWithPackages;
   };
 
   librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
@@ -7989,7 +7987,7 @@ let
   agda = callPackage ../build-support/agda {
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
     extension = self : super : { };
-    inherit (haskell-ng.packages.ghc784) Agda;
+    inherit (haskell.packages.ghc784) Agda;
     inherit writeScriptBin;
   };
 
@@ -8000,7 +7998,7 @@ let
   agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { };
 
   AgdaStdlib = callPackage ../development/libraries/agda/agda-stdlib {
-    inherit (haskellngPackages) ghcWithPackages;
+    inherit (haskellPackages) ghcWithPackages;
   };
 
   AgdaSheaves = callPackage ../development/libraries/agda/Agda-Sheaves { };
@@ -10385,7 +10383,7 @@ let
 
   d4x = callPackage ../applications/misc/d4x { };
 
-  darcs = haskell-ng.lib.overrideCabal haskellngPackages.darcs (drv: {
+  darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: {
     configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
     enableSharedExecutables = false;
     isLibrary = false;
@@ -10675,8 +10673,8 @@ let
 
     external = {
       # FIXME: revert when Agda and ghc-mod are fixed on 7.10
-      inherit (haskell-ng.packages.ghc784) ghc-mod Agda;
-      inherit (haskellngPackages) structured-haskell-mode;
+      inherit (haskell.packages.ghc784) ghc-mod Agda;
+      inherit (haskellPackages) structured-haskell-mode;
     };
   };
 
@@ -12676,7 +12674,7 @@ let
   xkblayout-state = callPackage ../applications/misc/xkblayout-state { };
 
   xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix {
-    inherit (haskellngPackages) ghcWithPackages;
+    inherit (haskellPackages) ghcWithPackages;
     packages = self: [];
   };
 

From f8743f3dcd90754ea2a6c6a9f5db3ad6f50bf602 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 May 2015 12:43:24 +0200
Subject: [PATCH 0377/1143] hedgewars: convert the build to Haskell NG

---
 pkgs/games/hedgewars/default.nix | 16 ++++++++++------
 pkgs/top-level/all-packages.nix  |  3 +--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index 3768375d6259..042d4f9fd4aa 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -1,8 +1,13 @@
-{ SDL_image, SDL_ttf, SDL_net, fpc, qt4 , ghc, ffmpeg, freeglut, network, vector
+{ SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut
 , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer
-, utf8String, bytestringShow, hslogger, random, dataenc, zlib, libpng, mesa
+, zlib, libpng, mesa
 }:
 
+let
+  ghc = ghcWithPackages (pkgs: with pkgs; [
+          network vector utf8-string bytestring-show random hslogger dataenc
+        ]);
+in
 stdenv.mkDerivation rec {
   version = "0.9.20.5";
   name = "hedgewars-${version}";
@@ -12,9 +17,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    SDL_ttf SDL_net network vector utf8String bytestringShow hslogger random
-    cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc qt4 ghc ffmpeg freeglut
-    dataenc makeWrapper
+    SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc
+    qt4 ghc ffmpeg freeglut makeWrapper
   ];
 
   patches = [ ./fix-ghc-7.8-build-failure.diff ];
@@ -64,6 +68,6 @@ stdenv.mkDerivation rec {
        hedgehog or hedgehogs after a player's or CPU turn is shown only when
        all movement on the battlefield has ceased).'';
     maintainers = maintainers.kragniz;
-    platforms = platforms.all;
+    platforms = ghc.meta.platforms;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cdc9dd0bc21..47c444b151f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12915,8 +12915,7 @@ let
   gtypist = callPackage ../games/gtypist { };
 
   hedgewars = callPackage ../games/hedgewars {
-    inherit (haskellPackages) ghc network vector utf8String bytestringShow
-      random hslogger dataenc;
+    inherit (haskellPackages) ghcWithPackages;
   };
 
   hexen = callPackage ../games/hexen { };

From ca27e79025fabd1dc6079adf5abe29c4061d33b0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 4 May 2015 13:57:11 +0200
Subject: [PATCH 0378/1143] freemind: 0.9.0 -> 1.0.1

See http://freemind.sourceforge.net/wiki/index.php/FreeMind_1.0.0:_The_New_Features
for an overview of changes in version 1.

Tested briefly by creating, saving & loading a simple mind map. The
problems referred to in the previous version of the build recipe
do not occur for me.

This patch simplifies the build somewhat, but it could still be improved
by not copying the freemind dist wholesale into nix-support and replacing
freemind.sh with a more specialized wrapper.
---
 pkgs/applications/misc/freemind/default.nix | 49 +++++++++------------
 pkgs/top-level/all-packages.nix             |  5 +--
 2 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index f67138e66a77..eeb269e580c3 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,51 +1,42 @@
-{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
+{ stdenv, fetchurl, jdk, jre, ant }:
 
-stdenv.mkDerivation {
-  name = "freemind-0.9.0";
+stdenv.mkDerivation rec {
+  name = "freemind-${version}";
+  version = "1.0.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz;
-    sha256 = "1qd535gwx00d8z56mplxli5529yds2gsmbgla5b0bhhmsdwmrxmf";
+    url = "mirror://sourceforge/freemind/freemind-src-${version}.tar.gz";
+    sha256 = "06c6pm7hpwh9hbmyah3lj2wp1g957x8znfwc5cwygsi7dc98b0h1";
   };
 
   buildInputs = [ jdk ant ];
 
-  phases = "unpackPhase patchPhase buildPhase installPhase";
+  preConfigure = ''
+    chmod +x check_for_duplicate_resources.sh
+    sed 's,/bin/bash,${stdenv.shell},' -i check_for_duplicate_resources.sh
 
-  patchPhase = ''
-    # There is a complain about this. I don't understand it.
-    mkdir plugins/plugins
+    ## work around javac encoding errors
+    export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
   '';
 
-  buildPhase="ant dist";
-  
-  # LIBXCB_ALLOW_SLOPPY_LOCK=true :
-  # don't know yet what this option really means but I'm no longer getting
-  #   Checking Java Version...
-  #   Locking assertion failure.  Backtrace:
-  #   java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
-  # this way
-  # reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
-  # JDK 7 beta seems to have fixed this (bug ?)
+  buildPhase = "ant dist";
 
   installPhase = ''
     mkdir -p $out/{bin,nix-support}
     cp -r ../bin/dist $out/nix-support
     sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
-    cat > $out/bin/freemind << EOF
-    #!/bin/sh
-    export PATH=${coreutils}/bin:${gnugrep}/bin:"$PATH"
-    export JAVA_HOME="${jre}"
-    export LIBXCB_ALLOW_SLOPPY_LOCK=true
-    $out/nix-support/dist/freemind.sh
-    EOF
 
+    cat >$out/bin/freemind <<EOF
+    #! /bin/sh
+    JAVA_HOME=${jre} $out/nix-support/dist/freemind.sh
+    EOF
     chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Mind-mapping software";
     homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
-    license = "GPL";
-  }; 
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..1e0a66614a62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10871,10 +10871,7 @@ let
     inherit (pythonPackages) matplotlib pycollada;
   };
 
-  freemind = callPackage ../applications/misc/freemind {
-    jdk = jdk;
-    jre = jdk;
-  };
+  freemind = callPackage ../applications/misc/freemind { };
 
   freenet = callPackage ../applications/networking/p2p/freenet { };
 

From a58356c953d7a938e33dc801ee1d445f2d229851 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 May 2015 14:00:12 +0200
Subject: [PATCH 0379/1143] useGoldLinker: Fix appending to $NIX_CFLAGS_LINK

---
 pkgs/stdenv/adapters.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 81231fdf97a1..480801d0d01a 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -232,7 +232,7 @@ rec {
   /* Modify a stdenv so that it uses the Gold linker. */
   useGoldLinker = stdenv: stdenv //
     { mkDerivation = args: stdenv.mkDerivation (args // {
-        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_COMPILE or "") + " -fuse-ld=gold";
+        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=gold";
       });
     };
 

From c2bf9c3ee3da9752b7b19a2078ebcf5f15895b79 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 May 2015 14:12:49 +0200
Subject: [PATCH 0380/1143] Typo

---
 nixos/modules/system/boot/luksroot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 20eee8e06e07..d9482a8264d7 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -286,8 +286,8 @@ in
           type = types.bool;
           description = ''
             Whether to allow TRIM requests to the underlying device. This option
-            has security implications, please read the LUKS documentation before
-            activating in.
+            has security implications; please read the LUKS documentation before
+            activating it.
           '';
         };
 

From 28e49dcb41e5f83107b637dfdacc932925e83ad3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 May 2015 14:16:03 +0200
Subject: [PATCH 0381/1143] Style fix

---
 nixos/modules/system/boot/luksroot.nix | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index d9482a8264d7..03070bef483a 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -303,43 +303,43 @@ in
             twoFactor = mkOption {
               default = true;
               type = types.bool;
-              description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)";
+              description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false).";
             };
 
             slot = mkOption {
               default = 2;
               type = types.int;
-              description = "Which slot on the Yubikey to challenge";
+              description = "Which slot on the Yubikey to challenge.";
             };
 
             saltLength = mkOption {
               default = 16;
               type = types.int;
-              description = "Length of the new salt in byte (64 is the effective maximum)";
+              description = "Length of the new salt in byte (64 is the effective maximum).";
             };
 
             keyLength = mkOption {
               default = 64;
               type = types.int;
-              description = "Length of the LUKS slot key derived with PBKDF2 in byte";
+              description = "Length of the LUKS slot key derived with PBKDF2 in byte.";
             };
 
             iterationStep = mkOption {
               default = 0;
               type = types.int;
-              description = "How much the iteration count for PBKDF2 is increased at each successful authentication";
+              description = "How much the iteration count for PBKDF2 is increased at each successful authentication.";
             };
 
             gracePeriod = mkOption {
               default = 2;
               type = types.int;
-              description = "Time in seconds to wait before attempting to find the Yubikey";
+              description = "Time in seconds to wait before attempting to find the Yubikey.";
             };
 
             ramfsMountPoint = mkOption {
               default = "/crypt-ramfs";
               type = types.string;
-              description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1";
+              description = "Path where the ramfs used to update the LUKS key will be mounted during early boot.";
             };
 
             /* TODO: Add to the documentation of the current module:
@@ -359,13 +359,13 @@ in
               fsType = mkOption {
                 default = "vfat";
                 type = types.string;
-                description = "The filesystem of the unencrypted device";
+                description = "The filesystem of the unencrypted device.";
               };
 
               mountPoint = mkOption {
                 default = "/crypt-storage";
                 type = types.string;
-                description = "Path where the unencrypted device will be mounted in stage-1";
+                description = "Path where the unencrypted device will be mounted during early boot.";
               };
 
               path = mkOption {
@@ -419,10 +419,10 @@ in
         mkdir -p $out/etc/ssl
         cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl
 
-      cat > $out/bin/openssl-wrap <<EOF
-#!$out/bin/sh
-EOF
-      chmod +x $out/bin/openssl-wrap
+        cat > $out/bin/openssl-wrap <<EOF
+        #!$out/bin/sh
+        EOF
+        chmod +x $out/bin/openssl-wrap
       ''}
     '';
 
@@ -432,10 +432,10 @@ EOF
         $out/bin/ykchalresp -V
         $out/bin/ykinfo -V
         cat > $out/bin/openssl-wrap <<EOF
-#!$out/bin/sh
-export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
-$out/bin/openssl "\$@"
-EOF
+        #!$out/bin/sh
+        export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
+        $out/bin/openssl "\$@"
+        EOF
         $out/bin/openssl-wrap version
       ''}
     '';

From 3984468692b5a794e71bec665fc89ca874d08c79 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Mon, 4 May 2015 08:34:22 -0400
Subject: [PATCH 0382/1143] nim: 0.10.2 -> 0.11.0

---
 pkgs/development/compilers/nim/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 3b8f46eb6881..3da27d72814a 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "nim-0.10.2";
+  name = "nim-0.11.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "http://nim-lang.org/download/${name}.zip";
-    sha256 = "1jkrf8wgva7kfl0vqs1f3scidi6a85r6bkz2zf90k8gdpin9idrg";
+    sha256 = "0l19rrp6nhwhr2z33np4x32c35iba0hhv6w3qwj1sk8bjfpvz4cw";
   };
 
   buildPhase   = "sh build.sh";
   installPhase =
     ''
+      installBin bin/nim
       substituteInPlace install.sh --replace '$1/nim' "$out"
       sh install.sh $out
     '';

From cf230ccc8268aea2eca7022876bfdb7ebd5cedf5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Apr 2015 12:40:48 +0200
Subject: [PATCH 0383/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/7291c193bd5bca009cbe89c2b153828c6b04d676
 with hackage2nix revision 1e8c48d7b3a9b73489d686ee1ae44f4198130294

---
 .../haskell-modules/hackage-packages.nix      | 1437 ++++++++++-------
 1 file changed, 892 insertions(+), 545 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 04293b81fe70..e7d1a786004b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1027,6 +1027,7 @@ self: {
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BNFC" = callPackage
@@ -1646,9 +1647,12 @@ self: {
      mkDerivation {
        pname = "BufferedSocket";
        version = "0.1.1.0";
+       revision = "2";
        sha256 = "1j0v2g7p8fmjgcdd10wfinakiviv9r1bh3mw897gsk1h5ycbxfjg";
+       editedCabalFile = "646c24722f7f909e6430c9c55a225936c6c12db7d3d57ea0789d03cc800cbc59";
        buildDepends = [ base bytestring network text ];
        jailbreak = true;
+       homepage = "https://github.com/black0range/BufferedSocket";
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -2373,8 +2377,8 @@ self: {
      }:
      mkDerivation {
        pname = "ChasingBottoms";
-       version = "1.3.0.11";
-       sha256 = "00z3h4qpy7n9khygwjzn5dziv4fgvgj72fkan3m7f27d2y3cbw4w";
+       version = "1.3.0.12";
+       sha256 = "0z844mxvkhg114wvbs8z3cvhmhsrzx344yj7yh4fzfm4fcx5j3k9";
        buildDepends = [ base containers mtl QuickCheck random syb ];
        testDepends = [ array base containers mtl QuickCheck random syb ];
        description = "For testing partial and infinite values";
@@ -2646,12 +2650,12 @@ self: {
      }) {};
 
   "Concurrential" = callPackage
-    ({ mkDerivation, async, base, stm }:
+    ({ mkDerivation, async, base }:
      mkDerivation {
        pname = "Concurrential";
-       version = "0.2.1.0";
-       sha256 = "09p9a1a1z8jp9152bl0cir340cv4g45dprajyrdrxqd96b6libhh";
-       buildDepends = [ async base stm ];
+       version = "0.4.0.0";
+       sha256 = "0wgiwpkv65czcc5fllzicgswq6rf0jl646w2n937yhvbdmxfcq6i";
+       buildDepends = [ async base ];
        jailbreak = true;
        homepage = "http://github.com/avieth/Concurrential";
        description = "Mix concurrent and sequential computation";
@@ -3445,10 +3449,8 @@ self: {
     ({ mkDerivation, array, base, pretty }:
      mkDerivation {
        pname = "Diff";
-       version = "0.3.1";
-       revision = "1";
-       sha256 = "10saybbmd3qa4k11g0nqjfja7c87vi540y53j59778y0hhvykfif";
-       editedCabalFile = "d427dd81a963a691e4a683b78d2fd9378a8405b034210ea3423b4982237233dc";
+       version = "0.3.2";
+       sha256 = "13iqqmpadcm7fvqwbfrz94w030rvjh66w2bdls1253128ac2n0vz";
        buildDepends = [ array base pretty ];
        description = "O(ND) diff algorithm in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -3935,8 +3937,8 @@ self: {
     ({ mkDerivation, base, containers, ListLike }:
      mkDerivation {
        pname = "Earley";
-       version = "0.7.0";
-       sha256 = "1jjyrf56crk4zxp7kw148969hjvl5hj248xv3495xb188s610y72";
+       version = "0.7.1";
+       sha256 = "00cm5gd7j7z7kr67wr3k9b793n4rp427psmq7h8x229n25x71nbq";
        buildDepends = [ base containers ListLike ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -5082,8 +5084,8 @@ self: {
     ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
-       version = "1.5.0.0";
-       sha256 = "1y3qbq1qaxnylrb86all96xdja1d62adilyyky0glsbl9dqnzr4j";
+       version = "1.5.0.1";
+       sha256 = "1wf8nav298wsjl417vgp94wdvh38g8hxvb20iyivxhi0g1iw4lhv";
        buildDepends = [ base OpenGLRaw transformers ];
        extraLibraries = [ freeglut mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -5097,8 +5099,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLUT";
-       version = "2.7.0.0";
-       sha256 = "02y565fdfsl7pwl1wmyk5dma9ipc3l0yz7kwcgkvbzvqajhdg13d";
+       version = "2.7.0.1";
+       sha256 = "0kcw8nf0k0ql220yy6sp3cf0vhij378j94l3ffrz3nynxq5xh7pv";
        buildDepends = [
          array base containers OpenGL OpenGLRaw StateVar transformers
        ];
@@ -7619,18 +7621,18 @@ self: {
      }) {};
 
   "HandsomeSoup" = callPackage
-    ({ mkDerivation, base, containers, hspec, HTTP, hxt, hxt-http
-     , MaybeT, mtl, network, network-uri, parsec, transformers
+    ({ mkDerivation, base, containers, hspec, HTTP, hxt, hxt-http, mtl
+     , network, network-uri, parsec, transformers
      }:
      mkDerivation {
        pname = "HandsomeSoup";
-       version = "0.3.5";
-       sha256 = "1d1zanlr1mdxjc69xvbxg5kn5bc08gd960j6lb1x3grhcgmj9krm";
+       version = "0.4";
+       sha256 = "0h760vfqgg40h50ybqpgpzh0skgbggx4xj1zaag3ca6l22950w36";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base containers HTTP hxt hxt-http MaybeT mtl network network-uri
-         parsec transformers
+         base containers HTTP hxt hxt-http mtl network network-uri parsec
+         transformers
        ];
        testDepends = [ base hspec hxt ];
        homepage = "https://github.com/egonSchiele/HandsomeSoup";
@@ -8078,14 +8080,15 @@ self: {
      }:
      mkDerivation {
        pname = "Hoed";
-       version = "0.2.0";
-       sha256 = "0hjjsrk3rbj2q2n6pylg7xg583ns34iz7mg4mhsfgiadz593b7ph";
+       version = "0.2.1";
+       sha256 = "1lfmkyv5c11b0kglf2456ng0r0j78rfwzims8l0a65lff7bkahbv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base containers directory filepath libgraph mtl process
          RBTree regex-posix template-haskell threepenny-gui
        ];
+       jailbreak = true;
        homepage = "http://maartenfaddegon.nl";
        description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack";
        license = stdenv.lib.licenses.bsd3;
@@ -11257,8 +11260,8 @@ self: {
      }:
      mkDerivation {
        pname = "OpenGL";
-       version = "2.12.0.0";
-       sha256 = "0f5s6b1mv3hm6xnansv0jsxahn8acc8nmr9754fx5b44bn1s6iqy";
+       version = "2.12.0.1";
+       sha256 = "1mcfb167jl75qc2hgylh83vf2jqizvyvkvhhb72adi2crc3zqz4b";
        buildDepends = [
          base bytestring GLURaw ObjectName OpenGLRaw StateVar text
          transformers
@@ -11285,8 +11288,8 @@ self: {
     ({ mkDerivation, base, mesa, transformers }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "2.4.1.0";
-       sha256 = "0xikg3jvmh1q514r2vnabw6d481h4qj93zpkp157wd155c7b0vjl";
+       version = "2.5.0.0";
+       sha256 = "008w16flhil8ndrik0nmf0cjjcvh7s69gq8h9nff77dlbvjx1rl8";
        buildDepends = [ base transformers ];
        extraLibraries = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -11322,6 +11325,7 @@ self: {
        homepage = "https://chiselapp.com/user/mwm/repository/OpenSCAD/";
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenVG" = callPackage
@@ -12225,6 +12229,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "QuickCheck-safe" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "QuickCheck-safe";
+       version = "0.1.0.1";
+       revision = "1";
+       sha256 = "0rxqd1n814b9mf6zg1i0g9d96ym9xqdgky7w7qf5bnnnpkk1ckc7";
+       editedCabalFile = "7609c326853799a0cd519bd258c03f89664ee37795ff3099aa3d5004d1f2dee8";
+       buildDepends = [ base QuickCheck ];
+       description = "Safe reimplementation of QuickCheck's core";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Quickson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, either, text
      }:
@@ -12572,20 +12589,19 @@ self: {
      }) {};
 
   "Rasenschach" = callPackage
-    ({ mkDerivation, array, base, containers, convertible, directory
-     , filepath, ghc, monad-loops, SDL, SDL-gfx, SDL-image, SDL-mixer
-     , SDL-ttf, template-haskell, time, Yampa
+    ({ mkDerivation, array, base, bytestring, cereal, containers
+     , convertible, directory, filepath, ghc, GLUT, monad-loops, OpenGL
+     , OpenGLRaw, time, Yampa
      }:
      mkDerivation {
        pname = "Rasenschach";
-       version = "0.1.2";
-       sha256 = "1axjmid2kdyg9jzc9k8x1jyzlkxa1iws8608pyrgix8vswxxxr0w";
+       version = "0.1.3.1";
+       sha256 = "0y90clz236lqhacv6ba4w3qx4fyd5yls9nh4chk8s945hr92jg57";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         array base containers convertible directory filepath ghc
-         monad-loops SDL SDL-gfx SDL-image SDL-mixer SDL-ttf
-         template-haskell time Yampa
+         array base bytestring cereal containers convertible directory
+         filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa
        ];
        homepage = "http://hub.darcs.net/martingw/Rasenschach";
        description = "Soccer simulation";
@@ -13354,6 +13370,7 @@ self: {
        buildDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SessionLogger" = callPackage
@@ -15424,8 +15441,10 @@ self: {
      }:
      mkDerivation {
        pname = "Workflow";
-       version = "0.8.1";
-       sha256 = "0z23g68gcbbn43i78cql4is9js3m4z16rm2x8s57f73n0hx7f00l";
+       version = "0.8.3";
+       revision = "1";
+       sha256 = "08r1s840771z1gy44dj3xc6ary7gk3ka3zvji5pmgzi998x4p6y8";
+       editedCabalFile = "1be542eaf091e04c561a2a589f37330b0a65d6d3d5a44609c197a74e8385c64b";
        buildDepends = [
          base binary bytestring containers directory exceptions
          extensible-exceptions mtl old-time RefSerialize stm TCache vector
@@ -16147,15 +16166,12 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate";
-       version = "0.15.0.0";
-       revision = "2";
-       sha256 = "1hi3zm1swm9fank9w98009pwcgccw6w2j2ilb970sbxyb0xf8nps";
-       editedCabalFile = "98cea47c7fdb595a54cb06751fe54eb800059e5a2b1f9699a65d4e845b55cd4c";
+       version = "0.15.1.0";
+       sha256 = "07bbam9za0g15vm0h0p9dypblw2f709v4qmvc52jcvmsv1drl3yv";
        buildDepends = [
          array base containers fclabels ghc-prim hashable hashtables pretty
          template-haskell unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/AccelerateHS/accelerate/";
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
@@ -16725,6 +16741,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "acme-safe" = callPackage
+    ({ mkDerivation, acme-dont, base }:
+     mkDerivation {
+       pname = "acme-safe";
+       version = "0.1.0.0";
+       sha256 = "0bmv45b3v45967gdvsy37xfw6x50qpl8234y20m3nc48f4nf0z68";
+       buildDepends = [ acme-dont base ];
+       homepage = "http://github.com/fgaz/acme-safe";
+       description = "Safe versions of some infamous haskell functions such as fromJust";
+       license = "unknown";
+     }) {};
+
   "acme-schoenfinkel" = callPackage
     ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-quickcheck2, test-framework-th
@@ -16820,8 +16848,8 @@ self: {
      }:
      mkDerivation {
        pname = "active";
-       version = "0.2.0.1";
-       sha256 = "1a7vraffac4md7bcxxzl6x9jyy0pz37w3m9drnk4lrjhzirbkn89";
+       version = "0.2.0.2";
+       sha256 = "1xmm0xa4npdsbib5vmgzzqyq8b1abqx2j142zfal3b3nprfjpngk";
        buildDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -17227,8 +17255,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-diff";
-       version = "0.1.1.1";
-       sha256 = "102fa65xnma0d1g7gyhjagybzjys93m32gwxc9zliz3wbbpyarp3";
+       version = "0.1.1.2";
+       sha256 = "00bmvdnqhw364i1j2f1n2didfzpgs93ia8djmmq81adgry73xmbq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -17330,8 +17358,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-schema";
-       version = "0.3.0.3";
-       sha256 = "1cb09lq21mb4471w3k3gjhhq7g081wkpnx39bqy15lj6alpbqvd2";
+       version = "0.3.0.4";
+       sha256 = "05iizrs50q0ndrh3p20hj1pfv45b5q678njhaxd22fcpqypvr56k";
        buildDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -17571,15 +17599,14 @@ self: {
 
   "air" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
-     , dlist, filepath, mtl, text, time
+     , filepath, mtl, text, time
      }:
      mkDerivation {
        pname = "air";
-       version = "2014.11.17";
-       sha256 = "1npn2pqc1ndk603as2nhvgq4bclzdfslk7w5y85kpsq77s5mahdh";
+       version = "2015.5.4";
+       sha256 = "1g9zzsxhmkiqpdmmapsvvh3vq5dp5gmmyr0x7ja59529xndslwaj";
        buildDepends = [
-         array base bytestring containers directory dlist filepath mtl text
-         time
+         array base bytestring containers directory filepath mtl text time
        ];
        homepage = "https://github.com/nfjinjing/air";
        description = "air";
@@ -17589,16 +17616,15 @@ self: {
 
   "air-extra" = callPackage
     ({ mkDerivation, air, array, base, bytestring, containers
-     , directory, filepath, old-locale, old-time, parallel, parsec
-     , regexpr, text, time
+     , directory, filepath, parallel, parsec, regexpr, text, time
      }:
      mkDerivation {
        pname = "air-extra";
-       version = "2013.9.15";
-       sha256 = "0mf3wpb7d46b58fb4n6hbqix5wxhh55k7g6z22q28ygrmk77himg";
+       version = "2015.5.4";
+       sha256 = "07k01yjr9kj5q0dr871w9jmf23sdd75xrwgldsrkpppfc8kvnd97";
        buildDepends = [
-         air array base bytestring containers directory filepath old-locale
-         old-time parallel parsec regexpr text time
+         air array base bytestring containers directory filepath parallel
+         parsec regexpr text time
        ];
        homepage = "https://github.com/nfjinjing/air-extra";
        description = "air-extra";
@@ -17817,11 +17843,10 @@ self: {
     ({ mkDerivation, base, stm, time, unbounded-delays }:
      mkDerivation {
        pname = "alarmclock";
-       version = "0.2.0.5";
-       sha256 = "1j0g4xff6i69wx5m45xmx6dsdb5sdl85id967mflnrczgj36d1fd";
+       version = "0.2.0.6";
+       sha256 = "1jr4pxrgz6gq1dcnkkggbaq3gnj0gr1g14mf174f2b4qzgl63cq1";
        buildDepends = [ base stm time unbounded-delays ];
        testDepends = [ base time ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/davecturner/alarmclock";
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
@@ -18986,20 +19011,25 @@ self: {
      }) {};
 
   "ampersand" = callPackage
-    ({ mkDerivation, base, bytestring, ConfigFile, containers
-     , directory, filepath, graphviz, hashable, mtl, old-locale, pandoc
-     , pandoc-types, process, split, SpreadsheetML, time, utf8-string
+    ({ mkDerivation, base, bytestring, containers, csv, directory
+     , filepath, graphviz, hashable, HDBC, HDBC-odbc, HStringTemplate
+     , mtl, old-locale, old-time, pandoc, pandoc-types, process
+     , simple-sql-parser, split, SpreadsheetML, text, time, utf8-string
+     , uulib
      }:
      mkDerivation {
        pname = "ampersand";
-       version = "3.0.2";
-       sha256 = "1ipsh4nvyvdjgblzq6rpq44m1wsps0jvka7m762nh9418w697myc";
-       isLibrary = true;
+       version = "3.0.3";
+       revision = "1";
+       sha256 = "0xasmdcsrnvyfw3q5jkd1cpmi26yj8c5ifzgmjy6qp6wpsldswqc";
+       editedCabalFile = "42a4a0f82e5c10b76a8412ba625df82da44d7e28353a9efa5aad2b10e7cc9d2a";
+       isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring ConfigFile containers directory filepath graphviz
-         hashable mtl old-locale pandoc pandoc-types process split
-         SpreadsheetML time utf8-string
+         base bytestring containers csv directory filepath graphviz hashable
+         HDBC HDBC-odbc HStringTemplate mtl old-locale old-time pandoc
+         pandoc-types process simple-sql-parser split SpreadsheetML text
+         time utf8-string uulib
        ];
        jailbreak = true;
        homepage = "ampersand.sourceforge.net";
@@ -19280,19 +19310,19 @@ self: {
 
   "antagonist" = callPackage
     ({ mkDerivation, antisplice, base, chatty, chatty-utils, ironforge
-     , mtl, old-locale, shakespeare, text, time, yesod, yesod-auth
+     , mtl, shakespeare, text, time, time-locale-compat, yesod
+     , yesod-auth
      }:
      mkDerivation {
        pname = "antagonist";
-       version = "0.1.0.25";
-       sha256 = "1dw9sp5aan1i8hpzdflms8w2n113jbcrg6hn3qfhnih9bb45v7jy";
+       version = "0.1.0.29";
+       sha256 = "1dkrjn07445kmdq09fwdlnk676dvjzrzkgcfwni661lr5kbrj7p9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         antisplice base chatty chatty-utils ironforge mtl old-locale
-         shakespeare text time yesod yesod-auth
+         antisplice base chatty chatty-utils ironforge mtl shakespeare text
+         time time-locale-compat yesod yesod-auth
        ];
-       jailbreak = true;
        homepage = "http://doomanddarkness.eu/pub/antisplice";
        description = "A web interface to Antisplice dungeons";
        license = stdenv.lib.licenses.agpl3;
@@ -19393,13 +19423,13 @@ self: {
      }:
      mkDerivation {
        pname = "antisplice";
-       version = "0.17.0.3";
-       sha256 = "0i7zm0s8vfkc4gwrw9aphj8xgppja50m71wkbkcibnrwvbyxdcqm";
+       version = "0.17.1.0";
+       sha256 = "1f4872gmw1h2xl5jy9ajck5n4qmxdwk0f3v3bk1fxc9x8y5mscny";
        buildDepends = [
          base chatty chatty-utils haskeline mtl template-haskell text time
          transformers
        ];
-       jailbreak = true;
+       homepage = "http://doomanddarkness.eu/pub/antisplice";
        description = "An engine for text-based dungeons";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19948,15 +19978,22 @@ self: {
      }) {};
 
   "applicative-fail" = callPackage
-    ({ mkDerivation, base, bifunctors }:
+    ({ mkDerivation, base, bifunctors, checkers, dlist, mtl, QuickCheck
+     , tasty, tasty-quickcheck, transformers, transformers-base
+     }:
      mkDerivation {
        pname = "applicative-fail";
-       version = "0.0.3";
-       sha256 = "057ii1519qwjhg64vahbg2z2a4ydb2ndd1bjzz6cb1cx3n7nigr8";
-       buildDepends = [ base bifunctors ];
+       version = "1.1.0";
+       sha256 = "0slxvf7iah7k8mpap6sc1kfibgah8pjls5z82zf62kf7ywzqmfkf";
+       buildDepends = [
+         base bifunctors dlist mtl transformers transformers-base
+       ];
+       testDepends = [
+         base checkers mtl QuickCheck tasty tasty-quickcheck
+       ];
        jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/applicative-fail";
-       description = "Applicative functor which collects all your fails";
+       description = "Applicative functor and monad which collects all your fails";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -20789,16 +20826,13 @@ self: {
 
   "asn1-parse" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring, mtl
-     , text
      }:
      mkDerivation {
        pname = "asn1-parse";
-       version = "0.9.0";
-       sha256 = "0m093wwndyxvy72qlnb70bp8w5ahimrlv1dp972l9s9l5jc4pjg3";
-       buildDepends = [
-         asn1-encoding asn1-types base bytestring mtl text
-       ];
-       homepage = "http://github.com/vincenthz/hs-asn1";
+       version = "0.9.1";
+       sha256 = "1pik647wjj1mpk2vj74kjdiblqmkk5s8yxf987maa9bjm2x8g071";
+       buildDepends = [ asn1-encoding asn1-types base bytestring mtl ];
+       homepage = "https://github.com/vincenthz/hs-asn1";
        description = "Simple monadic parser for ASN1 stream types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21570,17 +21604,16 @@ self: {
 
   "aur" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, filepath, lens
-     , lens-aeson, mtl, text, vector, wreq
+     , lens-aeson, mtl, text, vector, wreq-sb
      }:
      mkDerivation {
        pname = "aur";
-       version = "2.0.3";
-       sha256 = "0gnvnqxkgyq9ydrx5divqd9g9ja6znj2zqn0ra8q3i3701cczzw2";
+       version = "2.0.4";
+       sha256 = "1f6j85nz1mb9cn4l4pqv6jcx42m6rp8fj1g4xrfp8k2y9yyx7hjn";
        buildDepends = [
          aeson aeson-pretty base filepath lens lens-aeson mtl text vector
-         wreq
+         wreq-sb
        ];
-       jailbreak = true;
        homepage = "https://github.com/fosskers/haskell-aur";
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
@@ -21690,10 +21723,8 @@ self: {
      }:
      mkDerivation {
        pname = "auto";
-       version = "0.4.1.0";
-       revision = "1";
-       sha256 = "00l7dxcg6xx63vkwa8kx4k8bcpvxdyhmb4gvffnwkf1dg4kqd9qd";
-       editedCabalFile = "5170b5e4efc880cae0dc3275adf79a0b8491ebe32fd54e42116c863f9e76df50";
+       version = "0.4.2.0";
+       sha256 = "1kmji11dyyxc2m4kak6r4xnjw8hl5rvwdy3vaf9mylf68hk0jmfh";
        buildDepends = [
          base bytestring cereal containers deepseq MonadRandom profunctors
          random semigroups transformers
@@ -21799,8 +21830,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.5";
-       sha256 = "17291lzz09d5rpz62395jfqkwc06sp8pwd8wq04wycsk0hizz32i";
+       version = "0.0.6";
+       sha256 = "0x89zacl658376j4w4jk39fnlx99r10qqw01fg4vcvx7kgqdlsgc";
        buildDepends = [
          aeson attoparsec base base16-bytestring bytestring containers
          cryptohash inflections influxdb MonadRandom mtl network
@@ -21896,8 +21927,10 @@ self: {
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.11.4";
-       sha256 = "1mjpk17c2grlbxkwskplzqwn0icxpmv5pjc27xgwah5g97cm9hik";
+       version = "0.12";
+       revision = "1";
+       sha256 = "1vjqrj3hj92vvik2c3qlld9gyh0an4xl2hx01hnpypgawa1j1180";
+       editedCabalFile = "c40b53aee98659e34f2383439dacd26bb98228056283a05d25e55b3c8226f4a7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -22705,11 +22738,10 @@ self: {
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holidays-england";
-       version = "0.1.0.2";
-       sha256 = "0kjn5f76w9ff73blg8apxkhfsk1clv2i52gr4frgqn7l6f32yp22";
+       version = "0.1.0.3";
+       sha256 = "12k01aa0293izblgr7kszkilnw29716hddqfs9cq18h49gp6m7s5";
        buildDepends = [ base containers time ];
        testDepends = [ base containers hspec QuickCheck time ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
@@ -22842,8 +22874,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, unix }:
      mkDerivation {
        pname = "base-compat";
-       version = "0.8.1";
-       sha256 = "0v4vrx5rkhd9r4zca86gr6gh7ggbkg2h9i7vavm41j4y96ipcqvz";
+       version = "0.8.1.1";
+       sha256 = "0j1k7yxahprbajzvfxvdfzz3frx8s8karq1kv8v02yh0lsw7hjki";
        buildDepends = [ base unix ];
        testDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
@@ -22867,11 +22899,11 @@ self: {
     ({ mkDerivation, base, ghc-prim, hspec }:
      mkDerivation {
        pname = "base-orphans";
-       version = "0.2.0";
-       sha256 = "12xakv3vkgmdrgv6w5qddwkgyz2vw902fbps3gd334nzhgbxciwn";
+       version = "0.3.0";
+       sha256 = "19cqh95kpd34wf550b9j417v8z4gzczqiv0ghq9fp3wwd7j5qcmw";
        buildDepends = [ base ghc-prim ];
        testDepends = [ base hspec ];
-       homepage = "https://github.com/haskell-compat/base-orphans";
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -23286,9 +23318,12 @@ self: {
      mkDerivation {
        pname = "bed-and-breakfast";
        version = "0.4.3";
+       revision = "1";
        sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z";
+       editedCabalFile = "3efbed0b49112bb9addddcd87fdb8ffe58f14497c16a2aba9deb39e10dae0d4f";
        buildDepends = [ array base binary deepseq template-haskell ];
        testDepends = [ base QuickCheck ];
+       jailbreak = true;
        homepage = "https://hackage.haskell.org/package/bed-and-breakfast";
        description = "Efficient Matrix operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
@@ -23571,6 +23606,7 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bibtex" = callPackage
@@ -25114,6 +25150,50 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bitcoin-api" = callPackage
+    ({ mkDerivation, aeson, base, base58string, binary, bitcoin-block
+     , bitcoin-script, bitcoin-tx, bitcoin-types, bytestring, groom
+     , hexstring, hspec, http-client, lens, lens-aeson, text
+     , unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "bitcoin-api";
+       version = "0.9.0";
+       sha256 = "0rsfmmjrz6znfcbj0yqjzpy66xwgc3lk4c29yzqwzqmmghryks7z";
+       buildDepends = [
+         aeson base base58string binary bitcoin-block bitcoin-script
+         bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
+         unordered-containers wreq
+       ];
+       testDepends = [
+         base base58string bitcoin-script bitcoin-tx bytestring groom hspec
+         http-client lens text wreq
+       ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Provides access to the RPC API of Bitcoin Core";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "bitcoin-block" = callPackage
+    ({ mkDerivation, base, binary, bitcoin-tx, bitcoin-types
+     , bytestring, cryptohash, hexstring, hspec, largeword
+     }:
+     mkDerivation {
+       pname = "bitcoin-block";
+       version = "0.9.0";
+       sha256 = "0xqdf7hqcgrzmafh3lp3sq3jm6nblqbhfwvfihmjm4srdj1x77m2";
+       buildDepends = [
+         base binary bitcoin-tx bitcoin-types bytestring cryptohash
+         hexstring largeword
+       ];
+       testDepends = [
+         base bitcoin-tx bitcoin-types bytestring hexstring hspec
+       ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Utility functions for manipulating bitcoin blocks";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bitcoin-rpc" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, ghc-prim, HTTP, HUnit, mtl, network, QuickCheck
@@ -25155,15 +25235,16 @@ self: {
      }) {};
 
   "bitcoin-tx" = callPackage
-    ({ mkDerivation, base, binary, bitcoin-script, bytestring
-     , cryptohash, hexstring, hspec
+    ({ mkDerivation, base, binary, bitcoin-script, bitcoin-types
+     , bytestring, cryptohash, hexstring, hspec
      }:
      mkDerivation {
        pname = "bitcoin-tx";
-       version = "0.12.0";
-       sha256 = "13n64i73pqw052aw9sqmkdlf1ns6wh7z1ba1v8s9lv2zzphn8cxv";
+       version = "0.12.1";
+       sha256 = "130ci02j4zcpzmysg0ij54jvzh4j510jb37aa753fm3hpbgczzm5";
        buildDepends = [
-         base binary bitcoin-script bytestring cryptohash hexstring
+         base binary bitcoin-script bitcoin-types bytestring cryptohash
+         hexstring
        ];
        testDepends = [ base bitcoin-script bytestring hexstring hspec ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -25177,8 +25258,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-types";
-       version = "0.9.0";
-       sha256 = "1y2v4cm00pmysi051z37rsxis0i97bjk5zvybmpxal9g4k8mlbi5";
+       version = "0.9.1";
+       sha256 = "0hk03crwl8xh9gm3b53fgf76qd0jn4wbvvxjm1035lrbi028cm4y";
        buildDepends = [
          base base58string binary bytestring hexstring text
        ];
@@ -28172,18 +28253,16 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
-     , process, time, unix
+    ({ mkDerivation, base, Cabal, directory, filepath, process, time
+     , unix
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "0.9.5";
-       sha256 = "0a2j9py1dafkscs9lz70zxl54vahba62zb8r6rv3rbhnv0d3llf3";
+       version = "0.9.5.1";
+       sha256 = "0hqm7r209d5ny9860j7dwr3ksgm5xp4pgml9h379y4wf4ddwf0h2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
-         base Cabal directory filepath old-locale process time unix
-       ];
+       buildDepends = [ base Cabal directory filepath process time unix ];
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
@@ -28474,6 +28553,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cabalQuery" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, MissingH
+     , pretty
+     }:
+     mkDerivation {
+       pname = "cabalQuery";
+       version = "0.1.0.1";
+       sha256 = "195wsfh813z6pmba3lz2xgfcqijcql6xwqsggqb5rmzqxbkvk0bd";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base Cabal containers directory MissingH pretty ];
+       jailbreak = true;
+       homepage = "http://github.com/creswick/cabal-query";
+       description = "A simple tool to query cabal files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cabalg" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, process }:
      mkDerivation {
@@ -28579,6 +28675,7 @@ self: {
        extraLibraries = [ cabocha ];
        homepage = "http://github.com/pecorarista/hscabocha";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { cabocha = null;};
 
   "cached-traversable" = callPackage
@@ -29547,9 +29644,10 @@ self: {
      mkDerivation {
        pname = "cautious-file";
        version = "1.0.2";
+       revision = "1";
        sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
+       editedCabalFile = "c6183204fc6d4767c8b8c4b954f6908fd376054c28904866a90a66497970d893";
        buildDepends = [ base bytestring directory filepath unix ];
-       jailbreak = true;
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29577,18 +29675,19 @@ self: {
   "cblrepo" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
      , containers, directory, filepath, mtl, optparse-applicative
-     , process, safe, tar, unix, Unixutils, utf8-string, zlib
+     , process, safe, stringsearch, tar, transformers, unix, Unixutils
+     , utf8-string, zlib
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.15.1";
-       sha256 = "1cwkkszbxx90jykd6b4r6kkjz4dpi86xx99fb8h3aqczyccn6hvw";
+       version = "0.16.0";
+       sha256 = "0mgavwbdagnxcyhzg5cypz1rvzz8wj6xxj72b44j49262jm1lh15";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson ansi-wl-pprint base bytestring Cabal containers directory
-         filepath mtl optparse-applicative process safe tar unix Unixutils
-         utf8-string zlib
+         filepath mtl optparse-applicative process safe stringsearch tar
+         transformers unix Unixutils utf8-string zlib
        ];
        jailbreak = true;
        description = "Tool to maintain a database of CABAL packages and their dependencies";
@@ -30242,13 +30341,14 @@ self: {
      }:
      mkDerivation {
        pname = "chatty";
-       version = "0.6.2.1";
-       sha256 = "0504xxgzfrgqa6yk8c1xw6qilqq2bq1anmncm5863wg7sd0xknx9";
+       version = "0.6.4.1";
+       sha256 = "02garbdwhg32f089xd18w1i5hr9cbmvzk6cjdsl48w976liwqglz";
        buildDepends = [
          ansi-terminal base chatty-utils directory mtl process random setenv
          template-haskell text time transformers unix
        ];
        jailbreak = true;
+       homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Some monad transformers and typeclasses for abstraction of global dependencies";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30258,10 +30358,10 @@ self: {
     ({ mkDerivation, base, chatty, transformers }:
      mkDerivation {
        pname = "chatty-text";
-       version = "0.6.0.1";
-       sha256 = "1p88yn8c1ckckhxy8k0w50n3mjy8inrwh9zaas5wawaz286chxzh";
+       version = "0.6.2.0";
+       sha256 = "0gfgzqpdjja3ddz3hkynm31p9ma3g16qxavqcwybmp3v6h1pa2l3";
        buildDepends = [ base chatty transformers ];
-       jailbreak = true;
+       homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30271,10 +30371,10 @@ self: {
     ({ mkDerivation, base, mtl, text, transformers }:
      mkDerivation {
        pname = "chatty-utils";
-       version = "0.7.1.2";
-       sha256 = "17jilk0p6wvnpc064wjk6flilz78yx32f092wn0z8dbc9hpw32wf";
+       version = "0.7.3.2";
+       sha256 = "1d929y9zqj9mr99v691ymp0amy1x6nzkxjdaj3ylbgydjw1m3j8j";
        buildDepends = [ base mtl text transformers ];
-       jailbreak = true;
+       homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Some utilities every serious chatty-based application may need";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30349,8 +30449,8 @@ self: {
     ({ mkDerivation, array, base, QuickCheck, random }:
      mkDerivation {
        pname = "checkers";
-       version = "0.4.2";
-       sha256 = "0v2qvd0g0k2j3h07003wc2vkrknq6y3ld1qgh69j4r6049x9qhaj";
+       version = "0.4.3";
+       sha256 = "0ry5c9c1hcp9rgf2h3gy5ajjp96anhp2738hgzrvf9aj90hr6n60";
        buildDepends = [ array base QuickCheck random ];
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -31051,8 +31151,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5.3";
-       sha256 = "1xi6j5d5qz0ar1mm1prvxk3vqigrnyiyd88a537636vwbvh8ndns";
+       version = "0.5.4";
+       sha256 = "1ncwx28g0b99f8515qnyrqbmx4gvdfbf97199m2njk2rw5xbj3ka";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -31077,8 +31177,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.1";
-       sha256 = "1arkx9510klyrhihkqhz3dqg3m3lp0zm0hycfwsl3qyc1jdndsby";
+       version = "0.5.2";
+       sha256 = "1i7yk190vchcb3zm1fvmghsvjfpbrkwhh5l9vifxdsp34q10yr3g";
        buildDepends = [
          aeson attoparsec base bytestring concurrent-supply containers
          deepseq directory errors fgl filepath hashable lens mtl pretty
@@ -31130,8 +31230,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.5.1";
-       sha256 = "0k24ic9fv72llpa507lxd1xyq7sbczh8ilis9x1axyl8yv132y67";
+       version = "0.5.2";
+       sha256 = "1061ksf7riyv39rwaahn2d08xm2akyanmh18024qd3hz3i5gpghb";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31148,8 +31248,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5.2";
-       sha256 = "0ywcjrg3x0pcx2mj03bzq7hf4vmrivkckpa939ddqzcab114kkgl";
+       version = "0.5.3";
+       sha256 = "1x43w6sjscvkikrczjdq94wq24k0q92fwifk4561kp6qm2brlw1q";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31261,7 +31361,9 @@ self: {
      mkDerivation {
        pname = "clay";
        version = "0.10.1";
+       revision = "1";
        sha256 = "0m0ajbgypn9ki741x2bmcmpmpkccazv76wh8b9gha9483cl21f1v";
+       editedCabalFile = "8ecb3c320c9470f2bf250552d7fac738520d90d28e8e90b11922d1c4940a0263";
        buildDepends = [ base mtl text ];
        testDepends = [
          base HUnit mtl test-framework test-framework-hunit text
@@ -32030,6 +32132,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cmd-item" = callPackage
+    ({ mkDerivation, base, containers, hspec, hspec-laws, HUnit
+     , QuickCheck, quickcheck-instances, templater, text
+     }:
+     mkDerivation {
+       pname = "cmd-item";
+       version = "0.0.1.0";
+       sha256 = "1lawn0v32dn38xf3jaz70gks99llbq453zlf876pylinh5id7q62";
+       buildDepends = [ base containers templater text ];
+       testDepends = [
+         base hspec hspec-laws HUnit QuickCheck quickcheck-instances text
+       ];
+       homepage = "https://github.com/geraud/cmd-item";
+       description = "Library to compose and reuse command line fragments";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cmdargs" = callPackage
     ({ mkDerivation, base, filepath, process, template-haskell
      , transformers
@@ -32174,8 +32293,8 @@ self: {
      }:
      mkDerivation {
        pname = "cndict";
-       version = "0.5.5";
-       sha256 = "0l2fknpg07r5hp2as3irqqa7zik9p8n3jyi74a2b3d001d54gc7z";
+       version = "0.6.1";
+       sha256 = "0pi0n1chwv6y3ch7dw2smrllwsdiy6r295lmmsnfnbprc8w6gksq";
        buildDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
@@ -32898,8 +33017,10 @@ self: {
      }:
      mkDerivation {
        pname = "compdata";
-       version = "0.9";
-       sha256 = "1wk9vj834l3fc64fcsrgc9hz5f2z7461hs8lv1ldkfsixx4mxyqc";
+       version = "0.10";
+       revision = "1";
+       sha256 = "1538jdaww57vil32hvd6s13lfiwkczpjgym07ipwccw06cj49l8h";
+       editedCabalFile = "09ef1d8f84ae93c4f212661d411542155b0da1c8202e8bf10bfc18d69001a82e";
        buildDepends = [
          base containers deepseq derive mtl QuickCheck template-haskell
          th-expand-syns transformers tree-view
@@ -32923,28 +33044,27 @@ self: {
        sha256 = "1hlv6a4ywlnr86pzrlffqbg55mfkrkkxn2yir6a28bdirgi69fkf";
        editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130";
        buildDepends = [ base compdata containers projection ];
+       jailbreak = true;
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compdata-dags" = callPackage
-    ({ mkDerivation, base, compdata, containers, HUnit, mtl, projection
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, unordered-containers, vector
+    ({ mkDerivation, base, compdata, containers, HUnit, mtl, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "compdata-dags";
-       version = "0.1";
-       revision = "1";
-       sha256 = "1ijr3lpl0g5l5xynnwwzj4rflgfgw1y2b4ldabbw5qlk4qa0gr5j";
-       editedCabalFile = "556bbb62f4b8b6d738a20775066342b4d911fed945729da5aea072fd5df65044";
+       version = "0.2";
+       sha256 = "0z5vjfm0c4bcixnh951mzc06977l3lcs0v8mz6pbn65qbvv0d27c";
        buildDepends = [
-         base compdata containers mtl projection unordered-containers vector
+         base compdata containers mtl unordered-containers vector
        ];
        testDepends = [
-         base compdata containers HUnit mtl projection QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
+         base compdata containers HUnit mtl QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
          unordered-containers vector
        ];
        description = "Compositional Data Types on DAGs";
@@ -32966,6 +33086,7 @@ self: {
          base compdata containers HUnit mtl template-haskell test-framework
          test-framework-hunit transformers
        ];
+       jailbreak = true;
        description = "Parametric Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33173,6 +33294,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "computations" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "computations";
+       version = "0.0.0.0";
+       sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260";
+       buildDepends = [ base ];
+       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/computations";
+       description = "Advanced notions of computation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "concatenative" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -33538,11 +33671,11 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.4.1";
-       sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6";
+       version = "1.2.4.2";
+       sha256 = "1shx58xg4lqf0dj50m2svh132xlzasgg6j175hxk8zf8k1v9b1zl";
        buildDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
-         transformers-base void
+         transformers-base
        ];
        testDepends = [
          base containers exceptions hspec mtl QuickCheck resourcet safe
@@ -36235,8 +36368,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptol";
-       version = "2.2.2";
-       sha256 = "1rqnrjxvkisis7m5zfhyw8717a9jnjgdmm6nnbdrnbxmsabsad20";
+       version = "2.2.3";
+       sha256 = "0g8xf65v255z8qm30n3d1h4fval763lns14vb36cyrp1gp48rf2i";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -36246,7 +36379,6 @@ self: {
          template-haskell text tf-random transformers utf8-string
        ];
        buildTools = [ alex happy ];
-       jailbreak = true;
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -36315,16 +36447,16 @@ self: {
   "csound-expression" = callPackage
     ({ mkDerivation, base, Boolean, colour, csound-expression-dynamic
      , csound-expression-opcodes, csound-expression-typed, data-default
-     , process, transformers
+     , process, temporal-media, transformers
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "4.6.1";
-       sha256 = "0q9s4zqqxyj5y7bvinvccssp6kj3q69arljwhspj9p8rsvzlqpr3";
+       version = "4.7.1";
+       sha256 = "1zrllrj4jd26w7z080js2l9j939sbbcbp4zjdl37c68wsvc59qr9";
        buildDepends = [
          base Boolean colour csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
-         process transformers
+         process temporal-media transformers
        ];
        homepage = "https://github.com/anton-k/csound-expression";
        description = "library to make electronic music";
@@ -36338,8 +36470,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-dynamic";
-       version = "0.1.4.1";
-       sha256 = "0x0i2xsvjvm4ag485503x0yc3ii9j7xkr5v9w5xk4494rp8w15f8";
+       version = "0.1.4.3";
+       sha256 = "1rzfah8d7j7s45w6zvrs5sabplcapx6njaimkmvfj9dby2brxprw";
        buildDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          transformers wl-pprint
@@ -36368,15 +36500,16 @@ self: {
   "csound-expression-typed" = callPackage
     ({ mkDerivation, base, Boolean, colour, containers
      , csound-expression-dynamic, data-default, deepseq, ghc-prim
-     , stable-maps, transformers, wl-pprint
+     , stable-maps, temporal-media, transformers, wl-pprint
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.0.7.3.1";
-       sha256 = "0k5yqg8mvslx05bjvxz64hg04d0wky9zzdfsazvc1yf36spgpw9f";
+       version = "0.0.7.5";
+       sha256 = "1cazjx5xa81zxjds8xg4xdqp42y0izs0gx07684bshcvsz2hp91s";
        buildDepends = [
          base Boolean colour containers csound-expression-dynamic
-         data-default deepseq ghc-prim stable-maps transformers wl-pprint
+         data-default deepseq ghc-prim stable-maps temporal-media
+         transformers wl-pprint
        ];
        homepage = "https://github.com/anton-k/csound-expression-typed";
        description = "typed core for the library csound-expression";
@@ -36388,8 +36521,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.5.0";
-       sha256 = "14ya1sbq5kqg4nbl6iak181rhi8znj33vbcxnhzbbcybx1y6rsh1";
+       version = "0.0.6.1";
+       sha256 = "0gxgzhn8qrr59asrcclfwsnlmd2g3qy8pk1ah8ivn42g97c3r0mf";
        buildDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -36637,12 +36770,15 @@ self: {
      }) {};
 
   "cubicbezier" = callPackage
-    ({ mkDerivation, base, containers, deepseq, integration }:
+    ({ mkDerivation, base, containers, integration, parsec, tasty
+     , tasty-hunit
+     }:
      mkDerivation {
        pname = "cubicbezier";
-       version = "0.2.0";
-       sha256 = "1xrbg2pr41lnw7av38q2w70gi4cv1j8rx5pv3fgfr8qb9i0gd9w7";
-       buildDepends = [ base containers deepseq integration ];
+       version = "0.3.0";
+       sha256 = "1d5mr1xr1y7qnb65ybf6gncndzdz63di3gxrzwykks706ry475sr";
+       buildDepends = [ base containers integration ];
+       testDepends = [ base parsec tasty tasty-hunit ];
        description = "Efficient manipulating of 2D cubic bezier curves";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40216,8 +40352,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.3.0";
-       sha256 = "0q4369kdm04nl5rkdpbz23ckknsipmyysp5zmxp5ibmgh3mi8sq7";
+       version = "1.3.0.1";
+       sha256 = "07y0kgss06pl4xjb2klj3397dadrgypync8vh3mkh8ss1zvfr1zf";
        buildDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -40273,8 +40409,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.3.0.1";
-       sha256 = "1b75pynmvx32yqzvp2aflfbj373jj73wnpc9abkxl41myrmajr87";
+       version = "0.3.0.2";
+       sha256 = "0vm41w1cvlw1k2gp7d3iyjdi1sla91v5v0xd7d7zhfgx7cs1b6dn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40459,10 +40595,9 @@ self: {
     ({ mkDerivation, base, data-default-class, diagrams-lib, lens }:
      mkDerivation {
        pname = "diagrams-rubiks-cube";
-       version = "0.1.0.0";
-       sha256 = "1lvircn37ws8xy9z8r5ric0hngx3v2vvhnf2bkakg8gnr7cvfpiv";
+       version = "0.1.1.0";
+       sha256 = "0fgyl0skn8z4d9kycdlmmd876v7yd2h3fyx1jqgmx4ygk0cch9z3";
        buildDepends = [ base data-default-class diagrams-lib lens ];
-       jailbreak = true;
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
@@ -40489,8 +40624,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.3";
-       sha256 = "1jwya3cksx2js10x37fdnjvhjgkzp5pxnlfd9wnd4g8r90y77jf6";
+       version = "1.3.1";
+       sha256 = "0nl2yid05gravqx8d60ra71x6bbyxd3f03dfrbx52rlljwizfyrp";
        buildDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
@@ -43242,10 +43377,9 @@ self: {
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
        pname = "dynamic-mvector";
-       version = "0.1.0.2";
-       sha256 = "0pxl30zimy5733qn53xi30cfgksslc1wz6vqcfm8kg43919kdagn";
+       version = "0.1.0.3";
+       sha256 = "1nydfmhkdgynng4pn7c6f3rqdx2b21j7sqnzkb477gkri58y6335";
        buildDepends = [ base primitive vector ];
-       jailbreak = true;
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
@@ -43685,14 +43819,11 @@ self: {
     ({ mkDerivation, array, base, containers, random }:
      mkDerivation {
        pname = "edit-distance";
-       version = "0.2.1.2";
-       revision = "1";
-       sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44";
-       editedCabalFile = "27d6fb19e1707aa05883ca4ffd6715dcc81db287c71508d6aaa420cefc8f29c1";
+       version = "0.2.1.3";
+       sha256 = "1insr7a1yazilqrx5f3pnkcr1fsvn4iaisw18rhayc0bnndfbcm0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base containers random ];
-       jailbreak = true;
        homepage = "http://github.com/batterseapower/edit-distance";
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
        license = stdenv.lib.licenses.bsd3;
@@ -43703,8 +43834,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, quickcheck-instances, vector }:
      mkDerivation {
        pname = "edit-distance-vector";
-       version = "1.0.0.1";
-       sha256 = "1whpv0qm00fn0p8v6pgjy9kk04rw9p6ngwan4nrgi4kca0hvf8id";
+       version = "1.0.0.2";
+       sha256 = "00j0lmj7wz5bm5z4v0v3bamf1pnrlmjkc2ysb5d16dqwi9768x85";
        buildDepends = [ base vector ];
        testDepends = [ base QuickCheck quickcheck-instances vector ];
        homepage = "https://github.com/thsutton/edit-distance-vector";
@@ -45490,15 +45621,14 @@ self: {
      }:
      mkDerivation {
        pname = "ert";
-       version = "0.0.2.0";
-       sha256 = "07pany4zv8crgbcilxsz5abmaq2bma5lhn9fkngra62w8mhkhzvz";
+       version = "0.0.2.1";
+       sha256 = "0ica7vir4ragcc3xrkzlmhncnn0ddx8ky61cj32z7ginybfjq2ig";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson attoparsec attoparsec-expr base bytestring regex-compat text
          unordered-containers vector yaml
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/kayo/ert";
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
@@ -45534,8 +45664,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.1.3";
-       sha256 = "1wsq058dm849ldxn5gjayagb6ds56b80dinyrpbjw8b0fr3s6v9d";
+       version = "2.2";
+       sha256 = "1z49za7yid23ffymhycvbqypw3iabc2yn05p0klh7cd7frkj08j2";
        buildDepends = [
          base conduit monad-logger persistent resourcet tagged text
          transformers unordered-containers
@@ -47217,16 +47347,16 @@ self: {
      }) {};
 
   "feed" = callPackage
-    ({ mkDerivation, base, old-locale, old-time, time, utf8-string, xml
+    ({ mkDerivation, base, old-locale, old-time, time
+     , time-locale-compat, utf8-string, xml
      }:
      mkDerivation {
        pname = "feed";
-       version = "0.3.9.2";
-       revision = "1";
-       sha256 = "05sg2ly1pvni3sfv03rbf60vdjkrfa0f9mmc1dm1hrmp638j67gg";
-       editedCabalFile = "62cb5a05a61bc09e6203b5bb7aab4464cba1703216260b0d871d98046c226358";
-       buildDepends = [ base old-locale old-time time utf8-string xml ];
-       jailbreak = true;
+       version = "0.3.9.3";
+       sha256 = "1l3bdhyfj7kcrkdwvsynkmzrskbg5r154pay9dkf5l7m8n2vicfl";
+       buildDepends = [
+         base old-locale old-time time time-locale-compat utf8-string xml
+       ];
        homepage = "https://github.com/sof/feed";
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
@@ -47514,6 +47644,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { fftw3 = null;  fftw3f = null;};
 
+  "fftwRaw" = callPackage
+    ({ mkDerivation, base, fftw3 }:
+     mkDerivation {
+       pname = "fftwRaw";
+       version = "0.1.0.0";
+       sha256 = "1dkkn72g4arjamv647ba05j7aj95vvjy2wdd6g9xcc5w2ix45kr4";
+       buildDepends = [ base ];
+       extraLibraries = [ fftw3 ];
+       homepage = "https://github.com/adamwalker/haskell-fftw-simple";
+       description = "Low level bindings to FFTW";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) { fftw3 = null;};
+
   "fgl" = callPackage
     ({ mkDerivation, array, base, containers, mtl }:
      mkDerivation {
@@ -47720,8 +47864,8 @@ self: {
      }:
      mkDerivation {
        pname = "filediff";
-       version = "0.1.0.8";
-       sha256 = "1wsinnmc5dw4r9wk3ijx9zlzwf0rqsknl6mql28lja2r1m2s2jc3";
+       version = "1.0.0.0";
+       sha256 = "06krwpnawvy28rgcs6xpk4m98vbn0wfqbw91is5j026iksdpga1g";
        buildDepends = [
          base bytestring data-default data-memocombinators directory either
          mtl rainbow tasty tasty-hunit text time transformers Zora
@@ -47865,16 +48009,16 @@ self: {
      }) {};
 
   "filesystem-trees" = callPackage
-    ({ mkDerivation, base, cond, containers, data-lens, deepseq
+    ({ mkDerivation, base, cond, containers, data-lens-light, deepseq
      , directory, dlist, filepath, mtl, unix
      }:
      mkDerivation {
        pname = "filesystem-trees";
-       version = "0.1.0.5";
-       sha256 = "0ypdnzv00kgr785z1psqaz306rgkvkn53jnr7qvchx1pqdw2v5cg";
+       version = "0.1.0.6";
+       sha256 = "1bnxhf9ppqwgcnpcanxj6ji8yi1i0pspzhjh3p3zyf57d7y6p8sh";
        buildDepends = [
-         base cond containers data-lens deepseq directory dlist filepath mtl
-         unix
+         base cond containers data-lens-light deepseq directory dlist
+         filepath mtl unix
        ];
        homepage = "https://github.com/kallisti-dev/filesystem-trees";
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
@@ -48742,12 +48886,13 @@ self: {
     ({ mkDerivation, base, containers, QuickCheck, syb }:
      mkDerivation {
        pname = "flowlocks-framework";
-       version = "0.1.3";
-       sha256 = "0scxfgsdh15wnrjpmdbn7phhhxb718pnbnfb53713hsdsvacmnmv";
+       version = "0.1.3.1";
+       sha256 = "1v9z302fg2fx6k9k7ci5128gxrrcgdqp40r7axk0yhrzc06b9wa8";
        buildDepends = [ base containers syb ];
        testDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowsim" = callPackage
@@ -49964,8 +50109,8 @@ self: {
      }:
      mkDerivation {
        pname = "fst";
-       version = "0.10.0.0";
-       sha256 = "14135p69zjn0f0300q09g79dm9vgrmvgnjwdhy7f58z0blhahibs";
+       version = "0.10.0.1";
+       sha256 = "190a89445fv006m5nv8g58h569rpw9s8jadqdy6m3ik43mnggzpy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base haskeline mtl transformers ];
@@ -50221,15 +50366,16 @@ self: {
      }) {};
 
   "functor-combo" = callPackage
-    ({ mkDerivation, base, containers, data-inttrie, lub, type-unary
-     , TypeCompose
+    ({ mkDerivation, base, base-orphans, containers, data-inttrie, lub
+     , type-unary, TypeCompose
      }:
      mkDerivation {
        pname = "functor-combo";
-       version = "0.3.5";
-       sha256 = "1q93chk6bj43dym8v620sdcpwfzw4q1ws3jcry84h33ymlpwqnpp";
+       version = "0.3.6";
+       sha256 = "1jlva6imjjpj9iww7dxiplw60vszjiw6456yq30zsqrb63sz2lk1";
        buildDepends = [
-         base containers data-inttrie lub type-unary TypeCompose
+         base base-orphans containers data-inttrie lub type-unary
+         TypeCompose
        ];
        description = "Functor combinators with tries & zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -50740,18 +50886,18 @@ self: {
   "geek" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, air, air-extra, air-th, base
      , bytestring, containers, curl, data-default, directory, filepath
-     , fsnotify, Glob, hack2, hack2-contrib, miku, moe, mtl, old-locale
-     , process, random, safe, system-filepath, text, text-icu, time
+     , fsnotify, Glob, hack2, hack2-contrib, miku, moe, mtl, process
+     , random, safe, system-filepath, text, text-icu, time
      }:
      mkDerivation {
        pname = "geek";
-       version = "1.1.0.1";
-       sha256 = "09ajjb12ziknfrw2m4plm10r99crq1hhizymni441x58wprpcdm2";
+       version = "1.1.1.0";
+       sha256 = "0n52s5azqqx06flfhsgbp5a63mpd4vd60y4rzrpa4jx13bydlp50";
        buildDepends = [
          aeson aeson-pretty air air-extra air-th base bytestring containers
          curl data-default directory filepath fsnotify Glob hack2
-         hack2-contrib miku moe mtl old-locale process random safe
-         system-filepath text text-icu time
+         hack2-contrib miku moe mtl process random safe system-filepath text
+         text-icu time
        ];
        homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine";
@@ -50895,7 +51041,9 @@ self: {
      mkDerivation {
        pname = "generic-aeson";
        version = "0.2.0.4";
+       revision = "1";
        sha256 = "1h5vj66dx25iais9yia33ia95nr0ywxsbnrcm71v50jvj73ywhbx";
+       editedCabalFile = "1f690c3d9f5359349399f9409ba65dc79bd5a13301cb98ad0961db1b2241c643";
        buildDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -51203,6 +51351,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "geniplate-mirror" = callPackage
+    ({ mkDerivation, base, mtl, template-haskell }:
+     mkDerivation {
+       pname = "geniplate-mirror";
+       version = "0.6.0.6";
+       sha256 = "1fgs9aak7l7r3xlgna1kbq43zm55nd43phsv0w4ssy305dqylshj";
+       buildDepends = [ base mtl template-haskell ];
+       description = "Use Template Haskell to generate Uniplate-like functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "geniserver" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, GenI, http-types, json
      , snap-core, snap-server, text, transformers, utf8-string
@@ -52949,8 +53108,8 @@ self: {
      }:
      mkDerivation {
        pname = "gl";
-       version = "0.7.5";
-       sha256 = "0ffc9lks1fd4ch7pygdl8yfmy425aazykrn2niakb876kzzm5axi";
+       version = "0.7.6";
+       sha256 = "1wdhp5q84cv59ssygbgy8pd7gm76wkl2zvcbmi83wml1x9a7xmjd";
        buildDepends = [
          base containers directory filepath fixed half hxt split
          transformers
@@ -53198,15 +53357,14 @@ self: {
      }) {};
 
   "gloss-accelerate" = callPackage
-    ({ mkDerivation, accelerate, accelerate-cuda, base, gloss }:
+    ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
      mkDerivation {
        pname = "gloss-accelerate";
-       version = "1.8.15.0";
+       version = "1.9.0.0";
        revision = "1";
-       sha256 = "1nj2rnp2bg3xmi4xbaws9jc7qx3b4qqg9fyvfv13xdav28d7iqb0";
-       editedCabalFile = "3c0195c2208cb3c6786b8d1f27a17f5249af3797f6a37af410e95f23d03fb8d6";
-       buildDepends = [ accelerate accelerate-cuda base gloss ];
-       jailbreak = true;
+       sha256 = "13vr758nl712kpkc8nii05iv1zidsp55ihvaknqzn8zdhyk4dxrv";
+       editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff";
+       buildDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53320,14 +53478,11 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-raster-accelerate";
-       version = "1.8.15.0";
-       revision = "2";
-       sha256 = "1fs3ybrzkykslac1zzh6g73lfdfysn6y2fr1pra9hd0a7x5a8j10";
-       editedCabalFile = "7dc701f53445822b911329368601a2de82ef2457573d6ac8ae795c74d61a5635";
+       version = "1.9.0.0";
+       sha256 = "0kgjbqharpl9an4kpciiy17chsdlzx5n4mgxp93yja4av8vik3i8";
        buildDepends = [
          accelerate accelerate-cuda base gloss gloss-accelerate
        ];
-       jailbreak = true;
        description = "Parallel rendering of raster images using Accelerate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54570,8 +54725,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-inspector";
-       version = "0.7.1.1";
-       sha256 = "17bnzi1gkhl8ps9dihmrw3nb0mdlbgd83k67dplqzgj1q3z52lpy";
+       version = "0.7.1.2";
+       sha256 = "14wxmn18z4022vkakyrdl7mz7zbdaa3dnwbb52ymg3f5r13lr7lh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -54644,8 +54799,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-th";
-       version = "0.7.0";
-       sha256 = "14g4665wrr3226m2v63p4j8g9bcyi5la7nk2vh509xyz3z17aq67";
+       version = "0.7.0.1";
+       sha256 = "15g07rzw2jygzs5p9jflq6l2rjrmf03lj8pprzc4vgwvk04x233h";
        buildDepends = [
          aeson base bytestring containers groundhog template-haskell text
          time unordered-containers yaml
@@ -55560,8 +55715,8 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.0";
-       sha256 = "1krk1019d0ix4ix0qh55l4pzgbggl151vqgd0jbhdcbkmvhfi4xv";
+       version = "2.1";
+       sha256 = "0jl2rciqgnhjw6q4xgdm2117vrj25l18hzl58fdls7j9bqlvrn5y";
        buildDepends = [
          aeson attoparsec base base64-bytestring bifunctors binary
          binary-conduit byteable bytestring bzlib conduit conduit-extra
@@ -55595,8 +55750,8 @@ self: {
      }:
      mkDerivation {
        pname = "hPDB";
-       version = "1.2.0.2";
-       sha256 = "0mymyvd9p63sf3801bn2pyihj47fymp8wwfbllhbvw2l92hy79vk";
+       version = "1.2.0.3";
+       sha256 = "1lciijgn137gmi190if41akj4pv9030rbbvys5lfh4q5kk8p2dsp";
        buildDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          iterable mmap mtl Octree parallel QuickCheck tagged
@@ -55615,8 +55770,8 @@ self: {
      }:
      mkDerivation {
        pname = "hPDB-examples";
-       version = "1.2.0.1";
-       sha256 = "0ppwbm0ag9dd5rzpvzk89c4ykwkgvwz9fg6d3lr9vwfid15a116s";
+       version = "1.2.0.2";
+       sha256 = "1s1m09y3x8lpsdxs6ch77y1qipfy35swqwaj242aa0v5p8xs58wa";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -55760,11 +55915,12 @@ self: {
      mkDerivation {
        pname = "hXmixer";
        version = "0.2.5.0";
+       revision = "1";
        sha256 = "0nl6ylprxc1mz96713n222gy1b3pifkp3mb42v181w1iwms405y5";
+       editedCabalFile = "c59d268da5fbb74957b9b9a2dd908a06a002d4c4845748876da77bafcc2deeb7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base directory gtk3 process split text ];
-       homepage = "http://colinrmitchell.endoftheinternet.org/";
        description = "A Gtk mixer application for FreeBSD";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56081,15 +56237,15 @@ self: {
 
   "hack2-contrib" = callPackage
     ({ mkDerivation, air, base, bytestring, containers, data-default
-     , directory, filepath, hack2, network-uri, old-locale, text, time
+     , directory, filepath, hack2, network-uri, text, time
      }:
      mkDerivation {
        pname = "hack2-contrib";
-       version = "2014.11.17";
-       sha256 = "1fjk86r1lh77r729qgaj664swq07fqz4pafm99xfzy3xwvbfx5lx";
+       version = "2015.5.4";
+       sha256 = "1vbdnbab5f090fp5zgviwbc2w33y7calgbh67fgxcaflhg0514vk";
        buildDepends = [
          air base bytestring containers data-default directory filepath
-         hack2 network-uri old-locale text time
+         hack2 network-uri text time
        ];
        homepage = "https://github.com/nfjinjing/hack2-contrib";
        description = "Hack2 contrib";
@@ -58578,6 +58734,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashabler" = callPackage
+    ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp
+     , primitive, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "hashabler";
+       version = "0.1.0.2";
+       sha256 = "0n3cw5vc48144kddz0krcm682bcigdafap81kdkvhq8alhc50532";
+       buildDepends = [
+         array base bytestring ghc-prim integer-gmp primitive
+         template-haskell text
+       ];
+       homepage = "https://github.com/jberryman/hashabler";
+       description = "Principled, cross-platform & extensible hashing of types, including an implementation of the FNV-1a algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hashed-storage" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, dataenc
      , directory, extensible-exceptions, filepath, mmap, mtl, zlib
@@ -59275,16 +59448,13 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-packages";
-       version = "0.2.4.4";
-       revision = "1";
-       sha256 = "1n4il9vkszr48n0zg3kccyqa744p0cc6idamdk6xb6hj0flpqzzc";
-       editedCabalFile = "0d8b5e0dd102cc4c6aac5bc12e523d5c2ad94d981f33792b459d9373bb25c399";
+       version = "0.3";
+       sha256 = "199srg8k8j2nirs83hx04r1hkwv83h4k73z1sji547f5w0zwnws0";
        buildDepends = [
          aeson base bytestring Cabal containers deepseq directory filepath
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
          transformers transformers-compat
        ];
-       jailbreak = true;
        homepage = "http://documentup.com/haskell-suite/haskell-packages";
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
@@ -60060,25 +60230,24 @@ self: {
      }) {};
 
   "haskellscrabble" = callPackage
-    ({ mkDerivation, array, base, containers, directory, errors
+    ({ mkDerivation, array, arrows, base, containers, directory, errors
      , filepath, HUnit, mtl, parsec, QuickCheck, random, safe
      , semigroups, split, test-framework, test-framework-hunit
      , test-framework-quickcheck2, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "0.1.0.2";
-       sha256 = "1f0vdkgjyqwk1lkbn86gbnzbv1r021l0808aw57plb9jmmpn0m4s";
+       version = "1.0";
+       sha256 = "099qhvi7v7bimjqdlnz6scmyr7xqxjk65y861630n9jr133bclnz";
        buildDepends = [
-         array base containers errors mtl parsec QuickCheck random safe
-         semigroups split transformers unordered-containers
+         array arrows base containers errors mtl parsec QuickCheck random
+         safe semigroups split transformers unordered-containers
        ];
        testDepends = [
          base containers directory filepath HUnit QuickCheck random
          semigroups test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/happy0/haskellscrabble";
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
@@ -61716,8 +61885,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.4.2.0";
-       sha256 = "1qsahvm24hxjzfd0qvyfsasdplh2hbg9fkxcdkysgqxpzq8kx4gb";
+       version = "0.4.2.1";
+       sha256 = "01pc60nc009ww52kwjx9chjx1vpr4y120dnci61vhr2ylxls1hd4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -64120,8 +64289,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonpointer";
-       version = "0.2.0.1";
-       sha256 = "0r44fpljqwzwzj818p3xplhwkdbndwmbxf2mrgdqsjxj0dmnifhq";
+       version = "0.2.0.2";
+       sha256 = "1jf5cd77m1jvdlsblx9c3l5z9gdnkw0lii0z3zpzpcr275sxff0h";
        buildDepends = [ aeson base text unordered-containers vector ];
        testDepends = [
          aeson base http-types HUnit test-framework test-framework-hunit
@@ -64133,22 +64302,24 @@ self: {
      }) {};
 
   "hjsonschema" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, file-embed
-     , filepath, hashable, hjsonpointer, http-client, http-types, HUnit
-     , regexpr, scientific, test-framework, test-framework-hunit, text
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, async, base, bytestring, directory
+     , file-embed, filepath, hashable, hjsonpointer, http-client
+     , http-types, HUnit, regexpr, scientific, test-framework
+     , test-framework-hunit, text, unordered-containers, vector
+     , wai-app-static, warp
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "0.5.3.1";
-       sha256 = "1ggqxi2f10qdls67lk3204wc4naicchr20i00p17ynkzxl9ndi8b";
+       version = "0.5.3.2";
+       sha256 = "0w4m50glqvqipv99bk55jipzdga8dwics0sw1k52kmbf34qac5ih";
        buildDepends = [
          aeson base bytestring file-embed hashable hjsonpointer http-client
          http-types regexpr scientific text unordered-containers vector
        ];
        testDepends = [
-         aeson base bytestring directory filepath HUnit test-framework
+         aeson async base bytestring directory filepath HUnit test-framework
          test-framework-hunit text unordered-containers vector
+         wai-app-static warp
        ];
        jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonschema";
@@ -64227,10 +64398,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "0.25";
-       revision = "1";
-       sha256 = "0gzhlrxdjgg7313aipxr0ziakvdlj07d7sm9cc0q2mx3f37mrnxx";
-       editedCabalFile = "e67ec6a6820e09eba70980062cded8f2ea6466b83009f2808e8910101f900a1b";
+       version = "0.25.1";
+       sha256 = "1z3qpa8p6z7lil67ikimfzvlppsaz3yn58ljc5mkqv3cz6rss9q3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -64247,7 +64416,6 @@ self: {
          shakespeare-text split tabular test-framework test-framework-hunit
          text time transformers wizards
        ];
-       jailbreak = true;
        homepage = "http://hledger.org";
        description = "The main command-line interface for the hledger accounting tool";
        license = "GPL";
@@ -64327,10 +64495,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "0.25";
-       revision = "2";
-       sha256 = "0p0j69gyd9q6rx86vzrqaclf4jys1d60rw5344danb2m3vgv7c21";
-       editedCabalFile = "1ff33c2f9bb3163aaac70aa78d622e42a19f3eaa0f37391e90352dbb663a7837";
+       version = "0.25.1";
+       sha256 = "1p8khkpwiqxhm9ycg4vcgqsggrxzlp55b34ckhsdrfzjdphxq60i";
        buildDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv Decimal directory filepath HUnit mtl mtl-compat old-time parsec
@@ -64343,7 +64509,6 @@ self: {
          regex-tdfa regexpr safe split test-framework test-framework-hunit
          time transformers
        ];
-       jailbreak = true;
        homepage = "http://hledger.org";
        description = "Core data types, parsers and utilities for the hledger accounting tool";
        license = "GPL";
@@ -64380,10 +64545,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "0.25";
-       revision = "1";
-       sha256 = "15rkmw9zg95ijsl4xchgm642y888fa76lxwpzg4qqb5gpjbflz9x";
-       editedCabalFile = "415979e85eb96e7108b25431fde2c08e8dbda6f613f72597bf467319b3e674e4";
+       version = "0.25.1";
+       sha256 = "07al1vlrh5v71zzghn5q5krdygqa63icbg33n0hlvc42mghc6rsk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -64395,7 +64558,6 @@ self: {
          yesod yesod-core yesod-form yesod-static
        ];
        testDepends = [ base base-compat hspec yesod yesod-test ];
-       jailbreak = true;
        homepage = "http://hledger.org";
        description = "A web interface for the hledger accounting tool";
        license = "GPL";
@@ -64917,6 +65079,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hmm-hmatrix" = callPackage
+    ({ mkDerivation, array, base, containers, explicit-exception
+     , hmatrix, lazy-csv, non-empty, random, semigroups, transformers
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "hmm-hmatrix";
+       version = "0.0";
+       sha256 = "0gcjasj6115gwjh2m680wrg3fmm8zchk6isb2wmlyfvib27963jm";
+       buildDepends = [
+         array base containers explicit-exception hmatrix lazy-csv non-empty
+         random semigroups transformers utility-ht
+       ];
+       jailbreak = true;
+       homepage = "http://code.haskell.org/~thielema/hmm-hmatrix";
+       description = "Hidden Markov Models using HMatrix primitives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hmp3" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , curses, directory, mersenne-random, old-time, pcre-light, process
@@ -65344,8 +65526,8 @@ self: {
      }:
      mkDerivation {
        pname = "holy-project";
-       version = "0.1.1.1";
-       sha256 = "0vb4mlz6gb01aadm2b8kgvgnrwwvl6q4ndx6xldi0xi3rm22xkwj";
+       version = "0.2.0.0";
+       sha256 = "05lns2xkw44g2jf2fbrpzdi5iqzq7hxkhhv86ah08hr14qiyp3sg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -65825,8 +66007,8 @@ self: {
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.14.1";
-       sha256 = "0ckmz6v6y8lwbpx0aw4a5japxgx1m664p7pgrblsbw9pn5yjrkcw";
+       version = "0.15";
+       sha256 = "1qzp1lhbg9v6q7f8yq0abfwak80krmsdih86fpmfc6riiamfin7g";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -68930,8 +69112,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-meta";
-       version = "2.1.5";
-       sha256 = "02v4a5hcp4bbvnjb18vpw6fwz4qxjll8k8ama0hf6y8jppp72hid";
+       version = "2.1.7";
+       sha256 = "0yh9yf9859cimd1qrh3bn65c89n16fpxzrcsily3xzr4miri7r7z";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -69912,15 +70094,15 @@ self: {
   "html-tokenizer" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, case-insensitive
      , conversion, conversion-case-insensitive, conversion-text
-     , directory, doctest, filepath, html-entities, text
+     , directory, doctest, filepath, text
      }:
      mkDerivation {
        pname = "html-tokenizer";
-       version = "0.2.1.2";
-       sha256 = "0pq4bmh0bn9z95014h1n98m4jjjhkcnr65dlxhp9mkf0fkh5hb21";
+       version = "0.3.0.1";
+       sha256 = "1xvqxybmjy0xyik6ss1hmrfd4k1pdd8sqnz1cs9pl6xjz3wwclwr";
        buildDepends = [
          attoparsec base-prelude case-insensitive conversion
-         conversion-case-insensitive conversion-text html-entities text
+         conversion-case-insensitive conversion-text text
        ];
        testDepends = [ base base-prelude directory doctest filepath ];
        homepage = "https://github.com/nikita-volkov/html-tokenizer";
@@ -71202,6 +71384,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hvect" = callPackage
+    ({ mkDerivation, base, HTF }:
+     mkDerivation {
+       pname = "hvect";
+       version = "0.1.0.0";
+       sha256 = "12zwrzz0bk83i42q3iv5cs2dma2a80s8zkjyill0ysxyrjni25wy";
+       buildDepends = [ base ];
+       testDepends = [ base HTF ];
+       homepage = "https://github.com/agrafix/hvect";
+       description = "Simple heterogeneous lists";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hwall-auth-iitk" = callPackage
     ({ mkDerivation, base, bytestring, haskeline, http-conduit
      , http-types, mtl, regex-compat, unix
@@ -73067,6 +73262,7 @@ self: {
          resourcet text text-icu time timerep tls transformers
          transformers-base utf8-string xdg-basedir xml
        ];
+       jailbreak = true;
        description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73567,22 +73763,21 @@ self: {
 
   "informative" = callPackage
     ({ mkDerivation, base, csv, highlighting-kate, http-conduit
-     , monad-logger, old-locale, pandoc, persistent
-     , persistent-postgresql, shakespeare, text, time, yesod, yesod-auth
+     , monad-logger, pandoc, persistent, persistent-postgresql
+     , shakespeare, text, time, time-locale-compat, yesod, yesod-auth
      , yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "informative";
-       version = "0.1.0.5";
-       sha256 = "1jc9hf90a22b7g58paqgwzxyjv89lmsqlpbjh39h79w6gm6a89xs";
+       version = "0.1.0.7";
+       sha256 = "0xzckvbscs3946y7sscx15mixyh3xhahjmwli72311gmyxkf767y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base csv highlighting-kate http-conduit monad-logger old-locale
-         pandoc persistent persistent-postgresql shakespeare text time yesod
-         yesod-auth yesod-core yesod-form
+         base csv highlighting-kate http-conduit monad-logger pandoc
+         persistent persistent-postgresql shakespeare text time
+         time-locale-compat yesod yesod-auth yesod-core yesod-form
        ];
-       jailbreak = true;
        homepage = "http://doomanddarkness.eu/pub/informative";
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
@@ -74195,13 +74390,12 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams-http";
-       version = "0.2.0.2";
-       sha256 = "0vzl61hkhgyi5vanfl2fmfxp95yici96kgg8iz6rxjhipxs0ff86";
+       version = "0.2.1.2";
+       sha256 = "0ra3z236d4mbw2vqlx4zxpa5z53a7k1j2pmkwf3075ghgdavrmk3";
        buildDepends = [
          base bytestring http-client http-client-tls io-streams mtl
          transformers
        ];
-       jailbreak = true;
        description = "http-client for io-streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74621,14 +74815,14 @@ self: {
      }:
      mkDerivation {
        pname = "ironforge";
-       version = "0.1.0.34";
-       sha256 = "0f5hhncn1svv7kh8jl1jcscm9686401b0cvln5lv6gf3yij15107";
+       version = "0.1.0.35";
+       sha256 = "1dx0ljvfll8vb9rjdvx41vm4mrybafjch83xk7xs5fpvijjfp47l";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          antisplice base chatty chatty-utils mtl transformers
        ];
-       jailbreak = true;
+       homepage = "http://doomanddarkness.eu/pub/antisplice";
        description = "A technical demo for Antisplice";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76395,19 +76589,18 @@ self: {
 
   "jsonschema-gen" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, process
-     , scientific, tagged, text, time, transformers
-     , unordered-containers, vector
+     , scientific, tagged, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "jsonschema-gen";
-       version = "0.2.0.0";
-       sha256 = "0n7qm46ivp5lr83rfvyijavx6qbw3fd0m54zzk2bz203ggymab9x";
+       version = "0.3.0.0";
+       sha256 = "0jjqn5y5rxgm92y26p00kd5rkh4z1kyavj0v5axpbs9a9a08aplx";
        buildDepends = [
          aeson base bytestring containers scientific tagged text time
          unordered-containers vector
        ];
        testDepends = [
-         aeson base bytestring containers process tagged text transformers
+         aeson base bytestring containers process tagged text
        ];
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
@@ -76874,8 +77067,8 @@ self: {
      }:
      mkDerivation {
        pname = "keter";
-       version = "1.3.9.2";
-       sha256 = "1c5hsckcdy966c5nn1cwa63sc7fqmyhanw0156cllkss8kzwzj4r";
+       version = "1.3.10.1";
+       sha256 = "1bqy0g0255xqnlk9qn2ykwlszwdliqhcrdm4bjfac1d2lf27vs7r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -76933,12 +77126,11 @@ self: {
     ({ mkDerivation, base, udbus }:
      mkDerivation {
        pname = "keyring";
-       version = "0.1.0.3";
-       sha256 = "06sp308nwgk7cdpj0q7zinp05vy5fcgm7jrawhdmcvxka6l22yiy";
+       version = "0.1.0.4";
+       sha256 = "1j7nynr7sksrqdn4zfp9ikwx6vvlimlhwhifbs68igfdn03gxnrd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base udbus ];
-       jailbreak = true;
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
@@ -77691,8 +77883,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot";
-       version = "5.0.1";
-       sha256 = "1zf29cqdr71n2bj7idh9v7yygk0ckpadr44f5ghqr74zdpyw6dyi";
+       version = "5.0.2.2";
+       sha256 = "148s2qlwcs7g89a77xv07yjyjrcnd6x7alvghbldvv4p067f0n86";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -77743,8 +77935,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
-       version = "5.0.1";
-       sha256 = "0bzfbaksij0sav93qp2j4k4qlclb9zdz8z8233ziismf9bq4bm16";
+       version = "5.0.2.1";
+       sha256 = "06jcx3qp87fk58cvnwljr4zyvlqcsfrq0nxg2m67kd2imyg10iyd";
        buildDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts hoogle HTTP IOSpec
@@ -77809,8 +78001,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-novelty-plugins";
-       version = "5.0.1";
-       sha256 = "1h9qnxbdqnpwarbvviaqrl18fxd9bs33f6n60b7cdx1p2imzbp25";
+       version = "5.0.2.1";
+       sha256 = "07zx59jfsdq7lbfmfq9l3xbbdm0fhzidi5vcripfp5wry8xshn5y";
        buildDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
@@ -77828,8 +78020,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-reference-plugins";
-       version = "5.0.1";
-       sha256 = "11hljsbb8kdbf6h4si97c52643w2fxicql1xq743f4gkys2y0x2a";
+       version = "5.0.2.1";
+       sha256 = "0xg70m58n03lym8z3lsf0mh634xwb48sj39cfydsacdn5gx0i8kc";
        buildDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
@@ -77858,12 +78050,12 @@ self: {
      }) {};
 
   "lambdabot-trusted" = callPackage
-    ({ mkDerivation, base, oeis, QuickCheck }:
+    ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }:
      mkDerivation {
        pname = "lambdabot-trusted";
-       version = "5.0.1";
-       sha256 = "1ijpr8b4vzvyfbry1g8wphk9wn7pxvay2wk6racl5k78kw27jd1c";
-       buildDepends = [ base oeis QuickCheck ];
+       version = "5.0.2.1";
+       sha256 = "078yhq9d0vxgnc01hfa25kf4kdg4mymg9678jqmyk8csjy5gjw0h";
+       buildDepends = [ base oeis QuickCheck QuickCheck-safe ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot trusted code";
        license = "GPL";
@@ -78642,7 +78834,6 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python" = callPackage
@@ -79576,8 +79767,8 @@ self: {
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "lenses";
-       version = "0.1.6";
-       sha256 = "0n2r7gjiq5vk6jjaxn7kr3g5gvn4y0gmdqpn9l0nfgqdnscmfbiv";
+       version = "0.1.7";
+       sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4";
        buildDepends = [ base mtl template-haskell ];
        homepage = "http://github.com/jvranish/Lenses/tree/master";
        description = "Simple Functional Lenses";
@@ -80736,6 +80927,7 @@ self: {
        buildDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
@@ -81313,15 +81505,18 @@ self: {
      }) {};
 
   "list-t-attoparsec" = callPackage
-    ({ mkDerivation, attoparsec, base-prelude, exceptions, list-t
-     , mtl-prelude, text
+    ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
+     , list-t-text, text, transformers
      }:
      mkDerivation {
        pname = "list-t-attoparsec";
-       version = "0.2.0.0";
-       sha256 = "073qi17qwlic4y3vjas6ki5ws0kfixnvhnnqhs7hmj7iq6qbjm91";
+       version = "0.4.0.1";
+       sha256 = "0qxxs1hw4bimssjds2xh70mnwdc68zii5dm5klsml3kjynwi1nj3";
        buildDepends = [
-         attoparsec base-prelude exceptions list-t mtl-prelude text
+         attoparsec base-prelude either list-t text transformers
+       ];
+       testDepends = [
+         attoparsec base-prelude either hspec list-t list-t-text text
        ];
        homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
        description = "An \"attoparsec\" adapter for \"list-t\"";
@@ -81330,24 +81525,28 @@ self: {
 
   "list-t-html-parser" = callPackage
     ({ mkDerivation, base-prelude, case-insensitive, conversion
-     , conversion-text, either, hspec, html-entities, html-tokenizer
-     , list-t, list-t-attoparsec, list-t-text, mtl-prelude, text
+     , conversion-case-insensitive, conversion-text, either, hspec
+     , html-entities, html-tokenizer, list-t, list-t-attoparsec
+     , list-t-text, mtl-prelude, text
      }:
      mkDerivation {
        pname = "list-t-html-parser";
-       version = "0.2.2.0";
-       sha256 = "07fd7nzlhwvhzj4g84wmsm48rj1748m0cbglv0wc2w1rsbsikwl0";
+       version = "0.4.0.0";
+       sha256 = "1i243xa52ljqr79zccybx3x5nb58lvsfq4q99n2kk2qyhwyv7wb5";
        buildDepends = [
-         base-prelude case-insensitive either html-entities html-tokenizer
-         list-t mtl-prelude text
+         base-prelude case-insensitive conversion
+         conversion-case-insensitive conversion-text either html-entities
+         html-tokenizer list-t mtl-prelude text
        ];
        testDepends = [
          base-prelude conversion conversion-text hspec html-tokenizer
          list-t-attoparsec list-t-text text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-http-client" = callPackage
@@ -81389,8 +81588,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-text";
-       version = "0.2.0.1";
-       sha256 = "1ylb4fs5gbphny281gwd0j0k26ayqcqmc79qarcfpfm6j4washng";
+       version = "0.2.0.2";
+       sha256 = "1hsbisvmjprfzhqlhzmicxzyv67ylik0dazl4yjyilh8frjd7qlm";
        buildDepends = [ base-prelude bytestring list-t mtl-prelude text ];
        testDepends = [
          base base-prelude bytestring hspec list-t QuickCheck
@@ -82155,7 +82354,9 @@ self: {
      mkDerivation {
        pname = "logging-facade";
        version = "0.0.0";
+       revision = "1";
        sha256 = "0i7m4dpj7b556bfiahisvxcvdb1lv352zggjyrcr69iqnrac30z8";
+       editedCabalFile = "18d32076d981102462c3f24c95c6d9dc2470be80f5f36f99759cb23cc3db2d24";
        buildDepends = [ base template-haskell transformers ];
        testDepends = [ base hspec ];
        description = "Simple logging abstraction that allows multiple backends";
@@ -83836,8 +84037,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.2.1.0";
-       sha256 = "0gmlf50hq9dh2xh74dvsyywrbrv7i31d6j7k4pgmfinn8pih03lz";
+       version = "0.2.2.0";
+       sha256 = "186svy4m93r5p25kv1k5bwfpwgmxzf20rhpr6ah4pbavcys6jiyh";
        buildDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -84117,8 +84318,8 @@ self: {
      }:
      mkDerivation {
        pname = "markup";
-       version = "0.0.6.1";
-       sha256 = "1dhmimqzgr9dgfww714pjmf8zkmygr8ja2sbz0awmlcn5zad48bl";
+       version = "0.0.7";
+       sha256 = "0rzq7gpwaq7x7q9qcjfyybviydcp0map3ikxbci3379g1hikfan4";
        buildDepends = [
          base blaze-html blaze-markup lucid mtl text transformers urlpath
        ];
@@ -86102,12 +86303,14 @@ self: {
      }) {};
 
   "modular-arithmetic" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
        pname = "modular-arithmetic";
-       version = "1.2.0.0";
-       sha256 = "1qlvi0xjdvr4730xj303i6gp610mz4xrlrk191yy8hr7afjysm0k";
+       version = "1.2.1.1";
+       sha256 = "005pbkrszgkbm0qx9hzn1f72l9z07qhqypmcw72fi5i5hppr45av";
        buildDepends = [ base ];
+       testDepends = [ base doctest Glob ];
+       homepage = "https://github.com/TikhonJelvis/modular-arithmetic";
        description = "A type for integers modulo some constant";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86217,8 +86420,8 @@ self: {
      }:
      mkDerivation {
        pname = "moe";
-       version = "2014.11.17";
-       sha256 = "1rh9g4f488l0fjjvwfaxaf1lbxz1pvq24nxjy2c4yyrg7m7b61z5";
+       version = "2015.5.4";
+       sha256 = "0yiyr8n0bw5wcc8jyrah2kf9jnj3x4h5kl3qprysx8ffhc6dx3r9";
        buildDepends = [ air base bytestring data-default dlist mtl text ];
        homepage = "https://github.com/nfjinjing/moe";
        description = "html with style";
@@ -89339,8 +89542,8 @@ self: {
     ({ mkDerivation, base, hspec, silently }:
      mkDerivation {
        pname = "nanospec";
-       version = "0.2.0";
-       sha256 = "0g10l86cv33r58zxn2bprqlm80i7g86bwzhn9jqg9s81xc0aw2qv";
+       version = "0.2.1";
+       sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv";
        buildDepends = [ base ];
        testDepends = [ base hspec silently ];
        description = "A lightweight implementation of a subset of Hspec's API";
@@ -89647,8 +89850,8 @@ self: {
      }:
      mkDerivation {
        pname = "nemesis";
-       version = "2014.5.19";
-       sha256 = "1kj7w9rp8kimrbwwb1f1336ijdb99r2b6jwpmgxjp0q3sq07wmvc";
+       version = "2015.5.4";
+       sha256 = "149fx29818cf9rxp1gp64w5l288l4whij7im5rfms3rlgj95w6ji";
        buildDepends = [
          air air-th base containers directory dlist Glob mtl process time
        ];
@@ -89756,8 +89959,8 @@ self: {
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "0.3";
-       sha256 = "04cgy9hvriq4r8imi23s5lpvbvvdg8a3a51ypmwwgk6vss84jz1l";
+       version = "0.3.1";
+       sha256 = "1bgh0ap6yzpnp4dzwf73dbi6dspc57hvsvnkv4ndg0fcclifvih5";
        buildDepends = [
          aeson attoparsec base blaze-html bytestring constraints containers
          http-types lucid mtl poly-arity pred-trie semigroups text
@@ -90807,16 +91010,16 @@ self: {
      }) {};
 
   "network-uri" = callPackage
-    ({ mkDerivation, base, HUnit, network, parsec, test-framework
+    ({ mkDerivation, base, deepseq, HUnit, parsec, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "network-uri";
-       version = "2.6.0.1";
-       sha256 = "09ymamb128jgqghpda4nixncr73all8qc6q53976aricm6a27p37";
-       buildDepends = [ base parsec ];
+       version = "2.6.0.3";
+       sha256 = "1pwbqb2rk4rnvllvdch42p5368xcvpkanp7bxckdhxya8zzwvhhg";
+       buildDepends = [ base deepseq parsec ];
        testDepends = [
-         base HUnit network test-framework test-framework-hunit
+         base HUnit test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
        homepage = "https://github.com/haskell/network-uri";
@@ -91009,8 +91212,8 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "nf";
-       version = "1.0.0.3";
-       sha256 = "0k6zlya37fhbx154z6gjrg4bbncvwgq4ra6y97l10aajyg4a4gxc";
+       version = "1.0.1.0";
+       sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a";
        buildDepends = [ base deepseq ];
        homepage = "https://github.com/ezyang/nf";
        description = "NF data type to statically enforce normal form";
@@ -93432,17 +93635,16 @@ self: {
      }) {};
 
   "packer" = callPackage
-    ({ mkDerivation, array, base, bytestring, HUnit, mtl, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, array, base, bytestring, mtl, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "packer";
-       version = "0.1.5";
-       sha256 = "1bqxpa13ccvkkzy45374rl5w0qswsh3lsgv6mrxs9hp6b4w3f46j";
+       version = "0.1.6";
+       sha256 = "02vswdsiinarg405lgzgghlqk4lhw9il8s9v2n1xdhszi510sz1w";
        buildDepends = [ array base bytestring mtl ];
        testDepends = [
-         base bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
+         base bytestring tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://github.com/vincenthz/hs-packer";
        description = "Fast byte serializer and unserializer";
@@ -93676,10 +93878,10 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.0.1";
+       version = "0.1.0.2";
        revision = "1";
-       sha256 = "06ij62dc07pr4ky7xyhdvp40a0nz79vg24dydhmcqi6qda8k6s2l";
-       editedCabalFile = "ad80b7dc6a76fa094a3748d076cd03bda219109ccf7db345a12884f63d810054";
+       sha256 = "0mnksd8wl6y9qh4z5p6nzf64lic2cxws0hm2n1aj8vq8asfy28af";
+       editedCabalFile = "c209bec5811d40360ca07a9218404186ab8564ee649b14d6e3ece04b4006204f";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -94564,6 +94766,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base HandsomeSoup hxt ];
+       jailbreak = true;
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94612,24 +94815,23 @@ self: {
      }) {};
 
   "paypal-adaptive-hoops" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, errors
-     , http-client, HUnit, lens, lens-aeson, test-framework
-     , test-framework-hunit, text, time, transformers
-     , unordered-containers, vector, wreq
+    ({ mkDerivation, aeson, base, bytestring, errors, http-client
+     , HUnit, lens, lens-aeson, test-framework, test-framework-hunit
+     , text, time, transformers, unordered-containers, vector, wreq
      }:
      mkDerivation {
        pname = "paypal-adaptive-hoops";
-       version = "0.10.0.2";
-       sha256 = "1kriijissnxnid088via7gvb9gz09nvl7mw7x8qph623kpbvxxkd";
+       version = "0.11.0.0";
+       sha256 = "0v72ny33mfi29vv4kzld5x01qr9k6i9vdyk9v83dy9zbfb7vkmzv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base bytestring data-default errors http-client lens
-         lens-aeson text time transformers vector wreq
+         aeson base bytestring errors http-client lens lens-aeson text time
+         transformers vector wreq
        ];
        testDepends = [
-         aeson base bytestring data-default HUnit test-framework
-         test-framework-hunit text unordered-containers
+         aeson base bytestring HUnit test-framework test-framework-hunit
+         text unordered-containers
        ];
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
@@ -95509,8 +95711,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.1.4";
-       sha256 = "1x9mpvc8b4rj4pc2f3d7c0720zh2f8qrqg77x19q099ycag70pmg";
+       version = "2.1.5";
+       sha256 = "1l12kw2ylxgahy55h302dbbp59mrb3m7xwxvbcvmsnxfi7pcm2si";
        buildDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
@@ -95544,8 +95746,8 @@ self: {
     ({ mkDerivation, base, time, yesod }:
      mkDerivation {
        pname = "persistent-ratelimit";
-       version = "0.1.0.0";
-       sha256 = "00kvmqisi6y8r8vpfa61kzxr0iyy6varj8920kjwsd2jk2i7q8wl";
+       version = "0.1.0.1";
+       sha256 = "13mvf0k4nkcdcz7gcvqsw3mrnbpvw0lvs94rff0y9q50cc6y36xd";
        buildDepends = [ base time yesod ];
        jailbreak = true;
        homepage = "https://github.com/jprider63/persistent-ratelimit";
@@ -97586,8 +97788,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.4.1.0";
-       sha256 = "183c69v3540gm54clxd2kizrhsiy4xwdjgaakpqkvlk47s4rj89i";
+       version = "0.4.2.0";
+       sha256 = "14f20any4pasjwxq81dmcds3l9gyaabdh9rma65yapkpgrs2v56z";
        buildDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -98057,8 +98259,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-orm";
-       version = "0.3.1";
-       sha256 = "1npynkpilp7p6y2biqr9m5a9r179ga67p8lx39pildn94iz1yg76";
+       version = "0.3.2";
+       sha256 = "1a81wrqzhpgdhs7i0znamkrrra2bksfwsh22yxv94qg6r7c2qp2p";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -98151,8 +98353,8 @@ self: {
     ({ mkDerivation, base, generics-sop, postgresql-simple }:
      mkDerivation {
        pname = "postgresql-simple-sop";
-       version = "0.1.0.5";
-       sha256 = "1v4rqjhwki6q46q5y4rmrk8y5p60s00faa153fg71zpkzafqqx0q";
+       version = "0.1.0.7";
+       sha256 = "1hbfh4rp40h1h4m8dzr70zrfb24fckqwp5s6a7kc2fa7a9lw9g8r";
        buildDepends = [ base generics-sop postgresql-simple ];
        homepage = "https://github.com/openbrainsrc/postgresql-simple-sop";
        description = "Generic functions for postgresql-simple";
@@ -98430,8 +98632,8 @@ self: {
      }:
      mkDerivation {
        pname = "pred-trie";
-       version = "0.0.12";
-       sha256 = "0hyghjp1zcprgzq2szkpfpkihr1hhgf70901wm5hfgs6bfvgw2sb";
+       version = "0.1";
+       sha256 = "1dkmpdqxq919555hc8hx5qf070ginynbzb7lnmir1lnidvqi5b8i";
        buildDepends = [ base semigroups ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Predicative tries";
@@ -101477,6 +101679,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "random-derive" = callPackage
+    ({ mkDerivation, base, random, template-haskell }:
+     mkDerivation {
+       pname = "random-derive";
+       version = "0.1.0.0";
+       sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p";
+       buildDepends = [ base random template-haskell ];
+       homepage = "https://github.com/frerich/random-derive";
+       description = "A Template Haskell helper for deriving Random instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "random-eff" = callPackage
     ({ mkDerivation, base, extensible-effects, random }:
      mkDerivation {
@@ -102068,20 +102282,20 @@ self: {
      }) {};
 
   "reactive-banana" = callPackage
-    ({ mkDerivation, base, containers, hashable, HUnit, pqueue
+    ({ mkDerivation, base, containers, hashable, HUnit, psqueues
      , test-framework, test-framework-hunit, transformers
      , unordered-containers, vault
      }:
      mkDerivation {
        pname = "reactive-banana";
-       version = "0.8.1.1";
-       sha256 = "1fgfcpn5zapygixygz69cfmqg872ixa3nlakvgj5dd53qgkzq9s7";
+       version = "0.8.1.2";
+       sha256 = "1ak3i0r7y9d5pyb4q6jag804bkgiqj3az7cckj50ffvra2v37nga";
        buildDepends = [
-         base containers hashable pqueue transformers unordered-containers
+         base containers hashable psqueues transformers unordered-containers
          vault
        ];
        testDepends = [
-         base containers hashable HUnit pqueue test-framework
+         base containers hashable HUnit psqueues test-framework
          test-framework-hunit transformers unordered-containers vault
        ];
        homepage = "http://wiki.haskell.org/Reactive-banana";
@@ -102351,8 +102565,8 @@ self: {
      }:
      mkDerivation {
        pname = "record";
-       version = "0.3.1";
-       sha256 = "11ddiz2i4rx0rydcm82j8gwf9zr26if78ij539hfdyi2zbvyri85";
+       version = "0.3.1.1";
+       sha256 = "08rmxy2hy19jz614ml5qfwhmdnhfs0qllgk65p0p7bb4v65cg5s9";
        buildDepends = [
          attoparsec base base-prelude template-haskell text transformers
        ];
@@ -102363,6 +102577,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "record-aeson" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, hspec, record
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "record-aeson";
+       version = "0.1.0.0";
+       sha256 = "023g63y478k7mq8kk5xcxa3civs3hdhlvdb0qh3amvvybpj3g4av";
+       buildDepends = [ aeson base base-prelude record template-haskell ];
+       testDepends = [ aeson base-prelude hspec record ];
+       homepage = "https://github.com/nikita-volkov/record-aeson";
+       description = "Instances of \"aeson\" classes for the \"record\" types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "record-gl" = callPackage
     ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit
      , linear, OpenGL, record, tagged, template-haskell, test-framework
@@ -102422,8 +102651,8 @@ self: {
     ({ mkDerivation, base, comonad, free, transformers }:
      mkDerivation {
        pname = "recursion-schemes";
-       version = "4.1";
-       sha256 = "03rf65ak6bxsr204j6d8g5zyxva9vbmncycav3smqwfg5n3b3pwf";
+       version = "4.1.1";
+       sha256 = "00izjknk7g2546p35hrha413nji6013wfbjic8jgmlzzjlr1cjwl";
        buildDepends = [ base comonad free transformers ];
        homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
@@ -104347,7 +104576,9 @@ self: {
      mkDerivation {
        pname = "resourcet";
        version = "1.1.4.1";
+       revision = "1";
        sha256 = "1qw9bjr22g8a1fr84cmwjqpqs7cfc8iagix4s618snrg1r1gp6p2";
+       editedCabalFile = "28106769e7204b32cfdfb46603990697cfef6f1a9e720d47ec76873edfb06ad7";
        buildDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat
@@ -104668,8 +104899,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.17";
-       sha256 = "01jz3bg6zjrvkrs7mvwvyyzq94j57cgmghzp9rsdlia2r6bd6lcz";
+       version = "0.0.18";
+       sha256 = "1zj9b0k9v1pi66m8j36zv2i6dc2r8njlsjalfiifch3knpfadl4z";
        buildDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -105746,6 +105977,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rspp" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "rspp";
+       version = "0.1.0.0";
+       sha256 = "1rlx6hzw987jng2wmm2igfqlfym06wk8wxvqpb4v1zgqb00rabpc";
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "http://github.com/AJChapman/rspp";
+       description = "A Rational Street Performer Protocol solver";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rss" = callPackage
     ({ mkDerivation, base, HaXml, network, network-uri, old-locale
      , time
@@ -107656,6 +107900,34 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "sdr" = callPackage
+    ({ mkDerivation, array, base, bytestring, cairo, cereal, Chart
+     , Chart-cairo, colour, containers, Decimal, dynamic-graph, either
+     , fftwRaw, GLFW-b, OpenGL, optparse-applicative, pango, pipes
+     , pipes-bytestring, pipes-concurrency, primitive, pulse-simple
+     , QuickCheck, rtlsdr, storable-complex, test-framework
+     , test-framework-quickcheck2, time, tuple, vector
+     }:
+     mkDerivation {
+       pname = "sdr";
+       version = "0.1.0.1";
+       sha256 = "1sy5sn401bdsnip99jc8qxp81j2ladrw9yvzmf3xf5hljyq7sxif";
+       buildDepends = [
+         array base bytestring cairo cereal Chart Chart-cairo colour
+         containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL
+         optparse-applicative pango pipes pipes-bytestring pipes-concurrency
+         primitive pulse-simple rtlsdr storable-complex time tuple vector
+       ];
+       testDepends = [
+         base primitive QuickCheck storable-complex test-framework
+         test-framework-quickcheck2 vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/adamwalker/sdr";
+       description = "A software defined radio library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "seacat" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , ConfigFile, data-default, directory, filepath, http-types
@@ -107753,20 +108025,21 @@ self: {
 
   "second-transfer" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
-     , conduit, containers, exceptions, hashable, hashtables, hslogger
-     , http2, HUnit, lens, network, network-uri, openssl, text
+     , conduit, containers, cpphs, exceptions, hashable, hashtables
+     , hslogger, http2, HUnit, lens, network, network-uri, openssl, text
      , transformers
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.2.0.0";
-       sha256 = "0lgb938i3f4yb4j5dxa4j4vn7wckl7kjhz0qd8yx1hpzi9k3y70g";
+       version = "0.3.0.4";
+       sha256 = "0hw3a43fz11sys8z8ngsfl7nc6prfaa4j6vzs1j8m3cni3hmrl5v";
        buildDepends = [
          base base16-bytestring binary bytestring conduit containers
          exceptions hashable hashtables hslogger http2 lens network
          network-uri text transformers
        ];
        testDepends = [ base bytestring conduit http2 HUnit lens ];
+       buildTools = [ cpphs ];
        extraLibraries = [ openssl ];
        jailbreak = true;
        homepage = "https://github.com/alcidesv/second-transfer";
@@ -109149,8 +109422,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-language-c";
-       version = "0.6.4";
-       sha256 = "1wn491jcx78v748dyis7wg3jlg0kff0iv605a6f2ig3j7sxka1yz";
+       version = "0.7.1";
+       sha256 = "035pqmxqkydl62i1yz2r3a3fzc3p4zw83y5p56ngjjywksy9w68m";
        buildDepends = [
          base data-default-class fclabels process shake split
          unordered-containers
@@ -109507,20 +109780,29 @@ self: {
 
   "shelly" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
-     , enclosed-exceptions, exceptions, lifted-async, lifted-base
-     , monad-control, mtl, process, system-fileio, system-filepath, text
-     , time, transformers, transformers-base, unix-compat
+     , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async
+     , lifted-base, monad-control, mtl, process, system-fileio
+     , system-filepath, text, time, transformers, transformers-base
+     , unix-compat
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.1.2";
-       sha256 = "0iv0ypl6qbrcax43smqc7s5zpm5ck5a5zby59ibnahv5a6wn16ki";
+       version = "1.6.2.5";
+       sha256 = "1dvaf1w1b5y717n24b9c3ri1qnpqppk5syh834h4iqcwfwlkjcvy";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
          system-fileio system-filepath text time transformers
          transformers-base unix-compat
        ];
+       testDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions hspec HUnit lifted-async lifted-base monad-control mtl
+         process system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -109688,8 +109970,8 @@ self: {
      }:
      mkDerivation {
        pname = "shuffle";
-       version = "0.1.3.2";
-       sha256 = "07amjk5l9apxs90klq3ii8gxmywnxqhx4fk2yapmm8l75l8b6kfg";
+       version = "0.1.3.3";
+       sha256 = "0ngva3p3838xay3zz442n99ilhk5d9majg342x6y7hs796lqbrrd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -110578,8 +110860,8 @@ self: {
      }:
      mkDerivation {
        pname = "singletons";
-       version = "1.1.1";
-       sha256 = "1pbz42i2vxmw3sf3f4sqvgyp9a1b1q5my7xq64h37a9g6jd2246a";
+       version = "1.1.2";
+       sha256 = "102pxml8k1f94q8vmbsjhv6sjxa316xblfcl8czagcxkpz0sil4d";
        buildDepends = [ base containers mtl template-haskell th-desugar ];
        testDepends = [
          base Cabal constraints filepath process tasty tasty-golden
@@ -114160,21 +114442,44 @@ self: {
      }) {};
 
   "stackage" = callPackage
-    ({ mkDerivation, base, stackage-cli, stackage-install
-     , stackage-update, stackage-upload
+    ({ mkDerivation, base, stackage-build-plan, stackage-cli
+     , stackage-install, stackage-update, stackage-upload
      }:
      mkDerivation {
        pname = "stackage";
-       version = "0.7.1.0";
-       sha256 = "02z5gkhymgiz7n0mm7j3p10ysi58d9rcz9d2pxakf0hmdsc37xx7";
+       version = "0.7.2.0";
+       sha256 = "0qqj39jpigv77vikdc18n7p4527z5hj1chzshqsng4d4msqavfkp";
        buildDepends = [
-         base stackage-cli stackage-install stackage-update stackage-upload
+         base stackage-build-plan stackage-cli stackage-install
+         stackage-update stackage-upload
        ];
        homepage = "https://www.stackage.org/";
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-build-plan" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , directory, exceptions, filepath, http-client, http-client-tls
+     , mtl, optparse-applicative, stackage-cli, stackage-types, text
+     , time, yaml
+     }:
+     mkDerivation {
+       pname = "stackage-build-plan";
+       version = "0.1.0.0";
+       sha256 = "01vnfmsxx6m6x9wip5pqbg5yffprlc94cdj5ahqs2fyqvzs4j8rb";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring Cabal containers directory exceptions
+         filepath http-client http-client-tls mtl optparse-applicative
+         stackage-cli stackage-types text time yaml
+       ];
+       homepage = "https://github.com/fpco/stackage-build-plan";
+       description = "Calculate and print (in different formats) Stackage build plans";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-cli" = callPackage
     ({ mkDerivation, base, bytestring, conduit, directory, either
      , exceptions, filepath, hashable, http-client, http-client-tls
@@ -114213,8 +114518,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.8.0";
-       sha256 = "1nzbx22y90llcbfv37v119s7psp70rh7gyszar6zfg7wr4plcimb";
+       version = "0.8.1";
+       sha256 = "1fjyh8lgkf4z36jwxy45rbl4sqzg7j51gaymrqig5c0434canyqc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114239,17 +114544,17 @@ self: {
 
   "stackage-install" = callPackage
     ({ mkDerivation, async, base, bytestring, directory, filepath
-     , http-client, http-client-tls, process, stm
+     , http-client, http-client-tls, http-types, process, stm
      }:
      mkDerivation {
        pname = "stackage-install";
-       version = "0.1.0.1";
-       sha256 = "1ryl2b3hd4kbrn4k1brsqqwq14sv0dhsl89zskgmzwrxg32p2m94";
+       version = "0.1.0.2";
+       sha256 = "0zz7rlmjmfx45xxcid6zd8i3m3ar45hv4jhb9sqnha3qdy9yb9a5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          async base bytestring directory filepath http-client
-         http-client-tls process stm
+         http-client-tls http-types process stm
        ];
        homepage = "https://github.com/fpco/stackage-install";
        description = "Secure download of packages for cabal-install";
@@ -114816,13 +115121,14 @@ self: {
     ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }:
      mkDerivation {
        pname = "step-function";
-       version = "0.1.0.0";
-       sha256 = "0v7mpi680zl5ihzrdda7di790br5jm563kf0r46z40b63lbzzv01";
+       version = "0.1.0.2";
+       sha256 = "1jr10zxyq8w6nnkxvjzhrmrxq8ksfcpsgxmjcag0hsxr0rflh8pk";
        buildDepends = [ base ];
        testDepends = [ base Cabal cabal-test-quickcheck QuickCheck ];
        homepage = "https://github.com/jonpetterbergman/step-function";
        description = "Step functions, staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stepwise" = callPackage
@@ -115800,8 +116106,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "0.1.3.1";
-       sha256 = "0c0g1ixjja49ifdch06flsb1k233sazy7yybqskacv7xmb1bpixy";
+       version = "0.1.4.0";
+       sha256 = "09s699h2b641bakcgf3f2cwdqb4qb37b4y31vpcq3k8pkbmhy8sf";
        buildDepends = [
          aeson base bytestring either HsOpenSSL http-streams io-streams mtl
          random text time transformers unordered-containers
@@ -116452,8 +116758,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger";
-       version = "0.2.1";
-       sha256 = "0b3yj37l80nvk2qnd1hnvqr6xsh11v7sb6s75wnr5gm6v7q5fd47";
+       version = "0.2.2";
+       sha256 = "1hpc569n34kr1nkrwlx76pc0yp9icr8j5cxliwjqffnh7x2czzqr";
        buildDepends = [ aeson base bytestring text time transformers ];
        testDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "Implementation of swagger data model";
@@ -116724,24 +117030,26 @@ self: {
 
   "syncthing-hs" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, containers
-     , derive, either, exceptions, http-client, http-client-tls, lens
-     , old-locale, quickcheck-instances, regex-posix, tasty, tasty-hunit
+     , data-default, derive, either, exceptions, http-client
+     , http-client-tls, http-types, lens, old-locale
+     , quickcheck-instances, regex-posix, scientific, tasty, tasty-hunit
      , tasty-quickcheck, text, time, transformers, unordered-containers
-     , wreq
+     , vector, wreq
      }:
      mkDerivation {
        pname = "syncthing-hs";
-       version = "0.1.2.0";
-       sha256 = "15s2pz775bgygq2pnb6x546sf16vcr2dzyn5qnwf4wl7gg4hjalj";
+       version = "0.2.0.0";
+       sha256 = "172jyv2lxq1ys7r2hcrria91s6k5fks2bqnd7whppln79g1nd7vi";
        buildDepends = [
          aeson base bytestring connection containers either exceptions
          http-client http-client-tls lens old-locale regex-posix text time
-         transformers unordered-containers wreq
+         transformers unordered-containers vector wreq
        ];
        testDepends = [
-         aeson base bytestring containers derive either lens
-         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
-         transformers wreq
+         aeson base bytestring containers data-default derive either
+         exceptions http-client http-types lens quickcheck-instances
+         scientific tasty tasty-hunit tasty-quickcheck text transformers
+         vector wreq
        ];
        homepage = "https://github.com/jetho/syncthing-hs";
        description = "Haskell bindings for the Syncthing REST API";
@@ -118648,8 +118956,8 @@ self: {
      }:
      mkDerivation {
        pname = "templater";
-       version = "0.0.2.0";
-       sha256 = "10dar9n4ccskv163zh3h756mp9ccx04ifgjwnsf8cnab22lng5mb";
+       version = "0.0.3.0";
+       sha256 = "0j00bb915j5d9a416gjqng08zcqfwbv24k2rqmb0mbmzz768viz4";
        buildDepends = [ attoparsec base text ];
        testDepends = [
          base hspec hspec-attoparsec HUnit QuickCheck text
@@ -118699,12 +119007,12 @@ self: {
      }) {};
 
   "temporal-media" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, Boolean }:
      mkDerivation {
        pname = "temporal-media";
-       version = "0.4.0";
-       sha256 = "0x421j06xqa3rrx3pavc720j6xhnajgp3x1m8hdafis2g93d4mb0";
-       buildDepends = [ base ];
+       version = "0.5.0";
+       sha256 = "1pjw781rkki4nv0xsn35jhrad2xxxks0lpqsx3zg5rzrvvxqd3b6";
+       buildDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
        license = stdenv.lib.licenses.bsd3;
@@ -119169,6 +119477,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "test-invariant" = callPackage
+    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "test-invariant";
+       version = "0.4.3.0";
+       sha256 = "1s0ddadch3wk8435y6am6v7d833jj0v7i70wr9shi7qc91igm3wr";
+       buildDepends = [ base QuickCheck ];
+       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       homepage = "https://github.com/knupfer/test-invariant";
+       description = "Provide common invariants to be checked with QuickCheck";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "test-pkg" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -119417,8 +119738,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.8.1";
-       sha256 = "0k30b4klbp1n59gjpwmkcd8p7rg0ihnn9n3ka5vz85lfsykl7q6q";
+       version = "0.8.2";
+       sha256 = "1dqx00ai4cgvrih0pwk46iajcpdq6a2dn8ndy1lficgqld6dvdzr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -120014,6 +120335,7 @@ self: {
        homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar" = callPackage
@@ -120540,28 +120862,27 @@ self: {
      }) {};
 
   "threepenny-gui" = callPackage
-    ({ mkDerivation, aeson, attoparsec-enumerator, base, bytestring
-     , containers, data-default, deepseq, filepath, hashable
+    ({ mkDerivation, aeson, async, attoparsec-enumerator, base
+     , bytestring, containers, data-default, deepseq, filepath, hashable
      , MonadCatchIO-transformers, network-uri, safe, snap-core
      , snap-server, stm, template-haskell, text, time, transformers
-     , unordered-containers, utf8-string, vault, websockets
+     , unordered-containers, utf8-string, vault, vector, websockets
      , websockets-snap
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.5.0.0";
-       sha256 = "0rr826k6p2hbp66qr12sci6km40krbi7lbs293r11jxi0ivj5drd";
+       version = "0.6.0.1";
+       sha256 = "1pivjwz9i3phi6ja4b47mwbh3gscql4z14vxw5s6imhy3pzbr99r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson attoparsec-enumerator base bytestring containers data-default
-         deepseq filepath hashable MonadCatchIO-transformers network-uri
-         safe snap-core snap-server stm template-haskell text time
-         transformers unordered-containers utf8-string vault websockets
-         websockets-snap
+         aeson async attoparsec-enumerator base bytestring containers
+         data-default deepseq filepath hashable MonadCatchIO-transformers
+         network-uri safe snap-core snap-server stm template-haskell text
+         time transformers unordered-containers utf8-string vault vector
+         websockets websockets-snap
        ];
-       jailbreak = true;
-       homepage = "http://www.haskell.org/haskellwiki/Threepenny-gui";
+       homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121204,14 +121525,23 @@ self: {
      }) {};
 
   "timerep" = callPackage
-    ({ mkDerivation, attoparsec, base, old-locale, time }:
+    ({ mkDerivation, attoparsec, base, Cabal, cabal-test-quickcheck
+     , monoid-subclasses, QuickCheck, text, time, time-locale-compat
+     }:
      mkDerivation {
        pname = "timerep";
-       version = "1.0.4";
-       sha256 = "00a1sfhpp3c88f2pg0kigmzngh84ahw9d4zh188miagw0b4zn8xj";
-       buildDepends = [ attoparsec base old-locale time ];
-       description = "Parse and display time according to some RFCs (RFC3339, RFC2822)";
+       version = "2.0.0";
+       sha256 = "1s2m5z36ll4r2xijw6jv0wblva79jpzz6737l607hn3pvq13nbzz";
+       buildDepends = [
+         attoparsec base monoid-subclasses text time time-locale-compat
+       ];
+       testDepends = [
+         base Cabal cabal-test-quickcheck QuickCheck text time
+         time-locale-compat
+       ];
+       description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -121283,12 +121613,13 @@ self: {
      }:
      mkDerivation {
        pname = "timezone-olson";
-       version = "0.1.6";
-       sha256 = "0gg1fq85km5d48966a267q6z0wwl1dz88xq88v0l1jlkwd9jsb0z";
+       version = "0.1.7";
+       revision = "1";
+       sha256 = "1am6vqq3zxrnb444waqfajk3s1wpynw9fszqnk9ww7akf2v5abr3";
+       editedCabalFile = "cdd67661d2460ceb1720bcbb194726a57c21b113b9383cd1f1dca91e8e71d652";
        buildDepends = [
          base binary bytestring extensible-exceptions time timezone-series
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/time-ng/";
        description = "A pure Haskell parser and renderer for binary Olson timezone files";
        license = stdenv.lib.licenses.bsd3;
@@ -121300,12 +121631,11 @@ self: {
      }:
      mkDerivation {
        pname = "timezone-olson-th";
-       version = "0.1.0.0";
-       sha256 = "0rw0gca1qa5r9nas12mhmbfa09jjix6kn7h5vjmvbhh83820br5i";
+       version = "0.1.0.1";
+       sha256 = "1xqy4bbkwn03ynvk8dhcmrp37rj1swaskh2si9adb9d5prcibsv1";
        buildDepends = [
          base template-haskell time timezone-olson timezone-series
        ];
-       jailbreak = true;
        homepage = "http://github.com/jonpetterbergman/timezone-olson-th";
        description = "Load TimeZoneSeries from an Olson file at compile time";
        license = stdenv.lib.licenses.bsd3;
@@ -121315,10 +121645,9 @@ self: {
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "timezone-series";
-       version = "0.1.4";
-       sha256 = "06p5v0dimhwmra100gwkhkz3ll492i2bvafw0qx2qzcxx4yxff40";
+       version = "0.1.5.1";
+       sha256 = "0mks5s5wdw8fi5hjhf6zbs3pfgy4gsysd1369s41kw4h7aidsi6j";
        buildDepends = [ base time ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -122621,20 +122950,20 @@ self: {
 
   "tttool" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , directory, filepath, ghc-prim, hashable, JuicyPixels, mtl, parsec
-     , process, template-haskell, text, time, unordered-containers
-     , vector, yaml
+     , directory, executable-path, filepath, hashable, haskeline
+     , JuicyPixels, mtl, parsec, process, process-extras, random
+     , template-haskell, time, vector, yaml
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.3";
-       sha256 = "03wb7ra4zk6x40z2h2i8rdlf53abd9lnj67c2438y2vk70ljmlny";
+       version = "1.4.0.1";
+       sha256 = "1adk3ngh88bm2mwycvpw3fsvzcrprkd34wyam6pan8yvw1jaz0lg";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         aeson base binary bytestring containers directory filepath ghc-prim
-         hashable JuicyPixels mtl parsec process template-haskell text time
-         unordered-containers vector yaml
+         aeson base binary bytestring containers directory executable-path
+         filepath hashable haskeline JuicyPixels mtl parsec process
+         process-extras random template-haskell time vector yaml
        ];
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
@@ -124141,8 +124470,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-light";
-       version = "1.1.8.10";
-       sha256 = "12rrcvmqpani5pp9qpf4yqsgvbzx4xwj87nfw0kl4mrhl4gd8c8d";
+       version = "1.1.9.0";
+       sha256 = "0dqb0054nbl5qfxrg7g4yvmiawp9ladlws26cdf32jxrm31wgmkj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -124163,8 +124492,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.5.4";
-       sha256 = "0ksaph4nmk38hv3pfs95xrp6mryhjk6dqbl8wlj5iyn75f1yibli";
+       version = "0.1.5.5";
+       sha256 = "00b1ycdnm0gm01izs96qwsx3c3p1mrcimzamscaimyr1y14jvfc1";
        buildDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib
@@ -125644,8 +125973,8 @@ self: {
      }:
      mkDerivation {
        pname = "usb";
-       version = "1.3.0.1";
-       sha256 = "0sckwrf22zpyp11575d8n5ka6cwcc0cw9r79vzbl859rz1bcxrj7";
+       version = "1.3.0.2";
+       sha256 = "1qnbjpxa19w3dli5qjamb3f8pgq8jas01pm30x8m7fbh4zlnpzib";
        buildDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
@@ -125748,8 +126077,8 @@ self: {
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
        pname = "users";
-       version = "0.2.0.1";
-       sha256 = "0h0265yynj22p6m84gb9by4axby90awsf7zr2s2g0sb9j38z2b4p";
+       version = "0.3.0.0";
+       sha256 = "1f63223fxrcyp3gz63viqncqs7yln0mifcnh123172rnfhn61zka";
        buildDepends = [ aeson base bcrypt path-pieces text time ];
        homepage = "https://github.com/agrafix/users";
        description = "A library simplifying user management for web applications";
@@ -125762,8 +126091,8 @@ self: {
      }:
      mkDerivation {
        pname = "users-postgresql-simple";
-       version = "0.2.0.0";
-       sha256 = "162bk3nswnnzblksx4n8fz2yvxaqry7jknb2gkypv15r6kw1pi43";
+       version = "0.3.0.0";
+       sha256 = "039da6rvjcdjg5lpd5hqkxcb9vgdcd7ppjiqk3gn6jl5q1gn1yzr";
        buildDepends = [
          aeson base bytestring mtl postgresql-simple text time users uuid
        ];
@@ -125777,8 +126106,8 @@ self: {
     ({ mkDerivation, aeson, base, hspec, text, users }:
      mkDerivation {
        pname = "users-test";
-       version = "0.2.0.0";
-       sha256 = "1fli5h9i5bjx945pixnlicsy2y2caw1595isq98vwv7rsarkj8dx";
+       version = "0.3.0.0";
+       sha256 = "1cmrd0igkidmv8jfb3dv3g49i1k71rh3i4v3dksql18g7472cnxh";
        buildDepends = [ aeson base hspec text users ];
        homepage = "https://github.com/agrafix/users";
        description = "Library to test backends for the users library";
@@ -125939,19 +126268,21 @@ self: {
      }) {};
 
   "uu-options" = callPackage
-    ({ mkDerivation, base, lenses, mtl, transformers, uu-interleaved
-     , uu-parsinglib
+    ({ mkDerivation, base, lenses, mtl, template-haskell, transformers
+     , uu-interleaved, uu-parsinglib
      }:
      mkDerivation {
        pname = "uu-options";
-       version = "0.1.0.1";
-       sha256 = "0dygg4w3rlnf1pnmwq7i6vzz0v90b4g18ipfc5whn1ss1bixwxk4";
+       version = "0.1.0.2";
+       revision = "1";
+       sha256 = "0cbf0ckq8z7lqziip7znfwa4vmqfsgmg7phrc3r68z2hpinw73zy";
+       editedCabalFile = "25f112bb1de34b05c01588e982a1ce61225ede0e18d569c5dea91518589e0149";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base lenses mtl transformers uu-interleaved uu-parsinglib
+         base lenses mtl template-haskell transformers uu-interleaved
+         uu-parsinglib
        ];
-       jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Parse command line options using uu-interleave and uu-parsinglib";
        license = stdenv.lib.licenses.mit;
@@ -126689,6 +127020,7 @@ self: {
        sha256 = "10mn2gvpkp14j7rc7cc66x30k7xh56xpp04ak1aj8p46rsy75s4x";
        editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216";
        buildDepends = [ accelerate base vect-floating ];
+       jailbreak = true;
        homepage = "http://github.com/cpdurham/vect-floating-accelerate";
        description = "Accelerate instances for vect-floating types";
        license = stdenv.lib.licenses.bsd3;
@@ -127513,8 +127845,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.2.8";
-       sha256 = "01wra0gfv94wbv0blrixix0bggjg9cg72axgg3r9brp7qmh1qv14";
+       version = "5.2.9";
+       sha256 = "013bha8b30q7ax2qyv315hmdxhzfqgc2bw2wyz1q53qw0mxyhbjr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -127663,8 +127995,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-static";
-       version = "3.0.1";
-       sha256 = "0c2zhkm9c9ixaj210npi5vlm4rnyj56nxakjz63kahna121qjqak";
+       version = "3.0.1.1";
+       sha256 = "1zji4zisclycpyg28shwk96zmhmlvwiwz057dd4wf3w35sdklx7y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -128317,6 +128649,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-request-spec" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-types, text, wai
+     }:
+     mkDerivation {
+       pname = "wai-request-spec";
+       version = "0.8.5.2";
+       sha256 = "1r51ib85krin61ggqgrir0igma80qryblqqrf38j01af1qnvvlxv";
+       buildDepends = [
+         base bytestring case-insensitive containers http-types text wai
+       ];
+       homepage = "https://gitlab.com/cpp.cabrera/wai-request-spec";
+       description = "Declarative request parsing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-responsible" = callPackage
     ({ mkDerivation, base, bytestring, http-types, wai }:
      mkDerivation {
@@ -132242,8 +132590,8 @@ self: {
      }:
      mkDerivation {
        pname = "yackage";
-       version = "0.7.0.7";
-       sha256 = "168dcl2ham94k0wmf75lgazn6q82yfww5lpl24nhmdr3fwd4p6p1";
+       version = "0.7.0.8";
+       sha256 = "1wp7vqlnwxiq4fi0dly25n9jxqi1rpgngd5dn4w4gqla1mqpb43c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -132954,8 +133302,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth";
-       version = "1.4.0.1";
-       sha256 = "0wy3c271jq7ssvh6fhpi0h92pin5a8f48vmr3qsw8szf4gpw1j69";
+       version = "1.4.0.2";
+       sha256 = "0vwp08rx4bnqx9mr6ixq15s334cdjadhl9n84rs3n1xd94sj1p6l";
        buildDepends = [
          authenticate-oauth base bytestring lifted-base text transformers
          yesod-auth yesod-core yesod-form
@@ -133053,10 +133401,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.7.1";
-       revision = "1";
-       sha256 = "080jamya9scyybls3j230rv1mpmxhvskaxd72wxxm5slv8kc6p27";
-       editedCabalFile = "a4b2436fca046b83a3e88fc9b923d3d852a87ebd392d9d0704047e01b8a0a7be";
+       version = "1.4.7.2";
+       sha256 = "15l69vxfzhjql83ikvb6ca980ikj17346bq9b4888cv87yxnizgh";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -133985,6 +134331,7 @@ self: {
        ];
        description = "Transloadit support for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-vend" = callPackage

From 6079bd61b50ac560321c68cb5943f93aac5457ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 3 May 2015 16:58:56 +0200
Subject: [PATCH 0384/1143] haskell-bitcoin-api: depends on broken wreq

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 0e4fd3cc5d1f..d22a279f0b82 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -333,5 +333,6 @@ self: super: {
   wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq);
   wreq-sb = dontDistribute (dontCheck super.wreq-sb);
   hipbot = dontDistribute super.hipbot;
+  bitcoin-api = dontDistribute super.bitcoin-api;
 
 }

From 63efc2ee3877f9da46455445ef6827d192fcdfe7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 3 May 2015 20:34:10 +0200
Subject: [PATCH 0385/1143] haskell-doctest-prop: disable broken test suite

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f6819a100fef..f65e43c9b51e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -787,4 +787,7 @@ self: super: {
   # https://github.com/ndmitchell/shake/issues/206
   shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin; });
 
+  # https://github.com/nushio3/doctest-prop/issues/1
+  doctest-prop = dontCheck super.doctest-prop;
+
 }

From 35b3d16bdebaa12340c36c39660b4744c4617ee2 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Mon, 4 May 2015 16:20:11 +0200
Subject: [PATCH 0386/1143] haskell-data-hash: disable broken test suite

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f65e43c9b51e..b0c628b9763a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -349,6 +349,7 @@ self: super: {
   conduit-connection = dontCheck super.conduit-connection;
   craftwerk = dontCheck super.craftwerk;
   damnpacket = dontCheck super.damnpacket;              # http://hydra.cryp.to/build/496923/log
+  data-hash = dontCheck super.data-hash;
   Deadpan-DDP = dontCheck super.Deadpan-DDP;            # http://hydra.cryp.to/build/496418/log/raw
   DigitalOcean = dontCheck super.DigitalOcean;
   directory-layout = dontCheck super.directory-layout;

From 4239e276ea0c0604ad1de38c46e3a615ae535222 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 May 2015 16:56:46 +0200
Subject: [PATCH 0387/1143] fetch-ec2-data: Don't restart

This service only needs to run once on system startup, so it doesn't
need to be restarted by switch-to-configuration.
---
 nixos/modules/virtualisation/ec2-data.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 15114b1e76ac..b21c6bfbc0be 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -35,8 +35,8 @@ with lib;
 
             wget="wget -q --retry-connrefused -O -"
 
-            echo "setting host name..."
             ${optionalString (config.networking.hostName == "") ''
+              echo "setting host name..."
               ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname)
             ''}
 
@@ -69,14 +69,18 @@ with lib;
             fi
 
             ${optionalString (! config.ec2.metadata) ''
-            # Since the user data is sensitive, prevent it from being
-            # accessed from now on.
-            ip route add blackhole 169.254.169.254/32
+              # Since the user data is sensitive, prevent it from
+              # being accessed from now on. FIXME: remove at some
+              # point, since current NixOps no longer relies on
+              # metadata secrecy.
+              ip route add blackhole 169.254.169.254/32
             ''}
           '';
 
         serviceConfig.Type = "oneshot";
         serviceConfig.RemainAfterExit = true;
+
+        restartIfChanged = false;
       };
 
     systemd.services."print-host-key" =

From 80edc9549477ef570bd902658960f84975cad54a Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Sun, 3 May 2015 14:30:09 -0400
Subject: [PATCH 0388/1143] dbus: Build on Darwin

---
 pkgs/development/libraries/dbus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 087df1a71511..84a18f2a0b54 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -76,7 +76,7 @@ let
     # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
     NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
     buildInputs = [ systemdOrEmpty ];
-    meta.platforms = with stdenv.lib.platforms; allBut darwin;
+    meta.platforms = stdenv.lib.platforms.all;
   };
 
 

From 366da9e70f46bd42a62bdcd9a0aa7b891c54760d Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 1 Apr 2015 15:02:07 +0100
Subject: [PATCH 0389/1143] fetchhg: add option to fetch hg subrepos

---
 pkgs/build-support/fetchhg/builder.sh      | 2 +-
 pkgs/build-support/fetchhg/default.nix     | 6 ++++--
 pkgs/build-support/fetchhg/nix-prefetch-hg | 8 +++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh
index 0b51ef79b235..847f18fa5975 100644
--- a/pkgs/build-support/fetchhg/builder.sh
+++ b/pkgs/build-support/fetchhg/builder.sh
@@ -3,7 +3,7 @@ header "getting $url${rev:+ ($rev)} into $out"
 
 hg clone --insecure "$url" hg-clone
 
-hg archive -q -y ${rev:+-r "$rev"} --cwd hg-clone $out
+hg archive -q$subrepoClause -y ${rev:+-r "$rev"} --cwd hg-clone $out
 rm -f $out/.hg_archival.txt
 
 stopNest
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 4675cbe6ec80..afff9d368833 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null}:
+{stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
 
 # TODO: statically check if mercurial as the https support if the url starts woth https.
 stdenv.mkDerivation {
@@ -9,10 +9,12 @@ stdenv.mkDerivation {
   # Nix <= 0.7 compatibility.
   id = md5;
 
+  subrepoClause = if fetchSubrepos then "S" else "";
+
   outputHashAlgo = if md5 != null then "md5" else "sha256";
   outputHashMode = "recursive";
   outputHash = if md5 != null then md5 else sha256;
-  
+
   inherit url rev;
   preferLocalBuild = true;
 }
diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg
index a8916176f8af..a877b217125f 100755
--- a/pkgs/build-support/fetchhg/nix-prefetch-hg
+++ b/pkgs/build-support/fetchhg/nix-prefetch-hg
@@ -17,6 +17,12 @@ if test -z "$url"; then
     exit 1
 fi
 
+if test "$fetchSubrepos" == 1; then
+    subrepoClause=S
+else
+    subrepoClause=
+fi
+
 test -n "$rev" || rev="tip"
 
 
@@ -47,7 +53,7 @@ if test -z "$finalPath"; then
     else
       tmpClone=$url
     fi
-    hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive
+    hg archive -q$subrepoClause -y -r "$rev" --cwd $tmpClone $tmpArchive
     rm -f $tmpArchive/.hg_archival.txt
 
     echo "hg revision is $(cd $tmpClone; hg id -r "$rev" -i)"

From 7931799a0f1a492ddab7325a488df729810b53bd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 May 2015 17:30:56 +0200
Subject: [PATCH 0390/1143] tzdata 2015c -> 2015d

---
 pkgs/data/misc/tzdata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 57417022176d..0ed99bfdb163 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2015c"; in
+let version = "2015d"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0nin48g5dmkfgckp25bngxchn3sw3yyjss5sq7gs5xspbxgsq3w6";
+        sha256 = "0cfmjvr753b3wjnr1njv268xcs31yl9pifkxx58y42bz4w4517wb";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "0bplibiy70dvlrhwqzkzxgmg81j6d2kklvjgi2f1g2zz1nkb3vkz";
+        sha256 = "0a3i65b6lracfx18s8j69k0x30x8aq9gx7qm040sybn4qm7ga6i2";
       })
     ];
 

From 171710c14abad8a3c87c99f3bcb879cc7e16c352 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Mon, 4 May 2015 19:08:14 +0200
Subject: [PATCH 0391/1143] update/fix distrho

---
 pkgs/applications/audio/distrho/default.nix | 24 ++++++++-------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index a8c710f2099e..e6d5971b6fd2 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -2,12 +2,12 @@
 , libxslt, lv2, pkgconfig, premake3, xlibs }:
 
 stdenv.mkDerivation rec {
-  name = "distrho-ports-git-2015-01-28";
+  name = "distrho-ports-git-2015-05-04";
 
   src = fetchgit {
     url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
-    rev = "b4e2dc24802fe6804c60fcd2559a0bca46b7709c";
-    sha256 = "661ff6f7cda71a8dd08cbcea3f560e99f0fc2232053cbc9a2aaba854137805c6";
+    rev = "3f13db5dc7722ed0dcbb5256d7fac1ac9165c2d8";
+    sha256 = "6f740f6a8af714436ef75b858944e8122490a2faa04591a201105e84bca42fa0";
   };
 
   patchPhase = ''
@@ -22,13 +22,11 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     sh ./scripts/premake-update.sh linux
-    make standalone
     make lv2
   '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp bin/standalone/* $out/bin/
     mkdir -p $out/lib/lv2
     cp -a bin/lv2/* $out/lib/lv2/
   '';
@@ -38,18 +36,14 @@ stdenv.mkDerivation rec {
     description = "A collection of cross-platform audio effects and plugins";
     longDescription = ''
       Includes:
-      3BandEQ bitmangler drowaudio-distortion drowaudio-flanger
-      drowaudio-tremolo eqinox juce_pitcher sDelay TAL-Filter
-      TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
-      Wolpertinger argotlunar capsaicin drowaudio-distortionshaper
-      drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan
-      TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex
+      Dexed  drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger
+      drowaudio-reverb drowaudio-tremolo drumsynt EasySSP  eqinox
+      JuceDemoPlugin klangfalter LUFSMeter luftikus obxd pitchedDelay
+      stereosourceseparation TAL-Dub-3 TAL-Filter TAL-Filter-2 TAL-NoiseMaker
+      TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction
+      ThePilgrim Vex Wolpertinger
     '';
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
-
-    # The old repo was removed and split into multiple repos. More
-    # work is required to get everything to build and work.
-    broken = true;
   };
 }

From 3e17d6e958668403b51a52f96f8d3e26761b8840 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 May 2015 19:09:27 +0200
Subject: [PATCH 0392/1143] haskell-void: trigger re-build to unbreak our copy
 on Hydra

---
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index bba72198e602..caa4882accba 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -132,4 +132,8 @@ self: super: {
   # needs mtl-compat to build with mtl 2.1.x
   cgi = addBuildDepend super.cgi self.mtl-compat;
 
+  # Ugly hack that triggers a re-build to get rid of the broken version served
+  # by Hydra: http://hydra.cryp.to/build/794273/nixlog/98/raw.
+  void = appendConfigureFlag super.void "-fignore-me";
+
 }

From 5ccbfb2dcce22000cc279f92a9e357f11af9fe77 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Mon, 4 May 2015 18:58:19 +0000
Subject: [PATCH 0393/1143] tarsnap: fix up permissions of existing cache
 directories

---
 nixos/modules/services/backup/tarsnap.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index f8eeb4378443..57121e238553 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -249,6 +249,8 @@ in
       script = ''
         mkdir -p -m 0755 ${dirOf cfg.cachedir}
         mkdir -p -m 0700 ${cfg.cachedir}
+        chown root:root ${cfg.cachedir}
+        chmod 0700 ${cfg.cachedir}
         DIRS=`cat /etc/tarsnap/$1.dirs`
         exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS
       '';

From b7aeeee0436f6d0902d5ae5af068644d5252846e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 4 May 2015 23:41:54 +0200
Subject: [PATCH 0394/1143] pythonPackages.httpretty: disable testing

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3fa87cf6ecf..04a5ab65e097 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6008,7 +6008,7 @@ let
     name = "httpretty-${version}";
     version = "0.8.3";
     disabled = isPy3k;
-    doCheck = !isPyPy;
+    doCheck = false;
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/h/httpretty/${name}.tar.gz";

From eaa5e2309f8de5320ce00e0af1158f5e0573f56c Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 5 May 2015 02:58:33 +0300
Subject: [PATCH 0395/1143] spacefm: update and add dep

---
 pkgs/applications/misc/spacefm/default.nix    | 36 +++++++++++--------
 .../libraries/ffmpegthumbnailer/default.nix   | 31 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/ffmpegthumbnailer/default.nix

diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index b88e4c567cc1..ea7663c24069 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -1,30 +1,36 @@
-{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info
-, intltool, pkgconfig, makeWrapper
-}:
+{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks }:
 
-let
-  version = "0.9.2";
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "spacefm-${version}";
+  version = "1.0.1";
 
   src = fetchurl {
-    url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true";
-    sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c";
+    url = "https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz";
+    sha256 = "0mps6akwzr4mkljgywpimwgqf6ajnd7gq615877h20wyjf4h46vz";
   };
 
-  buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ];
+  configureFlags = [
+    "--with-bash-path=${pkgs.bash}/bin/bash"
+    "--with-preferable-sudo=${pkgs.sudo}/bin/sudo"
+  ];
+
+  buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ffmpegthumbnailer jmtpfs ifuse lsof udisks ];
 
   preFixup = ''
     wrapProgram "$out/bin/spacefm" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  meta = {
-    description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration";
-    platforms = pkgs.lib.platforms.linux;
-    license = pkgs.lib.licenses.gpl3;
+  meta = with stdenv.lib;  {
+    description = "A multi-panel tabbed file manager";
+    longDescription = "Multi-panel tabbed file and desktop manager for Linux
+      with built-in VFS, udev- or HAL-based device manager,
+      customizable menu system, and bash integration
+    ";
+    homepage = http://ignorantguru.github.io/spacefm/;
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.jagajaga ];
   };
 
 }
-
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
new file mode 100644
index 000000000000..df1c532f6330
--- /dev/null
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -0,0 +1,31 @@
+{ pkgs, fetchurl, stdenv, ffmpeg, cmake, libpng, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  name = "ffmpegthumbnailer-${version}";
+  version = "2.0.10";
+
+  src = fetchurl {
+    url = "https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/${version}/${name}.tar.bz2";
+    sha256 = "0q7ws7ysw2rwr6ja8rhdjcc7x1hrlga7n514wi4lhw1yma32q0m3";
+  };
+
+  buildInputs = [ ffmpeg cmake libpng pkgconfig ];
+
+  meta = with stdenv.lib;  {
+    homepage = https://github.com/dirkvdb/ffmpegthumbnailer;
+    description = "A lightweight video thumbnailer";
+    longDescription = "FFmpegthumbnailer is a lightweight video 
+        thumbnailer that can be used by file managers to create thumbnails
+        for your video files. The thumbnailer uses ffmpeg o decode frames
+        from the video files, so supported videoformats depend on the
+        configuration flags of ffmpeg.
+        This thumbnailer was designed to be as fast and lightweight as possible.
+        The only dependencies are ffmpeg and libpng.
+    ";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.jagajaga ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a20248705f3c..0ed6fbdbb451 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5770,6 +5770,8 @@ let
   ffmpeg_2 = ffmpeg_2_5;
   ffmpeg = ffmpeg_2;
 
+  ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
+
   ffms = callPackage ../development/libraries/ffms { };
 
   fftw = callPackage ../development/libraries/fftw { };

From 256a372b08dc296ae5084c6d38f5ddeab5d56bbf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 4 May 2015 21:07:56 -0500
Subject: [PATCH 0396/1143] clementine: fix Spotify support

---
 .../clementine/clementine-spotify-blob.patch  |  25 ++++
 .../applications/audio/clementine/default.nix | 123 ++++++++++++------
 2 files changed, 107 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/applications/audio/clementine/clementine-spotify-blob.patch

diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
new file mode 100644
index 000000000000..d41720c90215
--- /dev/null
+++ b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
@@ -0,0 +1,25 @@
+From d9ebe7ec09a48b1ea505ccc33686b72642f083f4 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 4 May 2015 19:59:38 -0500
+Subject: [PATCH] Runtime selection of Spotify blob
+
+---
+ src/internet/spotifyservice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp
+index 543744e..d987a36 100644
+--- a/src/internet/spotifyservice.cpp
++++ b/src/internet/spotifyservice.cpp
+@@ -65,7 +65,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)
+   system_blob_path_ = QCoreApplication::applicationDirPath() +
+       "/../PlugIns/clementine-spotifyblob";
+ #else
+-  system_blob_path_ = QCoreApplication::applicationDirPath() +
++  system_blob_path_ = qgetenv("CLEMENTINE_SPOTIFYBLOB") +
+       "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
+ #endif
+ 
+-- 
+2.3.6
+
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index de5fd148aa1a..cc13868e9d4e 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,65 +1,105 @@
 { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
 , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
-, usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
+, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig
 , sparsehash, config, makeWrapper, runCommand, gst_plugins }:
 
 let
+  withSpotify = config.clementine.spotify or false;
+
   version = "1.2.3";
 
   exeName = "clementine";
 
+  src = fetchurl {
+    url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
+    sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
+  };
+
+  patches = [
+    ./clementine-1.2.1-include-paths.patch
+    ./clementine-dbus-namespace.patch
+    ./clementine-spotify-blob.patch
+  ];
+
+  buildInputs = [
+    boost
+    cmake
+    fftw
+    gettext
+    glew
+    gst_plugins_base
+    gstreamer
+    gvfs
+    libcdio
+    libgpod
+    liblastfm
+    libmtp
+    libplist
+    pkgconfig
+    protobuf
+    qca2
+    qjson
+    qt4
+    sparsehash
+    sqlite
+    taglib
+    usbmuxd
+  ];
+
   unwrapped = stdenv.mkDerivation {
     name = "clementine-unwrapped-${version}";
-
-    src = fetchurl {
-      url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
-      sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
-    };
-
-    patches = [
-      ./clementine-1.2.1-include-paths.patch
-      ./clementine-dbus-namespace.patch
-    ];
-
-    buildInputs = [
-      boost
-      cmake
-      fftw
-      gettext
-      glew
-      gst_plugins_base
-      gstreamer
-      gvfs
-      libcdio
-      libgpod
-      liblastfm
-      libmtp
-      libplist
-      pkgconfig
-      protobuf
-      qca2
-      qjson
-      qt4
-      sparsehash
-      sqlite
-      taglib
-      usbmuxd
-    ];
-
+    inherit patches src buildInputs;
     enableParallelBuilding = true;
+    meta = with stdenv.lib; {
+      homepage = "http://www.clementine-player.org";
+      description = "A multiplatform music player";
+      license = licenses.gpl3Plus;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.ttuegel ];
+    };
+  };
+
+  # Spotify blob for Clementine
+  blob = stdenv.mkDerivation {
+    name = "clementine-blob-${version}";
+    # Use the same patches and sources as Clementine
+    inherit patches src;
+    buildInputs = buildInputs ++ [ libspotify ];
+    # Only build and install the Spotify blob
+    preBuild = ''
+      cd ext/clementine-spotifyblob
+    '';
+    postInstall = ''
+      mkdir -p $out/libexec/clementine
+      mv $out/bin/clementine-spotifyblob $out/libexec/clementine
+      rmdir $out/bin
+    '';
+    enableParallelBuilding = true;
+    meta = with stdenv.lib; {
+      homepage = "http://www.clementine-player.org";
+      description = "Spotify integration for Clementine";
+      # The blob itself is Apache-licensed, although libspotify is unfree.
+      license = licenses.asl20;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.ttuegel ];
+    };
   };
 
 in
 
+with stdenv.lib;
+
 runCommand "clementine-${version}"
 {
-  buildInputs = [ unwrapped makeWrapper ] ++ gst_plugins;
+  inherit blob unwrapped;
+  buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks
   dontPatchELF = true;
   dontStrip = true;
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "http://www.clementine-player.org";
     description = "A multiplatform music player"
-      + " (with gstreamer plugins: "
+      + " (" + (optionalString withSpotify "with Spotify, ")
+      + "with gstreamer plugins: "
       + concatStrings (intersperse ", " (map (x: x.name) gst_plugins))
       + ")";
     license = licenses.gpl3Plus;
@@ -69,6 +109,7 @@ runCommand "clementine-${version}"
 }
 ''
   mkdir -p $out/bin
-  makeWrapper "${unwrapped}/bin/${exeName}" "$out/bin/${exeName}" \
+  makeWrapper "$unwrapped/bin/${exeName}" "$out/bin/${exeName}" \
+      ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
 ''

From a6ebccfbb879640e6a1ab406b4061bac492e789f Mon Sep 17 00:00:00 2001
From: Stephen Weinberg <stephen@q5comm.com>
Date: Fri, 1 May 2015 12:38:00 -0700
Subject: [PATCH 0397/1143] Sane default configuration for sabnzbd module

Added option to set user. Use unpriviledged user by default. Add sane
default for configuration location.
---
 nixos/modules/misc/ids.nix                    |  1 +
 nixos/modules/services/networking/sabnzbd.nix | 40 +++++++++++++------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0319c5688fbf..0039ca74ba85 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -411,6 +411,7 @@
       lambdabot = 191;
       #asterisk = 192; # unused
       plex = 193;
+      sabnzbd = 194;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix
index 77bf64b80d0f..cacf753fdcd7 100644
--- a/nixos/modules/services/networking/sabnzbd.nix
+++ b/nixos/modules/services/networking/sabnzbd.nix
@@ -17,11 +17,21 @@ in
     services.sabnzbd = {
       enable = mkOption {
         default = false;
-        description = "Whether to enable the sabnzbd FTP server.";
+        description = "Whether to enable the sabnzbd server.";
       };
       configFile = mkOption {
-        default = "/var/sabnzbd/sabnzbd.ini";
-        description = "Path to config file. (You need to create this file yourself!)";
+        default = "/var/lib/sabnzbd/sabnzbd.ini";
+        description = "Path to config file.";
+      };
+
+      user = mkOption {
+        default = "sabnzbd";
+        description = "User to run the service as";
+      };
+
+      group = mkOption {
+        default = "sabnzbd";
+        description = "Group to run the service as";
       };
     };
   };
@@ -31,23 +41,29 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers =
-      [ { name = "sabnzbd";
+    users.extraUsers.sabnzbd = {
           uid = config.ids.uids.sabnzbd;
+          group = "sabnzbd";
           description = "sabnzbd user";
-          home = "/homeless-shelter";
-        }
-      ];
+          home = "/var/lib/sabnzbd/";
+          createHome = true;
+    };
 
-    systemd.services.sabnzbd =
-      { description = "sabnzbd server";
+    users.extraGroups.sabnzbd = {
+      gid = config.ids.gids.sabnzbd;
+    };
+
+    systemd.services.sabnzbd = {
+        description = "sabnzbd server";
         wantedBy    = [ "multi-user.target" ];
         after = [ "network.target" ];
         serviceConfig = {
           Type = "forking";
+          GuessMainPID = "no";
+          User = "${cfg.user}";
+          Group = "${cfg.group}";
           ExecStart = "${sabnzbd}/bin/sabnzbd -d -f ${cfg.configFile}";
         };
-      };
-
+    };
   };
 }

From 6acab0228f75d53d90c0cc85f234bb36da523767 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 4 May 2015 23:18:13 -0700
Subject: [PATCH 0398/1143] pcre: 8.36 -> 8.37

---
 pkgs/development/libraries/pcre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 77d21abb6d25..71f0df40ec26 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.36";
+  name = "pcre-8.37";
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "1fs5p1z67m9f4xnyil3s4lhgyld78f7m4d1yawpyhh0cvrbk90zg";
+    sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi";
   };
 
   configureFlags = ''

From 4e400df1d8f2ed3d2dd8408e9893844831122bb2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 4 May 2015 23:17:55 -0700
Subject: [PATCH 0399/1143] npth: 1.1 -> 1.2

---
 pkgs/development/libraries/npth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index ba75c8aefe7d..0c28a921995b 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "npth-1.1";
+  name = "npth-1.2";
 
   src = fetchurl {
     url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2";
-    sha256 = "0zyzwmk4mp6pas87jz35zx0jvwdz7x5b13w225gs73gcn8g5cv49";
+    sha256 = "12n0nvhw4fzwp0k7gjv3rc6pdml0qiinbbfiz4ilg6pl5kdxvnvd";
   };
 
   meta = with stdenv.lib; {

From faf57b2d05d4be62062ca9b77a5468768cef2e4b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 4 May 2015 23:18:26 -0700
Subject: [PATCH 0400/1143] radvd: 2.10 -> 2.11

---
 pkgs/tools/networking/radvd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 110fec50a6bb..63f82f12787d 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
 
 stdenv.mkDerivation rec {
-  name = "radvd-2.10";
+  name = "radvd-2.11";
   
   src = fetchurl {
     url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
-    sha256 = "0wwpzdkk6lpsai11iwsrwiblmf9x19rds0wdqcnf82hj0j1yxkkn";
+    sha256 = "1k2sbfs4w2lkgz2mh4zh66fgahjrn2hvxcpfc091bykrzj464qq4";
   };
 
   buildInputs = [ pkgconfig libdaemon bison flex check ];

From 08ffb05c7ef943746c41ce77e200735b4c3db460 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 4 May 2015 23:22:57 -0700
Subject: [PATCH 0401/1143] gawk: 4.1.1 -> 4.1.2

---
 pkgs/tools/text/gawk/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 936f27421a56..9017025477b3 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }:
 
 stdenv.mkDerivation rec {
-  name = "gawk-4.1.1";
+  name = "gawk-4.1.2";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "1nz83vpss8xv7m475sv4qhhj40g74nvcw0y9kwq9ds8wzfmcdm7g";
+    sha256 = "10glh5amry76v8fzhp4phi4119zwjwzjg9ybzq971qjfhg2m72za";
   };
 
-  # Currently broken due to locale tests failing
-  #doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
+  doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
 
   buildInputs = [ libsigsegv ]
     ++ stdenv.lib.optional readlineSupport readline;

From 00d108e4f5a4e4f321ce5bd518f5b5e8c37a1771 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 4 May 2015 23:27:52 -0700
Subject: [PATCH 0402/1143] pciutils: 3.3.0 -> 3.3.1

---
 pkgs/tools/system/pciutils/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index fb3b6c5b9c61..240600bf9ec6 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,24 +1,15 @@
 { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
-let
-  pciids = fetchurl {
-    # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://tarballs.nixos.org/pci.ids.20131006.bz2;
-    sha256 = "1vmshcgxqminiyh52pdcak24lm24qlic49py9cmkp96y1s48lvsc";
-  };
-in
 stdenv.mkDerivation rec {
-  name = "pciutils-3.3.0"; # with database from 2014-11-10
+  name = "pciutils-3.3.1"; # with database from 2014-11-10
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
-    sha256 = "008kh33kbpkk1wr9srrapw93imqx7l4djglrdkfxwvy6ppa9acs1";
+    sha256 = "1ag3skny1bamqil46dlppw8j1fp08spqa60fjygbxkg4fzdknjji";
   };
 
   buildInputs = [ pkgconfig zlib kmod which ];
 
-  #preBuild = "bunzip2 < ${pciids} > pci.ids";
-
   makeFlags = "SHARED=yes PREFIX=\${out}";
 
   installTargets = "install install-lib";

From e0181e4b725db7dc4f64324f0cad0bf3af1544e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 11:15:58 +0200
Subject: [PATCH 0403/1143] haskell-void: trigger re-build some more

---
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++++
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 50f9585f5059..a9c2bb609ae8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -76,4 +76,8 @@ self: super: {
   # Needs hashable on pre 7.10.x compilers.
   nats = addBuildDepend super.nats self.hashable;
 
+  # Ugly hack that triggers a re-build to get rid of the broken version served
+  # by Hydra: http://hydra.cryp.to/build/794276/nixlog/41/raw.
+  void = appendConfigureFlag super.void "-fignore-me-3";
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index caa4882accba..fb95a3c2833b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -134,6 +134,6 @@ self: super: {
 
   # Ugly hack that triggers a re-build to get rid of the broken version served
   # by Hydra: http://hydra.cryp.to/build/794273/nixlog/98/raw.
-  void = appendConfigureFlag super.void "-fignore-me";
+  void = appendConfigureFlag super.void "-fignore-me-3";
 
 }

From befacbba0d76cb479c96e660ce92b1e58cd66107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 5 May 2015 11:50:58 +0200
Subject: [PATCH 0404/1143] gnome3.tracker: pass correct automake

---
 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
index f3de70e10a15..d14b088f5304 100644
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, libxml2, upower
 , pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection
-, bash, makeWrapper, itstool, vala, sqlite, automake, autoconf
+, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf
 , gnome3, librsvg, gdk_pixbuf, file, libnotify
 , evolution_data_server, gst_all_1, poppler, libtool
 , icu, taglib, libjpeg, libtiff, giflib, libcue
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
                   bzip2 gnome3.totem-pl-parser gobjectIntrospection
-                  automake autoconf libtool
+                  automake114x autoconf libtool
                   gnome3.gsettings_desktop_schemas makeWrapper file
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
                   upower libnotify evolution_data_server gnome3.libgee

From 3a080a2d894b90246d632453297d3340c8fdcb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 5 May 2015 12:18:14 +0200
Subject: [PATCH 0405/1143] gnome3_16.geary: add missing params (gcr is still
 not picked up

---
 pkgs/desktops/gnome-3/3.16/misc/geary/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
index 21f55a6d81e3..b9a62642c1df 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
 , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
 , libnotify, libcanberra, libsecret, gmime
-, libpthreadstubs, hicolor_icon_theme
+, libpthreadstubs, hicolor_icon_theme, sqlite
 , gnome3, librsvg, gnome_doc_utils, webkitgtk }:
 
 let
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
-                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime
-                  libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme
+                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
+                  libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme gnome3.gcr
                   gdk_pixbuf librsvg gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ];
 
   preConfigure = ''

From ee0ecb520eb3577e2d508fc11dbc057aca9b6c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 5 May 2015 12:40:21 +0200
Subject: [PATCH 0406/1143] gnome3.gdm: remove a patch since X supports access
 control now

---
 .../desktops/gnome-3/3.12/core/gdm/default.nix |  3 +--
 .../core/gdm/disable_x_access_control.patch    | 18 ------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch

diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
index 46e300383647..a939a8d4fd9f 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
@@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
     substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
   '';
 
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./propagate_env.patch ];
+  patches = [ ./xserver_path.patch ./sessions_dir.patch ./propagate_env.patch ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GDM;
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
deleted file mode 100644
index 5985dbe0e017..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
-index 1afe48e..e3d1ec2 100644
---- a/daemon/gdm-display.c
-+++ b/daemon/gdm-display.c
-@@ -291,9 +291,10 @@ gdm_slave_connect_to_x11_display (GdmSlave *slave)
-
-                 gdm_error_trap_push ();
-
--                for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-+                /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-                         XAddHost (slave->priv->server_display, &host_entries[i]);
--                }
-+                }*/
-+               XDisableAccessControl(slave->priv->server_display);
-
-                 XSync (slave->priv->server_display, False);
-                 if (gdm_error_trap_pop ()) {
-

From 34c533009dc596701bd7e6188b5ecc522f911383 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 May 2015 16:40:16 +0200
Subject: [PATCH 0407/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/377c4aff879606476cb90d20235f95d202c7c56a
 with hackage2nix revision e4785fc969ad3ea9d2fdda94a86d0fff9c56721c

---
 .../haskell-modules/hackage-packages.nix      | 267 +++++++++++++-----
 1 file changed, 202 insertions(+), 65 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e7d1a786004b..18d78c1a8a68 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1511,23 +1511,20 @@ self: {
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
      , pandoc-types, parsec, process, split, strict, temporary
-     , transformers, utf8-string
+     , transformers
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.7.1.7";
-       revision = "3";
-       sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90";
-       editedCabalFile = "04eff5dba1e60fa191970db5aa7c08f4c95dbc5f425cdea79037c5ee5823074c";
+       version = "0.7.1.8";
+       sha256 = "0l326xnagszwv7f21dqzdb0qj5q2xhj1mmll7rpy1mxr5c0bvm2h";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base blaze-html bool-extras bytestring cmdargs containers
          data-default directory filepath HaXml haxr highlighting-kate
          hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
-         process split strict temporary transformers utf8-string
+         process split strict temporary transformers
        ];
-       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -17202,8 +17199,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-better-errors";
-       version = "0.6.0.0";
-       sha256 = "188pi0x2hfl1m1s55xb64s6gm6bcfck9b1hs3lmcbpczka84wy20";
+       version = "0.7.0.0";
+       sha256 = "01kfbbpf0kdjidgiscljg6mx0x4qk89n5jl44lhg52i3ni3wr28x";
        buildDepends = [
          aeson base bytestring dlist mtl scientific text transformers
          transformers-compat unordered-containers vector void
@@ -27890,12 +27887,11 @@ self: {
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "cabal-dependency-licenses";
-       version = "0.1.0.1";
-       sha256 = "1zccbhv7ysx9v6k0m2i08mrrx0d16x00cpkq7k5r765g9yjmn80k";
+       version = "0.1.1.1";
+       sha256 = "11bp5gmm0j0w5pbd26qd7w05v1mkkxi5gf28rlx44dzic55xpkld";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base Cabal containers directory filepath ];
-       jailbreak = true;
        homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
@@ -28964,6 +28960,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "call-haskell-from-anything" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, msgpack, mtl
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "call-haskell-from-anything";
+       version = "0.1.0.2";
+       sha256 = "0hav4kypy39lil49wrclrrajrwa5prmi7r7s6y9i3xshn1mhnjx1";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         attoparsec base bytestring msgpack mtl template-haskell
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/nh2/call-haskell-from-anything";
+       description = "Python-to-Haskell function calls";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "camh" = callPackage
     ({ mkDerivation, base, bytestring, Imlib, terminfo }:
      mkDerivation {
@@ -33664,6 +33679,28 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "conduit_1_2_4_1" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
+     , mmorph, mtl, QuickCheck, resourcet, safe, transformers
+     , transformers-base, void
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.2.4.1";
+       sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6";
+       buildDepends = [
+         base exceptions lifted-base mmorph mtl resourcet transformers
+         transformers-base void
+       ];
+       testDepends = [
+         base containers exceptions hspec mtl QuickCheck resourcet safe
+         transformers void
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "conduit" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, mtl, QuickCheck, resourcet, safe, transformers
@@ -37716,9 +37753,10 @@ self: {
      mkDerivation {
        pname = "data-carousel";
        version = "0.1.0.0";
+       revision = "1";
        sha256 = "1vp17428a2pw4g3y2ra22ll5vjnqwl2xwr2wfj8ppkxaj34a2nsh";
+       editedCabalFile = "56aa17d4ad0390625d0694ff6f8e281720d96bdabc678cc10934ac9becc663ea";
        buildDepends = [ base containers lens ];
-       jailbreak = true;
        description = "A rotating sequence data structure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -38787,6 +38825,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dbcleaner" = callPackage
+    ({ mkDerivation, base, hspec, postgresql-simple, text }:
+     mkDerivation {
+       pname = "dbcleaner";
+       version = "0.1.1";
+       sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc";
+       buildDepends = [ base postgresql-simple text ];
+       testDepends = [ base hspec postgresql-simple text ];
+       description = "Clean database tables automatically around hspec tests";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dbf" = callPackage
     ({ mkDerivation, base, binary, bytestring, monad-loops, rwlock }:
      mkDerivation {
@@ -42362,8 +42412,8 @@ self: {
     ({ mkDerivation, base, doctest, HUnit, QuickCheck }:
      mkDerivation {
        pname = "doctest-prop";
-       version = "0.2";
-       sha256 = "09wxkhcmh297hqnx3g4x8ff0w5dcmls9y383417rc8wawf5q288n";
+       version = "0.2.0.1";
+       sha256 = "1amfsq53s0bgal77g7hbsvbn1vlqh1jc3qvcjwv0achc6z65dc2a";
        buildDepends = [ base HUnit QuickCheck ];
        testDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
@@ -49987,18 +50037,13 @@ self: {
      }) { inherit (pkgs) libdevil;};
 
   "friendly-time" = callPackage
-    ({ mkDerivation, base, HUnit, old-locale, test-framework
-     , test-framework-hunit, time
-     }:
+    ({ mkDerivation, base, hspec, old-locale, time }:
      mkDerivation {
        pname = "friendly-time";
-       version = "0.3";
-       sha256 = "10p78qbb1c87d0ag6cwc7blgwaw8r5sbs00gp5qg3sh9x7n9l3nj";
+       version = "0.4";
+       sha256 = "1x73jk9smga912nfyxa77j6yz74kyx8zdr4q6xj3sirp46qm5nh5";
        buildDepends = [ base old-locale time ];
-       testDepends = [
-         base HUnit old-locale test-framework test-framework-hunit time
-       ];
-       homepage = "http://github.com/pbrisbin/friendly-time";
+       testDepends = [ base hspec old-locale time ];
        description = "Print time information in friendly ways";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51681,8 +51726,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-events";
-       version = "0.4.3.0";
-       sha256 = "128p651hp8v1i0iaccmfh3ap6lajcrzdihjb853s71pgnpal6izr";
+       version = "0.4.4.0";
+       sha256 = "0vagr03rivl5ymcnkxnzb1x5b4cr6xknnkwmfliqfrc1hhjgcaxb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base binary bytestring containers mtl ];
@@ -55915,13 +55960,13 @@ self: {
      mkDerivation {
        pname = "hXmixer";
        version = "0.2.5.0";
-       revision = "1";
+       revision = "2";
        sha256 = "0nl6ylprxc1mz96713n222gy1b3pifkp3mb42v181w1iwms405y5";
-       editedCabalFile = "c59d268da5fbb74957b9b9a2dd908a06a002d4c4845748876da77bafcc2deeb7";
+       editedCabalFile = "3d625ce1058f3df1e7384767fe12bc7a364a0c3ee075a6033bf8e91cfc5c8acc";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base directory gtk3 process split text ];
-       description = "A Gtk mixer application for FreeBSD";
+       description = "A Gtk mixer GUI application for FreeBSD";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -63203,13 +63248,24 @@ self: {
      }) {};
 
   "hgeometry" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, array, base, bifunctors, bytestring, containers
+     , data-clist, doctest, fixed-vector, hexpat, lens, linear, mtl
+     , parsec, random, semigroups, singletons, text, validation, vector
+     , vinyl
+     }:
      mkDerivation {
        pname = "hgeometry";
-       version = "0.1.1.1";
-       sha256 = "04czprwf74cyghi5c0mj5iyxdxc0wln6wxvknfvb7ns739mg2019";
-       buildDepends = [ base ];
-       description = "Geometry types in Haskell";
+       version = "0.4.0.0";
+       sha256 = "00z6xna83j9klba6rj09cdiriqgn45cx15pw22zylywn0s8agc4d";
+       buildDepends = [
+         base bifunctors bytestring containers data-clist fixed-vector
+         hexpat lens linear mtl parsec random semigroups singletons text
+         validation vector vinyl
+       ];
+       testDepends = [ array base data-clist doctest lens linear ];
+       jailbreak = true;
+       homepage = "http://fstaals.net/software/hgeometry";
+       description = "Data types for geometric objects, geometric algorithms, and data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -70653,17 +70709,17 @@ self: {
      }) {};
 
   "http-media" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cabal-test-quickcheck
-     , case-insensitive, containers, QuickCheck
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "http-media";
-       version = "0.6.1";
-       sha256 = "0x2smkccs64ll31adwj4n7kr1qalihyj28py2k5qwl2ynyygxbxq";
+       version = "0.6.2";
+       sha256 = "0r3xghxhnwpc8gblcj6l5sq3lxzra7280vlph1s4xfqxknv69km7";
        buildDepends = [ base bytestring case-insensitive containers ];
        testDepends = [
-         base bytestring Cabal cabal-test-quickcheck case-insensitive
-         containers QuickCheck
+         base bytestring case-insensitive containers QuickCheck
+         test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/zmthy/http-media";
        description = "Processing HTTP Content-Type and Accept headers";
@@ -76339,8 +76395,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.2.1.5";
-       sha256 = "10yxfdqj1bpi065wi7wp80z24bil7gxajiqxkx2w91w198pzlrlh";
+       version = "0.2.1.6";
+       sha256 = "1y9c95qbvkg0r75y4dd0fvcy5r0bj08pklf7hl052ncwm87l9hln";
        buildDepends = [
          aeson async attoparsec base bytestring conduit conduit-extra
          deepseq hashable mtl stm stm-conduit text transformers
@@ -87817,6 +87873,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mosaico-lib" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
+     , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
+     , mtl, split, stm, stm-chans, transformers
+     }:
+     mkDerivation {
+       pname = "mosaico-lib";
+       version = "0.1.0.0";
+       sha256 = "0jk1x7jwcx8ackapz91v6apwvwjlhjx36j2pr9ayriyl3s00q0vq";
+       buildDepends = [
+         base base-unicode-symbols colour diagrams-cairo diagrams-core
+         diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm
+         stm-chans transformers
+       ];
+       jailbreak = true;
+       homepage = "http://ldc.usb.ve/~05-38235/cursos/CI3661/2015AJ/";
+       description = "Generación interactiva de mosaicos";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mount" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -96879,8 +96955,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-text";
-       version = "0.0.0.15";
-       sha256 = "10906gdb9gjhxxmxvmib6kw7py6fl2r4df5bryqvbjvr1afcc3x9";
+       version = "0.0.0.16";
+       sha256 = "0db6xh10g4h1zy62aamcz59hykhlnq8d7qs24yp7lva8g0ymapyv";
        buildDepends = [
          base bytestring pipes pipes-bytestring pipes-group pipes-parse
          pipes-safe streaming-commons text transformers
@@ -98972,7 +99048,9 @@ self: {
      mkDerivation {
        pname = "pretty-show";
        version = "1.6.8.2";
+       revision = "1";
        sha256 = "1s95nzjkmqb747s50i68c9s8p91cxgydzqkd2l5yjzdaygrvrhqv";
+       editedCabalFile = "3454673131f18cc65fb3fbca43d5d010f6b228abc0b7e501e67ef90ffded4218";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -106776,13 +106854,12 @@ self: {
      }:
      mkDerivation {
        pname = "sandi";
-       version = "0.3.3";
-       sha256 = "0nbp5brry13nfs05aqzscyy4gp678bzqsq8d0726dj23iffd4191";
+       version = "0.3.4";
+       sha256 = "1f2id34ga5d7cfas9z3n9b28yxpga44rkn5qvkma41cpf4djg72r";
        buildDepends = [ base bytestring conduit exceptions ];
        testDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
        ];
-       jailbreak = true;
        homepage = "http://hackage.haskell.org/package/sandi";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
@@ -111583,6 +111660,7 @@ self: {
          stm syb template-haskell text time transformers
          unordered-containers vector vector-algorithms xmlhtml
        ];
+       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -114480,25 +114558,41 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-cabal" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, http-client
+     , http-client-tls, http-types, optparse-applicative, parsec
+     , process, stackage-cli, system-fileio, text
+     }:
+     mkDerivation {
+       pname = "stackage-cabal";
+       version = "0.1.0";
+       sha256 = "11xafmg1lywgd6vnpgrbk2v8w576i41m9h911y86vh5m4d4bq2q1";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring exceptions http-client http-client-tls http-types
+         optparse-applicative parsec process stackage-cli system-fileio text
+       ];
+       homepage = "https://www.stackage.org/package/stackage-cabal";
+       description = "A CLI executable for cabal-based stackage commands";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-cli" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, directory, either
-     , exceptions, filepath, hashable, http-client, http-client-tls
-     , http-types, optparse-applicative, optparse-simple, parsec
-     , process, split, system-fileio, system-filepath, text
-     , transformers, unordered-containers
+    ({ mkDerivation, base, conduit, directory, either, exceptions
+     , filepath, hashable, optparse-applicative, optparse-simple
+     , process, split, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "stackage-cli";
-       version = "0.0.0.4";
-       sha256 = "1ygsy9ms89prs693x9gw5dv7gyhaxl3q74wbd5c2p9138gp1zykq";
+       version = "0.1.0.1";
+       sha256 = "1mcmpr745z221pp5lbib3c9cdjw8nv0lp76kv1xz7bppsn26sncm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring conduit directory either exceptions filepath
-         hashable http-client http-client-tls http-types
-         optparse-applicative optparse-simple parsec process split
-         system-fileio system-filepath text transformers
-         unordered-containers
+         base conduit directory either exceptions filepath hashable
+         optparse-applicative optparse-simple process split text
+         transformers unordered-containers
        ];
        homepage = "https://www.stackage.org/package/stackage-cli";
        description = "A CLI library for stackage commands";
@@ -114561,6 +114655,49 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-sandbox" = callPackage
+    ({ mkDerivation, base, filepath, optparse-applicative, process
+     , stackage-cli, system-fileio, system-filepath, text
+     }:
+     mkDerivation {
+       pname = "stackage-sandbox";
+       version = "0.1.0";
+       sha256 = "0c71mb29mqzinrlbh2blpssl9r5jsdpaffrsjg398fbzam9i9xzx";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base filepath optparse-applicative process stackage-cli
+         system-fileio system-filepath text
+       ];
+       homepage = "https://www.stackage.org/package/stackage-sandbox";
+       description = "Work with shared stackage sandboxes";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "stackage-setup" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, classy-prelude-conduit
+     , cryptohash, cryptohash-conduit, filepath, http-client-tls
+     , http-conduit, http-types, optparse-applicative, process
+     , stackage-cli, system-fileio, system-filepath, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "stackage-setup";
+       version = "0.0.0";
+       sha256 = "0igm3yyfzbmqrr6h1ifk5jg4r9rl0xap03ibb381lmmghbxvixx2";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring classy-prelude-conduit cryptohash
+         cryptohash-conduit filepath http-client-tls http-conduit http-types
+         optparse-applicative process stackage-cli system-fileio
+         system-filepath text unordered-containers yaml
+       ];
+       homepage = "https://www.stackage.org/package/stackage-setup";
+       description = "An executable for downloading a Haskell setup";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-types" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
      , hashable, semigroups, text, unordered-containers, vector
@@ -120830,8 +120967,8 @@ self: {
      }:
      mkDerivation {
        pname = "threadscope";
-       version = "0.2.6";
-       sha256 = "0pycxvf3gjx86yp948anczxidhi6ra95szkqyvvlfpriay7klfya";
+       version = "0.2.7";
+       sha256 = "1dpxgzm29p07iy17hkfzki4c9ckhwx4acvjhlwxmpmaj2a1m6mnc";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -127077,8 +127214,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-algorithms";
-       version = "0.6.0.4";
-       sha256 = "09f0kds50xa0r2l837gqarzazvlhx2afvvykkqiwjqma9caj52av";
+       version = "0.7";
+       sha256 = "1ijnmgvdhj2qi5rsq4b1ffci47inck9arrcan5jzfkvzr54fvzcx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring mtl mwc-random primitive vector ];
@@ -128964,8 +129101,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.0.12.1";
-       sha256 = "0dahx5g6dclpgrapwvplz4di6yjhy7i3ja089nlyn46lx15pzp6b";
+       version = "3.0.13";
+       sha256 = "0ggjbkgxzrvi7smjvrprr07c49n6d3s21jqnjc9l4ss3f3nd7699";
        buildDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          ghc-prim hashable http-date http-types iproute network

From d42d6438b2d095aa2ac16297138f1a5d069cfa6b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 12:47:32 +0200
Subject: [PATCH 0408/1143] Use old conduit version 1.2.4.1 for GHC 7.6.x and
 7.8.x.

Newer versions seem impossible to compile with older GHCs because they
invariably refer to a non-existent version of 'void':

  http://hydra.cryp.to/build/794276/nixlog/41/raw
  http://hydra.cryp.to/build/794273/nixlog/98/raw
---
 .../development/haskell-modules/configuration-ghc-7.6.x.nix | 6 +++---
 .../development/haskell-modules/configuration-ghc-7.8.x.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index a9c2bb609ae8..1adccd36dca1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -76,8 +76,8 @@ self: super: {
   # Needs hashable on pre 7.10.x compilers.
   nats = addBuildDepend super.nats self.hashable;
 
-  # Ugly hack that triggers a re-build to get rid of the broken version served
-  # by Hydra: http://hydra.cryp.to/build/794276/nixlog/41/raw.
-  void = appendConfigureFlag super.void "-fignore-me-3";
+  # Newer versions always trigger the non-deterministic library ID bug
+  # and are virtually impossible to compile on Hydra.
+  conduit = super.conduit_1_2_4_1;
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index fb95a3c2833b..f481f75c2f8d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -132,8 +132,8 @@ self: super: {
   # needs mtl-compat to build with mtl 2.1.x
   cgi = addBuildDepend super.cgi self.mtl-compat;
 
-  # Ugly hack that triggers a re-build to get rid of the broken version served
-  # by Hydra: http://hydra.cryp.to/build/794273/nixlog/98/raw.
-  void = appendConfigureFlag super.void "-fignore-me-3";
+  # Newer versions always trigger the non-deterministic library ID bug
+  # and are virtually impossible to compile on Hydra.
+  conduit = super.conduit_1_2_4_1;
 
 }

From b8bd19791556fec038ec17a466cc43a4a748399f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 May 2015 20:00:23 +0200
Subject: [PATCH 0409/1143] haskell-libconfig: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b0c628b9763a..86d58851fcd1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -118,6 +118,9 @@ self: super: {
   # Agda-2.4.2.2 needs these overrides to compile.
   Agda = super.Agda.override { equivalence = self.equivalence_0_2_5; cpphs = self.cpphs_1_18_9; };
 
+  # Help libconfig find it's C language counterpart.
+  libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
+
   # The Haddock phase fails for one reason or another.
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
   blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;

From d383f5181cf22a5eaca6ea84592aa5a73ad758e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 May 2015 18:20:40 +0200
Subject: [PATCH 0410/1143] haskell-singletons: broken with GHC 7.10.x and
 probably other versions too

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 86d58851fcd1..dc1d8e0625a6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -794,4 +794,12 @@ self: super: {
   # https://github.com/nushio3/doctest-prop/issues/1
   doctest-prop = dontCheck super.doctest-prop;
 
+  # https://github.com/goldfirere/singletons/issues/116
+  # https://github.com/goldfirere/singletons/issues/117
+  # https://github.com/goldfirere/singletons/issues/118
+  singletons = markBroken super.singletons;
+  singleton-nats = dontDistribute super.singleton-nats;
+  hgeometry = dontDistribute super.hgeometry;
+  hipe = dontDistribute super.hipe;
+
 }

From dfd4ada456359ac06613d527efeacc370c0f85bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 5 May 2015 13:05:54 +0200
Subject: [PATCH 0411/1143] kde4: fix cantor build

---
 pkgs/desktops/kde-4.14/kdeedu/cantor.nix     |  2 +
 pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 | 42 ++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.14/kdeedu/commit-846cf02

diff --git a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
index a8cd2e44957a..625a2678e48b 100644
--- a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
@@ -7,6 +7,8 @@ kde {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  patches = [ ./commit-846cf02 ];
+
   meta = {
     description = "KDE Frontend to Mathematical Software";
   };
diff --git a/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 b/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02
new file mode 100644
index 000000000000..66e756e21bb8
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02
@@ -0,0 +1,42 @@
+diff --git a/src/backends/R/rserver/rcallbacks.h b/src/backends/R/rserver/rcallbacks.h
+index 8f4752c..6d0e9a2 100644
+--- a/src/backends/R/rserver/rcallbacks.h
++++ b/src/backends/R/rserver/rcallbacks.h
+@@ -30,7 +30,6 @@ class Expression;
+ #include <Rversion.h>
+ #include <Rdefines.h>
+ #define R_INTERFACE_PTRS
+-#include <Rinterface.h>
+ #include <R_ext/Parse.h>
+ 
+ //This File implements the necessary callbacks for R
+commit 846cf02ab1618b9322b83eafc18dff3264988b72
+Author: Raymond Wooninck <tittiatcoke@gmail.com>
+Date:   Mon Apr 27 16:08:51 2015 +0200
+
+    Also build against R >= 3.2.
+
+diff --git a/src/backends/R/rserver/rcallbacks.cpp b/src/backends/R/rserver/rcallbacks.cpp
+index 2c86531..492f270 100644
+--- a/src/backends/R/rserver/rcallbacks.cpp
++++ b/src/backends/R/rserver/rcallbacks.cpp
+@@ -26,6 +26,7 @@
+ #include <QStringList>
+ 
+ #include <stdio.h>
++#include <Rinterface.h>
+ 
+ RServer* server;
+ Expression* currentExpression;
+diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp
+index 30cdb70..f689f42 100644
+--- a/src/backends/R/rserver/rserver.cpp
++++ b/src/backends/R/rserver/rserver.cpp
+@@ -42,7 +42,6 @@
+ #include <Rversion.h>
+ #include <Rdefines.h>
+ #define R_INTERFACE_PTRS
+-#include <Rinterface.h>
+ #include <R_ext/Parse.h>
+ 
+ // Not making a member to prevent pulling R headers into rserver.h

From 19e1e448096eeb02e4c64597130f21aa29c5caf3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 13:11:30 +0200
Subject: [PATCH 0412/1143] haskell-ghc-events has been fixed upstream.

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index d22a279f0b82..7618b7c4eb54 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -119,10 +119,6 @@ self: super: {
   unix-time = dontCheck super.unix-time;
 
   # Until the changes have been pushed to Hackage
-  ghc-events = appendPatch super.ghc-events (pkgs.fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/haskell/ghc-events/pull/8.patch";
-    sha256 = "1k881jrvzfvs761jgfhf5nsbmbc33c9333l4s0f5088p46ff2n1l";
-  });
   dependent-sum-template = appendPatch super.dependent-sum-template (pkgs.fetchpatch {
     url = "https://patch-diff.githubusercontent.com/raw/mokus0/dependent-sum-template/pull/4.patch";
     sha256 = "1yb1ny4ckl4d3sf4xnvpbsa9rw2dficzgipijs5s3729dnsc3rb0";

From cc8539293c37e9b1481ba37abc4157c3fd4f9be2 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 30 Apr 2015 11:45:05 +0200
Subject: [PATCH 0413/1143] haskell-uhc: New version with GHC 7.10 support.

---
 pkgs/development/compilers/uhc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 6096fc4e4c4a..c788112fb91c 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -2,13 +2,13 @@
 
 let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
 in stdenv.mkDerivation rec {
-  version = "1.1.8.10";
+  version = "1.1.9.0";
   name = "uhc-${version}";
 
   src = fetchgit {
     url = "https://github.com/UU-ComputerScience/uhc.git";
-    rev = "449d9578e06af1362d7f746798f0aed57ab6ca88";
-    sha256 = "0f8abhl9idbc2qlnb7ynrb11yvm3y07vksyzs1yg6snjvlhfj5az";
+    rev = "0363bbcf4cf8c47d30c3a188e3e53b3f8454bbe4";
+    sha256 = "0sa9b341mm5ggmbydc33ja3h7k9w65qnki9gsaagb06gkvvqc7c2";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";
@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
   # want that, and hack the build process to use a temporary package
   # configuration file instead.
   preConfigure = ''
-    p=`pwd`/uhc-local-packages
-    echo '[]' > $p
+    p=`pwd`/uhc-local-packages/
+    ghc-pkg init $p
     sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
     sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
     sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk

From 0d8af2ce9a27430063cc39d64dfe8be3ffe43d50 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Mon, 4 May 2015 11:29:37 +0200
Subject: [PATCH 0414/1143] add zam-plugins:  a set of audio plugins

---
 .../audio/zam-plugins/default.nix             | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/audio/zam-plugins/default.nix

diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
new file mode 100644
index 000000000000..8d383ca39d6a
--- /dev/null
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, boost, libX11, mesa, liblo, jack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
+
+stdenv.mkDerivation rec {
+  name = "zam-plugins-${version}";
+  version = "3.5";
+
+  src = fetchurl {
+    url = "https://github.com/zamaudio/zam-plugins/archive/${version}.tar.gz";
+    sha256 = "0icdrs4vaaj8gqi76jkkx5yk9h3agipa11cyb5h52y814q6mx6vm";
+  };
+
+  buildInputs = [ boost libX11 mesa liblo jack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
+
+  patchPhase = ''
+    patchShebangs ./libs/generate-ttl.sh
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.zamaudio.com/?p=976;
+    description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a20248705f3c..73184bc56cf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12756,6 +12756,8 @@ let
     fltk = fltk13;
   };
 
+  zam-plugins = callPackage ../applications/audio/zam-plugins { inherit (xlibs) libX11; };
+
   zathuraCollection = recurseIntoAttrs
     (let callPackage = newScope pkgs.zathuraCollection; in
       import ../applications/misc/zathura {

From 1b95228a53a06378e1c5df759195e5ae4389d7ef Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Tue, 5 May 2015 08:41:54 -0400
Subject: [PATCH 0415/1143] libva-intel-driver: refactor

---
 .../libraries/vaapi-intel/default.nix         | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 8eddb2b0ae8a..d873d801bac7 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, libdrm, libva, libX11, intel-gpu-tools, mesa_noglu, wayland, python, gnum4 }:
+{ stdenv, fetchurl, gnum4, pkgconfig, python
+, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland
+}:
 
 stdenv.mkDerivation rec {
   name = "libva-intel-driver-1.5.1";
@@ -8,16 +10,24 @@ stdenv.mkDerivation rec {
     sha256 = "1p7aw0wmb6z3rbbm3bqlp6rxw41kii23csbjmcvbbk037lq6rnqb";
   };
 
-  prePatch = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' src/shaders/gpp.py
+  patchPhase = ''
+    patchShebangs ./src/shaders/gpp.py
   '';
 
-  buildInputs = [ pkgconfig libdrm libva libX11 intel-gpu-tools mesa_noglu wayland gnum4 ];
-
   preConfigure = ''
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
+  configureFlags = [
+    "--enable-drm"
+    "--enable-x11"
+    "--enable-wayland"
+  ];
+
+  nativeBuildInputs = [ gnum4 pkgconfig python ];
+
+  buildInputs = [ intel-gpu-tools libdrm libva libX11 mesa_noglu wayland ];
+
   meta = with stdenv.lib; {
     homepage = http://cgit.freedesktop.org/vaapi/intel-driver/;
     license = licenses.mit;

From fdea7f43602740bde228f2eaba36d190ffec5c23 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 5 May 2015 14:06:47 +0200
Subject: [PATCH 0416/1143] newsbeuter: 2.8 -> 2.9

Also set installFlags rather than call make install directly.

This release has a logic error which causes the newsbeuter cache to be
deleted on exit iff urls contains a single URL [1] (no problem for n > 1).

[1]: https://github.com/akrennmair/newsbeuter/pull/179
---
 .../feedreaders/newsbeuter/default.nix        | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index 183df058effb..8158c458afc7 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -2,11 +2,11 @@
 , gettext, libiconv, makeWrapper, perl }:
 
 stdenv.mkDerivation rec {
-  name = "newsbeuter-2.8";
+  name = "newsbeuter-2.9";
 
   src = fetchurl {
     url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
-    sha256 = "013qi8yghpms2qq1b3xbrlmfgpj0ybgk0qhj245ni4kpxila0wn8";
+    sha256 = "1j1x0hgwxz11dckk81ncalgylj5y5fgw5bcmp9qb5hq9kc0vza3l";
 
   };
 
@@ -22,14 +22,13 @@ stdenv.mkDerivation rec {
     export LDFLAGS=-lncursesw
   '';
 
-  installPhase = ''
-    DESTDIR=$out prefix=\"\" make install
-  ''
-    + stdenv.lib.optionalString stdenv.isDarwin ''
-      for prog in $out/bin/*; do
-        wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
-      done
-    '';
+  installFlags = [ "DESTDIR=$(out)" "prefix=" ];
+
+  installPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
+    done
+  '';
 
   meta = {
     homepage    = http://www.newsbeuter.org;
@@ -39,4 +38,3 @@ stdenv.mkDerivation rec {
     platforms   = stdenv.lib.platforms.unix;
   };
 }
-

From 2a5fef39c981e373cd3763231b9529aa93ea3426 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 5 May 2015 15:15:31 +0200
Subject: [PATCH 0417/1143] Pharo launcher 0.2.4 -> 0.2.7

---
 pkgs/development/pharo/launcher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 2fa5f4d82e3e..e88e82845b9f 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.4-2015.02.13";
+  version = "0.2.7-2015.04.20";
   name = "pharo-launcher-${version}";
   src = fetchurl {
     url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
-    md5 = "064f53cd20c7f189ba2d01f9e4b17d36";
+    sha256 = "0qz8469hadlv6mj8b0hp0jas153alwmja7fr4099jv1b0sx4s0kf";
   };
 
   executable-name = "pharo-launcher";

From b114eab794da362665a388278e808089f243306e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 5 May 2015 13:26:55 +0000
Subject: [PATCH 0418/1143] le: add psutil to dependencies

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04a5ab65e097..e1c2a98d17f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6368,7 +6368,7 @@ let
       sha256 = "12l6fqavykjinq286i9pgbbbrv5lq2mmiji91g0m05lfdx9pg4y1";
     };
 
-    propagatedBuildInputs = with self; [ simplejson ];
+    propagatedBuildInputs = with self; [ simplejson psutil ];
 
     meta = {
       homepage = "https://github.com/logentries/le";

From ec498cf0222840daa39ea913cbaeaee75296cad8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 5 May 2015 18:02:18 +0200
Subject: [PATCH 0419/1143] openldap: fix broken .la files

---
 pkgs/development/libraries/openldap/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 8ab9becf3461..3513d83e8679 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = 1; # !!!
 
+  # Fixup broken libtool
+  preFixup = ''
+    sed -e 's,-lsasl2,-L${cyrus_sasl}/lib -lsasl2,' \
+        -e 's,-lssl,-L${openssl}/lib -lssl,' \
+        -i $out/lib/libldap.la -i $out/lib/libldap_r.la
+  '';
+
   meta = with stdenv.lib; {
     homepage    = http://www.openldap.org/;
     description = "An open source implementation of the Lightweight Directory Access Protocol";

From 53598090ea7e435d4cceaaf75e569ed817d28d99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 13:43:37 +0200
Subject: [PATCH 0420/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/461332b5ddf43fb1951843cc6651198063a73bd1
 with hackage2nix revision a92f66b20fe51e401d0d4d945beeae82093f8d43

---
 .../haskell-modules/hackage-packages.nix      | 79 +++++++++++++++----
 1 file changed, 62 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 18d78c1a8a68..935383e4ee03 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17556,8 +17556,8 @@ self: {
      }:
      mkDerivation {
        pname = "agentx";
-       version = "0.1.0.4";
-       sha256 = "0m0kcylamac8fx5yl6zk5gznjyphplgy7gj3mqbq56146087935a";
+       version = "0.1.0.5";
+       sha256 = "0a6zzn4zv5f1zl10vz1p4iw32s9jd605px4ziy5v24fmjm5xnbzb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -31212,8 +31212,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.7.3";
-       sha256 = "04kz71sx36a14rryw219my8k523akfq3ivv1j67x0m85mlqldnk2";
+       version = "0.7.4";
+       sha256 = "1y5y03glswmy4vbi4g5dxyipy4n4fygkmh8bd7pb7n8fa1n751a2";
        buildDepends = [
          base data-default ghc-prim ghc-typelits-natnormalise integer-gmp
          singletons template-haskell th-lift
@@ -57219,7 +57219,6 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -65972,14 +65971,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hoopl_3_10_0_2" = callPackage
+  "hoopl_3_10_1_0" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "hoopl";
-       version = "3.10.0.2";
-       revision = "1";
-       sha256 = "11j7xd82zx7ja08lsnnkfq39yzqc2wbgdxgnwsviml58bkp495yj";
-       editedCabalFile = "5067e0036ed0f2728f5d0d62580070bfa2537bc3aed5e649d1a136e70042cff9";
+       version = "3.10.1.0";
+       sha256 = "1m62dcgzd17xay2nd87607ryb6hswzhsgr9irzf705h5skgibxks";
        buildDepends = [ base containers ];
        homepage = "http://ghc.cs.tufts.edu/hoopl/";
        description = "A library to support dataflow analysis and optimization";
@@ -74614,7 +74611,9 @@ self: {
      mkDerivation {
        pname = "iproute";
        version = "1.4.0";
+       revision = "1";
        sha256 = "00f4xddz9js73bsy15zsznmnad2psq7wg1ha7pmhdmdw5zlmqvad";
+       editedCabalFile = "c3781d19d6853f9d7c8308f716521cfe3e4d2c2851d91025e1d75003ca5cd35b";
        buildDepends = [ appar base byteorder containers network ];
        testDepends = [
          appar base byteorder containers doctest hspec network QuickCheck
@@ -78125,12 +78124,15 @@ self: {
      mkDerivation {
        pname = "lambdabot-utils";
        version = "4.2.2";
+       revision = "1";
        sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
+       editedCabalFile = "1936d25bbfb2ce39465857c136e0d77c656714feb2c1936024da4d763e9dbbf3";
        buildDepends = [
          base binary bytestring containers haskell-src mtl network old-time
          process random regex-compat regex-posix syb tagsoup unix
          utf8-string zlib
        ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
@@ -87891,6 +87893,7 @@ self: {
        homepage = "http://ldc.usb.ve/~05-38235/cursos/CI3661/2015AJ/";
        description = "Generación interactiva de mosaicos";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mount" = callPackage
@@ -93109,6 +93112,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opml-conduit" = callPackage
+    ({ mkDerivation, base, case-insensitive, conduit
+     , conduit-combinators, containers, data-default, exceptions, lens
+     , mono-traversable, monoid-subclasses, mtl, network-uri, QuickCheck
+     , quickcheck-instances, resourcet, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, timerep, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "opml-conduit";
+       version = "0.1.0.0";
+       sha256 = "055ngv2ibb7bk99y67ag9y7xxhyzag08mgb6zf1aqfjgpna6dkcf";
+       buildDepends = [
+         base case-insensitive conduit containers data-default exceptions
+         lens mono-traversable monoid-subclasses network-uri QuickCheck
+         quickcheck-instances semigroups text time timerep xml-conduit
+         xml-types
+       ];
+       testDepends = [
+         base conduit conduit-combinators containers exceptions lens mtl
+         network-uri resourcet tasty tasty-hunit tasty-quickcheck
+         xml-conduit
+       ];
+       homepage = "https://github.com/k0ral/opml-conduit";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
+       license = "unknown";
+     }) {};
+
   "opn" = callPackage
     ({ mkDerivation, base, directory, filepath, ini, network-uri
      , optparse-applicative, process, text, unordered-containers
@@ -93945,7 +93975,6 @@ self: {
        ];
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-crossref" = callPackage
@@ -98360,8 +98389,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "1.1.1";
-       sha256 = "0c6ns1zwqanqxd45zly2ms6zg3wx0lzr690pvq1prmf676vw2fj1";
+       version = "1.2.0";
+       sha256 = "0syjgaxp77dq7yk9hhyf5mfznf4z0wlfdsxh9dz92krfs5kl3wqr";
        buildDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta
@@ -111423,6 +111452,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "smaoin" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, text }:
+     mkDerivation {
+       pname = "smaoin";
+       version = "0.1.0.0";
+       sha256 = "0bi9qg9vfn2hr8pakk7xhrca0bxgr28hbg6infnk2dxvhl9yipd3";
+       buildDepends = [ base bytestring text ];
+       testDepends = [ base QuickCheck ];
+       jailbreak = true;
+       homepage = "http://rel4tion.org/projects/smaoin-hs/";
+       description = "Utilities for the Smaoin semantic information model";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "smartGroup" = callPackage
     ({ mkDerivation, base, bytestring, containers, template-haskell }:
      mkDerivation {
@@ -115258,8 +115301,8 @@ self: {
     ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }:
      mkDerivation {
        pname = "step-function";
-       version = "0.1.0.2";
-       sha256 = "1jr10zxyq8w6nnkxvjzhrmrxq8ksfcpsgxmjcag0hsxr0rflh8pk";
+       version = "0.1.1.0";
+       sha256 = "03pdpm1glmaqhqzr2cp08iy84c1vjhq0fq7yavmcrx94hxfw1zfd";
        buildDepends = [ base ];
        testDepends = [ base Cabal cabal-test-quickcheck QuickCheck ];
        homepage = "https://github.com/jonpetterbergman/step-function";
@@ -127215,7 +127258,9 @@ self: {
      mkDerivation {
        pname = "vector-algorithms";
        version = "0.7";
+       revision = "1";
        sha256 = "1ijnmgvdhj2qi5rsq4b1ffci47inck9arrcan5jzfkvzr54fvzcx";
+       editedCabalFile = "ba3ba4dbfe97dc45be68d13c51ba4425900b186a46cdf3eceaafb746030c1b95";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring mtl mwc-random primitive vector ];
@@ -131736,8 +131781,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.2.4";
-       sha256 = "1pb9iy95ajy0dxw2f1jh1ymdl4fjlhyan59hbmnj09g1q1h51dpq";
+       version = "1.2.5.1";
+       sha256 = "1p3rhmp0j8yayylx936asq7ggn9z50fg3vmd108bfrab2wzqrs4f";
        buildDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control

From 2c62a0a930cba21ccb18995396bda6b8d4f50d09 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 May 2015 15:42:24 +0200
Subject: [PATCH 0421/1143] Add egypt 1.10: create simple C call graphs

---
 .../tools/analysis/egypt/default.nix          | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/egypt/default.nix

diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix
new file mode 100644
index 000000000000..2bb978739990
--- /dev/null
+++ b/pkgs/development/tools/analysis/egypt/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, buildPerlPackage }:
+
+let version = "1.10"; in
+buildPerlPackage rec {
+  name = "egypt-${version}";
+
+  src = fetchurl {
+    sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m";
+    url = "http://www.gson.org/egypt/download/${name}.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Tool for making call graphs of C programmes";
+    longDescription = ''
+      Egypt is a simple tool for creating call graphs of C programs. It neither
+      analyzes source code nor lays out graphs. Instead, it leaves the source
+      code analysis to GCC and the graph layout to Graphviz, both of which are
+      better at their respective jobs than egypt itself could ever hope to be.
+      Egypt is simply a very small Perl script that glues these existing tools
+      together.
+    '';
+    homepage = http://www.gson.org/egypt/;
+    license = with licenses; [ artistic1 gpl1Plus ];
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbdfb4285bf8..bf919156b3bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5135,6 +5135,8 @@ let
 
   eggdbus = callPackage ../development/tools/misc/eggdbus { };
 
+  egypt = callPackage ../development/tools/analysis/egypt { };
+
   elfutils = callPackage ../development/tools/misc/elfutils { };
 
   epm = callPackage ../development/tools/misc/epm { };

From d80f6f8d6ffe4dbc84330a1b0f31a49cb79b5cd2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 May 2015 16:15:43 +0200
Subject: [PATCH 0422/1143] python-packages: add repocheck 2015-05-04

This script gives status information for code repositories found
recursively under a root directory. In particular, it tells whether
there are uncommitted changes, untracked files, unpushed or unpulled
commits. Thanks to the -u option, it is also useful to fetch updates
for all the remotes in the encountered repositories.
---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1c2a98d17f4..8f4a3cb63213 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10526,6 +10526,24 @@ let
     };
   };
 
+  repocheck = buildPythonPackage rec {
+    name = "repocheck-2015-05-04";
+    disabled = isPy26 || isPy27;
+
+    src = pkgs.fetchFromGitHub {
+      sha256 = "0zk8n4sm7i488wgqljkfjd2j0hm0qimxr9dhdz6d7xal7apwh71x";
+      rev = "db8c336f071ead3375805b7a78ca3d7c862536db";
+      repo = "repocheck";
+      owner = "kynikos";
+    };
+
+    meta = {
+      description = "Check the status of code repositories under a root directory";
+      homepage = https://github.com/kynikos/repocheck;
+      license = with licenses; gpl3Plus;
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
 
   requests_oauth2 = buildPythonPackage rec {
     name = "requests-oauth2-0.1.1";

From c37ca32be245ed2eb8abd56878f0d4ce6c746dc3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 May 2015 17:57:36 +0200
Subject: [PATCH 0423/1143] Add picoc 2015-05-04: a very small C interpreter

---
 .../interpreters/picoc/default.nix            | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/interpreters/picoc/default.nix

diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
new file mode 100644
index 000000000000..8cad6dc369d9
--- /dev/null
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub, readline }:
+
+let version = "2015-05-04"; in
+stdenv.mkDerivation rec {
+  name = "picoc-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "01w3jwl0vn9fsmh7p20ad4nl9ljzgfn576yvncd9pk9frx3pd8y4";
+    rev = "4555e8456f020554bcac50751fbb9b36c7d8c13b";
+    repo = "picoc";
+    owner = "zsaleeba";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Very small C interpreter for scripting";
+    longDescription = ''
+      PicoC is a very small C interpreter for scripting. It was originally
+      written as a script language for a UAV's on-board flight system. It's
+      also very suitable for other robotic, embedded and non-embedded
+      applications. The core C source code is around 3500 lines of code. It's
+      not intended to be a complete implementation of ISO C but it has all the
+      essentials. When compiled it only takes a few k of code space and is also
+      very sparing of data space. This means it can work well in small embedded
+      devices.
+    '';
+    homepage = https://github.com/zsaleeba/picoc;
+    downloadPage = https://code.google.com/p/picoc/downloads/list;
+    license = with licenses; bsd3;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ readline ];
+
+  postPatch = ''
+    substituteInPlace Makefile --replace '`svnversion -n`' "${version}"
+  '';
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  checkTarget = "test";
+
+  installPhase = ''
+    install -Dm755 picoc $out/bin/picoc
+
+    mkdir -p $out/include
+    install -m644 *.h $out/include
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf919156b3bb..80dd9eb28439 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4683,6 +4683,8 @@ let
 
   php56 = callPackage ../development/interpreters/php/5.6.nix { };
 
+  picoc = callPackage ../development/interpreters/picoc {};
+
   picolisp = callPackage ../development/interpreters/picolisp {};
 
   pltScheme = racket; # just to be sure

From 288291e13233057711da0331cd75a0024517ac12 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 May 2015 02:37:22 +0200
Subject: [PATCH 0424/1143] yodl: fix paths. Now it actually works.

---
 pkgs/development/tools/misc/yodl/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 598835c51521..d6667b76759e 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, icmake }:
+{ stdenv, fetchurl, perl, icmake, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     patchShebangs scripts/.
-    sed -i 's;/usr;;g' INSTALL.im
-    substituteInPlace build --replace /usr/bin/icmake ${icmake}/bin/icmake
+    substituteInPlace INSTALL.im --replace /usr $out
+    patchShebangs ./build
     substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl
+    substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt
   '';
 
   buildPhase = ''
@@ -25,9 +26,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ./build install programs $out
-    ./build install macros $out
-    ./build install man $out
+    ./build install programs
+    ./build install macros
+    ./build install man
   '';
 
   meta = with stdenv.lib; {

From 7a9484863822632a194b672751316372579bd8c0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 May 2015 02:46:20 +0200
Subject: [PATCH 0425/1143] stress-ng 0.04.00 -> 0.04.01

---
 pkgs/tools/system/stress-ng/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index f67921c6b712..a769cb77eca3 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.00"; in
+let version = "0.04.01"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "1rivmqa3qy9saxcz7mg211imcfyfwdhyhl2z6k1zc55vhnjdwhih";
+    sha256 = "1n7980lx32jvk9z9gl5621vas83x2jvyvp3l2jzw3afh09vd5axk";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
       bugs that only occur when a system is being thrashed hard.
     '';
     homepage = http://kernel.ubuntu.com/~cking/stress-ng;
+    downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
     license = with licenses; gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];

From 32ff988030e6657791c6232653242307deddc17f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 May 2015 13:08:55 +0200
Subject: [PATCH 0426/1143] Add bobcat 3.25.01: C++ helper library

---
 pkgs/development/libraries/bobcat/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/bobcat/default.nix

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
new file mode 100644
index 000000000000..d89a27638349
--- /dev/null
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline
+, utillinux, yodl }:
+
+let version = "3.25.01"; in
+stdenv.mkDerivation rec {
+  name = "bobcat-${version}";
+
+  src = fetchurl {
+    sha256 = "07qc10hnjpmc2wq14kw01vfww5i049y0jmdvkiiafw33ffy0wdca";
+    url = "mirror://sourceforge/bobcat/bobcat/${version}/bobcat_${version}.orig.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Brokken's Own Base Classes And Templates";
+    downloadPage = http://sourceforge.net/projects/bobcat/files/;
+    license = with licenses; gpl3;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ gcc49 icmake libmilter libX11 openssl readline utillinux
+    yodl ];
+
+  postPatch = ''
+    substituteInPlace INSTALL.im --replace /usr $out
+    patchShebangs ./build
+  '';
+
+  buildPhase = ''
+    ./build libraries all
+    ./build man
+  '';
+
+  installPhase = ''
+    ./build install
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80dd9eb28439..dbe9e6d92269 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5551,6 +5551,8 @@ let
 
   belle-sip = callPackage ../development/libraries/belle-sip { };
 
+  bobcat = callPackage ../development/libraries/bobcat { };
+
   boehmgc = callPackage ../development/libraries/boehm-gc { };
 
   boolstuff = callPackage ../development/libraries/boolstuff { };

From 897897cc30066abbf191a5b52c144a2b2c479f9f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 May 2015 18:55:28 +0200
Subject: [PATCH 0427/1143] Add flexc++ 2.02.00: C++ lexical scanner generator

---
 .../tools/parsing/flexc++/default.nix         | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/flexc++/default.nix

diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
new file mode 100644
index 000000000000..0d96c562c167
--- /dev/null
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }:
+
+let version = "2.02.00"; in
+stdenv.mkDerivation rec {
+  name = "flexc++-${version}";
+
+  src = fetchurl {
+    sha256 = "0mz5d0axr4c8rrmn4iw7b5llmf6f3g9cnjzzz3kw02mfzwll79rz";
+    url = "mirror://sourceforge/flexcpp/${version}/flexc++_${version}.orig.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "";
+    longDescription = ''
+      Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design
+      and requires simpler specification files than offered by flex's C++
+      option.
+    '';
+    homepage = http://flexcpp.sourceforge.net/;
+    downloadPage = http://sourceforge.net/projects/flexcpp/files/;
+    license = with licenses; gpl3;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ bobcat gcc49 icmake yodl ];
+
+  postPatch = ''
+    substituteInPlace INSTALL.im --replace /usr $out
+    patchShebangs ./build
+  '';
+
+  buildPhase = ''
+    ./build man
+    ./build manual
+    ./build program
+  '';
+
+  installPhase = ''
+    ./build install man
+    ./build install manual
+    ./build install program
+    ./build install skel
+    ./build install std
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbe9e6d92269..c2752f14b862 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5165,6 +5165,8 @@ let
   flex_2_5_39 = callPackage ../development/tools/parsing/flex/2.5.39.nix { };
   flex = flex_2_5_39;
 
+  flexcpp = callPackage ../development/tools/parsing/flexc++ { };
+
   m4 = gnum4;
 
   geis = callPackage ../development/libraries/geis { };

From aea86f61823d700b48ae1bda7b24b2587bd6ce99 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 May 2015 19:04:51 +0200
Subject: [PATCH 0428/1143] geolite-legacy -> 2015-05-05

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index ac8582e2018c..08b402b004e9 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-04-21";
+  version = "2015-05-05";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
   srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
     "1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv";
   srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
-    "0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms";
+    "1y5b68s1giw01vw98c99qdhjiaxx6l4hrc2mx4rdaja46zic4maz";
   srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
-    "04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc";
+    "0crl31yc11w4jzgvbr9pgqd7x6ivpsgsip19s1g5xl71qbpmmjxm";
 
   meta = with stdenv.lib; {
     inherit version;

From 67529e7a08b875b6d29905ccfe1b81887aa7d888 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 27 Apr 2015 15:26:41 +0200
Subject: [PATCH 0429/1143] frama-c: update from Neon to Sodium

---
 .../0004-Port-to-OCamlgraph-1.8.5.patch       | 254 ------------------
 .../tools/analysis/frama-c/default.nix        |  11 +-
 2 files changed, 3 insertions(+), 262 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch

diff --git a/pkgs/development/tools/analysis/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch b/pkgs/development/tools/analysis/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch
deleted file mode 100644
index 798d17fd3694..000000000000
--- a/pkgs/development/tools/analysis/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 27 Apr 2014 13:46:16 +0200
-Subject: Port to OCamlgraph 1.8.5
-
----
- src/impact/reason_graph.ml          |    2 +-
- src/kernel/stmts_graph.ml           |   10 +++++-----
- src/logic/property_status.ml        |    8 ++++----
- src/misc/service_graph.ml           |    4 ++--
- src/pdg_types/pdgTypes.ml           |    6 +++---
- src/postdominators/print.ml         |    2 +-
- src/semantic_callgraph/register.ml  |    4 ++--
- src/slicing/printSlice.ml           |   10 +++++-----
- src/syntactic_callgraph/register.ml |    4 ++--
- src/wp/cil2cfg.ml                   |   12 ++++++------
- 10 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/src/impact/reason_graph.ml b/src/impact/reason_graph.ml
-index eabacb0..ce19b4a 100644
---- a/src/impact/reason_graph.ml
-+++ b/src/impact/reason_graph.ml
-@@ -139,7 +139,7 @@ module Printer (X: AdditionalInfo) = struct
- 
-   let graph_attributes _ = [`Label "Impact graph"]
- 
--  let default_vertex_attributes _g = [`Style [`Filled]; `Shape `Box]
-+  let default_vertex_attributes _g = [`Style `Filled; `Shape `Box]
-   let default_edge_attributes _g = []
- 
-   let vertex_attributes v =
-diff --git a/src/kernel/stmts_graph.ml b/src/kernel/stmts_graph.ml
-index a8fe121..16059c3 100644
---- a/src/kernel/stmts_graph.ml
-+++ b/src/kernel/stmts_graph.ml
-@@ -157,12 +157,12 @@ module TP = struct
- 
-   let vertex_attributes s =
-     match s.skind with
--    | Loop _ -> [`Color 0xFF0000; `Style [`Filled]]
--    | If _ -> [`Color 0x00FF00; `Style [`Filled]; `Shape `Diamond]
--    | Return _ -> [`Color 0x0000FF; `Style [`Filled]]
-+    | Loop _ -> [`Color 0xFF0000; `Style `Filled]
-+    | If _ -> [`Color 0x00FF00; `Style `Filled; `Shape `Diamond]
-+    | Return _ -> [`Color 0x0000FF; `Style `Filled]
-     | Block _ -> [`Shape `Box; `Fontsize 8]
--    | Goto _ -> [`Shape `Diamond; `Color 0x00FFFF ; `Style [`Filled]]
--    | Instr (Skip _) -> [`Color 0x00FFFF ; `Style [`Filled]]
-+    | Goto _ -> [`Shape `Diamond; `Color 0x00FFFF ; `Style `Filled]
-+    | Instr (Skip _) -> [`Color 0x00FFFF ; `Style `Filled]
-     | _ -> []
-   let default_vertex_attributes _ = []
- 
-diff --git a/src/logic/property_status.ml b/src/logic/property_status.ml
-index f7c278d..47485f6 100644
---- a/src/logic/property_status.ml
-+++ b/src/logic/property_status.ml
-@@ -1481,12 +1481,12 @@ module Consolidation_graph = struct
-                 let s = get_status p in
- 		let color = status_color p s in
-                 let style = match s with
--                  | Never_tried -> [`Style [`Bold]; `Width 0.8 ]
--                  | _ -> [`Style [`Filled]]
-+                  | Never_tried -> [`Style `Bold; `Width 0.8 ]
-+                  | _ -> [`Style `Filled]
-                 in
- 		style @ [ label v; `Color color; `Shape `Box ]
-               | Emitter _ as v -> 
--		[ label v; `Shape `Diamond; `Color 0xb0c4de; `Style [`Filled] ]
-+		[ label v; `Shape `Diamond; `Color 0xb0c4de; `Style `Filled ]
-               | Tuning_parameter _ as v ->
- 		[ label v; (*`Style `Dotted;*) `Color 0xb0c4de;  ]
- 	      (*| Correctness_parameter _ (*as v*) -> assert false (*[ label v; `Color 0xb0c4de ]*)*)
-@@ -1495,7 +1495,7 @@ module Consolidation_graph = struct
- 	      | None -> []
- 	      | Some s ->
- 		let c = emitted_status_color s in
--		[ `Color c; `Fontcolor c; `Style [`Bold] ]
-+		[ `Color c; `Fontcolor c; `Style `Bold ]
- 
-         let default_vertex_attributes _ = []
-         let default_edge_attributes _ = []
-diff --git a/src/misc/service_graph.ml b/src/misc/service_graph.ml
-index 4f866c5..d158028 100644
---- a/src/misc/service_graph.ml
-+++ b/src/misc/service_graph.ml
-@@ -289,7 +289,7 @@ Src root:%s in %s (is_root:%b) Dst:%s in %s (is_root:%b) [2d case]"
-         color e
-       else
-         match CallG.E.label e with
--        | Inter_services -> [ `Style [`Invis] ]
-+        | Inter_services -> [ `Style `Invis ]
-         | Inter_functions | Both -> color e
- 
-     let default_edge_attributes _ = []
-@@ -303,7 +303,7 @@ Src root:%s in %s (is_root:%b) Dst:%s in %s (is_root:%b) [2d case]"
-           sg_attributes =
-             [ `Label ("S " ^ cs);
-               `Color (Extlib.number_to_color id);
--              `Style [`Bold] ] }
-+              `Style `Bold ] }
- 
-   end
- 
-diff --git a/src/pdg_types/pdgTypes.ml b/src/pdg_types/pdgTypes.ml
-index 05754e4..74cdebf 100644
---- a/src/pdg_types/pdgTypes.ml
-+++ b/src/pdg_types/pdgTypes.ml
-@@ -626,7 +626,7 @@ module Pdg = struct
- 
-     let graph_attributes _ = [`Rankdir `TopToBottom ]
- 
--    let default_vertex_attributes _ = [`Style [`Filled]]
-+    let default_vertex_attributes _ = [`Style `Filled]
-     let vertex_name v = string_of_int (Node.id v)
- 
-     let vertex_attributes v =
-@@ -711,13 +711,13 @@ module Pdg = struct
-         if Dpd.is_ctrl d then (`Arrowtail `Odot)::attrib else attrib
-       in
-       let attrib =
--        if Dpd.is_addr d then (`Style [`Dotted])::attrib else attrib
-+        if Dpd.is_addr d then (`Style `Dotted)::attrib else attrib
-       in
-         attrib
- 
-     let get_subgraph v =
-       let mk_subgraph name attrib =
--        let attrib = (`Style [`Filled]) :: attrib in
-+        let attrib = (`Style `Filled) :: attrib in
-         Some { Graph.Graphviz.DotAttributes.sg_name= name;
-                sg_parent = None;
-                sg_attributes = attrib }
-diff --git a/src/postdominators/print.ml b/src/postdominators/print.ml
-index f2e3a25..15f4ff2 100644
---- a/src/postdominators/print.ml
-+++ b/src/postdominators/print.ml
-@@ -63,7 +63,7 @@ module Printer = struct
- 
-   let graph_attributes (title, _) = [`Label title]
- 
--  let default_vertex_attributes _g = [`Style [`Filled]]
-+  let default_vertex_attributes _g = [`Style `Filled]
-   let default_edge_attributes _g = []
- 
-   let vertex_attributes (s, has_postdom) =
-diff --git a/src/semantic_callgraph/register.ml b/src/semantic_callgraph/register.ml
-index 1c79dcc..071f061 100644
---- a/src/semantic_callgraph/register.ml
-+++ b/src/semantic_callgraph/register.ml
-@@ -102,8 +102,8 @@ module Service =
-          let name = Kernel_function.get_name
-          let attributes v =
-            [ `Style
--               [if Kernel_function.is_definition v then `Bold
--                else `Dotted] ]
-+               (if Kernel_function.is_definition v then `Bold
-+                else `Dotted) ]
-          let entry_point () =
-            try Some (fst (Globals.entry_point ()))
-            with Globals.No_such_entry_point _ -> None
-diff --git a/src/slicing/printSlice.ml b/src/slicing/printSlice.ml
-index c5363f9..211e0bb 100644
---- a/src/slicing/printSlice.ml
-+++ b/src/slicing/printSlice.ml
-@@ -227,7 +227,7 @@ module PrintProject = struct
- 
-   let graph_attributes (name, _) = [`Label name]
- 
--  let default_vertex_attributes _ = [`Style [`Filled]]
-+  let default_vertex_attributes _ = [`Style `Filled]
- 
-   let vertex_name v = match v with
-     | Src fi -> SlicingMacros.fi_name fi
-@@ -280,16 +280,16 @@ module PrintProject = struct
- 
-   let edge_attributes (e, call) =
-     let attrib = match e with
--    | (Src _, Src _) -> [`Style [`Invis]]
--    | (OptSliceCallers _, _) -> [`Style [`Invis]]
--    | (_, OptSliceCallers _) -> [`Style [`Invis]]
-+    | (Src _, Src _) -> [`Style `Invis]
-+    | (OptSliceCallers _, _) -> [`Style `Invis]
-+    | (_, OptSliceCallers _) -> [`Style `Invis]
-     | _ -> []
-     in match call with None -> attrib
-       | Some call -> (`Label (string_of_int call.sid)):: attrib
- 
-   let get_subgraph v =
-     let mk_subgraph name attrib =
--      let attrib = (*(`Label name) ::*) (`Style [`Filled]) :: attrib in
-+      let attrib = (*(`Label name) ::*) (`Style `Filled) :: attrib in
-           Some { Graph.Graphviz.DotAttributes.sg_name= name;
-                  sg_parent = None;
-                  sg_attributes = attrib }
-diff --git a/src/syntactic_callgraph/register.ml b/src/syntactic_callgraph/register.ml
-index d4669c4..d41980e 100644
---- a/src/syntactic_callgraph/register.ml
-+++ b/src/syntactic_callgraph/register.ml
-@@ -37,8 +37,8 @@ module Service =
-          let name v = nodeName v.cnInfo
-          let attributes v =
-            [ match v.cnInfo with
--             | NIVar (_,b) when not !b -> `Style [`Dotted]
--             | _ -> `Style [`Bold] ]
-+             | NIVar (_,b) when not !b -> `Style `Dotted
-+             | _ -> `Style `Bold ]
-          let equal v1 v2 = id v1 = id v2
- 	 let compare v1 v2 = 
- 	   let i1 = id v1 in
-diff --git a/src/wp/cil2cfg.ml b/src/wp/cil2cfg.ml
-index 6d8cf09..ba5f410 100644
---- a/src/wp/cil2cfg.ml
-+++ b/src/wp/cil2cfg.ml
-@@ -1278,9 +1278,9 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct
-       | Vstart | Vend | Vexit -> [`Color 0x0000FF; `Shape `Doublecircle]
-       | VfctIn | VfctOut -> [`Color 0x0000FF; `Shape `Box]
-       | VblkIn _ | VblkOut _ -> [`Shape `Box]
--      | Vloop _ | Vloop2 _ -> [`Color 0xFF0000; `Style [`Filled]]
-+      | Vloop _ | Vloop2 _ -> [`Color 0xFF0000; `Style `Filled]
-       | Vtest _ | Vswitch _ ->
--        [`Color 0x00FF00; `Style [`Filled]; `Shape `Diamond]
-+        [`Color 0x00FF00; `Style `Filled; `Shape `Diamond]
-       | Vcall _ | Vstmt _ -> []
-     in (`Label (String.escaped label))::attr
- 
-@@ -1290,15 +1290,15 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct
-     let attr = [] in
-     let attr = (`Label (String.escaped (PE.edge_txt e)))::attr in
-     let attr =
--      if is_back_edge e then (`Constraint false)::(`Style [`Bold])::attr
-+      if is_back_edge e then (`Constraint false)::(`Style `Bold)::attr
-       else attr
-     in
-     let attr = match (edge_type e) with
-       | Ethen | EbackThen -> (`Color 0x00FF00)::attr
-       | Eelse | EbackElse -> (`Color 0xFF0000)::attr
--      | Ecase [] -> (`Color 0x0000FF)::(`Style [`Dashed])::attr
-+      | Ecase [] -> (`Color 0x0000FF)::(`Style `Dashed)::attr
-       | Ecase _ -> (`Color 0x0000FF)::attr
--      | Enext -> (`Style [`Dotted])::attr
-+      | Enext -> (`Style `Dotted)::attr
-       | Eback -> attr (* see is_back_edge above *)
-       | Enone -> attr
-     in
-@@ -1308,7 +1308,7 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct
- 
-   let get_subgraph v =
-      let mk_subgraph name attrib =
--      let attrib = (`Style [`Filled]) :: attrib in
-+      let attrib = (`Style `Filled) :: attrib in
-           Some { Graph.Graphviz.DotAttributes.sg_name= name;
-                  sg_parent = None;
-                  sg_attributes = attrib }
--- 
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 9e2f310b8a11..b7c71475d6c5 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name    = "frama-c-${version}";
-  version = "20140301";
-  slang   = "Neon";
+  version = "20150201";
+  slang   = "Sodium";
 
   src = fetchurl {
     url    = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
-    sha256 = "0ca7ky7vs34did1j64v6d8gcp2irzw3rr5qgv47jhmidbipn1865";
+    sha256 = "0wackacnnpxnh3612ld68bal8b1dm9cdsi180lw42bsyks03h5mn";
   };
 
   why2 = fetchurl {
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
 
 
   enableParallelBuilding = true;
-  configureFlags = [ "--disable-local-ocamlgraph" ];
 
   unpackPhase = ''
     tar xf $src
@@ -42,10 +41,6 @@ stdenv.mkDerivation rec {
   '';
 
 
-  # Taken from Debian Sid
-  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746091
-  patches = ./0004-Port-to-OCamlgraph-1.8.5.patch;
-
   # Enter frama-c directory before patching
   prePatch = ''cd frama*'';
   postPatch = ''

From 1650292b65c74b0b4d6f197708b480e4a16930ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 19:38:33 +0200
Subject: [PATCH 0430/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/9c68a9d77e73e5aaec311e87f8220de2c4b8d8f5
 with hackage2nix revision a92f66b20fe51e401d0d4d945beeae82093f8d43

---
 .../haskell-modules/hackage-packages.nix      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 935383e4ee03..7b787e0d389d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -31166,8 +31166,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5.4";
-       sha256 = "1ncwx28g0b99f8515qnyrqbmx4gvdfbf97199m2njk2rw5xbj3ka";
+       version = "0.5.5";
+       sha256 = "1s5r7sjkxri02zxsjnkdxd03sk2j77l5r819sjw1wi6930p2fwa4";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -31184,7 +31184,7 @@ self: {
      }) {};
 
   "clash-lib" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, hashable, lens, mtl, pretty, process, template-haskell
      , text, time, transformers, unbound-generics, unordered-containers
@@ -31192,13 +31192,13 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.2";
-       sha256 = "1i7yk190vchcb3zm1fvmghsvjfpbrkwhh5l9vifxdsp34q10yr3g";
+       version = "0.5.3";
+       sha256 = "0x5qza2xv26m27inr0cm59vlizlbimb3gfdc1amal6nznjgrsflc";
        buildDepends = [
-         aeson attoparsec base bytestring concurrent-supply containers
-         deepseq directory errors fgl filepath hashable lens mtl pretty
-         process template-haskell text time transformers unbound-generics
-         unordered-containers uu-parsinglib wl-pprint-text
+         aeson attoparsec base bytestring clash-prelude concurrent-supply
+         containers deepseq directory errors fgl filepath hashable lens mtl
+         pretty process template-haskell text time transformers
+         unbound-generics unordered-containers uu-parsinglib wl-pprint-text
        ];
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
@@ -31245,8 +31245,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.5.2";
-       sha256 = "1061ksf7riyv39rwaahn2d08xm2akyanmh18024qd3hz3i5gpghb";
+       version = "0.5.3";
+       sha256 = "06b224qjvj1yqywzs2cz8pzb37n1p8y9zpw4jjb9q76qvr0x68q3";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text

From 1e574111ff5621b6cdfdf2a741e00cd265746339 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 19:47:19 +0200
Subject: [PATCH 0431/1143] haskell-temporal-music-notation does not compile.

https://github.com/anton-k/temporal-music-notation/issues/1
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dc1d8e0625a6..86fe1f239e91 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -802,4 +802,9 @@ self: super: {
   hgeometry = dontDistribute super.hgeometry;
   hipe = dontDistribute super.hipe;
 
+  # https://github.com/anton-k/temporal-music-notation/issues/1
+  temporal-music-notation = markBroken super.temporal-music-notation;
+  temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
+  temporal-music-notation-western = dontDistribute super.temporal-music-notation-western;
+
 }

From e9631f289ff6e81869c041b232a505fc57d05862 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 19:48:27 +0200
Subject: [PATCH 0432/1143] haskell-clash-lib depends on broken singletons
 library.

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 86fe1f239e91..a44a2c09a24d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -801,6 +801,7 @@ self: super: {
   singleton-nats = dontDistribute super.singleton-nats;
   hgeometry = dontDistribute super.hgeometry;
   hipe = dontDistribute super.hipe;
+  clash-lib = dontDistribute super.clash-lib;
 
   # https://github.com/anton-k/temporal-music-notation/issues/1
   temporal-music-notation = markBroken super.temporal-music-notation;

From 01ba9d0dec962ac5a7651150a1a6c43762f59b31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 20:40:07 +0200
Subject: [PATCH 0433/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/69ffcf7c20bf9aa1d0aaa12925d810d9a6ae382c
 with hackage2nix revision 936f7d1dd81cf86df3d79e4e38d17dc68e2a561e

---
 .../haskell-modules/hackage-packages.nix      | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7b787e0d389d..d88534cdaf4c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1008,22 +1008,21 @@ self: {
      }) {};
 
   "BCMtools" = callPackage
-    ({ mkDerivation, base, binary, bytestring, bytestring-lexing
-     , colour, conduit, conduit-extra, data-binary-ieee754
-     , data-default-class, matrices, optparse-applicative, resourcet
-     , split, transformers, unordered-containers, vector, zlib
+    ({ mkDerivation, base, bytestring, bytestring-lexing, cereal
+     , colour, conduit, conduit-extra, data-default-class, matrices
+     , optparse-applicative, resourcet, split, transformers
+     , unordered-containers, vector, zlib
      }:
      mkDerivation {
        pname = "BCMtools";
-       version = "0.1.0";
-       sha256 = "1rql6xxa6lddb2ngvbnicz6gsd17m5l7yqxfpm242s1crhqmxajg";
+       version = "0.1.1";
+       sha256 = "1693kg8hxr1jl8h0ri11dbrbyhyznipkvcp0cvvx9chn97761ys4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base binary bytestring bytestring-lexing colour conduit
-         conduit-extra data-binary-ieee754 data-default-class matrices
-         optparse-applicative resourcet split transformers
-         unordered-containers vector zlib
+         base bytestring bytestring-lexing cereal colour conduit
+         conduit-extra data-default-class matrices optparse-applicative
+         resourcet split transformers unordered-containers vector zlib
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
@@ -15795,12 +15794,13 @@ self: {
      }) {};
 
   "Yampa" = callPackage
-    ({ mkDerivation, base, random }:
+    ({ mkDerivation, base, hlint, random }:
      mkDerivation {
        pname = "Yampa";
-       version = "0.9.6.1";
-       sha256 = "14nssljqgpirdjl6rxb1x4xxl6rpq2rhldhcvsvc0qx31mb01df1";
+       version = "0.10.1";
+       sha256 = "10ggyb0lbjcz77dmfrnrxhfi5pph4396zp5vzmcvmiwls2s1g3am";
        buildDepends = [ base random ];
+       testDepends = [ base hlint ];
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -28977,6 +28977,7 @@ self: {
        homepage = "https://github.com/nh2/call-haskell-from-anything";
        description = "Python-to-Haskell function calls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "camh" = callPackage
@@ -47676,7 +47677,7 @@ self: {
      }) {};
 
   "fft" = callPackage
-    ({ mkDerivation, array, base, carray, fftw3, fftw3f, ix-shapable
+    ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
      , QuickCheck, storable-complex, syb
      }:
      mkDerivation {
@@ -47687,26 +47688,26 @@ self: {
          array base carray ix-shapable storable-complex syb
        ];
        testDepends = [ base carray QuickCheck storable-complex ];
-       pkgconfigDepends = [ fftw3 fftw3f ];
+       pkgconfigDepends = [ fftw fftwFloat ];
        jailbreak = true;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fftw3 = null;  fftw3f = null;};
+     }) { inherit (pkgs) fftw;  inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
-    ({ mkDerivation, base, fftw3 }:
+    ({ mkDerivation, base, fftw }:
      mkDerivation {
        pname = "fftwRaw";
        version = "0.1.0.0";
        sha256 = "1dkkn72g4arjamv647ba05j7aj95vvjy2wdd6g9xcc5w2ix45kr4";
        buildDepends = [ base ];
-       extraLibraries = [ fftw3 ];
+       extraLibraries = [ fftw ];
        homepage = "https://github.com/adamwalker/haskell-fftw-simple";
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fftw3 = null;};
+     }) { inherit (pkgs) fftw;};
 
   "fgl" = callPackage
     ({ mkDerivation, array, base, containers, mtl }:
@@ -77890,9 +77891,10 @@ self: {
     ({ mkDerivation, base, parsec }:
      mkDerivation {
        pname = "lambdaBase";
-       version = "0.0.1.0";
-       sha256 = "0mmdkyadpnkm8d3jv6vb7ln762vkf744hcq6qiyhznxhvih0k28x";
+       version = "0.0.2.0";
+       sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd";
        buildDepends = [ base parsec ];
+       testDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -100452,17 +100454,17 @@ self: {
      }) {};
 
   "pulse-simple" = callPackage
-    ({ mkDerivation, base, bytestring, pulse-simple }:
+    ({ mkDerivation, base, bytestring, pulseaudio }:
      mkDerivation {
        pname = "pulse-simple";
        version = "0.1.14";
        sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4";
        buildDepends = [ base bytestring ];
-       extraLibraries = [ pulse-simple ];
+       extraLibraries = [ pulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { pulse-simple = null;};
+     }) { inherit (pkgs) pulseaudio;};
 
   "punkt" = callPackage
     ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text
@@ -106150,19 +106152,19 @@ self: {
      }) {};
 
   "rtlsdr" = callPackage
-    ({ mkDerivation, base, c2hs, rtlsdr }:
+    ({ mkDerivation, base, c2hs, rtl-sdr }:
      mkDerivation {
        pname = "rtlsdr";
        version = "0.1.0.4";
        sha256 = "090m8qsj9g0xr8ybyiik6vrc9j7bvgmgp42vznank3nklrmkxbgz";
        buildDepends = [ base ];
        buildTools = [ c2hs ];
-       extraLibraries = [ rtlsdr ];
+       extraLibraries = [ rtl-sdr ];
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { rtlsdr = null;};
+     }) { inherit (pkgs) rtl-sdr;};
 
   "rtorrent-rpc" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual
@@ -111464,6 +111466,7 @@ self: {
        homepage = "http://rel4tion.org/projects/smaoin-hs/";
        description = "Utilities for the Smaoin semantic information model";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smartGroup" = callPackage
@@ -127367,20 +127370,19 @@ self: {
      }) {};
 
   "vector-fftw" = callPackage
-    ({ mkDerivation, base, fftw3, primitive, storable-complex, vector
-     }:
+    ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
      mkDerivation {
        pname = "vector-fftw";
        version = "0.1.3.2";
        sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0";
        buildDepends = [ base primitive storable-complex vector ];
-       extraLibraries = [ fftw3 ];
+       extraLibraries = [ fftw ];
        jailbreak = true;
        homepage = "http://hackage.haskell.org/package/vector-fftw";
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fftw3 = null;};
+     }) { inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive, vector, vector-th-unbox
@@ -134501,8 +134503,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.1.1.0";
-       sha256 = "0m83hy3j2sg060jv44pcgr99avzg0laq6ydl37pckvyqz27rbw7f";
+       version = "0.1.3.0";
+       sha256 = "0yj1mn5xbvq4j6qqndfby04vdy6x2k7ik9xg6vb4ffhg9z9r8q3y";
        buildDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers yesod yesod-core

From e36427857d3e9a70c241a8c1ffd3949dce913b7f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 20:35:43 +0200
Subject: [PATCH 0434/1143] Fix cabal-install builds with ghc 7.0.x and 7.2.x.

---
 .../haskell-modules/configuration-ghc-7.0.x.nix            | 7 ++++++-
 .../haskell-modules/configuration-ghc-7.2.x.nix            | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index caef6c4b7546..ea21f0090710 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -46,8 +46,13 @@ self: super: {
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
+  # Newer versions don't compile.
+  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
+  cabal-install = self.cabal-install_1_18_0_8;
+
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 49296fa04df3..b06a9dbbbd35 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -43,11 +43,16 @@ self: super: {
   # https://github.com/haskell/cabal/issues/2322
   Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };
 
+  # Newer versions don't compile.
+  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
+  cabal-install = self.cabal-install_1_18_0_8;
+
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;

From 324719a5a611501d7b54e14f205465f5da1242b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 20:48:49 +0200
Subject: [PATCH 0435/1143] Drop obsolete pre-NG Haskell builds.

---
 pkgs/applications/audio/vimus/default.nix     |  30 --
 .../structured-haskell-mode/default.nix       |  23 --
 pkgs/applications/editors/yi/yi.nix           |  39 ---
 pkgs/applications/graphics/hoodle/default.nix |  22 --
 pkgs/applications/misc/arbtt/default.nix      |  31 --
 .../misc/nc-indicators/default.nix            |  18 -
 pkgs/applications/misc/taffybar/default.nix   |  28 --
 pkgs/applications/misc/xmobar/default.nix     |  28 --
 pkgs/applications/misc/yeganesh/default.nix   |  18 -
 .../office/hledger-interest/default.nix       |  19 -
 .../office/hledger-irr/default.nix            |  18 -
 .../science/math/sloane/default.nix           |  28 --
 .../git-and-tools/git-annex/default.nix       |  56 ---
 .../git-and-tools/github-backup/default.nix   |  26 --
 .../window-managers/xmonad/default.nix        |  30 --
 .../window-managers/xmonad/xmonad-contrib.nix |  21 --
 .../window-managers/xmonad/xmonad-extras.nix  |  24 --
 pkgs/build-support/cabal/default.nix          | 330 ------------------
 pkgs/development/compilers/agda/default.nix   |  36 --
 .../compilers/clash-ghc/default.nix           |  33 --
 .../compilers/elm/elm-compiler.nix            |  34 --
 pkgs/development/compilers/elm/elm-get.nix    |  25 --
 pkgs/development/compilers/elm/elm-make.nix   |  23 --
 .../development/compilers/elm/elm-package.nix |  26 --
 .../elm/elm-reactor-exact-dependencies.json   |   6 -
 .../development/compilers/elm/elm-reactor.nix |  68 ----
 pkgs/development/compilers/elm/elm-repl.nix   |  28 --
 pkgs/development/compilers/elm/elm-server.nix |  23 --
 pkgs/development/compilers/elm/elm.nix        |  40 ---
 pkgs/development/compilers/epic/default.nix   |  20 --
 pkgs/development/compilers/idris/default.nix  |  34 --
 pkgs/development/compilers/idris/wrapper.nix  |  11 -
 .../compilers/pakcs/adjust-buildsystem.patch  |  43 ---
 pkgs/development/compilers/pakcs/default.nix  | 111 ------
 .../tools/documentation/haddock/default.nix   |  20 --
 .../tools/misc/ShellCheck/default.nix         |  25 --
 pkgs/development/tools/misc/cpphs/default.nix |  18 -
 .../tools/parsing/Ebnf2ps/default.nix         |  18 -
 pkgs/development/tools/parsing/alex/2.3.5.nix |  20 --
 pkgs/development/tools/parsing/alex/3.1.3.nix |  19 -
 ...adapt-crazy-perl-regex-for-cpp-4.8.0.patch |  12 -
 ...adapt-crazy-perl-regex-for-cpp-4.8.0.patch |  12 -
 .../tools/parsing/happy/default.nix           |  19 -
 pkgs/games/Allure/default.nix                 |  19 -
 pkgs/games/LambdaHack/default.nix             |  35 --
 pkgs/games/uqm/3dovideo.nix                   |  63 ----
 pkgs/games/uqm/default.nix                    | 108 ------
 pkgs/tools/misc/escoger/default.nix           |  33 --
 .../cabal-install/1.16.0.2.nix                |  29 --
 .../cabal-install/1.18.0.3.nix                |  36 --
 .../cabal-install/1.20.0.6.nix                |  32 --
 .../cabal-install/1.22.0.0.nix                |  34 --
 pkgs/tools/system/journal-mailer/default.nix  |  34 --
 pkgs/tools/system/sizes/default.nix           |  23 --
 pkgs/tools/typesetting/lhs2tex/default.nix    |  26 --
 pkgs/top-level/all-packages.nix               |   4 +-
 56 files changed, 1 insertion(+), 1988 deletions(-)
 delete mode 100644 pkgs/applications/audio/vimus/default.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
 delete mode 100644 pkgs/applications/editors/yi/yi.nix
 delete mode 100644 pkgs/applications/graphics/hoodle/default.nix
 delete mode 100644 pkgs/applications/misc/arbtt/default.nix
 delete mode 100644 pkgs/applications/misc/nc-indicators/default.nix
 delete mode 100644 pkgs/applications/misc/taffybar/default.nix
 delete mode 100644 pkgs/applications/misc/xmobar/default.nix
 delete mode 100644 pkgs/applications/misc/yeganesh/default.nix
 delete mode 100644 pkgs/applications/office/hledger-interest/default.nix
 delete mode 100644 pkgs/applications/office/hledger-irr/default.nix
 delete mode 100644 pkgs/applications/science/math/sloane/default.nix
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git-annex/default.nix
 delete mode 100644 pkgs/applications/version-management/git-and-tools/github-backup/default.nix
 delete mode 100644 pkgs/applications/window-managers/xmonad/default.nix
 delete mode 100644 pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
 delete mode 100644 pkgs/applications/window-managers/xmonad/xmonad-extras.nix
 delete mode 100644 pkgs/build-support/cabal/default.nix
 delete mode 100644 pkgs/development/compilers/agda/default.nix
 delete mode 100644 pkgs/development/compilers/clash-ghc/default.nix
 delete mode 100644 pkgs/development/compilers/elm/elm-compiler.nix
 delete mode 100644 pkgs/development/compilers/elm/elm-get.nix
 delete mode 100644 pkgs/development/compilers/elm/elm-make.nix
 delete mode 100644 pkgs/development/compilers/elm/elm-package.nix
 delete mode 100644 pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json
 delete mode 100644 pkgs/development/compilers/elm/elm-reactor.nix
 delete mode 100644 pkgs/development/compilers/elm/elm-repl.nix
 delete mode 100644 pkgs/development/compilers/elm/elm-server.nix
 delete mode 100644 pkgs/development/compilers/elm/elm.nix
 delete mode 100644 pkgs/development/compilers/epic/default.nix
 delete mode 100644 pkgs/development/compilers/idris/default.nix
 delete mode 100644 pkgs/development/compilers/idris/wrapper.nix
 delete mode 100644 pkgs/development/compilers/pakcs/adjust-buildsystem.patch
 delete mode 100644 pkgs/development/compilers/pakcs/default.nix
 delete mode 100644 pkgs/development/tools/documentation/haddock/default.nix
 delete mode 100644 pkgs/development/tools/misc/ShellCheck/default.nix
 delete mode 100644 pkgs/development/tools/misc/cpphs/default.nix
 delete mode 100644 pkgs/development/tools/parsing/Ebnf2ps/default.nix
 delete mode 100644 pkgs/development/tools/parsing/alex/2.3.5.nix
 delete mode 100644 pkgs/development/tools/parsing/alex/3.1.3.nix
 delete mode 100644 pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
 delete mode 100644 pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
 delete mode 100644 pkgs/development/tools/parsing/happy/default.nix
 delete mode 100644 pkgs/games/Allure/default.nix
 delete mode 100644 pkgs/games/LambdaHack/default.nix
 delete mode 100644 pkgs/games/uqm/3dovideo.nix
 delete mode 100644 pkgs/games/uqm/default.nix
 delete mode 100644 pkgs/tools/misc/escoger/default.nix
 delete mode 100644 pkgs/tools/package-management/cabal-install/1.16.0.2.nix
 delete mode 100644 pkgs/tools/package-management/cabal-install/1.18.0.3.nix
 delete mode 100644 pkgs/tools/package-management/cabal-install/1.20.0.6.nix
 delete mode 100644 pkgs/tools/package-management/cabal-install/1.22.0.0.nix
 delete mode 100644 pkgs/tools/system/journal-mailer/default.nix
 delete mode 100644 pkgs/tools/system/sizes/default.nix
 delete mode 100644 pkgs/tools/typesetting/lhs2tex/default.nix

diff --git a/pkgs/applications/audio/vimus/default.nix b/pkgs/applications/audio/vimus/default.nix
deleted file mode 100644
index 7118f1876dcf..000000000000
--- a/pkgs/applications/audio/vimus/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, dataDefault, deepseq, filepath, hspec
-, hspecExpectations, libmpd, mtl, ncurses, QuickCheck, time
-, transformers, utf8String, wcwidth
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vimus";
-  version = "0.2.0";
-  sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataDefault deepseq filepath libmpd mtl time utf8String wcwidth
-  ];
-  testDepends = [
-    dataDefault hspec hspecExpectations mtl QuickCheck transformers
-    wcwidth
-  ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ ncurses ];
-  meta = {
-    description = "An MPD client with vim-like key bindings";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jzellner ];
-    broken = self.stdenv.isLinux && self.stdenv.isi686;
-  };
-})
diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
deleted file mode 100644
index b8838fac980f..000000000000
--- a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, emacs, haskellMode, haskellSrcExts }:
-
-cabal.mkDerivation (self: {
-  pname = "structured-haskell-mode";
-  version = "1.0.4";
-  sha256 = "1402wx27py7292ad7whsb13ywv71k36501jpfrn2p0v7knzknj8z";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ haskellSrcExts haskellMode ];
-  buildTools = [ emacs ];
-  postInstall = ''
-    emacs -L elisp -L ${haskellMode}/share/emacs/site-lisp \
-      --batch -f batch-byte-compile "elisp/"*.el
-    install -d $out/share/emacs/site-lisp
-    install "elisp/"*.el "elisp/"*.elc  $out/share/emacs/site-lisp
-  '';
-  meta = {
-    homepage = "https://github.com/chrisdone/structured-haskell-mode";
-    description = "Structured editing Emacs mode for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix
deleted file mode 100644
index f9ef27d999de..000000000000
--- a/pkgs/applications/editors/yi/yi.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, Cabal, cautiousFile, dataDefault, derive, dlist
-, dynamicState, dyre, exceptions, filepath, glib, gtk, hashable
-, hint, HUnit, lens, mtl, ooPrototypes, pango, parsec, pointedlist
-, QuickCheck, random, regexBase, regexTdfa, safe, semigroups, split
-, tagged, tasty, tastyHunit, tastyQuickcheck, text, time
-, transformersBase, unixCompat, unorderedContainers, utf8String
-, vty, wordTrie, xdgBasedir, yiLanguage, yiRope
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yi";
-  version = "0.11.1";
-  sha256 = "15m1wwrxmszl930az79lpgyz5rxg72gy8vi17ibpac1cszfdx192";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary Cabal cautiousFile dataDefault derive dlist dynamicState
-    dyre exceptions filepath glib gtk hashable hint lens mtl
-    ooPrototypes pango parsec pointedlist QuickCheck random regexBase
-    regexTdfa safe semigroups split tagged text time transformersBase
-    unixCompat unorderedContainers utf8String vty wordTrie xdgBasedir
-    yiLanguage yiRope
-  ];
-  testDepends = [
-    filepath HUnit lens QuickCheck semigroups tasty tastyHunit
-    tastyQuickcheck text yiLanguage yiRope
-  ];
-  configureFlags = "-fpango -fvty";
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8";
-  meta = {
-    homepage = http://haskell.org/haskellwiki/Yi;
-    description = "The Haskell-Scriptable Editor";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix
deleted file mode 100644
index afa3a8ca0c7c..000000000000
--- a/pkgs/applications/graphics/hoodle/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle";
-  version = "0.3";
-  sha256 = "01wz7bwdr3i43ikaiaq8vpn6b0clxjnjyaw6nl6zaq489dhj6fv5";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs configurator dyre filepath hoodleCore mtl
-  ];
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "Executable for hoodle";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
deleted file mode 100644
index cd3df455c38e..000000000000
--- a/pkgs/applications/misc/arbtt/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, binary, bytestringProgress, deepseq, filepath
-, HUnit, libXScrnSaver, parsec, pcreLight, processExtras, strict
-, tasty, tastyGolden, tastyHunit, terminalProgressBar, time
-, transformers, utf8String, X11
-}:
-
-cabal.mkDerivation (self: {
-  pname = "arbtt";
-  version = "0.8.1.4";
-  sha256 = "15ydb425nvqfzajx09q713wy5xa7awbzfjlsidk17vf7qbhfjn7z";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson binary bytestringProgress deepseq filepath parsec pcreLight
-    strict terminalProgressBar time transformers utf8String X11
-  ];
-  testDepends = [
-    binary deepseq HUnit parsec pcreLight processExtras tasty
-    tastyGolden tastyHunit time transformers utf8String
-  ];
-  extraLibraries = [ libXScrnSaver ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://arbtt.nomeata.de/";
-    description = "Automatic Rule-Based Time Tracker";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix
deleted file mode 100644
index 3198333cce25..000000000000
--- a/pkgs/applications/misc/nc-indicators/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, gtk, hflags, lens, pipes, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "nc-indicators";
-  version = "0.3";
-  sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ attoparsec gtk hflags lens pipes stm ];
-  meta = {
-    homepage = "https://github.com/nilcons/nc-indicators";
-    description = "CPU load and memory usage indicators for i3bar";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix
deleted file mode 100644
index 8f2f95193fbb..000000000000
--- a/pkgs/applications/misc/taffybar/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, dbus, dyre, enclosedExceptions, filepath, gtk
-, gtkTraymanager, HStringTemplate, HTTP, mtl, network, networkUri
-, parsec, safe, split, stm, text, time, transformers, utf8String
-, X11, xdgBasedir, xmonad, xmonadContrib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "taffybar";
-  version = "0.4.4";
-  sha256 = "046nfp878mqj9acsid94mqp8q1yqnm1hsdkv88m5qpmn182xljwh";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cairo dbus dyre enclosedExceptions filepath gtk gtkTraymanager
-    HStringTemplate HTTP mtl network networkUri parsec safe split stm
-    text time transformers utf8String X11 xdgBasedir xmonad
-    xmonadContrib
-  ];
-  pkgconfigDepends = [ gtk ];
-  meta = {
-    homepage = "http://github.com/travitch/taffybar";
-    description = "A desktop bar similar to xmobar, but with more GUI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
deleted file mode 100644
index 65201f2495b9..000000000000
--- a/pkgs/applications/misc/xmobar/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP
-, libmpd, libXpm, libXrandr, mtl, parsec, regexCompat, stm, time
-, timezoneOlson, timezoneSeries, transformers, utf8String
-, wirelesstools, X11, X11Xft
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xmobar";
-  version = "0.22.1";
-  sha256 = "0mnwwcfk0xf4fi3cnw19s6lxcg8sbsdlvg7zwvf5xf0y9q365swz";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec
-    regexCompat stm time timezoneOlson timezoneSeries transformers
-    utf8String X11 X11Xft
-  ];
-  extraLibraries = [ libXpm libXrandr wirelesstools ];
-  configureFlags = "-fall_extensions";
-  meta = {
-    homepage = "http://xmobar.org";
-    description = "A Minimalistic Text Based Status Bar";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/applications/misc/yeganesh/default.nix b/pkgs/applications/misc/yeganesh/default.nix
deleted file mode 100644
index f26d315fce2c..000000000000
--- a/pkgs/applications/misc/yeganesh/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, strict, time, xdgBasedir }:
-
-cabal.mkDerivation (self: {
-  pname = "yeganesh";
-  version = "2.5";
-  sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath strict time xdgBasedir ];
-  meta = {
-    homepage = "http://dmwit.com/yeganesh";
-    description = "small dmenu wrapper";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix
deleted file mode 100644
index 393bc9cc4c7a..000000000000
--- a/pkgs/applications/office/hledger-interest/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, Decimal, hledgerLib, mtl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "hledger-interest";
-  version = "1.4.4";
-  sha256 = "16knk1cwrpg5jn6vgcab7hqpjzg33ysz57x1f2glrmhhv1slmbfn";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Cabal Decimal hledgerLib mtl time ];
-  meta = {
-    homepage = "http://github.com/peti/hledger-interest";
-    description = "computes interest for a given account";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix
deleted file mode 100644
index 6274797f6096..000000000000
--- a/pkgs/applications/office/hledger-irr/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, hledgerLib, statistics, time }:
-
-cabal.mkDerivation (self: {
-  pname = "hledger-irr";
-  version = "0.1.1.4";
-  sha256 = "0nqd8br86d71dpwq7p8956q74pgqdimid42xikp9zvf632x2s8ax";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Cabal hledgerLib statistics time ];
-  meta = {
-    description = "computes the internal rate of return of an investment";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix
deleted file mode 100644
index 644ec3be5693..000000000000
--- a/pkgs/applications/science/math/sloane/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, cereal, downloadCurl, filepath, HTTP
-, network, optparseApplicative, terminalSize, text, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sloane";
-  version = "1.9.3";
-  sha256 = "0xl3dmi6czwfbi17742hqxf3d6sl9dci08qszrkdmasnvivakg78";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal cereal downloadCurl filepath HTTP network
-    optparseApplicative terminalSize text zlib
-  ];
-  postInstall = ''
-    mkdir -p $out/share/man/man1
-    cp sloane.1 $out/share/man/man1/
-  '';
-  meta = {
-    homepage = "http://github.com/akc/sloane";
-    description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ akc ];
-  };
-})
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
deleted file mode 100644
index d4d627d61545..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, aws, blazeBuilder, bloomfilter, bup
-, byteable, caseInsensitive, clientsession, conduit, conduitExtra
-, cryptoApi, cryptohash, curl, dataDefault, dataenc, DAV, dbus
-, dlist, dns, editDistance, exceptions, fdoNotify, feed, filepath
-, git, gnupg1, gnutls, hamlet, hinotify, hslogger, httpClient
-, httpConduit, httpTypes, IfElse, json, lsof, MissingH
-, monadControl, mtl, network, networkInfo, networkMulticast
-, networkProtocolXmpp, networkUri, openssh, optparseApplicative
-, pathPieces, perl, QuickCheck, random, regexTdfa, resourcet, rsync
-, SafeSemaphore, securemem, SHA, shakespeare, stm, tasty
-, tastyHunit, tastyQuickcheck, tastyRerun, text, time, torrent
-, transformers, unixCompat, utf8String, uuid, wai, waiExtra, warp
-, warpTls, wget, which, xmlTypes, yesod, yesodCore, yesodDefault
-, yesodForm, yesodStatic
-}:
-
-cabal.mkDerivation (self: {
-  pname = "git-annex";
-  version = "5.20141231";
-  sha256 = "0rrwaclc3mpn39087fs5pgn0axjp5mki0nhj9a3fjjchdwd8wzyf";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson async aws blazeBuilder bloomfilter byteable caseInsensitive
-    clientsession conduit conduitExtra cryptoApi cryptohash dataDefault
-    dataenc DAV dbus dlist dns editDistance exceptions fdoNotify feed
-    filepath gnutls hamlet hinotify hslogger httpClient httpConduit
-    httpTypes IfElse json MissingH monadControl mtl network networkInfo
-    networkMulticast networkProtocolXmpp networkUri optparseApplicative
-    pathPieces QuickCheck random regexTdfa resourcet SafeSemaphore
-    securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck
-    tastyRerun text time torrent transformers unixCompat utf8String
-    uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
-    yesodDefault yesodForm yesodStatic
-  ];
-  buildTools = [
-    bup curl git gnupg1 lsof openssh perl rsync wget which
-  ];
-  configureFlags = "-fAssistant -fProduction";
-  preConfigure = "export HOME=$TEMPDIR";
-  installPhase = "./Setup install";
-  checkPhase = ''
-    cp dist/build/git-annex/git-annex git-annex
-    ./git-annex test
-  '';
-  propagatedUserEnvPkgs = [git lsof];
-  meta = {
-    homepage = "http://git-annex.branchable.com/";
-    description = "manage files with git, without checking their contents into git";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
deleted file mode 100644
index 39af61f5bb5d..000000000000
--- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, filepath, git, github, hslogger, IfElse
-, MissingH, mtl, network, networkUri, optparseApplicative
-, prettyShow, text, transformers, unixCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "github-backup";
-  version = "1.20141204";
-  sha256 = "0asj0ix81k6vi95rwlhs7ikk936lzfsav4gw0gvyzf31ggmf4j4c";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    exceptions filepath github hslogger IfElse MissingH mtl network
-    networkUri optparseApplicative prettyShow text transformers
-    unixCompat
-  ];
-  buildTools = [ git ];
-  meta = {
-    homepage = "https://github.com/joeyh/github-backup";
-    description = "backs up everything github knows about a repository, to the repository";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
deleted file mode 100644
index 16b0ac365a2e..000000000000
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }:
-
-cabal.mkDerivation (self: {
-  pname = "xmonad";
-  version = "0.11";
-  sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    extensibleExceptions filepath mtl utf8String X11
-  ];
-  postInstall = ''
-    shopt -s globstar
-    mkdir -p $out/share/man/man1
-    mv "$out/"**"/man/"*.1 $out/share/man/man1/
-  '';
-  patches = [
-    # Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available).
-    ../../../development/haskell-modules/xmonad-nix.patch
-  ];
-  meta = {
-    homepage = "http://xmonad.org";
-    description = "A tiling window manager";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
deleted file mode 100644
index 086d80963d84..000000000000
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft
-, xmonad
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xmonad-contrib";
-  version = "0.11.3";
-  sha256 = "14h9vr33yljymswj50wbimav263y9abdcgi07mvfis0zd08rxqxa";
-  buildDepends = [
-    extensibleExceptions mtl random utf8String X11 X11Xft xmonad
-  ];
-  meta = {
-    homepage = "http://xmonad.org/";
-    description = "Third party extensions for xmonad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
deleted file mode 100644
index 87ee4994e45d..000000000000
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hint, libmpd, mtl, network, parsec, random, regexPosix
-, split, X11, xmonad, xmonadContrib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xmonad-extras";
-  version = "0.12";
-  sha256 = "1gyj9j6x21rvs6kg6g74wr0jdd36c5ml63a670456fhjr96s8y0g";
-  buildDepends = [
-    hint libmpd mtl network parsec random regexPosix split X11 xmonad
-    xmonadContrib
-  ];
-  configureFlags = "-f-with_hlist -fwith_split -fwith_parsec";
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/xmonad-extras";
-    description = "Third party extensions for xmonad with wacky dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
deleted file mode 100644
index bf88a0d48e27..000000000000
--- a/pkgs/build-support/cabal/default.nix
+++ /dev/null
@@ -1,330 +0,0 @@
-# generic builder for Cabal packages
-
-{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, glibcLocales
-, gnugrep, coreutils, hscolour, cpphs
-, enableLibraryProfiling ? false
-, enableSharedLibraries ? false
-, enableSharedExecutables ? false
-, enableStaticLibraries ? true
-, enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version
-, enableHyperlinkSource ? true
-, enableCpphs ? false
-, extension ? (self : super : {})
-}:
-
-let
-  enableFeature         = stdenv.lib.enableFeature;
-  versionOlder          = stdenv.lib.versionOlder;
-  optional              = stdenv.lib.optional;
-  optionals             = stdenv.lib.optionals;
-  optionalString        = stdenv.lib.optionalString;
-  filter                = stdenv.lib.filter;
-
-  defaultSetupHs        = builtins.toFile "Setup.hs" ''
-                            import Distribution.Simple
-                            main = defaultMain
-                          '';
-in
-
-# Cabal shipped with GHC 6.12.4 or earlier doesn't know the "--enable-tests configure" flag.
-assert enableCheckPhase -> versionOlder "7" ghc.version;
-
-# GHC prior to 7.4.x doesn't know the "--enable-executable-dynamic" flag.
-assert enableSharedExecutables -> versionOlder "7.4" ghc.version;
-
-# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
-assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
-
-# Pure shared library builds don't work before GHC 7.8.x.
-assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
-
-{
-  mkDerivation =
-    args : # arguments for the individual package, can modify the defaults
-    let # These attributes are removed in the end. This is in order not to spoil the build
-        # environment overly, but also to keep hash-backwards-compatible with the old cabal.nix.
-        internalAttrs = [
-          "internalAttrs" "buildDepends" "buildTools" "extraLibraries" "pkgconfigDepends"
-          "isLibrary" "isExecutable" "testDepends"
-        ];
-
-        # Stuff happening after the user preferences have been processed. We remove
-        # internal attributes and strip null elements from the dependency lists, all
-        # in the interest of keeping hashes stable.
-        postprocess =
-          x : (removeAttrs x internalAttrs) // {
-                buildInputs           = filter (y : ! (y == null)) x.buildInputs;
-                propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
-                propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
-                doCheck               = enableCheckPhase && x.doCheck;
-                useCpphs              = enableCpphs && x.useCpphs;
-                hyperlinkSource       = enableHyperlinkSource && x.hyperlinkSource;
-                # Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>.
-                meta                  = let meta = x.meta or {};
-                                            hydraPlatforms = meta.hydraPlatforms or meta.platforms or [];
-                                            noElem         = p: ps: !stdenv.lib.elem p ps;
-                                            noDarwin       = p: noElem p stdenv.lib.platforms.darwin;
-                                        in
-                                        meta // { hydraPlatforms = filter noDarwin hydraPlatforms; };
-              };
-
-        defaults =
-          self : { # self is the final version of the attribute set
-
-            # pname should be defined by the client to be the package basename
-            # version should be defined by the client to be the package version
-
-            # fname is the internal full name of the package
-            fname = "${self.pname}-${self.version}";
-
-            # name is the external full name of the package; usually we prefix
-            # all packages with haskell- to avoid name clashes for libraries;
-            # if that is not desired (for applications), name can be set to
-            # fname.
-            name = if self.isLibrary then
-                     if enableLibraryProfiling && self.enableSharedLibraries then
-                       "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-profiling-shared"
-                     else if enableLibraryProfiling && !self.enableSharedLibraries then
-                       "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-profiling"
-                     else if !enableLibraryProfiling && self.enableSharedLibraries then
-                       "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-shared"
-                     else
-                       "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}"
-                   else
-                     "${self.pname}-${self.version}";
-
-            # the default download location for Cabal packages is Hackage,
-            # you still have to specify the checksum
-            src = fetchurl {
-              url = "mirror://hackage/${self.pname}/${self.fname}.tar.gz";
-              inherit (self) sha256;
-            };
-
-            # default buildInputs are just ghc, if more buildInputs are required
-            # buildInputs can be extended by the client by using extraBuildInputs,
-            # but often propagatedBuildInputs is preferable anyway
-            buildInputs = [ghc Cabal] ++ self.extraBuildInputs;
-            extraBuildInputs = self.buildTools ++
-                               (optionals self.doCheck self.testDepends) ++
-                               (optional self.hyperlinkSource hscolour) ++
-                               (optional self.useCpphs cpphs) ++
-                               (if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++
-                               (if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends);
-
-            # we make sure that propagatedBuildInputs is defined, so that we don't
-            # have to check for its existence
-            propagatedBuildInputs = if self.isLibrary then self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends else [];
-
-            # By default, also propagate all dependencies to the user environment. This is required, otherwise packages would be broken, because
-            # GHC also needs all dependencies to be available.
-            propagatedUserEnvPkgs = if self.isLibrary then self.buildDepends else [];
-
-            # library directories that have to be added to the Cabal files
-            extraLibDirs = [];
-
-            # build-depends Cabal field
-            buildDepends = [];
-
-            # target(s) passed to the cabal build phase as an argument
-            buildTarget = "";
-
-            # build-depends Cabal fields stated in test-suite stanzas
-            testDepends = [];
-
-            # target(s) passed to the cabal test phase as an argument
-            testTarget = "";
-
-            # build-tools Cabal field
-            buildTools = [];
-
-            # extra-libraries Cabal field
-            extraLibraries = [];
-
-            # pkgconfig-depends Cabal field
-            pkgconfigDepends = [];
-
-            isLibrary = ! self.isExecutable;
-            isExecutable = false;
-
-            # ignore version restrictions on the build inputs that the cabal file might specify
-            jailbreak = false;
-
-            # pass the '--enable-split-objs' flag to cabal in the configure stage
-            enableSplitObjs = !stdenv.isDarwin;         # http://hackage.haskell.org/trac/ghc/ticket/4013
-
-            # pass the '--enable-tests' flag to cabal in the configure stage
-            # and run any regression test suites the package might have
-            doCheck = enableCheckPhase;
-
-            # force cpphs instead of the C compiler's preprocessor; sometimes
-            # needed due to clang's wacky behavior
-            useCpphs = false;
-
-            # pass the '--hyperlink-source' flag to ./Setup haddock
-            hyperlinkSource = enableHyperlinkSource;
-
-            # abort the build if the configure phase detects that the package
-            # depends on multiple versions of the same build input
-            strictConfigurePhase = true;
-
-            # pass the '--enable-library-vanilla' flag to cabal in the
-            # configure stage to enable building shared libraries
-            inherit enableStaticLibraries;
-
-            # pass the '--enable-shared' flag to cabal in the configure
-            # stage to enable building shared libraries
-            inherit enableSharedLibraries;
-
-            # pass the '--enable-executable-dynamic' flag to cabal in
-            # the configure stage to enable linking shared libraries
-            inherit enableSharedExecutables;
-
-            extraConfigureFlags = [
-              (enableFeature self.enableSplitObjs "split-objs")
-              (enableFeature enableLibraryProfiling "library-profiling")
-              (enableFeature self.enableSharedLibraries "shared")
-              (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla"))
-              (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
-              (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
-            ];
-
-            # GHC needs the locale configured during the Haddock phase.
-            LANG = "en_US.UTF-8";
-            LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
-
-            # compiles Setup and configures
-            configurePhase = ''
-              eval "$preConfigure"
-
-              ${let newCabalFile = fetchurl {
-                      url = "http://hackage.haskell.org/package/${self.fname}/${self.pname}.cabal";
-                      sha256 = self.editedCabalFile;
-                    };
-                in
-                  optionalString (self.editedCabalFile or "" != "") ''
-                    echo "Replace Cabal file with edited version ${newCabalFile}."
-                    cp ${newCabalFile} ${self.pname}.cabal
-                  ''
-              }${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
-
-              for i in Setup.hs Setup.lhs ${defaultSetupHs}; do
-                test -f $i && break
-              done
-              ghc --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
-
-              for p in $extraBuildInputs $propagatedNativeBuildInputs; do
-                if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then
-                  # Haskell packages don't need any extra configuration.
-                  continue;
-                fi
-                if [ -d "$p/include" ]; then
-                  extraConfigureFlags+=" --extra-include-dirs=$p/include"
-                fi
-                for d in lib{,64}; do
-                  if [ -d "$p/$d" ]; then
-                    extraConfigureFlags+=" --extra-lib-dirs=$p/$d"
-                  fi
-                done
-              done
-
-              configureFlags+=" --with-gcc=$CC"
-
-              ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) ''
-                configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}"
-              ''}
-              ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
-                configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"
-              ''}
-              ${optionalString (versionOlder "7.8" ghc.version && !self.isLibrary) ''
-                configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES"
-              ''}
-              ${optionalString self.useCpphs ''
-                configureFlags+=" --ghc-option=-pgmPcpphs --ghc-option=-optP--cpp"
-              ''}
-
-              ${optionalString self.stdenv.isDarwin ''
-                configureFlags+=" --with-gcc=clang"
-              ''}
-
-              echo "configure flags: $extraConfigureFlags $configureFlags"
-              ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \
-                --libsubdir='$pkgid' $extraConfigureFlags $configureFlags 2>&1 \
-              ${optionalString self.strictConfigurePhase ''
-                | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
-                if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
-                  echo >&2 "*** abort because of serious configure-time warning from Cabal"
-                  exit 1
-                fi
-              ''}
-
-              eval "$postConfigure"
-            '';
-
-            # builds via Cabal
-            buildPhase = ''
-              eval "$preBuild"
-
-              ./Setup build ${self.buildTarget}
-
-              export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
-              test -n "$noHaddock" || ./Setup haddock --html --hoogle \
-                  ${optionalString (stdenv.lib.versionOlder "6.12" ghc.version) "--ghc-options=-optP-P"} \
-                  ${optionalString self.hyperlinkSource "--hyperlink-source"} \
-                  ${optionalString self.useCpphs ''
-                    --haddock-options="--optghc=-pgmPcpphs --optghc=-optP--cpp"
-                  ''}
-
-              eval "$postBuild"
-            '';
-
-            checkPhase = optional self.doCheck ''
-              eval "$preCheck"
-
-              ./Setup test ${self.testTarget}
-
-              eval "$postCheck"
-            '';
-
-            # installs via Cabal; creates a registration file for nix-support
-            # so that the package can be used in other Haskell-builds; also
-            # adds all propagated build inputs to the user environment packages
-            installPhase = ''
-              eval "$preInstall"
-
-              ./Setup copy
-
-              mkdir -p $out/bin # necessary to get it added to PATH
-
-              local confDir=$out/lib/ghc-${ghc.ghc.version}/package.conf.d
-              local installedPkgConf=$confDir/${self.fname}.installedconf
-              local pkgConf=$confDir/${self.fname}.conf
-              mkdir -p $confDir
-              ./Setup register --gen-pkg-config=$pkgConf
-              if test -f $pkgConf; then
-                echo '[]' > $installedPkgConf
-                GHC_PACKAGE_PATH=$installedPkgConf ghc-pkg --global register $pkgConf --force
-              fi
-
-              if test -f $out/nix-support/propagated-native-build-inputs; then
-                ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
-              fi
-
-              ${optionalString (self.enableSharedExecutables && self.isExecutable && self.stdenv.isDarwin) ''
-                for exe in "$out/bin/"* ; do
-                  install_name_tool -add_rpath \
-                    $out/lib/${ghc.ghc.name}/${self.pname}-${self.version} $exe
-                done
-              ''}
-
-              eval "$postInstall"
-            '';
-
-            # We inherit stdenv and ghc so that they can be used
-            # in Cabal derivations.
-            inherit stdenv ghc;
-          };
-    in
-    stdenv.mkDerivation (postprocess (let super = defaults self // args self;
-                                          self  = super // extension self super;
-                                      in self));
-}
diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix
deleted file mode 100644
index 573f7c6b8904..000000000000
--- a/pkgs/development/compilers/agda/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, binary, boxes, cpphs, dataHash, deepseq, emacs
-, equivalence, filepath, geniplate, happy, hashable, hashtables
-, haskeline, haskellSrcExts, mtl, parallel, QuickCheck
-, STMonadTrans, strict, text, time, transformers
-, unorderedContainers, xhtml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Agda";
-  version = "2.4.2.2";
-  sha256 = "1hxvapnvlkx6imifswc70ng869zll0zfsygivhc2mjyhaiv10i13";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary boxes dataHash deepseq equivalence filepath geniplate
-    hashable hashtables haskeline haskellSrcExts mtl parallel
-    QuickCheck STMonadTrans strict text time transformers
-    unorderedContainers xhtml zlib
-  ];
-  buildTools = [ alex cpphs emacs happy ];
-  noHaddock = true;
-  jailbreak = true;
-  postInstall = ''
-    $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
-    $out/bin/agda-mode compile
-  '';
-  meta = {
-    homepage = "http://wiki.portal.chalmers.se/agda/";
-    description = "A dependently typed functional programming language and proof assistant";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/compilers/clash-ghc/default.nix b/pkgs/development/compilers/clash-ghc/default.nix
deleted file mode 100644
index a7e87b78dc74..000000000000
--- a/pkgs/development/compilers/clash-ghc/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, clashLib, clashPrelude, filepath, ghcPaths
-, hashable, haskeline, lens, makeWrapper, mtl, text, transformers, unbound
-, unorderedContainers, thLift
-}:
-
-cabal.mkDerivation (self: {
-  pname = "clash-ghc";
-  version = "0.4";
-  sha256 = "0pyv8snrmy7x9gv6xna5rd5chacrdvczcjs7854b80pifhag5c2g";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    bifunctors clashLib clashPrelude filepath ghcPaths hashable
-    haskeline lens mtl text transformers unbound unorderedContainers
-    thLift
-  ];
-  buildTools = [ makeWrapper ];
-  postInstall = ''
-    echo ${clashPrelude}
-    wrapProgram $out/bin/clash \
-      --add-flags "-package-db ${clashPrelude}/lib/ghc-${self.ghc.version}/package.conf.d/${clashPrelude.fname}.installedconf" \
-      --add-flags "-package-db ${thLift}/lib/ghc-${self.ghc.version}/package.conf.d/${thLift.fname}.installedconf" \
-      --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-package-db\")"
-  '';
-  meta = {
-    homepage = "http://christiaanb.github.io/clash2";
-    description = "CAES Language for Synchronous Hardware";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/elm/elm-compiler.nix b/pkgs/development/compilers/elm/elm-compiler.nix
deleted file mode 100644
index 9cf8eda2d9a3..000000000000
--- a/pkgs/development/compilers/elm/elm-compiler.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
-, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript
-, languageGlsl, mtl, parsec, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers
-, unionFind, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "elm-compiler";
-  version = "0.14.1";
-  sha256 = "0my04mipgia5qw02nzzrzc4kq3vl7bv75rzrsmd2bdb2wll1k94f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath
-    indents languageEcmascript languageGlsl mtl parsec text
-    transformers unionFind unorderedContainers
-  ];
-  testDepends = [
-    aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip
-    filepath HUnit indents languageEcmascript languageGlsl mtl parsec
-    QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text transformers unionFind
-    unorderedContainers
-  ];
-  meta = {
-    homepage = "http://elm-lang.org";
-    description = "Values to help with elm-package, elm-make, and elm-lang.org";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/elm/elm-get.nix b/pkgs/development/compilers/elm/elm-get.nix
deleted file mode 100644
index d01a3226d29b..000000000000
--- a/pkgs/development/compilers/elm/elm-get.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, ansiWlPprint, binary, Elm, filepath
-, HTTP, httpClient, httpClientTls, httpTypes, mtl, network
-, optparseApplicative, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "elm-get";
-  version = "0.1.3";
-  sha256 = "1did7vjd1h2kh5alndd2b63zi8b1m9hf6k1k75yxwvw6f6mz5i4q";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson aesonPretty ansiWlPprint binary Elm filepath HTTP httpClient
-    httpClientTls httpTypes mtl network optparseApplicative vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/elm-lang/elm-get";
-    description = "Tool for sharing and using Elm libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/elm/elm-make.nix b/pkgs/development/compilers/elm/elm-make.nix
deleted file mode 100644
index f9693ab2d94d..000000000000
--- a/pkgs/development/compilers/elm/elm-make.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiWlPprint, binary, blazeHtml, blazeMarkup, elmCompiler
-, elmPackage, filepath, mtl, optparseApplicative, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "elm-make";
-  version = "0.1.1";
-  sha256 = "02mqr6v146piwrhycnmlxnky5bmsl7ap7781qmcwkfmc89wfa4zl";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    ansiWlPprint binary blazeHtml blazeMarkup elmCompiler elmPackage
-    filepath mtl optparseApplicative text
-  ];
-  meta = {
-    homepage = "http://elm-lang.org";
-    description = "A build tool for Elm projects";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/elm/elm-package.nix b/pkgs/development/compilers/elm/elm-package.nix
deleted file mode 100644
index 4bcc4339b68f..000000000000
--- a/pkgs/development/compilers/elm/elm-package.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, ansiWlPprint, binary, elmCompiler
-, filepath, HTTP, httpClient, httpClientTls, httpTypes, mtl
-, network, optparseApplicative, text, time, unorderedContainers
-, vector, zipArchive
-}:
-
-cabal.mkDerivation (self: {
-  pname = "elm-package";
-  version = "0.4";
-  sha256 = "0vsq87imyvs1sa2n4z41b6qswy2cknxsg4prhwc9r7lvyljkmn03";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson aesonPretty ansiWlPprint binary elmCompiler filepath HTTP
-    httpClient httpClientTls httpTypes mtl network optparseApplicative
-    text time unorderedContainers vector zipArchive
-  ];
-  meta = {
-    homepage = "http://github.com/elm-lang/elm-package";
-    description = "Package manager for Elm libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json b/pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json
deleted file mode 100644
index e9e2a77bc8b1..000000000000
--- a/pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "evancz/virtual-dom": "1.1.0",
-    "evancz/elm-markdown": "1.1.2",
-    "evancz/elm-html": "1.1.0",
-    "elm-lang/core": "1.1.0"
-}
\ No newline at end of file
diff --git a/pkgs/development/compilers/elm/elm-reactor.nix b/pkgs/development/compilers/elm/elm-reactor.nix
deleted file mode 100644
index 00efef6c1fe6..000000000000
--- a/pkgs/development/compilers/elm/elm-reactor.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ unzip, fetchurl, fetchFromGitHub, cabal, blazeHtml, blazeMarkup, cmdargs, elmCompiler, elmMake, filepath
-, fsnotify, HTTP, mtl, snapCore, snapServer, systemFilepath, text
-, time, transformers, unorderedContainers, websockets
-, websocketsSnap
-}:
-
-cabal.mkDerivation (self: rec {
-  pname = "elm-reactor";
-  version = "0.3";
-  isLibrary = false;
-  isExecutable = true;
-  buildTools = [ unzip ];
-
-  src = fetchFromGitHub {
-    owner = "elm-lang";
-	repo = "elm-reactor";
-	rev = "176ff8e05e4bb7474752da1b3455c83d6181d594";
-	sha256 = "1marjqlmmq3a74g9f3ngk90h9mkhillcdwfsys6x0nqj6qirw4ph";
-  };
-  elmLangCore = fetchurl {
-    url = "https://github.com/elm-lang/core/archive/1.1.0.zip";
-    sha256 = "1fhvghjsay1p82k13039wbd02k439yplv2rh9zr77zvcbih6a31j";
-  };
-  elmHtml = fetchurl {
-	url = "https://github.com/evancz/elm-html/archive/1.1.0.zip";
-    sha256 = "01wshabxsdrxcxs2nn3dhk7n8720sp3prpkahhx36vvprdh05l4q";
-  };
-  elmMarkdown = fetchurl {
-	url = "https://github.com/evancz/elm-markdown/archive/1.1.2.zip";
-	sha256 = "14y1wp28za50zypdzyvl5d57hkm0v3rgnzm5klv3jcbd625kr9bg";
-  };
-  virtualDom = fetchurl {
-	url = "https://github.com/evancz/virtual-dom/archive/1.1.0.zip";
-	sha256 = "08dr7q0x1ycgj5b15s2kn1a45iw350gzq65c3lxp47xfffq1vz91";
-  };
-  elmStuff = ./elm-reactor-exact-dependencies.json;
-
-  preConfigure = ''
-	unzip -d $TEMPDIR -q ${elmLangCore}
-	mkdir -p elm-stuff/packages/elm-lang/core/1.1.0
-	cp -pr $TEMPDIR/core-1.1.0/* elm-stuff/packages/elm-lang/core/1.1.0/
-
-	unzip -d $TEMPDIR -q ${elmHtml}
-	mkdir -p elm-stuff/packages/evancz/elm-html/1.1.0
-	cp -pr $TEMPDIR/elm-html-1.1.0/* elm-stuff/packages/evancz/elm-html/1.1.0
-
-	unzip -d $TEMPDIR -q ${elmMarkdown}
-	mkdir -p elm-stuff/packages/evancz/elm-markdown/1.1.2
-	cp -pr $TEMPDIR/elm-markdown-1.1.2/* elm-stuff/packages/evancz/elm-markdown/1.1.2
-
-	unzip -d $TEMPDIR -q ${virtualDom}
-	mkdir -p elm-stuff/packages/evancz/virtual-dom/1.1.0
-	cp -pr $TEMPDIR/virtual-dom-1.1.0/* elm-stuff/packages/evancz/virtual-dom/1.1.0
-
-    cp ${elmStuff} elm-stuff/exact-dependencies.json
-  '';
-  buildDepends = [
-    blazeHtml blazeMarkup cmdargs elmCompiler filepath fsnotify HTTP
-    mtl snapCore snapServer systemFilepath text time transformers
-    unorderedContainers websockets websocketsSnap elmMake
-  ];
-  meta = {
-    homepage = "http://elm-lang.org";
-    description = "Interactive development tool for Elm programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/elm/elm-repl.nix b/pkgs/development/compilers/elm/elm-repl.nix
deleted file mode 100644
index ffeea93f9fb4..000000000000
--- a/pkgs/development/compilers/elm/elm-repl.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bytestringTrie, cmdargs, Elm, filepath, haskeline, HUnit
-, mtl, parsec, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "elm-repl";
-  version = "0.3";
-  sha256 = "10a4a2ybg5dlshpklnisb957lknb0w8s3ppaq5p5y6ylqik8ak0a";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    bytestringTrie cmdargs Elm filepath haskeline mtl parsec
-  ];
-  testDepends = [
-    bytestringTrie cmdargs Elm filepath haskeline HUnit mtl parsec
-    QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/elm-lang/elm-repl";
-    description = "a REPL for Elm";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
deleted file mode 100644
index 264c75ee7af9..000000000000
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "elm-server";
-  version = "0.11.0.1";
-  sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs Elm filepath mtl snapCore snapServer unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://elm-lang.org";
-    description = "Server for developing Elm projects";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
deleted file mode 100644
index 38e1d7de2c6d..000000000000
--- a/pkgs/development/compilers/elm/elm.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
-, cheapskate, cmdargs, filemanip, filepath, highlightingKate, HUnit
-, indents, languageEcmascript, languageGlsl, mtl, parsec
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, transformers, unionFind
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Elm";
-  version = "0.13";
-  sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson aesonPretty binary blazeHtml blazeMarkup cheapskate cmdargs
-    filepath highlightingKate indents languageEcmascript languageGlsl
-    mtl parsec text transformers unionFind unorderedContainers
-  ];
-  testDepends = [
-    aeson aesonPretty binary blazeHtml blazeMarkup cheapskate cmdargs
-    filemanip filepath highlightingKate HUnit indents
-    languageEcmascript languageGlsl mtl parsec QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text transformers
-    unionFind unorderedContainers
-  ];
-  doCheck = false;
-  preConfigure = ''
-    rm -f Setup.hs
-    echo -e "import Distribution.Simple\nmain=defaultMain\n" > Setup.hs
-  '';
-  meta = {
-    homepage = "http://elm-lang.org";
-    description = "The Elm language module";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix
deleted file mode 100644
index ae4d73d6e209..000000000000
--- a/pkgs/development/compilers/epic/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, boehmgc, Cabal, gmp, happy, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "epic";
-  version = "0.9.3.2";
-  sha256 = "1l73absns4ci20brkdjg1r1l9p4xxx88vax736diqik7rl7zrx9h";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ Cabal mtl ];
-  buildTools = [ happy ];
-  extraLibraries = [ boehmgc gmp ];
-  meta = {
-    homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
-    description = "Compiler for a simple functional language";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
deleted file mode 100644
index 16bf3bdeb954..000000000000
--- a/pkgs/development/compilers/idris/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint
-, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc
-, cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline
-, lens, libffi, mtl, network, optparseApplicative, parsers, split
-, text, time, transformers, trifecta, unorderedContainers
-, utf8String, vector, vectorBinaryInstances, xml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "idris";
-  version = "0.9.15.1";
-  sha256 = "0r31jcqs9kgknm66v7bbcgj9md7z49sgvn0nhk1dwg8jj2rmfll8";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary
-    blazeHtml blazeMarkup cheapskate deepseq filepath fingertree
-    haskeline lens libffi mtl network optparseApplicative parsers split
-    text time transformers trifecta unorderedContainers utf8String
-    vector vectorBinaryInstances xml zlib
-  ];
-  buildTools = [ happy ];
-  extraLibraries = [ boehmgc gmp ];
-  configureFlags = "-fgmp -fffi";
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.idris-lang.org/";
-    description = "Functional Programming Language with Dependent Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/compilers/idris/wrapper.nix b/pkgs/development/compilers/idris/wrapper.nix
deleted file mode 100644
index 857a31f6d4ab..000000000000
--- a/pkgs/development/compilers/idris/wrapper.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, gmp, makeWrapper, runCommand, idris_plain, boehmgc}:
-
-runCommand "idris-wrapper" {} ''
-  source ${makeWrapper}/nix-support/setup-hook
-  mkdir -p $out/bin
-  ln -s ${idris_plain}/bin/idris $out/bin
-      wrapProgram $out/bin/idris \
-        --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \
-        --suffix PATH : ${stdenv.cc}/bin \
-        --suffix PATH : ${idris_plain}/bin
-''
diff --git a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch
deleted file mode 100644
index ce0b42c9e344..000000000000
--- a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur pakcs-1.11.4-upstream/Makefile pakcs-1.11.4/Makefile
---- pakcs-1.11.4-upstream/Makefile	2014-10-24 05:12:37.000000000 -0430
-+++ pakcs-1.11.4/Makefile	2015-01-05 16:26:39.256709080 -0430
-@@ -94,7 +94,6 @@
- install: cleanoldinfos installscripts copylibs
- 	@echo "PAKCS installation configuration (file pakcsinitrc):"
- 	@cat pakcsinitrc
--	$(MAKE) frontend
- 	# pre-compile all libraries:
- 	@cd lib && $(MAKE) fcy
- 	# install the Curry2Prolog compiler as a saved system:
-@@ -145,10 +144,6 @@
- # compile the tools:
- .PHONY: tools
- tools:
--	# compile the Curry Port Name Server demon:
--	@if [ -r bin/pakcs ] ; then cd cpns       && $(MAKE) ; fi
--	# compile the event handler demon for dynamic web pages:
--	@if [ -r bin/pakcs ] ; then cd www        && $(MAKE) ; fi
- 	@if [ -r bin/pakcs ] ; then cd currytools && $(MAKE) ; fi
- 	@if [ -r bin/pakcs ] ; then cd tools      && $(MAKE) ; fi
- 
-diff -Naur pakcs-1.11.4-upstream/scripts/pakcs.sh pakcs-1.11.4/scripts/pakcs.sh
---- pakcs-1.11.4-upstream/scripts/pakcs.sh	2014-10-24 05:06:07.000000000 -0430
-+++ pakcs-1.11.4/scripts/pakcs.sh	2015-01-05 16:26:15.697982791 -0430
-@@ -16,7 +16,7 @@
- # use readline wrapper rlwrap if it is installed and we have tty as stdin:
- USERLWRAP=no
- if tty -s ; then
--  RLWRAP=`which rlwrap`
-+  RLWRAP=`type -P rlwrap`
-   if [ -x "$RLWRAP" ] ; then
-     USERLWRAP=yes
-   fi
-@@ -29,7 +29,7 @@
- done
- 
- if [ $USERLWRAP = yes ] ; then
--  exec rlwrap -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"}
-+  exec rlwrap -a -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"}
- else
-   exec "$REPL" ${1+"$@"}
- fi
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
deleted file mode 100644
index 739804646c2a..000000000000
--- a/pkgs/development/compilers/pakcs/default.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ stdenv, fetchurl, cabal, swiProlog, either, mtl, syb
-, glibcLocales, makeWrapper, rlwrap, tk, which }:
-
-let
-  fname = "pakcs-1.11.4";
-
-  fsrc = fetchurl {
-    url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
-    sha256 = "1xsn8h58pi1jp8wr4abyrqdps840j8limyv5i812z49npf91fy5c";
-  };
-
-in
-stdenv.mkDerivation rec {
-
-  name = fname;
-
-  curryBase = cabal.mkDerivation(self: {
-    pname = "curryBase";
-    version = "local";
-    src = fsrc;
-    sourceRoot = "${name}/frontend/curry-base";
-    isLibrary = true;
-    buildDepends = [ mtl syb ];
-  });
-
-  curryFront = cabal.mkDerivation(self: {
-    pname = "curryFront";
-    version = "local";
-    src = fsrc;
-    sourceRoot = "${name}/frontend/curry-frontend";
-    isLibrary = true;
-    isExecutable = true;
-    buildDepends = [ either mtl syb curryBase ];
-  });
-
-  src = fsrc;
-
-  buildInputs = [ swiProlog makeWrapper glibcLocales rlwrap tk which ];
-
-  patches = [ ./adjust-buildsystem.patch ];
-
-  configurePhase = ''
-    # Phony HOME.
-    mkdir phony-home
-    export HOME=$(pwd)/phony-home
-
-    # SWI Prolog
-    sed -i 's@SWIPROLOG=@SWIPROLOG='${swiProlog}/bin/swipl'@' pakcsinitrc
-  '';
-
-  buildPhase = ''
-    # Some comments in files are in UTF-8, so include the locale needed by GHC runtime.
-    export LC_ALL=en_US.UTF-8
-
-    # PAKCS must be build in place due to embedded filesystem references placed by swi.
-
-    # Prepare PAKCSHOME directory.
-    mkdir -p $out/pakcs/bin
-
-    # Set up link to cymake, which has been built already.
-    ln -s ${curryFront}/bin/cymake $out/pakcs/bin/
-
-    # Prevent embedding the derivation build directory as temp.
-    export TEMP=/tmp
-
-    # Copy to in place build location and run the build.
-    cp -r * $out/pakcs
-    (cd $out/pakcs ; make)
-  '';
-
-  installPhase = ''
-    # Install bin.
-    mkdir -p $out/bin
-    for b in $(ls $out/pakcs/bin) ; do
-      ln -s $out/pakcs/bin/$b $out/bin/ ;
-    done
-
-    # Place emacs lisp files in expected locations.
-    mkdir -p $out/share/emacs/site-lisp/curry-pakcs
-    for e in "$out/tools/emacs/"*.el ; do
-      cp $e $out/share/emacs/site-lisp/curry-pakcs/ ;
-    done
-
-    # Wrap for rlwrap and tk support.
-    wrapProgram $out/pakcs/bin/pakcs \
-      --prefix PATH ":" "${rlwrap}/bin" \
-      --prefix PATH ":" "${tk}/bin" \
-  '';
-
-  meta = {
-    homepage = "http://www.informatik.uni-kiel.de/~pakcs/";
-    description = "An implementation of the multi-paradigm declarative language Curry";
-    license = stdenv.lib.licenses.bsd3;
-
-    longDescription = ''
-      PAKCS is an implementation of the multi-paradigm declarative language
-      Curry jointly developed by the Portland State University, the Aachen
-      University of Technology, and the University of Kiel. Although this is
-      not a highly optimized implementation but based on a high-level
-      compilation of Curry programs into Prolog programs, it is not a toy
-      implementation but has been used for a variety of applications (e.g.,
-      graphical programming environments, an object-oriented front-end for
-      Curry, partial evaluators, database applications, HTML programming
-      with dynamic web pages, prototyping embedded systems).
-    '';
-
-    maintainers = [ stdenv.lib.maintainers.kkallio ];
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = stdenv.lib.platforms.none;
-  };
-}
diff --git a/pkgs/development/tools/documentation/haddock/default.nix b/pkgs/development/tools/documentation/haddock/default.nix
deleted file mode 100644
index e809312d5763..000000000000
--- a/pkgs/development/tools/documentation/haddock/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, haddockApi }:
-
-cabal.mkDerivation (self: {
-  pname = "haddock";
-  version = "2.15.0.1";
-  sha256 = "0pvhhqackfikmp5zg6v6lysvr69f3f9f78xcjs4sd68f0rby7fdp";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ haddockApi ];
-  testDepends = [ Cabal filepath ];
-  preCheck = "unset GHC_PACKAGE_PATH";
-  meta = {
-    homepage = "http://www.haskell.org/haddock/";
-    description = "A documentation-generation tool for Haskell libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix
deleted file mode 100644
index 519ca892f3c1..000000000000
--- a/pkgs/development/tools/misc/ShellCheck/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, json, mtl, parsec, QuickCheck, regexCompat, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ShellCheck";
-  version = "0.3.5";
-  sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    json mtl parsec QuickCheck regexCompat transformers
-  ];
-  testDepends = [
-    json mtl parsec QuickCheck regexCompat transformers
-  ];
-  meta = {
-    homepage = "http://www.shellcheck.net/";
-    description = "Shell script analysis tool";
-    license = self.stdenv.lib.licenses.agpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
deleted file mode 100644
index 8167ae924165..000000000000
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, polyparse }:
-
-cabal.mkDerivation (self: {
-  pname = "cpphs";
-  version = "1.18.6";
-  sha256 = "0ds712zabigswf3cljzh7f2ys4rl1fj2cf76lbw856adm8514gxc";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ polyparse ];
-  meta = {
-    homepage = "http://projects.haskell.org/cpphs/";
-    description = "A liberalised re-implementation of cpp, the C pre-processor";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
deleted file mode 100644
index 4b4eae915f5c..000000000000
--- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy }:
-
-cabal.mkDerivation (self: {
-  pname = "Ebnf2ps";
-  version = "1.0.12";
-  sha256 = "1rd0pxj2bfx06z1p0sy8kdhyfg1y51gn1bhr71j33czls6m9ry8c";
-  isLibrary = false;
-  isExecutable = true;
-  buildTools = [ happy ];
-  meta = {
-    homepage = "https://github.com/FranklinChen/Ebnf2ps";
-    description = "Peter's Syntax Diagram Drawing Tool";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix
deleted file mode 100644
index d8e7e759e76b..000000000000
--- a/pkgs/development/tools/parsing/alex/2.3.5.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, perl }:
-
-cabal.mkDerivation (self: {
-  pname = "alex";
-  version = "2.3.5";
-  sha256 = "0lyjiq4lmii2syk6838ln32qvn8c0ljf1ypsggahy748k05x79if";
-  isLibrary = false;
-  isExecutable = true;
-  buildTools = [ perl ];
-  doCheck = false;
-  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
-  meta = {
-    homepage = "http://www.haskell.org/alex/";
-    description = "Alex is a tool for generating lexical analysers in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/tools/parsing/alex/3.1.3.nix b/pkgs/development/tools/parsing/alex/3.1.3.nix
deleted file mode 100644
index 172c90d96cc1..000000000000
--- a/pkgs/development/tools/parsing/alex/3.1.3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy, perl, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "alex";
-  version = "3.1.3";
-  sha256 = "14hajxpqb6va5mclp2k682bgw9sbmd372vw41kq5aq815bkschcd";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ QuickCheck ];
-  buildTools = [ happy perl ];
-  meta = {
-    homepage = "http://www.haskell.org/alex/";
-    description = "Alex is a tool for generating lexical analysers in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch b/pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
deleted file mode 100644
index 1e5942bfbefb..000000000000
--- a/pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ubr alex-2.3.5-orig/Setup.lhs alex-2.3.5/Setup.lhs
---- alex-2.3.5-orig/Setup.lhs	2013-04-19 12:00:15.812606335 +0000
-+++ alex-2.3.5/Setup.lhs	2013-04-19 12:05:41.635450321 +0000
-@@ -25,7 +25,7 @@
- -- hack to turn cpp-style '# 27 "GenericTemplate.hs"' into 
- -- '{-# LINE 27 "GenericTemplate.hs" #-}'.
- crazy_perl_regexp =
-- "s/^#\\s+(\\d+)\\s+(\"[^\"]*\")/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
-+ "s/^#\\s+(\\d+)\\s+(\"[^\"]*\").*/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
- 
- myPostBuild _ flags _ lbi = do
-   let runProgram p = rawSystemProgramConf (buildVerbose flags) p (withPrograms lbi)
diff --git a/pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch b/pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
deleted file mode 100644
index 8bc4db0f405e..000000000000
--- a/pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ubr happy-1.18.6-orig/Setup.lhs happy-1.18.6/Setup.lhs
---- happy-1.18.6-orig/Setup.lhs	2013-04-19 14:17:10.865999210 +0200
-+++ happy-1.18.6/Setup.lhs	2013-04-19 14:17:15.285214809 +0200
-@@ -25,7 +25,7 @@
- -- hack to turn cpp-style '# 27 "GenericTemplate.hs"' into 
- -- '{-# LINE 27 "GenericTemplate.hs" #-}'.
- crazy_perl_regexp =
-- "s/^#\\s+(\\d+)\\s+(\"[^\"]*\")/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
-+ "s/^#\\s+(\\d+)\\s+(\"[^\"]*\").*/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
- 
- myPostBuild _ flags _ lbi = do
-   let runProgram p = rawSystemProgramConf (buildVerbose flags) p (withPrograms lbi)
diff --git a/pkgs/development/tools/parsing/happy/default.nix b/pkgs/development/tools/parsing/happy/default.nix
deleted file mode 100644
index 979d4bc52e37..000000000000
--- a/pkgs/development/tools/parsing/happy/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, perl }:
-
-cabal.mkDerivation (self: {
-  pname = "happy";
-  version = "1.19.4";
-  sha256 = "0vcklr1y6yjf8z4wip4al2zw4qlfxcahbdxwpf6c9y31dkv9kr3b";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ mtl ];
-  buildTools = [ perl ];
-  meta = {
-    homepage = "http://www.haskell.org/happy/";
-    description = "Happy is a parser generator for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/games/Allure/default.nix b/pkgs/games/Allure/default.nix
deleted file mode 100644
index 63d6a0a2fb27..000000000000
--- a/pkgs/games/Allure/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enummapsetTh, filepath, LambdaHack, text }:
-
-cabal.mkDerivation (self: {
-  pname = "Allure";
-  version = "0.4.100.0";
-  sha256 = "15rkj5xab23wqr2d44xbri7hggbb3zmmka41xfiscqq4ifagfj4m";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ enummapsetTh filepath LambdaHack text ];
-  testDepends = [ enummapsetTh filepath LambdaHack text ];
-  meta = {
-    homepage = "http://allureofthestars.com";
-    description = "Near-future Sci-Fi roguelike and tactical squad game";
-    license = "AGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
deleted file mode 100644
index 2130c423cfeb..000000000000
--- a/pkgs/games/LambdaHack/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, assertFailure, async, binary, dataDefault, deepseq
-, enummapsetTh, filepath, gtk, hashable, hsini, keys, miniutter
-, mtl, prettyShow, random, stm, text, transformers
-, unorderedContainers, vector, vectorBinaryInstances, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "LambdaHack";
-  version = "0.4.100.0";
-  sha256 = "15v3aagwsh180603an3wd7rfgbjzgamdw270ciw2m03v8pkg9d28";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    assertFailure async binary dataDefault deepseq enummapsetTh
-    filepath gtk hashable hsini keys miniutter mtl prettyShow random
-    stm text transformers unorderedContainers vector
-    vectorBinaryInstances zlib
-  ];
-  testDepends = [
-    assertFailure async binary dataDefault deepseq enummapsetTh
-    filepath hashable hsini keys miniutter mtl prettyShow random stm
-    text transformers unorderedContainers vector vectorBinaryInstances
-    zlib
-  ];
-  pkgconfigDepends = [ gtk ];
-  meta = {
-    homepage = "http://github.com/LambdaHack/LambdaHack";
-    description = "A game engine library for roguelike dungeon crawlers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix
deleted file mode 100644
index c52cc5ed879c..000000000000
--- a/pkgs/games/uqm/3dovideo.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, requireFile, writeText, fetchurl, haskellPackages }:
-
-with stdenv.lib;
-
-let
-  makeSpin = num: let
-    padded = (optionalString (lessThan num 10) "0") + toString num;
-  in "slides.spins.${padded} = 3DOVID:" +
-     "addons/3dovideo/spins/ship${padded}.duk:" +
-     "addons/3dovideo/spins/spin.aif:" +
-     "addons/3dovideo/spins/ship${padded}.aif:89";
-
-  videoRMP = writeText "3dovideo.rmp" (''
-    slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk
-    slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk
-  '' + concatMapStrings makeSpin (range 0 24));
-
-  helper = with haskellPackages; cabal.mkDerivation (self: {
-    pname = "uqm3donix";
-    version = "0.1.0.0";
-
-    src = fetchurl {
-      url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz";
-      sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb";
-    };
-
-    isLibrary = false;
-    isExecutable = true;
-
-    buildDepends = [ binary filepath tar ];
-
-    meta = {
-      description = "Extract video files from a Star Control II 3DO image";
-      license = self.stdenv.lib.licenses.bsd3;
-      platforms = self.ghc.meta.platforms;
-    };
-  });
-
-in stdenv.mkDerivation {
-  name = "uqm-3dovideo";
-
-  src = requireFile rec {
-    name = "videos.tar";
-    sha256 = "044h0cl69r0kc43vk4n0akk0prwzb7inq324h5yfqb38sd4zkds1";
-    message = ''
-      In order to get the intro and ending sequences from the 3DO version, you
-      need to have the original 3DO Star Control II CD. Create an image from the
-      CD and use uqm3donix* to extract a tarball with the videos from it. The
-      reason for this is because the 3DO uses its own proprietary disk format.
-
-      Save the file as videos.tar and use "nix-prefetch-url file://${name}" to
-      add it to the Nix store.
-
-      [*] ${helper}/bin/uqm3donix CDIMAGE ${name}
-    '';
-  };
-
-  buildCommand = ''
-    mkdir -vp "$out"
-    tar xf "$src" -C "$out" --strip-components=3
-    cp "${videoRMP}" "$out/3dovideo.rmp"
-  '';
-}
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
deleted file mode 100644
index 9d233d383384..000000000000
--- a/pkgs/games/uqm/default.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ stdenv, fetchurl
-, pkgconfig, mesa
-, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip
-
-, use3DOVideos ? false, requireFile ? null, writeText ? null
-, haskellPackages ? null
-
-, useRemixPacks ? false
-}:
-
-assert use3DOVideos -> requireFile != null && writeText != null
-                    && haskellPackages != null;
-
-with stdenv.lib;
-
-let
-  videos = import ./3dovideo.nix {
-    inherit stdenv requireFile writeText fetchurl haskellPackages;
-  };
-
-  remixPacks = imap (num: sha256: fetchurl rec {
-    name = "uqm-remix-disc${toString num}.uqm";
-    url = "mirror://sourceforge/sc2/${name}";
-    inherit sha256;
-  }) [
-    "1s470i6hm53l214f2rkrbp111q4jyvnxbzdziqg32ffr8m3nk5xn"
-    "1pmsq65k8gk4jcbyk3qjgi9yqlm0dlaimc2r8hz2fc9f2124gfvz"
-    "07g966ylvw9k5q9jdzqdczp7c5qv4s91xjlg4z5z27fgcs7rzn76"
-    "1l46k9aqlcp7d3fjkjb3n05cjfkxx8rjlypgqy0jmdx529vikj54"
-  ];
-
-in stdenv.mkDerivation rec {
-  name = "uqm-${version}";
-  version = "0.7.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz";
-    sha256 = "08dj7fsvflxx69an6vpf3wx050mk0ycmdv401yffrrqbgxgmqsd3";
-  };
-
-  content = fetchurl {
-    url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm";
-    sha256 = "1gx39ns698hyczd4nx73mr0z86bbi4q3h8sw3pxjh1lzla5xpxmq";
-  };
-
-  voice = fetchurl {
-    url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm";
-    sha256 = "0yf9ff5sxk229202gsa7ski6wn7a8hkjjyr1yr7mjdxsnh0zik5w";
-  };
-
-  music = fetchurl {
-    url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm";
-    sha256 = "10nbvcrr0lc0mxivxfkcbxnibwk3vwmamabrlvwdsjxd9pk8aw65";
-  };
-
-
- /* uses pthread_cancel(), which requires libgcc_s.so.1 to be
-    loadable at run-time. Adding the flag below ensures that the
-    library can be found. Obviously, though, this is a hack. */
-  NIX_LDFLAGS="-lgcc_s";
-
-  buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip pkgconfig mesa];
-
-  postUnpack = ''
-    mkdir -p uqm-${version}/content/packages
-    mkdir -p uqm-${version}/content/addons
-    ln -s "$content" "uqm-${version}/content/packages/uqm-0.7.0-content.uqm"
-    ln -s "$music" "uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm"
-    ln -s "$voice" "uqm-${version}/content/addons/uqm-0.7.0-voice.uqm"
-  '' + optionalString useRemixPacks (concatMapStrings (disc: ''
-    ln -s "${disc}" "uqm-$version/content/addons/${disc.name}"
-  '') remixPacks) + optionalString use3DOVideos ''
-    ln -s "${videos}" "uqm-${version}/content/addons/3dovideo"
-  '';
-
-  /* uqm has a 'unique' build system with a root script incidentally called
- * 'build.sh'. */
-
-  configurePhase = ''
-    echo "INPUT_install_prefix_VALUE='$out'" >> config.state
-    echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state
-    echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state
-    echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state
-    PREFIX=$out ./build.sh uqm config
-  '';
-
-  buildPhase = ''
-    ./build.sh uqm
-  '';
-
-  installPhase = ''
-    ./build.sh uqm install
-    sed -i $out/bin/uqm -e "s%/usr/local/games/%$out%g"
-  '';
-
-  meta = {
-    description = "Remake of Star Control II";
-    longDescription = ''
-    The goals for the The Ur-Quan Masters project are:
-      - to bring Star Control II to modern platforms, thereby making a lot of people happy
-      - to make game translations easy, thereby making even more people happy
-      - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy!
-    '';
-    homepage = http://sc2.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with maintainers; [ jcumming aszlig ];
-  };
-}
diff --git a/pkgs/tools/misc/escoger/default.nix b/pkgs/tools/misc/escoger/default.nix
deleted file mode 100644
index 2fe67f1b97f4..000000000000
--- a/pkgs/tools/misc/escoger/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ cabal, dataDefault, fetchFromGitHub, HUnit, mtl, parallel
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, vector, vectorAlgorithms, vty
-}:
-
-let
-  rv = "b6b11c51846a9283ef4ee7c839b99ded9f6c3bc8";
-in
-cabal.mkDerivation (self: {
-  pname = "escoger";
-  version = "0.1.0.0-${rv}";
-  src = fetchFromGitHub {
-    owner = "tstat";
-    repo = "escoger";
-    rev = rv;
-    sha256 = "0n6mvg5cm50ym20bz74b7q1afkljp0fc9pxhqk0ai82a71xxbxy3";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    dataDefault mtl parallel vector vectorAlgorithms vty
-  ];
-  testDepends = [
-    dataDefault HUnit mtl parallel QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms
-    vty
-  ];
-  meta = {
-    description = "A multithreaded terminal fuzzy selector";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
deleted file mode 100644
index d4a709ab13ba..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.16.0.2";
-  sha256 = "162nbkkffpbalg368m5s49jrvg9nibdwlwj0j1b8wriyyg4srpv6";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network random time zlib
-  ];
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  patchPhase = ''
-    sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
deleted file mode 100644
index e391d80420dc..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck
-, random, stm, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.18.0.3";
-  sha256 = "0h01mz6p4fwl8h6k2ybrlp598f0j3n2zasrr63fy0vjbjibmgf41";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network random stm time zlib
-  ];
-  testDepends = [
-    Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 time zlib
-  ];
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  patchPhase = ''
-    sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.6.nix b/pkgs/tools/package-management/cabal-install/1.20.0.6.nix
deleted file mode 100644
index adb2f24f5b26..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.20.0.6.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, networkUri
-, QuickCheck, random, stm, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.20.0.6";
-  sha256 = "1hc187yzl59518cswk25xzsabn9dvm4wqpq817hmclrvkf4zr3pl";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network networkUri random stm time zlib
-  ];
-  testDepends = [
-    Cabal filepath HTTP HUnit mtl network networkUri QuickCheck stm
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 time zlib
-  ];
-  doCheck = false;
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/1.22.0.0.nix b/pkgs/tools/package-management/cabal-install/1.22.0.0.nix
deleted file mode 100644
index abf3809872b4..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.22.0.0.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, extensibleExceptions, filepath, HTTP, HUnit, mtl
-, network, networkUri, QuickCheck, random, regexPosix, stm
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
-, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.22.0.0";
-  sha256 = "17cf2bkrxawjldhkq4hzlzlf7b2xqgkrzl7fa31whnnpni68v6jz";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network networkUri random stm time zlib
-  ];
-  testDepends = [
-    Cabal extensibleExceptions filepath HTTP HUnit mtl network
-    networkUri QuickCheck regexPosix stm testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 time zlib
-  ];
-  doCheck = false;
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/tools/system/journal-mailer/default.nix b/pkgs/tools/system/journal-mailer/default.nix
deleted file mode 100644
index 5de15f8457ad..000000000000
--- a/pkgs/tools/system/journal-mailer/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseCompat, fetchgit, hspec, hspecExpectations
-, libsystemdJournal, mimeMail, mtl, pipes, pipesBytestring
-, pipesSafe, QuickCheck, silently, stringConversions, temporary
-, text, time, unorderedContainers, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "journal-mailer";
-  version = "0.1.1.0";
-  src = fetchgit {
-    url = "https://github.com/zalora/journal-mailer.git";
-    sha256 = "cd28b39746fd8a9652eb5d4dc5dcfd66704826d1ee466572fb47925b054cd07b";
-    rev = "ab1b4df09e7ddbe139959374437331cdddf754b2";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    baseCompat libsystemdJournal mimeMail pipes pipesBytestring
-    pipesSafe stringConversions text time unorderedContainers yaml
-  ];
-  testDepends = [
-    baseCompat hspec hspecExpectations libsystemdJournal mimeMail mtl
-    pipes pipesBytestring pipesSafe QuickCheck silently
-    stringConversions temporary text time unorderedContainers yaml
-  ];
-  meta = {
-    description = "Sends out emails for every severe message logged to systemd's journal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.tv ];
-  };
-})
diff --git a/pkgs/tools/system/sizes/default.nix b/pkgs/tools/system/sizes/default.nix
deleted file mode 100644
index a20a40f701c2..000000000000
--- a/pkgs/tools/system/sizes/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, deepseq, dlist, lens, parallelIo, regexPosix
-, systemFileio, systemFilepath, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sizes";
-  version = "2.3.2";
-  sha256 = "0xns0xl3khks1jvsmxh0nqf1saxs7qscvkbcg4270pp7n6lziqdg";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs deepseq dlist lens parallelIo regexPosix systemFileio
-    systemFilepath text
-  ];
-  meta = {
-    homepage = "https://github.com/jwiegley/sizes";
-    description = "Recursively show space (size and i-nodes) used in subdirectories";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
deleted file mode 100644
index 35e609b440ab..000000000000
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, regexCompat, texLive }:
-
-cabal.mkDerivation (self: {
-  pname = "lhs2tex";
-  version = "1.18.1";
-  sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath mtl regexCompat ];
-  extraLibraries = [ texLive ];
-  postInstall = ''
-    mkdir -p "$out/share/doc/$name"
-    cp doc/Guide2.pdf $out/share/doc/$name
-    mkdir -p "$out/nix-support"
-  '';
-  meta = {
-    homepage = "http://www.andres-loeh.de/lhs2tex/";
-    description = "Preprocessor for typesetting Haskell sources with LaTeX";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2752f14b862..648d78749f24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4866,7 +4866,7 @@ let
   jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
 
   jruby165 = callPackage ../development/interpreters/jruby { };
-  
+
   jython = callPackage ../development/interpreters/jython {};
 
   guileCairo = callPackage ../development/guile-modules/guile-cairo { };
@@ -13112,8 +13112,6 @@ let
 
   unvanquished = callPackage ../games/unvanquished { };
 
-  uqm = callPackage ../games/uqm { };
-
   urbanterror = callPackage ../games/urbanterror { };
 
   ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });

From b5c368cbe4174eb83c9243803a7433803ea0cfa8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 20:58:18 +0200
Subject: [PATCH 0436/1143] haskell-unix-time: fix build with ghc-7.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index a00b89e5b4ed..5d080b1b4eb8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -70,4 +70,7 @@ self: super: {
   # Needs hashable on pre 7.10.x compilers.
   nats = addBuildDepend super.nats self.hashable;
 
+  # Test suite won't compile.
+  unix-time = dontCheck super.unix-time;
+
 }

From ea9e11db9a51038630afc3d0954c9a88ab01b04c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 20:59:54 +0200
Subject: [PATCH 0437/1143] haskell-monad-par: fix build with ghc-7.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 5d080b1b4eb8..56f1edb66201 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -73,4 +73,7 @@ self: super: {
   # Test suite won't compile.
   unix-time = dontCheck super.unix-time;
 
+  # Avoid depending on tasty-golden.
+  monad-par = dontCheck super.monad-par;
+
 }

From 4cf188b376827fe0b752e0a6e64d63b5141d1327 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 21:13:42 +0200
Subject: [PATCH 0438/1143] We can't build cabal-install with ghc-6.12.x.

---
 .../haskell-modules/configuration-ghc-6.12.x.nix         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 9329a2c2318f..40661c69cbd3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -50,11 +50,18 @@ self: super: {
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
 
+  # Newer versions don't compile.
+  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+
+  # We have no working cabal-install at the moment.
+  cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8;
+  cabal-install = self.cabal-install_1_18_0_8;
+
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;

From 539e8eb7f121bed12d8b0e1f3138567481cf472d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 21:15:35 +0200
Subject: [PATCH 0439/1143] haskell-Yampa fails its test suite.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a44a2c09a24d..c1eb57849903 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -808,4 +808,7 @@ self: super: {
   temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
   temporal-music-notation-western = dontDistribute super.temporal-music-notation-western;
 
+  # https://github.com/ivanperez-keera/Yampa/issues/10
+  Yampa = dontCheck super.Yampa;
+
 }

From 857ddfc2f5a0b0ffd8a36b685aa0e1df68aa30c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 21:21:21 +0200
Subject: [PATCH 0440/1143] haskell-sdr fails its test suite.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c1eb57849903..9886a9e43b5d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -811,4 +811,7 @@ self: super: {
   # https://github.com/ivanperez-keera/Yampa/issues/10
   Yampa = dontCheck super.Yampa;
 
+  # https://github.com/adamwalker/sdr/issues/1
+  sdr = dontCheck super.sdr;
+
 }

From a2f6ca40e3b1fd4a71958f163fe000f792159d51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 21:24:27 +0200
Subject: [PATCH 0441/1143] haskell-timerep test suite crashes ghc-7.10.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 7618b7c4eb54..d81a5ef6a1b4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -331,4 +331,7 @@ self: super: {
   hipbot = dontDistribute super.hipbot;
   bitcoin-api = dontDistribute super.bitcoin-api;
 
+  # https://github.com/HugoDaniel/RFC3339/issues/14
+  timerep = dontCheck super.timerep;
+
 }

From ea3b8cd918315613a5f1d5ee6e9ba5248dbbc18b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 21:35:13 +0200
Subject: [PATCH 0442/1143] cabal2nix: update to version 20150505

---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 1f91f58ee1c5..d933b97d1c11 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -7,11 +7,11 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150423";
+  version = "20150505";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "8cfe61c222bd2750ef29f991a2a3ee353444e458";
-    sha256 = "07n5am1ca00291qaarvwgzbkhwqc4f4wwhffycwwxaq46by34l7b";
+    rev = "db53ac3a644eebda581c9f036ccd55a19ff3c629";
+    sha256 = "1bimja9qsq865dmpjpy5wxxz43rc8wk9yva58l7hydmm87a4ch8y";
     deepClone = true;
   };
   isExecutable = true;

From 06255562b6d6f21a88fc2cd8b141184d63320011 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 21:38:23 +0200
Subject: [PATCH 0443/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/a1949327793e54d00594ec4d5a19ca66e76043cd
 with hackage2nix revision db53ac3a644eebda581c9f036ccd55a19ff3c629

---
 .../haskell-modules/hackage-packages.nix      | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d88534cdaf4c..d621217a144b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -43500,7 +43500,7 @@ self: {
 
   "dynobud" = callPackage
     ({ mkDerivation, base, binary, bytestring, casadi-bindings
-     , casadi-bindings-core, Chart, Chart-gtk, cmdargs, colour
+     , casadi-bindings-core, cereal, Chart, Chart-gtk, cmdargs, colour
      , containers, data-default-class, distributive, generic-accessors
      , hmatrix, hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl
      , not-gloss, Plot-ho-matic, process, QuickCheck, reflection
@@ -43511,19 +43511,20 @@ self: {
      }:
      mkDerivation {
        pname = "dynobud";
-       version = "1.3.0.0";
-       sha256 = "1zxwx777n08flmwcd7c9w8rkkcpvkzagwhy0axaxl9n0anyf8q1i";
+       version = "1.4.0.0";
+       sha256 = "1dmgi69gsh7rm385pykajlq73m3cfaw617gkj2nv0h4x11mdp0ms";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base binary bytestring casadi-bindings casadi-bindings-core Chart
-         Chart-gtk cmdargs colour containers data-default-class distributive
-         generic-accessors hmatrix jacobi-roots lens linear mtl not-gloss
-         Plot-ho-matic process reflection semigroups spatial-math stm
-         unordered-containers vector vector-binary-instances zeromq4-haskell
+         base binary bytestring casadi-bindings casadi-bindings-core cereal
+         Chart Chart-gtk cmdargs colour containers data-default-class
+         distributive generic-accessors hmatrix jacobi-roots lens linear mtl
+         not-gloss Plot-ho-matic process reflection semigroups spatial-math
+         stm unordered-containers vector vector-binary-instances
+         zeromq4-haskell
        ];
        testDepends = [
-         base binary casadi-bindings hmatrix hmatrix-gsl HUnit linear
+         base binary casadi-bindings cereal hmatrix hmatrix-gsl HUnit linear
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
@@ -58966,8 +58967,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskanoid";
-       version = "0.1.3";
-       sha256 = "11hwnjw01bra1xcp71kn2sdlk2a46vfv6sblymgf56mcqnj9pkra";
+       version = "0.1.4";
+       sha256 = "1qyk3lwzykc3vamm5ddv9733b2mc3p0rafcawi0hm87y01gc4w6q";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -111458,8 +111459,8 @@ self: {
     ({ mkDerivation, base, bytestring, QuickCheck, text }:
      mkDerivation {
        pname = "smaoin";
-       version = "0.1.0.0";
-       sha256 = "0bi9qg9vfn2hr8pakk7xhrca0bxgr28hbg6infnk2dxvhl9yipd3";
+       version = "0.1.1.0";
+       sha256 = "1sx3f8bkfy7an8v92xryxxjhwxprwdisv8lvl4kkq9pm36dzsnrk";
        buildDepends = [ base bytestring text ];
        testDepends = [ base QuickCheck ];
        jailbreak = true;
@@ -134515,7 +134516,6 @@ self: {
        ];
        description = "Transloadit support for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-vend" = callPackage

From 21d57e33c878b7810e98bf804aeb8a16e5ead389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Tue, 5 May 2015 19:51:28 +0000
Subject: [PATCH 0444/1143] Update of TexStudio from 2.7.0 to 2.9.4

---
 pkgs/applications/editors/texstudio/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 5cb31af797d5..4b0cccae3648 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, qt4, poppler_qt4, zlib}:
+{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig}:
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
-  version = "2.7.0";
+  version = "2.9.4";
   name = "${pname}-${version}";
   altname="Texstudio";
 
   src = fetchurl {
     url = "mirror://sourceforge/texstudio/${name}.tar.gz";
-    sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831";
+    sha256 = "1smmc4xqs8x8qzp6iqj2wr4xarfnxxxp6rq6chx1kb256w75jwfw";
   };
 
-  buildInputs = [ qt4 poppler_qt4 zlib ];
+  buildInputs = [ qt4 poppler_qt4 zlib pkgconfig];
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) "
-    qmake PREFIX=$out texstudio.pro
+    qmake PREFIX=$out NO_APPDATA=True texstudio.pro
   '';
 
   meta = with stdenv.lib; {

From df7b5b4ecbab8c1675672374371076cd7de721f8 Mon Sep 17 00:00:00 2001
From: Ryan Scheel <Ryan.havvy@gmail.com>
Date: Tue, 5 May 2015 12:20:58 -0700
Subject: [PATCH 0445/1143] Doc dontDisableStatic variable to configure stage

---
 doc/stdenv.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index fa3a7ef056e6..d3042710f188 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -546,6 +546,15 @@ script) if it exists.</para>
     such.</para></footnote>.  If this is undesirable, set this
     variable to a non-empty value.</para></listitem>
   </varlistentry>
+  
+  <varlistentry>
+    <term><varname>dontDisableStatic</varname></term>
+    <listitem><para>By default, when the configure script has
+    <option>--enable-static</option>, the option
+    <option>--disable-static</option> is added to the configure flags.</para>
+    <para></para>If this is undesirable, set this variable to a non-empty
+    value.</para></listitem>
+  </varlistentry>
 
   <varlistentry>
     <term><varname>preConfigure</varname></term>

From 0b94774479c7a92d0348f8920b8c3946f23b3bd0 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Tue, 5 May 2015 20:12:37 +0000
Subject: [PATCH 0446/1143] Docs: non-empty value -> true

---
 doc/stdenv.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index d3042710f188..a03b3716a87b 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -513,8 +513,8 @@ script) if it exists.</para>
     <term><varname>dontAddPrefix</varname></term>
     <listitem><para>By default, the flag
     <literal>--prefix=$prefix</literal> is added to the configure
-    flags.  If this is undesirable, set this variable to a non-empty
-    value.</para></listitem>
+    flags.  If this is undesirable, set this variable to
+    true.</para></listitem>
   </varlistentry>
 
   <varlistentry>
@@ -530,8 +530,7 @@ script) if it exists.</para>
     <listitem><para>By default, the flag
     <literal>--disable-dependency-tracking</literal> is added to the
     configure flags to speed up Automake-based builds.  If this is
-    undesirable, set this variable to a non-empty
-    value.</para></listitem>
+    undesirable, set this variable to true.</para></listitem>
   </varlistentry>
 
   <varlistentry>
@@ -544,7 +543,7 @@ script) if it exists.</para>
     variables in the Libtool script to prevent Libtool from using
     libraries in <filename>/usr/lib</filename> and
     such.</para></footnote>.  If this is undesirable, set this
-    variable to a non-empty value.</para></listitem>
+    variable to true.</para></listitem>
   </varlistentry>
   
   <varlistentry>
@@ -552,8 +551,8 @@ script) if it exists.</para>
     <listitem><para>By default, when the configure script has
     <option>--enable-static</option>, the option
     <option>--disable-static</option> is added to the configure flags.</para>
-    <para></para>If this is undesirable, set this variable to a non-empty
-    value.</para></listitem>
+    <para></para>If this is undesirable, set this variable to
+    true.</para></listitem>
   </varlistentry>
 
   <varlistentry>

From fc82638b33a653c5eee807e2f715666edb1e7c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Tue, 5 May 2015 20:30:13 +0000
Subject: [PATCH 0447/1143] Update TexMaker from 4.1.1 to 4.4.1

---
 pkgs/applications/editors/texmaker/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 4df2dc8cac14..04ebf195108f 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -2,20 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "texmaker";
-  version = "4.1.1";
+  version = "4.4.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
-    sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z";
+    sha256 = "1d5lb4sibdhvzgfr0zi48j92b4acvvvdy2biqi3jzjdnzy9r94w0";
   };
 
   buildInputs = [ qt4 poppler_qt4 zlib ];
-
   nativeBuildInputs = [ pkgconfig poppler ];
+  NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler";
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler}/include/poppler/) " # for poppler-config.h
     qmake PREFIX=$out DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps texmaker.pro
   '';
 

From 4d3be75ae229399f54b6caad5481346f2d4cadba Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 5 May 2015 15:09:51 -0400
Subject: [PATCH 0448/1143] broadcom-sta: fixes for kernel version >= 3.18

This replaces our patches with those from Arch's package [1]. Further
discussion can be found on the Arch forum [2].

This patch set is a superset of the previous set, and resolves the
immediate and consistent kernel panics I've seen on my MacBook Pro
Retina since switching from version 3.16 to 3.18 of the Linux kernel.

Fixes #5315
Fixes #7710

1: https://aur.archlinux.org/packages/broadcom-wl/
2: https://bbs.archlinux.org/viewtopic.php?id=192287
---
 ...g80211_ibss_joined-channel-parameter.patch |  17 -
 .../cfg80211_inform_bss-3.18.patch            |  21 -
 .../linux/broadcom-sta/default.nix            |   5 +-
 pkgs/os-specific/linux/broadcom-sta/gcc.patch |  11 +
 .../linux/broadcom-sta/linux-recent.patch     | 374 ++++++++++++++++++
 .../linux/broadcom-sta/netdev-3.17.patch      |  15 -
 6 files changed, 387 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch
 delete mode 100644 pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch
 create mode 100644 pkgs/os-specific/linux/broadcom-sta/gcc.patch
 create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-recent.patch
 delete mode 100644 pkgs/os-specific/linux/broadcom-sta/netdev-3.17.patch

diff --git a/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch b/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch
deleted file mode 100644
index 5596c0ebcf2e..000000000000
--- a/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Add channel parameter to cfg80211_ibss_joined call
-
---- a/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -1841,7 +1841,12 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
- 			wl_get_assoc_ies(wl);
- 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
- 			wl_update_bss_info(wl);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)
- 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
-+#else
-+			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid,
-+			                     &wl->conf->channel, GFP_KERNEL);
-+#endif
- 			set_bit(WL_STATUS_CONNECTED, &wl->status);
- 			wl->profile->active = true;
- 		}
diff --git a/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch b/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch
deleted file mode 100644
index 100ac9161a6f..000000000000
--- a/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Found on a random place http://web.archiveorange.com/archive/v/CcRuxYExfvTxfKcBFLah
-Nicolas Viéville, Oct 27 2014
-diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c
---- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c	2014-09-10 19:27:13.301316000 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c	2014-10-27 11:21:58.213536239 +0100
-@@ -2025,7 +2025,15 @@
- 	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
- 	notify_ielen = le32_to_cpu(bi->ie_length);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
-+	cbss = cfg80211_inform_bss(wiphy, channel,
-+		(mgmt_type == IEEE80211_STYPE_PROBE_RESP) ? CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON,
-+		(const u8 *)(bi->BSSID.octet),
-+		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
-+		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
-+#else
- 	cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
- 		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
- 		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
-+#endif
- 	if (unlikely(!cbss))
- 		return -ENOMEM;
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 94f519112952..64a0c3138c9b 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -18,9 +18,8 @@ stdenv.mkDerivation {
 
   patches = [
     ./license.patch
-    ./cfg80211_ibss_joined-channel-parameter.patch
-    ./netdev-3.17.patch
-    ./cfg80211_inform_bss-3.18.patch
+    ./linux-recent.patch
+    ./gcc.patch
   ];
 
   makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}";
diff --git a/pkgs/os-specific/linux/broadcom-sta/gcc.patch b/pkgs/os-specific/linux/broadcom-sta/gcc.patch
new file mode 100644
index 000000000000..f93e3f1d3a3f
--- /dev/null
+++ b/pkgs/os-specific/linux/broadcom-sta/gcc.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2014-06-26 10:42:08.000000000 +0000
++++ b/Makefile	2014-07-17 22:44:01.662297228 +0000
+@@ -126,6 +126,8 @@
+ EXTRA_CFLAGS       += -I$(src)/src/shared/bcmwifi/include
+ #EXTRA_CFLAGS       += -DBCMDBG_ASSERT -DBCMDBG_ERR
+ 
++EXTRA_CFLAGS       += -Wno-date-time
++
+ EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped
+ 
+ KBASE              ?= /lib/modules/`uname -r`
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch b/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch
new file mode 100644
index 000000000000..81d27204b4e0
--- /dev/null
+++ b/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch
@@ -0,0 +1,374 @@
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2014-06-26 12:42:08.000000000 +0200
++++ b/src/wl/sys/wl_cfg80211_hybrid.c	2015-04-13 13:20:08.140013177 +0200
+@@ -63,8 +63,13 @@
+ static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
+            struct cfg80211_ibss_params *params);
+ static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)
+ static s32 wl_cfg80211_get_station(struct wiphy *wiphy,
+            struct net_device *dev, u8 *mac, struct station_info *sinfo);
++#else
++static s32 wl_cfg80211_get_station(struct wiphy *wiphy,
++           struct net_device *dev, const u8 *mac, struct station_info *sinfo);
++#endif
+ static s32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
+            struct net_device *dev, bool enabled, s32 timeout);
+ static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
+@@ -1387,7 +1392,7 @@
+ 	key_endian_to_host(&key);
+ 
+ 	params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len);
+-	memcpy(params.key, key.data, params.key_len);
++	memcpy((char *)params.key, key.data, params.key_len);
+ 
+ 	if ((err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) {
+ 		return err;
+@@ -1421,9 +1426,15 @@
+ 	return err;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)
+ static s32
+ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
+                         u8 *mac, struct station_info *sinfo)
++#else
++static s32
++wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
++                        const u8 *mac, struct station_info *sinfo)
++#endif
+ {
+ 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
+ 	scb_val_t scb_val;
+@@ -1441,7 +1452,11 @@
+ 		WL_DBG(("Could not get rate (%d)\n", err));
+ 	} else {
+ 		rate = dtoh32(rate);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
+ 		sinfo->filled |= STATION_INFO_TX_BITRATE;
++#else
++		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
++#endif
+ 		sinfo->txrate.legacy = rate * 5;
+ 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));
+ 	}
+@@ -1454,7 +1469,11 @@
+ 			return err;
+ 		}
+ 		rssi = dtoh32(scb_val.val);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
+ 		sinfo->filled |= STATION_INFO_SIGNAL;
++#else
++		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
++#endif
+ 		sinfo->signal = rssi;
+ 		WL_DBG(("RSSI %d dBm\n", rssi));
+ 	}
+@@ -2010,9 +2029,15 @@
+ 
+ 	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
+ 	notify_ielen = le32_to_cpu(bi->ie_length);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+ 	cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
+ 		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
+ 		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
++#else
++	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet),
++		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
++		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
++#endif
+ 
+ 	if (unlikely(!cbss))
+ 		return -ENOMEM;
+@@ -2071,7 +2096,26 @@
+ 			wl_get_assoc_ies(wl);
+ 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 			wl_update_bss_info(wl);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++			{
++				struct wl_bss_info *bi;
++				u16 bss_info_channel;
++				struct ieee80211_channel *channel;
++				u32 freq;
++
++				bi = (struct wl_bss_info *)(wl->extra_buf + 4);
++				bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
++
++				freq = ieee80211_channel_to_frequency(bss_info_channel,
++				       (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
++				       IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++
++				channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
++				cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
++			}
++#else
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
++#endif
+ 			set_bit(WL_STATUS_CONNECTED, &wl->status);
+ 			wl->profile->active = true;
+ 		}
+@@ -2629,7 +2673,15 @@
+ 
+ void wl_cfg80211_detach(struct net_device *ndev)
+ {
+-	struct wl_cfg80211_priv *wl = ndev_to_wl(ndev);
++	struct wl_cfg80211_priv *wl;
++	struct wireless_dev *wdev;
++	
++	wdev = ndev->ieee80211_ptr;
++	if (wdev == NULL) {
++                printk(KERN_ERR "[%s()] in ndev=%p: IEEE80211ptr=%p\n", __FUNCTION__, ndev, wdev);
++                return;
++        }
++	wl = ndev_to_wl(ndev);
+ 
+ 	wl_deinit_cfg80211_priv(wl);
+ 	wl_free_wdev(wl);
+--- a/src/wl/sys/wl_dbg.h	2014-06-26 12:42:08.000000000 +0200
++++ b/src/wl/sys/wl_dbg.h	2015-04-13 13:19:52.443345832 +0200
+@@ -55,10 +55,12 @@
+ 
+ #define WL_NONE(args)
+ 
++#define FORCE_TRACE_LEVEL(fmt, ...) do { printk(KERN_ERR fmt, ## __VA_ARGS__); } while (0) /* ## is GCC specific syntax to remove comma when single arg */
++
+ #ifdef BCMDBG_ERR
+ #define	WL_ERROR(args)		WL_PRINT(args)
+ #else
+-#define	WL_ERROR(args)
++#define	WL_ERROR(args)		FORCE_TRACE_LEVEL args
+ #endif 
+ #define	WL_TRACE(args)
+ #define WL_APSTA_UPDN(args)
+--- a/src/wl/sys/wl_linux.c	2014-06-26 12:42:08.000000000 +0200
++++ b/src/wl/sys/wl_linux.c	2015-04-13 13:19:52.443345832 +0200
+@@ -878,7 +878,7 @@
+ static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume);
+ #endif
+ 
+-static struct pci_driver wl_pci_driver = {
++static struct pci_driver wl_pci_driver __refdata = {
+ 	.name =		"wl",
+ 	.probe =	wl_pci_probe,
+ 	.remove =	__devexit_p(wl_remove),
+@@ -1270,6 +1270,7 @@
+ 		MFREE(wl->osh, wlif->dev, sizeof(struct net_device));
+ #else
+ 		free_netdev(wlif->dev);
++		wlif->dev = NULL;
+ #endif 
+ 	}
+ 
+@@ -1307,7 +1308,12 @@
+ 	dev->priv = priv_link;
+ #else
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0))
+ 	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
++#else
++	dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN,
++			   ether_setup);
++#endif
+ 	if (!dev) {
+ 		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
+ 			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
+@@ -1651,11 +1657,7 @@
+ 	}
+ 
+ 	WL_LOCK(wl);
+-	if (!capable(CAP_NET_ADMIN)) {
+-		bcmerror = BCME_EPERM;
+-	} else {
+-		bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
+-	}
++	bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
+ 	WL_UNLOCK(wl);
+ 
+ done1:
+@@ -2157,8 +2159,8 @@
+ 	wlif = WL_DEV_IF(dev);
+ 	wl = WL_INFO(dev);
+ 
++	skb->prev = NULL;
+ 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-		skb->prev = NULL;
+ 
+ 		TXQ_LOCK(wl);
+ 
+@@ -2455,8 +2457,10 @@
+ 		p80211msg_t *phdr;
+ 
+ 		len = sizeof(p80211msg_t) + oskb->len - D11_PHY_HDR_LEN;
+-		if ((skb = dev_alloc_skb(len)) == NULL)
++		if ((skb = dev_alloc_skb(len)) == NULL) {
++			WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__));
+ 			return;
++		}
+ 
+ 		skb_put(skb, len);
+ 		phdr = (p80211msg_t*)skb->data;
+@@ -2535,8 +2539,10 @@
+ 			rtap_len = sizeof(wl_radiotap_ht_brcm_2_t);
+ 
+ 		len = rtap_len + (oskb->len - D11_PHY_HDR_LEN);
+-		if ((skb = dev_alloc_skb(len)) == NULL)
++		if ((skb = dev_alloc_skb(len)) == NULL) {
++			WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__));
+ 			return;
++		}
+ 
+ 		skb_put(skb, len);
+ 
+@@ -2664,8 +2670,10 @@
+ 			len += amsdu_len;
+ 		}
+ 
+-		if ((skb = dev_alloc_skb(len)) == NULL)
++		if ((skb = dev_alloc_skb(len)) == NULL) {
++			WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__));
+ 			return;
++		}
+ 
+ 		skb_put(skb, len);
+ 
+@@ -2990,7 +2998,7 @@
+ }
+ 
+ void
+-wl_set_monitor(wl_info_t *wl, int val)
++wl_set_monitor(wl_info_t *wl, int val) /* public => is called by wlc_hybrid.o_shipped */
+ {
+ 	const char *devname;
+ 	wl_if_t *wlif;
+@@ -3224,42 +3232,75 @@
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ static int
+ wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
++{
++	wl_info_t * wl = (wl_info_t *)data;
+ #else
+ static ssize_t
+-wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *data)
+-#endif
++wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
+ {
+-	wl_info_t * wl = (wl_info_t *)data;
+-	int to_user;
+-	int len;
++	wl_info_t * wl = PDE_DATA(file_inode(filp));
++#endif
++	int bcmerror, len;
++	int to_user = 0;
++	char tmp[8];
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ 	if (offset > 0) {
+ 		*eof = 1;
+ 		return 0;
+ 	}
++#else
++	if (*offp > 0) { /* for example, stop: cat /proc/brcm_monitor0 */
++		return 0; /* 0 <=> EOF */
++	}
+ #endif
+ 
+-	if (!length) {
+-		WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__));
+-		return 0;
+-	}
+ 	WL_LOCK(wl);
+-	wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
+-	len = sprintf(buffer, "%d\n", to_user);
+-	WL_UNLOCK(wl);
+-	return len;
++	bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
++ 	WL_UNLOCK(wl);
++
++	if (bcmerror != BCME_OK) {
++		WL_ERROR(("%s: GET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
++		return -EIO;
++	}
++
++ 	len = snprintf(tmp, ARRAY_SIZE(tmp), "%d\n", to_user);
++	tmp[ARRAY_SIZE(tmp) - 1] = '\0';
++	if (len >= ARRAY_SIZE(tmp)) {
++		printk(KERN_ERR "%s:%d [%s()] output would be truncated (ret=%d)!", __FILE__, __LINE__, __FUNCTION__, len);
++		return -ERANGE;
++	}
++	else if (len < 0) {
++		printk(KERN_ERR "%s:%d [%s()] unable to convert value (ret=%d)!", __FILE__, __LINE__, __FUNCTION__, len);
++		return len;
++	}
++	if (length < len) {
++		printk(KERN_ERR "%s:%d [%s()] user buffer is too small (at least=%d ; user=%d)!", __FILE__, __LINE__, __FUNCTION__, len, (int)length);
++		return -EMSGSIZE;
++	}
++	if (copy_to_user(buffer, tmp, len) != 0) {
++		printk(KERN_ERR "%s:%d [%s()] unable to copy data!", __FILE__, __LINE__, __FUNCTION__);
++		return -EFAULT;
++	}
++	
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++	*offp += len;
++#endif
++
++ 	return len;
+ }
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ static int
+ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data)
++{
++	wl_info_t * wl = (wl_info_t *)data;
+ #else
+ static ssize_t
+-wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *data)
+-#endif
++wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
+ {
+-	wl_info_t * wl = (wl_info_t *)data;
++	wl_info_t * wl = PDE_DATA(file_inode(filp));
++#endif
+ 	int from_user = 0;
+ 	int bcmerror;
+ 
+@@ -3270,7 +3311,11 @@
+ 	}
+ 	if (copy_from_user(&from_user, buff, 1)) {
+ 		WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
+-		return -EIO;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
++ 		return -EIO;
++#else
++		return -EFAULT;
++#endif
+ 	}
+ 
+ 	if (from_user >= 0x30)
+@@ -3280,10 +3325,15 @@
+ 	bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL);
+ 	WL_UNLOCK(wl);
+ 
+-	if (bcmerror < 0) {
++	if (bcmerror != BCME_OK) {
+ 		WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
+ 		return -EIO;
+ 	}
++	
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) && 0 /* no need to update offset because this file should only trigger action... */
++	*offp += length;
++#endif
++
+ 	return length;
+ }
+ 
+@@ -3304,8 +3354,8 @@
+ 	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
+ 		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
+ #else
+-	if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) {
+-		WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp));
++	if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) {
++		WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp));
+ #endif
+ 		ASSERT(0);
+ 		return -1;
diff --git a/pkgs/os-specific/linux/broadcom-sta/netdev-3.17.patch b/pkgs/os-specific/linux/broadcom-sta/netdev-3.17.patch
deleted file mode 100644
index 5a33cef7370a..000000000000
--- a/pkgs/os-specific/linux/broadcom-sta/netdev-3.17.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
---- a/src/wl/sys/wl_linux.c	2014-06-26 06:42:08.000000000 -0400
-+++ b/src/wl/sys/wl_linux.c	2014-10-13 12:00:04.446122588 -0400
-@@ -1307,7 +1307,11 @@
- 	dev->priv = priv_link;
- #else
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
-+	dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup);
-+#else
- 	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
-+#endif
- 	if (!dev) {
- 		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
- 			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));

From 0f2de4c64e451a82ff5b7cbef3fead5c1cb01120 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 5 May 2015 13:49:40 -0700
Subject: [PATCH 0449/1143] heimdal: Disable DCE as it was breaking the build

---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index c06fcdb384e8..a615854a6b25 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -55,11 +55,11 @@ stdenv.mkDerivation rec {
     (mkWith   (optLibcap_ng != null) "capng"                 null)
     (mkWith   (optSqlite != null)    "sqlite3"               sqlite)
     (mkEnable (optSqlite != null)    "sqlite-cache"          null)
-    #(mkWith  true                   "libintl"               glibc)              # TODO libintl fix
+    (mkWith   false                  "libintl"               null)               # TODO libintl fix
     (mkWith   true                   "hdbdir"                "/var/lib/heimdal")
     (mkWith   (optOpenssl != null)   "openssl"               optOpenssl)
     (mkEnable true                   "pthread-support"       null)
-    (mkEnable true                   "dce"                   null)
+    (mkEnable false                  "dce"                   null)               # TODO: Add support
     (mkEnable true                   "afs-support"           null)
     (mkWith   (optDb != null)        "berkeley-db"           optDb)
     (mkEnable false                  "nmdb"                  null)

From 007dfb8438cc360acfe4a43dec68f7f08c04196a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 5 May 2015 20:35:39 -0400
Subject: [PATCH 0450/1143] ghcjs: bump git revision

This resolves an issue in ghcjs where lazy IO can result in opening too
many files during linking due to lazy IO.
---
 pkgs/development/compilers/ghcjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 54604f548fa7..193082187881 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -59,8 +59,8 @@ in mkDerivation (rec {
   inherit version;
   src = fetchgit {
     url = git://github.com/ghcjs/ghcjs.git;
-    rev = "64c3768186d73d8c185b42d4d14dfb943919ee56"; # master branch
-    sha256 = "1w7rwcqzihg6h2j0khar7kjn8vdjg9ngjk6bndpiqcgf3kwfmvhf";
+    rev = "d4322c2ae4467420b28eca99f0c0abd00caf5d4a"; # master branch
+    sha256 = "12mvl4l1i993j86n9wkwcs567jm13javghbxapjjsc7493xpmya5";
   };
   isLibrary = true;
   isExecutable = true;

From 9a658d340fc6fe2cfaa47309e216fab8235445a9 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 5 May 2015 20:43:47 -0400
Subject: [PATCH 0451/1143] ghc-7.10.1: fix user pkg db location for GHCJS

This cherry picks the commit referenced on the associated trac ticket:
https://ghc.haskell.org/trac/ghc/ticket/10232
---
 pkgs/development/compilers/ghc/7.10.1.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix
index 5bec1fa3f559..4eb4a501e4e3 100644
--- a/pkgs/development/compilers/ghc/7.10.1.nix
+++ b/pkgs/development/compilers/ghc/7.10.1.nix
@@ -35,6 +35,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  patches = [
+    # Fix user pkg db location for GHCJS: 
+    # https://ghc.haskell.org/trac/ghc/ticket/10232
+    (fetchpatch {
+      url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984";
+      sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w";
+    })
+  ];
+
   postPatch = ''
     pushd libraries/Cabal
     patch -p1 < ${cabalPatch}

From e70f8b391ef0b5d85bf7788ddff5fd243baa9050 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 5 May 2015 20:29:17 -0500
Subject: [PATCH 0452/1143] openjpeg: Correctly set the install name on darwin

This fixes libpoppler, and thus texLiveFull
---
 pkgs/development/libraries/openjpeg/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 4ffcd62f982b..3fae65d9bd29 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
     (mkFlag jp3dSupport "BUILD_JP3D")
     (mkFlag thirdPartySupport "BUILD_THIRDPARTY")
     (mkFlag testsSupport "BUILD_TESTING")
+  ] ++ stdenv.lib.optionals stdenv.isDarwin
+  [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"
   ];
 
   nativebuildInputs = [ pkgconfig ];

From 7f00ab7f674f29ec220176a094c99161cab6a3a5 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Wed, 6 May 2015 01:44:24 +0000
Subject: [PATCH 0453/1143] libuv: version 1.4.2

---
 pkgs/development/libraries/libuv/default.nix | 2 +-
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 3ce377dfb08a..f85c2bef1853 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -105,5 +105,5 @@ in
   //
   mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
     v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
-    v1_4_0 = "17k028gn07vb9in440wbf0ar0rdl8bi5v4shm8nhj22vfb18dhl5";
+    v1_4_2 = "03ffyjyz92ipi2im05hvlx7jypv9c8fyp90zqyr91w7vszskxnxw";
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 648d78749f24..4372d2283cdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1884,7 +1884,7 @@ let
   else
     nodePackages_0_12;
 
-  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };
+  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_2; };
 
   iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
 
@@ -6936,6 +6936,8 @@ let
     automake = automake113x; # fails with 14
   });
 
+  libuv = libuvVersions.v1_4_2;
+
   libv4l = lowPrio (v4l_utils.override {
     alsaLib = null;
     libX11 = null;

From 086e801d5132bcf9a4e4cac56c361651b7b22ac0 Mon Sep 17 00:00:00 2001
From: Dario Bertini <dario.bertini@nccgroup.com>
Date: Wed, 6 May 2015 07:50:52 +0100
Subject: [PATCH 0454/1143] Enable old pythons' wide builds

---
 pkgs/development/interpreters/python/2.6/default.nix | 2 +-
 pkgs/development/interpreters/python/2.7/default.nix | 2 +-
 pkgs/development/interpreters/python/3.2/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 9bf161ffc1aa..ffc4c5d2e1fa 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -63,7 +63,7 @@ let
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    configureFlags = "--enable-shared --with-threads --enable-unicode";
+    configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
 
     NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
 
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 8b24fe004631..b8b25c576c59 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -79,7 +79,7 @@ let
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    configureFlags = "--enable-shared --with-threads --enable-unicode";
+    configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
 
     NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
     DETERMINISTIC_BUILD = 1;
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index 2645b5033440..f4103662316e 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     done
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
-    configureFlagsArray=( --enable-shared --with-threads
+    configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode
                           CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
                           LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"

From 874fa4d8a35d570f11e622d55ba3a60a6ac9e660 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 6 May 2015 00:14:18 -0700
Subject: [PATCH 0455/1143] busybox: 1.22.1 -> 1.23.2

Also use musl as libc since it is just as small as uclibc, usually more
performant, and regularly makes releases.
---
 pkgs/os-specific/linux/busybox/default.nix | 25 +++++++++++++---------
 pkgs/stdenv/linux/make-bootstrap-tools.nix |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 47f9fb9a5a40..2a96f4b46b39 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,4 +1,9 @@
-{ lib, stdenv, uclibc, fetchurl, enableStatic ? false, enableMinimal ? false, useUclibc ? false, extraConfig ? "" }:
+{ stdenv, fetchurl, musl
+, enableStatic ? false
+, enableMinimal ? false
+, useMusl ? false
+, extraConfig ? ""
+}:
 
 let
   configParser = ''
@@ -21,11 +26,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.22.1";
+  name = "busybox-1.23.2";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf";
+    sha256 = "16ii9sqracvh2r1gfzhmlypl269nnbkpvrwa7270k35d3bigk9h5";
   };
 
   patches = [ ./busybox-in-store.patch ];
@@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
     CONFIG_PREFIX "$out"
     CONFIG_INSTALL_NO_USR y
 
-    ${lib.optionalString enableStatic ''
+    ${stdenv.lib.optionalString enableStatic ''
       CONFIG_STATIC y
     ''}
 
@@ -54,8 +59,8 @@ stdenv.mkDerivation rec {
     EOF
 
     make oldconfig
-  '' + lib.optionalString useUclibc ''
-    makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc}/lib -L${uclibc}/lib")
+  '' + stdenv.lib.optionalString useMusl ''
+    makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
   '';
 
   crossAttrs = {
@@ -69,11 +74,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tiny versions of common UNIX utilities in a single small executable";
     homepage = http://busybox.net/;
-    license = lib.licenses.gpl2;
-    maintainers = [ lib.maintainers.viric ];
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 3ad81476c2e9..a995606886f3 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -17,7 +17,7 @@ rec {
   };
 
   busyboxMinimal = busybox.override {
-    useUclibc = true;
+    useMusl = true;
     enableStatic = true;
     enableMinimal = true;
     extraConfig = ''

From 0c5be7164c0dacbef334bcc84d927c1890363584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 6 May 2015 09:35:38 +0200
Subject: [PATCH 0456/1143] sheevaplug: fix kernel build.

I added platform.kernelMakeFlags. This allows setting the required
parameter to make the required kernel uImage for the sheevaplug,
since it became a platform with devicetree (3.10).

I have tried it with linux 3.18 and it built fine.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++-
 pkgs/top-level/platforms.nix                    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 620df6dd6cfb..c57082c93305 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -49,7 +49,8 @@ let
 
   commonMakeFlags = [
     "O=$(buildRoot)"
-  ];
+  ] ++ stdenv.lib.optionals (stdenv.platform ? kernelMakeFlags)
+    stdenv.platform.kernelMakeFlags;
 
   drvAttrs = config_: platform: kernelPatches: configfile:
     let
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 8bdc4f77302c..fc0fe23d4fb1 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -25,7 +25,7 @@ rec {
     name = "sheevaplug";
     kernelMajor = "2.6";
     kernelHeadersBaseConfig = "kirkwood_defconfig";
-    kernelBaseConfig = "kirkwood_defconfig";
+    kernelBaseConfig = "multi_v5_defconfig";
     kernelArch = "arm";
     kernelAutoModules = false;
     kernelExtraConfig =
@@ -123,10 +123,12 @@ rec {
         KGDB_SERIAL_CONSOLE y
         KGDB_KDB y
       '';
+    kernelMakeFlags = [ "LOADADDR=0x0200000" ];
     kernelTarget = "uImage";
     uboot = "sheevaplug";
     # Only for uboot = uboot :
     ubootConfig = "sheevaplug_config";
+    kernelDTB = true; # Beyond 3.10
   };
 
   raspberrypi = {

From d0462cdf2547eedc443ae1968e0ae4a895e0e915 Mon Sep 17 00:00:00 2001
From: Tim Williams <info@timphilipwilliams.com>
Date: Wed, 6 May 2015 08:52:40 +0100
Subject: [PATCH 0457/1143] xss-lock: upstream fix: exit when X connection dies

---
 pkgs/misc/screensavers/xss-lock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix
index 82fa71431228..a95f9ae86136 100644
--- a/pkgs/misc/screensavers/xss-lock/default.nix
+++ b/pkgs/misc/screensavers/xss-lock/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = https://bitbucket.org/raymonad/xss-lock.git;
-    rev = "d75612f1d1eea64b5c43806eea88059340a08ca9";
-    sha256 = "4d57bcfd45287b5b068f45eeceb9e43d975806a038a4c586b141da5d99b3e48b";
+    rev = "1e158fb20108058dbd62bd51d8e8c003c0a48717";
+    sha256 = "0jdpd6x1kk30qynv2n4zbjmsicvwjwcldr2224da0srzl7sgyjsg";
   };
 
   buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau

From a043b3ba9f2dbc8196c646876bb608da235058f2 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 5 May 2015 16:42:26 +0200
Subject: [PATCH 0458/1143] Add package for open-pdf-presenter

---
 .../misc/open-pdf-presenter/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/misc/open-pdf-presenter/default.nix

diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix
new file mode 100644
index 000000000000..1d5811226d57
--- /dev/null
+++ b/pkgs/applications/misc/open-pdf-presenter/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake, qt4, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "open-pdf-presenter-git-2014-09-23";
+
+  src = fetchFromGitHub {
+    owner  = "olabini";
+    repo   = "open-pdf-presenter";
+    rev    = "f14930871b60b6ba50298c27377605e0a5fdf124";
+    sha256 = "1lfqb60zmjmsvzpbz29m8yxlzs2fscingyk8jvisng1y921726rr";
+  };
+
+  buildInputs = [ cmake qt4 pythonPackages.poppler-qt4 ];
+
+  meta = {
+    homepage = https://github.com/olabini/open-pdf-presenter;
+    description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..436c54084190 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2330,6 +2330,8 @@ let
 
   update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { };
 
+  open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { };
+
   openvswitch = callPackage ../os-specific/linux/openvswitch { };
 
   optipng = callPackage ../tools/graphics/optipng {

From b421fc0686232fb2e1ff723d6ae2295345db007b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 6 May 2015 11:40:47 +0200
Subject: [PATCH 0459/1143] pulseaudio: system user and group changed to pulse.

---
 pkgs/servers/pulseaudio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index b031b0b45089..65eee2994e6c 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -148,8 +148,8 @@ stdenv.mkDerivation rec {
     (mkEnable true                    "manpages"                   null)
     (mkEnable hasWebrtc               "webrtc-aec"                 null)
     (mkEnable true                    "adrian-aec"                 null)
-    (mkWith   true                    "system-user"                "pulseaudio")
-    (mkWith   true                    "system-group"               "pulseaudio")
+    (mkWith   true                    "system-user"                "pulse")
+    (mkWith   true                    "system-group"               "pulse")
     (mkWith   true                    "access-group"               "audio")
     "--with-systemduserunitdir=\${out}/lib/systemd/user"
   ] ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";

From 3ca38da728daaba2130ba72599d9358da188024c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Wed, 6 May 2015 13:14:14 +0200
Subject: [PATCH 0460/1143] add Sorcer, an LV2 synth.

---
 pkgs/applications/audio/sorcer/default.nix    | 26 +++++++++++++++
 .../libraries/audio/ntk/default.nix           | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 63 insertions(+)
 create mode 100644 pkgs/applications/audio/sorcer/default.nix
 create mode 100644 pkgs/development/libraries/audio/ntk/default.nix

diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix
new file mode 100644
index 000000000000..ef28180cc3b2
--- /dev/null
+++ b/pkgs/applications/audio/sorcer/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "sorcer-${version}";
+  version = "1.1.1";
+
+  src = fetchurl {
+    url = "https://github.com/harryhaaren/openAV-Sorcer/archive/release-${version}.tar.gz";
+    sha256 = "1jkhs2rhn4givac7rlbj8067r7qq6jnj3ixabb346nw7pd6gn1wn";
+  };
+
+  buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ];
+
+  installPhase = ''
+    make install
+    cp -a ../presets/* "$out/lib/lv2"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://openavproductions.com/sorcer/;
+    description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
new file mode 100644
index 000000000000..647d0962f0a6
--- /dev/null
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, cairo, libjpeg, libXft, pkgconfig, python2 }:
+
+stdenv.mkDerivation rec {
+  name = "ntk-${version}";
+  version = "2014-10-18";
+  src = fetchgit {
+    url = "git://git.tuxfamily.org/gitroot/non/fltk.git";
+    rev = "5719b0044d9f267de5391fab006370cc7f4e70bd";
+    sha256 = "7ecedb049e00cc9a1bb0e0e2f02e5a734c873653b68551e6573474c04abe1821";
+  };
+
+  buildInputs = [
+    cairo libjpeg libXft pkgconfig python2
+  ];
+
+  buildPhase = ''
+    python waf configure --prefix=$out
+    python waf
+  '';
+
+  installPhase = ''
+    python waf install
+  '';
+
+  meta = {
+    description = "Fork of FLTK 1.3.0 with additional functionality.";
+    version = "${version}";
+    homepage = "http://non.tuxfamily.org/";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90a448f7d634..8ca3e8f2369a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7226,6 +7226,8 @@ let
     includeTools = true;
   };
 
+  ntk = callPackage ../development/libraries/audio/ntk { };
+
   ntrack = callPackage ../development/libraries/ntrack { };
 
   nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
@@ -11983,6 +11985,8 @@ let
 
   sooperlooper = callPackage ../applications/audio/sooperlooper { };
 
+  sorcer = callPackage ../applications/audio/sorcer { };
+
   sound-juicer = callPackage ../applications/audio/sound-juicer { };
 
   spideroak = callPackage ../applications/networking/spideroak { };

From 6dfbbc8e24f1bf9793b3a516ab6a165e5a2c96c7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 5 May 2015 07:21:45 -0500
Subject: [PATCH 0461/1143] plasma53: fix kcm_keyboard

---
 pkgs/desktops/plasma-5.3/default.nix          |  4 ++
 .../plasma-desktop-xkb-rules.patch            | 47 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index bd840dff42d6..7ff2d5fe8156 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -131,6 +131,10 @@ let
         patches = [
           ./plasma-desktop/plasma-desktop-hwclock.patch
           ./plasma-desktop/plasma-desktop-zoneinfo.patch
+          (substituteAll {
+            src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
+            xkb = pkgs.xkeyboard_config;
+          })
         ];
         preConfigure = ''
           substituteInPlace kcms/dateandtime/helper.cpp \
diff --git a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch
new file mode 100644
index 000000000000..8553222bfe0f
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch
@@ -0,0 +1,47 @@
+From 3f175a5ecc9b4fecd8fe25cb482cf2c91aa47cf6 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 4 May 2015 22:23:21 -0500
+Subject: [PATCH] xkb rules path
+
+---
+ kcms/keyboard/xkb_rules.cpp | 24 +-----------------------
+ 1 file changed, 1 insertion(+), 23 deletions(-)
+
+diff --git a/kcms/keyboard/xkb_rules.cpp b/kcms/keyboard/xkb_rules.cpp
+index 341369d..27066d6 100644
+--- a/kcms/keyboard/xkb_rules.cpp
++++ b/kcms/keyboard/xkb_rules.cpp
+@@ -157,29 +157,7 @@ QString Rules::getRulesName()
+ 
+ QString Rules::findXkbDir()
+ {
+-	QString xkbParentDir;
+-
+-	QString base(XLIBDIR);
+-	if( base.count('/') >= 3 ) {
+-		// .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb
+-		QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11";
+-		QDir baseDir(base + delta);
+-		if( baseDir.exists() ) {
+-			xkbParentDir = baseDir.absolutePath();
+-		}
+-		else {
+-			QDir baseDir(base + "/X11");	// .../usr/X11/lib/X11/xkb (old XFree)
+-			if( baseDir.exists() ) {
+-				xkbParentDir = baseDir.absolutePath();
+-			}
+-		}
+-	}
+-
+-	if( xkbParentDir.isEmpty() ) {
+-		xkbParentDir = "/usr/share/X11";
+-	}
+-
+-	return xkbParentDir + "/xkb";
++	return "@xkb@/share/X11/xkb";
+ }
+ 
+ static QString findXkbRulesFile()
+-- 
+2.3.6
+

From 09af6d457215c3dcff7144a8917f17d82e3c8674 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 May 2015 07:06:58 -0500
Subject: [PATCH 0462/1143] add telepathy-qt5

---
 pkgs/applications/kde-apps-15.04/default.nix  |  1 +
 .../libraries/telepathy/qt5/default.nix       | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/telepathy/qt5/default.nix

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index e08394f0bf02..e680f006f89a 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -125,6 +125,7 @@ let
         TIFF = libtiff;
         Taglib = taglib;
         TelepathyQt4 = telepathy_qt;
+        TelepathyQt5 = telepathy_qt5;
         TunePimp = libtunepimp;
         UDev = udev;
         USB = libusb;
diff --git a/pkgs/development/libraries/telepathy/qt5/default.nix b/pkgs/development/libraries/telepathy/qt5/default.nix
new file mode 100644
index 000000000000..50d569f30917
--- /dev/null
+++ b/pkgs/development/libraries/telepathy/qt5/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
+, telepathy_farstream, telepathy_glib, pythonDBus }:
+
+stdenv.mkDerivation rec {
+  name = "telepathy-qt5-0.9.5";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
+    sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig python libxslt ];
+  propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
+
+  cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ];
+
+  buildInputs = stdenv.lib.optional doCheck dbus_daemon;
+
+  preBuild = ''
+    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
+  '';
+
+  enableParallelBuilding = true;
+  doCheck = false; # giving up for now
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4eb351261a2..d01732ac273c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7804,6 +7804,8 @@ let
 
   telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
 
+  telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5 { };
+
   tevent = callPackage ../development/libraries/tevent {
     python = python2;
   };

From 3aff74a7a266be14ec7d0ee242601fd037eefe9c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 6 May 2015 08:32:03 -0400
Subject: [PATCH 0463/1143] Resurrect old cloog and isl for gcc-4.9

Fixes #7723

Refs 8af39c1cf725be2f42b8d104cf39f2cd74840cac
Refs 5cd11989c55e32df83cf5c4bc257bb6825b4e889
---
 pkgs/development/libraries/cloog/0.18.0.nix   | 65 +++++++++++++++++++
 pkgs/development/libraries/isl/0.11.1.nix     | 23 +++++++
 .../libraries/isl/fix-gcc-build.diff          | 12 ++++
 pkgs/top-level/all-packages.nix               |  8 +++
 4 files changed, 108 insertions(+)
 create mode 100644 pkgs/development/libraries/cloog/0.18.0.nix
 create mode 100644 pkgs/development/libraries/isl/0.11.1.nix
 create mode 100644 pkgs/development/libraries/isl/fix-gcc-build.diff

diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix
new file mode 100644
index 000000000000..926da22b2802
--- /dev/null
+++ b/pkgs/development/libraries/cloog/0.18.0.nix
@@ -0,0 +1,65 @@
+{ fetchurl, stdenv, gmp, isl }:
+
+stdenv.mkDerivation rec {
+  name = "cloog-0.18.0";
+
+  src = fetchurl {
+    url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";
+    sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228";
+  };
+
+  buildInputs = [ gmp ];
+
+  propagatedBuildInputs = [ isl ];
+
+  configureFlags = [ "--with-isl=system" ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = {
+    description = "Library that generates loops for scanning polyhedra";
+
+    longDescription = ''
+      CLooG is a free software library to generate code for scanning
+      Z-polyhedra.  That is, it finds a code (e.g., in C, FORTRAN...) that
+      reaches each integral point of one or more parameterized polyhedra.
+      CLooG has been originally written to solve the code generation problem
+      for optimizing compilers based on the polytope model.  Nevertheless it
+      is used now in various area e.g., to build control automata for
+      high-level synthesis or to find the best polynomial approximation of a
+      function.  CLooG may help in any situation where scanning polyhedra
+      matters.  While the user has full control on generated code quality,
+      CLooG is designed to avoid control overhead and to produce a very
+      effective code.
+    '';
+
+    homepage = http://www.cloog.org/;
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+
+    /* Leads to an ICE on Cygwin:
+
+       make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src'
+       /bin/sh ../libtool --tag=CXX   --mode=compile g++ -DHAVE_CONFIG_H -I. -I..  -I.. -I../src    -g -O2 -frounding-math  -W -Wall -c -o Box.lo Box.cc
+       libtool: compile:  g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc  -DDLL_EXPORT -DPIC -o .libs/Box.o
+       In file included from checked.defs.hh:595,
+                        from Checked_Number.defs.hh:27,
+                        from Coefficient.types.hh:15,
+                        from Coefficient.defs.hh:26,
+                        from Box.defs.hh:28,
+                        from Box.cc:24:
+       checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)':
+       checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719
+       Please submit a full bug report,
+       with preprocessed source if appropriate.
+       See <URL:http://cygwin.com/problems.html> for instructions.
+       make[3]: *** [Box.lo] Error 1
+
+    */
+    platforms = with stdenv.lib.platforms; allBut cygwin;
+  };
+}
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
new file mode 100644
index 000000000000..931ee831b734
--- /dev/null
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
+
+  src = fetchurl {
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
+    sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9";
+  };
+
+  buildInputs = [ gmp ];
+  patches = [ ./fix-gcc-build.diff ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.kotnet.org/~skimo/isl/;
+    license = stdenv.lib.licenses.lgpl21;
+    description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/isl/fix-gcc-build.diff b/pkgs/development/libraries/isl/fix-gcc-build.diff
new file mode 100644
index 000000000000..6fbd1f9d478b
--- /dev/null
+++ b/pkgs/development/libraries/isl/fix-gcc-build.diff
@@ -0,0 +1,12 @@
+diff -ru isl-0.11.1/include/isl/int.h isl-0.11.1.new/include/isl/int.h
+--- isl-0.11.1/include/isl/int.h        2012-11-29 09:47:32.000000000 +0100
++++ isl-0.11.1.new/include/isl/int.h    2013-10-27 15:35:31.348553812 +0100
+@@ -14,7 +14,7 @@
+ #include <string.h>
+ #include <gmp.h>
+ #if defined(__cplusplus)
+-#include <iostream>
++#include <ostream>
+ #endif
+ 
+ #if defined(__cplusplus)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d01732ac273c..b7a8d30bae55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1063,6 +1063,9 @@ let
   };
 
   cloog = callPackage ../development/libraries/cloog { };
+  cloog_0_18_0 = callPackage ../development/libraries/cloog/0.18.0.nix {
+    isl = isl_0_11;
+  };
 
   cloogppl = callPackage ../development/libraries/cloog-ppl { };
 
@@ -1766,6 +1769,7 @@ let
   ised = callPackage ../tools/misc/ised {};
 
   isl = callPackage ../development/libraries/isl { };
+  isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { };
   isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { };
   isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { };
 
@@ -3613,6 +3617,10 @@ let
       if crossSystem != null && crossSystem.config == "i586-pc-gnu"
       then gnu.libpthreadCross
       else null;
+
+    isl = isl_0_11;
+
+    cloog = cloog_0_18_0;
   }));
 
   gcc51 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5.1 {

From abb76bcdad7fb97bb354191b92c13e3d794a2ba1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 May 2015 07:28:42 -0500
Subject: [PATCH 0464/1143] add libaccounts-glib-1.16

---
 .../libraries/libaccounts-glib/default.nix        | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                   |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/libaccounts-glib/default.nix

diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
new file mode 100644
index 000000000000..b3217e662754
--- /dev/null
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, glib, libxml2, libxslt, pkgconfig, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "libaccounts-glib-1.16";
+  src = fetchurl {
+    url = "https://accounts-sso.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0hgvk9rdfvk47c54rvcp3hq74yy7v6w1ql71q2mik8lmsx22354a";
+  };
+
+  buildInputs = [ glib libxml2 libxslt sqlite ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  configurePhase = ''HAVE_GCOV_FALSE='#' ./configure $configureFlags --prefix=$out'';
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7a8d30bae55..a7302209d043 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6366,6 +6366,8 @@ let
 
   libaal = callPackage ../development/libraries/libaal { };
 
+  libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { };
+
   libao = callPackage ../development/libraries/libao {
     usePulseAudio = config.pulseaudio or true;
   };

From c2ff0a293ecb44956a9f4f138e4c494690bfa526 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 May 2015 07:33:42 -0500
Subject: [PATCH 0465/1143] kdeApps_15_04: fix kaccounts-providers

---
 pkgs/applications/kde-apps-15.04/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index e680f006f89a..490f5c0fd651 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -191,6 +191,16 @@ let
         nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
       };
 
+      kaccounts-providers = super.kaccounts-providers // {
+        buildInputs = super.kaccounts-providers.buildInputs
+          ++ (with pkgs; [ intltool libaccounts-glib ]);
+        preConfigure = ''
+          ${super.kaccounts-providers.preConfigure or ""}
+          substituteInPlace webkit-options/CMakeLists.txt \
+            --replace "/etc/signon-ui/webkit-options.d/" "$out/etc/signon-ui/webkit-options.d/"
+        '';
+      };
+
       kalzium = with pkgs; super.kalzium // {
         nativeBuildInputs = super.kalzium.nativeBuildInputs ++ [pkgconfig];
       };

From 1a32f5e4e801e1380d43c96fe07a7f0c1e3c82b9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 May 2015 07:33:57 -0500
Subject: [PATCH 0466/1143] kdeApps_15_04: fix kate

---
 pkgs/applications/kde-apps-15.04/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 490f5c0fd651..e29f484237f1 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -205,6 +205,14 @@ let
         nativeBuildInputs = super.kalzium.nativeBuildInputs ++ [pkgconfig];
       };
 
+      kate = super.kate // {
+        buildInputs =
+          super.kate.buildInputs
+          ++ (with kf5; [ kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets
+                          kio kparts ktexteditor kwindowsystem kxmlgui ]);
+        nativeBuildInputs = super.kate.nativeBuildInputs ++ (with kf5; [ kdoctools ]);
+      };
+
       kde-runtime = with pkgs; super.kde-runtime // {
         buildInputs =
           super.kde-runtime.buildInputs ++ [libcanberra];

From c99af2710dfd8ac9aa0ad420d47bbe70a5e11460 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Tue, 5 May 2015 23:23:26 +0200
Subject: [PATCH 0467/1143] add ir.lv2, a convolution plugin.

---
 pkgs/applications/audio/ir.lv2/default.nix    | 40 +++++++++++++++++++
 .../{ => audio}/zita-alsa-pcmi/default.nix    |  0
 .../audio/zita-convolver/default.nix          | 33 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++-
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/ir.lv2/default.nix
 rename pkgs/development/libraries/{ => audio}/zita-alsa-pcmi/default.nix (100%)
 create mode 100644 pkgs/development/libraries/audio/zita-convolver/default.nix

diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
new file mode 100644
index 000000000000..2b808c3b0153
--- /dev/null
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
+
+stdenv.mkDerivation rec {
+  name = "ir.lv2-${version}";
+  version = "1.2.2";
+
+  src = fetchurl {
+    url = "http://factorial.hu/system/files/${name}.tar.gz";
+    sha256 = "17a6h2mv9xv41jpbx6bdakkngin4kqzh2v67l4076ddq609k5a7v";
+  };
+
+  buildInputs = [ gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ];
+
+  buildPhase = ''
+    make
+    make convert4chan
+  '';
+
+  installPhase = ''
+    mkdir "$out/bin"
+    mkdir "$out/include"
+    mkdir "$out/share"
+    mkdir "$out/share/doc"
+
+    make PREFIX="$out" install
+    install -Dm755 convert4chan "$out/bin/convert4chan"
+    # fixed location
+    sed -i 's/, but seem like its gone://' README
+    sed -i  's@rhythminmind.net/1313@rhythminmind.net/STN@' README
+    install -Dm644 README "$out/share/doc/README"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://factorial.hu/plugins/lv2/ir;
+    description = "Zero-latency, realtime, high performance signal convolver especially for creating reverb effects";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
similarity index 100%
rename from pkgs/development/libraries/zita-alsa-pcmi/default.nix
rename to pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
new file mode 100644
index 000000000000..a15ae7dad40d
--- /dev/null
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, fftwFloat }:
+
+stdenv.mkDerivation rec {
+  name = "zita-convolver-${version}";
+  version = "3.1.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "14qrnczhp5mbwhky64il7kxc4hl1mmh495v60va7i2qnhasr6zmz";
+  };
+
+  buildInputs = [ fftwFloat ];
+
+  patchPhase = ''
+    cd libs
+    sed -e "s@ldconfig@@" -i Makefile
+  '';
+
+  installPhase = ''
+    make PREFIX="$out" SUFFIX="" install
+
+    # create lib link for building apps
+    ln -s $out/lib/libzita-convolver.so.$version $out/lib/libzita-convolver.so.3
+  '';
+
+  meta = {
+    description = "Convolution library by Fons Adriaensen";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90a448f7d634..f67134a006ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7992,7 +7992,9 @@ let
 
   czmq = callPackage ../development/libraries/czmq { };
 
-  zita-alsa-pcmi = callPackage ../development/libraries/zita-alsa-pcmi { };
+  zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };
+
+  zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { };
 
   zziplib = callPackage ../development/libraries/zziplib { };
 
@@ -11196,6 +11198,8 @@ let
 
   irssi_otr = callPackage ../applications/networking/irc/irssi/otr { };
 
+  ir.lv2 = callPackage ../applications/audio/ir.lv2 { };
+
   bip = callPackage ../applications/networking/irc/bip { };
 
   jabref = callPackage ../applications/office/jabref/default.nix { };

From e0bec9ece5b27494c9870ad2007f4ad7397de16f Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 6 May 2015 16:16:34 +0300
Subject: [PATCH 0468/1143] teamviewer: update sha

---
 pkgs/applications/networking/remote/teamviewer/10.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix
index 6a54a0e7ff0b..cd1833261f49 100644
--- a/pkgs/applications/networking/remote/teamviewer/10.nix
+++ b/pkgs/applications/networking/remote/teamviewer/10.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   name = "teamviewer-10.0.37742";
   src = fetchurl {
     url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb";
-    sha256 = config.teamviewer10.sha256 or "1j3zbvyj003gk8mm9sv1dld9x30l6fswwlhdyk46mixsqq5ayp6c";
+    sha256 = config.teamviewer10.sha256 or "0n2lzphvsqnlvm7pd7hjlislqj9rr57lai8jyw4wpqcy9j2xwxd2";
   };
 
   buildInputs = [ makeWrapper patchelf ];

From ae8c6092e74138c6288ebab41933fc5ef512634f Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 6 May 2015 10:34:12 -0400
Subject: [PATCH 0469/1143] pwmt: update packages (zathura, jumanji, girara)

This updates (and fixes) the mupdf backend for zathura, and bumps the
versions for other related packages.
---
 pkgs/applications/misc/girara/default.nix     |  4 ++--
 .../misc/zathura/core/default.nix             |  4 ++--
 pkgs/applications/misc/zathura/default.nix    | 10 ++++-----
 .../misc/zathura/pdf-mupdf/default.nix        | 21 +++++++++++--------
 .../misc/zathura/pdf-poppler/default.nix      | 10 ++++-----
 pkgs/applications/misc/zathura/ps/default.nix | 10 ++++-----
 .../networking/browsers/jumanji/default.nix   |  6 +++---
 pkgs/top-level/all-packages.nix               |  2 +-
 8 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index c7c110a978a5..e91e94695f5a 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -5,11 +5,11 @@ assert withBuildColors -> ncurses != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "girara-${version}";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh";
+    sha256 = "0pnfdsg435b5vc4x8l9pgm77aj7ram1q0bzrp9g4a3bh1r64xq1f";
   };
 
   preConfigure = ''
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 5f9b3850ad7d..cab6423b77e5 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.2";
+  version = "0.3.3";
   name = "zathura-core-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "1qk5s7cyqp4l673yhma5igk9g24p5jyqyy81fdk7q7xjqlym19px";
+    sha256 = "1rywx09qn6ap5hb1z31wxby4lzdrqdbldm51pjk1ifflr37xwirk";
   };
 
   buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite ];
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 6f1b5f400dd1..8b37e22d117a 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, pkgs, fetchurl, stdenv, useMupdf }:
+{ callPackage, lib, pkgs, fetchurl, stdenv, useMupdf }:
 
 rec {
   inherit stdenv;
@@ -40,7 +40,7 @@ rec {
 
     preferLocalBuild = true;
 
-    meta = {
+    meta = with lib; {
       homepage = http://pwmt.org/projects/zathura/;
       description = "A highly customizable and functional PDF viewer";
       longDescription = ''
@@ -49,9 +49,9 @@ rec {
         is an application that provides a minimalistic and space saving interface
         as well as an easy usage that mainly focuses on keyboard interaction.
       '';
-      license = stdenv.lib.licenses.zlib;
-      platforms = stdenv.lib.platforms.linux;
-      maintainers = [ stdenv.lib.maintainers.garbas stdenv.lib.maintainers.smironov ];
+      license = licenses.zlib;
+      platforms = platforms.linux;
+      maintainers = with maintainers;[ garbas smironov ];
     };
   };
 }
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index a6f12a64cf00..48b177120fb6 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,29 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }:
+{ stdenv, lib, fetchgit, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }:
 
 stdenv.mkDerivation rec {
   version = "0.2.7";
   name = "zathura-pdf-mupdf-${version}";
 
-  src = fetchurl {
-    url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "0gr5kkk75hn7sz9kmzynhhcdd9xb9sz5gdb8p1iz9g0fjhskyd5i";
+  src = fetchgit {
+    url = "https://git.pwmt.org/zathura-pdf-mupdf.git";
+    rev = "99bff723291f5aa2558e5c8b475f496025105f4a";
+    sha256 = "14mfp116a8dmazss3dcipvjs6dclazp36vsbcc53lr8lal5ccfnf";
   };
 
   buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ];
 
   makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
 
-  preConfigure = "patch -p1 < ${./config.patch}";
+  patches = [
+    ./config.patch
+  ];
 
-  meta = {
+  meta = with lib; {
     homepage = http://pwmt.org/projects/zathura/;
     description = "A zathura PDF plugin (mupdf)";
     longDescription = ''
       The zathura-pdf-mupdf plugin adds PDF support to zathura by
       using the mupdf rendering library.
     '';
-    license = stdenv.lib.licenses.zlib;
-    platforms = stdenv.lib.platforms.linux;
-#    maintainers = [ ];
+    license = licenses.zlib;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 6625bf471942..caaab9ec3c77 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler }:
+{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
 
 stdenv.mkDerivation rec {
   version = "0.2.5";
@@ -13,15 +13,15 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
 
-  meta = {
+  meta = with lib; {
     homepage = http://pwmt.org/projects/zathura/;
     description = "A zathura PDF plugin (poppler)";
     longDescription = ''
       The zathura-pdf-poppler plugin adds PDF support to zathura by 
       using the poppler rendering library.
     '';
-    license = stdenv.lib.licenses.zlib;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = licenses.zlib;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan garbas ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index eef020016015..31ffbf628dd8 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
+{ stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
 
 stdenv.mkDerivation rec {
   name = "zathura-ps-0.2.2";
@@ -14,16 +14,16 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
 
-  meta = {
+  meta = with lib; {
     homepage = http://pwmt.org/projects/zathura/;
     description = "A zathura PS plugin";
     longDescription = ''
       The zathura-ps plugin adds PS support to zathura by using the
       libspectre library.
       '';
-    license = stdenv.lib.licenses.zlib;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = licenses.zlib;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan garbas ];
   };
 }
 
diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
index ff4fea90bff1..c44db8db759b 100644
--- a/pkgs/applications/networking/browsers/jumanji/default.nix
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "jumanji-${version}";
-  version = "20140622";
+  version = "20150107";
 
   src = fetchgit {
     url = git://pwmt.org/jumanji.git;
-    rev = "8f40487304a6a931487c411b25001f2bb5cf8d4f";
-    sha256 = "1hdk09rayyv2knxzn4n7d41dvh34gdk9ra75x7g9n985w13pkinv";
+    rev = "f8e04e5b5a9fec47d49ca63a096e5d35be281151";
+    sha256 = "1xq06iabr4y76faf4w1cx6fhwdksfsxggz1ndny7icniwjzk98h9";
   };
 
   buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ca3e8f2369a..340e07f7ee23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12779,7 +12779,7 @@ let
   zathuraCollection = recurseIntoAttrs
     (let callPackage = newScope pkgs.zathuraCollection; in
       import ../applications/misc/zathura {
-        inherit callPackage pkgs fetchurl;
+        inherit callPackage pkgs fetchurl lib;
         stdenv = overrideCC stdenv gcc49;
         useMupdf = config.zathura.useMupdf or false;
       });

From 290132bf899eb18c21817eba51a3db6a95af1449 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 6 May 2015 15:31:47 +0000
Subject: [PATCH 0470/1143] Disable hiredis in rsyslog as it is currently
 broken.

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 340e07f7ee23..2826dc7ecd70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -830,6 +830,7 @@ let
     libgcrypt = libgcrypt_1_6;
     czmq = null; # Currently Broken
     hadoop = null; # Currently Broken
+    hiredis = null; # Currently Broken
   };
 
   rsyslog-light = callPackage ../tools/system/rsyslog {

From 10d1a9cf8e3c45b7b7e30be1463193e6aa43ccdb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 May 2015 10:32:40 -0500
Subject: [PATCH 0471/1143] add accounts-qt

---
 .../libraries/accounts-qt/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/accounts-qt/default.nix

diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
new file mode 100644
index 000000000000..9194339b3a4f
--- /dev/null
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "accounts-qt-1.11";
+  src = fetchurl {
+    url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "07drh4s7zaz4bzg2xhwm50ig1g8vlphfv02nrzz1yi085az1fmch";
+  };
+
+  buildInputs = [ glib libaccounts-glib qt5.base ];
+  nativeBuildInputs = [ doxygen pkgconfig ];
+
+  configurePhase = ''
+    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/AccountsQt5
+  '';
+
+  postInstall = ''
+    mv $out/lib/cmake/AccountsQt5/AccountsQtConfig.cmake \
+       $out/lib/cmake/AccountsQt5/AccountsQt5Config.cmake
+    mv $out/lib/cmake/AccountsQt5/AccountsQtConfigVersion.cmake \
+       $out/lib/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7302209d043..2a39a1d8381a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5508,6 +5508,8 @@ let
 
   accelio = callPackage ../development/libraries/accelio { };
 
+  accounts-qt = callPackage ../development/libraries/accounts-qt { };
+
   accountsservice = callPackage ../development/libraries/accountsservice { };
 
   acl = callPackage ../development/libraries/acl { };

From 68350c5b9ff4118d56fec191b476a4f29d1f12eb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 May 2015 10:53:01 -0500
Subject: [PATCH 0472/1143] add signon

---
 pkgs/development/libraries/signon/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/signon/default.nix

diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix
new file mode 100644
index 000000000000..0bafb42e2c52
--- /dev/null
+++ b/pkgs/development/libraries/signon/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, doxygen, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "signon-8.56";
+  src = fetchurl {
+    url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "00kwysm7bga0bycclkcyslsa6aahcn98drm125l6brzhigc7qxa8";
+  };
+
+  buildInputs = [ qt5.base ];
+  nativeBuildInputs = [ doxygen ];
+
+  configurePhase = ''
+    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5
+  '';
+
+  postInstall = ''
+    mv $out/lib/cmake/SignOnQt5/SignOnQtConfig.cmake \
+      $out/lib/cmake/SignOnQt5/SignOnQt5Config.cmake
+    mv $out/lib/cmake/SignOnQt5/SignOnQtConfigVersion.cmake \
+      $out/lib/cmake/SignOnQt5/SignOnQt5ConfigVersion.cmake
+  '';
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a39a1d8381a..65c55adbf2d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7709,6 +7709,8 @@ let
 
   soundtouch = callPackage ../development/libraries/soundtouch {};
 
+  signon = callPackage ../development/libraries/signon { };
+
   spandsp = callPackage ../development/libraries/spandsp {};
 
   spatialite_tools = callPackage ../development/libraries/spatialite-tools { };

From 84ff78dd8b98126798a33e10d078b8cfee101c00 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 May 2015 10:53:26 -0500
Subject: [PATCH 0473/1143] kdeApps_15_04: fix kaccounts-integration

---
 pkgs/applications/kde-apps-15.04/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index e29f484237f1..c3bbbb35c05e 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -12,7 +12,7 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, debug ? false }:
+{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, callPackage, debug ? false }:
 
 with stdenv.lib; with autonix;
 
@@ -191,6 +191,14 @@ let
         nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
       };
 
+      kaccounts-integration =
+        let accounts-qt = pkgs.accounts-qt.override { inherit qt5; };
+            signon = pkgs.signon.override { inherit qt5; };
+        in super.kaccounts-integration // {
+          buildInputs = super.kaccounts-integration.buildInputs
+            ++ [ accounts-qt signon ];
+        };
+
       kaccounts-providers = super.kaccounts-providers // {
         buildInputs = super.kaccounts-providers.buildInputs
           ++ (with pkgs; [ intltool libaccounts-glib ]);
@@ -329,6 +337,13 @@ let
         buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
       };
 
+      marble = super.marble // {
+        preConfigure = ''
+          ${super.preConfigure or ""}
+          cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake"
+        '';
+      };
+
     };
 
   l10nManifest =

From 4559bc015d355cb679faf33242298d8486374d09 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 6 May 2015 09:42:50 -0700
Subject: [PATCH 0474/1143] hiredis: 0.13.0 -> 0.13.1

---
 pkgs/development/libraries/hiredis/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 6476fb663ef9..86b1a2c72a52 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hiredis-${version}";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis";
     rev = "v${version}";
-    sha256 = "195ih8jprw0q253nvhnmfv9dsm8pss6pdf4x3c88q4mfsyw8pg76";
+    sha256 = "15rzq7n7z9h143smrnd34f9gh24swwal6r9z9xlxsl0jxabiv71l";
   };
 
   PREFIX = "\${out}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2826dc7ecd70..340e07f7ee23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -830,7 +830,6 @@ let
     libgcrypt = libgcrypt_1_6;
     czmq = null; # Currently Broken
     hadoop = null; # Currently Broken
-    hiredis = null; # Currently Broken
   };
 
   rsyslog-light = callPackage ../tools/system/rsyslog {

From 901849eca43fd7ca76da68eba3bc11870077b4e2 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 6 May 2015 20:19:54 +0300
Subject: [PATCH 0475/1143] less: fix sha

---
 pkgs/tools/misc/less/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 7924615201e6..8c0f0e96d21e 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
-    sha256 = "1w7d10h6hzgz5zww8g4aja2fbl7xwx30vd07hcg1fcy7hm8yc1q2";
+    sha256 = "16703m6g5l97af3jwpypgac7gpmh3yjkdpqygf5a2scfip0hxm2g";
   };
 
   # Look for ‘sysless’ in /etc.

From c5a0dae668902674179ef2b4a98de06fa9566e1b Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 6 May 2015 22:01:16 +0300
Subject: [PATCH 0476/1143] lua_patch: fix sha

---
 pkgs/development/interpreters/lua-5/5.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 1812ccbf7d6e..eccc64d744fe 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -3,7 +3,7 @@
 let
   dsoPatch = fetchurl {
     url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua";
-    sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9";
+    sha256 = "1n53869fshazj1w52kdh582nwyg2rqf2ssvnjqvdlb9s89vkrj1c";
     name = "lua-arch.patch";
   };
 in

From f24d8777dd7f1038796cd8bba0f1ec47b32aace0 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 6 May 2015 22:05:20 +0300
Subject: [PATCH 0477/1143] Revert "lua_patch: fix sha"

This reverts commit c5a0dae668902674179ef2b4a98de06fa9566e1b.
---
 pkgs/development/interpreters/lua-5/5.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index eccc64d744fe..1812ccbf7d6e 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -3,7 +3,7 @@
 let
   dsoPatch = fetchurl {
     url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua";
-    sha256 = "1n53869fshazj1w52kdh582nwyg2rqf2ssvnjqvdlb9s89vkrj1c";
+    sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9";
     name = "lua-arch.patch";
   };
 in

From 75ee41fdb9cf5211c61fed76b026d87225630876 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 6 May 2015 22:05:44 +0300
Subject: [PATCH 0478/1143] lua_patch: fix url

---
 pkgs/development/interpreters/lua-5/5.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 1812ccbf7d6e..313db1038b85 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -2,7 +2,7 @@
 
 let
   dsoPatch = fetchurl {
-    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua";
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua52";
     sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9";
     name = "lua-arch.patch";
   };

From 40b9e938b6c1ccc8e15b41309f87bcb6a63345b4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 6 May 2015 21:51:01 +0200
Subject: [PATCH 0479/1143] postfix service: description enhancement

closes #7651
---
 nixos/modules/services/mail/postfix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index b84c63e6421d..839da7407ef9 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -265,7 +265,7 @@ in
       extraAliases = mkOption {
         default = "";
         description = "
-          Additional entries to put verbatim into aliases file.
+          Additional entries to put verbatim into aliases file, cf. man-page aliases(8).
         ";
       };
 
@@ -302,7 +302,7 @@ in
       virtual = mkOption {
         default = "";
         description = "
-          Entries for the virtual alias map.
+          Entries for the virtual alias map, cf. man-page virtual(8).
         ";
       };
 

From 02f97e2288b72f5710546fe4f493bea3ec8e3c18 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 6 May 2015 23:40:52 +0200
Subject: [PATCH 0480/1143] msmtp: 1.6.1 -> 1.6.2

Fixes removal of consecutive Bcc headers.
---
 pkgs/applications/networking/msmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 86ad4031622f..363e98d46d25 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.1";
+  version = "1.6.2";
   name = "msmtp-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/msmtp/${name}.tar.xz";
-    sha256 = "1ws6hdpm8vfq4vwxjwgd8xndx5ax1ppnmxn0fhzlwj3pvkr4fpf4";
+    sha256 = "12c7ljahb06pgn8yvvw526xvr11vnr6d4nr0apylixddpxycsvig";
   };
 
   buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];

From db79335c0785fae6665c59ca9bee8b24685ffb0d Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Mon, 20 Apr 2015 15:20:07 +0200
Subject: [PATCH 0481/1143] mysql: /run/mysql now 0755 (instead 0700)

see https://github.com/NixOS/nixpkgs/pull/7482
---
 nixos/modules/services/databases/mysql.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 05b13492052a..b5919047cc11 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -176,11 +176,11 @@ in
                 touch /tmp/mysql_init
             fi
 
-            mkdir -m 0700 -p ${cfg.pidDir}
+            mkdir -m 0755 -p ${cfg.pidDir}
             chown -R ${cfg.user} ${cfg.pidDir}
 
             # Make the socket directory
-            mkdir -m 0700 -p /run/mysqld
+            mkdir -m 0755 -p /run/mysqld
             chown -R ${cfg.user} /run/mysqld
           '';
 

From 0d5e144210a3a2b2d486de88c26bff0fcb1e0b33 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 6 May 2015 11:15:46 +0300
Subject: [PATCH 0482/1143] platforms: Add ARMv7 (hard float) multiplatform

Based on the 'multi_v7_defconfig' that supports numerous boards.
---
 pkgs/top-level/platforms.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index fc0fe23d4fb1..7127d6bc79d1 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -483,4 +483,22 @@ rec {
       float = "hard";
     };
   };
+
+  armv7l-hf-multiplatform = {
+    name = "armv7l-hf-multiplatform";
+    kernelMajor = "2.6";
+    kernelHeadersBaseConfig = "multi_v7_defconfig";
+    kernelBaseConfig = "multi_v7_defconfig";
+    kernelArch = "arm";
+    kernelAutoModules = false;
+    kernelExtraConfig = "";
+    kernelTarget = "zImage";
+    kernelDTB = true;
+    uboot = null;
+    gcc = {
+      arch = "armv7-a";
+      fpu = "vfpv3-d16";
+      float = "hard";
+    };
+  };
 }

From a7c4aba8968dfa85a147f60398d266441bc2b5ae Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 6 May 2015 11:15:13 +0300
Subject: [PATCH 0483/1143] ARM: Assume armv7l-hf-multiplatform instead of
 beaglebone

Several places in the tree associate the ARMv7 system
with the beaglebone platform. Change them to point to
armv7l-hf-multiplatform as it supports several boards (including the
beaglebone as well)
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 6 +++---
 pkgs/top-level/all-packages.nix                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 9cc5d4700878..520bdd208e36 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -34,7 +34,7 @@ let
     };
   };
   
-  beagleboneCrossSystem = {
+  armv7l-hf-multiplatform-crossSystem = {
     crossSystem = rec {
       config = "armv7l-unknown-linux-gnueabi";  
       bigEndian = false;
@@ -43,7 +43,7 @@ let
       fpu = "vfpv3-d16";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.beaglebone;
+      platform = pkgsNoParams.platforms.armv7l-hf-multiplatform;
       openssl.system = "linux-generic32";
       inherit (platform) gcc;
     };
@@ -52,7 +52,7 @@ let
   selectedCrossSystem =
     if toolsArch == "armv5tel" then sheevaplugCrossSystem else
     if toolsArch == "armv6l" then raspberrypiCrossSystem else
-    if toolsArch == "armv7l" then beagleboneCrossSystem else null;
+    if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else null;
 
   pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65c55adbf2d7..ca4177f380d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -72,7 +72,7 @@ let
       platforms = (import ./platforms.nix);
     in
       if system == "armv6l-linux" then platforms.raspberrypi
-      else if system == "armv7l-linux" then platforms.beaglebone
+      else if system == "armv7l-linux" then platforms.armv7l-hf-multiplatform
       else if system == "armv5tel-linux" then platforms.sheevaplug
       else if system == "mips64el-linux" then platforms.fuloong2f_n32
       else if system == "x86_64-linux" then platforms.pc64

From a6aa673849fa8716e88237c0bda39df394b3cfc8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 7 May 2015 06:00:49 +0300
Subject: [PATCH 0484/1143] ARMv7 platforms: switch header config to
 multi_v7_defconfig

Otherwise they wouldn't be able to share a binary cache since glibc et
al would get a different hash due to different linux-headers package.
---
 pkgs/top-level/platforms.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 7127d6bc79d1..47d7d5993f1c 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -217,7 +217,7 @@ rec {
   raspberrypi2 = {
     name = "raspberrypi2";
     kernelMajor = "3.14";
-    kernelHeadersBaseConfig = "kirkwood_defconfig";
+    kernelHeadersBaseConfig = "multi_v7_defconfig";
     kernelBaseConfig = "bcm2709_defconfig";
     kernelArch = "arm";
     kernelDTB = true;
@@ -470,7 +470,7 @@ rec {
   beaglebone = {
     name = "beaglebone";
     kernelMajor = "2.6";
-    kernelHeadersBaseConfig = "omap2plus_defconfig";
+    kernelHeadersBaseConfig = "multi_v7_defconfig";
     kernelBaseConfig = "omap2plus_defconfig";
     kernelArch = "arm";
     kernelAutoModules = false;

From 9fc72c8ab8dc1e9c9eab9d091068b11f7de9184f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 6 May 2015 11:40:53 +0300
Subject: [PATCH 0485/1143] kernel: Install DTBs into a subdirectory

This avoids the pollution of the top-level kernel output directory and
also simplifies the boot entry generator script I will be using on ARM.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index c57082c93305..963e10a59645 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -125,7 +125,8 @@ let
         mkdir -p $out/lib/firmware
       '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
  	make $makeFlags "''${makeFlagsArray[@]}" dtbs
-        cp $buildRoot/arch/$karch/boot/dts/*dtb $out
+        mkdir -p $out/dtbs
+        cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs
       '' else "") + (if isModular then ''
         make modules_install $makeFlags "''${makeFlagsArray[@]}" \
           $installFlags "''${installFlagsArray[@]}"

From 00c4c52277d95f64cd0faa205a7a0d00b1c63fef Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Thu, 7 May 2015 00:11:00 -0400
Subject: [PATCH 0486/1143] Fix bundler HEAD

---
 pkgs/development/interpreters/ruby/bundler-head.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 35b8823d22a7..5b190c5a43bf 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -1,12 +1,12 @@
-{ buildRubyGem, coreutils, fetchgit }:
+{ buildRubyGem, coreutils, fetchFromGitHub }:
 
 buildRubyGem {
   name = "bundler-HEAD";
-  src = fetchgit {
-    url = "https://github.com/bundler/bundler.git";
-    rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "0q7cjmz1fsrw3yfsr3h274qjamwnw01xgaqq3h5cjbqlrni4iq7k";
-    leaveDotGit = true;
+  src = fetchFromGitHub {
+    owner  = "bundler";
+    repo   = "bundler";
+    rev    = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
+    sha256 = "05275drvlrrlbync39qdw9nrsabb5yxcns7a7rk5c0ggsfc6hsnb";
   };
   dontPatchShebangs = true;
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f08ecfeb5bd9..302a4d7dce02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4771,7 +4771,7 @@ let
   };
   bundler = callPackage ../development/interpreters/ruby/bundler.nix { };
   bundler_HEAD = import ../development/interpreters/ruby/bundler-head.nix {
-    inherit buildRubyGem coreutils fetchgit;
+    inherit buildRubyGem coreutils fetchFromGitHub;
   };
   defaultGemConfig = callPackage ../development/interpreters/ruby/bundler-env/default-gem-config.nix { };
   buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { };

From 35ddd2543a8f6effed1366166117919493ac5f62 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Thu, 7 May 2015 01:10:46 -0400
Subject: [PATCH 0487/1143] Revert "Fix bundler HEAD"

This reverts commit 00c4c52277d95f64cd0faa205a7a0d00b1c63fef.
---
 pkgs/development/interpreters/ruby/bundler-head.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 5b190c5a43bf..35b8823d22a7 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -1,12 +1,12 @@
-{ buildRubyGem, coreutils, fetchFromGitHub }:
+{ buildRubyGem, coreutils, fetchgit }:
 
 buildRubyGem {
   name = "bundler-HEAD";
-  src = fetchFromGitHub {
-    owner  = "bundler";
-    repo   = "bundler";
-    rev    = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "05275drvlrrlbync39qdw9nrsabb5yxcns7a7rk5c0ggsfc6hsnb";
+  src = fetchgit {
+    url = "https://github.com/bundler/bundler.git";
+    rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
+    sha256 = "0q7cjmz1fsrw3yfsr3h274qjamwnw01xgaqq3h5cjbqlrni4iq7k";
+    leaveDotGit = true;
   };
   dontPatchShebangs = true;
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 302a4d7dce02..f08ecfeb5bd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4771,7 +4771,7 @@ let
   };
   bundler = callPackage ../development/interpreters/ruby/bundler.nix { };
   bundler_HEAD = import ../development/interpreters/ruby/bundler-head.nix {
-    inherit buildRubyGem coreutils fetchFromGitHub;
+    inherit buildRubyGem coreutils fetchgit;
   };
   defaultGemConfig = callPackage ../development/interpreters/ruby/bundler-env/default-gem-config.nix { };
   buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { };

From 5454be28aa919032fbf0a4f3c13891e36750d44b Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Thu, 7 May 2015 01:14:14 -0400
Subject: [PATCH 0488/1143] I suppose this is the 'better' way to fix bundler
 for now. Ugh

---
 pkgs/development/interpreters/ruby/bundler-head.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 35b8823d22a7..3e10a1e4b549 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -5,7 +5,7 @@ buildRubyGem {
   src = fetchgit {
     url = "https://github.com/bundler/bundler.git";
     rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "0q7cjmz1fsrw3yfsr3h274qjamwnw01xgaqq3h5cjbqlrni4iq7k";
+    sha256 = "11pbg71bhp66nyhwk0cpbcn1fhp4amv8sr2vx8dw83dcnqqafn92";
     leaveDotGit = true;
   };
   dontPatchShebangs = true;

From c7e7f12ef679f53a76e811d3e047d97fd34331ea Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 7 May 2015 07:56:03 +0200
Subject: [PATCH 0489/1143] uqm: Bring back package and fix 3do extractor.

It was dropped in 324719a5a611501d7b54e14f205465f5da1242b1.

The UQM package itself doesn't require Haskell, but in order to extract
contents from the 3do version of the game, we need to have a small
helper utility which I wrote in Haskell a while ago. In order to switch
it to Haskell NG, only very minor modifications were necessary, which
are now done with this commit instead of dropping the whole game.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/games/uqm/3dovideo.nix     |  60 ++++++++++++++++++
 pkgs/games/uqm/default.nix      | 108 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |   2 +
 3 files changed, 170 insertions(+)
 create mode 100644 pkgs/games/uqm/3dovideo.nix
 create mode 100644 pkgs/games/uqm/default.nix

diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix
new file mode 100644
index 000000000000..ca5a1197a327
--- /dev/null
+++ b/pkgs/games/uqm/3dovideo.nix
@@ -0,0 +1,60 @@
+{ stdenv, requireFile, writeText, fetchurl, haskellPackages }:
+
+with stdenv.lib;
+
+let
+  makeSpin = num: let
+    padded = (optionalString (lessThan num 10) "0") + toString num;
+  in "slides.spins.${padded} = 3DOVID:" +
+     "addons/3dovideo/spins/ship${padded}.duk:" +
+     "addons/3dovideo/spins/spin.aif:" +
+     "addons/3dovideo/spins/ship${padded}.aif:89";
+
+  videoRMP = writeText "3dovideo.rmp" (''
+    slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk
+    slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk
+  '' + concatMapStrings makeSpin (range 0 24));
+
+  helper = with haskellPackages; mkDerivation {
+    pname = "uqm3donix";
+    version = "0.1.0.0";
+
+    src = fetchurl {
+      url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz";
+      sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb";
+    };
+
+    isLibrary = false;
+    isExecutable = true;
+
+    buildDepends = [ base binary bytestring filepath tar ];
+
+    description = "Extract video files from a Star Control II 3DO image";
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+in stdenv.mkDerivation {
+  name = "uqm-3dovideo";
+
+  src = requireFile rec {
+    name = "videos.tar";
+    sha256 = "044h0cl69r0kc43vk4n0akk0prwzb7inq324h5yfqb38sd4zkds1";
+    message = ''
+      In order to get the intro and ending sequences from the 3DO version, you
+      need to have the original 3DO Star Control II CD. Create an image from the
+      CD and use uqm3donix* to extract a tarball with the videos from it. The
+      reason for this is because the 3DO uses its own proprietary disk format.
+
+      Save the file as videos.tar and use "nix-prefetch-url file://${name}" to
+      add it to the Nix store.
+
+      [*] ${helper}/bin/uqm3donix CDIMAGE ${name}
+    '';
+  };
+
+  buildCommand = ''
+    mkdir -vp "$out"
+    tar xf "$src" -C "$out" --strip-components=3
+    cp "${videoRMP}" "$out/3dovideo.rmp"
+  '';
+}
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
new file mode 100644
index 000000000000..9d233d383384
--- /dev/null
+++ b/pkgs/games/uqm/default.nix
@@ -0,0 +1,108 @@
+{ stdenv, fetchurl
+, pkgconfig, mesa
+, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip
+
+, use3DOVideos ? false, requireFile ? null, writeText ? null
+, haskellPackages ? null
+
+, useRemixPacks ? false
+}:
+
+assert use3DOVideos -> requireFile != null && writeText != null
+                    && haskellPackages != null;
+
+with stdenv.lib;
+
+let
+  videos = import ./3dovideo.nix {
+    inherit stdenv requireFile writeText fetchurl haskellPackages;
+  };
+
+  remixPacks = imap (num: sha256: fetchurl rec {
+    name = "uqm-remix-disc${toString num}.uqm";
+    url = "mirror://sourceforge/sc2/${name}";
+    inherit sha256;
+  }) [
+    "1s470i6hm53l214f2rkrbp111q4jyvnxbzdziqg32ffr8m3nk5xn"
+    "1pmsq65k8gk4jcbyk3qjgi9yqlm0dlaimc2r8hz2fc9f2124gfvz"
+    "07g966ylvw9k5q9jdzqdczp7c5qv4s91xjlg4z5z27fgcs7rzn76"
+    "1l46k9aqlcp7d3fjkjb3n05cjfkxx8rjlypgqy0jmdx529vikj54"
+  ];
+
+in stdenv.mkDerivation rec {
+  name = "uqm-${version}";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz";
+    sha256 = "08dj7fsvflxx69an6vpf3wx050mk0ycmdv401yffrrqbgxgmqsd3";
+  };
+
+  content = fetchurl {
+    url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm";
+    sha256 = "1gx39ns698hyczd4nx73mr0z86bbi4q3h8sw3pxjh1lzla5xpxmq";
+  };
+
+  voice = fetchurl {
+    url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm";
+    sha256 = "0yf9ff5sxk229202gsa7ski6wn7a8hkjjyr1yr7mjdxsnh0zik5w";
+  };
+
+  music = fetchurl {
+    url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm";
+    sha256 = "10nbvcrr0lc0mxivxfkcbxnibwk3vwmamabrlvwdsjxd9pk8aw65";
+  };
+
+
+ /* uses pthread_cancel(), which requires libgcc_s.so.1 to be
+    loadable at run-time. Adding the flag below ensures that the
+    library can be found. Obviously, though, this is a hack. */
+  NIX_LDFLAGS="-lgcc_s";
+
+  buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip pkgconfig mesa];
+
+  postUnpack = ''
+    mkdir -p uqm-${version}/content/packages
+    mkdir -p uqm-${version}/content/addons
+    ln -s "$content" "uqm-${version}/content/packages/uqm-0.7.0-content.uqm"
+    ln -s "$music" "uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm"
+    ln -s "$voice" "uqm-${version}/content/addons/uqm-0.7.0-voice.uqm"
+  '' + optionalString useRemixPacks (concatMapStrings (disc: ''
+    ln -s "${disc}" "uqm-$version/content/addons/${disc.name}"
+  '') remixPacks) + optionalString use3DOVideos ''
+    ln -s "${videos}" "uqm-${version}/content/addons/3dovideo"
+  '';
+
+  /* uqm has a 'unique' build system with a root script incidentally called
+ * 'build.sh'. */
+
+  configurePhase = ''
+    echo "INPUT_install_prefix_VALUE='$out'" >> config.state
+    echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state
+    echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state
+    echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state
+    PREFIX=$out ./build.sh uqm config
+  '';
+
+  buildPhase = ''
+    ./build.sh uqm
+  '';
+
+  installPhase = ''
+    ./build.sh uqm install
+    sed -i $out/bin/uqm -e "s%/usr/local/games/%$out%g"
+  '';
+
+  meta = {
+    description = "Remake of Star Control II";
+    longDescription = ''
+    The goals for the The Ur-Quan Masters project are:
+      - to bring Star Control II to modern platforms, thereby making a lot of people happy
+      - to make game translations easy, thereby making even more people happy
+      - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy!
+    '';
+    homepage = http://sc2.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with maintainers; [ jcumming aszlig ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f08ecfeb5bd9..6bac3bfc57bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13126,6 +13126,8 @@ let
 
   unvanquished = callPackage ../games/unvanquished { };
 
+  uqm = callPackage ../games/uqm { };
+
   urbanterror = callPackage ../games/urbanterror { };
 
   ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });

From 10bb715c077ced71defbd4318cebe77b64b7a279 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 May 2015 10:10:33 +0200
Subject: [PATCH 0490/1143] geolite-legacy -> 2015-05-07

---
 pkgs/data/misc/geolite-legacy/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 08b402b004e9..7715a0db2362 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,19 +8,19 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-05-05";
+  version = "2015-05-07";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
-    "15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k";
+    "15p8is7jml8xsy7a8afsjq7q20pkisbk5b7nj465ljaz5svq6rgv";
   srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
-    "0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i";
+    "0apiypf500k9k89x6zm1109gw6j9xs83c80iyl17rxlik1hhqf8g";
   srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
-    "1z40kfjwn90fln7nfnk5pwcn1wl9imw5jz6bcdy8yr552m2n31y7";
+    "12j44586jmvk1jnxs345lgdgl9izn51xgh1m2jm7lklsyw13b2nk";
   srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
-    "1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv";
+    "1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb";
   srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
     "1y5b68s1giw01vw98c99qdhjiaxx6l4hrc2mx4rdaja46zic4maz";
   srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"

From 3f9817fd51fa7edb64c23bea0de77c86e5fff8d7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 01:38:03 -0700
Subject: [PATCH 0491/1143] Revert "libvorbis: Fix ogg dependency"

This reverts commit ca5c9e6cf2ea5a7367154c52b41072722924ef2b.
---
 pkgs/development/libraries/libvorbis/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 2ab6f6246726..7e34c6e9b9fa 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -13,12 +13,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  # Fix header reference
-  postInstall = ''
-    sed -i $out/include/vorbis/codec.h \
-      -e 's,#include <ogg/ogg.h>,#include "${libogg}/include/ogg/ogg.h",g'
-  '';
-
   meta = with stdenv.lib; {
     homepage = http://xiph.org/vorbis/;
     license = licenses.bsd3;

From d3f3317632f40b403afab3cc055c78ead00e93bd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 01:38:14 -0700
Subject: [PATCH 0492/1143] Revert "Revert "libvorbis: propagate libogg
 dependency""

This reverts commit 5728c06f8320e134795374f35289ee6590ba2f85.
---
 pkgs/development/libraries/libvorbis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 7e34c6e9b9fa..cff6cbe8616f 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libogg ];
+  propagatedBuildInputs = [ libogg ];
 
   doCheck = true;
 

From 650d3f8fc4e49d6caed46b8f6db077e634682bd6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 7 May 2015 08:50:47 +0000
Subject: [PATCH 0493/1143] Revert restartIfChanged on fetch-ec2-data, as it
 breaks deployments that set ec2.metadata = true, as the existing (default)
 blackhole will not be cleared.

(cherry picked from commit ccf672ca6b055e5e862e45b65d122754c16cf7d1)
---
 nixos/modules/virtualisation/ec2-data.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index b21c6bfbc0be..fd062237bb07 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -79,8 +79,6 @@ with lib;
 
         serviceConfig.Type = "oneshot";
         serviceConfig.RemainAfterExit = true;
-
-        restartIfChanged = false;
       };
 
     systemd.services."print-host-key" =

From e9b093bc9851a05eac2e1a0a9340c0c3a8d4e605 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 7 May 2015 06:04:20 -0400
Subject: [PATCH 0494/1143] stxxl: refactor

---
 pkgs/development/libraries/stxxl/default.nix | 30 ++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index 23590f17ca88..9fb25aa36e0a 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -1,24 +1,38 @@
-{stdenv, fetchurl, cmake, parallel ? true }:
+{ stdenv, fetchurl, cmake
+, parallel ? true
+}:
+
+let
+  mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF";
+in
 
 stdenv.mkDerivation rec {
-  name = "stxxl-1.4.1";
+  name = "stxxl-${version}";
+  version = "1.4.1";
 
   src = fetchurl {
-    url = "https://github.com/stxxl/stxxl/archive/1.4.1.tar.gz";
+    url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz";
     sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = let parallel_str = if parallel then "ON" else "OFF"; in "-DUSE_GNU_PARALLEL=${parallel_str}";
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_STATIC_LIBS=OFF"
+    "-DCMAKE_BUILD_TYPE=Release"
+    (mkFlag parallel "USE_GNU_PARALLEL")
+  ];
 
   passthru = {
     inherit parallel;
   };
 
-  meta = {
-    homepage = https://github.com/stxxl/stxxl;
+  meta = with stdenv.lib; {
     description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations";
-    license = stdenv.lib.licenses.boost;
+    homepage = https://github.com/stxxl/stxxl;
+    license = licenses.boost;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.all;
   };
 }

From d27b8e642ed60a00d9a55003d8799ae9303deb20 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Tue, 5 May 2015 10:26:17 +0100
Subject: [PATCH 0495/1143] mono 3.12.1 -> 4.0.1 monodevelop 5.7.0.660 ->
 5.9.0.431

---
 .../editors/monodevelop/default.nix           | 94 +++++++++++++------
 pkgs/development/compilers/mono/default.nix   | 10 +-
 2 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 4e8e6079ff16..b04e37746e05 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -4,49 +4,84 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.7.0.660";
-  revision = "6a74f9bdb90d9415b597064d815c9be38b401fee";
+  version = "5.9.0.431";
+  revision = "7560726734fc7267de2fa9abed2509968deefaa8";
   name = "monodevelop-${version}";
 
-  srcs = [
-    (fetchurl {
-      url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
-      sha256 = "0i9fpjkcys991dhxh02zf9imar3aj6fldk9ymy09vmr10f4d7vbf";
-    })
-    (fetchurl {
-      url = "https://launchpadlibrarian.net/153448659/NUnit-2.6.3.zip";
-      sha256 = "0vzbziq44zy7fyyhb44mf9ypfi7gvs17rxpg8c9d9lvvdpkshhcp";
-    })
-    (fetchurl {
-      url = "https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip";
-      sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc";
-    })
-    (fetchgit {
-      url = "https://github.com/mono/nuget-binary.git";
-      rev = "ecb27dd49384d70b6c861d28763906f2b25b7c8";
-      sha256 = "0dj0yglgwn07xw2crr66vl0vcgnr6m041pynyq0kdd0z8nlp92ki";
-    })
-  ];
+  src = fetchurl {
+    url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
+    sha256 = "1bgqvlfi6pilj2zxsviqilh63qq98wsijqdiqwpkqchcw741zlyn";
+  };
 
-  sourceRoot = "monodevelop-5.7";
+  srcNugetBinary = fetchgit {
+    url = "https://github.com/mono/nuget-binary.git";
+    rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047";
+    sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3";
+  };
+
+  srcNUnit = fetchurl {
+    url = "https://www.nuget.org/api/v2/package/NUnit/2.6.3";
+    sha256 = "0bb16i4ggwz32wkxsh485wf014cqqzhbyx0b3wbpmqjw7p4canph";
+  };
+
+  srcNUnitRunners = fetchurl {
+    url = "https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3";
+    sha256 = "0qwx1i9lxkp9pijj2bsczzgsamz651hngkxraqjap1v4m7d09a3b";
+  };
+
+  srcNUnit2510 = fetchurl {
+    url = "http://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip";
+    sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc";
+  };
+
+  srcNugetSystemWebMvcExtensions = fetchurl {
+    url = https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9;
+    sha256 = "19wi662m8primpimzifv8k560m6ymm73z0mf1r8ixl0xqag1hx6j";
+  };
+
+  srcNugetMicrosoftAspNetMvc = fetchurl {
+    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2;
+    sha256 = "1jwfmz42kw2yb1g2hgp2h34fc4wx6s8z71da3mw5i4ivs25w9n2b";
+  };
+
+  srcNugetMicrosoftAspNetRazor = fetchurl {
+    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2;
+    sha256 = "1db3apn4vzz1bx6q5fyv6nyx0drz095xgazqbw60qnhfs7z45axd";
+  };
+
+  srcNugetMicrosoftAspNetWebPages = fetchurl {
+    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2;
+    sha256 = "17fwb5yj165sql80i47zirjnm0gr4n8ypz408mz7p8a1n40r4i5l";
+  };
+
+  srcNugetMicrosoftWebInfrastructure = fetchurl {
+    url = https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0;
+    sha256 = "1mxl9dri5729d0jl84gkpqifqf4xzb6aw1rzcfh6l0r24bix9afn";
+  };
 
   postPatch = ''
     # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19
 
     # it seems parts of MonoDevelop 5.2+ need NUnit 2.6.4, which isn't included
     # (?), so download it and put it in the right place in the tree
-    mkdir -v -p packages/NUnit.2.6.3/lib
-    cp -vfR ../NUnit-2.6.3/bin/framework/* packages/NUnit.2.6.3/lib
-    mkdir -v -p packages/NUnit.Runners.2.6.3/tools/lib
-    cp -vfR ../NUnit-2.6.3/bin/lib/* packages/NUnit.Runners.2.6.3/tools/lib
+    mkdir packages
+    unzip ${srcNUnit} -d packages/NUnit.2.6.3
+    unzip ${srcNUnitRunners} -d packages/NUnit.Runners.2.6.3
 
     # cecil needs NUnit 2.5.10 - this is also missing from the tar
-    cp -vfR ../NUnit-2.5.10.11092/bin/net-2.0/framework/* external/cecil/Test/libs/nunit-2.5.10
+    unzip -j ${srcNUnit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\*
 
     # the tar doesn't include the nuget binary, so grab it from github and copy it
     # into the right place
-    cp -vfR ../nuget-binary-*/* external/nuget-binary/
-    '';
+    cp -vfR ${srcNugetBinary}/* external/nuget-binary/
+
+    # AspNet plugin requires these packages
+    unzip ${srcNugetSystemWebMvcExtensions} -d packages/System.Web.Mvc.Extensions.Mvc.4.1.0.9
+    unzip ${srcNugetMicrosoftAspNetMvc} -d packages/Microsoft.AspNet.Mvc.5.2.2
+    unzip ${srcNugetMicrosoftAspNetRazor} -d packages/Microsoft.AspNet.Razor.3.2.2
+    unzip ${srcNugetMicrosoftAspNetWebPages} -d packages/Microsoft.AspNet.WebPages.3.2.2
+    unzip ${srcNugetMicrosoftWebInfrastructure} -d packages/Microsoft.Web.Infrastructure.1.0.0.0
+  '';
 
   buildInputs = [
     autoconf automake pkgconfig shared_mime_info intltool
@@ -54,6 +89,7 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = "patchShebangs ./configure";
+
   preBuild = ''
     cat > ./buildinfo <<EOF
     Release ID: ${version}
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index a9e0dd89e84c..ba2ce00cfb56 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -6,10 +6,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mono-${version}";
-  version = "3.12.1";
+  version = "4.0.1";
   src = fetchurl {
     url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
-    sha256 = "03dn68vignknzxy1rx75p16qx1ild27hixgvr5mw0j19mx9z332x";
+    sha256 = "1kjv1zhcmd2qfr89vkaas6541n5jfzisn3y030l6lg6lp3ria7zz";
   };
 
   buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
     substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
   '';
 
-  #Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
-  #Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
-  #http://www.mono-project.com/Config_DllMap
+  # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
+  # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
+  # http://www.mono-project.com/Config_DllMap
   postBuild = ''
     find . -name 'config' -type f | while read i; do
         sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i

From 3715dbbb988aabb57de32bc5b32ba098cdf24473 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 7 May 2015 14:28:14 +0200
Subject: [PATCH 0496/1143] gnome-contacts: use automake 1.14

---
 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
index 49bd7ac70f48..5b4ca5c34182 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
 , bash, makeWrapper, itstool, folks, libnotify, libxml2
 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala, dbus_glib, automake, autoconf }:
+, libsoup, vala, dbus_glib, automake114x, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "gnome-contacts-3.12.0";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg
                   hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  vala automake autoconf db ];
+                  vala automake114x autoconf db ];
 
   preFixup = ''
     for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do

From ff075758d74b76b1fc633fc6934cc5981e0096f6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 7 May 2015 08:05:22 -0400
Subject: [PATCH 0497/1143] Fix calibre PDF handling

In c0d5cd0ff90cac2e04f6b436991baa4c4471150f, the binaries for poppler
were carved off into a separate package, and calibre has had broken pdf
support since.  This changes all dependencies on poppler to
poppler_utils, which fixes this support, much as was done for
cups_filter in 394562655ff09ef490eca8b14fe02c393e9ac70e.
---
 pkgs/applications/misc/calibre/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 13738cdafe58..670d7667e1b9 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler, pkgconfig, libpng
+{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig ];
 
   buildInputs =
-    [ python pyqt5 sip_4_16 poppler libpng imagemagick libjpeg
+    [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
       fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     export HOME=$TMPDIR/fakehome
-    export POPPLER_INC_DIR=${poppler}/include/poppler
-    export POPPLER_LIB_DIR=${poppler}/lib
+    export POPPLER_INC_DIR=${poppler_utils}/include/poppler
+    export POPPLER_LIB_DIR=${poppler_utils}/lib
     export MAGICK_INC=${imagemagick}/include/ImageMagick
     export MAGICK_LIB=${imagemagick}/lib
     export FC_INC_DIR=${fontconfig}/include/fontconfig
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
                      --prefix LD_LIBRARY_PATH : ${unrar}/lib \
-                     --prefix PATH : ${poppler}/bin
+                     --prefix PATH : ${poppler_utils}/bin
     done
   '';
 

From 0c0e37a32b646e986921981a868c2319c7ec9855 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 7 May 2015 08:38:43 -0400
Subject: [PATCH 0498/1143] libsexy: add meta

---
 pkgs/development/libraries/libsexy/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix
index 81a38d399735..179c899d754d 100644
--- a/pkgs/development/libraries/libsexy/default.nix
+++ b/pkgs/development/libraries/libsexy/default.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk, pango
+{ stdenv, fetchurl, pkgconfig
+, glib, gtk, libxml2, pango
 }:
  
 stdenv.mkDerivation {
   name = "libsexy-0.1.11";
-  #builder = ./builder.sh;
 
   src = fetchurl {
     url = http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.gz;
     sha256 = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e";
   };
 
-  buildInputs = [ pkgconfig libxml2 glib gtk pango
-  ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  #configureFlags="";  
+  buildInputs = [ glib gtk libxml2 pango ];
+
+  meta = with stdenv.lib; {
+    description = "A collection of GTK+ widgets";
+    homepahe = http://blog.chipx86.com/tag/libsexy/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.unix;
+  };
 }

From c3f6c8c582f14538e4d6a7065e63bc03cafd8a7d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 May 2015 15:27:45 +0200
Subject: [PATCH 0499/1143] Mount /dev/shm in VMs

---
 pkgs/build-support/vm/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index fc41e8ec52ed..838548f94bfe 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -113,6 +113,9 @@ rec {
     mkdir -p /fs/dev
     mount -o bind /dev /fs/dev
 
+    mkdir -p /fs/dev /fs/dev/shm
+    mount -t tmpfs -o "mode=1777" none /fs/dev/shm
+
     echo "mounting Nix store..."
     mkdir -p /fs/nix/store
     mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose

From 5f874466ebdbda586d34cf6bdb9e0ccdcb937435 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 7 May 2015 09:50:50 -0400
Subject: [PATCH 0500/1143] libsass: 3.1.0 -> 3.2.2

---
 .../development/libraries/libsass/default.nix | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index dbfa1656a1a6..69bae8abfeba 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.1.0";
+  version = "3.2.2";
 
-  src = fetchFromGitHub {
-    owner = "sass";
-    repo = "libsass";
-    rev = version;
-    sha256 = "1k9a6hiybqk7xx4k2cb9vhdqskrrzhi60dvwp3gx39jhjqjfl96p";
+  src = fetchurl {
+    url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
+    sha256 = "022rvsnqslds1ss6ls1x1w93mrhq7nigd00wjlnd07qhfqpbnwax";
   };
 
-  preConfigure = ''
-    autoreconf --force --install
+  patchPhase = ''
+    export LIBSASS_VERSION=${version}
   '';
 
-  buildInputs = [ autoconf automake libtool ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A C/C++ implementation of a Sass compiler";
-    license = licenses.mit;
     homepage = https://github.com/sass/libsass;
+    license = licenses.mit;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

From 0f4b787428668c0f23f97abb635939de9a3b5642 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 7 May 2015 09:51:40 -0400
Subject: [PATCH 0501/1143] sassc: 3.1.0 -> 3.2.1

---
 pkgs/development/tools/sassc/default.nix | 28 ++++++++++--------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix
index b9b897421658..451ee3a719cf 100644
--- a/pkgs/development/tools/sassc/default.nix
+++ b/pkgs/development/tools/sassc/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libsass }:
+{ stdenv, fetchurl, autoreconfHook, libsass }:
 
 stdenv.mkDerivation rec {
-  name = "sassc";
-  version = "3.1.0";
+  name = "sassc-${version}";
+  version = "3.2.1";
 
-  src = fetchFromGitHub {
-    owner = "sass";
-    repo = "sassc";
-    rev = version;
-    sha256 = "0lpilmsir9b9292a4b8kq3zzg5cfh031p0krgam5rmsn39i6ivs4";
+  src = fetchurl {
+    url = "https://github.com/sass/sassc/archive/${version}.tar.gz";
+    sha256 = "18pp7ylcwfvfagvnpw660cdvv7cjl7pl9v8x7xr05fp2l6133rxw";
   };
 
-  preConfigure = ''
-    export SASSC_VERSION="3.1.0"
-    autoreconf --force --install
+  patchPhase = ''
+    export SASSC_VERSION=${version}
   '';
 
-  buildInputs = [ autoconf automake libtool libsass ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp sassc $out/bin/
-  '';
+  buildInputs = [ libsass ];
 
   meta = with stdenv.lib; {
     description = "A front-end for libsass";
-    license = licenses.mit;
     homepage = https://github.com/sass/sassc/;
+    license = licenses.mit;
     maintainers = with maintainers; [ pjones ];
     platforms = platforms.unix;
   };

From 72d925f7efd2c87f4a966f2b4010460d22ef6340 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 May 2015 16:05:51 +0200
Subject: [PATCH 0502/1143] Add libpsl 0.7.1: Publix Suffix List C library

---
 pkgs/development/libraries/libpsl/default.nix | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/libpsl/default.nix

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
new file mode 100644
index 000000000000..f1c54d5cf5fd
--- /dev/null
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, icu, libxslt, pkgconfig }:
+
+let version = "0.7.1"; in
+stdenv.mkDerivation rec {
+  name = "libpsl-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0hbsidbmwgpg0h48wh2pzsq59j8az7naz3s5q3yqn99yyjji2vgw";
+    rev = name;
+    repo = "libpsl";
+    owner = "rockdaboot";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "C library for the Publix Suffix List";
+    longDescription = ''
+      libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"
+      is a domain name under which Internet users can directly register own
+      names. Browsers and other web clients can use it to avoid privacy-leaking
+      "supercookies" and "super domain" certificates, for highlighting parts of
+      the domain in a user interface or sorting domain lists by site.
+    '';
+    homepage = http://rockdaboot.github.io/libpsl/;
+    license = with licenses; mit;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ autoreconfHook icu libxslt pkgconfig ];
+
+  configureFlags = "--disable-static --enable-man";
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4206cc2cb92f..6cf11f0d8444 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6824,6 +6824,8 @@ let
 
   libpseudo = callPackage ../development/libraries/libpseudo { };
 
+  libpsl = callPackage ../development/libraries/libpsl { };
+
   libpst = callPackage ../development/libraries/libpst { };
 
   libpwquality = callPackage ../development/libraries/libpwquality { };

From 0db1bb5bda4ae9c5b900402ca6a47eadb5cc3fb2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 May 2015 17:30:20 +0200
Subject: [PATCH 0503/1143] wget: verify cookie domains with libpsl

Reduces vulnerability to "supercookie" attacks:
<http://comments.gmane.org/gmane.comp.web.wget.general/12820>
---
 pkgs/tools/networking/wget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 5a597afd9d37..7c6f815f909f 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gettext, libidn
 , perl, perlPackages, LWP, python3
-, libiconv, gnutls ? null }:
+, libiconv, libpsl, gnutls ? null }:
 
 stdenv.mkDerivation rec {
   name = "wget-1.16";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
 
   nativeBuildInputs = [ gettext ];
-  buildInputs = [ libidn libiconv ]
+  buildInputs = [ libidn libiconv libpsl ]
     ++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ]
     ++ stdenv.lib.optional (gnutls != null) gnutls
     ++ stdenv.lib.optional stdenv.isDarwin perl;

From 27d57966f5f1864f022eb4aa33dcf2ac840de8e3 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Thu, 7 May 2015 17:51:05 +0200
Subject: [PATCH 0504/1143] add artyFX: A LV2 plugin bundle of effects

---
 pkgs/applications/audio/artyFX/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 ++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/audio/artyFX/default.nix

diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
new file mode 100644
index 000000000000..e60381710c3c
--- /dev/null
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, cairomm, cmake, jack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "artyFX-git-${version}";
+  version = "2015-05-07";
+
+  src = fetchgit {
+    url = "https://github.com/harryhaaren/openAV-ArtyFX.git";
+    rev = "3a8cb9a5e4ffaf27a497a31cc9cd6f2e79622d5b";
+    sha256 = "2e3f6ab6f829c0ec177e85f4e419286616cf35fb7303445caa09d3438cac27d5";
+  };
+
+  buildInputs = [ cairomm cmake jack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig   ];
+
+  meta = with stdenv.lib; {
+    homepage = http://openavproductions.com/artyfx/;
+    description = "A LV2 plugin bundle of artistic realtime effects";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf11f0d8444..9847c52958ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -560,6 +560,10 @@ let
 
   arp-scan = callPackage ../tools/misc/arp-scan { };
 
+  artyFX = callPackage ../applications/audio/artyFX {
+    inherit (xlibs) libpthreadstubs;
+  };
+
   ascii = callPackage ../tools/text/ascii { };
 
   asymptote = callPackage ../tools/graphics/asymptote {

From 2bfff5a8ef806650a3dce2fa615f2bad5daa7b55 Mon Sep 17 00:00:00 2001
From: Michael Phillips <michaelalanphillips@gmail.com>
Date: Thu, 7 May 2015 12:11:14 -0500
Subject: [PATCH 0505/1143] Update powerline to 2.1

---
 pkgs/top-level/python-packages.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f4a3cb63213..73fa69b4cb02 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8501,13 +8501,12 @@ let
 
 
   powerline = buildPythonPackage rec {
-    rev  = "db80fc95ed01d2c559c4bdc7da8514ed3cc7fcd9";
-    name = "powerline-beta_${rev}";
-
+    rev  = "8164f42fb924f38dc5b9dd6d32063e8c3d41e504";
+    name = "powerline-2.1";
     src = pkgs.fetchurl {
-      url    = "https://github.com/Lokaltog/powerline/tarball/${rev}";
+      url    = "https://github.com/powerline/powerline/tarball/${rev}";
       name   = "${name}.tar.bz";
-      sha256 = "1csd4vasy0avwfxrpdr61plj6k1nzf36f6qvd9kl15s3lnspsfaz";
+      sha256 = "0xrasj1lh9ypz1q6q4k997rfym9r16bclfbpzjqj8qfkp4i62lz6";
     };
 
     propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ];
@@ -8532,7 +8531,7 @@ let
     '';
 
     meta = with stdenv.lib; {
-      homepage    = https://github.com/Lokaltog/powerline;
+      homepage    = https://github.com/powerline/powerline;
       description = "The ultimate statusline/prompt utility";
       license     = licenses.mit;
       maintainers = with maintainers; [ lovek323 ];

From d62204a1d2c30a7f963d95da0a152c7b26e23daa Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 7 May 2015 22:47:58 +0200
Subject: [PATCH 0506/1143] s3fs: fix typo in name

---
 pkgs/tools/filesystems/s3fs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 4c509444b74c..c39f5cba775b 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}:
 
 stdenv.mkDerivation {
-  name = "sshfs-fuse-1.78";
+  name = "s3fs-fuse-1.78";
   src = fetchurl {
     url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz;
     sha256 = "1xcp0bqa4a2ynjn5phb1pj70wm322czhqp4qcb27d5jd545b1h1n";

From f4a016081a19b3cc7e6390f6d2f1cdc4a1477437 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 19:26:20 -0700
Subject: [PATCH 0507/1143] kernel: 3.10.76 -> 3.10.77

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 68e5c940ca9e..a6ceb5b09547 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.76";
+  version = "3.10.77";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0v4blm026fg4hk5ddh25b1fjhnk2yak2hpj4cz4wiq7yr84dr8p5";
+    sha256 = "1vx2sg0pab3b3rflwhxrimwx18azqayys8zidzr6sv0x7ir9bc31";
   };
 
   features.iwlwifi = true;

From 185d7c062b95c779fe4be2963cc1c07d7ef0ea7e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 19:26:48 -0700
Subject: [PATCH 0508/1143] kernel: 3.12.40 -> 3.12.42

---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index bd8c7d99daae..810087b55a76 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.40";
+  version = "3.12.42";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1cdivv1n0r057y2wq38ci00im8z24jrnvyz5vwhmnzv0l4qzbhw5";
+    sha256 = "0vp6yllal2gcyng1kklp9n8r18fhcb1m1ssavjbcbfax5chi7w5s";
   };
 
   features.iwlwifi = true;

From 55a2edb893ed51c5638efa694b20af553acaf1b6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 7 May 2015 08:40:37 -0500
Subject: [PATCH 0509/1143] mlt-qt5: fix build with Qt 5.4

---
 pkgs/development/libraries/mlt/qt5.nix | 39 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 +--
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/mlt/qt5.nix

diff --git a/pkgs/development/libraries/mlt/qt5.nix b/pkgs/development/libraries/mlt/qt5.nix
new file mode 100644
index 000000000000..4fcd029971c3
--- /dev/null
+++ b/pkgs/development/libraries/mlt/qt5.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, SDL, ffmpeg, frei0r, jack2, libdv, libsamplerate
+, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt5, sox
+}:
+
+stdenv.mkDerivation rec {
+  name = "mlt-${version}";
+  version = "0.9.6";
+
+  src = fetchurl {
+    url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
+    sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh";
+  };
+
+  buildInputs = [
+    SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2
+    makeWrapper movit pkgconfig qt5.base qt5.svg sox
+  ];
+
+  # Mostly taken from:
+  # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
+  configureFlags = [
+    "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3"
+    "--enable-opengl"
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open source multimedia framework, designed for television broadcasting";
+    homepage = http://www.mltframework.org/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 283ffec18fc2..454dfa6dac8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7190,9 +7190,7 @@ let
     qt = qt4;
   };
 
-  mlt-qt5 = callPackage ../development/libraries/mlt {
-    qt = qt5;
-  };
+  mlt-qt5 = callPackage ../development/libraries/mlt/qt5.nix { };
 
   movit = callPackage ../development/libraries/movit { };
 

From 5b640cd1a58e336073258162ada9f793519c2e4e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 7 May 2015 08:40:55 -0500
Subject: [PATCH 0510/1143] kdeApps_15_04.kdenlive: fix build

---
 pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index c3bbbb35c05e..0ff72edb9830 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -273,6 +273,12 @@ let
         ];
       };
 
+      kdenlive =
+        let mlt = pkgs.mlt-qt5.override { inherit qt5; };
+        in super.kdenlive // {
+          buildInputs = super.kdenlive.buildInputs ++ [ mlt ];
+        };
+
       kdepim = with pkgs; super.kdepim // {
         buildInputs =
           super.kdepim.buildInputs ++ [ gpgme libassuan ];

From bf888ed17086f78b95077a791d42db9650c6d8ae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 7 May 2015 18:53:42 -0500
Subject: [PATCH 0511/1143] kdeApps_15_04.signon-kwallet-extension: fix build

---
 pkgs/applications/kde-apps-15.04/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 0ff72edb9830..798d6d977b0d 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -350,6 +350,17 @@ let
         '';
       };
 
+      signon-kwallet-extension =
+        let signon = pkgs.signon.override { inherit qt5; };
+        in super.signon-kwallet-extension // {
+          buildInputs = super.signon-kwallet-extension.buildInputs ++ [ signon ];
+          preConfigure = ''
+            ${super.signon-kwallet-extension.preConfigure or ""}
+            sed -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions," \
+                -i src/CMakeLists.txt
+          '';
+        };
+
     };
 
   l10nManifest =

From aa5791f7ad9e7da0272eac6d084031d4961c828f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 7 May 2015 21:49:24 -0500
Subject: [PATCH 0512/1143] kde4.kopete: fix build

---
 pkgs/desktops/kde-4.14/kdenetwork/kopete.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
index 7d8aec21ce6c..267c2b782129 100644
--- a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
@@ -1,12 +1,19 @@
 { kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
   jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib,
   libgadu, boost, qca2, sqlite, jsoncpp,
-  ortp, srtp, libv4l }:
+  ortp, srtp, libv4l, fetchurl }:
 
 kde {
 
 # TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?),
 
+  patches = [
+    (fetchurl {
+      url = "https://bugs.kde.org/attachment.cgi?id=91567";
+      sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1";
+    })
+  ];
+
   buildInputs = [
     kdelibs qca2 mediastreamer libgadu jsoncpp
     kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib

From b4a8eaaf87aaffe5f6d5c5aa3ab3f7a0140edff0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 19:27:08 -0700
Subject: [PATCH 0513/1143] kernel: 3.18.12 -> 3.18.13

---
 pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index aabeee6302f3..4729e6ed47d4 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.12";
+  version = "3.18.13";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "06wfgg00vc5a2vvmg158ipbmigx803hdp3lhf4kv25p4sdmvbsl2";
+    sha256 = "043bqjvbamzi201csgnw7hsf8810qm0dn7x9p0kc7s9p9jnyq79n";
   };
 
   # FIXME: remove with the next point release.

From 5b4cd639ddb988c2acbee113b6a8a4b74ecd9ea1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 19:27:11 -0700
Subject: [PATCH 0514/1143] kernel: 3.19.6 -> 3.19.7

---
 pkgs/os-specific/linux/kernel/linux-3.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix
index 293b0abf9f34..3c1bbaa10c78 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.19.6";
+  version = "3.19.7";
   # Remember to update grsecurity!
   extraMeta.branch = "3.19";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1kqn796vwkmhj2qkv56nj7anpmxx1hxv47cf44fcmx9n1afry8j4";
+    sha256 = "0xd38f7g5yfn0b6b2l4qr022f9hcr82ddbysjs4npbgk5ms7341k";
   };
 
   features.iwlwifi = true;

From 0e4057b167702a5450da09123260f2e453f092cb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 19:27:19 -0700
Subject: [PATCH 0515/1143] kernel: 4.0.1 -> 4.0.2

---
 pkgs/build-support/grsecurity/default.nix   | 2 +-
 pkgs/os-specific/linux/kernel/linux-4.0.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index e82792be033a..0fd3df6d5f5f 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -33,7 +33,7 @@ let
 
     grKernel = if cfg.stable
                then mkKernel pkgs.linux_3_14 stable-patch
-               else mkKernel pkgs.linux_3_19 test-patch;
+               else mkKernel pkgs.linux_4_0 test-patch;
 
     ## -- grsecurity configuration ---------------------------------------------
 
diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index 161861d6f067..9f5280774fca 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0.1";
+  version = "4.0.2";
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1ggj26p1bm5v5kaviz6brfkjk32f8rib1mh61ns77gjlx5vsvc7z";
+    sha256 = "1jq4583wwqmwqkqlkck57fxw18xszng92b6ma3avf0djd11b2izz";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 9ed7633e7a3b..fc9fca26c353 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.19.6";
-      revision  = "201504302119";
+    { kversion  = "4.0.2";
+      revision  = "201505072057";
       branch    = "test";
-      sha256    = "03yj8011i6mkf33npa7all0c33r95mgiic6zjg494x56279s701s";
+      sha256    = "0njvgd6n9z35hyxnligb8aq9shxzbwrkrdvpbxc0qxmwya0midv2";
     };
 
   grsec_fix_path =

From 8209d3f78b55847a67e12769b4566abb3fad4fa1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 19:26:58 -0700
Subject: [PATCH 0516/1143] kernel: 3.14.40 -> 3.14.41

---
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 8b134e740064..75ab538ddf5e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.40";
+  version = "3.14.41";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1w5j53ny5vahp1ipj16x0ahjb5yj6q859jsdshblymvwrbkcr29a";
+    sha256 = "0qghsf648nvzsh2x44x3w0d8lciml8rj6dvglqvmq1zcg492k8i2";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index fc9fca26c353..628dda0ac4b7 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.40";
-      revision  = "201504302118";
+    { kversion  = "3.14.41";
+      revision  = "201505072056";
       branch    = "stable";
-      sha256    = "154ivf42ib93f8shh2b2qcqhppd1c6vbjfiazgigr006q638429i";
+      sha256    = "1fgi63y61mjmxj0mq2a24lwq0i0186kyvcdsjflw48adwjm6v0kg";
     };
 
   grsecurity_unstable = grsecPatch

From 61be2ceb27971cb939c1defaab0ea4cb2c654868 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 7 May 2015 20:45:48 -0700
Subject: [PATCH 0517/1143] kernel: Move grsecurity update warning

---
 pkgs/os-specific/linux/kernel/linux-3.19.nix | 1 -
 pkgs/os-specific/linux/kernel/linux-4.0.nix  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix
index 3c1bbaa10c78..03c0db556263 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix
@@ -2,7 +2,6 @@
 
 import ./generic.nix (args // rec {
   version = "3.19.7";
-  # Remember to update grsecurity!
   extraMeta.branch = "3.19";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index 9f5280774fca..a5dafd4c8066 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "4.0.2";
+  # Remember to update grsecurity!
   extraMeta.branch = "4.0";
 
   src = fetchurl {

From 5a648474f23939146ce8002a5d9cd1ae4d69cd49 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Wed, 29 Apr 2015 17:37:39 -0400
Subject: [PATCH 0518/1143] SDL: libcap is Linux only

---
 pkgs/development/libraries/SDL/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 1e32a5985060..f23955228f75 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
-  in [ libcap ]
+  in stdenv.lib.optional stdenv.isLinux libcap
     ++ (stdenv.lib.optional notMingw audiofile);
 
   nativeBuildInputs = [ pkgconfig ] ++

From d3ceff38d494506fce9356d18e3731fce3f7eb14 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Fri, 8 May 2015 13:07:31 +0200
Subject: [PATCH 0519/1143] add x42-plugins: a collection of LV2 plugins by
 Robin Gareus

---
 .../audio/x42-plugins/default.nix             | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/audio/x42-plugins/default.nix

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
new file mode 100644
index 000000000000..aabb6308c143
--- /dev/null
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, jack2, mesa_glu, pkgconfig
+, libltc, libsndfile, libsamplerate
+, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
+
+stdenv.mkDerivation rec {
+  version = "2014-11-01";
+  name = "x42-plugins-${version}";
+
+  src = fetchurl {
+    url = "http://gareus.org/misc/x42-plugins/x42-plugins-20141101.tar.xz";
+    sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk";
+  };
+
+  buildInputs = [ mesa_glu ftgl freefont_ttf jack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
+
+  makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
+
+  # remove check for zita-convolver in /usr/
+  patchPhase = ''
+    sed -i "38,42d" convoLV2/Makefile
+  '';
+
+  meta = with stdenv.lib;
+    { description = "Collection of LV2 plugins by Robin Gareus";
+      homepage = https://github.com/x42/x42-plugins;
+      maintainers = with maintainers; [ magnetophon ];
+      license = licenses.gpl2;
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c38feccb5108..c1e25fcf4161 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12595,6 +12595,8 @@ let
 
   x2vnc = callPackage ../tools/X11/x2vnc { };
 
+  x42-plugins = callPackage ../applications/audio/x42-plugins { };
+
   xaos = builderDefsPackage (import ../applications/graphics/xaos) {
     inherit (xlibs) libXt libX11 libXext xextproto xproto;
     inherit gsl aalib zlib intltool gettext perl;

From eb98989cf0e8dc86445408bf07abb2dc7552344d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 8 May 2015 13:19:31 +0200
Subject: [PATCH 0520/1143] Add libcrafter and tracebox

---
 .../libraries/libcrafter/default.nix          | 26 ++++++++++++++++
 pkgs/tools/networking/tracebox/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/libraries/libcrafter/default.nix
 create mode 100644 pkgs/tools/networking/tracebox/default.nix

diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
new file mode 100644
index 000000000000..e775e9ef63f7
--- /dev/null
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
+
+stdenv.mkDerivation rec {
+  name = "libcrafter-${version}";
+  version = "0.3";
+  
+  src = fetchzip {
+    url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";
+    sha256 = "04lpmshh4wb1dav03p6rnskpd1zmmvhv80xwn8v7l8faps5gvjp4";
+  };
+  
+  preConfigure = "cd libcrafter";
+
+  configureScript = "./autogen.sh";
+
+  configureFlags = [ "--with-libpcap=yes" ];
+
+  buildInputs = [ autoconf automake libtool ];
+
+  propagatedBuildInputs = [ libpcap ];
+
+  meta = {
+    homepage = https://github.com/pellegre/libcrafter;
+    description = "High level C++ network packet sniffing and crafting library";
+  };
+}
diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix
new file mode 100644
index 000000000000..8c443282e5cb
--- /dev/null
+++ b/pkgs/tools/networking/tracebox/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }:
+
+stdenv.mkDerivation rec {
+  name = "tracebox-${version}";
+  version = "0.2";
+
+  src = fetchzip {
+    url = "https://github.com/tracebox/tracebox/archive/v${version}.zip";
+    sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns";
+  };
+
+  buildInputs = [ autoreconfHook libcrafter lua ];
+
+  configureFlags = [ "--with-lua=yes" ];
+
+  NIX_LDFLAGS = [ "${libpcap}/lib/libpcap.so" "${libcrafter}/lib/libcrafter.so" ];
+
+  preAutoreconf = ''
+    substituteInPlace Makefile.am --replace "noinst" ""
+    sed '/noinst/d' -i configure.ac
+    sed '/libcrafter/d' -i src/tracebox/Makefile.am
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.tracebox.org/;
+    description = "A middlebox detection tool";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ maintainers.lethalman ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c38feccb5108..79b50719bf64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2970,6 +2970,8 @@ let
 
   traceroute = callPackage ../tools/networking/traceroute { };
 
+  tracebox = callPackage ../tools/networking/tracebox { };
+
   trash-cli = callPackage ../tools/misc/trash-cli { };
 
   trickle = callPackage ../tools/networking/trickle {};
@@ -6376,6 +6378,8 @@ let
 
   libchardet = callPackage ../development/libraries/libchardet { };
 
+  libcrafter = callPackage ../development/libraries/libcrafter { };
+
   libuchardet = callPackage ../development/libraries/libuchardet { };
 
   libchop = callPackage ../development/libraries/libchop { };

From 2cd6b418b9659546d1ead150562f35ea2184930d Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 8 May 2015 13:26:31 +0200
Subject: [PATCH 0521/1143] libcrafter: added license and maintainer

---
 pkgs/development/libraries/libcrafter/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
index e775e9ef63f7..04543511fc4a 100644
--- a/pkgs/development/libraries/libcrafter/default.nix
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -22,5 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://github.com/pellegre/libcrafter;
     description = "High level C++ network packet sniffing and crafting library";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ maintainers.lethalman ];
   };
 }

From 9254ee082eab66aaed9e4450120a03f67af62dd0 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 8 May 2015 13:41:02 +0200
Subject: [PATCH 0522/1143] git-cola: changed platform to Linux only

---
 .../version-management/git-and-tools/git-cola/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index eee17911cea8..a43bd8d3a373 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -30,7 +30,7 @@ pythonPackages.buildPythonPackage rec {
     homepage = https://github.com/git-cola/git-cola;
     description = "A sleek and powerful Git GUI";
     license = licenses.gpl2;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = [ maintainers.bobvanderlinden ];
   };
 }

From 9e28f20fe6df1eac0a63678d5b4363bd49dc4982 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 8 May 2015 14:47:29 +0300
Subject: [PATCH 0523/1143] Update LibreOffice to 4.4.3.2

---
 pkgs/applications/office/libreoffice/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 464b00167648..833b93b82723 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -24,7 +24,7 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "4";
   minor = "4";
-  patch = "2";
+  patch = "3";
   tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@@ -80,14 +80,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0m1a09vzgh5mz0dgx2ji3fwmsqr7xymr0hhrrhf75nd1dr0blv2s";
+      sha256 = "17wfnbwcp7c5cx06c88gmprscfz05qyb5587m72xs6hzr741ygir";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "06i2c143dpqm4w1a9nba0gn1ayrvrhdrcm2kydzapvljgljqswkh";
+      sha256 = "09im7shbka9dfdh6mq31xq106khlyyw6rr1ij69smlkq0kg463g1";
     };
 
   };
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0dif783zbh9qb4636mm055clwwsv8j6pmb8msi9lr183drnaw73x";
+    sha256 = "0rl9x01ngxwnqwzxkrqy4vks4rb024m75z0w4zidwyp0az0m8qdd";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly

From 7e9d00b05dfad7546eca4c05b50d024e8d589f20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 May 2015 13:48:26 +0200
Subject: [PATCH 0524/1143] libcrafter: fix broken evaluation

---
 pkgs/development/libraries/libcrafter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
index 04543511fc4a..95339be7f3e0 100644
--- a/pkgs/development/libraries/libcrafter/default.nix
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "libcrafter-${version}";
   version = "0.3";
-  
+
   src = fetchzip {
     url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";
     sha256 = "04lpmshh4wb1dav03p6rnskpd1zmmvhv80xwn8v7l8faps5gvjp4";
   };
-  
+
   preConfigure = "cd libcrafter";
 
   configureScript = "./autogen.sh";
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/pellegre/libcrafter;
     description = "High level C++ network packet sniffing and crafting library";
     license = stdenv.lib.licenses.bsd3;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = [ stdenv.lib.maintainers.lethalman ];
   };
 }

From e930cf057ea02b8f4391791151362883710b1255 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 May 2015 22:38:16 +0200
Subject: [PATCH 0525/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/d338756e7c7e959d547cc633d243c1696d297add
 with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba

---
 .../haskell-modules/hackage-packages.nix      | 1001 +++++++++++------
 1 file changed, 677 insertions(+), 324 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d621217a144b..74b79921291c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -233,20 +233,27 @@ self: {
      }) {};
 
   "ADPfusion" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive, PrimitiveArray
-     , QuickCheck, repa, strict, template-haskell, transformers, vector
+    ({ mkDerivation, base, bits, mmorph, monad-primitive, mtl
+     , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict
+     , template-haskell, test-framework, test-framework-quickcheck2
+     , test-framework-th, transformers, tuple, vector
      }:
      mkDerivation {
        pname = "ADPfusion";
-       version = "0.2.1.0";
-       sha256 = "0z6a6j57jn72pqzljsg1pwjm2vwzfnl6rjzz853vbi9djp28kcd9";
+       version = "0.4.0.2";
+       sha256 = "1wawzavw7sx7lwvgqa88a34rrazl54z44cwc5mznp2ynfivk5qlq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base deepseq ghc-prim primitive PrimitiveArray QuickCheck repa
-         strict template-haskell transformers vector
+         base bits mmorph monad-primitive mtl OrderedBits primitive
+         PrimitiveArray QuickCheck strict template-haskell transformers
+         tuple vector
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
+       testDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+         test-framework-th
+       ];
+       homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -726,6 +733,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "AlignmentAlgorithms" = callPackage
+    ({ mkDerivation, ADPfusion, base, containers, fmlist
+     , FormalGrammars, GrammarProducts, PrimitiveArray, vector
+     }:
+     mkDerivation {
+       pname = "AlignmentAlgorithms";
+       version = "0.0.1.2";
+       sha256 = "1y9c0q34dc2y508sfxgyrgdjg39f4j7h9fjqaykx95dlv383xsjq";
+       buildDepends = [
+         ADPfusion base containers fmlist FormalGrammars GrammarProducts
+         PrimitiveArray vector
+       ];
+       homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
+       description = "Collection of alignment algorithms";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Allure" = callPackage
     ({ mkDerivation, base, containers, enummapset-th, filepath
      , LambdaHack, template-haskell, text
@@ -1403,21 +1427,24 @@ self: {
      }) {};
 
   "BiobaseXNA" = callPackage
-    ({ mkDerivation, base, bytestring, cmdargs, containers, csv
-     , file-embed, mtl, primitive, PrimitiveArray, repa, text, tuple
-     , vector, vector-th-unbox
+    ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring
+     , cereal, cereal-vector, cmdargs, containers, csv, file-embed
+     , hashable, lens, primitive, PrimitiveArray, split, text, tuple
+     , vector, vector-binary-instances, vector-th-unbox
      }:
      mkDerivation {
        pname = "BiobaseXNA";
-       version = "0.8.3.0";
-       sha256 = "0z0qm7hlacxixwnd9xdvyk05ih3wvj23zwz6mc9dgflzjq75d6n9";
+       version = "0.9.1.0";
+       sha256 = "0mwfzfhsywrv70gz8fc7s84v5hra0qidckjv4y0ps80ha7qv4kci";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring cmdargs containers csv file-embed mtl primitive
-         PrimitiveArray repa text tuple vector vector-th-unbox
+         aeson base bimaps binary bytes bytestring cereal cereal-vector
+         cmdargs containers csv file-embed hashable lens primitive
+         PrimitiveArray split text tuple vector vector-binary-instances
+         vector-th-unbox
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
+       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -1514,8 +1541,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.7.1.8";
-       sha256 = "0l326xnagszwv7f21dqzdb0qj5q2xhj1mmll7rpy1mxr5c0bvm2h";
+       version = "0.7.1.9";
+       sha256 = "1llfbfwxnyvc4k9zlf1fdkb9dr4abmv0x6zc0048h4vx7db50f8h";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -1786,8 +1813,8 @@ self: {
      }:
      mkDerivation {
        pname = "CCA";
-       version = "0.1.5.2";
-       sha256 = "16121708y4pdqzcg4s6i8rmz7jrzhndj1i86zn3xgnq2bgv1rxj4";
+       version = "0.1.5.3";
+       sha256 = "05zv1vha31fgw4ddvrnbvk5pzhq8lkvfx1xrgja5ggy451zrs6aw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -2912,8 +2939,8 @@ self: {
      }:
      mkDerivation {
        pname = "CouchDB";
-       version = "1.2.1";
-       sha256 = "0hj1rml9pf9knwm3grwrkizjricc7bchsi6m7dgjlfh81q247jp4";
+       version = "1.2.2";
+       sha256 = "0imzpwrynr54as3bzx2222vqcnmmrzx6dis5qa2vmclf6yd8q1z8";
        buildDepends = [
          base bytestring containers HTTP json mtl network network-uri
          utf8-string
@@ -2922,7 +2949,7 @@ self: {
          base bytestring containers HTTP HUnit json mtl network network-uri
          utf8-string
        ];
-       homepage = "http://github.com/arjunguha/haskell-couchdb/";
+       homepage = "http://github.com/hsenag/haskell-couchdb/";
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3933,8 +3960,8 @@ self: {
     ({ mkDerivation, base, containers, ListLike }:
      mkDerivation {
        pname = "Earley";
-       version = "0.7.1";
-       sha256 = "00cm5gd7j7z7kr67wr3k9b793n4rp427psmq7h8x229n25x71nbq";
+       version = "0.8.0";
+       sha256 = "0vg672jfj9a814pcbx19hkb2nsy0zndm1a98z5ygssy7m098cvgh";
        buildDepends = [ base containers ListLike ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -4821,21 +4848,22 @@ self: {
   "FormalGrammars" = callPackage
     ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
      , cmdargs, containers, data-default, HaTeX, lens, mtl, parsers
-     , repa, template-haskell, text, transformers, trifecta
-     , unordered-containers, vector
+     , PrimitiveArray, semigroups, template-haskell, text, transformers
+     , trifecta, unordered-containers, vector
      }:
      mkDerivation {
        pname = "FormalGrammars";
-       version = "0.0.0.2";
-       sha256 = "1wdcwdr3chzmgs5y634jv0gsndm7vgfndr0sfxn0m6z56xcv65gj";
+       version = "0.2.0.0";
+       sha256 = "0qx2r4gvims7s7ki7sanwvyws4ykf7cwxsxpwy3krr2rfqhmhp75";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          ADPfusion ansi-wl-pprint base bytestring cmdargs containers
-         data-default HaTeX lens mtl parsers repa template-haskell text
-         transformers trifecta unordered-containers vector
+         data-default HaTeX lens mtl parsers PrimitiveArray semigroups
+         template-haskell text transformers trifecta unordered-containers
+         vector
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/gramprod/";
+       homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5572,23 +5600,22 @@ self: {
      }) {};
 
   "GrammarProducts" = callPackage
-    ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
-     , cmdargs, containers, data-default, FormalGrammars, HaTeX, lens
-     , newtype, parsers, PrimitiveArray, semigroups, transformers
-     , trifecta
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+     , data-default, FormalGrammars, lens, newtype, parsers, semigroups
+     , template-haskell, transformers, trifecta
      }:
      mkDerivation {
        pname = "GrammarProducts";
-       version = "0.0.0.4";
-       sha256 = "0ni7rjp2cb7n47zkgl63ipr35q54m7f4lsrkcm2s6d0i5pwlv11f";
+       version = "0.1.0.0";
+       sha256 = "1is934sdflkhi8idprdihdb7knsi8gi0gd4rdnhn4cd8xjvkicgk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         ADPfusion ansi-wl-pprint base bytestring cmdargs containers
-         data-default FormalGrammars HaTeX lens newtype parsers
-         PrimitiveArray semigroups transformers trifecta
+         ansi-wl-pprint base bytestring containers data-default
+         FormalGrammars lens newtype parsers semigroups template-haskell
+         transformers trifecta
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/gramprod";
+       homepage = "http://www.bioinf.uni-leipzig.de/gADP/";
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6665,22 +6692,22 @@ self: {
      }) {};
 
   "HList" = callPackage
-    ({ mkDerivation, base, cmdargs, diffutils, directory, doctest
-     , filepath, ghc-prim, hspec, lens, mtl, process, syb, tagged
-     , template-haskell
+    ({ mkDerivation, array, base, cmdargs, diffutils, directory
+     , doctest, filepath, ghc-prim, hspec, lens, mtl, process
+     , profunctors, QuickCheck, syb, tagged, template-haskell
      }:
      mkDerivation {
        pname = "HList";
-       version = "0.3.4.1";
-       revision = "1";
-       sha256 = "02hw496qv2p0nnbz7lq7jfqnis19qqjsylyvdksqbwmjprk32rh2";
-       editedCabalFile = "b3eec9db43bda99e47b409bc7f188e89899f0e13854de02674be6d0d24eef4f6";
-       buildDepends = [ base ghc-prim mtl tagged template-haskell ];
+       version = "0.4.0.0";
+       sha256 = "0f6d97vfxlml4dp6zfk95kk4la8xr5m91hiw4zj98kvwvvhb99mz";
+       buildDepends = [
+         array base ghc-prim mtl profunctors tagged template-haskell
+       ];
        testDepends = [
-         base cmdargs directory doctest filepath hspec lens mtl process syb
+         array base cmdargs directory doctest filepath hspec lens mtl
+         process QuickCheck syb template-haskell
        ];
        buildTools = [ diffutils ];
-       jailbreak = true;
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) diffutils;};
@@ -10587,17 +10614,21 @@ self: {
      }) {};
 
   "NaturalLanguageAlphabets" = callPackage
-    ({ mkDerivation, base, bytestring, hashable, intern
-     , unordered-containers
+    ({ mkDerivation, array, attoparsec, base, bimaps, bytestring
+     , deepseq, file-embed, hashable, hashtables, intern, stringable
+     , system-filepath, text, unordered-containers, vector
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "NaturalLanguageAlphabets";
-       version = "0.0.0.1";
-       sha256 = "0zwp7hqgvkrz1d3wcsp79v29b1c6cyby8jzvndnsb3gxp7x7gpws";
+       version = "0.0.1.0";
+       sha256 = "0s2dv9vsfy1j3v7n0j35y69sjmsjcps88idd7b3f6fnxbmwms3z2";
        buildDepends = [
-         base bytestring hashable intern unordered-containers
+         array attoparsec base bimaps bytestring deepseq file-embed hashable
+         hashtables intern stringable system-filepath text
+         unordered-containers vector vector-th-unbox
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
+       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Alphabet and word representations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11393,6 +11424,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OrderedBits" = callPackage
+    ({ mkDerivation, base, bits, primitive, QuickCheck, test-framework
+     , test-framework-quickcheck2, test-framework-th, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "OrderedBits";
+       version = "0.0.0.1";
+       sha256 = "1q272m1rjsgbp3w4jx36r84b3n29j1ggpqqxjyyhlkidm7w4h6lm";
+       buildDepends = [
+         base bits primitive QuickCheck vector vector-algorithms
+       ];
+       testDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+         test-framework-th
+       ];
+       jailbreak = true;
+       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
+       description = "Efficient ordered (by popcount) enumeration of bits";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Ordinals" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -11877,8 +11930,8 @@ self: {
     ({ mkDerivation, alsaLib, base }:
      mkDerivation {
        pname = "PortMidi";
-       version = "0.1.3";
-       sha256 = "1sjs73jpdsb610l6b8i7pr019ijddz7zqv56f4yy843ix848yqzp";
+       version = "0.1.4";
+       sha256 = "00w4208dan87adyd8gm7izbs38mva7glbi7s9rbcdjdkiz486q8m";
        buildDepends = [ base ];
        extraLibraries = [ alsaLib ];
        homepage = "http://haskell.org/haskellwiki/PortMidi";
@@ -11899,17 +11952,24 @@ self: {
      }) {};
 
   "PrimitiveArray" = callPackage
-    ({ mkDerivation, base, deepseq, primitive, QuickCheck, repa, vector
-     , vector-th-unbox
+    ({ mkDerivation, aeson, base, binary, bits, cereal, deepseq
+     , OrderedBits, primitive, QuickCheck, test-framework
+     , test-framework-quickcheck2, test-framework-th, vector
+     , vector-binary-instances, vector-th-unbox
      }:
      mkDerivation {
        pname = "PrimitiveArray";
-       version = "0.5.4.0";
-       sha256 = "1m97c7zc8x6ml9ng120r4kzl7g73cz4c3qk41j1zihlrrfrcxrvq";
+       version = "0.6.0.0";
+       sha256 = "13j9jqf09fj93slizb99wpn3d0c3zxj8ld5vl894dif7vw7hjmz9";
        buildDepends = [
-         base deepseq primitive QuickCheck repa vector vector-th-unbox
+         aeson base binary bits cereal deepseq OrderedBits primitive
+         QuickCheck vector vector-binary-instances vector-th-unbox
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
+       testDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+         test-framework-th
+       ];
+       homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12771,20 +12831,22 @@ self: {
 
   "Rlang-QQ" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
-     , directory, doctest, filepath, haskell-src-meta, HList, mtl
-     , process, repa, split, syb, template-haskell, temporary, text
-     , transformers, trifecta, utf8-string, vector, zlib
+     , data-binary-ieee754, directory, doctest, filepath
+     , haskell-src-meta, HList, hspec, lens, mtl, process, repa, SHA
+     , split, syb, template-haskell, temporary, text, transformers
+     , trifecta, utf8-string, vector, zlib
      }:
      mkDerivation {
        pname = "Rlang-QQ";
-       version = "0.2.1.0";
-       sha256 = "1r46prwscjfgvvky08rd632pmwlmihgr3rx41xz0h00vv5dygyxn";
+       version = "0.3.1.0";
+       sha256 = "0rl3cmr7vfc8vk7132y40ib0l53v9yndw71bmp25zj24nkmha7hj";
        buildDepends = [
-         array base binary bytestring Cabal containers directory filepath
-         haskell-src-meta HList mtl process repa split syb template-haskell
-         temporary text transformers trifecta utf8-string vector zlib
+         array base binary bytestring Cabal containers data-binary-ieee754
+         directory filepath haskell-src-meta HList lens mtl process repa SHA
+         split syb template-haskell temporary text transformers trifecta
+         utf8-string vector zlib
        ];
-       testDepends = [ base doctest ];
+       testDepends = [ base directory doctest hspec lens vector ];
        homepage = "http://code.haskell.org/~aavogt/Rlang-QQ";
        description = "quasiquoter for inline-R code";
        license = stdenv.lib.licenses.bsd3;
@@ -14062,6 +14124,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SuffixStructures" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, cereal, cmdargs
+     , containers, data-default-class, ListLike, primitive, vector
+     , vector-algorithms, vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "SuffixStructures";
+       version = "0.0.1.0";
+       sha256 = "0s294s06pj95i6q8n1cxsgkdc7x98mvvr1qd720rxqd3y54n63lb";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base binary bytestring cereal cmdargs containers
+         data-default-class ListLike primitive vector vector-algorithms
+         vector-binary-instances
+       ];
+       jailbreak = true;
+       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
+       description = "Suffix array construction";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "SybWidget" = callPackage
     ({ mkDerivation, base, containers, mtl, syb-with-class
      , template-haskell, TypeCompose
@@ -14685,8 +14769,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "TypeNat";
-       version = "0.1.0.0";
-       sha256 = "1j5v4kmd3hxzzm6xrhxf2vh7rn3b8n4gzb1yppgvxng06p642snb";
+       version = "0.2.1.0";
+       sha256 = "01dsw64zzwbkvm7q4jwyidjvxbkx6fvx8hhn70d2bpdxxammnxry";
        buildDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/TypeNat";
@@ -15794,13 +15878,12 @@ self: {
      }) {};
 
   "Yampa" = callPackage
-    ({ mkDerivation, base, hlint, random }:
+    ({ mkDerivation, base, random }:
      mkDerivation {
        pname = "Yampa";
-       version = "0.10.1";
-       sha256 = "10ggyb0lbjcz77dmfrnrxhfi5pph4396zp5vzmcvmiwls2s1g3am";
+       version = "0.10.1.1";
+       sha256 = "1gx0ai040plh99ixamb1sj8sh7lhx7lniy068d2syv9nhvc55mbf";
        buildDepends = [ base random ];
-       testDepends = [ base hlint ];
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -16888,10 +16971,9 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "activehs-base";
-       version = "0.3.0.2";
-       sha256 = "0wsrsxfaspv4xvw4wq3sllicc5v08rgpp1g76p24b9r9ghn7hrdv";
+       version = "0.3.0.3";
+       sha256 = "1q433by9ygs7rrjj8z76hg94zyh2cp4qiwsv7q1mywr5scfccn32";
        buildDepends = [ base QuickCheck ];
-       jailbreak = true;
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21720,8 +21802,8 @@ self: {
      }:
      mkDerivation {
        pname = "auto";
-       version = "0.4.2.0";
-       sha256 = "1kmji11dyyxc2m4kak6r4xnjw8hl5rvwdy3vaf9mylf68hk0jmfh";
+       version = "0.4.2.1";
+       sha256 = "0q5zz6q0dcc9chypbd2kci7kkn69ib0vdv48186jqzb3f50l59zw";
        buildDepends = [
          base bytestring cereal containers deepseq MonadRandom profunctors
          random semigroups transformers
@@ -21967,6 +22049,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aws-configuration-tools" = callPackage
+    ({ mkDerivation, aws, aws-general, aws-kinesis, base
+     , base-unicode-symbols, bytestring, configuration-tools, mtl, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "aws-configuration-tools";
+       version = "0.1.0.0";
+       revision = "2";
+       sha256 = "0xqwhd15ijwf6h26hb1nl16813b1rfh1nx6qipslz6pw857vv53b";
+       editedCabalFile = "536eacac6f54fbeb3e823d5b751eaa8cf1bb45a69f1d0bf54bdbff6245eb93e9";
+       buildDepends = [
+         aws aws-general aws-kinesis base base-unicode-symbols bytestring
+         configuration-tools mtl text transformers
+       ];
+       description = "Configuration types, parsers & renderers for AWS services";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "aws-dynamodb-streams" = callPackage
     ({ mkDerivation, aeson, attoparsec, aws, aws-general, base
      , base-unicode-symbols, base16-bytestring, base64-bytestring
@@ -22094,26 +22195,27 @@ self: {
      }) {};
 
   "aws-kinesis-client" = callPackage
-    ({ mkDerivation, aeson, aws, aws-general, aws-kinesis, base
-     , base-unicode-symbols, bytestring, conduit, containers
-     , data-carousel, enclosed-exceptions, http-conduit, kan-extensions
-     , lens, lens-action, lifted-async, lifted-base, monad-control, mtl
-     , nats, optparse-applicative, random, resourcet, stm, stm-chans
+    ({ mkDerivation, aeson, aws, aws-configuration-tools, aws-general
+     , aws-kinesis, base, base-unicode-symbols, bytestring, conduit
+     , configuration-tools, containers, data-carousel
+     , enclosed-exceptions, http-conduit, kan-extensions, lens
+     , lens-action, lifted-async, lifted-base, monad-control, mtl, nats
+     , optparse-applicative, random, resourcet, stm, stm-chans
      , stm-queue-extras, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "aws-kinesis-client";
-       version = "0.4.0.1";
-       sha256 = "1ky05hq0fs500jbf840ap6ji4vq26vn50w5cz8nqfz416jdjgx7r";
+       version = "0.4.0.2";
+       sha256 = "1vygs2qdnwjw8pygbsncc22cq9294hmlbzi2fysi3agva2qxzmwx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson aws aws-general aws-kinesis base base-unicode-symbols
-         bytestring conduit containers data-carousel enclosed-exceptions
-         http-conduit kan-extensions lens lens-action lifted-async
-         lifted-base monad-control mtl nats optparse-applicative random
-         resourcet stm stm-chans stm-queue-extras text transformers
-         unordered-containers
+         aeson aws aws-configuration-tools aws-general aws-kinesis base
+         base-unicode-symbols bytestring conduit configuration-tools
+         containers data-carousel enclosed-exceptions http-conduit
+         kan-extensions lens lens-action lifted-async lifted-base
+         monad-control mtl nats optparse-applicative random resourcet stm
+         stm-chans stm-queue-extras text transformers unordered-containers
        ];
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
@@ -22438,29 +22540,28 @@ self: {
 
   "b9" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, bytestring
-     , conduit, conduit-extra, ConfigFile, directory, filepath, hspec
-     , hspec-expectations, mtl, old-locale, optparse-applicative, parsec
+     , conduit, conduit-extra, ConfigFile, directory, filepath, free
+     , hspec, hspec-expectations, mtl, optparse-applicative, parsec
      , pretty, pretty-show, process, QuickCheck, random, semigroups, syb
      , template, text, time, transformers, unordered-containers, vector
      , yaml
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.4.1";
-       sha256 = "1zylnxh6r6sbk6fyx3b5hh6msajrrr07nsb4hwqlh07n1zzavw7j";
+       version = "0.5.3";
+       sha256 = "1dw6ylb7w4hycanx07qm4gzmvi1xw5jsh89dagbyaz9z9spl5fm4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson async base bifunctors binary bytestring conduit conduit-extra
-         ConfigFile directory filepath mtl old-locale optparse-applicative
-         parsec pretty pretty-show process QuickCheck random semigroups syb
+         ConfigFile directory filepath free mtl optparse-applicative parsec
+         pretty pretty-show process QuickCheck random semigroups syb
          template text time transformers unordered-containers vector yaml
        ];
        testDepends = [
          aeson base bytestring hspec hspec-expectations QuickCheck
          semigroups text unordered-containers vector yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
@@ -22744,6 +22845,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "banwords" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit
+     , test-framework, test-framework-hunit, text, vector
+     }:
+     mkDerivation {
+       pname = "banwords";
+       version = "0.1.0.0";
+       sha256 = "0r35w2kv9nfsz67bmcc9k9pg7k1d1k00cz5y16cpjra200mz847z";
+       buildDepends = [
+         attoparsec base bytestring data-default text vector
+       ];
+       testDepends = [
+         attoparsec base HUnit test-framework test-framework-hunit text
+         vector
+       ];
+       homepage = "https://github.com/fanjam/banwords";
+       description = "Generalized word blacklister";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "barchart" = callPackage
     ({ mkDerivation, base, cmdargs, csv, diagrams, filepath }:
      mkDerivation {
@@ -22896,8 +23017,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, hspec }:
      mkDerivation {
        pname = "base-orphans";
-       version = "0.3.0";
-       sha256 = "19cqh95kpd34wf550b9j417v8z4gzczqiv0ghq9fp3wwd7j5qcmw";
+       version = "0.3.1";
+       sha256 = "12nabqwniywwxsysdk0kh1zscdwyjk10z1fk3iqqcg0bqmyb67i5";
        buildDepends = [ base ghc-prim ];
        testDepends = [ base hspec ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
@@ -23812,6 +23933,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bimaps" = callPackage
+    ({ mkDerivation, aeson, base, binary, cereal, containers, deepseq
+     , hashable, primitive, QuickCheck, storable-tuple
+     , unordered-containers, vector, vector-binary-instances
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "bimaps";
+       version = "0.0.0.1";
+       sha256 = "0d2gfgamfmgwqzhbv45s2irabqcchlymn151yyd0d0sfsvl26vl6";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base binary cereal containers deepseq hashable primitive
+         QuickCheck storable-tuple unordered-containers vector
+         vector-binary-instances vector-th-unbox
+       ];
+       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
+       description = "bijections with multiple implementations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "binary_0_7_4_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
@@ -23867,7 +24010,9 @@ self: {
      mkDerivation {
        pname = "binary-conduit";
        version = "1.2.3";
+       revision = "1";
        sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr";
+       editedCabalFile = "9cb1c58171575429a65947d1ef7e22c1501b4ca9becc07904c7b4a5066345e29";
        buildDepends = [ base binary bytestring conduit resourcet vector ];
        testDepends = [
          base binary bytestring conduit hspec QuickCheck
@@ -24055,14 +24200,13 @@ self: {
      }:
      mkDerivation {
        pname = "binary-streams";
-       version = "0.1.0.0";
-       sha256 = "1xaqjcyrimggq7al6wr304gw61dacr7ch29dkm9b3sp2lmwvf74i";
+       version = "0.1.0.1";
+       sha256 = "1kjf5ks9l7fs0fsmwk5bcyhxlrz22hi4315bqqx2jzyq6pnwf4mv";
        buildDepends = [ base binary bytestring io-streams ];
        testDepends = [
          base binary bytestring Cabal cabal-test-quickcheck io-streams
          QuickCheck
        ];
-       jailbreak = true;
        homepage = "http://github.com/jonpetterbergman/binary-streams";
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
@@ -25149,21 +25293,21 @@ self: {
 
   "bitcoin-api" = callPackage
     ({ mkDerivation, aeson, base, base58string, binary, bitcoin-block
-     , bitcoin-script, bitcoin-tx, bitcoin-types, bytestring, groom
-     , hexstring, hspec, http-client, lens, lens-aeson, text
-     , unordered-containers, wreq
+     , bitcoin-script, bitcoin-tx, bitcoin-types, bytestring, hexstring
+     , hspec, http-client, lens, lens-aeson, text, unordered-containers
+     , wreq
      }:
      mkDerivation {
        pname = "bitcoin-api";
-       version = "0.9.0";
-       sha256 = "0rsfmmjrz6znfcbj0yqjzpy66xwgc3lk4c29yzqwzqmmghryks7z";
+       version = "0.11.0";
+       sha256 = "1k2ca8bszj13g5lsm3rm1mrfkrh4c7knl50alpn2l9zlwsg7whqx";
        buildDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
          unordered-containers wreq
        ];
        testDepends = [
-         base base58string bitcoin-script bitcoin-tx bytestring groom hspec
+         base base58string bitcoin-script bitcoin-tx bytestring hspec
          http-client lens text wreq
        ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -25171,6 +25315,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bitcoin-api-extra" = callPackage
+    ({ mkDerivation, base, binary, bitcoin-api, bitcoin-block
+     , bitcoin-tx, bytestring, conduit, hspec, http-client, lens, stm
+     , stm-chans, stm-conduit, text, transformers, wreq
+     }:
+     mkDerivation {
+       pname = "bitcoin-api-extra";
+       version = "0.9.0";
+       sha256 = "155fq7wfpij0rfc06ps1bq9mz8gm68nnlxh1170qq5rgqcc49f79";
+       buildDepends = [
+         base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit
+         stm stm-chans stm-conduit text transformers
+       ];
+       testDepends = [
+         base bitcoin-api bitcoin-tx bytestring conduit hspec http-client
+         lens text wreq
+       ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Higher level constructs on top of the bitcoin-api package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bitcoin-block" = callPackage
     ({ mkDerivation, base, binary, bitcoin-tx, bitcoin-types
      , bytestring, cryptohash, hexstring, hspec, largeword
@@ -27991,19 +28157,20 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.3.0";
-       sha256 = "0bvd7qf206slg4ckjc7bjjfrgdxsq3kmb9rp8qp7lfc81ccnr09j";
+       version = "0.3.4.0";
+       sha256 = "1c96zwiz7jn55ijjjy8ip5axk7g0mv7b10bs25b5y3z7iqbblw6c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring Cabal data-default directory filepath ghc-prim mtl
          process template-haskell temporary transformers
        ];
+       testDepends = [ base ];
        description = "Simple interface to Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
-  "cabal-install_1_18_0_8" = callPackage
+  "cabal-install_1_18_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HTTP, HUnit, mtl, network, network-uri
      , pretty, process, QuickCheck, random, stm, test-framework
@@ -28012,8 +28179,10 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "1.18.0.8";
-       sha256 = "1yx7vgyi2hs934z4ln7d8m2yrsakidb551ib01l9hxnmc3jbskwi";
+       version = "1.18.1.0";
+       revision = "1";
+       sha256 = "1r1shhvnpgxf91rmbv3wa1rkd24plbgr6bpz3aj80ir0z3zbdayn";
+       editedCabalFile = "7f1c53bbf3a3906d0594e217d236e54acc015c67db88301dbadaf5008cb9ac4c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -28045,8 +28214,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "1.22.3.0";
-       sha256 = "0k4bz2haba1qk30swkshf3v8prbv5lkw47nxgvi4xxayhyv4wm98";
+       version = "1.22.4.0";
+       sha256 = "0qwgs01jd6k03zk67gbydhqkdgsb4wzqylxywz4samkmdilagiw0";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -29696,8 +29865,8 @@ self: {
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.16.0";
-       sha256 = "0mgavwbdagnxcyhzg5cypz1rvzz8wj6xxj72b44j49262jm1lh15";
+       version = "0.17.0";
+       sha256 = "1q9x31aahm8sr8lnrcdavy2lzi46qh12q3k10hprq7lr3w41ls7d";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -31213,8 +31382,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.7.4";
-       sha256 = "1y5y03glswmy4vbi4g5dxyipy4n4fygkmh8bd7pb7n8fa1n751a2";
+       version = "0.7.5";
+       sha256 = "0li9y6cb56yf28yrma2c1japhl6c4rk0x9d8wnf3wq9n499bj6iv";
        buildDepends = [
          base data-default ghc-prim ghc-typelits-natnormalise integer-gmp
          singletons template-haskell th-lift
@@ -31231,10 +31400,11 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude-quickcheck";
-       version = "0.1.1.0";
-       sha256 = "1yccczs5bpg5qc4zdp4qpgfy5mnf6h17s16dv77d54k4c3r90adz";
+       version = "0.1.2.0";
+       revision = "1";
+       sha256 = "1vnw7gaaj1ixz6j96dg6lqcafjbijkzxww0pij8hy4z3sm2370w0";
+       editedCabalFile = "f746784b2f0ed039d21e46d8b3adabb39ab6eb002d1c83fd8091619863be7f28";
        buildDepends = [ base clash-prelude containers mtl QuickCheck ];
-       jailbreak = true;
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32527,6 +32697,7 @@ self: {
          aeson base conceit network network-simple pipes pipes-aeson
          pipes-attoparsec pipes-network text transformers
        ];
+       jailbreak = true;
        description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33340,8 +33511,8 @@ self: {
      }:
      mkDerivation {
        pname = "conceit";
-       version = "0.2.2.1";
-       sha256 = "0phr04cp36n5r137la3vh92v7wbc5a56grpfynn2vjiyacmrw0b4";
+       version = "0.3.0.0";
+       sha256 = "1sy8qz7lf4a09b4i7nnzn2bl4lbmkmc613l9pjs7y2xf1qniawhg";
        buildDepends = [
          base bifunctors exceptions mtl semigroupoids transformers void
        ];
@@ -34497,8 +34668,8 @@ self: {
      }:
      mkDerivation {
        pname = "contravariant";
-       version = "1.3.1";
-       sha256 = "18zmjn2d4ig0sfbbdajjzmqd9fjcyb6gjf4xywimdjg6wv053cxw";
+       version = "1.3.1.1";
+       sha256 = "0kjfild3zp34w745p79658i84k45cg9qjhv154sa0plqgk2vmdfs";
        buildDepends = [
          base semigroups StateVar transformers transformers-compat void
        ];
@@ -34883,7 +35054,9 @@ self: {
      mkDerivation {
        pname = "cookie";
        version = "0.4.1.5";
+       revision = "2";
        sha256 = "0n1kil6z2sgaj8p67wbi7gaaz5rs78aagcnbk2338xhpd69wgrmn";
+       editedCabalFile = "f9789afefed0c211dfe33d029f26bd464a3ca2f51b277629230a68ed58ee49e2";
        buildDepends = [
          base blaze-builder bytestring data-default-class deepseq old-locale
          text time
@@ -36862,6 +37035,7 @@ self: {
        buildDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cuda" = callPackage
@@ -38381,10 +38555,9 @@ self: {
     ({ mkDerivation, base, deepseq, mtl, parallel, pretty, time }:
      mkDerivation {
        pname = "data-pprint";
-       version = "0.2.3";
-       sha256 = "1ygbhn399d4hlrdjmg7gxbr5akydb78p6qa80rv7m6j0fsqzbf6y";
+       version = "0.2.4";
+       sha256 = "0r4q95pl9gmgc080psi3j87cg1v3cmm6gxnrps17j5sw1nqzb6v5";
        buildDepends = [ base deepseq mtl parallel pretty time ];
-       jailbreak = true;
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38715,19 +38888,21 @@ self: {
      }) {};
 
   "dataflow" = callPackage
-    ({ mkDerivation, base, containers, hspec, HUnit, mtl, parsec }:
+    ({ mkDerivation, base, containers, hspec, HUnit, MissingH, mtl
+     , parsec
+     }:
      mkDerivation {
        pname = "dataflow";
-       version = "0.6.0.0";
-       sha256 = "0npfaq8zxkw2yj56x4m3cxcrl9krknw67apjjy1nbsabw9yaim2z";
+       version = "0.6.1.0";
+       sha256 = "099n0mlx695zvazx7q53i474nzmdrqk38q8lrzf6qh440h60q7bx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec ];
+       buildDepends = [ base containers MissingH mtl parsec ];
        testDepends = [ base hspec HUnit ];
        jailbreak = true;
-       homepage = "https://github.com/owickstrom/dataflow";
+       homepage = "https://github.com/sonyxperiadev/dataflow";
        description = "Generate Graphviz documents from a Haskell representation";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "datalog" = callPackage
@@ -40287,10 +40462,9 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "dia-base";
-       version = "0.1.1.2";
-       sha256 = "08j65fgxrbp8mdhs887w6hj4wakxrkbk9nr5kk9jy0bahw7dw9c5";
+       version = "0.1.1.3";
+       sha256 = "1kx7dczabfklqpvbz7zcf1hhha8vrcbv35xl82fips02x0065b75";
        buildDepends = [ base deepseq ];
-       jailbreak = true;
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40301,12 +40475,11 @@ self: {
      }:
      mkDerivation {
        pname = "dia-functions";
-       version = "0.2.1.3";
-       sha256 = "0zay364hmrd1759i89g8bv8845hd9b3dnvicz3ybnqk5bcn6aq1l";
+       version = "0.2.1.4";
+       sha256 = "14hfapfnfl2m9g8b6mdcmmq2fbyqgg14s0sagxbb8hhz47pznc27";
        buildDepends = [
          base containers data-pprint deepseq dia-base mtl xhtml
        ];
-       jailbreak = true;
        description = "An EDSL for teaching Haskell with diagrams - functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40675,8 +40848,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.3.1";
-       sha256 = "0nl2yid05gravqx8d60ra71x6bbyxd3f03dfrbx52rlljwizfyrp";
+       version = "1.3.1.1";
+       sha256 = "1agfyxv98j14pz6lhk8v5fvm534j7d0923260mrnd5ma6dvpshsw";
        buildDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
@@ -40965,8 +41138,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.13";
-       sha256 = "0s6rns38gi4fn8hi5dag0p3pkf8yl4r1ilrlq2vwgr8d25647k91";
+       version = "1.1.14";
+       sha256 = "0j6pxvxcisnj5gx0vr0d845j380q0qqkw93b811bnz767zskmm7n";
        buildDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -40975,7 +41148,6 @@ self: {
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
@@ -42045,8 +42217,8 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.6.0.1";
-       sha256 = "1dx1f647849v5mlsp862x7cmwiygiph9y1fgdfg1xnfshlx6r4qp";
+       version = "0.6.0.2";
+       sha256 = "17sx8pkwmdksqk2g7jiid335znx03h1crxnhhk66vainif5my5bg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -44252,13 +44424,12 @@ self: {
      }:
      mkDerivation {
        pname = "ekg";
-       version = "0.4.0.5";
-       sha256 = "0ak06yz88p79bhayy8byy3j9yw9bix7zhw8yxfcdnxjwgnx621h0";
+       version = "0.4.0.6";
+       sha256 = "0s3snpak9kighii4gsq9svc92qiqcr46jw0v02f98jgfqbi9wanc";
        buildDepends = [
          aeson base bytestring ekg-core filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
@@ -45794,15 +45965,15 @@ self: {
      }) {};
 
   "etcd" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
-     , MonadRandom, mtl, text, time
+    ({ mkDerivation, aeson, async, base, bytestring, hspec
+     , http-conduit, MonadRandom, mtl, text, time
      }:
      mkDerivation {
        pname = "etcd";
-       version = "1.0.3";
-       sha256 = "0575f7kh8kkyp849b0gh10ka0xip0q1014il2q05vds118mvqxg3";
+       version = "1.0.4";
+       sha256 = "0s08gryqhvcjvyq3swp2p753xqny3swgni17a2pbdjq300krx8kn";
        buildDepends = [ aeson base bytestring http-conduit text time ];
-       testDepends = [ base hspec MonadRandom mtl text ];
+       testDepends = [ async base hspec MonadRandom mtl text ];
        description = "Client for etcd, a highly-available key value store";
        license = "unknown";
      }) {};
@@ -46612,8 +46783,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "1.9.0.1";
-       sha256 = "17hl4x4052jfn7xs6xhnc6d3x75a8haw2zsbnjd6rr5gsd1hq5kx";
+       version = "1.9.1.0";
+       sha256 = "1xkddv9k7kqmz4v0pprkzhni8kc2wxkrfv1cqv1lvkjvp8js1zy6";
        buildDepends = [
          base transformers transformers-base type-aligned void
        ];
@@ -46972,12 +47143,17 @@ self: {
      }) {};
 
   "fasta" = callPackage
-    ({ mkDerivation, base, containers, parsec, pipes, split, text }:
+    ({ mkDerivation, base, containers, foldl, lens, parsec, pipes
+     , pipes-group, pipes-text, split, text
+     }:
      mkDerivation {
        pname = "fasta";
-       version = "0.5.4.0";
-       sha256 = "15ff6l8kv6pivl8l9apfpsnn5arwgbhzxi8h4chr05qvanlycvfg";
-       buildDepends = [ base containers parsec pipes split text ];
+       version = "0.6.1.0";
+       sha256 = "1hxp7r08cca8yyfgkgv2vrk8i989bxw6pd211zy65xsfd6gmf7nr";
+       buildDepends = [
+         base containers foldl lens parsec pipes pipes-group pipes-text
+         split text
+       ];
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -47399,17 +47575,21 @@ self: {
      }) {};
 
   "feed" = callPackage
-    ({ mkDerivation, base, old-locale, old-time, time
-     , time-locale-compat, utf8-string, xml
+    ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
+     , test-framework-hunit, time, time-locale-compat, utf8-string, xml
      }:
      mkDerivation {
        pname = "feed";
-       version = "0.3.9.3";
-       sha256 = "1l3bdhyfj7kcrkdwvsynkmzrskbg5r154pay9dkf5l7m8n2vicfl";
+       version = "0.3.9.4";
+       sha256 = "18jq1zw1qb2z6lga2vpn4z7dsylglgzl4bskb9x2skw9wv7pgsnk";
        buildDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
-       homepage = "https://github.com/sof/feed";
+       testDepends = [
+         base HUnit old-locale old-time test-framework test-framework-hunit
+         time time-locale-compat utf8-string xml
+       ];
+       homepage = "https://github.com/bergmark/feed";
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47725,10 +47905,10 @@ self: {
     ({ mkDerivation, base, containers, fgl }:
      mkDerivation {
        pname = "fgl-extras-decompositions";
-       version = "0.1.0.0";
-       sha256 = "0mx0axc88yb992zb9ymaipsrln42rj49558ir9753j19d38v2q8m";
+       version = "0.1.1.0";
+       sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s";
        buildDepends = [ base containers fgl ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
+       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47912,15 +48092,15 @@ self: {
   "filediff" = callPackage
     ({ mkDerivation, base, bytestring, data-default
      , data-memocombinators, directory, either, mtl, rainbow, tasty
-     , tasty-hunit, text, time, transformers, Zora
+     , tasty-hunit, text, threads, time, transformers, Zora
      }:
      mkDerivation {
        pname = "filediff";
-       version = "1.0.0.0";
-       sha256 = "06krwpnawvy28rgcs6xpk4m98vbn0wfqbw91is5j026iksdpga1g";
+       version = "1.0.0.1";
+       sha256 = "1341xriaylrvclbz8c5pc1dppbz4kqq1hmbrga0dlpb6vr83amv2";
        buildDepends = [
          base bytestring data-default data-memocombinators directory either
-         mtl rainbow tasty tasty-hunit text time transformers Zora
+         mtl rainbow tasty tasty-hunit text threads time transformers Zora
        ];
        testDepends = [
          base directory either mtl tasty tasty-hunit text time transformers
@@ -49077,15 +49257,16 @@ self: {
      }) {};
 
   "foldl" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primitive, text
-     , transformers, vector
+    ({ mkDerivation, base, bytestring, containers, mwc-random
+     , primitive, text, transformers, vector
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.0.9";
-       sha256 = "10y9r4h6a6na0gpf5sy5mm34k94swisv6wbj2k210zyfvnrx9r36";
+       version = "1.0.10";
+       sha256 = "04ghbn78hsqp92k9mljpa5xgjrmddwrhj90wb1f1v4lliw1inn9q";
        buildDepends = [
-         base bytestring containers primitive text transformers vector
+         base bytestring containers mwc-random primitive text transformers
+         vector
        ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
@@ -52136,8 +52317,8 @@ self: {
     ({ mkDerivation, base, ghc, tasty, tasty-hunit }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.2";
-       sha256 = "1imf7lgv5fm19p87kmkl03gbc2an5gbs2p70xw12g8nmf6s23flc";
+       version = "0.2.1";
+       sha256 = "0dflzqhqax06nx4qc5xw6k1aihny7d2pxg1ldyw1y57mjg44clah";
        buildDepends = [ base ghc ];
        testDepends = [ base tasty tasty-hunit ];
        jailbreak = true;
@@ -52919,8 +53100,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.10.6.2";
-       sha256 = "0n4g4v6mdqml83vz5gz48l58747xnzz1h645kj6pwygfg4s48nza";
+       version = "0.10.6.3";
+       sha256 = "1pzxk4zsk1992gsgyi0pfj8x0dggf56v78345jl282hvb2psm371";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -53706,8 +53887,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnutls";
-       version = "0.1.5";
-       sha256 = "1sf6b4g0jwk1jrzjq4vwwak57lzm1zc43ggysp973q5icm6gs8wp";
+       version = "0.1.6";
+       sha256 = "03xas76prffkzckpcrsqi6izj415yd172v3knpjbb0za4m489n63";
        buildDepends = [ base bytestring monads-tf transformers ];
        extraLibraries = [ gnutls ];
        pkgconfigDepends = [ gnutls ];
@@ -54977,8 +55158,8 @@ self: {
     ({ mkDerivation, base, bytestring, gsasl, transformers }:
      mkDerivation {
        pname = "gsasl";
-       version = "0.3.5";
-       sha256 = "1797rs6syrgs82akbj7nkmj0nni4w83fhwrl1zy2l3jqkcacvbm3";
+       version = "0.3.6";
+       sha256 = "0cgrw5ypkwp4mzj8m12q783jqng1jp1j7ny15704jmjxbq13cq3q";
        buildDepends = [ base bytestring transformers ];
        pkgconfigDepends = [ gsasl ];
        homepage = "https://john-millikin.com/software/haskell-gsasl/";
@@ -56997,14 +57178,13 @@ self: {
      }:
      mkDerivation {
        pname = "hailgun";
-       version = "0.4.0.0";
-       sha256 = "0f833chxrc3ac9f2sc1cwszz0pdhg7yz4ni5fq5x647vm5wifhcj";
+       version = "0.4.0.1";
+       sha256 = "1jwk8rip8d96ivkv2k3dzmppid8dyvkrhgkjrxawgvwjzavfwwfn";
        buildDepends = [
          aeson base bytestring email-validate exceptions filepath
          http-client http-client-tls http-types tagsoup text time
          transformers
        ];
-       jailbreak = true;
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -65715,6 +65895,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hood2" = callPackage
+    ({ mkDerivation, array, base }:
+     mkDerivation {
+       pname = "hood2";
+       version = "0.2.1";
+       sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02";
+       buildDepends = [ array base ];
+       homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
+       description = "Debugging by observing in place";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hoodie" = callPackage
     ({ mkDerivation, array, astar, base, containers, hfov, monad-loops
      , mtl, ncurses, random
@@ -66945,8 +67137,8 @@ self: {
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1.2";
-       sha256 = "1w57k3c4y08mk0887knar33yg36hpk2z31lqwz4aiq3dnidvjmdz";
+       version = "0.3.1.3";
+       sha256 = "1gzbdpsighs8jj92gi1xsrhpb7zh5mc86wiv4fszmgfrwaq1w8ab";
        buildDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
@@ -67173,8 +67365,8 @@ self: {
     ({ mkDerivation, base, haskell-src, hspec }:
      mkDerivation {
        pname = "hs-inspector";
-       version = "0.4.0.0";
-       sha256 = "04i1jydalnc67zagz2ladidjxd0l4l9fl65apswylarm6pn7kfp1";
+       version = "0.5.1.0";
+       sha256 = "189ch2hr39n73cgrrg94kx8rqnm4j0s2bsg5xij85bw96w8d44y5";
        buildDepends = [ base haskell-src ];
        testDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
@@ -72478,8 +72670,8 @@ self: {
      }:
      mkDerivation {
        pname = "ide-backend";
-       version = "0.9.0.7";
-       sha256 = "0z85pxf4hmk0b374y3wrxsjx7lvmqhgb3k5153yfd08rh606p0s3";
+       version = "0.9.0.8";
+       sha256 = "0jrjpx7kx5q9lixvi4c02xb5sjq7wsd4mkh07b2ak4w784gndz8q";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74572,21 +74764,19 @@ self: {
      }) {};
 
   "ipopt-hs" = callPackage
-    ({ mkDerivation, ad, ansi-wl-pprint, base, c2hs, containers
-     , criterion, ipopt, lens, linear, mtl, nlopt, random-shuffle
-     , Rlang-QQ, splines, template-haskell, uu-parsinglib, vector
+    ({ mkDerivation, ad, ansi-wl-pprint, base, c2hs, containers, ipopt
+     , lens, mtl, nlopt, template-haskell, uu-parsinglib, vector
      , vector-space
      }:
      mkDerivation {
        pname = "ipopt-hs";
-       version = "0.4.2.0";
-       sha256 = "1lp0prql6f487zp08rj5hkdsf4al6qlzzfjpxildwmwsgajnw942";
+       version = "0.5.0.0";
+       sha256 = "03cpn73ybkifkbl8dxbpyh17gv71jx9x53pkhi9wbfpqqz2ail9c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         ad ansi-wl-pprint base containers criterion lens linear mtl
-         random-shuffle Rlang-QQ splines template-haskell uu-parsinglib
-         vector vector-space
+         ad ansi-wl-pprint base containers lens mtl template-haskell
+         uu-parsinglib vector vector-space
        ];
        buildTools = [ c2hs ];
        pkgconfigDepends = [ ipopt nlopt ];
@@ -76120,8 +76310,8 @@ self: {
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
-       version = "1.11.2";
-       sha256 = "0sdzgz3gfic0i6636kd2szlqczhydi8m6vjr188n1bjc1y1xh112";
+       version = "1.11.3";
+       sha256 = "0my2ncql2vkdhxcqiw4jly957zkjdvbbw9jhf2dk6ndfnp81jyrx";
        buildDepends = [ base ];
        testDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
@@ -76417,22 +76607,24 @@ self: {
 
   "json-rpc-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, HUnit, json-rpc-server
-     , mtl, QuickCheck, test-framework, test-framework-hunit
+     , mtl, QuickCheck, scientific, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, unordered-containers, vector
+     , vector-algorithms
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.1.0.0";
-       sha256 = "0sfdlj5i7flb9kkmi4lmmx199ikw7gp17flr9yx104z5a9r5f51m";
+       version = "0.1.2.0";
+       sha256 = "1arn4ik9fyicb875ac0y7dp9ahipvip8fq2mr95vvmhym921ca64";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bytestring json-rpc-server mtl text unordered-containers
-         vector
+         vector vector-algorithms
        ];
        testDepends = [
          aeson base bytestring HUnit json-rpc-server mtl QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
+         scientific test-framework test-framework-hunit
+         test-framework-quickcheck2 text unordered-containers vector
        ];
        jailbreak = true;
        description = "JSON-RPC 2.0 on the client side.";
@@ -82303,6 +82495,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "log" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
+     , exceptions, hpqtypes, monad-control, monad-time, mtl, old-locale
+     , split, stm, text, time, transformers-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "log";
+       version = "0.1.0";
+       sha256 = "1smki1bp50vnmq6i2gxafj271sqwbizfdyqx0ggar6zbxv436gzm";
+       buildDepends = [
+         aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
+         monad-control monad-time mtl old-locale split stm text time
+         transformers-base unordered-containers
+       ];
+       homepage = "https://github.com/scrive/log";
+       description = "Structured logging solution with multiple backends";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "log-domain" = callPackage
     ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
      , directory, distributive, doctest, filepath, generic-deriving
@@ -85065,13 +85276,17 @@ self: {
      }) {};
 
   "memcache" = callPackage
-    ({ mkDerivation, base, binary, blaze-builder, bytestring, network
+    ({ mkDerivation, base, binary, blaze-builder, bytestring, hashable
+     , network, resource-pool, time, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "memcache";
-       version = "0.0.0";
-       sha256 = "0bwnr28wn5anc2bcg2fwci3rgn2ykxp1gg58qg97d7lw1djmikwr";
-       buildDepends = [ base binary blaze-builder bytestring network ];
+       version = "0.0.1";
+       sha256 = "1fzppfyizli64g7dwsdayn5qlbxi8fp1cwwxgw391w5gl07h228f";
+       buildDepends = [
+         base binary blaze-builder bytestring hashable network resource-pool
+         time vector vector-algorithms
+       ];
        testDepends = [ base bytestring ];
        homepage = "https://github.com/dterei/memcache-hs";
        description = "A memcached client library";
@@ -85605,8 +85820,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi-util";
-       version = "0.1.1";
-       sha256 = "14apfrhahm5pniwpjgk5ckgb1y6zlfxcb91xsh4qpg1axav89cr2";
+       version = "0.1.1.1";
+       sha256 = "1g8rhx1n6rhyi49x6rkim1bnv7rg6wc0x89dzkrbzyxm28hkvjfk";
        buildDepends = [ base containers event-list midi non-negative ];
        jailbreak = true;
        homepage = "http://github.com/mtolly/midi-util";
@@ -86302,8 +86517,8 @@ self: {
     ({ mkDerivation, base, directory, hspec, temporary }:
      mkDerivation {
        pname = "mockery";
-       version = "0.0.0";
-       sha256 = "0j4cpjrcgdp93mbfzfhxrmp33163rfs171pc60hppv7wx1hqb1rl";
+       version = "0.1.0";
+       sha256 = "0jl2561jknvp86anccw6pwy8w95jnxm635jpsal47y90mdjf1qbl";
        buildDepends = [ base directory temporary ];
        testDepends = [ base directory hspec temporary ];
        description = "Support functions for automated testing";
@@ -87157,6 +87372,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-time" = callPackage
+    ({ mkDerivation, base, mtl, time }:
+     mkDerivation {
+       pname = "monad-time";
+       version = "0.1";
+       sha256 = "1g3dqfwwmqwdpr3dcixxyw5akbdicx53i6d2s8921l2zbkm0hfnj";
+       buildDepends = [ base mtl time ];
+       homepage = "https://github.com/scrive/monad-time";
+       description = "Type class for monads which carry the notion of the current time";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monad-tx" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -90035,18 +90262,18 @@ self: {
 
   "nested-routes" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
-     , constraints, containers, hspec, http-types, lucid, mtl
-     , poly-arity, pred-trie, QuickCheck, quickcheck-instances
-     , semigroups, text, transformers, wai, wai-extra
+     , constraints, containers, hspec, http-media, http-types, lucid
+     , mtl, poly-arity, pred-trie, QuickCheck, quickcheck-instances
+     , regex-compat, semigroups, text, transformers, wai, wai-extra
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "0.3.1";
-       sha256 = "1bgh0ap6yzpnp4dzwf73dbi6dspc57hvsvnkv4ndg0fcclifvih5";
+       version = "0.3.2.1";
+       sha256 = "1mj6l01pfyjasa4zaff41vixbbcwdwwwhqv925bq3n1wkznwkzic";
        buildDepends = [
          aeson attoparsec base blaze-html bytestring constraints containers
-         http-types lucid mtl poly-arity pred-trie semigroups text
-         transformers wai wai-extra
+         http-media http-types lucid mtl poly-arity pred-trie regex-compat
+         semigroups text transformers wai wai-extra
        ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Declarative, compositional Wai responses";
@@ -90379,8 +90606,8 @@ self: {
      }:
      mkDerivation {
        pname = "network";
-       version = "2.6.0.2";
-       sha256 = "12b7saam5ga6l4cplgkad49xa4vkynz2ri9jxidx1cxiqjcl0vc4";
+       version = "2.6.1.0";
+       sha256 = "0nx85kvrzjm258qr5blphli44gipc7nvxgvbyq8ifv42ll6w6jdj";
        buildDepends = [ base bytestring unix ];
        testDepends = [
          base bytestring HUnit test-framework test-framework-hunit
@@ -90766,8 +90993,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, network, unix }:
      mkDerivation {
        pname = "network-msg";
-       version = "0.4";
-       sha256 = "13dn06rgw8ygw1iikadf0m7bh7kvdx0s90iachip7kg50nq90waw";
+       version = "0.5";
+       sha256 = "0ykphm5xljxml4ifx2v2f7f51kny170k552sy5l4f5paciv47a1g";
        buildDepends = [ base binary bytestring network unix ];
        description = "Recvmsg and sendmsg bindings";
        license = "unknown";
@@ -90822,8 +91049,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-protocol-xmpp";
-       version = "0.4.6";
-       sha256 = "0xmafjz11v2dlbyg2ny90ycz315s23yprdpxz3l06igjxw6h3v6n";
+       version = "0.4.7";
+       sha256 = "12xvg21lxvssnaxvzis49xqsccx2siymrva5702m1npdd6f9y81h";
        buildDepends = [
          base bytestring gnuidn gnutls gsasl libxml-sax monads-tf network
          text transformers xml-types
@@ -93125,7 +93352,9 @@ self: {
      mkDerivation {
        pname = "opml-conduit";
        version = "0.1.0.0";
+       revision = "2";
        sha256 = "055ngv2ibb7bk99y67ag9y7xxhyzag08mgb6zf1aqfjgpna6dkcf";
+       editedCabalFile = "74ca928e036892a1db09b1309addb87cba9dd7332fc5c9aab8413e6635e357c9";
        buildDepends = [
          base case-insensitive conduit containers data-default exceptions
          lens mono-traversable monoid-subclasses network-uri QuickCheck
@@ -96378,7 +96607,9 @@ self: {
      mkDerivation {
        pname = "pia-forward";
        version = "0.1.0.1";
+       revision = "1";
        sha256 = "02ryfiibkbfx6zg1n0h8kvb4mkiai57cvllqcwp815x50rsrpd2r";
+       editedCabalFile = "7ace7bfcb4b05c4099a28ec12b7e12682669ddfe6d4e5f68c4d74c05914b7582";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -96386,7 +96617,6 @@ self: {
          http-client-tls network-info process random text text-format time
          xdg-basedir
        ];
-       jailbreak = true;
        homepage = "https://github.com/enolan/pia-forward";
        description = "Set up port forwarding with the Private Internet Access VPN service";
        license = stdenv.lib.licenses.gpl3;
@@ -97726,14 +97956,16 @@ self: {
      }) {};
 
   "poly-arity" = callPackage
-    ({ mkDerivation, base, constraints, HList, hspec, QuickCheck
+    ({ mkDerivation, base, constraints, hspec, QuickCheck
      , quickcheck-instances
      }:
      mkDerivation {
        pname = "poly-arity";
-       version = "0.0.3";
-       sha256 = "1laywdj9bifh4mqb6farlzvp4cp3f4vgbvd9dnnhyndzh3sp3p5b";
-       buildDepends = [ base constraints HList ];
+       version = "0.0.4";
+       revision = "1";
+       sha256 = "0cg312hlfylablw4h840xhm72cs70xk9rla4wrmzpqm45g91fhyq";
+       editedCabalFile = "e099e3cdd06f5ab832bfc920265cd97304f92c2e89126306f7e1d9bff98cbe86";
+       buildDepends = [ base constraints ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Tools for working with functions of undetermined arity";
        license = stdenv.lib.licenses.bsd3;
@@ -100143,6 +100375,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proton-haskell" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, HUnit
+     , test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "proton-haskell";
+       version = "0.4";
+       sha256 = "1drg50ffp9q5hqdn6h46i45y4crmb1d6j6238qdnmrdmbj1pk4zw";
+       buildDepends = [ base containers directory filepath ];
+       testDepends = [
+         base containers directory filepath HUnit test-framework
+         test-framework-hunit
+       ];
+       homepage = "http://github.com/jasonrbriggs/proton";
+       description = "Simple XML templating library";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "prototype" = callPackage
     ({ mkDerivation, base, monads-tf }:
      mkDerivation {
@@ -102191,6 +102441,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "razom-text-util" = callPackage
+    ({ mkDerivation, base, QuickCheck, regex-applicative, smaoin
+     , text-position
+     }:
+     mkDerivation {
+       pname = "razom-text-util";
+       version = "0.1.0.0";
+       sha256 = "08f7cvipcdcn6s2rgf0n65g67fhkx36841dihzzsfalglfr9gn6m";
+       buildDepends = [ base regex-applicative smaoin text-position ];
+       testDepends = [ base QuickCheck regex-applicative smaoin ];
+       jailbreak = true;
+       homepage = "http://rel4tion.org/projects/razom-text-util/";
+       description = "Common text/parsing tools for Razom language packages";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "rbr" = callPackage
     ({ mkDerivation, base, bio, bytestring, containers }:
      mkDerivation {
@@ -103125,14 +103391,16 @@ self: {
 
   "reflex" = callPackage
     ({ mkDerivation, base, containers, dependent-map, dependent-sum
-     , mtl, primitive, semigroups, template-haskell, these
+     , mtl, primitive, ref-tf, semigroups, template-haskell, these
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.1.1";
-       sha256 = "071pv72l1iynl8jmnjdx121f1pzp1pj4kr1jcbmzx4v60zhfwpns";
+       version = "0.2";
+       revision = "1";
+       sha256 = "0mq5249dhx26z02jzjr5bxxsgyhg7npd3q7v3l4ipxxxgixg1vdv";
+       editedCabalFile = "4454a0c57f83e4490729fe4b1ce95197be989aa2a0f8b384afddcb1ad71817de";
        buildDepends = [
-         base containers dependent-map dependent-sum mtl primitive
+         base containers dependent-map dependent-sum mtl primitive ref-tf
          semigroups template-haskell these
        ];
        homepage = "https://github.com/ryantrinkle/reflex";
@@ -103140,6 +103408,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reflex-dom" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , dependent-map, dependent-sum, ghcjs-dom, glib, gtk3, lens, mtl
+     , ref-tf, reflex, safe, semigroups, text, these, time, transformers
+     , webkitgtk3, webkitgtk3-javascriptcore
+     }:
+     mkDerivation {
+       pname = "reflex-dom";
+       version = "0.1.1";
+       sha256 = "1fzk7x0iwgdsb4fmhx399xvq200pz4sh2g1n0n8a76q9sy6j82hs";
+       buildDepends = [
+         aeson base bytestring containers data-default dependent-map
+         dependent-sum ghcjs-dom glib gtk3 lens mtl ref-tf reflex safe
+         semigroups text these time transformers webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
+       description = "Glitch-free Functional Reactive Web Apps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reform" = callPackage
     ({ mkDerivation, base, containers, mtl, text }:
      mkDerivation {
@@ -108744,14 +109032,14 @@ self: {
      }) {};
 
   "sequent-core" = callPackage
-    ({ mkDerivation, base, containers, ghc, transformers }:
+    ({ mkDerivation, base, bytestring, containers, ghc, transformers }:
      mkDerivation {
        pname = "sequent-core";
-       version = "0.3";
-       sha256 = "1f5s9aikfsff46x4xf4s9vsc36yhbnbvhf7yhvnl5z9sms52yjiw";
+       version = "0.4";
+       sha256 = "07lgzdhywdv2jzzijnx01z587n8bb2smd48v15rir9v17fsfp105";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ghc transformers ];
+       buildDepends = [ base bytestring containers ghc transformers ];
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -110956,8 +111244,8 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
-       version = "0.1.1.0";
-       sha256 = "154jzdxhq5nvr78wlk26fzjs9n2piw8h92dq4n1rqz4wqjkhyg9s";
+       version = "0.2.0.0";
+       sha256 = "0qq5zg2m5w55fimz9xm7dc9953zlm345whvlf2j0gk1iw7n6a1ax";
        buildDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
@@ -111459,15 +111747,14 @@ self: {
     ({ mkDerivation, base, bytestring, QuickCheck, text }:
      mkDerivation {
        pname = "smaoin";
-       version = "0.1.1.0";
-       sha256 = "1sx3f8bkfy7an8v92xryxxjhwxprwdisv8lvl4kkq9pm36dzsnrk";
+       version = "0.1.1.2";
+       sha256 = "0h8qqbggklw0vj5qf12114ki42kb7cilhd6i24fvlhaffpmpgv21";
        buildDepends = [ base bytestring text ];
        testDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "http://rel4tion.org/projects/smaoin-hs/";
        description = "Utilities for the Smaoin semantic information model";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smartGroup" = callPackage
@@ -111694,9 +111981,9 @@ self: {
      mkDerivation {
        pname = "snap";
        version = "0.14.0.2";
-       revision = "1";
+       revision = "2";
        sha256 = "1yv1snkibsqd7cdxyqi7c8gvnv1hzzhw5jlk19kps526n5xvay7r";
-       editedCabalFile = "1640756ec7bfd3130869dce451904d6cc762ab6c8b8128982933fba80f325c92";
+       editedCabalFile = "27e804d1f6070f0899ad3770dfded3db1b6ce44309b28c33f11701edcfe6428a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -111707,7 +111994,6 @@ self: {
          stm syb template-haskell text time transformers
          unordered-containers vector vector-algorithms xmlhtml
        ];
-       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -111875,22 +112161,29 @@ self: {
 
   "snap-extras" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
-     , configurator, containers, data-default, digestive-functors
-     , digestive-functors-heist, digestive-functors-snap, directory-tree
-     , errors, filepath, heist, jmacro, mtl, readable, safe, snap
-     , snap-core, text, transformers, xmlhtml
+     , case-insensitive, configurator, containers, data-default
+     , digestive-functors, digestive-functors-heist
+     , digestive-functors-snap, directory-tree, errors, filepath, heist
+     , jmacro, lens, mtl, pcre-light, QuickCheck, readable, safe, snap
+     , snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, wl-pprint-text, xmlhtml
      }:
      mkDerivation {
        pname = "snap-extras";
-       version = "0.9";
-       revision = "1";
-       sha256 = "143n0y3cavfgn6f40sh7i441q77ys4lkfv0g9cai714n7yr0ya1v";
-       editedCabalFile = "3a360180bc4463874da336da5b4f1271a1cce298ca36cf9407a04823d4df58d8";
+       version = "0.11";
+       sha256 = "1s6qdl149x22six61kgm7xnqfyys8z7zh0waajmzip1q4ivxqnij";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
-         aeson base blaze-builder blaze-html bytestring configurator
-         containers data-default digestive-functors digestive-functors-heist
-         digestive-functors-snap directory-tree errors filepath heist jmacro
-         mtl readable safe snap snap-core text transformers xmlhtml
+         aeson base blaze-builder blaze-html bytestring case-insensitive
+         configurator containers data-default digestive-functors
+         digestive-functors-heist digestive-functors-snap directory-tree
+         errors filepath heist jmacro lens mtl pcre-light readable safe snap
+         snap-core text time transformers wl-pprint-text xmlhtml
+       ];
+       testDepends = [
+         base bytestring containers QuickCheck snap-core tasty tasty-hunit
+         tasty-quickcheck
        ];
        jailbreak = true;
        description = "A collection of useful helpers and utilities for Snap web applications";
@@ -111965,8 +112258,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-server";
-       version = "0.9.5.0";
-       sha256 = "1rsn3zxrl8cngpl47hd4js18gw90dwn0zhwv2z6hxi7ygwnx8q0i";
+       version = "0.9.5.1";
+       sha256 = "18ryin6f315picrs2159sn2668266l3xchs7jb8isw0gp52273xg";
        buildDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring case-insensitive containers
@@ -114330,8 +114623,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "srcloc";
-       version = "0.5.0.1";
-       sha256 = "0v13s813s3a4xgadpcjwf36kw8qf6chpghrnx7r6nqii92nvry8q";
+       version = "0.5.0.2";
+       sha256 = "0r7fgplyys8335bjrdmcx4m0z0xark0f174lrh2hsmzyii37x6jc";
        buildDepends = [ base ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Data types for managing source code locations";
@@ -114567,16 +114860,18 @@ self: {
      }) {};
 
   "stackage" = callPackage
-    ({ mkDerivation, base, stackage-build-plan, stackage-cli
-     , stackage-install, stackage-update, stackage-upload
+    ({ mkDerivation, base, stackage-build-plan, stackage-cabal
+     , stackage-cli, stackage-install, stackage-sandbox, stackage-setup
+     , stackage-update, stackage-upload
      }:
      mkDerivation {
        pname = "stackage";
-       version = "0.7.2.0";
-       sha256 = "0qqj39jpigv77vikdc18n7p4527z5hj1chzshqsng4d4msqavfkp";
+       version = "0.7.3.2";
+       sha256 = "0npry3yxbfyz97q19b405h40mb4rypgkhlp78hgl7zqbxk28ysza";
        buildDepends = [
-         base stackage-build-plan stackage-cli stackage-install
-         stackage-update stackage-upload
+         base stackage-build-plan stackage-cabal stackage-cli
+         stackage-install stackage-sandbox stackage-setup stackage-update
+         stackage-upload
        ];
        homepage = "https://www.stackage.org/";
        description = "Dummy package forcing installation of other Stackage packages";
@@ -114612,9 +114907,9 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-cabal";
-       version = "0.1.0";
-       sha256 = "11xafmg1lywgd6vnpgrbk2v8w576i41m9h911y86vh5m4d4bq2q1";
-       isLibrary = false;
+       version = "0.1.1";
+       sha256 = "0797izw5451mqr41a22xvv5c6c0936hi44cfmp9rzhj6mh92iwzj";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring exceptions http-client http-client-tls http-types
@@ -114632,8 +114927,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-cli";
-       version = "0.1.0.1";
-       sha256 = "1mcmpr745z221pp5lbib3c9cdjw8nv0lp76kv1xz7bppsn26sncm";
+       version = "0.1.0.2";
+       sha256 = "10asq1zg7b4zqsn51ap03809j0bxrwh1gacc387wdi1p3zakn88n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114684,18 +114979,20 @@ self: {
      }) {};
 
   "stackage-install" = callPackage
-    ({ mkDerivation, async, base, bytestring, directory, filepath
-     , http-client, http-client-tls, http-types, process, stm
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , cryptohash, directory, filepath, http-client, http-client-tls
+     , http-types, process, stm, tar, text
      }:
      mkDerivation {
        pname = "stackage-install";
-       version = "0.1.0.2";
-       sha256 = "0zz7rlmjmfx45xxcid6zd8i3m3ar45hv4jhb9sqnha3qdy9yb9a5";
+       version = "0.1.0.3";
+       sha256 = "1m9y6xvh1gzivvx9n69m1qdawmbshb05xm7dw3d5wpbrrc9axg4m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         async base bytestring directory filepath http-client
-         http-client-tls http-types process stm
+         aeson async base bytestring containers cryptohash directory
+         filepath http-client http-client-tls http-types process stm tar
+         text
        ];
        homepage = "https://github.com/fpco/stackage-install";
        description = "Secure download of packages for cabal-install";
@@ -114703,18 +115000,20 @@ self: {
      }) {};
 
   "stackage-sandbox" = callPackage
-    ({ mkDerivation, base, filepath, optparse-applicative, process
+    ({ mkDerivation, attoparsec, base, bytestring, conduit-combinators
+     , conduit-extra, filepath, optparse-applicative, process
      , stackage-cli, system-fileio, system-filepath, text
      }:
      mkDerivation {
        pname = "stackage-sandbox";
-       version = "0.1.0";
-       sha256 = "0c71mb29mqzinrlbh2blpssl9r5jsdpaffrsjg398fbzam9i9xzx";
-       isLibrary = false;
+       version = "0.1.1";
+       sha256 = "1xdf1izk8a610g5jzmq3fhx5myld1lfmzd9hfjlqyvwjc76w36g5";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base filepath optparse-applicative process stackage-cli
-         system-fileio system-filepath text
+         attoparsec base bytestring conduit-combinators conduit-extra
+         filepath optparse-applicative process stackage-cli system-fileio
+         system-filepath text
        ];
        homepage = "https://www.stackage.org/package/stackage-sandbox";
        description = "Work with shared stackage sandboxes";
@@ -114730,9 +115029,9 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-setup";
-       version = "0.0.0";
-       sha256 = "0igm3yyfzbmqrr6h1ifk5jg4r9rl0xap03ibb381lmmghbxvixx2";
-       isLibrary = false;
+       version = "0.0.1";
+       sha256 = "1db527g3wk154rr1vsi6fv2lvh4cyfgab02ghvmmshgrjj3iypkw";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bytestring classy-prelude-conduit cryptohash
@@ -114766,8 +115065,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
        pname = "stackage-update";
-       version = "0.1.0.3";
-       sha256 = "1d5l44cphrd9kcvhlbyk2yq0qm7i6f5s91yaa2258bhsj09rm5wk";
+       version = "0.1.1.1";
+       sha256 = "1w5d3kgpr6cyy9wzifhgh54x3sbx8k1sy7l7yzrjjiypy4ij29gb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath process ];
@@ -114783,8 +115082,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-upload";
-       version = "0.1.0.3";
-       sha256 = "0bg08nmcm9jg4pamsm41y1vw2fy2dy9pxxs36nmbrkn1622x7dkc";
+       version = "0.1.0.4";
+       sha256 = "12233xn9gjd7a7d75rpzf58r2fw86vcvhv0snkkj97y83mm4r3ga";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -118598,8 +118897,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty";
-       version = "0.10.1.1";
-       sha256 = "1gbxml5lr17x54zm44cxcjd0zgiqgdx5yj5yrrwn58wlmb9683rn";
+       version = "0.10.1.2";
+       sha256 = "0c5p86ljqa7id6rlkj4p4wy53m9p77f6nayr8ybhcqsjprpb5q4i";
        buildDepends = [
          ansi-terminal async base containers deepseq mtl
          optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays
@@ -118790,13 +119089,12 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-rerun";
-       version = "1.1.3";
-       sha256 = "1pgm3h7kyg7q8ydgqqj9sn65ckl6i7cz6a8g1cfighf4gy5y0cj3";
+       version = "1.1.4";
+       sha256 = "1c0mbjfgg0s2p1cmlyd8gnmmc6wk5ih5v9jr11bln54myyjywq8m";
        buildDepends = [
          base containers mtl optparse-applicative reducers split stm tagged
          tasty transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/tasty-rerun";
        description = "Run tests by filtering the test tree depending on the result of previous test runs";
        license = stdenv.lib.licenses.bsd3;
@@ -119348,6 +119646,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "termbox-bindings" = callPackage
+    ({ mkDerivation, base, c2hs, termbox }:
+     mkDerivation {
+       pname = "termbox-bindings";
+       version = "0.1.0.0";
+       sha256 = "050m1yl6x619pnkmfmg0zkr4rw5l93vgb1pjg9xizrdrqfh5dxhi";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base ];
+       buildTools = [ c2hs ];
+       extraLibraries = [ termbox ];
+       homepage = "github.com/luciferous/termbox-bindings";
+       description = "Bindings to the termbox library";
+       license = stdenv.lib.licenses.bsd3;
+     }) { termbox = null;};
+
   "terminal-progress-bar" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, HUnit, stm, stm-chans
      , test-framework, test-framework-hunit
@@ -119665,8 +119979,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
      mkDerivation {
        pname = "test-invariant";
-       version = "0.4.3.0";
-       sha256 = "1s0ddadch3wk8435y6am6v7d833jj0v7i70wr9shi7qc91igm3wr";
+       version = "0.4.4.0";
+       sha256 = "12b3m9ryfkc4gvlsw7jchy3rnqjs5j0gcknn1b3rhm2gzn66ac04";
        buildDepends = [ base QuickCheck ];
        testDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/knupfer/test-invariant";
@@ -121114,6 +121428,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "through-text" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, text }:
+     mkDerivation {
+       pname = "through-text";
+       version = "0.1.0.0";
+       sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk";
+       buildDepends = [ base bytestring case-insensitive text ];
+       homepage = "https://www.github.com/bergmark/through-text";
+       description = "Convert textual types through Text without needing O(n^2) instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "thumbnail" = callPackage
     ({ mkDerivation, base, bytestring, gd }:
      mkDerivation {
@@ -123213,6 +123539,7 @@ self: {
        version = "0.2.0.0";
        sha256 = "0z1mmm6gnhv3c4hn60v1yasvr9j5rakvyma4c535s51hk5s7g7bl";
        buildDepends = [ base HList OneTuple ];
+       jailbreak = true;
        homepage = "http://github.com/dudebout/tuple-hlist";
        description = "Functions to convert between tuples and HLists";
        license = "unknown";
@@ -126157,8 +126484,8 @@ self: {
      }:
      mkDerivation {
        pname = "usb";
-       version = "1.3.0.2";
-       sha256 = "1qnbjpxa19w3dli5qjamb3f8pgq8jas01pm30x8m7fbh4zlnpzib";
+       version = "1.3.0.3";
+       sha256 = "0wn17x61pnckrxn4gba7fdk1phjm82dc2wiblm2wc36xf6mw16yf";
        buildDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
@@ -128627,6 +128954,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-crowd" = callPackage
+    ({ mkDerivation, authenticate, base, base64-bytestring, binary
+     , blaze-builder, bytestring, case-insensitive, clientsession
+     , containers, cookie, gitrev, http-client, http-client-tls
+     , http-reverse-proxy, http-types, optparse-applicative, resourcet
+     , template-haskell, text, time, transformers, unix-compat, wai
+     , wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "wai-middleware-crowd";
+       version = "0.1.0.0";
+       sha256 = "15wgnbsw47jqncz2zl9clsa6nbaya019sapmgj3d9yl1rqdzkaqy";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         authenticate base base64-bytestring binary blaze-builder bytestring
+         case-insensitive clientsession containers cookie gitrev http-client
+         http-client-tls http-reverse-proxy http-types optparse-applicative
+         resourcet template-haskell text time transformers unix-compat wai
+         wai-app-static warp
+       ];
+       jailbreak = true;
+       description = "Middleware and utilities for using Atlassian Crowd authentication";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wai-middleware-etag" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
      , filepath, http-date, http-types, unix-compat
@@ -131273,8 +131626,8 @@ self: {
      }:
      mkDerivation {
        pname = "x509-validation";
-       version = "1.5.1";
-       sha256 = "19cp187id9hdlzkr7sbv2sdxqxnpjv0db09hwf3zdqqqxr30mn6x";
+       version = "1.5.2";
+       sha256 = "1w97x9075kib88vxhxsgndhsw2bhg31sdw0czcvl16zsgj8998ay";
        buildDepends = [
          asn1-encoding asn1-types base byteable bytestring containers
          crypto-pubkey crypto-pubkey-types cryptohash data-default-class
@@ -133985,8 +134338,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.9.3.1";
-       sha256 = "1spbgcsq1lkywp19k7ksiy6rsh2n060mxzh33k0ngbxxg566n08i";
+       version = "0.9.4";
+       sha256 = "1mam4ibbnzvi1ljlj8kzz24s8jxk3f3xvvicmcygklz0n9pmaw66";
        buildDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
@@ -134504,8 +134857,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.1.3.0";
-       sha256 = "0yj1mn5xbvq4j6qqndfby04vdy6x2k7ik9xg6vb4ffhg9z9r8q3y";
+       version = "0.2.0.0";
+       sha256 = "0zr36i9bpf2x8jav31gb2gc3i8hyfn7k1yizvbk2zcjcp9iiphhw";
        buildDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers yesod yesod-core
@@ -134602,8 +134955,8 @@ self: {
      }:
      mkDerivation {
        pname = "yet-another-logger";
-       version = "0.2.2";
-       sha256 = "17mh22kkah1wvd5d13qcslqx6k49vlvykrwrqw2vnxkjk4pbp8bb";
+       version = "0.2.3.1";
+       sha256 = "1m9sb4kshdvr4nd4dsd6ss2f4dfhxnbs9g1xd9rmzrd7bw9k5am0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [

From 4dba3fa2e03bd277b4e2b09814d545d287414cfe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 May 2015 11:18:44 +0200
Subject: [PATCH 0526/1143] Fix bogus references to cabal-install 1.18.x.

---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 40661c69cbd3..2fecaa5a5322 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -54,8 +54,8 @@ self: super: {
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
 
   # We have no working cabal-install at the moment.
-  cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8;
-  cabal-install = self.cabal-install_1_18_0_8;
+  cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
+  cabal-install = self.cabal-install_1_18_1_0;
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index ea21f0090710..4686c813b3c5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -48,8 +48,8 @@ self: super: {
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
-  cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
-  cabal-install = self.cabal-install_1_18_0_8;
+  cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; };
+  cabal-install = self.cabal-install_1_18_1_0;
 
   # Needs Cabal >= 1.18.x.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index d81a5ef6a1b4..b4f069643263 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -314,7 +314,7 @@ self: super: {
   annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3;
   c2hs_0_20_1 = markBroken super.c2hs_0_20_1;
   Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
-  cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8;
+  cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
   containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
   control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
   equivalence_0_2_5 = markBroken super.equivalence_0_2_5;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index b06a9dbbbd35..46a4b0d02e64 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -45,8 +45,8 @@ self: super: {
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
-  cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
-  cabal-install = self.cabal-install_1_18_0_8;
+  cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; };
+  cabal-install = self.cabal-install_1_18_1_0;
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

From 677ab5d03c3cb6534bb496afccb9ceaeffb8c831 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 May 2015 11:55:25 +0200
Subject: [PATCH 0527/1143] haskell-samoin: fix build by disabling the test
 suite

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9886a9e43b5d..abd07b9fd175 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -814,4 +814,7 @@ self: super: {
   # https://github.com/adamwalker/sdr/issues/1
   sdr = dontCheck super.sdr;
 
+  # Reported upstream by e-mail.
+  smaoin = dontCheck super.smaoin;
+
 }

From 0dc150ffbc67de453470ab3c534a02d908bd994f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 May 2015 11:56:56 +0200
Subject: [PATCH 0528/1143] haskell-cabal-lenses: trigger re-build to fix
 broken Hydra package

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index b4f069643263..12bbbc541944 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -334,4 +334,7 @@ self: super: {
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 
+  # Ugly hack that triggers a rebuild to fix the broken package on Hydra.
+  cabal-lenses = appendConfigureFlag super.cabal-lenses "-fignore-me-1";
+
 }

From ad0140e780ef1f2374af2993eb8fce9cae499a6c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 May 2015 12:10:30 +0200
Subject: [PATCH 0529/1143] haskell-Yampa has been fixed upstream.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index abd07b9fd175..baec3bd6f80f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -808,9 +808,6 @@ self: super: {
   temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
   temporal-music-notation-western = dontDistribute super.temporal-music-notation-western;
 
-  # https://github.com/ivanperez-keera/Yampa/issues/10
-  Yampa = dontCheck super.Yampa;
-
   # https://github.com/adamwalker/sdr/issues/1
   sdr = dontCheck super.sdr;
 

From 60cee4e995bba36ea248c874af3eaff420613373 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 May 2015 10:54:10 +0200
Subject: [PATCH 0530/1143] haskell-text: trigger re-build to mitigate
 non-deterministic library ID bug

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 12bbbc541944..a60af597a953 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -336,5 +336,6 @@ self: super: {
 
   # Ugly hack that triggers a rebuild to fix the broken package on Hydra.
   cabal-lenses = appendConfigureFlag super.cabal-lenses "-fignore-me-1";
+  text = appendConfigureFlag super.text "-fignore-me-1";
 
 }

From 300edc44f862e6fa36364cd862918f9c23105e2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 May 2015 15:28:17 +0200
Subject: [PATCH 0531/1143] haskell-edit-distance has been fixed upstream

---
 .../haskell-modules/configuration-ghc-7.10.x.nix           | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index a60af597a953..efbd3a004395 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -189,13 +189,6 @@ self: super: {
   brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch;
   unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch;
 
-  # Updated Cabal file from Hackage tightened version bounds for some reason.
-  edit-distance = let pkg = appendPatch super.edit-distance ./edit-distance-fix-boundaries.patch;
-                  in appendPatch pkg (pkgs.fetchpatch {
-                    url = "https://patch-diff.githubusercontent.com/raw/batterseapower/edit-distance/pull/3.patch";
-                    sha256 = "0v47pa5ymh9f23bqpkdv3k7vnb6h3ssccdmjdylhs2ybarqzrcwh";
-                  });
-
   # https://github.com/BNFC/bnfc/issues/137
   BNFC = markBrokenVersion "2.7.1" super.BNFC;
   cubical = dontDistribute super.cubical;

From dbdba8e0c4893fe8fdb3779fd036384b6264d08d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 May 2015 13:47:53 +0200
Subject: [PATCH 0532/1143] haskell-bitcoin-api-extra depends on broken wreq
 library

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index efbd3a004395..65281a758b8a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -323,6 +323,7 @@ self: super: {
   wreq-sb = dontDistribute (dontCheck super.wreq-sb);
   hipbot = dontDistribute super.hipbot;
   bitcoin-api = dontDistribute super.bitcoin-api;
+  bitcoin-api-extra = dontDistribute super.bitcoin-api-extra;
 
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;

From a5312e581fc79e31b7b3deed14b08858804d3701 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 05:27:47 -0700
Subject: [PATCH 0533/1143] kernel: Remove obsolete btrfs patch

---
 .../linux/kernel/btrfs-fix-deadlock.patch     | 43 -------------------
 pkgs/os-specific/linux/kernel/linux-3.18.nix  |  7 ---
 2 files changed, 50 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/btrfs-fix-deadlock.patch

diff --git a/pkgs/os-specific/linux/kernel/btrfs-fix-deadlock.patch b/pkgs/os-specific/linux/kernel/btrfs-fix-deadlock.patch
deleted file mode 100644
index 9430d5833878..000000000000
--- a/pkgs/os-specific/linux/kernel/btrfs-fix-deadlock.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9c4f61f01d269815bb7c37be3ede59c5587747c6 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.cz>
-Date: Fri, 2 Jan 2015 19:12:57 +0100
-Subject: btrfs: simplify insert_orphan_item
-
-We can search and add the orphan item in one go,
-btrfs_insert_orphan_item will find out if the item already exists.
-
-Signed-off-by: David Sterba <dsterba@suse.cz>
-
-diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
-index 5be45c1..25a1c36 100644
---- a/fs/btrfs/tree-log.c
-+++ b/fs/btrfs/tree-log.c
-@@ -1254,21 +1254,13 @@ out:
- }
- 
- static int insert_orphan_item(struct btrfs_trans_handle *trans,
--			      struct btrfs_root *root, u64 offset)
-+			      struct btrfs_root *root, u64 ino)
- {
- 	int ret;
--	struct btrfs_path *path;
--
--	path = btrfs_alloc_path();
--	if (!path)
--		return -ENOMEM;
- 
--	ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID,
--			offset, BTRFS_ORPHAN_ITEM_KEY, NULL);
--	if (ret > 0)
--		ret = btrfs_insert_orphan_item(trans, root, offset);
--
--	btrfs_free_path(path);
-+	ret = btrfs_insert_orphan_item(trans, root, ino);
-+	if (ret == -EEXIST)
-+		ret = 0;
- 
- 	return ret;
- }
--- 
-cgit v0.10.2
-
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 4729e6ed47d4..eb694497931d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -9,13 +9,6 @@ import ./generic.nix (args // rec {
     sha256 = "043bqjvbamzi201csgnw7hsf8810qm0dn7x9p0kc7s9p9jnyq79n";
   };
 
-  # FIXME: remove with the next point release.
-  kernelPatches = args.kernelPatches ++
-    [ { name = "btrfs-fix-deadlock";
-        patch = ./btrfs-fix-deadlock.patch;
-      }
-    ];
-
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;

From bce08b7acab63a7b151b066297797c5393fca0b4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 05:40:35 -0700
Subject: [PATCH 0534/1143] mariadb: 10.0.17 -> 10.0.18

---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 7afa2e4da6b4..ef5e6d5098bc 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mariadb-${version}";
-  version = "10.0.17";
+  version = "10.0.18";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww";
+    sha256 = "1xcs391cm0vnl9bvx1470v8z4d77zqv16n6iaqi12jm0ma8fwvv8";
   };
 
   buildInputs = [ cmake ncurses openssl pcre libxml2 boost judy bison libevent ]

From c17b2144b42a373366b3d82438b64447bb519fdd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 05:50:21 -0700
Subject: [PATCH 0535/1143] tmux: 1.9a -> 2.0

---
 pkgs/tools/misc/tmux/default.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 7180665bd3d5..f559c77712af 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -1,24 +1,26 @@
-{stdenv, fetchurl, ncurses, libevent, pkgconfig}:
+{ stdenv, fetchurl, ncurses, libevent, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  pname = "tmux";
-  version = "1.9a";
-  name = "${pname}-${version}";
+  name = "tmux-2.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "1x9k4wfd4l5jg6fh7xkr3yyilizha6ka8m5b1nr0kw8wj0mv5qy5";
+    url = "mirror://sourceforge/tmux/${name}.tar.gz";
+    sha256 = "0qnkda8kb747vmbldjpb23ksv9pq3s65xhh1ja5rdsmh8r24npvr";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ ncurses libevent ];
 
-  postInstall =
-    ''
-      mkdir -p $out/etc/bash_completion.d
-      cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
-    '';
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/etc/bash_completion.d
+    cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
+  '';
 
   meta = {
     homepage = http://tmux.sourceforge.net/;

From 3a07187003a144a9214f403a1ba9b4bd14004a2b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 05:54:12 -0700
Subject: [PATCH 0536/1143] gnutls: 3.3.14 -> 3.3.15

---
 pkgs/development/libraries/gnutls/3.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
index fbf51f34ff87..a2c04506a6c9 100644
--- a/pkgs/development/libraries/gnutls/3.3.nix
+++ b/pkgs/development/libraries/gnutls/3.3.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.3.14";
+  version = "3.3.15";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
-    sha256 = "1117j71ng66syddw10yazrniqkd326hcigx2hfcw4s86rk0kqanv";
+    sha256 = "166nynb055vlh6dm1gaqwpcnf4mp7ks8lz2yvm7dlsrkbh3swj5m";
   };
 })

From 916b95b82989ee86dad62cb4a310ff82e784b404 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 06:05:43 -0700
Subject: [PATCH 0537/1143] gnutls: 3.4.0 -> 3.4.1

---
 pkgs/development/libraries/gnutls/3.4.nix     |  6 ++---
 .../libraries/gnutls/install-fix.patch        | 27 -------------------
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/install-fix.patch

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index f768e03f1841..fe44ce3621fc 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,12 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
-    sha256 = "0mhym25ns3fhjd82p6g0aafhzbfkanryqbxvjy9mi25n2xpr1b95";
+    sha256 = "06wiwsydfpy5fn86ip4x2s507483l4y847kr1p2chgjw0wqc8vjy";
   };
-
-  patches = [ ./install-fix.patch ];
 })
diff --git a/pkgs/development/libraries/gnutls/install-fix.patch b/pkgs/development/libraries/gnutls/install-fix.patch
deleted file mode 100644
index 48ed2da24c0c..000000000000
--- a/pkgs/development/libraries/gnutls/install-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
-index 8e793d3..68de757 100644
---- a/doc/manpages/Makefile.am
-+++ b/doc/manpages/Makefile.am
-@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
- APIMANS += gnutls_certificate_get_peers_subkey_id.3
- APIMANS += gnutls_certificate_get_trust_list.3
- APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_key.3
--APIMANS += gnutls_certificate_get_x509_key.3
- APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
- APIMANS += gnutls_certificate_server_set_request.3
- APIMANS += gnutls_certificate_set_dh_params.3
-@@ -1101,7 +1098,7 @@ compare-makefile:
- 	@echo "******************************************************************************"
- 	@echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
- 	@echo "******************************************************************************"
--	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
-+	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
- 	MANS=""; \
- 	for i in $$FUNCS; do \
- 		MANS="$$MANS\nAPIMANS += $$i.3"; \
---
-libgit2 0.21.4

From f5ea3fe58993ef99ac4d35369076c398f771656a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 06:08:46 -0700
Subject: [PATCH 0538/1143] gnutls: Remove potentially insecure 3.2

---
 pkgs/development/libraries/gnutls/3.2.nix | 10 ----------
 pkgs/top-level/all-packages.nix           |  7 -------
 2 files changed, 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/3.2.nix

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
deleted file mode 100644
index e46b1dfd8e66..000000000000
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "3.2.21";
-
-  src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-${version}.tar.lz";
-    sha256 = "1xydzlwmf0frxvr26yw0ily5vwkdvf90m53fix61bi5gx4xd2m7m";
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79b50719bf64..fc8bb30aaabf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6032,18 +6032,11 @@ let
 
   gnutls = gnutls33;
 
-  gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
-    guileBindings = config.gnutls.guile or false;
-    nettle = nettle27;
-  };
-
   gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
     guileBindings = config.gnutls.guile or false;
     nettle = nettle27;
   };
 
-  gnutls32_with_guile = lowPrio (gnutls32.override { guileBindings = true; });
-
   gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; });
 
   gpac = callPackage ../applications/video/gpac { };

From 9f337e8cc79b40ed06bad6eafad37ab88515ad69 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 06:14:35 -0700
Subject: [PATCH 0539/1143] nss: 3.18.1 -> 3.19

---
 pkgs/development/libraries/nss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d91a905f7ba1..5b1675584866 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.18.1";
+  version = "3.19";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_1_RTM/src/${name}.tar.gz";
-    sha256 = "10d005ca1b143a8b77032a169c595d06cf42d16d54809558ea30f1ffe73fef70";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/${name}.tar.gz";
+    sha256 = "989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From d3e0850989cbff07143fc0a237c610a74e079555 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 8 May 2015 11:02:01 -0400
Subject: [PATCH 0540/1143] Add wpa_supplicant p2p patch.

wpa_supplicant 2.4 appears to have a serious bug that makes impossible
to use wifi for some number of people.

(See https://bbs.archlinux.org/viewtopic.php?id=196584 for an example)

It was resolved in a patch for the to-be-released 2.5 which it seemed
worth it to cherry-pick here.
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index f6142bd630f6..c709880af2dc 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, openssl, pkgconfig, libnl
+{ stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl
 , dbus_libs ? null, readline ? null, pcsclite ? null
 }:
 
@@ -79,6 +79,11 @@ stdenv.mkDerivation rec {
   patches = [
     ./0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
     ./build-fix.patch
+    (fetchpatch {
+      name = "p2p-fix.patch";
+      url = "http://w1.fi/cgit/hostap/patch/?id=8a78e227df1ead19be8e12a4108e448887e64d6f";
+      sha256 = "1k2mcq1jv8xzi8061ixcz6j56n4i8wbq0vxcvml204q1syy2ika0";
+    })
   ];
 
   postInstall = ''

From 929dc4199a57b5d21eb72077f735eb33c4c7b09b Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 6 May 2015 15:56:02 -0400
Subject: [PATCH 0541/1143] ghcjs: properly wrap binaries in environment

This also:

 1  Builds Setup.hs with ghcjs, which (among other things) defines
    __GHCJS__ and ghcjs_HOST_OS during pre-processing.
 2  Fixes ghc-paths to point at ghcjs and use NIX_GHCJS_* env-vars.
 3  Boots ghcjs into $prefix/lib/$compiler.
---
 pkgs/development/compilers/ghcjs/default.nix  | 17 ++---
 pkgs/development/compilers/ghcjs/ghcjs.patch  | 20 ++++--
 .../haskell-modules/configuration-ghcjs.nix   |  4 ++
 .../haskell-modules/generic-builder.nix       | 18 ++---
 .../haskell-modules/ghc-paths-nix-ghcjs.patch | 65 +++++++++++++++++++
 .../haskell-modules/with-packages-wrapper.nix | 47 +++++++-------
 6 files changed, 125 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 193082187881..24a361724aed 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -39,10 +39,6 @@
 }:
 let
   version = "0.1.0";
-  ghcArch = if pkgs.stdenv.system == "i686-linux"
-    then "i386-linux"
-    else pkgs.stdenv.system;
-  libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
     rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch
@@ -84,14 +80,19 @@ in mkDerivation (rec {
   ];
   patches = [ ./ghcjs.patch ];
   postPatch = ''
-    substituteInPlace Setup.hs --replace "/usr/bin/env" "${coreutils}/bin/env"
-    substituteInPlace src/Compiler/Info.hs --replace "@PREFIX@" "$out"
+    substituteInPlace Setup.hs \
+      --replace "/usr/bin/env" "${coreutils}/bin/env"
+
+    substituteInPlace src/Compiler/Info.hs \
+      --replace "@PREFIX@" "$out"          \
+      --replace "@VERSION@" "${version}"
+
     substituteInPlace src-bin/Boot.hs \
       --replace "@PREFIX@" "$out"     \
       --replace "@CC@"     "${stdenv.cc}/bin/cc"
   '';
   preBuild = ''
-    local topDir=$out/${libDir}
+    local topDir=$out/lib/ghcjs-${version}
     mkdir -p $topDir
 
     cp -r ${ghcjsBoot} $topDir/ghcjs-boot
@@ -116,9 +117,9 @@ in mkDerivation (rec {
         --with-gmp-libraries ${gmp}/lib
   '';
   passthru = {
-    inherit libDir;
     isGhcjs = true;
     nativeGhc = ghc;
+    inherit nodejs;
   };
 
   homepage = "https://github.com/ghcjs/ghcjs";
diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch
index 618656f787ce..751f114ba43a 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs.patch
+++ b/pkgs/development/compilers/ghcjs/ghcjs.patch
@@ -60,15 +60,21 @@ index 3c68dcf..64f3cf7 100644
             , "--haddock-html"
  -- workaround for hoogle support being broken in haddock for GHC 7.10RC1
 diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..5d09c86 100644
+index 33a401f..79833c5 100644
 --- a/src/Compiler/Info.hs
 +++ b/src/Compiler/Info.hs
-@@ -49,7 +49,7 @@ compilerInfo nativeToo dflags = do
+@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
+
  -- | the directory to use if started without -B flag
  getDefaultTopDir :: IO FilePath
- getDefaultTopDir = do
+-getDefaultTopDir = do
 -  appdir <- getAppUserDataDirectory "ghcjs"
-+  let appdir = "@PREFIX@/share/ghcjs"
-   return (appdir </> subdir </> "ghcjs")
-       where
-         targetARCH = arch
+-  return (appdir </> subdir </> "ghcjs")
+-      where
+-        targetARCH = arch
+-        targetOS   = os
+-        subdir     = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
++getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
+
+ getDefaultLibDir :: IO FilePath
+ getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index e880f7e713e8..aef6e6c9190c 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -99,4 +99,8 @@ self: super: {
     buildDepends = [ self.base self.mtl self.text self.ghcjs-base ];
   });
 
+  ghc-paths = overrideCabal super.ghc-paths (drv: {
+    patches = [ ./ghc-paths-nix-ghcjs.patch ];
+  });
+
 }
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 158940348190..28fcf45bfa20 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -114,7 +114,7 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupBuilder = if isGhcjs then "${ghc.nativeGhc}/bin/ghc" else "ghc";
+  setupCommand = if isGhcjs then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js" else "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
 
 in
@@ -186,7 +186,7 @@ stdenv.mkDerivation ({
     done
 
     echo setupCompileFlags: $setupCompileFlags
-    ${setupBuilder} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
+    ${ghcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
 
     runHook postCompileBuildDriver
   '';
@@ -197,7 +197,7 @@ stdenv.mkDerivation ({
     unset GHC_PACKAGE_PATH      # Cabal complains if this variable is set during configure.
 
     echo configureFlags: $configureFlags
-    ./Setup configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
+    ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
     if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
       echo >&2 "*** abort because of serious configure-time warning from Cabal"
       exit 1
@@ -210,20 +210,20 @@ stdenv.mkDerivation ({
 
   buildPhase = ''
     runHook preBuild
-    ./Setup build ${buildTarget}
+    ${setupCommand} build ${buildTarget}
     runHook postBuild
   '';
 
   checkPhase = ''
     runHook preCheck
-    ./Setup test ${testTarget}
+    ${setupCommand} test ${testTarget}
     runHook postCheck
   '';
 
   haddockPhase = ''
     runHook preHaddock
     ${optionalString (doHaddock && hasActiveLibrary) ''
-      ./Setup haddock --html \
+      ${setupCommand} haddock --html \
         ${optionalString doHoogle "--hoogle"} \
         ${optionalString (hasActiveLibrary && hyperlinkSource) "--hyperlink-source"}
     ''}
@@ -233,12 +233,12 @@ stdenv.mkDerivation ({
   installPhase = ''
     runHook preInstall
 
-    ${if !hasActiveLibrary then "./Setup install" else ''
-      ./Setup copy
+    ${if !hasActiveLibrary then "${setupCommand} install" else ''
+      ${setupCommand} copy
       local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
       local packageConfFile="$packageConfDir/${pname}-${version}.conf"
       mkdir -p "$packageConfDir"
-      ./Setup register --gen-pkg-config=$packageConfFile
+      ${setupCommand} register --gen-pkg-config=$packageConfFile
       local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
diff --git a/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch
new file mode 100644
index 000000000000..26ea0eaa5a8b
--- /dev/null
+++ b/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch
@@ -0,0 +1,65 @@
+diff --git a/GHC/Paths.hs b/GHC/Paths.hs
+index c87565d..88b3db4 100644
+--- a/GHC/Paths.hs
++++ b/GHC/Paths.hs
+@@ -1,13 +1,35 @@
+ {-# LANGUAGE CPP #-}
++{-# LANGUAGE ScopedTypeVariables #-}
+ 
+ module GHC.Paths (
+         ghc, ghc_pkg, libdir, docdir
+   ) where
+ 
++import Control.Exception as E
++import Data.Maybe
++import System.Environment
++import System.IO.Unsafe
++
++-- Yes, there's lookupEnv now, but we want to be compatible
++-- with older GHCs.
++checkEnv :: String -> IO (Maybe String)
++checkEnv var = E.catch (fmap Just (getEnv var))
++                       (\ (e :: IOException) -> return Nothing)
++
++nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath
++nixLibdir = unsafePerformIO (checkEnv "NIX_GHCJS_LIBDIR")
++nixDocdir = unsafePerformIO (checkEnv "NIX_GHCJS_DOCDIR")
++nixGhc    = unsafePerformIO (checkEnv "NIX_GHCJS")
++nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCJSPKG")
++{-# NOINLINE nixLibdir #-}
++{-# NOINLINE nixDocdir #-}
++{-# NOINLINE nixGhc    #-}
++{-# NOINLINE nixGhcPkg #-}
++
+ libdir, docdir, ghc, ghc_pkg :: FilePath
+ 
+-libdir  = GHC_PATHS_LIBDIR
+-docdir  = GHC_PATHS_DOCDIR
++libdir  = fromMaybe GHC_PATHS_LIBDIR  nixLibdir
++docdir  = fromMaybe GHC_PATHS_DOCDIR  nixDocdir
+ 
+-ghc     = GHC_PATHS_GHC
+-ghc_pkg = GHC_PATHS_GHC_PKG
++ghc     = fromMaybe GHC_PATHS_GHC     nixGhc
++ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg
+diff --git a/Setup.hs b/Setup.hs
+index fad5026..1651650 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -27,13 +27,13 @@ main = defaultMainWithHooks simpleUserHooks {
+     defaultPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
+     defaultPostConf args flags pkgdescr lbi = do
+       libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags))
+-                     ghcProgram (withPrograms lbi) ["--print-libdir"]
++                     ghcjsProgram (withPrograms lbi) ["--print-libdir"]
+       let libdir = reverse $ dropWhile isSpace $ reverse libdir_
+ 
+-          ghc_pkg = case lookupProgram ghcPkgProgram (withPrograms lbi) of
++          ghc_pkg = case lookupProgram ghcjsPkgProgram (withPrograms lbi) of
+                           Just p  -> programPath p
+                           Nothing -> error "ghc-pkg was not found"
+-          ghc     = case lookupProgram ghcProgram (withPrograms lbi) of
++          ghc     = case lookupProgram ghcjsProgram (withPrograms lbi) of
+                           Just p  -> programPath p
+                           Nothing -> error "ghc was not found"
+ 
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 136566f65f0b..4362bacb9ee7 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -32,6 +32,7 @@ let
   ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version;
   packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf";
   ghcCommand    = if isGhcjs then "ghcjs" else "ghc";
+  ghcCommandCaps= lib.toUpper ghcCommand;
   libDir        = "$out/lib/${ghcCommand}-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
@@ -51,10 +52,6 @@ buildEnv {
   postBuild = ''
     . ${makeWrapper}/nix-support/setup-hook
 
-    ${lib.optionalString isGhcjs ''
-    cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/
-    ''}
-
     if test -L "$out/bin"; then
       binTarget="$(readlink -f "$out/bin")"
       rm "$out/bin"
@@ -62,30 +59,36 @@ buildEnv {
       chmod u+w "$out/bin"
     fi
 
-    for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
-      rm -f $out/bin/$prg
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg             \
-        --add-flags '"-B$NIX_GHC_LIBDIR"'                   \
-        --set "NIX_GHC"        "$out/bin/${ghcCommand}"     \
-        --set "NIX_GHCPKG"     "$out/bin/${ghcCommand}-pkg" \
-        --set "NIX_GHC_DOCDIR" "${docDir}"                  \
-        --set "NIX_GHC_LIBDIR" "${libDir}"                  \
-        ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
+    for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
+      if [[ -x "${ghc}/bin/$prg" ]]; then
+        rm -f $out/bin/$prg
+        makeWrapper ${ghc}/bin/$prg $out/bin/$prg                           \
+          --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'                   \
+          --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
+          --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
+          --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
+          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"                  \
+          ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
+      fi
     done
 
     for prg in runghc runhaskell; do
-      rm -f $out/bin/$prg
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg             \
-        --add-flags "-f $out/bin/ghc"                       \
-        --set "NIX_GHC"        "$out/bin/${ghcCommand}"     \
-        --set "NIX_GHCPKG"     "$out/bin/${ghcCommand}-pkg" \
-        --set "NIX_GHC_DOCDIR" "${docDir}"                  \
-        --set "NIX_GHC_LIBDIR" "${libDir}"
+      if [[ -x "${ghc}/bin/$prg" ]]; then
+        rm -f $out/bin/$prg
+        makeWrapper ${ghc}/bin/$prg $out/bin/$prg                           \
+          --add-flags "-f $out/bin/${ghcCommand}"                           \
+          --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
+          --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
+          --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
+          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
+      fi
     done
 
     for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do
-      rm -f $out/bin/$prg
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
+      if [[ -x "${ghc}/bin/$prg" ]]; then
+        rm -f $out/bin/$prg
+        makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
+      fi
     done
 
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}

From 816cca89b6ac4afa8efde593f71f357a39e3981a Mon Sep 17 00:00:00 2001
From: Stewart Mackenzie <setori88@gmail.com>
Date: Fri, 8 May 2015 23:31:26 +0800
Subject: [PATCH 0542/1143] hackrf: new package

---
 pkgs/applications/misc/hackrf/default.nix | 28 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/hackrf/default.nix

diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
new file mode 100644
index 000000000000..806392f717fc
--- /dev/null
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, cmake, pkgconfig, libusb }:
+
+stdenv.mkDerivation rec {
+  name = "hackrf-${version}";
+  version = "2014.08.1";
+
+  src = fetchgit {
+    url = "git://github.com/mossmann/hackrf";
+    rev = "refs/tags/v${version}";
+    sha256 = "1f3mmzyn6qqbl02h6dkz0zybppihqgpdxjgqmkb1pn3i0d98ydb3";
+  };
+
+  buildInputs = [
+    cmake pkgconfig libusb
+  ];
+  
+  preConfigure = ''
+    cd host  
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "An open source SDR platform";
+    homepage = http://greatscottgadgets.com/hackrf/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.sjmackenzie ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc8bb30aaabf..d1b2b61fdd0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11078,6 +11078,8 @@ let
 
   guvcview = callPackage ../os-specific/linux/guvcview { };
 
+  hackrf = callPackage ../applications/misc/hackrf { };
+
   hello = callPackage ../applications/misc/hello/ex-2 { };
 
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };

From 31dde168810c7dbb241c4be9502aa22eefe03f8a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 8 May 2015 11:53:28 -0400
Subject: [PATCH 0543/1143] ghcjs: set NIX_GHCJS_* variables in env.

---
 pkgs/development/haskell-modules/generic-builder.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 28fcf45bfa20..d441b824842d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -51,7 +51,7 @@ assert editedCabalFile != null -> revision != null;
 let
 
   inherit (stdenv.lib) optional optionals optionalString versionOlder
-                       concatStringsSep enableFeature optionalAttrs;
+                       concatStringsSep enableFeature optionalAttrs toUpper;
 
   isGhcjs = ghc.isGhcjs or false;
 
@@ -116,6 +116,7 @@ let
 
   setupCommand = if isGhcjs then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js" else "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
+  ghcCommandCaps = toUpper ghcCommand;
 
 in
 stdenv.mkDerivation ({
@@ -264,10 +265,10 @@ stdenv.mkDerivation ({
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''
-        export NIX_GHC="${ghcEnv}/bin/${ghcCommand}"
-        export NIX_GHCPKG="${ghcEnv}/bin/${ghcCommand}-pkg"
-        export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html"
-        export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
+        export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
+        export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
+        export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
+        export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
       '';
     };
 

From 1da4d8b5c927413238531c166c64a966997873d5 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 8 May 2015 11:35:00 -0500
Subject: [PATCH 0544/1143] coqPackages.QuickChick: New expression

---
 .../coq-modules/QuickChick/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/coq-modules/QuickChick/default.nix

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
new file mode 100644
index 000000000000..9141bfd24d11
--- /dev/null
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchgit, coq, coqPackages}:
+
+stdenv.mkDerivation rec {
+
+  name = "coq-QuickChick-${coq.coq-version}-${version}";
+  version = "21f50a02";
+
+  src = fetchgit {
+    url = git://github.com/QuickChick/QuickChick.git;
+    rev = "21f50a02e752f6d99d5bfefefcd2ad45df5e778a";
+    sha256 = "15hsirm443cr098hksfcg3nbjm9mdnmxzpz61qq7ap7lglabl7pw";
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 coqPackages.ssreflect ];
+  propagatedBuildInputs = [ coq ];
+
+  enableParallelBuilding = true;
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = git://github.com/QuickChick/QuickChick.git;
+    description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc8bb30aaabf..4cde5956f77c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13650,6 +13650,8 @@ let
 
     paco = callPackage ../development/coq-modules/paco {};
 
+    QuickChick = callPackage ../development/coq-modules/QuickChick {};
+
     ssreflect = callPackage ../development/coq-modules/ssreflect {};
 
     tlc = callPackage ../development/coq-modules/tlc {};

From 9d03afa429c88601004cfa987d94aac5dad2676c Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Fri, 8 May 2015 16:50:48 -0300
Subject: [PATCH 0545/1143] Haskell: explicit reflex-dom dependencies for GHCJS

When building `reflex-dom` for GHCJS, the following dependencies are not
needed and will fail to build: glib, gtk3, webkitgtk3,
webkitgtk3-javascriptcore. Now we explicitely need the dependencies
needed for building for GHCJS.
---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index aef6e6c9190c..e2a3739a496b 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -103,4 +103,12 @@ self: super: {
     patches = [ ./ghc-paths-nix-ghcjs.patch ];
   });
 
+  reflex-dom = overrideCabal super.reflex-dom (drv: {
+    buildDepends = [
+      self.aeson self.base self.bytestring self.containers self.data-default
+      self.dependent-map self.dependent-sum self.ghcjs-dom self.lens self.mtl
+      self.ref-tf self.reflex self.safe self.semigroups self.text self.these
+      self.time self.transformers
+    ];
+  });
 }

From daa5938c6a2792993fc49c52bf510809ce13b843 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Fri, 8 May 2015 14:15:49 -0700
Subject: [PATCH 0546/1143] emacs-packages: add swiper

---
 pkgs/top-level/emacs-packages.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index bc557a675975..2e8d68414a43 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1091,6 +1091,19 @@ let self = _self // overrides;
     };
   };
 
+  swiper = melpaBuild rec {
+    pname   = "swiper";
+    version = "0.4.0";
+    src = fetchFromGitHub {
+      owner  = "abo-abo";
+      repo   = pname;
+      rev    = version;
+      sha256 = "1skgw84j5a59ds86bpdcaf3c8iq2m0fz720chjh91ixhkavvdd87";
+    };
+    fileSpecs = [ "swiper.el" "ivy.el" "colir.el" ];
+    meta = { license = gpl3Plus; };
+  };
+
   switch-window = melpaBuild rec {
     pname   = "switch-window";
     version = "20140919";

From 1f6c2a97efe8dd2fac692c287f6ae31d4c74519c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 00:11:20 +0200
Subject: [PATCH 0547/1143] Add phc-intel: undervolt Intel CPUs under Linux

---
 pkgs/os-specific/linux/phc-intel/default.nix | 47 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/os-specific/linux/phc-intel/default.nix

diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
new file mode 100644
index 000000000000..1b4ee3218eb0
--- /dev/null
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, kernel, which }:
+
+assert stdenv.isLinux;
+# don't bother with older versions, though some would probably work:
+assert stdenv.lib.versionAtLeast kernel.version "4.0";
+
+let version = "0.4.0-rev17"; in
+stdenv.mkDerivation rec {
+  name = "linux-phc-intel-${version}-${kernel.version}";
+
+  src = fetchurl {
+    sha256 = "1fdfpghnsa5s98lisd2sn0vplrq0n54l0pkyyzkyb77z4fa6bs4p";
+    url = "http://www.linux-phc.org/forum/download/file.php?id=166";
+    name = "phc-intel-pack-rev17.tar.bz2";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Undervolting kernel driver for Intel processors";
+    longDescription = ''
+      PHC is a Linux kernel patch to undervolt processors. This can divide the
+      power consumption of the CPU by two or more, increasing battery life
+      while noticably reducing fan noise. This driver works only on supported
+      Intel architectures.
+    '';
+    homepage = http://www.linux-phc.org/;
+    downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267";
+    license = with licenses; gpl2;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ which ];
+
+  makeFlags = "KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build DESTDIR=$(out)";
+
+  configurePhase = ''
+    echo make $makeFlags brave
+  '';
+
+  enableParallelBuilding = false;
+
+  installPhase = ''
+    install -m 755   -d $out/lib/modules/${kernel.version}/extra/
+    install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9987f8d91411..50f714e71c4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9374,6 +9374,8 @@ let
 
     perf = callPackage ../os-specific/linux/kernel/perf.nix { };
 
+    phc-intel = callPackage ../os-specific/linux/phc-intel { };
+
     prl-tools = callPackage ../os-specific/linux/prl-tools { };
 
     psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };

From 4c5d3f5a717354f1cf1a3352eccb35d3cb0c611f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 01:23:30 +0200
Subject: [PATCH 0548/1143] Add alloy 4.2_2015-02-22: relational modeller

---
 pkgs/development/tools/alloy/builder.sh  |  16 ++++++++
 pkgs/development/tools/alloy/default.nix |  48 +++++++++++++++++++++++
 pkgs/development/tools/alloy/icon.png    | Bin 0 -> 17154 bytes
 pkgs/top-level/all-packages.nix          |   2 +
 4 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/tools/alloy/builder.sh
 create mode 100644 pkgs/development/tools/alloy/default.nix
 create mode 100644 pkgs/development/tools/alloy/icon.png

diff --git a/pkgs/development/tools/alloy/builder.sh b/pkgs/development/tools/alloy/builder.sh
new file mode 100644
index 000000000000..e737fc5eec73
--- /dev/null
+++ b/pkgs/development/tools/alloy/builder.sh
@@ -0,0 +1,16 @@
+source $stdenv/setup
+
+jar=${src##*/}
+jar=$out/share/alloy/${jar#*-}
+
+install -Dm644 $src $jar
+
+cat << EOF > alloy
+#! $SHELL
+exec $jre/bin/java -jar $jar
+EOF
+
+install -Dm755 alloy $out/bin/alloy
+
+install -Dm644 $icon $out/share/pixmaps/alloy.png
+cp -r ${desktopItem}/share/applications $out/share
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
new file mode 100644
index 000000000000..d25ccc1a7a5e
--- /dev/null
+++ b/pkgs/development/tools/alloy/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, jre, makeDesktopItem }:
+
+let version = "4.2_2015-02-22"; in
+stdenv.mkDerivation rec {
+  name = "alloy-${version}";
+
+  src = fetchurl {
+    sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28";
+    url = "http://alloy.mit.edu/alloy/downloads/alloy${version}.jar";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Language & tool for relational models";
+    longDescription = ''
+      Alloy is a language for describing structures and a tool for exploring
+      them. An Alloy model is a collection of constraints that describes a set
+      of structures, e.g. all the possible security configurations of a web
+      application, or all the possible topologies of a switching network. The
+      Alloy Analyzer is a solver that takes the constraints of a model and
+      finds structures that satisfy them. Structures are displayed graphically,
+      and their appearance can be customized for the domain at hand.
+    '';
+    homepage = http://alloy.mit.edu/;
+    downloadPage = http://alloy.mit.edu/alloy/download.html;
+    license = with licenses; mit;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  desktopItem = makeDesktopItem rec {
+    name = "alloy";
+    exec = name;
+    icon = name;
+    desktopName = "Alloy";
+    genericName = "Relational modelling tool";
+    comment = meta.description;
+    categories = "Development;IDE;Education;";
+  };
+
+
+  buildInputs = [ jre ];
+  inherit jre;
+
+  icon = ./icon.png;
+
+  builder = ./builder.sh;
+}
diff --git a/pkgs/development/tools/alloy/icon.png b/pkgs/development/tools/alloy/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a76bd94804749d7ffaedac3db83850ff1a78d546
GIT binary patch
literal 17154
zcmeAS@N?(olHy`uVBq!ia0y~yU{nBM4rT@h2IbheO$-do3;{kNuK)l4XJBApWMpJw
zVq#`yW?^ArWo6~$<YZ@OXJcdI=jZ3(;Na%wE-fu>YilzwFqkuEj+vPm7Z(=~509Ff
zT31(>iHS*HU!R4Ag^-YtqM{-%FR!Yqs=T~BA0MBNj*ftUfT*aby1KfYoSc@HmWGCg
zu&}V0nAoIAlf=cvZ{EDAtgNh}qN1s(DJUqYq@-kJWhE&oDIy{wBO{}rpy1)*p{=bw
zb?Q_J2?;4Fsgoy9zJ2?4=FFMW($WqN4ojCVm6erUxNzaxwQFr`Y!VU@o<4nQXJ>cu
z;>ELP&%S*5^5MgWd-m*cadFwXbElr3p02L$)vH&xZr$qS<aFS`0eyY_jT<+9`SQic
z$S5c%=<eOSM~)nEb93|Y@i8_w{`T!#SXfwOWMooOlE1%yNJxm6m)D;^e?EQs6c-m4
z5D>6x)vAVuhKh=cn3$M?f`XKkl#GmwoSdAjtgN)Ov=1LXL`6k4H#d8Fdj9zFqo$_j
z*RNmy{{73#%PTG}uB)qCv0_D4RTaZ17|;;N>O7qX$^a!ne!&b5&u*kKFfecyctjR6
zFmMZjFyp1Wb$=Kb6c{{R978JRyq(+bEERqE!%5#oZmp?P)tWS#T9p)Jmo~dBjR**E
zJkZv}krj~C^Y8WjGdEo?9{FS!Z?bdex#*^QqGk1SjMHz;Jp6Fa$=SrA{Vx0F<>#$i
z_wManJFVUOf1A}$e^Y0-!JJES@!6zVb0pr>c(7fM|6!-+7ypC#pSxv0!~6-R+OjWy
zet2gXS@%$SXGHvtiiiC_;#01QKDge0*==g|qUCSryZ`v}`BH;Lcir`8-u1`+M=p!e
zu8UKZ_l;_+vbOsZ=McBhUhLmywu?XKWM9;OA{XUq<(^)B`}cirkC=xy*T>XPQv0<k
zGX4wK&V{m3FIzajy<n(fbyym+ROQ)voj;bJb$DuyJUuk+;xp-&f4_YEyV&a2Q^ru6
zox*zgXZEj%tbN&EHSf)#KSJhx-_nJqE&R8xzu#}eb%v59-%|Kir{0sOfBN}~cm0jx
z6t15km*u>y__$sie$4zrltI=?WYUYejb*$YOzS>epZ;%;y6a>4-*KniU76D3zc1(a
z=UEWWu;uRC$$`f*c2&fz>t4QhW9!QMIeXUkU)?X8rn2hc$;NftzVDa6aP4<z;Z6pD
z+*-?(HSLKdqR}&IbKP{)j=gi7D}C#G0NdpU#%vd~8BXnaEh%9bImPp2kXrbPsjr=^
z4Z2$DudgbztBpMysru{T!p3jQ*)M1_SXE!YcG1@0k;F9B7c)11c^Jql(d%0s9y9Ca
z=js1G%s;VehtRE0DX9w@tr9qY|7}?F{$72?>lczUBuu5hOgU0K?O##IW3vjDOP`!7
zzD`|!JM-_4(=!b<OL>$Q*e9?=-v9gg{O|sT74=CcG^c9@9a}oLWM9DADc&|4Yi~)<
z_`hc6-5Oi3;NHnGA&WNjlzl6ysrY|H>AzLOgW!An|9|)xT%DhOf5&a54XLVf*=fHw
z6!c7JNwU5#-?3BdSz7q{|Nm>Y-Ti#^^2*D5ub%zvUeSKK^{qy(wA|aA`nJA0RfiTq
zg;y_LzLk+IJyrT@$%z*?Pb}Hr;+Hl3shg~!@9*_t&#o)a`f%k{GXIaoF>mtToozFn
zc>eY2)1ObDKK=Ujy7Ld&?<e+2dsSz|Jo&HV@P5Y3Z!1?X-@iHkie-+#4UJnbI@7)t
zw>zvnv{z4Ync;7f`_&tSqRU*xu01;xY$3Dn-Mf2|k>a~|?|%M#_3GuDADa3e*=o06
z!eYm#s=sym6IZWpZgxoct9U%^t&mvd#Cw09Gb(l13ApW@D?Irzho|UyucmpubJxDD
zF)S(h^LA2n9)pI0s+@D!hcn^qjZ=>vjmVidH9}|Gj!i-q3`#Zsw$%FQh;g?%$!UKO
z`Y-m+<l6zEl`BOO1%qd+|Gs$s$7Y6&Jq$ta)&B1f967P#aLz@p5Y8?(pTO)i?YY01
z7OXnH^^~f3gz3KNUQ4U?p4+YdVRhBYFMBWU&@0|K)oX28OzP7eVZXx~_pjkTx^ez_
zqqEx|UGoXclzaL1moVdAWvSUbDomLh_}eB$=1o|cTj=E?-FW$!WP{i9Pw{-+3!NUm
zV3C)ex7(GYZ}DO$jgUW+&Og8O^6%QUJQLT}{yD9**{$y1%fBvJ3>r&Ilou>NyWl=!
zM~`xvLhY|BSMT|1^jh6{mMGzyHC4$kHM3L2;_*k9#nNG~Z}L@s3OgA8W=^E}qKm5M
zeJ*57xv+(!by+5-(zd*(T~|-H{aqfo>-^TkJ`;W&W;9haoMN@>Ry9NLbCv=rbIZGS
zJFhI5ta(*yw$enOpb)L8XE&Yq_ej~iQp8nta%YRv(r~U6tF<9njuWM}ST#mDUOf0B
zOit(9&-r)zS9diWnEL-RqhZg98fLE!PWRyd4$mLB+~=4eRnDNjIlm%8?|6E?=#NM}
z`EN7t<}E*IXlG?*Vrj`_WNE_EaJEQS;>`o8aQ(OTmz`dlH(1@W`}43N&th*nn{d&g
zk1Whw0blufN|@Gm?%TI-Vl~tLSF<H#-pIUo|Ni~kw`?z8Htuh<e<dR$X>^jc(9=YA
zmFcs(BKy<s?UKr>&JObbRU6*%sxz=IDezI$m54Cd@{aT0I_4+BUeVG!=lpSHpCwTH
z_%M@J##!0g=s%VVWRru^X1(|~opIO0FY^>zS8%LhZ;fGi7xJ0^-sUhdxA2fH>H8~m
z?)?5(_pJZZ|11aHCG*tRUT0q1pBrmC*EucnQpL2@MfIC59p~ckc>d!$^RNBf%`cpz
z!{4_!uUZty&04o-{#2)bXC$sq%s5`pbHVx;$KM|-YZET1FEE&C^ewqhA>c%`s?LJt
zhaKx>6}C9s-u3JEoVJ#Wv#c{)>UYd<4&Y<RJpO-n!wHFBH!fbb)H`k&_T$^)wJ%&9
zI2o>de);(F$4&c%F0ju?c1}yZwprBb+rI+)e*t;TVG_rz|1WNsAh6=4-S$4NCZS&!
zXFR*lRONQ$Yd*`D^S`(C<wYEK;C$L&VSnW8vS>!zl}-QL99FdKvOcbBW;ILOB<=m(
zb4MdI#Fyq?y7*s5p{K5%Df;4aH}8(!W$(+%jw<%tjQ)4K;nprTwX;nk882_uM*oVD
z@N&--WvB`}@^w86i`R<P^+z-pr)}%H`ulwOxnzdKM?dYkIotxiw|Gjor@qN}dhcz{
zG=>Qt`v3izopfzGPTz?9_hO&omS470;!gcr&bT+3q1QWCD0^MOeF3Xng9f$#mm3Ns
zrCrmN!v*eXZ=R_oetF)SsvrCLIOg;w+EyhmtuCFo`RSv5>Z}d(rknqn&G>W5&7~zP
zYR=E+FYb=!S&;se_kWl}?%Ti0b_OlqoTty)z1_I{B!kpXe`crh(jz*HZK97xJ$d(b
zO=8x(pkHpk<_9-?pU&juykh(Lm5bAijy|sbz1QSEpQOXy^BRS<->)<M>S);F$y0IU
z-90|fv%yTCjfGd&t1CP@&p+!x&>c&gUE<r1U-?rndtvwYHJWP;=GE@Z_uAdZZ+vjc
zoBez*n3*<ds9dW_{FQfCd1b7}sXOP-*!=(5@Gg~ee%+#S-{7j4yvaFFxE}4En)X^}
zLFazv3-<r-ESc)r_Or5wV*%r}>pR3tV(orT;yhMb&#u76KYLO7rw`?u&h|5A$xD1~
zT)(mQ{&j_wl`LQO9C;<r+i}!+m6?aGyL3_&n@W<`;`NUIUt}K<2ylA-$D5({z@sc3
zaV1lSx3RMG3sh`dJ3gAKNv8KyZ}-Uf_@42|l8M&0cK_b^V$J&e4V(9G-@W&BaP;lq
z4v!G28s0}eq3^7c8P~)HWXuKm;9x_9o$cRdWoN$0mtU6j@PGB?VNjNF>-RG`c3q<I
zw8xEq>x_>v8U5vLxL5zfW7~llXNp!HOxSRu*6;X*6Av89`FR!}cN65i&8#3>wfguv
z>+Qt>Cn8nrc@-+o98|o#Aw+%hNtUdoXA(ZnJf{BJs+#elyV%9%h6~ZI>2LD>Hce-}
z@>86FiS@4Wh36kUzfM|vC~#Jvc1Tv^!K5-C+r|#g+x|0nUaXb7s~hq~Sz&e~>zAI}
zKNd5VmX!OQ+N`)wdrzfZ`CCub5Ur_E?1wvCuY4<Z(NSnulsi+ibNY{m;ziOd7dDr5
z|2^37FOjkLbl;8CjDzucQ?@<goE@dc>LNUM?_1ei`FgjG!sqHTmv$7Y$6M?uw!YjN
zGbKz?=Dg0kAD<a{Po{gZe?I;Bo{&D9*~cnFkE6m`jfpobZ<#v?{A~&7ww|y5Bl`Wb
zLww2|VV?j0HsqB~h*`ZT!)mtaGUnCGR~NHCI;`W^vUtV*<*Rw$?yYXw5U?@5;Lak0
zsN&X_)(yu5Cj5KPa3$twP0-w+sUATgCL&sg|7N{PkJMTx<Z-s|<iUI2<_lz%K6n0h
zt%5!H&d2KvziwQ-XK!fvuB|n0!L{2W+bXgS?`udrxPU|8q)wiM%iH;N3P+alwTE(e
z+?f^qS4(FJ<AkR>S<~uG6gEZf+Pi;qe#V_lxosX>neJ%2roZBz^P%LTb1>J|gSK2P
z9pR<&0oF{5%(pr3xz->Me21}tZC<$C7k1{Pn$Snxygc7}d3tBhv0Ewj{ch_1AJ5C4
zC+*Rnw8QJQ^xN#dh1LzXX6?Khu-8;!OQgHQtNpAO?B9Gl`!4Q|ADi9G=yjpDCQV7X
z&HYNn=Iz3qO%Ds5UeszYOxx2eGIMH_dCr=93{}^r-LsbpFqU&MQ+qUT_rG(U3k$cq
zF82>ux#GLFg3uw8$ur&6-w7u%_|D>7@cLTE&8$v_N&R-4%O3W#l?WH)zT1)gUQS|8
z$qZd1>8W!wUGywAiwdS*{^@oy>Y7srFUL&QFG0Ib<gR_Ja#erPe%1@VC+6LhZQZyz
zFXF0<U9*(Q#lDKX;9%vJHny3%XMCN`)U^n1cVKyEv)y!wMQLxtlzLu;9S5U5Bx+e*
zm}?j3t#okgR5_kKXXoRPpwt5X(z5MBNvB2bMjVe^vqfx|-&E({^K=-h(!QRa&)?B_
zB&f>2r0o5JC7BVcz0zKuHb{Th(zSZ&InOWW?Dyoe9&tOvm(8tPZhV?a>ep%p)Av(d
zuN>u3N>!S=>Rh3TrPjhNGu+s!^3E<ybKqb|<$K>EayTYO?#pzhq&C5gy*I+FL%w}T
z(BCvSL+_h>gwv6WZ{HffEVz7Q?gS-f4}(ADOuHmq=I`2N?Ji?C*KXbt{pEJ~nju#A
ze;ir6XdkP|WXm<%#15Q^Wm<6MKKF`DyG^=l6J`a5q?XodF1$V~apU`>s{+DWGYv8g
zpH*FvDpvg(%#iVE=GWl=b`Eb8vVONbtl93m(j)El>PI3wQWvbKwlmzRCpLkZ@o9gQ
zc8kY*aV`ei&2_KhIXZkf4w@XkdPXT&<>jv;jm+RE8D-z@S!)G~Bqkl4`)BTgFNe&7
z?4SN#&1iU;Cw%ic!O1ZR-RZ5bTX)P`vGAMOqUEy{kE*nZM0>AL+M1NsHtFxvhFM)J
zJT)fHp1WFg3Y&R^^BIAv^J2G;_g>rW_;Nq@1^%<l@BU2x-g03{@Tx7IVHOXS_xikR
z*gB6z!tmKCrc<I(*=Owjzh?Yf-2L?Vr*)Y+=A4ZuSKPW@pd`(-Hh)Uw>x-qouiUlN
z^L<d(du_$u*E?o#23dVB?vD9y;NWYOqu$3~{(tY<g;|PMtSz#xt@`@&M2PFslvqBt
z0RQJZSQ%S?tZi7upmCC^%B}GDeAbSy+w-bsZSakKS7N+V*Cd%^>-X=y{HMQ|WtYwm
zI{9STzB(S!MX%2@+}bhwT7uSxlJn~x{wZeoTkQN?IkWikCDG;GQ-7O=JgHJMR@tDL
z;qSHZI&XjSlgG-;8CMofa4BxRw&mC-PNqw<e((Ap+c2xduI|XTv>Wj&w{QRNRwcP}
z<-%V-7Fyoj;Lx^0u~exv?Cg=NJ0>mMd4ge*@`4Ky-ciZ_o)kR4&%Q$PeP;G+h1^|M
z?4Flbdb-`{3tsY4B-pu?`6ct}nG&W?F0b5l|L}Z&5vFeD`G1wUIkvamKlxk0p>XZ)
z^}i!|cm3mVFu%CL--oSP#o*4fWjpTrEx+6%8ggSpP6kW%imF@I9)|a-m$~QE&p)ZO
zAYo(F?XZ_;oSAJcgl7u6xNmnpB<8Sj@nK`J3!Ak*{9|x9tHE#fLPp|<j6~VN%da{z
zcyofyxu*qq>K1JletjlE;bDq07pJ-;pJHk5<ij5?W$=7Wnj3fApHWw?*3$UjYzEWP
z^S=Lsa;#Q{Xiv@B%jL4(E2wIzgF=ATRHm6e3Kt}w*e%b@*py$eKweEc@}XVnL4iqJ
z8UOW;i-u+wa+E4AXjGh&RL;0oVL{8oo1q8xOJDG<VUK>0w05rJvM|j_$G!+|d$Tmt
z|Ej!3^`ws}rz*-KJiI4yO$}N$nQ!*pB@+E1<y#iclWS5Gk%<;Kr@>MbapIPJ?V)(S
z+XnBIb6#$0c{{a-Q<w3}bLlSK#AoOB1x}uM@_@Q)=KDMMUf$X>q1saHSwYzGOEd3$
zpW3=|@6Oe8H1aOL{^~XNn$epwA3vUw!#TfLnpw9@2vR)xyg5a&S@8-}$9H9g=lhug
zj5l4rYHQH=Qg3dMsQELeqpPMH#)$oS^m0a;ZkV2!bk2>ErL#^y?+I~A4CdZa^!<lN
zdcO6B7q8@GjIu)uCz{R*I@#vAPp*0|?_|HUwI_cvvn(<ABh6r%F0T1SR=q-K%2fGz
zzus)GzHZ9>`CHbp#~)L+H7U)=VlC8JR2X}6`Siny|Lt_WR2wJyy_1>MaPbnWvB(<N
znYvq5_lQiCanG-={(hdJ^1o?A-s02D!p=U~FPAcX=lb%}>)hkWQxVOJQVuN(;!atx
z;Oc>M5@%g(=lxyHeeP(|%E0^@!=%m$)iSTo+^VipSG&uWy2!{h)boWw)BVfL*|*O#
zdj8{Wh}yz$T@!R$JNRM51BV%cfhSwM)`uV7we;$wXKQa95xZvUYBSSTJC;@K`o6d~
zZQ`pVXJ2}7IFrqU?SSg#mD=%^^Vc#x+FbVCjPYu8759(-F%IRg%5OZp+;{l6iO$rO
zDnH+Uex6v}c1}%{YpT>Vt>zHBH^qy4Il>m*RNpR<pz|`fYl%mZn##>5H{A>tUgKN5
zj_r6#!HHY}34V*>$}cBAgg2)+Ux{^Caw0U*fcKltdafT+`+9dspH93Kz2;lul+EsY
z#6FtyHH%DhI-St@Y3AHzh0D(B?~tAByqItDWpkbBucl;0+n5SV9p2|q{Vl_3?ct(x
z2OIq=v_C|yt;<(yOzc1S?_cM9hFNK=8~!Ueq`!}Hwlt5kxM)|q*l%ap0{^rh#ji#A
zmu^@&CF6;O>|$r-7nQsl`n1df)oiEuM)WQ}X0=&%V|HHYHW%$LMk_08ijtU2_lC{?
zaK*?|Xx=-P(~fz&`A@{1a8)&XIiDrtd91h2^IBp4n@gEaMXuf!c<|BHPv14BHY~lZ
zU_RTey&##tV(Eh-Q)gKp=F~MN%*C8-b94pI>pjhKDrCG?x>Sr!aL1O#e%-gGY1P;V
zb1YeQ^5DUJALSWhH#ErbGw#x4&TxAc_xQtNKD8;IJ2{^U?BBxNetySIg$=6Bri$z5
zEl)fdl=al^_zRBLnWd!$YbV$n<u3DdekT`TT01!+UG0Ll(8(z&v*oqDH*C6NYiGi8
zIB?nWQ^neHAIy&>rv2l{DDSy4F?r%^e}=m~?{EMA|L$)$^R55woli}iEpLSHUcI-z
z;F8L5Ck_65$2pvrR;sM=IP7<4<)!;~n;Cn}%$79%@8>kyHnExM!YY~4UrUUZdI^db
z9^U*&)@$jMUk9$1|Jw4ZWy0puTVFm|ws4|n`%`v@N74@VVmr;6_sY*=S|87Nq3k-x
zil_@3M|S^lnJ2Wh|K<X}OIxnmZQW#=ykzqRxyDqRlYH_<B~fZmeR)NNg&FtrwoPPg
zoA~jC)*hKf1z%>)^^>0wyz@lsgrG@^sZ|^kp1M2eGM?S$KmUf`y<GWwwH1X9KOMK<
zd{g$wY?-6WmDal79mx^x>YJZ1KYy5I@@is7ghNVvBEPWk?;BhzBux)(5M*=PP$Q*n
z^;quryP~#D59P#-rFd3eI8{DT?)tXC<zLtx4$WuI+Gp(+o1kXgRQ~bb<!)xKnH~x5
zT(88xzbGj$H@@sWacYH@AfI~Cj^tRQOP*7GUKRK8`%c<;?a+(Ed%yN~%5HtU+u}@6
zqgLY6>@Y34n6poc7^ZlH?w8JG>aMQ2qZxXK`ODPf47+Z(e@=V)!{thh{kKc+TU57f
z-~BxJdN;F`p@ztVm{(Je>}+X&FC*h*H|0q1p--ng42#8hy@EI^oFX26oWb0{vi*35
z?k4B2>OCGimG%i*?6`X3-VB$8LK(blGvg-Objk*2HJ^W2ApMTn>iNTq0l%yp^2D#{
z6&*W%;=&6Hu31uZ@BY>2>ySQ^vPN#PMyEA<!-WS&Iu54?cuq5F;ZJ{8RBbQJduhj6
z&NJ!VtZ&ngYZ%{@sJ**O@{ih{^Vc37Jhaqfs`+xKLRN`Ds~?(ymgR37{=O)i73r{j
z>XYYR)fUV)dO7>zWxu4L#cJCtBl?VT%4WN<tH=GaDD^wC^rFj$oI9uIs4JTG`ZSbg
zEc7<Kp8o8?lvv(*RiYcNFPg%2SARxd)XLU~?#Vlz828w1$(g&`)U?`K-ErniQOCF=
z`+b=emj<m5cw(|UW~xtK*>4GlrO^&P3vHP@WE@XNeAQLlomlY4phT0Q`Ch_D%VY5}
z7kX=YKdcs7Da>n?`}p|(8o3h}MP{6Ev|4v*HS3G+pL2R5TO5CFv);`enZ9&2du_<t
zC`GT&%E@vwPE^JG&R$m)l)x}|?QZ^#mCDyo&u+NE*<HbQknQWkhn5e7m#a7?o8>W2
zzo1n9w_>%v((KI>o87GR<lP<GZt0|#=h+Ex9I-QQmx+7h`lj_vSfI`S%6ZcrS4XK$
zPGq>n%giakxX4=C;AVpKF`?rJe+6ndRqy82;yb11sH(d3y=Fk=;iAY#b_#2h*&TA!
z!_$5k2%c3uu$Vc2hF+1r_n(IF8xNKRSIvBLl#z8AKi{9^ucrf!&A2ejU0v-#SleU8
zhoyCgH;df8p<kE%;mD!ai;Wi-KI7iJ|BJ#~!>V&VoKxrJl$1TvyVv;p_tV)ezdAja
zPO3Q1-}EuXNN)LxH|76&qSU8GvwUZKYsxs$s;FXfnn%_onJ1}>dtPq*@GPeyzxZp(
z*VnT?=&Y<LbTFOTaW2SncAVR`z%srG%&!tOZa?sJ2okZG>eTAV!y4OrcJ8^ex7Y9Y
zU%y`WdXJ~jPX_)YEWvO8)m4TGZf(B)Zkkr^yrSCK%Q}`+Jd~=L<GQNnzlgwY;l?Fb
zJJzw=i|1(B*8KBI$vU69e!5ieuDe@z?hg3A$6|qS^VziKjSHCb8Gd~E{z$OSVh(Fg
z7W-!FtffMxi=z~8YAu^?b5ZM>S@x-yYv)Ye^pZ7!#mZg%z0xjTt*?(cmwJWXIlMN1
zX;4K`NTTBm7TMLIYVR4X_VO*YeG|qj(<eXUvbC?o#U+b&etNE%|MP^FU}~_YVD8$V
z>FKT9{PwrjPn>W#VL}rxd!E(HSq&HMf1L7pbJD-4=)=_12tNCWB~f#ImTgm=^dYov
z-uM2Wu@60%m(2=V;H)k5f8XA2pDoe+EpNPJN~I4R-fuV8e({GKUC*_XSb3L)22a}E
zu<Vq1g9np*_a%3?vtn~^xlNDN`~PLB`pSR<;;Vvg9;jK&o%HZLU%;=Wlir)mlz825
zGWCT5y9jTCsfi^Ep9M$q)Q8;d!m|S&TnN&1aa?>cn6r8A5o^m+mlM(_1)AKbPhVtu
zJm9`YMpkX%)WeGlIF9yKayneKWyz@Ec>U>Ok=oa5Y)hTCgv@-rCdK13(+_XmnqVfI
z2Rf2HHlK3#yKJ*oQ&T%ol)iRf|B?pg?I*tSf8pnOAQ<VJ_)T<I?O`$IJ91X9zf8QJ
zEkAocSHI-fjA=U#MkiL6Z}>H9<ErWpD^lhLi9FDeer#~`kx-t8;)IhS_6&!NT{iP9
zFl+12j94C4v2JgpXrWr(;Z#N+7XhAlt`M_V&)FIOIo+%}UQu^;QP20aq7J(1$p^0}
zm&!7nY>W=sYINtA_r;P8Hrsa}v$p*5V(WwM1-p)|<4*BZekfqlRL$N#N38KvPGRrt
z-eAwx!qhr9ZQ&I`-x<ydIe0OxVBRAtVP7<N-YMCPJqu?}VVaz4FxBu1_dm8{Ay@SI
zH9oJa<hpVE_N-mirYTPf48CdDzY%Lu=FEv&>$5WKw#dqor_$fE%Kio{WG*#(lQu>2
zn9GffDDlbCh8!$P@BX9)P23<Et|V;`8mjp?)*(@Ew=~y3xft$8t5&SIz|_9qQS%Ga
z;SJR?k7rtJVE^5AK=PVuoXmxD*3T3+eE;5L{oel0lph-oxg7Cmyuf07^T`2^1!0Ga
zru)R}ayuVg;icA4$kK0U=y0gd$6}lKRl8%7tg9v)uD+M%-6AFQ!`b!Jj*rC-b0tD&
z%qWRU+4f^v_hunqtt(dCC)2(^cDm%;<fpdN@#CY0bN9Bk7|vF^7po{H?Kkb&xzqQ~
zIX-jnSj1(Zx$H`J+M=D!KWmtJm_lx->BPNwuX>QvMpST)kL8Q<nK{pN7KW`<$>iK2
zTX<{7##(j(xy!Se9GX9r3mfPr{)u2-UXv{ooTJt>cTTOllizyg7iMpZ)lKT``Tm@L
zdo5&B?RNfPTR!$MzeZaHSN5R!C%CnDe&J#DVry1cTcqs}x#76$q+p{`wxvSLRQJB^
zJpNeID&y?ds?Ujc-b@ZXEnE9RwCB;mJ5#Q%|H(J4<-j8uS;-fw2Yrf!Ra8}{9*t+b
zFnOkEnTVl#*S8Jq>klQ*mg#%;i$720*}F{tbNeGWE|qBYF&fEp%<^Z`jV@q)y;-cM
z#MP!^#`F%Ck_($BYj0tgmCO(+qipc(Oi-h)<Wu)`nH9#CeDmjh^LLRiD@nBJOR0&E
z^R!>j@}BwTW^XMKM|b1Rr`?&HBNkXVJzD*0iHA_nw6yf_EV;!k%MOGGHyh>!s|XoH
zc?9^WUCv6aiW1^kwt8kl!7<^pcNn*XF*-!tGq5u0`^UNUaqkpWuBmx942^Ew_A6pt
z!BK6k-q98Is@{5mbz+Fn1!>pni%iW-j|~&-{7aH<iOh4KyCi*4di$T^b1Usd=5k8C
zv}VeS4O)1-RKIw}#&<2B!Y0i9GJUaiLl=XGeyO#O-O3=xr%4Zu<{pUo>XBX^F6>`!
zfAJ^VOe;yBY`My9)7h`|gl{!`R(fA$b6MkD4Q1A@!#5tJHUzE+vQ3TIl;)ItLqnlP
zpsUIut?6RP(R1ss^A*2b;WA~BP#4RNC%1n_>CV6H_kMZt(aB;C6++wGmt5j&juO^b
zvE}vZh)E3}lb!5jQ_3bDP%0EleU+g3thO-x@yW?mH~)T^>%q?B!W`AXWp#FKvGc_x
z2Q9CdU+C8Eiq1aGwzi%3pOtV@+~e@BpMO3^_%NTZFSOdeZ07UYj|UutJZ-Ket$p`g
z?8BNj`U|z*%PHt^P0X6wb;T{Av`TH=B;MI-*43ViHZ^nVSe+4T_7UZ|`8>v6hVM&P
z!>o%5MimCjdtPsmvRP1()p;d9=Uip?m5TWEdi$t7UZ<jVUfS~HX83ibiMQ8r%?^I(
zv0&aj&T~3%m-tuw+Zyrs_D4^Rl91i}9euZ1HmC$0JXWJTBjms@Q_B-;-dXIN5#%{n
zCwgwY*fq0B`f~3o_8jWjQZCsbdbsl}!_=zQn}17O7#QUHL2ChCOgOG9rmg)WKzwr}
z6YDME%Wu-wo(i`8@z7$cG$;FyvV{}MXKsr!zI}Ao-O`OaBOZnIt=`J@UQ8>`B4$!R
z;fIYuTeb=<TDjv^!ZD>aa*tj$ygSGmylly~*BhVC@>m=EPtW1Z8>jk-TLP4xuI&_g
zyK~;-n%=ofE{8tcvSE|H&<t5;<sBW8U#|GP_<gW{dEBN&A3q;``YP~+f&3}))zdF$
zi_clPI_UAHpq)9Eb5a+E-RYNd3|*ShX}CF6BydH8TjcvBrpx~#TGuRJKmBOCTx*cp
z)PHgg<|{R3e9EynKkdtupUH;~+*-Blpo{E<dUjn~JHEr-tJ$SBLImw4YHs|N*)23(
ze}5?Vo!75Yo8RAJ&M3S0y=bS-K30*Ht(Pt?U^%~Z{!Ok(!^gaACKbySGIBjrt6G~5
zz2#QroOd~|a96y|>W{__I`jF05}!?xW?AKOZAa?;CocP*esY&QwJeG2L&98h>$!P5
z@}*t9&uKlH%I+@EzPWnW1AWs|)2CJ~KKOZ8!rI%`0-wE>9=j3i5aw@?!Bh3^_^Uvx
zr2$e0?wCw|AiK@Wdzl7jdEAVT0WU7hn5#T_KeK@J^F!aFBNEjv-wu+zcWRT`n@36i
z0u&DLESe&t*}t7HUfaj6s$R<U%d3}Hu3XVs6RD8B`8(eu+uqK~ukY`_w)vgJa^>o?
zKVN1{IKKHlYst2jZwIg4@Y3jr-FIN#0gky`Hg{B5pM|7V<*!v}`tPu+@0WEw^MbTn
z>#G;=xACvp9(n$wO?vs#S#gUFTsoZ6f0MJWjgy`K1xu}s>Y~Nd7x0uR|0&uUz|nYd
z^VY3f=W`eSTzB)DTDkcA<wq5g|D>8sD^m`y*&T6a|Jou}hubq>1er+bu9vB12#8tO
z5v&xYWVnc>`QoQ^zaO`p(?yLe%d&Fb*ZtMHo;F7$*&<KEt}`JuRd0{pnI#EnoFx%X
z{BbWhek@E7kKB^Q+9T(Ga_h;NQ9AD*e=*p^&pfXsU9&jk`}+CY1RnYO`+xpxc&RKa
z>*nkE+p6;!YuB|FNoJQQ?>ek~Fl4doN}b#<E(f3VxfLcnEtuOQTh$Xe`x<+9^mlC$
z{X6VO)LacWzWX4_vh9tT{T|Es+Y2Te-0|d;TlUnD!MgKL$cMjd-Ha8-Zk!Y<X!KM_
zYH<sd{?f2}YW|t~3b#sQEBA&sx*kiI)f-#+w=vA2_0BcP2NpR`Z00HO%$fP(T%F$Z
z_0wMOsq*xhwnlBi#m;~8w)I_SD><EhLgo5P(VLS`#H}fu)|A?PWxr3;>sC{v2YN}K
zbCt9wrYt)sGv`tBXHCW8Lv5VxE;ciltPt6;-aGyGPp8_wo{8q0Hf`D@@mof1|AjRy
zOx@cXVzxTfX(!)3(Hpwx#d3zbZx1_dWz2s5cG?1id}pPg7X>VP?G(&X?_BNmom8S_
zRV*}PbN-S?KJ2$IPCV#$NALR4HfL7Oi7C%g<mUY<wtYPFpp<051EWcSn{Qs|^?xK{
zdAfDg)8=Oiw_>B`&5!R}bM}$){B_60p67>JGTk~qC-=&m%qv$e8h=R5j?v$37U$D?
zIN0FRvX*%{F`7r^dS&0P=kEC6_?&68Zq(mvB@2$&a;b&r%sW@N>7meJxfd}Uk2Y+(
z{qUXXpI6t|`l=(Uo)!tMR;$!za7lfs;InD*>9+luOff!db#*eH9l9Y`P@a`oxmWap
zAj768Zp-tN(leDOb6?%j%dq*>+g(StI=xsC^nLfWV>X^^4oba!{jS#6VNLNV6OSVA
ztCiQEZE4quG1pz>>B4r|a5CRcD^Ka-?hgk}-*Ku^ms;}J>+pt~XLGc?k9ba!oU%sc
zg{8N=-1OIfZl5^vEJuQkIr4tlVeajlkAHpp#M^4~#{aBs=O>kFhp&kFoWwKVH$USw
zPqT*5W47z{Dqc;zmN~CpS07FNcdX`E&W_}W-J8#GMhI(7nv(bE=MA6dGj+T+@OG~-
z{r<+3;mO2+s<#_%rxZ<Ix75drV|sdk%C)tB0+*^hxxcKl+&?{ixrBkZ?yIArE9I7z
z8{N@2HmKY7snyGQ$C;k>XIC$_=?mf%e4W_lrxwbz^5n-|4H0(C!i)2`ZOy7vbB{V-
zN|U!Y`>B%YIo0Oly#0ZC*ITcuw%&Qm(C*-sTi9AwXemGCOvQmE8{ef|+IgXHrunn|
zvO2q~m#^+=y^^Ia=y2`J($ZthpH~O`)JqY)^2$+lOYYo-n_WJ7t9W1kCNS6Q)zVMb
znXhc&zwNp2fclA>`k9Sl-ga(zA8HbK8G8CI9^;Z;b8Gh8TaROo^rf-9`*^W1GUNn{
zrC)g8`9;@!toF`5E!(zgy6VR-2jA-KzVY|rib{qO&W3a6*7)d%{n(&=XWsPav*|Vo
zSt~?1C3ZS4o*|s)@nVYC->h?4m-j2E?%`{;dp9%COV`f4jmL1-@duf|ulRj?%OKBr
zTd}BI%Vv3}j=y;3+UlC3qAPRmi0SK}X-%9ORT|5=nn7JeYt9wD{oKp<Zrtmhf9$BO
z-m>!vt^MzE+V`1OFh2WqbM@=|g@0GHY+5-r%hkx6p>Wv_w?LbJQ4M)_%6r;puUK(N
z;b@lc8HO_By)S3laxGEdsx5zPDyhEu^r2UYdD>Y%0{1hTrrgY4DS2VT^v^5ep8uJC
zHEZp+x0_;wZtZRSeSG<S=8$!w-}f(Z%wF1k{Q4g4WoKW{+Fw#R<+j1H3;ZFs875q8
z=Cxn;W2^43sSJkS5~bBTf2-Z~X6-!xvY>~5;wvjL|IMz8k|WZ*FFMNA?aXfU&c5KW
z{E=3pSncA2=Nz|5@cj143)!=x<dC7__L{pIACFuPZ#;gwGN#u{gE#r;uKI|l*Z!Uf
zxq9REoym9j)=Y|6zU26uOZ#Tbyc_@g&wAl4=|30Lv9Vu`IyZyy97ou%B(1KykDX41
zIofgyMOLNp%vto|hS{_7O`fx*LM+7|ef|EO-@vlC)<%0~<Sou##fg_C)*lh>di$^W
zs5%29m%&ow-w75|-<-*~>~sCJ3u7SX-njKlkCiIIcFA@;=ihsMz0m8uKTTiuOuPK)
zqF~x(NAc=U%(s)7&L}rqaqhGJubuww0Y?otk4;1Udo|aJy*o6!a;`|Q>FcF_d9&p6
z{T~)x&%%x!TlP0xd*ku_AI=|gTRX#h`AMethrYg5VtTy%m+Iq*OCE8}_F8+Qvh}CW
zua@KN{p*f$*9AJ1f9bbAb@oR=ze4d9;p#o7e2;47J)9tNVE2U(Mt`lwY6Fj70^4_%
z2s_-kd$==m_8P-oQ{DBMLr+E>s21qZ{Vx%i9eY+O+2)<+#|;%<)&|BOxj%pR5mkwh
z7XO%qi)`ZmNG&v+=)xVF6tik={=P#TS?k{WtSsBWRx@KAr|emy6>9Rw4Q9rvR-7vE
zRbpJaKw16jgtP7D)%@yiYVL(RiAsV~a<>M_70*qc#4OWuQ~vt5yVF+OVv3Jh6|(yH
z)Yn$K4CdTC8g0ilHFxoy6U*0%R8@7V+;Wz%tLAl(nCt#IJ>^d3Y1ekolUcvdzR29h
zn6$>Z>NnSw^RLPS&T>T-w~L(9W%G-d*Niy8_C19|u>95Tg4AyZr88t5XRXeB_}ysx
zod=v38RqO2di1Nbjh*Ahmy%tVPTXMeX^UTeMO#Bq*Q!S4#P8D#hR+iwUYUMS`J>^{
z8M>`)YpVU%$R{&C{uKY#P0EIQkBIm88Lu{TZaUARZMR_-v-3nvPKhHw1K!S3-&gg)
zQ7_8p<yO)6TV@<*Ztc5&=o#1glE@Qt6ASl8C9IM0%JEw2kj>bBK3A@-Rbk?yMe8?o
zCEmYKwq@Sk!<U{+I%jL*`02r!ObK7Rxd+@?#iT3)@~+CU+69?Qd8+)lc(&x+K_)j#
zu_Ju^$xGyQt$NsG7YfQ&_idUnJO1ORw+fd(81DXj=>3UwwjUfRr(Vo-T5v?jb@S!M
z_?Bos@6=O29=XoBR(^wbmHg`CyjHHqk{K`Wlz)Ex_wA3DFW$CHxpvEClB%5FR86^_
z%Bfc@kEqz}p3$OiCU)sniq##lG=m79ES^otC%9uP=ly-Cctz>q*Pln3*WZ61d;jU1
zb>`2*gY*M9S-kEXS~NN7h`7!K!JvO1r5euNOI*FHvv70BvTrfdgH-~qADtIjV!XfY
zj8W@}4AqZc_f`c=y5v1~$$|&L?4EpyuSDloY_*%J|NN2F&7ih(Ri84~6x_V27vh!t
z?|5#8+qY-eOa!n0+Qnw4uB21gA7CHMRcqjC_T#~{TKSt(?2MSMiTPEY*Je;s|1#s@
z>l3U>p^Vk14!5UmwJBzs5;=WAZ#4S~|MItip4ZY8YBtPcDBscaRcHFCpo=pXgxVaP
zxmF`}X26xG>lr%^CYWsgy0l97i9NeO#fH_vi6xIM5;ySo^M7AF<JOH$T2~WPl8pG;
zC!932vf}!-OF_}dEuJyJoj-HBq<!3jAH8hfFC>(Er@#5WU_ZOs-6+;vALH8Ia3i;g
zPOs<5ym*(9t-N;Sh5wVhbAO7SwW`ngS#mX0<V1>Bt(N+e_MVb;jQ0+w-u-{)DVsv$
zt$REl4!k{)YH)s*cko9Q!40BcBUE2~{^@Y?pw>&v>Ou$W_qTo*GKS~4TD-RQ>dySM
zY`c~8etC()rhl2AB2Tbqw(|YHmeg+~B>PJGx|YzDNfnbfYu&kLWi#c3$HKY3j8Pse
z!p5^shF6~cuipJGDUyfnOQO~0jV6=N8wVP7UgVg@KX;Lk)|Znxo@Y3o&NnvrzhC9^
zy7Hu&h~*PFzEA7sY^;%)onZEJf?j<sANQL0%w=yszxuvFMe}p-Bh6{@Gd~18PuX+s
zykxKR)R$6gFP$#9zf4B>XqEKj+Xs?fyuNW=J?}~18DDPcsf!Q4{kwK<jNz$MY$y9G
z4_J#WEimVny|Y5^-~4;u>L;Gr%_wyLq>kP*jj7jcuH1aH{@9b}yV;LF_4+V>=Evf~
z)Tv9Rd@6jVBB*xILSuUztI>`VD^gdupS%|@tQoBMvv)^E+H>!<`z*HqJhJxAsh6iD
z*2h?D$vykr-Wro<J@=mf^2?S}-u~?|?fU8Ix#dIct*?*fv8BJZ{U+`$b^5fZmEs1A
zysFRlH8SQa_(k7bcVm9B<HWN~bN^l7OJLZU`YI=gt9!<krs}%8enEo9EYr9$H8d`(
zt6uzaF}1d;@U6Pzk@+XzS;?nGtgR|33DFJr_v2a^u(2c2{D&*YirjRwMbhfs%XjZC
zp7lKVzkKTI+$-vvCHH4PE7zF%Fpa_RXy^Q@4yIF8EoaQPMt-`$Ik!4xLHo@wE-@lb
zho7(+?*6#v-o&(LrBmM2T+|ZYq8_})^vGq#v!B&mEEpP2O`q!Z^pf4Nr*UCf4lBdt
ztT|$0W7nS9eJ#1sfoJN!)@M%{m)@SsR{JSqn({Kyro=RcyAcj=_X_iM&zmH2<3+KK
z@<Nuwi|5|;IUE(l<Rmp~LT|8h4$sQ{lHU|ud#zHPL~KsW7FL%1U-ayu)RyR<udE()
zSN6UxT3on+ZFS_#=$&gmCtLiBlHGpy^XJbuKXjkp__of6;nsO^<HD_1N^Vb==TA|y
zHAyY3>fA4Vt$|mTlhsvAbDPbvxsGT4iG47dad^Y;h~;wTd=C?&av~S|<Sst2`aWOi
zzV4swpNr4WNDcnXxIdOdPx5`j)MBZb@iCEwXKUxhmnTY1i{O4<{Q2^p_fKD2y?<(c
z<*C}1ZCA>2ROcQ|o)e`mA=hO2^2n`S-q&sB%Rihm?ckg1Gb8z%-?lf`DzT}nv9Yty
zOcP9D_pUCM*ZXnjq)6KQ%dTI{_nZ%MPJA@6xAW*_-`g)^im&cqQU7nvpVz$k^{RFw
zpRO}MK20mB3z3Zf<p1%-j!%7U{|;0r95!mbx~_AocB#SSZ9P-&JyM9h-N9^s!SZ0A
ztjZM`JC$O4C#mv;T>fQY7ZsVOm-g)6RQB<UZtL`9#`W{<&mI@Le|Lj+S%QA}>Z`Z5
zd*_|B-!8eaecKwjP1n*lPZHN>wkx@{>He}q?wX=e$155><Z^VVR4i)z{MBpWg$r+{
zre(BV>$&K5r^Dieo4L&6vuSC<&CGj!%BM^$oFCS2Eu6MthD`8k(f3^&6u0R6+19$x
zi7bd@W@p!ySUtC^cj}I<%A0ybS6#idDSOQ<@A;J~D_OQ_2JHP4)^fohHP%w}{E?|e
z5)Qh;Jmx{Oo)|rzk+y5bIdO09I_<e4Ckz`b4t^;uPAXyM{&>evOn8;zn@(>hcjLg<
zH_x5(3$2;C@tt|hX6@cfGhSPA|9y5VeY&<$`>&YC;@3`ZWzvlF&VTMyTBy5!Z|Yn|
zet90fm0_!^K5p?p=<qr0y0Hk~f`8wtg?WxSo~!S?`S|eat;tqP54Gi{gdRWFknlv}
z#5~@WH4+9t@A#D{C%&AdHF?YNU98h$?c{}aFWa8T(W<xq>blm~=Vv6&>Hd5*G_7#f
zr$a^cF?Y^QsO1gJ<_nfH*t?0VG4Te^c7^(%Rxg$B-n6n<$!XHRJ5qmNC5QeBL9O}x
zY||HAoP4vOFX%+gvW1>JD;|B)4S4nVV#$=S6|79#Hg6I6J~8`h;epBjgt$WAJd(Om
zD)~qw#o$%q|NXhe{WmI~zM6h!lA*V%<NUK{B+}EGgaU)sPoBNe?~u)(Pir+-ow{%*
z%9NWqBjrIEL*n5Ao0;kpSGqc$)T`7gW}nw`>5<IbIWnw&S9>jDTkx8D^Q_8wrkxWz
zT!Pjr=XyU@I+G@{O0+t~yr5*pz0Rt%rWGp=imm!=dVb5Y&NJQKTMzpfq#nNK9OW9r
zI8V0q?K2&_oI=iJzfSirSd|j>*>;8s^NPo53=iYV-{ee=6RBpHpdKN8d-<2B83~h}
z`5L#Lv48M%^G5+sO&?Bk4Xb$mBR||HvDBOwI)AflW0c^!{Gznhs{wp$40Dg#>RA8G
za(;2uCViS=(W|G0&NCB&4Bp7dms>nNydzV7cSF>Pa|L&z7T0Gwh)+FsFKX5%LEbMf
z5BGL<%>A|X*Mk3_I|GGy*tQ>4oRM(2&og3|&&<_3S8DcFXwIH_e|A*Fn&)c{@>tfV
z_3dW)Y`A$Uw`}p=h#fEV!?||K`gpAfN$^kan!2m@>Cc<{&L=N@oXg*u_{lNIlxv#$
zWf{3Sc0cT!eZD=a4l9>7^h;58oVH<I|NDG4fgcG$sjn^_HBIW=^fh7Oj0@g#orUKL
zD?dJX+HK`QUAD&|CR4gEeXKC@tN-YJ?b=cIol4jD*C;&c6i?)}vVAbs<7SrzWBhIh
z#ZOE8*Bw27ep$XA*Xh<C7k)k^EB%Ul4V`bc9Q&aywpn^g)_L!A(=zYR!A`f98T&ta
zd1^azMpBGkaOCvs=QDbOThk6_?mc6E@497!+9ua!;RpX~c%BwsDrFw0waGhOZgKkK
z4_t>EgO|TB*S&po&+A(cuL(&kj9Td^V4l`B{m{$w+xr-1R7;$F^<Z~){&C%G<r~jj
z+P?OiO^wUX6|r%9?QL#;Q<S}B-V&*v7h$|Ei`G<iS(~?QJtgFs>*zDt_}Kx0BW{!U
zF8!Z=cdfRw*OIMM1WgJ{_pMA06aQH@X~vD23x&O8c@(RZ<5%CF&zo`T^y(*zrzF-a
z+P{1G?3X@kg4I`qh<VGG^I5FhqWkfZRmSzLJ-3dUn;ghkF#GY>CrwAL{YjGgE8E%r
ze7lxI@At3C?OX;^HvV3Jvh$_&5f#%HDOJ*WpW>`;-(R=+<b(Ca8@2yStpBLHC6`q<
zCHSUBrzv~GyuWkjSG{J?P(8fw+24vuCShueKRdZgKgwE>vp#6o^zcjK#YcDCVvwu4
ze)eaxLBobFXQSF%2{wmLvu^a@kIPEu-@SbQ<QtcEIG^lw=DfnR=AGtAo*ywgFKOO7
zBzV0>XWPC9kFM`DHT&l0Z8P(5{@0i3zwa*(-*Z~&+x=r9H&n#Faf@hn8cNvCnHPJG
zv3REAs_LI|X~mVIZ51Am4?Sa$I>Ptm_pF`zCLb1-$H*8iJz~IqbGu&@_k(}i?8??9
zo|XyvVJdvr^Z9WzLv<~g$MLK&vuD3fc-6Ri!(7YT9Z?sB9{JiwuYJeb@>F?)%j2w^
zOK&DOvvR$gyZixf&(-1`o39$Z`L?%0@VREa+fq|u{bnA8q9>v{iLX*ZjkmclEH&Mo
z+UjF>@20n(P~z?212c|m@yTaSYmR+e*dpS!gZJm1-+T48$m{5zIp;cU`t-N=S1mlO
zzcc3DhZUCuKF6LnZ7~x+y41^Xui%nkPEj4!h|0&F^3~IK27U;=8nyGLp~<gD4SS?T
zR%H|f&t!Bt*C+kyWsdYc2e$9KnHS73=W<h$<NG~v%ZG$r{~oQ%KBi~q^~P-C8L9m@
zra$lC-&!58@7d4mW##_QpC#B{?$|l~{wj$L51O3c*WO7~jWqoB^wX9NjkAR}h-&Db
z>dH77bocg(r_)syS>(COypoovDRfxc;`Bh-_{}$-yPOdxGJmVhf61Z1*}1lG>(ML6
z<@O(cBb@*4i)(+*^1zK%i!v33Pe<IHJ$qekHpg^x%k0mmv&AKn_|9~nep<wQZ0i39
zpOYK(%Ayyo5`4c!pjq~4jn(GHf2YoDkNBH&Oyi```sMix{)>L=o|=>3+W+9-j_t-d
zmvRMMlx5<kF`QyOmJtyA`0VBHc4p_54z`(Rg-+62SG=!kyZO0G5s^n{>Q6njux4Yx
zQ$P8hj}?y&DAm8oa@_pryPn*Q<$u|=x%+)LS~px{is1dcH*TG5qu6FW*UwV}Ofp=)
z>X`fbefhp+``$lwh6}xTUv2-L*48-N$|7sp%C+4aOSpcsu<hObZ_O@A9>to1&382<
z?X>(4>wR-SG;vb98Jq2+*mKYSu&sD(9C41%`Rc9hT+7t-Do;;5IwS4-ou_-b&e+Fz
zw_Y+jYEk`}QGdR@{6q5s%`;24e_OmkB8W3>wMAI||I6PVHN2^cEap`<?pYG_l<9Vu
zrm~XnUo(?AQ<tof>`T3U*WYS`ewtI#+-Es`Pq$r?<9dDH*7fWa)rxIycRa;yZ+ku8
zCnM&(aPi|?UzJwwyWO+K{m_5*a=SNC|9Nce5Bp?)kou`nv3H8o%C9rk*k^uv5}vW+
z?Btg-9FCvmkv^dO-RA427O%h$`{(`qJSooH#_EL3UiWi5k6m*!GCgbifPGr4T&vgG
zaFxv^1~VQ{KUnIoD!k*eNb*H#Ysmv4Hmjy31)u-^D8F@P{`2gK9clrGgCwLMIKI7n
zc8hXN>$JC~oAXy}U%d2ZdGz^~!|9J(E2r?9AJuG1+IaDSwCsyt9>4VVs>lAnQ#9A>
z5U=|xxlX3VsZle796Nhjy9`B-f4%<p*s(2D4_d5Wt$C^M9`o_wr^l0D7j_n0mY&pd
zru}Q|htRuU8mbB%p03eoynA_$+9m%}HaP)mE|WH=_Q@Zf<9+c(qOxr=OR{hF$Daqb
z8cgtgkkB8~#jHJ5<K08ny$+LO{ihzCWNM`>7`Q{%cp^(br!~uiW9tL9Hnn!0KWqD6
zL44LmuHdto!KV#mT+X!=S{$3Jzwb=`x<zm9a{a6<onCxyPsH6jDe-syxqo_nxBK(8
z`S1T-<ln?uw6F5tejnp0-Jj1|e=pSjul>oqa`OLaZ|40!fBAjrk?1_HH=WwgZ@!+#
zRXz9fjMqo}wK;kJ|L6$|m^a}=U~hH7cix|8`qy9HR2yEu`AoijVdl)e=YAh4T|M_q
z>0^J<J#*%LxnJ|6{dktq(KoI>p-DTMf4)2#eBNc*ue^5?>mEt#Z@eyR^Kshh!)HpH
z)V1cAmA@-7E3o&;Sl7O@#d7|=^M3?tADPun++la`&ci3dPg(a%UHD#Jp8E2j{tKm3
zF@Y-fxyJS%<ahnL-u3+(o4t+U%6h{EHwC}_-F2h>zWtw{Z)A#-FI1OJ*dtf#xAlbn
zglp?RzWV50Z@56>cUilX;p=xD@_WkWe${{W@GIA6qc2Bd|7e}u&Y)#m_fntjNc#PA
z=VxZ8#}&%gc{3LuHQn>iE$;8<E3<xgr%cacoKpYimN?Uq=NS<WQ`_~|8HOLQ+LWcZ
zK1Dz7@u?G6T(}i3K0bZpJ<FC8F&7tRo;x#HJ?~L?=WA!~1^bSFz4xAF%kyNtnR$In
zkAlVbx1J9MsXnsOXnKp;(<kwNPv^TNEOE43*Bfa$f5XIjZH2P8i^6AoeWTtUvA5^R
ziQ~Ly4CMd+F!~nFICs}c)n=hj=a-AGpP2SEds3jC=rJKpyQ+`*tVb*}L)q3pNjso)
z?95ulf9jv!Us_z)exLirD$xmlJEMQ3e%jevGcR@T>_4k(zf7#tU$8U!{QtWTy1$EL
zcs2ZVusZYOi*5h4<$vNF=A6-8uvY!ugX<?HJ~vv=Hv075{&RoqpV^GPf7>LFtu&CA
zc*HXQ<H`M!6PCUFx_@@XR>@<Q$#xS@>wWLP|0tiWBr%7ns%GQgsYUCO?FxH}PwqKk
zQ}#8Vtwi`!?e<Scc>h>swi)#^zu~C5;{NY$15-|b$G16W=k9k)(oL5Y%&gCm{C&4U
zsb}Liz3)e!|99GW|MBM^M&EWb>Xz)WT9E&p(RNqQ-#mwj*V(@$hyT8%9RB}1L++-D
zamTNPwS`_!?~nO+pLxr%dlG6K8PA?3-@8%IFChIw^`g4j?u%bN&d>ZWw_sU$^V{T|
zXHFmAr1{_0VXK(NS<(784^Pi-nAbJkoN=Z6{xzH#vo;^AisXNOv}2Feg0y41xxdda
z`8?;o+`fIBD-zT{JxIx6k`kT#dYznynyI>ls^8}I^9nA-%U)2M+*F-@sOLLV_OfO2
z`}T2mOl4R8<Lj_SLe9hCjNhGF`)A!%E^)E}#*eiXkH_#B+S^RB*~9+AF|>q#!rO&B
zXZL=uzQX2QS?X~5O>gZ%`7+lt{L1|Aed^2<?tf-@D|h$l=a5y}m%g29`15A&)RX?c
zt{)1VmKKU%Xx^%@dYSe0mGU(ox-(bJyz%!*rB$d@Vz-0bMW+2>ChR>1!T*haUp{<s
zS8KENrw6UOyUW*g+fMpuA20tnj9dNA%M-@0Ec}_zNbjp){5hMrt?>wDf7E`~GqD{0
Ud;W%rAm}6kPgg&ebxsLQ0BLVz5dZ)H

literal 0
HcmV?d00001

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50f714e71c4c..c92d49fea1e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4912,6 +4912,8 @@ let
 
   ### DEVELOPMENT / TOOLS
 
+  alloy = callPackage ../development/tools/alloy { };
+
   augeas = callPackage ../tools/system/augeas { };
 
   ansible = callPackage ../tools/system/ansible { };

From 8c39547fc258068e13e9dd14f6e7f290ed840428 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 02:49:36 +0200
Subject: [PATCH 0549/1143] phc-intel: don't try to build on _grsec kernels

It will fail.
---
 pkgs/os-specific/linux/phc-intel/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index 1b4ee3218eb0..ac60501929a8 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, kernel, which }:
 
 assert stdenv.isLinux;
-# don't bother with older versions, though some would probably work:
+# Don't bother with older versions, though some would probably work:
 assert stdenv.lib.versionAtLeast kernel.version "4.0";
+# Disable on grsecurity kernels, which break module building:
+assert !kernel.features ? grsecurity;
 
 let version = "0.4.0-rev17"; in
 stdenv.mkDerivation rec {

From e50afd12b7647921a18336add9fd81e8798b3d6d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 03:17:33 +0200
Subject: [PATCH 0550/1143] alloy: use installPhase instead of ./builder.sh

Also pass on any arguments from the shell wrapper to the .jar.
And be less clever with shell strings.
---
 pkgs/development/tools/alloy/builder.sh  | 16 ----------------
 pkgs/development/tools/alloy/default.nix | 21 +++++++++++++++++----
 2 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/tools/alloy/builder.sh

diff --git a/pkgs/development/tools/alloy/builder.sh b/pkgs/development/tools/alloy/builder.sh
deleted file mode 100644
index e737fc5eec73..000000000000
--- a/pkgs/development/tools/alloy/builder.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-source $stdenv/setup
-
-jar=${src##*/}
-jar=$out/share/alloy/${jar#*-}
-
-install -Dm644 $src $jar
-
-cat << EOF > alloy
-#! $SHELL
-exec $jre/bin/java -jar $jar
-EOF
-
-install -Dm755 alloy $out/bin/alloy
-
-install -Dm644 $icon $out/share/pixmaps/alloy.png
-cp -r ${desktopItem}/share/applications $out/share
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index d25ccc1a7a5e..da247072b070 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -38,11 +38,24 @@ stdenv.mkDerivation rec {
     categories = "Development;IDE;Education;";
   };
 
-
   buildInputs = [ jre ];
-  inherit jre;
 
-  icon = ./icon.png;
+  phases = [ "installPhase" ];
 
-  builder = ./builder.sh;
+  installPhase = ''
+    jar=`basename ${src}`
+    jar=$out/share/alloy/alloy${version}.jar
+
+    install -Dm644 ${src} $jar
+
+    cat << EOF > alloy
+    #!${stdenv.shell}
+    exec ${jre}/bin/java -jar $jar "\''${@}"
+    EOF
+
+    install -Dm755 alloy $out/bin/alloy
+
+    install -Dm644 ${./icon.png} $out/share/pixmaps/alloy.png
+    cp -r ${desktopItem}/share/applications $out/share
+  '';
 }

From 73f0339c3596728f0902579a99c9ec3dadc5bf78 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Thu, 7 May 2015 18:59:52 -0500
Subject: [PATCH 0551/1143] crypto++: fix build issue on OSX (10.9.5 at least)

---
 .../libraries/crypto++/GNUmakefile.patch            | 13 +++++++++++++
 pkgs/development/libraries/crypto++/default.nix     |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/crypto++/GNUmakefile.patch

diff --git a/pkgs/development/libraries/crypto++/GNUmakefile.patch b/pkgs/development/libraries/crypto++/GNUmakefile.patch
new file mode 100644
index 000000000000..48fdfe420482
--- /dev/null
+++ b/pkgs/development/libraries/crypto++/GNUmakefile.patch
@@ -0,0 +1,13 @@
+--- crypto++/GNUmakefile 2013-02-20 10:30:52.000000000 -0500
++++ crypto++/GNUmakefile 2015-05-07 18:34:25.000000000 -0500
+@@ -87,8 +87,8 @@
+ endif
+
+ ifeq ($(UNAME),Darwin)
+-AR = libtool
+-ARFLAGS = -static -o
++AR = ar
++ARFLAGS = cru
+ CXX = c++
+ IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932)
+ ifeq ($(IS_GCC2),1)
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index cf22a775b14d..053937f1c56d 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw";
   };
 
-  patches = stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch;
+  patches = (stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch)
+            ++ (stdenv.lib.optional stdenv.isDarwin ./GNUmakefile.patch);
 
   buildInputs = [ unzip libtool ];
 

From b5f2fd72205cdf8a20b1535736fea1ad75585526 Mon Sep 17 00:00:00 2001
From: Richard Wallace <rwallace@thewallacepack.net>
Date: Fri, 8 May 2015 23:17:47 -0700
Subject: [PATCH 0552/1143] no longer need to patch reactive-banana, latest
 version has all the necessary instances

---
 .../haskell-modules/configuration-ghcjs.nix         | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index e2a3739a496b..6fbb28d026ee 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -66,19 +66,6 @@ self: super: {
     '';
   });
 
-  reactive-banana = overrideCabal super.reactive-banana (drv: {
-    patchPhase = ''
-      cat >> src/Reactive/Banana/Switch.hs <<EOF
-      instance Functor (AnyMoment Identity) where
-        fmap = liftM
-
-      instance Applicative (AnyMoment Identity) where
-        pure = return
-        (<*>) = ap
-      EOF
-    '';
-  });
-
   transformers-compat = overrideCabal super.transformers-compat (drv: {
     configureFlags = [];
   });

From a5a740a17a4cf554a8eb237a3670f3aef0d3d8f3 Mon Sep 17 00:00:00 2001
From: Aistis Raulinaitis <sheganinans@gmail.com>
Date: Fri, 8 May 2015 23:45:07 -0700
Subject: [PATCH 0553/1143] z3 opt

---
 lib/maintainers.nix                           |  1 +
 .../science/logic/z3_opt/default.nix          | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/science/logic/z3_opt/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6f4a7be21f6e..6906abd2c78c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -184,6 +184,7 @@
   schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
+  sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>";
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
diff --git a/pkgs/applications/science/logic/z3_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix
new file mode 100644
index 000000000000..b4d8fbc95298
--- /dev/null
+++ b/pkgs/applications/science/logic/z3_opt/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, python }:
+
+# Copied shamelessly from the normal z3 .nix
+
+stdenv.mkDerivation rec {
+  name = "z3_opt-${version}";
+  version = "4.3.2";
+
+  src = fetchFromGitHub {
+    owner  = "Z3Prover";
+    repo   = "z3";
+    rev    = "9377779e5818b2ca15c4f39921b2ba3a42f948e7";
+    sha256 = "15d6hsb61hrm5vy3l2gnkrfnqr68lvspnznm17vyhm61ld33yaff";
+  };
+
+  buildInputs = [ python ];
+  enableParallelBuilding = true;
+
+  configurePhase = "python scripts/mk_make.py --prefix=$out && cd build";
+
+  # z3's install phase is stupid because it tries to calculate the
+  # python package store location itself, meaning it'll attempt to
+  # write files into the nix store, and fail.
+  soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
+    cp ../src/api/z3*.h       $out/include
+    cp ../src/api/c++/z3*.h   $out/include
+    cp z3                     $out/bin
+    cp libz3${soext}          $out/lib
+    cp libz3${soext}          $out/lib/${python.libPrefix}/site-packages
+    cp z3*.pyc                $out/lib/${python.libPrefix}/site-packages
+    cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages
+  '';
+
+  meta = {
+    description = "A high-performance theorem prover and SMT solver, optimization edition";
+    homepage    = "http://github.com/Z3Prover/z3";
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice sheganinans ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cde5956f77c..bed6b47501cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13768,6 +13768,7 @@ let
   yices = callPackage ../applications/science/logic/yices {};
 
   z3 = callPackage ../applications/science/logic/z3 {};
+  z3_opt = callPackage ../applications/science/logic/z3_opt {};
 
   boolector   = boolector15;
   boolector15 = callPackage ../applications/science/logic/boolector {};

From ea9969b0e45dc494e80095f4c4c0a469ec032312 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 09:10:47 +0000
Subject: [PATCH 0554/1143] Added jellyfish python package.

---
 pkgs/top-level/python-packages.nix | 39 ++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73fa69b4cb02..3e8164ff9b8b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6188,6 +6188,24 @@ let
     };
   });
 
+  jellyfish = buildPythonPackage rec {
+    version = "0.5.0";
+    name = "jellyfish-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jellyfish/${name}.tar.gz";
+      sha256 = "04p80gwwlhxjp8zpjf70a62x69l9rlvnz1pwi5ar52gyajn8z6z1";
+    };
+
+    buildInputs = with self; [ pytest unicodecsv ];
+
+    meta = with stdenv.lib; {
+      homepage = http://github.com/sunlightlabs/jellyfish;
+      description = "Approximate and phonetic matching of strings";
+      maintainers = [ maintainers.koral ];
+    };
+  };
+
   jinja2 = buildPythonPackage rec {
     name = "Jinja2-2.7.3";
 
@@ -12670,6 +12688,27 @@ let
     };
   };
 
+  unicodecsv = buildPythonPackage rec {
+    version = "0.12.0";
+    name = "unicodecsv-${version}";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/u/unicodecsv/${name}.tar.gz";
+      sha256 = "012yvwza38bq84z9p8xzlxn7bkz0gf5y2nm5js7cyn766cy53dxh";
+    };
+
+    # ImportError: No module named runtests
+    #buildInputs = with self; [ unittest2 ];
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Drop-in replacement for Python2's stdlib csv module, with unicode support";
+      homepage = https://github.com/jdunck/python-unicodecsv;
+      maintainers = [ maintainers.koral ];
+    };
+  };
+
   unittest2 = buildPythonPackage rec {
     version = "0.5.1";
     name = "unittest2-${version}";

From d9411d53e9eaae5d1cae16fe478a56e326e52550 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 May 2015 14:38:34 +0200
Subject: [PATCH 0555/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/533fd30acc55cb1db3f3a8339b66e99c934566c9
 with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba

---
 .../haskell-modules/hackage-packages.nix      | 260 +++++++++++++-----
 1 file changed, 191 insertions(+), 69 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 74b79921291c..93c7bbbf43ac 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1434,8 +1434,8 @@ self: {
      }:
      mkDerivation {
        pname = "BiobaseXNA";
-       version = "0.9.1.0";
-       sha256 = "0mwfzfhsywrv70gz8fc7s84v5hra0qidckjv4y0ps80ha7qv4kci";
+       version = "0.9.1.1";
+       sha256 = "1r9axc6g4fqc3sb47km3pfadx193s68ign8ac4va9wj8a5hilbgq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -1551,6 +1551,7 @@ self: {
          hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
          process split strict temporary transformers
        ];
+       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -10492,17 +10493,17 @@ self: {
 
   "MusicBrainz" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
-     , HTTP, http-conduit, http-types, monad-control, old-locale
-     , resourcet, text, time, transformers, vector, xml-conduit
+     , HTTP, http-conduit, http-types, monad-control, resourcet, text
+     , time, time-locale-compat, transformers, vector, xml-conduit
      , xml-types
      }:
      mkDerivation {
        pname = "MusicBrainz";
-       version = "0.2.3";
-       sha256 = "0xwyrjxrff38ijyppfbxsr2nbhg6zd7k0i2avch10dn15xfxapk8";
+       version = "0.2.4";
+       sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj";
        buildDepends = [
          aeson base bytestring conduit conduit-extra HTTP http-conduit
-         http-types monad-control old-locale resourcet text time
+         http-types monad-control resourcet text time time-locale-compat
          transformers vector xml-conduit xml-types
        ];
        homepage = "http://floss.scru.org/hMusicBrainz";
@@ -12290,9 +12291,9 @@ self: {
      mkDerivation {
        pname = "QuickCheck-safe";
        version = "0.1.0.1";
-       revision = "1";
+       revision = "3";
        sha256 = "0rxqd1n814b9mf6zg1i0g9d96ym9xqdgky7w7qf5bnnnpkk1ckc7";
-       editedCabalFile = "7609c326853799a0cd519bd258c03f89664ee37795ff3099aa3d5004d1f2dee8";
+       editedCabalFile = "4e791ac9fa2f2e73029ab92d17e3ab93571ec5b1d5acda0ea1f340c5ee1346f6";
        buildDepends = [ base QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
@@ -19632,8 +19633,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.7.0.1";
-       sha256 = "12wkny82bn843zbvq6vcwmd7lxzdg9g978bhyy9r9gc81mgmwf8s";
+       version = "0.7.1.0";
+       sha256 = "1kvn725ac7d8mx6r3wak046i706v8m7b7wlaxkkm8lc9b7hr5s9z";
        buildDepends = [
          aeson attoparsec base bifunctors bytestring either HTTP http-client
          http-conduit http-types text transformers
@@ -19642,7 +19643,6 @@ self: {
          aeson base bytestring Cabal containers hspec http-conduit text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -32011,8 +32011,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "clock";
-       version = "0.4.5.0";
-       sha256 = "0qa59yj4qr9hah1mljfmjv511p0nh7m67dgdz1zh9lnwwgky7biw";
+       version = "0.4.6.0";
+       sha256 = "0xrkw13dixj5pv79l10bl0z51kmplbkg30rhbykzx2imvv9rxixr";
        buildDepends = [ base ];
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
@@ -43654,16 +43654,15 @@ self: {
      }) {};
 
   "dynamic-state" = callPackage
-    ({ mkDerivation, base, binary, bytestring, concrete-typerep
-     , hashable, unordered-containers
+    ({ mkDerivation, base, binary, bytestring, hashable
+     , unordered-containers
      }:
      mkDerivation {
        pname = "dynamic-state";
-       version = "0.1.1.0";
-       sha256 = "18dc6fbnyk3q7n7gvqrgy98qc2grq0algr2jnc1ai3vm9bqh2x8n";
+       version = "0.2.0.0";
+       sha256 = "1dp0sp5cjk7rga9jkjdhl1alpj9g6g51zm57g58b64h070b9r82k";
        buildDepends = [
-         base binary bytestring concrete-typerep hashable
-         unordered-containers
+         base binary bytestring hashable unordered-containers
        ];
        description = "Optionally serializable dynamic state keyed by type";
        license = stdenv.lib.licenses.gpl2;
@@ -44940,7 +44939,9 @@ self: {
      mkDerivation {
        pname = "email-validate";
        version = "2.1.1";
+       revision = "1";
        sha256 = "1wka2zd6s8zf99d33z6mzprxq3aaxmm9z9rnfjs4j83930h61qdq";
+       editedCabalFile = "ec98fb65657fbd6705b80a2fbad8836246515f7ed84f3f382d88e0ee2d92645f";
        buildDepends = [ attoparsec base bytestring ghc-prim ];
        testDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -46278,8 +46279,8 @@ self: {
     ({ mkDerivation, base, groups }:
      mkDerivation {
        pname = "exact-pi";
-       version = "0.1.0.0";
-       sha256 = "01vljbgsqwiv6chlp1nfvmfc4wd3nq89mvn7x8s68dhfd8f8m2g6";
+       version = "0.1.1.0";
+       sha256 = "1n62886wjnnmdi1bjvw51ka21v882m1yc0m87kzq7kx7knvh1xxx";
        buildDepends = [ base groups ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
@@ -47148,8 +47149,8 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.6.1.0";
-       sha256 = "1hxp7r08cca8yyfgkgv2vrk8i989bxw6pd211zy65xsfd6gmf7nr";
+       version = "0.6.1.1";
+       sha256 = "1jwsf0mrr98wn5m4aavdqclv667kkgfqlgjn3dvrgnw8jrywzzd2";
        buildDepends = [
          base containers foldl lens parsec pipes pipes-group pipes-text
          split text
@@ -52665,16 +52666,16 @@ self: {
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, conduit, conduit-extra, containers, crypto-api
-     , cryptohash, curl, data-default, dataenc, DAV, dbus, directory
-     , dlist, dns, edit-distance, esqueleto, exceptions, fdo-notify
-     , feed, filepath, git, gnupg1, gnutls, hamlet, hinotify, hslogger
-     , http-client, http-conduit, http-types, IfElse, json, lsof
-     , MissingH, monad-control, monad-logger, mtl, network, network-info
+     , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
+     , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
+     , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client
+     , http-conduit, http-types, IfElse, json, lsof, MissingH
+     , monad-control, monad-logger, mtl, network, network-info
      , network-multicast, network-protocol-xmpp, network-uri, old-locale
      , openssh, optparse-applicative, path-pieces, perl, persistent
      , persistent-sqlite, persistent-template, process, QuickCheck
-     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, securemem
-     , shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
+     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
+     , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
      , tasty-rerun, template-haskell, text, time, torrent, transformers
      , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp
      , warp-tls, wget, which, xml-types, yesod, yesod-core
@@ -52682,25 +52683,25 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150420";
-       sha256 = "0jigzf550qzphzcc3wma03kdzq478s6azd992hkcxv9ymxhg2l7x";
+       version = "5.20150508";
+       sha256 = "07p9ifk1h0i9gmg36vdrn6nkp0m46g4pkv1jkjm7ip5bgc76382c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
          case-insensitive clientsession conduit conduit-extra containers
-         crypto-api cryptohash data-default dataenc DAV dbus directory dlist
-         dns edit-distance esqueleto exceptions fdo-notify feed filepath
-         gnutls hamlet hinotify hslogger http-client http-conduit http-types
-         IfElse json MissingH monad-control monad-logger mtl network
-         network-info network-multicast network-protocol-xmpp network-uri
-         old-locale optparse-applicative path-pieces persistent
-         persistent-sqlite persistent-template process QuickCheck random
-         regex-tdfa resourcet SafeSemaphore securemem shakespeare stm tasty
-         tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
-         torrent transformers unix unix-compat utf8-string uuid wai
-         wai-extra warp warp-tls xml-types yesod yesod-core yesod-default
-         yesod-form yesod-static
+         crypto-api cryptohash data-default DAV dbus directory dlist dns
+         edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
+         hamlet hinotify hslogger http-client http-conduit http-types IfElse
+         json MissingH monad-control monad-logger mtl network network-info
+         network-multicast network-protocol-xmpp network-uri old-locale
+         optparse-applicative path-pieces persistent persistent-sqlite
+         persistent-template process QuickCheck random regex-tdfa resourcet
+         SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit
+         tasty-quickcheck tasty-rerun template-haskell text time torrent
+         transformers unix unix-compat utf8-string uuid wai wai-extra warp
+         warp-tls xml-types yesod yesod-core yesod-default yesod-form
+         yesod-static
        ];
        buildTools = [
          bup curl git gnupg1 lsof openssh perl rsync wget which
@@ -57398,6 +57399,7 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time time-locale-compat
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -82502,8 +82504,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.1.0";
-       sha256 = "1smki1bp50vnmq6i2gxafj271sqwbizfdyqx0ggar6zbxv436gzm";
+       version = "0.1.1";
+       sha256 = "0kzziark5y41ig6z3qaa66x5avibwp6k74qcs9jf38hnl9z74pfr";
        buildDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
          monad-control monad-time mtl old-locale split stm text time
@@ -93770,6 +93772,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "osc" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring
+     , data-binary-ieee754, network
+     }:
+     mkDerivation {
+       pname = "osc";
+       version = "1.0.0.2";
+       sha256 = "0f7diw6nna7mq5rsn63jk9n230pnrr5ppi5dp8rcpniqry2gs1q3";
+       buildDepends = [
+         attoparsec base binary bytestring data-binary-ieee754 network
+       ];
+       homepage = "https://github.com/peacememories/haskell-osc";
+       description = "A library to handle messages in the OSC protocol";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "osdkeys" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , containers, libnotify, process, resourcet, time, transformers
@@ -94186,20 +94204,21 @@ self: {
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051, split
-     , syb, tagsoup, temporary, text, time, vector, xml-conduit, yaml
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time, vector
+     , xml-conduit, yaml
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.6.0.1";
-       sha256 = "05w6djrgpgf68shhbiv42gl0lvjiv8n9rrn0cd959dl3zdznssdg";
+       version = "0.7";
+       sha256 = "1ayh9gpkj128rsxiqjbgwr62fipc5a5h5vkkjnicjxgpwshnrcb8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson aeson-pretty attoparsec base bytestring containers
          data-default directory filepath hs-bibutils mtl old-locale pandoc
-         pandoc-types parsec process rfc5051 split syb tagsoup temporary
-         text time vector xml-conduit yaml
+         pandoc-types parsec process rfc5051 setenv split syb tagsoup
+         temporary text time vector xml-conduit yaml
        ];
        testDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -95033,6 +95052,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path" = callPackage
+    ({ mkDerivation, base, exceptions, filepath, hspec, HUnit, mtl
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "path";
+       version = "0.0.0";
+       sha256 = "1gk9z25d7swhg7zi6nxd076wcqfw2hxvq29hxqzc3drdaas2sc0b";
+       buildDepends = [ base exceptions filepath template-haskell ];
+       testDepends = [ base hspec HUnit mtl ];
+       description = "Path";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "path-pieces" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -96327,19 +96360,52 @@ self: {
      }) {};
 
   "pg-harness" = callPackage
+    ({ mkDerivation, async, base, bytestring, HTTP, ini
+     , postgresql-simple, random, scotty, text, transformers
+     }:
+     mkDerivation {
+       pname = "pg-harness";
+       version = "0.2.1";
+       sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         async base bytestring HTTP ini postgresql-simple random scotty text
+         transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/BardurArantsson/pg-harness";
+       description = "REST service and library for creating/consuming temporary PostgreSQL databases";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
+  "pg-harness-client" = callPackage
+    ({ mkDerivation, base, bytestring, HTTP }:
+     mkDerivation {
+       pname = "pg-harness-client";
+       version = "0.3.1";
+       sha256 = "12z5354in4zswn219cvxhqbva76p2jsccmzdn5iyw5g401546lr2";
+       buildDepends = [ base bytestring HTTP ];
+       homepage = "https://github.com/BardurArantsson/pg-harness";
+       description = "Client library for pg-harness-server";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "pg-harness-server" = callPackage
     ({ mkDerivation, async, base, ini, postgresql-simple, random
      , scotty, text, transformers
      }:
      mkDerivation {
-       pname = "pg-harness";
-       version = "0.1.0";
-       sha256 = "0ds161h0pcazq1lnbf5m89vm36mwjnhxakglyb2ixg39sd5a03g1";
+       pname = "pg-harness-server";
+       version = "0.3.1";
+       sha256 = "0459i1x5hsxkihyb5a8ca947ngs0gg8866s77bcdsifjw6b3cb4a";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          async base ini postgresql-simple random scotty text transformers
        ];
        jailbreak = true;
+       homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service for creating temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -113496,6 +113562,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sorted-list" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "sorted-list";
+       version = "0.1.2.1";
+       sha256 = "0jjzhi2wj4ca8bvwbv5nnljyli7c9ravigkndk85wdyzz74n0qbh";
+       buildDepends = [ base ];
+       homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
+       description = "Type-enforced sorted lists and related functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sorting" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -119650,14 +119728,14 @@ self: {
     ({ mkDerivation, base, c2hs, termbox }:
      mkDerivation {
        pname = "termbox-bindings";
-       version = "0.1.0.0";
-       sha256 = "050m1yl6x619pnkmfmg0zkr4rw5l93vgb1pjg9xizrdrqfh5dxhi";
+       version = "0.1.0.3";
+       sha256 = "00s3j6ccc63ycbj2lxzl2200ffwzslaxdny7d0b9dyzgn6n1pal7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base ];
        buildTools = [ c2hs ];
        extraLibraries = [ termbox ];
-       homepage = "github.com/luciferous/termbox-bindings";
+       homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the termbox library";
        license = stdenv.lib.licenses.bsd3;
      }) { termbox = null;};
@@ -121062,6 +121140,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-typegraph" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, data-default
+     , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl
+     , syb, template-haskell, text, th-desugar, th-orphans
+     , th-reify-many
+     }:
+     mkDerivation {
+       pname = "th-typegraph";
+       version = "0.14";
+       sha256 = "1f2wgr429hkv687mk9qgaqnr1n9nznl90cy7w74w4jzp6fd6rskp";
+       buildDepends = [
+         base containers data-default haskell-src-exts lens mtl syb
+         template-haskell th-desugar th-orphans
+       ];
+       testDepends = [
+         array base bytestring containers deepseq ghc-prim hspec hspec-core
+         lens mtl syb template-haskell text th-desugar th-orphans
+         th-reify-many
+       ];
+       homepage = "https://github.com/seereason/th-typegraph";
+       description = "Graph of the subtype relation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "themoviedb" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, either
      , http-client, http-client-tls, http-types, mtl, network
@@ -124044,15 +124146,14 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.1.1.4";
-       sha256 = "006qdp9imdnaprpaf4yk0zks0p3ry4ngag4i533wyik2xrz3q8ir";
+       version = "0.1.1.5";
+       sha256 = "1205s5a7x8vnv09717x6a2dv7y8rvzcxmmh6hm4cyph6b5p485vz";
        buildDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
        testDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
-       jailbreak = true;
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
@@ -125165,22 +125266,23 @@ self: {
      }) {};
 
   "unbound-generics" = callPackage
-    ({ mkDerivation, base, containers, contravariant, mtl, QuickCheck
-     , tasty, tasty-hunit, tasty-quickcheck, transformers
-     , transformers-compat
+    ({ mkDerivation, base, containers, contravariant, mtl, profunctors
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.1";
-       sha256 = "10flwmkmpnkxib1v9f5qv11wnvjmnn3aiag4f2qgpdc3hadq6j0q";
+       version = "0.1.2";
+       sha256 = "14mcv61ci6azzykx287b9cpcwyzbzr66i5s43vdd9wnzrg4mia03";
        buildDepends = [
-         base containers contravariant mtl transformers transformers-compat
+         base containers contravariant mtl profunctors template-haskell
+         transformers transformers-compat
        ];
        testDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://github.com/lambdageek/unbound-generics";
-       description = "Reimplementation of Unbound using GHC Generics";
+       description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -134039,6 +134141,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-crud" = callPackage
+    ({ mkDerivation, base, classy-prelude, containers, monad-control
+     , persistent, random, stm, uuid, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-crud";
+       version = "0.1.1";
+       sha256 = "06m24i27842pc599zrmj5nv0afx8ci07961gjagdsc02zhpx7896";
+       buildDepends = [
+         base classy-prelude containers monad-control persistent random stm
+         uuid yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "https://github.com/league/yesod-crud";
+       description = "Generic administrative CRUD operations as a Yesod subsite";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-datatables" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, data-default
      , HUnit, monad-control, persistent, persistent-sqlite
@@ -135785,7 +135905,9 @@ self: {
      mkDerivation {
        pname = "zlib";
        version = "0.6.1.0";
+       revision = "1";
        sha256 = "1yc4zfysbj28px064bfwz9n3b3i57c1dsfvkzgfxxmgj1mq65q7n";
+       editedCabalFile = "4efd1cd219decf6e6a97795a52344922c36aace77dc4b6834502c218d48b9f13";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck

From 387eaf74ef0a61debe45764cdd185aaa03db1ae4 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 09:37:34 +0000
Subject: [PATCH 0556/1143] mpv: 0.8.3 -> 0.9.1

---
 pkgs/applications/video/mpv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 464f5130b67a..8e516fd91e32 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -59,11 +59,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.8.3";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "1kw9hr957cxqgm2i94bgqc6sskm6bwhm0akzckilhs460b43h409";
+    sha256 = "17hpx8wb4b6hjhc208jn71p02s0gd6665vzyyy249k6jfn2nh8sx";
   };
 
   buildInputs = 

From e11306a366473f6cbbe7dc50e9043b8ec8ce42db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 11:39:38 +0200
Subject: [PATCH 0557/1143] haskell-smaoin has been fixed upstream.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index baec3bd6f80f..7609fca6286b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -811,7 +811,4 @@ self: super: {
   # https://github.com/adamwalker/sdr/issues/1
   sdr = dontCheck super.sdr;
 
-  # Reported upstream by e-mail.
-  smaoin = dontCheck super.smaoin;
-
 }

From e047ac86d62aa6dd5e8f29919e95076772b9d0ed Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 10:45:14 +0000
Subject: [PATCH 0558/1143] rmlint: 2.0.0 -> 2.1.0

---
 pkgs/tools/misc/rmlint/default.nix     |  6 ++----
 pkgs/tools/misc/rmlint/fix-scons.patch | 22 ----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/misc/rmlint/fix-scons.patch

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index aed93775ce98..9e61a5c195e4 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -4,15 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rmlint-${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
-    sha256 = "14jiswagipsmzxclcskn672ws4126p65l6hlzkkvanyv8gmpv90f";
+    sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g";
   };
 
-  patches = [ ./fix-scons.patch ];
-
   configurePhase = "scons config";
 
   buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ];
diff --git a/pkgs/tools/misc/rmlint/fix-scons.patch b/pkgs/tools/misc/rmlint/fix-scons.patch
deleted file mode 100644
index 4d7d832f13d7..000000000000
--- a/pkgs/tools/misc/rmlint/fix-scons.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git b/SConstruct a/SConstruct
-old mode 100644
-new mode 100755
-index a7fca2e..561007e
---- b/SConstruct
-+++ a/SConstruct
-@@ -404,11 +404,10 @@ options = dict(
-     SHLINKCOMSTR=link_shared_library_message,
-     LINKCOMSTR=link_program_message,
-     PREFIX=GetOption('prefix'),
--    ENV={
--        'PATH': os.environ['PATH'],
--        'TERM': os.environ['TERM'],
--        'HOME': os.environ['HOME']
--    }
-+    ENV = dict([ (key, os.environ[key])
-+                 for key in os.environ
-+                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
-+              ])
- )
- 
- if ARGUMENTS.get('VERBOSE') == "1":

From 1c371606cedccf1f13f86af88822f1412c6eea93 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 10:52:25 +0000
Subject: [PATCH 0559/1143] ranger: 1.7.0 -> 1.7.1

---
 pkgs/applications/misc/ranger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index cc8bd42ec39f..7c08bf9d2e79 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, python, fetchurl }:
 
 buildPythonPackage rec {
-  name = "ranger-1.7.0";
+  name = "ranger-1.7.1";
 
   meta = {
     description = "File manager with minimalistic curses interface";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://ranger.nongnu.org/${name}.tar.gz";
-    sha256 = "066lp1k2zcz2lnww2aj0m3fgn9g5ms67kxgclhgq66pxkjwgc4kx";
+    sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q";
   };
 
   propagatedBuildInputs = with python.modules; [ curses ];

From 073d4102b384cf86dd59fcfd200be2e0bbdb5784 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 11:02:19 +0000
Subject: [PATCH 0560/1143] slock: 1.1 -> 1.2

---
 pkgs/misc/screensavers/slock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index c88be58abb22..5c731ff20d7f 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, xproto, libX11, libXext }:
 stdenv.mkDerivation rec {
-  name = "slock-1.1";
+  name = "slock-1.2";
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "1r70s3npmp0nyrfdsxz8cw1i1z8n9phqdlw02wjphv341h3yajp0";
+    sha256 = "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il";
   };
   buildInputs = [ xproto libX11 libXext	];
   installFlags = "DESTDIR=\${out} PREFIX=";

From d40cf483cc1ccb70c2d665e4c80e78ed065ce4a8 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 11:46:31 +0000
Subject: [PATCH 0561/1143] git: 2.3.6 -> 2.4.0

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 474d509297f3..620d3264be88 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.3.6";
+  version = "2.4.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1z30gj5a9n0sylqlwd35vvpi49051ql44xzmarkkcirbx5a1rq1w";
+    sha256 = "095v8n0b0c314sfg5mrnxjx2d9mklbjcmajh92kmi6b5jkfkhd5k";
   };
 
   patches = [

From 31b330828c37eb6bea307ae41a25809eb10cc46e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 11:40:02 +0200
Subject: [PATCH 0562/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/7424fa13dba1209a3dccbd01c99675ea44e41b05
 with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022

---
 .../haskell-modules/hackage-packages.nix      | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 93c7bbbf43ac..56c6418afc6b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12497,6 +12497,7 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAwolf" = callPackage
@@ -14777,6 +14778,7 @@ self: {
        homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypingTester" = callPackage
@@ -29306,8 +29308,8 @@ self: {
      }:
      mkDerivation {
        pname = "caramia";
-       version = "0.7.2.1";
-       sha256 = "01l6i8cb2q73vc4w6fbn90mkx7sxxsnwzhj0jg4yjhnrg4js0hlh";
+       version = "0.7.2.2";
+       sha256 = "1cvpyad7kmkndan1bfpfaav6lara8g78x02pgascrq8n73b2jcgs";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -29318,7 +29320,6 @@ self: {
          base containers HUnit linear sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/Noeda/caramia/";
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
@@ -32480,10 +32481,13 @@ self: {
      mkDerivation {
        pname = "cndict";
        version = "0.6.1";
+       revision = "1";
        sha256 = "0pi0n1chwv6y3ch7dw2smrllwsdiy6r295lmmsnfnbprc8w6gksq";
+       editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468";
        buildDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
        license = stdenv.lib.licenses.publicDomain;
@@ -93346,26 +93350,26 @@ self: {
 
   "opml-conduit" = callPackage
     ({ mkDerivation, base, case-insensitive, conduit
-     , conduit-combinators, containers, data-default, exceptions, lens
-     , mono-traversable, monoid-subclasses, mtl, network-uri, QuickCheck
+     , conduit-combinators, containers, data-default, exceptions
+     , hashable, hashable-time, hlint, lens, mono-traversable
+     , monoid-subclasses, mtl, network-uri, QuickCheck
      , quickcheck-instances, resourcet, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, xml-conduit, xml-types
+     , tasty-quickcheck, text, time, timerep, unordered-containers
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.1.0.0";
-       revision = "2";
-       sha256 = "055ngv2ibb7bk99y67ag9y7xxhyzag08mgb6zf1aqfjgpna6dkcf";
-       editedCabalFile = "74ca928e036892a1db09b1309addb87cba9dd7332fc5c9aab8413e6635e357c9";
+       version = "0.2.0.0";
+       sha256 = "0dpsxssr8h3ph9c5plrmpxv9mv1mg5zb3wrwfbkyb5g7ja91qs4b";
        buildDepends = [
          base case-insensitive conduit containers data-default exceptions
-         lens mono-traversable monoid-subclasses network-uri QuickCheck
-         quickcheck-instances semigroups text time timerep xml-conduit
-         xml-types
+         hashable hashable-time lens mono-traversable monoid-subclasses
+         network-uri QuickCheck quickcheck-instances semigroups text time
+         timerep unordered-containers xml-conduit xml-types
        ];
        testDepends = [
-         base conduit conduit-combinators containers exceptions lens mtl
-         network-uri resourcet tasty tasty-hunit tasty-quickcheck
+         base conduit conduit-combinators containers exceptions hlint lens
+         mtl network-uri resourcet tasty tasty-hunit tasty-quickcheck
          xml-conduit
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
@@ -99414,6 +99418,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prettyFunctionComposing" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "prettyFunctionComposing";
+       version = "1.0.1";
+       sha256 = "0c39dyjlcrah1aq2rkk7zqysmzxqym6chv8x9zmifclvn5a4j98b";
+       buildDepends = [ base ];
+       description = "prettier function composition by (°)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prettyclass" = callPackage
     ({ mkDerivation, base, pretty }:
      mkDerivation {
@@ -99755,8 +99770,11 @@ self: {
      mkDerivation {
        pname = "process-listlike";
        version = "1.0";
+       revision = "1";
        sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r";
+       editedCabalFile = "72b239b889868394c365985197588cda0ec8aac03d4796a9e212b4044c966f16";
        buildDepends = [ base bytestring deepseq ListLike process text ];
+       jailbreak = true;
        homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
@@ -113494,6 +113512,7 @@ self: {
        homepage = "https://github.com/mhwombat/som";
        description = "Self-Organising Maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sonic-visualiser" = callPackage
@@ -119738,6 +119757,7 @@ self: {
        homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the termbox library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { termbox = null;};
 
   "terminal-progress-bar" = callPackage
@@ -125284,6 +125304,7 @@ self: {
        homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbounded-delays" = callPackage

From 1d119271e7914c75835ef354d784d5a813fea70d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 11:49:54 +0200
Subject: [PATCH 0563/1143] haskell-sandi: jailbreak restriction on "base ==
 4.8.*" so that we can build git-annex and hledger

Reported in https://github.com/magthe/sandi/issues/7.
---
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 5 +++++
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 1adccd36dca1..8be816b0c9b6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -80,4 +80,9 @@ self: super: {
   # and are virtually impossible to compile on Hydra.
   conduit = super.conduit_1_2_4_1;
 
+  # https://github.com/magthe/sandi/issues/7
+  sandi = overrideCabal super.sandi (drv: {
+    patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
+  );
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index f481f75c2f8d..21fdc86d89a6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -136,4 +136,9 @@ self: super: {
   # and are virtually impossible to compile on Hydra.
   conduit = super.conduit_1_2_4_1;
 
+  # https://github.com/magthe/sandi/issues/7
+  sandi = overrideCabal super.sandi (drv: {
+    patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
+  );
+
 }

From c4bc6fc243e4995badfdb6f81443b80b8500a3ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 12:18:04 +0200
Subject: [PATCH 0564/1143] haskell-email-validate: disable test suite to fix
 the build

Reported in https://github.com/Porges/email-validate-hs/issues/12.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7609fca6286b..b9c80eab34d9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -811,4 +811,7 @@ self: super: {
   # https://github.com/adamwalker/sdr/issues/1
   sdr = dontCheck super.sdr;
 
+  # https://github.com/Porges/email-validate-hs/issues/12
+  email-validate = dontCheck super.email-validate;
+
 }

From 75ebc3cf1dc1365be5a05018fc8e5409c66025cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 9 May 2015 14:58:40 +0200
Subject: [PATCH 0565/1143] doc/stdenv: fix manual build after #7711

---
 doc/stdenv.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a03b3716a87b..6fdebda09f98 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -545,13 +545,13 @@ script) if it exists.</para>
     such.</para></footnote>.  If this is undesirable, set this
     variable to true.</para></listitem>
   </varlistentry>
-  
+
   <varlistentry>
     <term><varname>dontDisableStatic</varname></term>
     <listitem><para>By default, when the configure script has
     <option>--enable-static</option>, the option
     <option>--disable-static</option> is added to the configure flags.</para>
-    <para></para>If this is undesirable, set this variable to
+    <para>If this is undesirable, set this variable to
     true.</para></listitem>
   </varlistentry>
 

From cd11803aa1142606e0df7a3546138c924d765c63 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Fri, 8 May 2015 12:10:40 +0200
Subject: [PATCH 0566/1143] Add s3ql package

S3QL is a file system that stores all its data online using storage
services like Google Storage, Amazon S3, or OpenStack. S3QL effectively
provides a hard disk of dynamic, infinite capacity that can be accessed
from any computer with internet access running Linux, FreeBSD or OS-X.
---
 pkgs/tools/backup/s3ql/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/backup/s3ql/default.nix

diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
new file mode 100644
index 000000000000..b455c672b104
--- /dev/null
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, python3Packages, sqlite  }:
+
+python3Packages.buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "s3ql";
+  version = "2.13";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
+    sha256 = "0bxps1iq0rv7bg2b8mys6zyjp912knm6zmafhid1jhsv3xyby4my";
+  };
+
+  propagatedBuildInputs = with python3Packages;
+    [ sqlite apsw pycrypto requests defusedxml dugong llfuse ];
+
+  meta = with stdenv.lib; {
+    description = "A full-featured file system for online data storage";
+    homepage = "https://bitbucket.org/nikratio/s3ql";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ rushmorem ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c38feccb5108..0222aa18212e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9629,6 +9629,8 @@ let
 
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
+  s3ql = callPackage ../tools/backup/s3ql { };
+
   sassc = callPackage ../development/tools/sassc { };
 
   schedtool = callPackage ../os-specific/linux/schedtool { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73fa69b4cb02..d29a8410a34b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1004,6 +1004,28 @@ let
     };
   };
 
+  defusedxml = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "defusedxml";
+    version = "0.4.1";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.gz";
+      sha256 = "0y147zy3jqmk6ly7fbhqmzn1hf41xcb53f2vcc3m8x4ba5d1smfd";
+    };
+  };
+
+  dugong = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "dugong";
+    version = "3.5";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.bz2";
+      sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24";
+    };
+
+    disabled = pythonOlder "3.3";	# Library does not support versions older than 3.3
+  };
+
   iowait = buildPythonPackage rec {
     name = "iowait-0.2";
 

From 41ad1f947b5226f658bcd74e5300c9c67d0e702a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 03:43:40 +0200
Subject: [PATCH 0567/1143] Add cfr 0_100: another Java decompiler

---
 pkgs/development/tools/java/cfr/default.nix | 41 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/java/cfr/default.nix

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
new file mode 100644
index 000000000000..6025a59f44cb
--- /dev/null
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, jre }:
+
+let version = "0_100"; in
+stdenv.mkDerivation rec {
+  name = "cfr-${version}";
+
+  src = fetchurl {
+    sha256 = "0q5kh5qdksykz339p55jz0q5cjqvxdzv3a7r4kkijgbfjm1ldr5f";
+    url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Another java decompiler";
+    longDescription = ''
+      CFR will decompile modern Java features - Java 8 lambdas (pre and post
+      Java beta 103 changes), Java 7 String switches etc, but is written
+      entirely in Java 6.
+    '';
+    homepage = http://www.benf.org/other/cfr/;
+    license = with licenses; mit;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ jre ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    jar=$out/share/cfr/cfr_${version}.jar
+
+    install -Dm644 ${src} $jar
+
+    cat << EOF > cfr
+    #!${stdenv.shell}
+    exec ${jre}/bin/java -jar $jar "\''${@}"
+    EOF
+    install -Dm755 cfr $out/bin/cfr
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ac1f36d5c5a..3269737a3b35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5043,6 +5043,8 @@ let
     ruby = ruby_2_0_0;
   };
 
+  cfr = callPackage ../development/tools/java/cfr { };
+
   chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; };
 
   chrpath = callPackage ../development/tools/misc/chrpath { };

From 4c05e484116b97d3e24ff0ca3fcd550f3a67b1b5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 05:25:01 +0200
Subject: [PATCH 0568/1143] man-pages 3.83 -> 4.00

---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 5c93ecc94690..14cd41adbec0 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let version = "3.83"; in
+let version = "4.00"; in
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1wksxxfvn8avfl01qk0i61zzgkkay29lpmbfal26a542yahydz3j";
+    sha256 = "18zb1g12s15sanffh0sykmmyx0j176pp7q1xxs0gk0imgvmn8hj4";
   };
 
   makeFlags = "MANDIR=$(out)/share/man";

From 8f74b653d22e22b47d8e5e5724397ec9d12bda22 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 17:40:51 +0200
Subject: [PATCH 0569/1143] alloy: remove left-over no-op

---
 pkgs/development/tools/alloy/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index da247072b070..2c16f1f6f6cf 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
   phases = [ "installPhase" ];
 
   installPhase = ''
-    jar=`basename ${src}`
     jar=$out/share/alloy/alloy${version}.jar
 
     install -Dm644 ${src} $jar

From d8a2bb86c0e52bd5c41b2404ed3bbc7f80768842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 9 May 2015 17:05:24 +0000
Subject: [PATCH 0570/1143] Raspberry Pi 2 changes to make it boot.

It boots, but some things still don't work:
1) Installation of DTBs
2) Boot of initrd

Booting still needs a proper config.txt in /boot, which could probably be
managed by NixOS.
---
 .../system/boot/loader/raspberrypi/builder.sh   | 17 ++++++++++++-----
 .../boot/loader/raspberrypi/raspberrypi.nix     | 14 ++++++++++++++
 .../linux/firmware/raspberrypi/default.nix      |  4 ++--
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
index f6ccfe493d8a..ccb88ca1c529 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
@@ -60,22 +60,26 @@ addEntry() {
     fi
 
     local kernel=$(readlink -f $path/kernel)
-    # local initrd=$(readlink -f $path/initrd)
+    local initrd=$(readlink -f $path/initrd)
 
     if test -n "@copyKernels@"; then
         copyToKernelsDir $kernel; kernel=$result
-        # copyToKernelsDir $initrd; initrd=$result
+        copyToKernelsDir $initrd; initrd=$result
     fi
     
     echo $(readlink -f $path) > $outdir/$generation-system
     echo $(readlink -f $path/init) > $outdir/$generation-init
     cp $path/kernel-params $outdir/$generation-cmdline.txt
-    # echo $initrd > $outdir/$generation-initrd
+    echo $initrd > $outdir/$generation-initrd
     echo $kernel > $outdir/$generation-kernel
 
     if test $(readlink -f "$path") = "$default"; then
-      copyForced $kernel /boot/kernel.img
-      # copyForced $initrd /boot/initrd
+      if [ @version@ -eq 1 ]; then
+        copyForced $kernel /boot/kernel.img
+      else
+        copyForced $kernel /boot/kernel7.img
+      fi
+      copyForced $initrd /boot/initrd
       cp "$(readlink -f "$path/init")" /boot/nixos-init
       echo "`cat $path/kernel-params` init=$path/init" >/boot/cmdline.txt
 
@@ -98,8 +102,11 @@ fwdir=@firmware@/share/raspberrypi/boot/
 copyForced $fwdir/bootcode.bin  /boot/bootcode.bin
 copyForced $fwdir/fixup.dat     /boot/fixup.dat
 copyForced $fwdir/fixup_cd.dat  /boot/fixup_cd.dat
+copyForced $fwdir/fixup_db.dat  /boot/fixup_db.dat
 copyForced $fwdir/start.elf     /boot/start.elf
 copyForced $fwdir/start_cd.elf  /boot/start_cd.elf
+copyForced $fwdir/start_db.elf  /boot/start_db.elf
+copyForced $fwdir/start_x.elf   /boot/start_x.elf
 
 # Remove obsolete files from /boot/old.
 for fn in /boot/old/*linux* /boot/old/*initrd*; do
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 1ea3ddd8867c..b7400e333e21 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -3,6 +3,7 @@
 with lib;
 
 let
+  cfg = config.boot.loader.raspberryPi;
 
   builder = pkgs.substituteAll {
     src = ./builder.sh;
@@ -10,6 +11,7 @@ let
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     firmware = pkgs.raspberrypifw;
+    version = cfg.version;
   };
 
   platform = pkgs.stdenv.platform;
@@ -29,11 +31,23 @@ in
       '';
     };
 
+    boot.loader.raspberryPi.version = mkOption {
+      default = 2;
+      type = types.int;
+      description = ''
+      '';
+    };
+
   };
 
   config = mkIf config.boot.loader.raspberryPi.enable {
     system.build.installBootLoader = builder;
     system.boot.loader.id = "raspberrypi";
     system.boot.loader.kernelFile = platform.kernelTarget;
+    assertions = [
+      { assertion = (cfg.version == 1 || cfg.version == 2);
+        message = "loader.raspberryPi.version should be 1 or 2";
+      }
+    ];
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 690b7dcc40f2..4d875d15d486 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,14 +2,14 @@
 
 let
 
-  rev = "3ab17ac25e";
+  rev = "b7bbd3d1683e9f3bb11ef86b952adee71e83862f";
 
 in stdenv.mkDerivation {
   name = "raspberrypi-firmware-${rev}";
 
   src = fetchurl {
     url = "https://github.com/raspberrypi/firmware/archive/${rev}.tar.gz";
-    sha256 = "080va4zz858bwwgxam8zy58gpwjpxfg7v5h1q5b4cpbzjihsxcx9";
+    sha256 = "16wpwa1y3imd3la477b3rfbfypssvlh0zjdag3hgkm33aysizijp";
   };
 
   installPhase = ''

From f392d36b17918eb27621c213b0b3ad512aecf1e6 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sat, 9 May 2015 17:13:51 +0000
Subject: [PATCH 0571/1143] libuv: version 1.5.0

---
 pkgs/development/libraries/libuv/default.nix | 2 +-
 pkgs/top-level/all-packages.nix              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index f85c2bef1853..37f09d4adf00 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -105,5 +105,5 @@ in
   //
   mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
     v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
-    v1_4_2 = "03ffyjyz92ipi2im05hvlx7jypv9c8fyp90zqyr91w7vszskxnxw";
+    v1_5_0 = "1j0871mxw97680ghlqy0dpyfmr26kqa0lk26a2bgcqf4ghqap24x";
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4372d2283cdf..74ed1b7190de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1884,7 +1884,7 @@ let
   else
     nodePackages_0_12;
 
-  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_2; };
+  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_5_0; };
 
   iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
 
@@ -6936,7 +6936,7 @@ let
     automake = automake113x; # fails with 14
   });
 
-  libuv = libuvVersions.v1_4_2;
+  libuv = libuvVersions.v1_5_0;
 
   libv4l = lowPrio (v4l_utils.override {
     alsaLib = null;

From 1ad2fa452a0d96be96dbe812c182cd1753992c14 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Thu, 7 May 2015 13:00:01 -0600
Subject: [PATCH 0572/1143] Add EventStore package

This turns the V8 expression into a generic build, so that we can
build with the required version.
---
 pkgs/development/libraries/v8/3.24.10.nix |  6 ++
 pkgs/development/libraries/v8/default.nix | 71 ++--------------------
 pkgs/development/libraries/v8/generic.nix | 73 +++++++++++++++++++++++
 pkgs/servers/nosql/eventstore/default.nix | 54 +++++++++++++++++
 pkgs/top-level/all-packages.nix           |  8 +++
 5 files changed, 145 insertions(+), 67 deletions(-)
 create mode 100644 pkgs/development/libraries/v8/3.24.10.nix
 create mode 100644 pkgs/development/libraries/v8/generic.nix
 create mode 100644 pkgs/servers/nosql/eventstore/default.nix

diff --git a/pkgs/development/libraries/v8/3.24.10.nix b/pkgs/development/libraries/v8/3.24.10.nix
new file mode 100644
index 000000000000..e7b10f23ac8a
--- /dev/null
+++ b/pkgs/development/libraries/v8/3.24.10.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "3.24.10";
+  sha256 = "1blz5h9syk93bb4x3shcai3s2jhh6ai4bpymr9rz0f1ysvg60x75";
+})
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index dbf2f376d0f9..6ae5c896efa1 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -1,69 +1,6 @@
-{ stdenv, fetchurl, gyp, readline, python, which, icu }:
+{ callPackage, ... } @ args:
 
-assert readline != null;
-
-let
-  arch = if stdenv.is64bit then "x64" else "ia32";
-in
-
-stdenv.mkDerivation rec {
-  name = "v8-${version}";
+callPackage ./generic.nix (args // {
   version = "3.30.33.16";
-
-  src = fetchurl {
-    url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
-        + "${name}.tar.bz2";
-    sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45";
-  };
-
-  patchPhase = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
-  '';
-
-  configurePhase = ''
-    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
-    PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
-      build/gyp_v8 \
-        -f make \
-        --generator-output="out" \
-        -Dflock_index=0 \
-        -Dv8_enable_i18n_support=1 \
-        -Duse_system_icu=1 \
-        -Dconsole=readline \
-        -Dcomponent=shared_library \
-        -Dv8_target_arch=${arch}
-  '';
-
-  nativeBuildInputs = [ which ];
-  buildInputs = [ readline python icu ];
-
-  buildFlags = [
-    "LINK=g++"
-    "-C out"
-    "builddir=$(CURDIR)/Release"
-    "BUILDTYPE=Release"
-  ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-    install -vD out/Release/d8 "$out/bin/d8"
-    ${if stdenv.system == "x86_64-darwin" then ''
-    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
-    '' else ''
-    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
-    ''}
-    cp -vr include "$out/"
-  '';
-
-  postFixup = if stdenv.isDarwin then ''
-    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
-    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
-  '' else null;
-
-  meta = with stdenv.lib; {
-    description = "Google's open source JavaScript engine";
-    platforms = with platforms; linux;
-    license = licenses.bsd3;
-  };
-}
+  sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45";
+})
diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix
new file mode 100644
index 000000000000..b056ba640d2d
--- /dev/null
+++ b/pkgs/development/libraries/v8/generic.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, gyp, readline, python, which, icu
+, version
+, sha256
+, ...
+}:
+
+assert readline != null;
+
+let
+  arch = if stdenv.is64bit then "x64" else "ia32";
+in
+
+stdenv.mkDerivation rec {
+  name = "v8-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+        + "${name}.tar.bz2";
+    inherit sha256;
+  };
+
+  patchPhase = ''
+    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
+  '';
+
+  configurePhase = ''
+    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
+    PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
+      build/gyp_v8 \
+        -f make \
+        --generator-output="out" \
+        -Dflock_index=0 \
+        -Dv8_enable_i18n_support=1 \
+        -Duse_system_icu=1 \
+        -Dconsole=readline \
+        -Dcomponent=shared_library \
+        -Dv8_target_arch=${arch}
+  '';
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ readline python icu ];
+
+  buildFlags = [
+    "LINK=g++"
+    "-C out"
+    "builddir=$(CURDIR)/Release"
+    "BUILDTYPE=Release"
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -vD out/Release/d8 "$out/bin/d8"
+    ${if stdenv.system == "x86_64-darwin" then ''
+    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
+    '' else ''
+    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
+    ''}
+    cp -vr include "$out/"
+  '';
+
+  postFixup = if stdenv.isDarwin then ''
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+  '' else null;
+
+  meta = with stdenv.lib; {
+    description = "Google's open source JavaScript engine";
+    platforms = with platforms; linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
new file mode 100644
index 000000000000..e13d99c104d4
--- /dev/null
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchgit, fetchpatch, git, mono, v8, icu }:
+
+# There are some similarities with the pinta derivation. We should
+# have a helper to make it easy to package these Mono apps.
+
+stdenv.mkDerivation rec {
+  name = "EventStore-${version}";
+  version = "3.0.3";
+  src = fetchgit {
+    url = "https://github.com/EventStore/EventStore.git";
+    rev = "a1382252dd1ed0554ddb04015cdb2cbc1b0a65c1";
+    sha256 = "07ir6jlli2q1yvsnyw8r8dfril6h1wmfj98yf7a6k81585v2mc6g";
+    leaveDotGit = true;
+  };
+
+  patches = [
+    # see: https://github.com/EventStore/EventStore/issues/461
+    (fetchpatch {
+      url = https://github.com/EventStore/EventStore/commit/9a0987f19935178df143a3cf876becaa1b11ffae.patch;
+      sha256 = "04qw0rb1pypa8dqvj94j2mwkc1y6b40zrpkn1d3zfci3k8cam79y";
+    })
+  ];
+
+  buildPhase = ''
+    ln -s ${v8}/lib/libv8.so src/libs/libv8.so
+    ln -s ${icu}/lib/libicui18n.so src/libs/libicui18n.so
+    ln -s ${icu}/lib/libicuuc.so src/libs/libicuuc.so
+
+    ./build.sh js1
+    ./build.sh quick ${version}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib/eventstore/clusternode}
+    cp -r bin/clusternode/* $out/lib/eventstore/clusternode/
+    cat > $out/bin/clusternode << EOF
+    #!/bin/sh
+    exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@"
+    EOF
+    chmod +x $out/bin/clusternode
+  '';
+
+  buildInputs = [ git v8 mono ];
+
+  dontStrip = true;
+
+  meta = {
+    homepage = https://geteventstore.com/;
+    description = "Event sourcing database with processing logic in JavaScript.";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3269737a3b35..2d480da59547 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7832,6 +7832,10 @@ let
     inherit (pythonPackages) gyp;
   };
 
+  v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix {
+    inherit (pythonPackages) gyp;
+  };
+
   v8 = callPackage ../development/libraries/v8 {
     inherit (pythonPackages) gyp;
   };
@@ -8425,6 +8429,10 @@ let
 
   elasticmq = callPackage ../servers/elasticmq { };
 
+  eventstore = callPackage ../servers/nosql/eventstore {
+    v8 = v8_3_24_10;
+  };
+
   etcdctl = callPackage ../development/tools/etcdctl { };
 
   exim = callPackage ../servers/mail/exim { };

From 44cdda7afb433c2cf9b48da982b013bdc694a1ae Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 9 May 2015 20:40:42 +0200
Subject: [PATCH 0573/1143] libsodium: 1.0.2 -> 1.0.3

---
 pkgs/development/libraries/libsodium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index fc554122c08e..dfe462c301ae 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.2";
+  name = "libsodium-1.0.3";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
+    sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp";

From b884826d15536ff4f0b39378276854d4572f4aaf Mon Sep 17 00:00:00 2001
From: Erik Timan <dev@timan.info>
Date: Sat, 9 May 2015 19:32:32 +0000
Subject: [PATCH 0574/1143] python-packages: azure 0.10.0 -> 0.10.2

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfc0c80f64ff..7020b17f273c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -732,12 +732,12 @@ let
   }));
 
   azure = buildPythonPackage rec {
-    version = "0.10.0";
+    version = "0.10.2";
     name = "azure-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/azure/${name}.zip";
-      md5 = "305b0036df5696d68369807835f554ae";
+      md5 = "8eaa0f8e649b21b6527a5ee801cef33a";
     };
 
     propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ];

From 8d8c7c36007b2de269d99d91987980cfa4a8ff5e Mon Sep 17 00:00:00 2001
From: Erik Timan <dev@timan.info>
Date: Sat, 9 May 2015 20:02:40 +0000
Subject: [PATCH 0575/1143] python-packages: disable older than 2.7 for azure

---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7020b17f273c..0831412365ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -734,6 +734,7 @@ let
   azure = buildPythonPackage rec {
     version = "0.10.2";
     name = "azure-${version}";
+    disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/azure/${name}.zip";

From d170c98d13a7b622c57c9b9f727a6bfec95a9181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 9 May 2015 20:19:34 +0000
Subject: [PATCH 0576/1143] Making nixos keep a ref to its stdenv

This will help a lot on ARM, where nix-collect-garbage erases gcc; then, any
change to a small system config file requires rebuilding gcc again.

I don't know why it does not happen on x86. Maybe it just pulls the gcc from
hydra, if garbage is collected.
---
 nixos/modules/system/activation/top-level.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index d7a1e205b4d4..52d76b03602f 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -64,6 +64,7 @@ let
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
       ln -s "$systemd" $out/systemd
+      ln -s ${pkgs.stdenv} $out/stdenv
 
       echo -n "$configurationName" > $out/configuration-name
       echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version

From 282354a6cfe45f0bc0a62a91515a1bfac80fad0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 9 May 2015 20:22:58 +0000
Subject: [PATCH 0577/1143] Updating cjdns to latest master.

It has important stability fixes.
---
 pkgs/tools/networking/cjdns/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 569d84bd72ed..86c3ea4f919b 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -2,7 +2,7 @@
 
 let
   version = "16"; # see ${src}/util/version/Version.h
-  date = "20150422";
+  date = "20150509";
 in
 stdenv.mkDerivation {
   name = "cjdns-${version}-${date}";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "cjdelisle";
     repo = "cjdns";
-    rev = "78e13484b6639adacefc62eb7cf93ef7db4a936f";
-    sha256 = "1l1c43r11mj4c8is24988yfycw74flgv7qvc2cfhlisz7fhgfkds";
+    rev = "a05ade40dc31caebaf3aa770aac3ab2ecb02d867";
+    sha256 = "07vwsw5d0sdxypl187cyzzdrv0chf4yyjxcymf847afkfr249n29";
   };
 
   buildInputs = [ which python27 nodejs ] ++

From 21dd114f8204178d72d1587ec032be0e7f066c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 9 May 2015 21:11:49 +0000
Subject: [PATCH 0578/1143] Revert "Making nixos keep a ref to its stdenv"

This reverts commit d170c98d13a7b622c57c9b9f727a6bfec95a9181.

niksnut argues that we need smaller system closures, not bigger.

So users facing the trouble of getting gcc rebuilds after nix-collect-garbage
for any minimal nixos configuration change should use other means of
not losing the stdenv output.

One way is to keep one somewhere: nix-build -A stdenv -o stdenv '<nixpkgs>'.
Another may be to use nix.conf options like gc-keep-outputs, gc-keep-derivations
or env-keep-derivations.
---
 nixos/modules/system/activation/top-level.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 52d76b03602f..d7a1e205b4d4 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -64,7 +64,6 @@ let
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
       ln -s "$systemd" $out/systemd
-      ln -s ${pkgs.stdenv} $out/stdenv
 
       echo -n "$configurationName" > $out/configuration-name
       echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version

From f541c61e220a70e77df18a02c20608160bbae7d2 Mon Sep 17 00:00:00 2001
From: Erik Timan <dev@timan.info>
Date: Sat, 9 May 2015 19:45:09 +0000
Subject: [PATCH 0579/1143] python-packages: icalendar 3.8.4 -> 3.9.0

dateutil is a new depencency for icalendar 3.9.0.
---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfc0c80f64ff..37b3c93c133d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6061,16 +6061,16 @@ let
   };
 
   icalendar = buildPythonPackage rec {
-    version = "3.8.4";
+    version = "3.9.0";
     name = "icalendar-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/icalendar/${name}.zip";
-      md5 = "d700e6e75613fd1ee882c4b11c58940c";
+      url = "https://pypi.python.org/packages/source/i/icalendar/${name}.tar.gz";
+      md5 = "072c67a4c461864abd604631d7cf67e7";
     };
 
     buildInputs = with self; [ setuptools ];
-    propagatedBuildInputs = with self; [ pytz ];
+    propagatedBuildInputs = with self; [ dateutil pytz ];
 
     meta = with stdenv.lib; {
       description = "A parser/generator of iCalendar files";

From b807d8daebf240a101b6b906161d9ae29fef6b14 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sat, 9 May 2015 18:13:52 -0400
Subject: [PATCH 0580/1143] avxsynth: refactor & 2013-05-10 -> 2015-04-07

---
 pkgs/applications/video/avxsynth/default.nix | 50 +++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index a9a2ec46397f..d8ec715a38cb 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -1,26 +1,42 @@
-{ stdenv, fetchurl, ffmpeg, autoconf, automake, libtool, pkgconfig, log4cpp
-, pango, cairo, python, libjpeg, ffms
-, enableQt ? true, qt4}:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, cairo, ffmpeg, ffms, libjpeg, log4cpp, pango
+, avxeditSupport ? false, qt4 ? null
+}:
+
+let
+  inherit (stdenv.lib) enableFeature optional;
+in
 
 stdenv.mkDerivation rec {
-  name = "avxsynth-4.0-e153e672bf";
+  name = "avxsynth-${version}";
+  version = "2015-04-07";
 
-  src = fetchurl {
-    url = https://github.com/avxsynth/avxsynth/tarball/e153e672bf;
-    name = "${name}.tar.gz";
-    sha256 = "16l2ld8k1nfsms6jd9d9r4l247xxbncsak66w87icr20yzyhs14s";
+  src = fetchFromGitHub {
+    owner = "avxsynth";
+    repo = "avxsynth";
+    rev = "80dcb7ec8d314bc158130c92803308aa8e5e9242";
+    sha256 = "0kckggvgv68b0qjdi7ms8vi97b46dl63n60qr96d2w67lf2nk87z";
   };
 
-  buildInputs = [ ffmpeg autoconf automake libtool pkgconfig log4cpp pango cairo python
-    libjpeg ffms ]
-    ++ stdenv.lib.optional enableQt qt4;
+  configureFlags = [
+    "--enable-autocrop"
+    "--enable-framecapture"
+    "--enable-subtitle"
+    "--enable-ffms2"
+    (enableFeature avxeditSupport "avxedit")
+    "--with-jpeg=${libjpeg}/lib"
+  ];
 
-  preConfigure = "autoreconf -vfi";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  meta = {
-    homepage = https://github.com/avxsynth/avxsynth/wiki;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+  buildInputs = [ cairo ffmpeg ffms libjpeg log4cpp pango ]
+    ++ optional avxeditSupport qt4;
+
+  meta = with stdenv.lib; {
+    description = "A script system that allows advanced non-linear editing";
+    homepage = https://github.com/avxsynth/avxsynth;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ codyopel viric ];
+    platforms = platforms.linux;
   };
 }

From 7a794e17978d110bde3e9dec96e9e5de50e7831b Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sat, 9 May 2015 18:20:02 -0400
Subject: [PATCH 0581/1143] libsodium: refactor & remove duplicate

---
 .../haskell-modules/hackage-packages.nix      |  6 ++--
 .../libraries/libsodium/default.nix           | 11 ++++----
 pkgs/development/libraries/sodium/default.nix | 28 -------------------
 .../libraries/sodium/default.upstream         |  1 -
 pkgs/servers/nosql/hyperdex/default.nix       |  2 +-
 pkgs/servers/nosql/hyperdex/libmacaroons.nix  |  4 +--
 pkgs/top-level/all-packages.nix               |  2 --
 7 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/libraries/sodium/default.nix
 delete mode 100644 pkgs/development/libraries/sodium/default.upstream

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 56c6418afc6b..7c724523c5d7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -107016,7 +107016,7 @@ self: {
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
-     , QuickCheck, saltine, sodium, tasty, tasty-quickcheck
+     , QuickCheck, saltine, libsodium, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "saltine-quickcheck";
@@ -107028,12 +107028,12 @@ self: {
        testDepends = [
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
-       extraLibraries = [ sodium ];
+       extraLibraries = [ libsodium ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) sodium;};
+     }) { inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index dfe462c301ae..ea3bbbede2a8 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
-    description = "Version of NaCl with hardware tests at runtime, not build time";
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    description = "A modern and easy-to-use crypto library";
+    homepage = http://doc.libsodium.org/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ raskin viric ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix
deleted file mode 100644
index 7bdec155813b..000000000000
--- a/pkgs/development/libraries/sodium/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, fetchurl}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="sodium";
-    version="1.0.2";
-    name="${baseName}-${version}";
-    hash="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
-    url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.2.tar.gz";
-    sha256="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
-  };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  meta = {
-    inherit (s) version;
-    description = ''A cryptography library with simple API'';
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/sodium/default.upstream b/pkgs/development/libraries/sodium/default.upstream
deleted file mode 100644
index ccc02cd89785..000000000000
--- a/pkgs/development/libraries/sodium/default.upstream
+++ /dev/null
@@ -1 +0,0 @@
-url http://download.dnscrypt.org/libsodium/releases/
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix
index 7ed3661b87ff..659081281ef0 100644
--- a/pkgs/servers/nosql/hyperdex/default.nix
+++ b/pkgs/servers/nosql/hyperdex/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool,
-  python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
+  python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
   flex, pandoc, help2man, autoconf-archive, callPackage }:
 
 assert stdenv.isLinux;
diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix
index 2d709c5bbd1d..5d91a82a8ec6 100644
--- a/pkgs/servers/nosql/hyperdex/libmacaroons.nix
+++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, autoconf, automake, libtool, 
-  pkgconfig, sodium, python }:
+  pkgconfig, libsodium, python }:
 stdenv.mkDerivation rec {
   name = "libmacaroons-${version}";
   version = "HEAD";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip";
     sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik";
   };
-  buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ];
+  buildInputs = [ unzip autoconf automake libtool python libsodium pkgconfig ];
   preConfigure = "autoreconf -i";
   
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3269737a3b35..085477d2ed67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7649,8 +7649,6 @@ let
 
   socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
 
-  sodium = callPackage ../development/libraries/sodium {};
-
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
 
   soprano = callPackage ../development/libraries/soprano { };

From 72d3d6fbfc3d62064f2f70e9d40716e0a82b1e18 Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Sun, 10 May 2015 01:49:09 +0200
Subject: [PATCH 0582/1143] Update emulationstation 2.0.0.rc1 -> 2.0.1a

---
 pkgs/misc/emulators/emulationstation/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 6ff0a21135a2..529e5d3d0a22 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "emulationstation-${version}";
-  version = "2.0.0-rc1";
+  version = "2.0.1a";
 
   src = fetchFromGitHub {
     owner = "Aloshi";
     repo = "EmulationStation";
-    rev = "8739519e1591819cab85e1d2056804d20c197dac";
-    sha256 = "1psq5cqyq2yy1lqxrcj7pfp8szfmzhamxf3111l97w2h2zzcgvq9";
+    rev = "646bede3d9ec0acf0ae378415edac136774a66c5";
+    sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v";
   };
 
   buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ];
@@ -25,4 +25,4 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     license = stdenv.lib.licenses.mit;
   };
-}
\ No newline at end of file
+}

From eb1b8183bc4541b988ac647a5df8a6196f255dab Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 9 May 2015 17:41:40 -0700
Subject: [PATCH 0583/1143] screenfetch: 3.6.2 -> 2015-04-20

---
 pkgs/tools/misc/screenfetch/default.nix | 32 +++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 442922b78054..418afee8135f 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -1,21 +1,33 @@
-{ stdenv, fetchgit, xdpyinfo, xprop }:
+{ stdenv, fetchgit, makeWrapper
+, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop
+}:
 
-let
-  version = "3.6.2";
-in
 stdenv.mkDerivation {
-  name = "screenFetch-${version}";
-  pname = "screenfetch";
+  name = "screenFetch-2015-04-20";
 
   src = fetchgit {
     url = git://github.com/KittyKatt/screenFetch.git;
-    rev = "dec1cd6c2471defe4459967fbc8ae15b55714338";
-    sha256 = "138a7g0za5dq27jx7x8gqg7gjkgyq0017v0nbcg68ys7dqlxsdl3";
+    rev = "53e1c0cccacf648e846057938a68dda914f532a1";
+    sha256 = "1wyvy1sn7vnclwrzd32jqlq6iirjkhp2ak55brhkpp9rj1qxk3q6";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   installPhase = ''
-    install -Dm 0755 $pname-dev $out/bin/$pname
-    install -Dm 0644 $pname.1 $out/man/man1/$pname.1
+    install -Dm 0755 screenfetch-dev $out/bin/screenfetch
+    install -Dm 0644 screenfetch.1 $out/man/man1/screenfetch.1
+
+    # Fix all of the depedencies of screenfetch
+    patchShebangs $out/bin/screenfetch
+    wrapProgram "$out/bin/screenfetch" \
+      --set PATH : "" \
+      --prefix PATH : "${coreutils}/bin" \
+      --prefix PATH : "${gawk}/bin" \
+      --prefix PATH : "${procps}/bin" \
+      --prefix PATH : "${gnused}/bin" \
+      --prefix PATH : "${findutils}/bin" \
+      --prefix PATH : "${xdpyinfo}/bin" \
+      --prefix PATH : "${xprop}/bin" \
   '';
 
   meta = {

From 7142d479910c794eb4c44a2d0e3c47e1af851def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 May 2015 10:11:29 +0200
Subject: [PATCH 0584/1143] pythonPackages: a bunch of build fixes

---
 pkgs/top-level/python-packages.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31a1050e5532..404b4e2a5930 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2001,11 +2001,11 @@ let
   };
 
   coverage = buildPythonPackage rec {
-    name = "coverage-3.7";
+    name = "coverage-3.7.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz";
-      md5 = "055d82e6849d882ec6cf2ae1faca8e56";
+      sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni";
     };
 
     meta = {
@@ -2087,7 +2087,7 @@ let
 
     buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
                     self.iso8601 self.pyasn1 self.pytest ];
-    propagatedBuildInputs = [ self.six self.cffi  ];
+    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi; 
   };
 
   cryptography_vectors = buildPythonPackage rec {
@@ -3153,7 +3153,7 @@ let
       sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x";
     };
 
-    patchPhase = ''
+    prePatch = ''
       substituteInPlace setup.py \
         --replace "httplib2==0.8" "httplib2" \
         --replace "iso8601==0.1.4" "iso8601"
@@ -6663,6 +6663,8 @@ let
     buildInputs = with self; [ markupsafe nose mock ];
     propagatedBuildInputs = with self; [ markupsafe ];
 
+    doCheck = !isPyPy;  # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25
+
     meta = {
       description = "Super-fast templating language";
       homepage = http://www.makotemplates.org;
@@ -7277,8 +7279,8 @@ let
     };
   };
 
-  MySQL_python = buildPythonPackage {
-    name = "MySQL-python-1.2.3";
+  MySQL_python = buildPythonPackage rec {
+    name = "MySQL-python-1.2.5";
 
     disabled = isPy3k;
 
@@ -7286,13 +7288,13 @@ let
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = mirror://sourceforge/mysql-python/MySQL-python-1.2.3.tar.gz;
-      sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx";
+      url = "http://pypi.python.org/packages/source/M/MySQL-python/${name}.zip";
+      sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
     };
 
     buildInputs = with self; [ nose pkgs.openssl ];
 
-    propagatedBuildInputs = with self; [ pkgs.mysql pkgs.zlib ];
+    propagatedBuildInputs = with self; [ pkgs.mysql.lib pkgs.zlib ];
 
     meta = {
       description = "MySQL database binding for Python";
@@ -11072,11 +11074,11 @@ let
 
 
   scikitlearn = buildPythonPackage {
-    name = "scikit-learn-0.15.2";
+    name = "scikit-learn-0.16.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz";
-      md5 = "d9822ad0238e17b382a3c756ea94fe0d";
+      sha256 = "19jzmbi3j4ix8418i80ayl595dwyi4gy474kb2nc1v8kdwgqi2hs";
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];

From 90ee28091313d684177fae15f2ca18c83b84f3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 May 2015 11:39:42 +0200
Subject: [PATCH 0585/1143] subunit: split package into everything and python
 lib

---
 .../development/libraries/subunit/default.nix | 26 +++++++++++++++++++
 pkgs/servers/samba/4.x.nix                    |  4 +--
 pkgs/top-level/all-packages.nix               |  3 ++-
 pkgs/top-level/python-packages.nix            | 21 +++------------
 4 files changed, 34 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/libraries/subunit/default.nix

diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix
new file mode 100644
index 000000000000..fa007da7d9cc
--- /dev/null
+++ b/pkgs/development/libraries/subunit/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }:
+
+# NOTE: for subunit python library see pkgs/top-level/python-packages.nix
+
+stdenv.mkDerivation rec {
+  name = "subunit-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m";
+  };
+
+  buildInputs = [ pkgconfig check cppunit perl pythonPackages.wrapPython ];
+
+  propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ];
+
+  postFixup = "wrapPythonPrograms";
+
+  meta = with stdenv.lib; {
+    description = "A streaming protocol for test results";
+    homepage = https://launchpad.net/subunit;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 49b81794f044..c785d76ddce7 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
 , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent
-, ldb, popt, iniparser, pythonPackages, libbsd, nss_wrapper, socket_wrapper
+, ldb, popt, iniparser, subunit, libbsd, nss_wrapper, socket_wrapper
 , uid_wrapper, libarchive
 
 # source3/wscript optionals
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42
     docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser
-    pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper
+    subunit libbsd nss_wrapper socket_wrapper uid_wrapper
     libarchive
 
     kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f92344f60d6..004420ddfb72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8724,7 +8724,6 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    pythonPackages = python2Packages;
     kerberos = heimdal;
     libgcrypt = libgcrypt_1_6;
     cups = if stdenv.isDarwin then null else cups;
@@ -12147,6 +12146,8 @@ let
     pythonBindings = true;
   });
 
+  subunit = callPackage ../development/libraries/subunit { };
+
   surf = callPackage ../applications/misc/surf {
     webkit = webkitgtk2;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 404b4e2a5930..6a475fe3061c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12084,26 +12084,13 @@ let
     };
   };
 
-  subunit = stdenv.mkDerivation rec {
-    name = "subunit-${version}";
-    version = "1.0.0";
-
-    src = pkgs.fetchurl {
-      url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
-      sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m";
-    };
-
-    buildInputs = (with pkgs; [ pkgconfig check cppunit perl ]) ++ [ self.wrapPython ];
+  subunit = buildPythonPackage rec {
+    name = pkgs.subunit.name;
+    src = pkgs.subunit.src;
 
     propagatedBuildInputs = with self; [ testtools testscenarios ];
 
-    postFixup = "wrapPythonPrograms";
-
-    meta = {
-      description = "A streaming protocol for test results";
-      homepage = https://launchpad.net/subunit;
-      license = licenses.asl20;
-    };
+    meta = pkgs.subunit.meta;
   };
 
 

From 2a5679aeaa5cca9da182190f21414a42848136c2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 11:55:21 +0300
Subject: [PATCH 0586/1143] Update ZPAQ

---
 pkgs/tools/archivers/zpaq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 5f8a03e2d67b..c8f3a890487f 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="704";
+    version="705";
     name="${baseName}-${version}";
-    hash="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91";
-    url="http://mattmahoney.net/dc/zpaq704.zip";
-    sha256="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91";
+    hash="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
+    url="http://mattmahoney.net/dc/zpaq705.zip";
+    sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
   };
   buildInputs = [
     unzip

From f6e852554c6a9ed4e8ac58fd3bfe19c22a0ec259 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 11:57:13 +0300
Subject: [PATCH 0587/1143] Update Nginx

---
 pkgs/servers/http/nginx/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index b47b67792b82..d9d9857e33b8 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -10,10 +10,10 @@
 with stdenv.lib;
 
 let
-  version = "1.7.11";
+  version = "1.9.0";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "15cnlrhiqklqfzwfspkp0i6g04zdhc092dh593yqnqqf450dgnfs";
+    sha256 = "0j7j4yfz39jl433ci9wgxnz3y70pr93vxixw1s4dxv81nzas2ap1";
   };
 
   rtmp-ext = fetchFromGitHub {

From 1a407e931118d1ac44b4f0f52a40241e3f7a5890 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 11:59:01 +0300
Subject: [PATCH 0588/1143] Update SQLite

---
 pkgs/development/libraries/sqlite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index d161fab31b62..ee8aec79af15 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.9";
+  name = "sqlite-3.8.10.1";
 
   src = fetchurl {
-    url = "http://sqlite.org/2015/sqlite-autoconf-3080900.tar.gz";
-    sha1 = "p6vwiqalhk7ybcx5p8n322vhd3idww6v";
+    url = "http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz";
+    sha1 = "86bfed5752783fb24c051f3efac5972ce11023f0";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];

From 47011aa614829cfafa546bb9ccb83ff263c67d8b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:02:09 +0300
Subject: [PATCH 0589/1143] Update allegro5-unstable

---
 pkgs/development/libraries/allegro/5-unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
index 72589ad1065d..71a521e23096 100644
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -16,7 +16,7 @@ let
   sourceInfo = rec {
     baseName="allegro";
     folderSuffix = "-unstable";
-    version = "5.1.9";
+    version = "5.1.10";
     name="${baseName}-${version}";
     project="alleg";
     url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
@@ -26,7 +26,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = "0jn1x2l1kz0vi2fvabpk5sbn1cx4k6hwncmf2j8wnrhk8pm5af5h";
+    sha256 = "13dfs007pyh908bm1hg7hz71y8fr9fj51byh5w149h8dsq2dds78";
   };
 
   inherit (sourceInfo) name version;

From 9ebdf9f8a99a0a6a801cdf3c74946703cc13df8b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:03:28 +0300
Subject: [PATCH 0590/1143] Update Regina/REXX

---
 pkgs/development/interpreters/regina/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index e6c84edacaf2..596b748a4f61 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -12,7 +12,7 @@ let
   sourceInfo = rec {
     baseName="Regina-REXX";
     pname="regina-rexx";
-    version = "3.9.0";
+    version = "3.9.1";
     name="${baseName}-${version}";
     url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
   };
@@ -20,7 +20,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = "051w6i5xyjq7j9yrhw4r14kw105gpylby6z5x9v31f5g824n4mfr";
+    sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
   };
 
   inherit (sourceInfo) name version;

From c25495bcffcbdfe3514acb083311395e08be6f69 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:07:06 +0300
Subject: [PATCH 0591/1143] Update firejail

---
 pkgs/os-specific/linux/firejail/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 91c039c875bc..99c99cd36628 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.24";
+    version="0.9.26";
     name="${baseName}-${version}";
-    hash="15fz6hjxakjnsn505w3wlc6bqvf5pjwn8zfhp5aw9zq6vxr7f317";
-    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.24-rc1.tar.bz2";
-    sha256="15fz6hjxakjnsn505w3wlc6bqvf5pjwn8zfhp5aw9zq6vxr7f317";
+    hash="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
+    url="http://softlayer-ams.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.26-rc2.tar.bz2";
+    sha256="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
   };
   buildInputs = [
   ];

From b766d9697a769170539d6d6d3ebb52607450fb49 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:08:15 +0300
Subject: [PATCH 0592/1143] Update XDaliClock

---
 pkgs/tools/misc/xdaliclock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 7d731650288c..16a54c819464 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -12,7 +12,7 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="xdaliclock";
-    version = "2.41";
+    version = "2.43";
     name="${baseName}-${version}";
     project="${baseName}";
     url="http://www.jwz.org/${project}/${name}.tar.gz";
@@ -21,7 +21,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = "1crkjvza692irkqm9vwgn58m8ps93n0rxigm6pasgl5dnx3p6d1d";
+    sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
   };
 
   inherit (sourceInfo) name version;

From f7c5343c65206dd89a2a094dcfc4c51d5538d038 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:09:40 +0300
Subject: [PATCH 0593/1143] Update atanks

---
 pkgs/games/atanks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index edad4b4b456e..9ebfb724779d 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -11,11 +11,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="atanks";
-    version = "6.1";
+    version = "6.2";
     name="${baseName}-${version}";
     project="${baseName}";
     url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz";
-    sha256 = "1azs9amqkgs7qglx0vk9bg2fhn73lq89372scnfp45hinrh52vqi";
+    sha256 = "1s1lb87ind0y9d6hmfaf1b9wks8q3hd6w5n9dibq75rxqmcfvlpy";
   };
 in
 rec {

From d3160f6f44de12091e23f0071d7807fcf59db20c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:11:53 +0300
Subject: [PATCH 0594/1143] Update IPMIutil

---
 pkgs/tools/system/ipmiutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index c19b6007f018..4fd3cb0f4a48 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.5";
+  version = "2.9.6";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "1rnv72qfrijcm0kiy2lsbdckjxnxdma8sf8y6y6iypp75rcg007b";
+    sha256 = "068mfxaay91m5qqs0lb4jwvsbxb665n2hgcp0g1k62zvicyiyk48";
   };
 
   buildInputs = [ openssl ];

From d1d2a9856cc3b071f9397a5273fca9242562caf8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:13:16 +0300
Subject: [PATCH 0595/1143] Update luarocks

---
 pkgs/development/tools/misc/luarocks/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index dfd5c2994fd0..2296bc3a9890 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.2.1";
+    version="2.2.2";
     name="${baseName}-${version}";
-    hash="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi";
-    url="http://luarocks.org/releases/luarocks-2.2.1.tar.gz";
-    sha256="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi";
+    hash="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g";
+    url="http://luarocks.org/releases/luarocks-2.2.2.tar.gz";
+    sha256="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g";
   };
   buildInputs = [
     lua curl makeWrapper which

From fdd0a1f7f85ac0fa2d1d83e4d6ad417c697657d5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:15:56 +0300
Subject: [PATCH 0596/1143] Update CL-Launch

---
 pkgs/development/tools/misc/cl-launch/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index a6ea7ed766ee..755e8001e881 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.1.2";
+    version="4.1.3.1";
     name="${baseName}-${version}";
-    hash="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.2.tar.gz";
-    sha256="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90";
+    hash="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.1.tar.gz";
+    sha256="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z";
   };
   buildInputs = [
   ];
@@ -24,6 +24,10 @@ stdenv.mkDerivation {
     mkdir -p "$out/bin"
   '';
 
+  preBuild = ''
+    sed -e 's/\t\t@/\t\t/g' -i Makefile
+  '';
+
   meta = {
     inherit (s) version;
     description = ''Common Lisp launcher script'';

From 2fe8b040100f92fef9b5d014537ce7a072a7b253 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:16:33 +0300
Subject: [PATCH 0597/1143] Update badvpn

---
 pkgs/tools/networking/badvpn/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix
index e11d454154b6..22da8486a80b 100644
--- a/pkgs/tools/networking/badvpn/default.nix
+++ b/pkgs/tools/networking/badvpn/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="badvpn";
-    version="1.999.129";
+    version="1.999.130";
     name="${baseName}-${version}";
-    hash="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl";
-    url="https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz";
-    sha256="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl";
+    hash="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z";
+    url="https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz";
+    sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z";
   };
   buildInputs = [
     cmake openssl nss pkgconfig nspr

From 193f2c0e2167d1af3f9b6ecbf970eefe9409ca37 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:17:33 +0300
Subject: [PATCH 0598/1143] Update GlusterFS

---
 pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 768614673489..bfab9454d6df 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -4,11 +4,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.6.2";
+    version="3.6.3";
     name="${baseName}-${version}";
-    hash="1kz0kmj0apkhkmw1zy72bsx06b1ii6z8y3fq365cy5l3xnjibdaa";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.2/glusterfs-3.6.2.tar.gz";
-    sha256="1kz0kmj0apkhkmw1zy72bsx06b1ii6z8y3fq365cy5l3xnjibdaa";
+    hash="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.3/glusterfs-3.6.3.tar.gz";
+    sha256="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From ede1211cbca746efb943fc58219d1fda6b6d713c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:27:07 +0300
Subject: [PATCH 0599/1143] Update Wine unstable

---
 pkgs/misc/emulators/wine/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index a7a1e02da3b6..aac97fe05b8e 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.cc.cc.isGNU or false;
 
 let
-    version = "1.7.40";
+    version = "1.7.42";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "1dnasmw1rnlz7wk1bn0x1zmy3r78hgrn9y53z4vm8xjkllwyd0hd";
+      sha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss";
     };
 
     gecko = fetchurl {

From 666a5c5eb69791c2d5c78e22a2220d3b263742ce Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:31:53 +0300
Subject: [PATCH 0600/1143] Update LiquidWar

---
 pkgs/games/liquidwar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index cd7478d99c8d..3a3774bc1dd3 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -15,7 +15,7 @@ rec {
 
   src = a.fetchurl {
     url = "mirror://gnu/liquidwar6/${name}.tar.gz";
-    sha256 = "1q58liqm5cgp494yjj6rfc2xj5b4gm8r8yvi46jzwqll353mabwl";
+    sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn";
   };
 
   inherit buildInputs;
@@ -36,7 +36,7 @@ rec {
     platforms = with a.lib.platforms; 
       linux;
   homepage = "http://www.gnu.org/software/liquidwar6/";
-  version = "0.4.3681";
+  version = "0.6.3902";
   updateWalker=true;
   };
 }

From 47c2726363ea670773616c06fecd17c2b490e3aa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:45:23 +0300
Subject: [PATCH 0601/1143] Update SBCL

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index d76a59c8dec4..b9e3011194d8 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.10";
+  version = "1.2.11";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "11gn25knjk0zdyi3s6w0blcnrxjgyj4iifg5h07pv2r7hm83s92m";
+    sha256 = "0w1ymazyck5a8bjmsbnq1hps1n4824h3ajh849f1y09dwzd09al8";
   };
 
   buildInputs = [ which ]

From a54e796cffbf26214a5c7f1fa3f3204952f28b74 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:46:21 +0300
Subject: [PATCH 0602/1143] Explicitly pass -pthread flag to fix the build
 after some updates

---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index aeea290bdb28..320e161d3da8 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
     "--without-x"
   ];
 
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread"
+  '';
+
   # We need to build hcrypt for applications like samba
   postBuild = ''
     (cd lib/hcrypto; make)

From 90453cc5ca4f09447f570bb3f8cf7b48bdd39546 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 13:25:07 +0300
Subject: [PATCH 0603/1143] Update Wine staging to match Wine unstable

---
 pkgs/misc/emulators/wine/staging.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 2aa588592ac1..a6ff309b08e3 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, wine, perl, autoconf, utillinux
 , pulseaudio, libtxc_dxtn }:
 
-let version = "1.7.40";
+let version = "1.7.42";
     patch = fetchFromGitHub {
       owner = "wine-compholio";
       repo = "wine-staging";
       rev = "v${version}";
-      sha256 = "0l14yy6wbvbs2xrnn9z3a35lbnpl8ibkmc0vh983fimf9nxckpan";
+      sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17";
     };
 
 in assert (builtins.parseDrvName wine.name).version == version;

From bbcc0c0f07d931713091bed74ca5c496f8e20acd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 13:32:35 +0300
Subject: [PATCH 0604/1143] Update Pipelight to use wine-staging

---
 pkgs/tools/misc/pipelight/default.nix | 39 ++-------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index aa0be62ed64c..cb130c8e9178 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -1,44 +1,9 @@
-{ stdenv, fetchurl, fetchgit, autoconf, automake, wineUnstable, perl, xlibs
+{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs
   , gnupg, gcc48_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
   }:
 
 let
-  wine_patches_version = "1.7.38";
-  wine_hash = "1h3bsga9qzqkavf9wlv62ldl3a8mz7grr68nxv8vicmnglzfj7lq";
-
-  wine_patches = fetchgit {
-    url = "git://github.com/compholio/wine-compholio.git";
-    rev = "refs/tags/v${wine_patches_version}";
-    sha256 = "0lcagswy1lgqz6qlpf0ng7ksl2sbaqldrgnhf0n1278jj82rq80n";
-  };
-
-  wine_custom =
-    stdenv.lib.overrideDerivation wineUnstable (args: rec {
-      name = "wine-${wine_patches_version}";
-      version = "${wine_patches_version}";
-      src = null;
-      srcs = [
-	      (fetchurl {
-                url = "mirror://sourceforge/wine/${name}.tar.bz2";
-                sha256 = wine_hash;
-	      })
-	      wine_patches ];
-      sourceRoot = "./${name}";
-      buildInputs = args.buildInputs ++ [ 
-        autoconf perl utillinux automake attr 
-      ];
-      nativeBuildInputs = args.nativeBuildInputs ++ [ 
-        autoconf perl utillinux automake attr 
-      ];
-      postPatch = ''
-        export wineDir=$(pwd)
-        patchShebangs $wineDir/tools/
-        chmod u+w $wineDir/../${wine_patches.name}/debian/tools/
-        patchShebangs $wineDir/../${wine_patches.name}/debian/tools/
-        chmod -R +rwx ../${wine_patches.name}/
-        make -C ../${wine_patches.name}/patches DESTDIR=$wineDir install
-      '';
-    });
+  wine_custom = wineStaging;
 
   mozillaPluginPath = "/lib/mozilla/plugins";
 

From d6edaea4f76b7602dfd90449d7edf0b7f05bffb6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 13:30:45 -0700
Subject: [PATCH 0605/1143] cups: 1.7.5 -> 2.0.2

---
 pkgs/misc/cups/default.nix      | 25 ++++++++++++++++++++-----
 pkgs/top-level/all-packages.nix |  4 +++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index e62cfcff8327..d2170cfc332f 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb, acl, gmp }:
+, dbus, acl, gmp
+, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
+}:
 
-let version = "1.7.5"; in
+let version = "2.0.2"; in
 
+with stdenv.lib;
 stdenv.mkDerivation {
   name = "cups-${version}";
 
@@ -10,15 +13,27 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq";
+    sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5";
   };
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
     ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
 
   propagatedBuildInputs = [ openssl gmp ];
 
-  configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-systemd=\${out}/lib/systemd/system"
+    "--enable-raw-printing"
+    "--enable-threads"
+  ] ++ optionals stdenv.isLinux [
+    "--enable-dbus"
+    "--enable-pam"
+  ] ++ optional (libusb != null) "--enable-libusb"
+    ++ optional (gnutls != null) "--enable-ssl"
+    ++ optional (avahi != null) "--enable-avahi"
+    ++ optional (libpaper != null) "--enable-libpaper";
 
   installFlags =
     [ # Don't try to write in /var at build time.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 004420ddfb72..4ba211f9e59a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13942,7 +13942,9 @@ let
 
   beep = callPackage ../misc/beep { };
 
-  cups = callPackage ../misc/cups { libusb = libusb1; };
+  cups = callPackage ../misc/cups {
+    libusb = libusb1;
+  };
 
   cups_filters = callPackage ../misc/cups/filters.nix { };
 

From 0a090d80ac78ffac8c8992238f258c1c310d117d Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 28 Apr 2015 12:11:41 +0200
Subject: [PATCH 0606/1143] cups: Refactor meta attributes

---
 pkgs/misc/cups/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index d2170cfc332f..cd6b6b4d12d5 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
+    ++ optionals stdenv.isLinux [ pam dbus.libs acl ] ;
 
   propagatedBuildInputs = [ openssl gmp ];
 
@@ -61,10 +61,10 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    homepage = "http://www.cups.org/";
+    homepage = https://cups.org/;
     description = "A standards-based printing system for UNIX";
-    license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest
-    maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
+    maintainers = with maintainers; [ urkud simons jgeerds ];
+    platforms = platforms.linux;
   };
 }

From 5f5ba7dda06c6fc4024f362665a650c742d55e42 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 28 Apr 2015 12:42:53 +0200
Subject: [PATCH 0607/1143] cups: Add xdg_utils to build inputs

---
 pkgs/misc/cups/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index cd6b6b4d12d5..45b042960d2e 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, acl, gmp
+, dbus, acl, gmp, xdg_utils
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
-    ++ optionals stdenv.isLinux [ pam dbus.libs acl ] ;
+    ++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ;
 
   propagatedBuildInputs = [ openssl gmp ];
 

From 4ac95ab3282a5aa364c8c1e51b9637b38729a3a7 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 28 Apr 2015 20:37:34 +0200
Subject: [PATCH 0608/1143] cups: Use systemd files provided by CUPS

---
 nixos/modules/services/printing/cupsd.nix |  9 +++------
 pkgs/misc/cups/default.nix                | 13 +++++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index b573a356b351..a69a8aab86a3 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -183,10 +183,10 @@ in
     # gets loaded, and then cups cannot access the printers.
     boot.blacklistedKernelModules = [ "usblp" ];
 
-    systemd.services.cups =
-      { description = "CUPS Printing Daemon";
+    systemd.packages = [ cups ];
 
-        wantedBy = [ "multi-user.target" ];
+    systemd.services.cups =
+      { wantedBy = [ "multi-user.target" ];
         wants = [ "network.target" ];
         after = [ "network.target" ];
 
@@ -200,9 +200,6 @@ in
             mkdir -m 0755 -p ${cfg.tempDir}
           '';
 
-        serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd";
-
         restartTriggers =
           [ config.environment.etc."cups/cups-files.conf".source
             config.environment.etc."cups/cupsd.conf".source
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 45b042960d2e..10fd71a07541 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -58,6 +58,19 @@ stdenv.mkDerivation {
     ''
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint
+
+      # Rename systemd files provided by CUPS
+      for f in $out/lib/systemd/system/*; do
+        substituteInPlace "$f" \
+          --replace "org.cups.cupsd" "cups" \
+          --replace "org.cups." ""
+
+        if [[ "$f" =~ .*cupsd\..* ]]; then
+          mv "$f" "''${f/org\.cups\.cupsd/cups}"
+        else
+          mv "$f" "''${f/org\.cups\./}"
+        fi
+      done
     '';
 
   meta = {

From 3710dbec0556b407915f133e480600e9882c1c3a Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 28 Apr 2015 20:40:03 +0200
Subject: [PATCH 0609/1143] cups: Remove deprecated config options from
 cupsd.conf

---
 nixos/modules/services/printing/cupsd.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index a69a8aab86a3..2515c1c16681 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -260,8 +260,6 @@ in
         SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
 
         Browsing On
-        BrowseOrder allow,deny
-        BrowseAllow @LOCAL
 
         DefaultAuthType Basic
 

From 55a6469ba36e840e2388673318b51bc77cb3f7ba Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sat, 2 May 2015 15:33:22 +0200
Subject: [PATCH 0610/1143] cups: Fix printing tests

It seems like there's an upstream bug in the "lpstat" command. We need
to specify the server's port.

Further information: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711327

[root@client:~]# lpstat -H
/var/run/cups/cups.sock

[root@client:~]# lpstat -h server -H
/var/run/cups/cups.sock:631

[root@client:~]# CUPS_SERVER=server lpstat -H
server:631

[root@client:~]# lpstat -h server:631 -H
server:631
---
 nixos/tests/printing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index ba10f23582d7..65d573e690b5 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -48,7 +48,7 @@ import ./make-test.nix ({pkgs, ... }: {
 
       # Do some status checks.
       $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die;
-      $client->succeed("lpstat -h server -a") =~ /DeskjetLocal accepting requests/ or die;
+      $client->succeed("lpstat -h server:631 -a") =~ /DeskjetLocal accepting requests/ or die;
       $client->succeed("cupsdisable DeskjetRemote");
       $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die;
       $client->succeed("cupsenable DeskjetRemote");

From 2cc8d156532aa776c53307375acafb80a4a3cfd3 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 4 May 2015 22:32:35 +0200
Subject: [PATCH 0611/1143] cups: Add defaultShared, browsing and webInterace
 config option

---
 nixos/modules/services/printing/cupsd.nix | 30 ++++++++++++++++++++++-
 nixos/tests/printing.nix                  |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 2515c1c16681..fd9589883edc 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -72,6 +72,30 @@ in
         '';
       };
 
+      defaultShared = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Specifies whether local printers are shared by default.
+        '';
+      };
+
+      browsing = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Specifies whether shared printers are advertised.
+        '';
+      };
+
+      webInterface = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Specifies whether the web interface is enabled.
+        '';
+      };
+
       cupsdConf = mkOption {
         type = types.lines;
         default = "";
@@ -259,7 +283,11 @@ in
 
         SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
 
-        Browsing On
+        DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
+
+        Browsing ${if cfg.browsing then "Yes" else "No"}
+
+        WebInterface ${if cfg.webInterface then "Yes" else "No"}
 
         DefaultAuthType Basic
 
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 65d573e690b5..708ff5391570 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -9,6 +9,7 @@ import ./make-test.nix ({pkgs, ... }: {
       { config, pkgs, ... }:
       { services.printing.enable = true;
         services.printing.listenAddresses = [ "*:631" ];
+        services.printing.defaultShared = true;
         services.printing.extraConf =
           ''
             <Location />

From 116006702bac0b79d8804817f798415a38cd7f53 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 4 May 2015 22:51:24 +0200
Subject: [PATCH 0612/1143] cups: Add changelog for the upcoming NixOS release

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 6b2cf55bb8d3..c4691aa663f4 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -49,6 +49,19 @@ was accordingly renamed to <literal>bomi</literal>
     </para>
 </listitem>
 
+<listitem>
+  <para>
+	The CUPS printing service has been updated to version <literal>2.0.2</literal>.
+	Furthermore its systemd service has been renamed to <literal>cups.service</literal>.
+  </para>
+  <para>
+	Local printers are no longer shared or advertised by default. This behavior
+	can be changed by enabling <literal>services.printing.defaultShared</literal>
+	or <literal>services.printing.browsing</literal> respectively.
+  </para>
+</listitem>
+
+
 </itemizedlist>
 </para>
 

From 48e65cec4ecd6bef08233460cf5ffedb023cc7c6 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 10 May 2015 00:04:59 +0200
Subject: [PATCH 0613/1143] cups: Rename "browsing" config option to
 "advertise"

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 2 +-
 nixos/modules/services/printing/cupsd.nix      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index c4691aa663f4..f1e652a53bb3 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -57,7 +57,7 @@ was accordingly renamed to <literal>bomi</literal>
   <para>
 	Local printers are no longer shared or advertised by default. This behavior
 	can be changed by enabling <literal>services.printing.defaultShared</literal>
-	or <literal>services.printing.browsing</literal> respectively.
+	or <literal>services.printing.advertise</literal> respectively.
   </para>
 </listitem>
 
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index fd9589883edc..d7f87413e6c7 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -80,7 +80,7 @@ in
         '';
       };
 
-      browsing = mkOption {
+      advertise = mkOption {
         type = types.bool;
         default = false;
         description = ''
@@ -285,7 +285,7 @@ in
 
         DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
 
-        Browsing ${if cfg.browsing then "Yes" else "No"}
+        Browsing ${if cfg.advertise then "Yes" else "No"}
 
         WebInterface ${if cfg.webInterface then "Yes" else "No"}
 

From f550eb7fdea5dd4e3183ce92c4ae993a3352ac48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 May 2015 12:26:53 +0200
Subject: [PATCH 0614/1143] docker: fix build

---
 pkgs/applications/virtualization/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 240973044d1e..905830381451 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   buildPhase = ''
-    patchShebangs ./project
+    patchShebangs .
     export AUTO_GOPATH=1
     export DOCKER_GITCOMMIT="03nzhikx"
     ./hack/make.sh dynbinary

From caeaddcf181293aad70fb1c6ec58f7eba0093263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 10 May 2015 10:59:29 +0000
Subject: [PATCH 0615/1143] Enabling NEON for armv7l. Also use a common
 platform for armv7.

I added some comments about our decision for fpu flags. It's about the boards
we have in mind to support. NVidia Tegra2 is out, because it lacks neon.
---
 pkgs/top-level/platforms.nix | 50 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 47d7d5993f1c..4a6dc5aacf6a 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -214,12 +214,9 @@ rec {
     };
   };
 
-  raspberrypi2 = {
+  raspberrypi2 = armv7l-hf-multiplatform // {
     name = "raspberrypi2";
-    kernelMajor = "3.14";
-    kernelHeadersBaseConfig = "multi_v7_defconfig";
     kernelBaseConfig = "bcm2709_defconfig";
-    kernelArch = "arm";
     kernelDTB = true;
     kernelAutoModules = false;
     kernelExtraConfig =
@@ -294,16 +291,6 @@ rec {
       '';
     kernelTarget = "zImage";
     uboot = null;
-    gcc = {
-      # For gcc 4.8, the best for rpi2 would be:
-      #   cpu = "cortex-a7";
-      #   fpu = "neon-vfpv4";
-      # But we prefer compatibility with the beaglebone, so both
-      # can run the same built store paths.
-      arch = "armv7-a";
-      fpu = "vfpv3-d16";
-      float = "hard";
-    };
   };
 
   guruplug = sheevaplug // {
@@ -467,38 +454,47 @@ rec {
     gcc.arch = "loongson2f";
   };
   
-  beaglebone = {
+  beaglebone = armv7l-hf-multiplatform // {
     name = "beaglebone";
-    kernelMajor = "2.6";
-    kernelHeadersBaseConfig = "multi_v7_defconfig";
     kernelBaseConfig = "omap2plus_defconfig";
-    kernelArch = "arm";
     kernelAutoModules = false;
     kernelExtraConfig = ""; # TBD kernel config
     kernelTarget = "zImage";
     uboot = null;
-    gcc = {
-      arch = "armv7-a";
-      fpu = "vfpv3-d16";
-      float = "hard";
-    };
   };
 
   armv7l-hf-multiplatform = {
     name = "armv7l-hf-multiplatform";
-    kernelMajor = "2.6";
+    kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.
     kernelHeadersBaseConfig = "multi_v7_defconfig";
     kernelBaseConfig = "multi_v7_defconfig";
     kernelArch = "arm";
+    kernelDTB = true;
     kernelAutoModules = false;
     kernelExtraConfig = "";
-    kernelTarget = "zImage";
-    kernelDTB = true;
     uboot = null;
+    kernelTarget = "zImage";
     gcc = {
+      # Some table about fpu flags:
+      # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png
+      # Cortex-A5: -mfpu=neon-fp16
+      # Cortex-A7 (rpi2): -mfpu=neon-vfpv4
+      # Cortex-A8 (beaglebone): -mfpu=neon
+      # Cortex-A9: -mfpu=neon-fp16
+      # Cortex-A15: -mfpu=neon-vfpv4
+
+      # More about FPU:
+       #https://wiki.debian.org/ArmHardFloatPort/VfpComparison
+
+      # We try to be compatible with beaglebone by now
       arch = "armv7-a";
-      fpu = "vfpv3-d16";
+      fpu = "neon";
       float = "hard";
+
+      # For Raspberry Pi the 2 the best would be:
+      #   cpu = "cortex-a7";
+      #   fpu = "neon-vfpv4";
     };
   };
+
 }

From 86290712d22e7b41c24ad06206e5346af68b733e Mon Sep 17 00:00:00 2001
From: Dario Bertini <dario.bertini@nccgroup.com>
Date: Wed, 6 May 2015 07:50:52 +0100
Subject: [PATCH 0616/1143] Enable old pythons' wide builds

---
 pkgs/development/interpreters/python/2.6/default.nix | 2 +-
 pkgs/development/interpreters/python/2.7/default.nix | 2 +-
 pkgs/development/interpreters/python/3.2/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 9bf161ffc1aa..ffc4c5d2e1fa 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -63,7 +63,7 @@ let
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    configureFlags = "--enable-shared --with-threads --enable-unicode";
+    configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
 
     NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
 
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 8b24fe004631..b8b25c576c59 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -79,7 +79,7 @@ let
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    configureFlags = "--enable-shared --with-threads --enable-unicode";
+    configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
 
     NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
     DETERMINISTIC_BUILD = 1;
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index 2645b5033440..f4103662316e 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     done
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
-    configureFlagsArray=( --enable-shared --with-threads
+    configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode
                           CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
                           LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"

From 235cf187cc736e007f78cff0f52b2b49cfd5322a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 7 May 2015 08:05:22 -0400
Subject: [PATCH 0617/1143] Fix calibre PDF handling

In c0d5cd0ff90cac2e04f6b436991baa4c4471150f, the binaries for poppler
were carved off into a separate package, and calibre has had broken pdf
support since.  This changes all dependencies on poppler to
poppler_utils, which fixes this support, much as was done for
cups_filter in 394562655ff09ef490eca8b14fe02c393e9ac70e.
---
 pkgs/applications/misc/calibre/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 13738cdafe58..670d7667e1b9 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler, pkgconfig, libpng
+{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig ];
 
   buildInputs =
-    [ python pyqt5 sip_4_16 poppler libpng imagemagick libjpeg
+    [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
       fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     export HOME=$TMPDIR/fakehome
-    export POPPLER_INC_DIR=${poppler}/include/poppler
-    export POPPLER_LIB_DIR=${poppler}/lib
+    export POPPLER_INC_DIR=${poppler_utils}/include/poppler
+    export POPPLER_LIB_DIR=${poppler_utils}/lib
     export MAGICK_INC=${imagemagick}/include/ImageMagick
     export MAGICK_LIB=${imagemagick}/lib
     export FC_INC_DIR=${fontconfig}/include/fontconfig
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
                      --prefix LD_LIBRARY_PATH : ${unrar}/lib \
-                     --prefix PATH : ${poppler}/bin
+                     --prefix PATH : ${poppler_utils}/bin
     done
   '';
 

From 6a51742e4bc13494de1cf04cc4ea781b7ee82903 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Fri, 8 May 2015 13:07:31 +0200
Subject: [PATCH 0618/1143] add x42-plugins: a collection of LV2 plugins by
 Robin Gareus

---
 .../audio/x42-plugins/default.nix             | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/audio/x42-plugins/default.nix

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
new file mode 100644
index 000000000000..aabb6308c143
--- /dev/null
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, jack2, mesa_glu, pkgconfig
+, libltc, libsndfile, libsamplerate
+, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
+
+stdenv.mkDerivation rec {
+  version = "2014-11-01";
+  name = "x42-plugins-${version}";
+
+  src = fetchurl {
+    url = "http://gareus.org/misc/x42-plugins/x42-plugins-20141101.tar.xz";
+    sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk";
+  };
+
+  buildInputs = [ mesa_glu ftgl freefont_ttf jack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
+
+  makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
+
+  # remove check for zita-convolver in /usr/
+  patchPhase = ''
+    sed -i "38,42d" convoLV2/Makefile
+  '';
+
+  meta = with stdenv.lib;
+    { description = "Collection of LV2 plugins by Robin Gareus";
+      homepage = https://github.com/x42/x42-plugins;
+      maintainers = with maintainers; [ magnetophon ];
+      license = licenses.gpl2;
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c2a6bc834bb..783f96aa42b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12636,6 +12636,8 @@ let
 
   x2vnc = callPackage ../tools/X11/x2vnc { };
 
+  x42-plugins = callPackage ../applications/audio/x42-plugins { };
+
   xaos = builderDefsPackage (import ../applications/graphics/xaos) {
     inherit (xlibs) libXt libX11 libXext xextproto xproto;
     inherit gsl aalib zlib intltool gettext perl;

From 861e5e757363d83cf39f046eb832d637e9755208 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 06:08:46 -0700
Subject: [PATCH 0619/1143] gnutls: Remove potentially insecure 3.2

---
 pkgs/development/libraries/gnutls/3.2.nix | 10 ----------
 pkgs/top-level/all-packages.nix           |  7 -------
 2 files changed, 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/3.2.nix

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
deleted file mode 100644
index e46b1dfd8e66..000000000000
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "3.2.21";
-
-  src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-${version}.tar.lz";
-    sha256 = "1xydzlwmf0frxvr26yw0ily5vwkdvf90m53fix61bi5gx4xd2m7m";
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 783f96aa42b2..a8555c1e01e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6070,11 +6070,6 @@ let
 
   gnutls = gnutls34;
 
-  gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
-    guileBindings = config.gnutls.guile or false;
-    nettle = nettle27;
-  };
-
   gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
     guileBindings = config.gnutls.guile or false;
     nettle = nettle27;
@@ -6084,8 +6079,6 @@ let
     guileBindings = config.gnutls.guile or false;
   };
 
-  gnutls32_with_guile = lowPrio (gnutls32.override { guileBindings = true; });
-
   gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; });
 
   gnutls34_with_guile = lowPrio (gnutls34.override { guileBindings = true; });

From 247bce6eb0607c63d8108b1513f98bb5a6c5e5cd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 06:14:35 -0700
Subject: [PATCH 0620/1143] nss: 3.18.1 -> 3.19

---
 pkgs/development/libraries/nss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d91a905f7ba1..5b1675584866 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.18.1";
+  version = "3.19";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_1_RTM/src/${name}.tar.gz";
-    sha256 = "10d005ca1b143a8b77032a169c595d06cf42d16d54809558ea30f1ffe73fef70";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/${name}.tar.gz";
+    sha256 = "989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From 27d4e762a029a693621f1edfa13d8337fb86ed18 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 8 May 2015 11:02:01 -0400
Subject: [PATCH 0621/1143] Add wpa_supplicant p2p patch.

wpa_supplicant 2.4 appears to have a serious bug that makes impossible
to use wifi for some number of people.

(See https://bbs.archlinux.org/viewtopic.php?id=196584 for an example)

It was resolved in a patch for the to-be-released 2.5 which it seemed
worth it to cherry-pick here.
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index f6142bd630f6..c709880af2dc 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, openssl, pkgconfig, libnl
+{ stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl
 , dbus_libs ? null, readline ? null, pcsclite ? null
 }:
 
@@ -79,6 +79,11 @@ stdenv.mkDerivation rec {
   patches = [
     ./0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
     ./build-fix.patch
+    (fetchpatch {
+      name = "p2p-fix.patch";
+      url = "http://w1.fi/cgit/hostap/patch/?id=8a78e227df1ead19be8e12a4108e448887e64d6f";
+      sha256 = "1k2mcq1jv8xzi8061ixcz6j56n4i8wbq0vxcvml204q1syy2ika0";
+    })
   ];
 
   postInstall = ''

From 4e04fdce860303b97fe0def4b51b2d6687ca6910 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 6 May 2015 15:56:02 -0400
Subject: [PATCH 0622/1143] ghcjs: properly wrap binaries in environment

This also:

 1  Builds Setup.hs with ghcjs, which (among other things) defines
    __GHCJS__ and ghcjs_HOST_OS during pre-processing.
 2  Fixes ghc-paths to point at ghcjs and use NIX_GHCJS_* env-vars.
 3  Boots ghcjs into $prefix/lib/$compiler.
---
 pkgs/development/compilers/ghcjs/default.nix  | 17 ++---
 pkgs/development/compilers/ghcjs/ghcjs.patch  | 20 ++++--
 .../haskell-modules/configuration-ghcjs.nix   |  4 ++
 .../haskell-modules/generic-builder.nix       | 18 ++---
 .../haskell-modules/ghc-paths-nix-ghcjs.patch | 65 +++++++++++++++++++
 .../haskell-modules/with-packages-wrapper.nix | 47 +++++++-------
 6 files changed, 125 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 193082187881..24a361724aed 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -39,10 +39,6 @@
 }:
 let
   version = "0.1.0";
-  ghcArch = if pkgs.stdenv.system == "i686-linux"
-    then "i386-linux"
-    else pkgs.stdenv.system;
-  libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
     rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch
@@ -84,14 +80,19 @@ in mkDerivation (rec {
   ];
   patches = [ ./ghcjs.patch ];
   postPatch = ''
-    substituteInPlace Setup.hs --replace "/usr/bin/env" "${coreutils}/bin/env"
-    substituteInPlace src/Compiler/Info.hs --replace "@PREFIX@" "$out"
+    substituteInPlace Setup.hs \
+      --replace "/usr/bin/env" "${coreutils}/bin/env"
+
+    substituteInPlace src/Compiler/Info.hs \
+      --replace "@PREFIX@" "$out"          \
+      --replace "@VERSION@" "${version}"
+
     substituteInPlace src-bin/Boot.hs \
       --replace "@PREFIX@" "$out"     \
       --replace "@CC@"     "${stdenv.cc}/bin/cc"
   '';
   preBuild = ''
-    local topDir=$out/${libDir}
+    local topDir=$out/lib/ghcjs-${version}
     mkdir -p $topDir
 
     cp -r ${ghcjsBoot} $topDir/ghcjs-boot
@@ -116,9 +117,9 @@ in mkDerivation (rec {
         --with-gmp-libraries ${gmp}/lib
   '';
   passthru = {
-    inherit libDir;
     isGhcjs = true;
     nativeGhc = ghc;
+    inherit nodejs;
   };
 
   homepage = "https://github.com/ghcjs/ghcjs";
diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch
index 618656f787ce..751f114ba43a 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs.patch
+++ b/pkgs/development/compilers/ghcjs/ghcjs.patch
@@ -60,15 +60,21 @@ index 3c68dcf..64f3cf7 100644
             , "--haddock-html"
  -- workaround for hoogle support being broken in haddock for GHC 7.10RC1
 diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..5d09c86 100644
+index 33a401f..79833c5 100644
 --- a/src/Compiler/Info.hs
 +++ b/src/Compiler/Info.hs
-@@ -49,7 +49,7 @@ compilerInfo nativeToo dflags = do
+@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
+
  -- | the directory to use if started without -B flag
  getDefaultTopDir :: IO FilePath
- getDefaultTopDir = do
+-getDefaultTopDir = do
 -  appdir <- getAppUserDataDirectory "ghcjs"
-+  let appdir = "@PREFIX@/share/ghcjs"
-   return (appdir </> subdir </> "ghcjs")
-       where
-         targetARCH = arch
+-  return (appdir </> subdir </> "ghcjs")
+-      where
+-        targetARCH = arch
+-        targetOS   = os
+-        subdir     = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
++getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
+
+ getDefaultLibDir :: IO FilePath
+ getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index e880f7e713e8..aef6e6c9190c 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -99,4 +99,8 @@ self: super: {
     buildDepends = [ self.base self.mtl self.text self.ghcjs-base ];
   });
 
+  ghc-paths = overrideCabal super.ghc-paths (drv: {
+    patches = [ ./ghc-paths-nix-ghcjs.patch ];
+  });
+
 }
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 158940348190..28fcf45bfa20 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -114,7 +114,7 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupBuilder = if isGhcjs then "${ghc.nativeGhc}/bin/ghc" else "ghc";
+  setupCommand = if isGhcjs then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js" else "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
 
 in
@@ -186,7 +186,7 @@ stdenv.mkDerivation ({
     done
 
     echo setupCompileFlags: $setupCompileFlags
-    ${setupBuilder} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
+    ${ghcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
 
     runHook postCompileBuildDriver
   '';
@@ -197,7 +197,7 @@ stdenv.mkDerivation ({
     unset GHC_PACKAGE_PATH      # Cabal complains if this variable is set during configure.
 
     echo configureFlags: $configureFlags
-    ./Setup configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
+    ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
     if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
       echo >&2 "*** abort because of serious configure-time warning from Cabal"
       exit 1
@@ -210,20 +210,20 @@ stdenv.mkDerivation ({
 
   buildPhase = ''
     runHook preBuild
-    ./Setup build ${buildTarget}
+    ${setupCommand} build ${buildTarget}
     runHook postBuild
   '';
 
   checkPhase = ''
     runHook preCheck
-    ./Setup test ${testTarget}
+    ${setupCommand} test ${testTarget}
     runHook postCheck
   '';
 
   haddockPhase = ''
     runHook preHaddock
     ${optionalString (doHaddock && hasActiveLibrary) ''
-      ./Setup haddock --html \
+      ${setupCommand} haddock --html \
         ${optionalString doHoogle "--hoogle"} \
         ${optionalString (hasActiveLibrary && hyperlinkSource) "--hyperlink-source"}
     ''}
@@ -233,12 +233,12 @@ stdenv.mkDerivation ({
   installPhase = ''
     runHook preInstall
 
-    ${if !hasActiveLibrary then "./Setup install" else ''
-      ./Setup copy
+    ${if !hasActiveLibrary then "${setupCommand} install" else ''
+      ${setupCommand} copy
       local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
       local packageConfFile="$packageConfDir/${pname}-${version}.conf"
       mkdir -p "$packageConfDir"
-      ./Setup register --gen-pkg-config=$packageConfFile
+      ${setupCommand} register --gen-pkg-config=$packageConfFile
       local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
diff --git a/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch
new file mode 100644
index 000000000000..26ea0eaa5a8b
--- /dev/null
+++ b/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch
@@ -0,0 +1,65 @@
+diff --git a/GHC/Paths.hs b/GHC/Paths.hs
+index c87565d..88b3db4 100644
+--- a/GHC/Paths.hs
++++ b/GHC/Paths.hs
+@@ -1,13 +1,35 @@
+ {-# LANGUAGE CPP #-}
++{-# LANGUAGE ScopedTypeVariables #-}
+ 
+ module GHC.Paths (
+         ghc, ghc_pkg, libdir, docdir
+   ) where
+ 
++import Control.Exception as E
++import Data.Maybe
++import System.Environment
++import System.IO.Unsafe
++
++-- Yes, there's lookupEnv now, but we want to be compatible
++-- with older GHCs.
++checkEnv :: String -> IO (Maybe String)
++checkEnv var = E.catch (fmap Just (getEnv var))
++                       (\ (e :: IOException) -> return Nothing)
++
++nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath
++nixLibdir = unsafePerformIO (checkEnv "NIX_GHCJS_LIBDIR")
++nixDocdir = unsafePerformIO (checkEnv "NIX_GHCJS_DOCDIR")
++nixGhc    = unsafePerformIO (checkEnv "NIX_GHCJS")
++nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCJSPKG")
++{-# NOINLINE nixLibdir #-}
++{-# NOINLINE nixDocdir #-}
++{-# NOINLINE nixGhc    #-}
++{-# NOINLINE nixGhcPkg #-}
++
+ libdir, docdir, ghc, ghc_pkg :: FilePath
+ 
+-libdir  = GHC_PATHS_LIBDIR
+-docdir  = GHC_PATHS_DOCDIR
++libdir  = fromMaybe GHC_PATHS_LIBDIR  nixLibdir
++docdir  = fromMaybe GHC_PATHS_DOCDIR  nixDocdir
+ 
+-ghc     = GHC_PATHS_GHC
+-ghc_pkg = GHC_PATHS_GHC_PKG
++ghc     = fromMaybe GHC_PATHS_GHC     nixGhc
++ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg
+diff --git a/Setup.hs b/Setup.hs
+index fad5026..1651650 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -27,13 +27,13 @@ main = defaultMainWithHooks simpleUserHooks {
+     defaultPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
+     defaultPostConf args flags pkgdescr lbi = do
+       libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags))
+-                     ghcProgram (withPrograms lbi) ["--print-libdir"]
++                     ghcjsProgram (withPrograms lbi) ["--print-libdir"]
+       let libdir = reverse $ dropWhile isSpace $ reverse libdir_
+ 
+-          ghc_pkg = case lookupProgram ghcPkgProgram (withPrograms lbi) of
++          ghc_pkg = case lookupProgram ghcjsPkgProgram (withPrograms lbi) of
+                           Just p  -> programPath p
+                           Nothing -> error "ghc-pkg was not found"
+-          ghc     = case lookupProgram ghcProgram (withPrograms lbi) of
++          ghc     = case lookupProgram ghcjsProgram (withPrograms lbi) of
+                           Just p  -> programPath p
+                           Nothing -> error "ghc was not found"
+ 
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 136566f65f0b..4362bacb9ee7 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -32,6 +32,7 @@ let
   ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version;
   packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf";
   ghcCommand    = if isGhcjs then "ghcjs" else "ghc";
+  ghcCommandCaps= lib.toUpper ghcCommand;
   libDir        = "$out/lib/${ghcCommand}-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
@@ -51,10 +52,6 @@ buildEnv {
   postBuild = ''
     . ${makeWrapper}/nix-support/setup-hook
 
-    ${lib.optionalString isGhcjs ''
-    cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/
-    ''}
-
     if test -L "$out/bin"; then
       binTarget="$(readlink -f "$out/bin")"
       rm "$out/bin"
@@ -62,30 +59,36 @@ buildEnv {
       chmod u+w "$out/bin"
     fi
 
-    for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
-      rm -f $out/bin/$prg
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg             \
-        --add-flags '"-B$NIX_GHC_LIBDIR"'                   \
-        --set "NIX_GHC"        "$out/bin/${ghcCommand}"     \
-        --set "NIX_GHCPKG"     "$out/bin/${ghcCommand}-pkg" \
-        --set "NIX_GHC_DOCDIR" "${docDir}"                  \
-        --set "NIX_GHC_LIBDIR" "${libDir}"                  \
-        ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
+    for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
+      if [[ -x "${ghc}/bin/$prg" ]]; then
+        rm -f $out/bin/$prg
+        makeWrapper ${ghc}/bin/$prg $out/bin/$prg                           \
+          --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'                   \
+          --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
+          --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
+          --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
+          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"                  \
+          ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
+      fi
     done
 
     for prg in runghc runhaskell; do
-      rm -f $out/bin/$prg
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg             \
-        --add-flags "-f $out/bin/ghc"                       \
-        --set "NIX_GHC"        "$out/bin/${ghcCommand}"     \
-        --set "NIX_GHCPKG"     "$out/bin/${ghcCommand}-pkg" \
-        --set "NIX_GHC_DOCDIR" "${docDir}"                  \
-        --set "NIX_GHC_LIBDIR" "${libDir}"
+      if [[ -x "${ghc}/bin/$prg" ]]; then
+        rm -f $out/bin/$prg
+        makeWrapper ${ghc}/bin/$prg $out/bin/$prg                           \
+          --add-flags "-f $out/bin/${ghcCommand}"                           \
+          --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
+          --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
+          --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
+          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
+      fi
     done
 
     for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do
-      rm -f $out/bin/$prg
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
+      if [[ -x "${ghc}/bin/$prg" ]]; then
+        rm -f $out/bin/$prg
+        makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
+      fi
     done
 
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}

From d1d5f587b29650857d31674ba2fbf48711160ca3 Mon Sep 17 00:00:00 2001
From: Stewart Mackenzie <setori88@gmail.com>
Date: Fri, 8 May 2015 23:31:26 +0800
Subject: [PATCH 0623/1143] hackrf: new package

---
 pkgs/applications/misc/hackrf/default.nix | 28 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/hackrf/default.nix

diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
new file mode 100644
index 000000000000..806392f717fc
--- /dev/null
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, cmake, pkgconfig, libusb }:
+
+stdenv.mkDerivation rec {
+  name = "hackrf-${version}";
+  version = "2014.08.1";
+
+  src = fetchgit {
+    url = "git://github.com/mossmann/hackrf";
+    rev = "refs/tags/v${version}";
+    sha256 = "1f3mmzyn6qqbl02h6dkz0zybppihqgpdxjgqmkb1pn3i0d98ydb3";
+  };
+
+  buildInputs = [
+    cmake pkgconfig libusb
+  ];
+  
+  preConfigure = ''
+    cd host  
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "An open source SDR platform";
+    homepage = http://greatscottgadgets.com/hackrf/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.sjmackenzie ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8555c1e01e9..6cb8448cdcbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11124,6 +11124,8 @@ let
 
   guvcview = callPackage ../os-specific/linux/guvcview { };
 
+  hackrf = callPackage ../applications/misc/hackrf { };
+
   hello = callPackage ../applications/misc/hello/ex-2 { };
 
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };

From f6f615662589d869dad158da5bd1f75fc5824dbd Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 8 May 2015 11:53:28 -0400
Subject: [PATCH 0624/1143] ghcjs: set NIX_GHCJS_* variables in env.

---
 pkgs/development/haskell-modules/generic-builder.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 28fcf45bfa20..d441b824842d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -51,7 +51,7 @@ assert editedCabalFile != null -> revision != null;
 let
 
   inherit (stdenv.lib) optional optionals optionalString versionOlder
-                       concatStringsSep enableFeature optionalAttrs;
+                       concatStringsSep enableFeature optionalAttrs toUpper;
 
   isGhcjs = ghc.isGhcjs or false;
 
@@ -116,6 +116,7 @@ let
 
   setupCommand = if isGhcjs then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js" else "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
+  ghcCommandCaps = toUpper ghcCommand;
 
 in
 stdenv.mkDerivation ({
@@ -264,10 +265,10 @@ stdenv.mkDerivation ({
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''
-        export NIX_GHC="${ghcEnv}/bin/${ghcCommand}"
-        export NIX_GHCPKG="${ghcEnv}/bin/${ghcCommand}-pkg"
-        export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html"
-        export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
+        export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
+        export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
+        export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
+        export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
       '';
     };
 

From ec1e3050fea0edfde4027a39e442a99f33455565 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 8 May 2015 11:35:00 -0500
Subject: [PATCH 0625/1143] coqPackages.QuickChick: New expression

---
 .../coq-modules/QuickChick/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/coq-modules/QuickChick/default.nix

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
new file mode 100644
index 000000000000..9141bfd24d11
--- /dev/null
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchgit, coq, coqPackages}:
+
+stdenv.mkDerivation rec {
+
+  name = "coq-QuickChick-${coq.coq-version}-${version}";
+  version = "21f50a02";
+
+  src = fetchgit {
+    url = git://github.com/QuickChick/QuickChick.git;
+    rev = "21f50a02e752f6d99d5bfefefcd2ad45df5e778a";
+    sha256 = "15hsirm443cr098hksfcg3nbjm9mdnmxzpz61qq7ap7lglabl7pw";
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 coqPackages.ssreflect ];
+  propagatedBuildInputs = [ coq ];
+
+  enableParallelBuilding = true;
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = git://github.com/QuickChick/QuickChick.git;
+    description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cb8448cdcbd..afba4d072406 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13695,6 +13695,8 @@ let
 
     paco = callPackage ../development/coq-modules/paco {};
 
+    QuickChick = callPackage ../development/coq-modules/QuickChick {};
+
     ssreflect = callPackage ../development/coq-modules/ssreflect {};
 
     tlc = callPackage ../development/coq-modules/tlc {};

From 9130b8d877adb0b35ef7e5543a1bc9adaed583a9 Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Fri, 8 May 2015 16:50:48 -0300
Subject: [PATCH 0626/1143] Haskell: explicit reflex-dom dependencies for GHCJS

When building `reflex-dom` for GHCJS, the following dependencies are not
needed and will fail to build: glib, gtk3, webkitgtk3,
webkitgtk3-javascriptcore. Now we explicitely need the dependencies
needed for building for GHCJS.
---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index aef6e6c9190c..e2a3739a496b 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -103,4 +103,12 @@ self: super: {
     patches = [ ./ghc-paths-nix-ghcjs.patch ];
   });
 
+  reflex-dom = overrideCabal super.reflex-dom (drv: {
+    buildDepends = [
+      self.aeson self.base self.bytestring self.containers self.data-default
+      self.dependent-map self.dependent-sum self.ghcjs-dom self.lens self.mtl
+      self.ref-tf self.reflex self.safe self.semigroups self.text self.these
+      self.time self.transformers
+    ];
+  });
 }

From 927faba5c7e131afcabc092582573e26eb4ebe21 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Fri, 8 May 2015 14:15:49 -0700
Subject: [PATCH 0627/1143] emacs-packages: add swiper

---
 pkgs/top-level/emacs-packages.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index bc557a675975..2e8d68414a43 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1091,6 +1091,19 @@ let self = _self // overrides;
     };
   };
 
+  swiper = melpaBuild rec {
+    pname   = "swiper";
+    version = "0.4.0";
+    src = fetchFromGitHub {
+      owner  = "abo-abo";
+      repo   = pname;
+      rev    = version;
+      sha256 = "1skgw84j5a59ds86bpdcaf3c8iq2m0fz720chjh91ixhkavvdd87";
+    };
+    fileSpecs = [ "swiper.el" "ivy.el" "colir.el" ];
+    meta = { license = gpl3Plus; };
+  };
+
   switch-window = melpaBuild rec {
     pname   = "switch-window";
     version = "20140919";

From b9b8fec6aeef8eb23822dbde5bfe1c7b0c82e296 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 00:11:20 +0200
Subject: [PATCH 0628/1143] Add phc-intel: undervolt Intel CPUs under Linux

---
 pkgs/os-specific/linux/phc-intel/default.nix | 47 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/os-specific/linux/phc-intel/default.nix

diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
new file mode 100644
index 000000000000..1b4ee3218eb0
--- /dev/null
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, kernel, which }:
+
+assert stdenv.isLinux;
+# don't bother with older versions, though some would probably work:
+assert stdenv.lib.versionAtLeast kernel.version "4.0";
+
+let version = "0.4.0-rev17"; in
+stdenv.mkDerivation rec {
+  name = "linux-phc-intel-${version}-${kernel.version}";
+
+  src = fetchurl {
+    sha256 = "1fdfpghnsa5s98lisd2sn0vplrq0n54l0pkyyzkyb77z4fa6bs4p";
+    url = "http://www.linux-phc.org/forum/download/file.php?id=166";
+    name = "phc-intel-pack-rev17.tar.bz2";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Undervolting kernel driver for Intel processors";
+    longDescription = ''
+      PHC is a Linux kernel patch to undervolt processors. This can divide the
+      power consumption of the CPU by two or more, increasing battery life
+      while noticably reducing fan noise. This driver works only on supported
+      Intel architectures.
+    '';
+    homepage = http://www.linux-phc.org/;
+    downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267";
+    license = with licenses; gpl2;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ which ];
+
+  makeFlags = "KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build DESTDIR=$(out)";
+
+  configurePhase = ''
+    echo make $makeFlags brave
+  '';
+
+  enableParallelBuilding = false;
+
+  installPhase = ''
+    install -m 755   -d $out/lib/modules/${kernel.version}/extra/
+    install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afba4d072406..bf605bb9da1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9420,6 +9420,8 @@ let
 
     perf = callPackage ../os-specific/linux/kernel/perf.nix { };
 
+    phc-intel = callPackage ../os-specific/linux/phc-intel { };
+
     prl-tools = callPackage ../os-specific/linux/prl-tools { };
 
     psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };

From f904376904f98c6f822e0e378655a1841ae761e9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 01:23:30 +0200
Subject: [PATCH 0629/1143] Add alloy 4.2_2015-02-22: relational modeller

---
 pkgs/development/tools/alloy/builder.sh  |  16 ++++++++
 pkgs/development/tools/alloy/default.nix |  48 +++++++++++++++++++++++
 pkgs/development/tools/alloy/icon.png    | Bin 0 -> 17154 bytes
 pkgs/top-level/all-packages.nix          |   2 +
 4 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/tools/alloy/builder.sh
 create mode 100644 pkgs/development/tools/alloy/default.nix
 create mode 100644 pkgs/development/tools/alloy/icon.png

diff --git a/pkgs/development/tools/alloy/builder.sh b/pkgs/development/tools/alloy/builder.sh
new file mode 100644
index 000000000000..e737fc5eec73
--- /dev/null
+++ b/pkgs/development/tools/alloy/builder.sh
@@ -0,0 +1,16 @@
+source $stdenv/setup
+
+jar=${src##*/}
+jar=$out/share/alloy/${jar#*-}
+
+install -Dm644 $src $jar
+
+cat << EOF > alloy
+#! $SHELL
+exec $jre/bin/java -jar $jar
+EOF
+
+install -Dm755 alloy $out/bin/alloy
+
+install -Dm644 $icon $out/share/pixmaps/alloy.png
+cp -r ${desktopItem}/share/applications $out/share
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
new file mode 100644
index 000000000000..d25ccc1a7a5e
--- /dev/null
+++ b/pkgs/development/tools/alloy/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, jre, makeDesktopItem }:
+
+let version = "4.2_2015-02-22"; in
+stdenv.mkDerivation rec {
+  name = "alloy-${version}";
+
+  src = fetchurl {
+    sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28";
+    url = "http://alloy.mit.edu/alloy/downloads/alloy${version}.jar";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Language & tool for relational models";
+    longDescription = ''
+      Alloy is a language for describing structures and a tool for exploring
+      them. An Alloy model is a collection of constraints that describes a set
+      of structures, e.g. all the possible security configurations of a web
+      application, or all the possible topologies of a switching network. The
+      Alloy Analyzer is a solver that takes the constraints of a model and
+      finds structures that satisfy them. Structures are displayed graphically,
+      and their appearance can be customized for the domain at hand.
+    '';
+    homepage = http://alloy.mit.edu/;
+    downloadPage = http://alloy.mit.edu/alloy/download.html;
+    license = with licenses; mit;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  desktopItem = makeDesktopItem rec {
+    name = "alloy";
+    exec = name;
+    icon = name;
+    desktopName = "Alloy";
+    genericName = "Relational modelling tool";
+    comment = meta.description;
+    categories = "Development;IDE;Education;";
+  };
+
+
+  buildInputs = [ jre ];
+  inherit jre;
+
+  icon = ./icon.png;
+
+  builder = ./builder.sh;
+}
diff --git a/pkgs/development/tools/alloy/icon.png b/pkgs/development/tools/alloy/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a76bd94804749d7ffaedac3db83850ff1a78d546
GIT binary patch
literal 17154
zcmeAS@N?(olHy`uVBq!ia0y~yU{nBM4rT@h2IbheO$-do3;{kNuK)l4XJBApWMpJw
zVq#`yW?^ArWo6~$<YZ@OXJcdI=jZ3(;Na%wE-fu>YilzwFqkuEj+vPm7Z(=~509Ff
zT31(>iHS*HU!R4Ag^-YtqM{-%FR!Yqs=T~BA0MBNj*ftUfT*aby1KfYoSc@HmWGCg
zu&}V0nAoIAlf=cvZ{EDAtgNh}qN1s(DJUqYq@-kJWhE&oDIy{wBO{}rpy1)*p{=bw
zb?Q_J2?;4Fsgoy9zJ2?4=FFMW($WqN4ojCVm6erUxNzaxwQFr`Y!VU@o<4nQXJ>cu
z;>ELP&%S*5^5MgWd-m*cadFwXbElr3p02L$)vH&xZr$qS<aFS`0eyY_jT<+9`SQic
z$S5c%=<eOSM~)nEb93|Y@i8_w{`T!#SXfwOWMooOlE1%yNJxm6m)D;^e?EQs6c-m4
z5D>6x)vAVuhKh=cn3$M?f`XKkl#GmwoSdAjtgN)Ov=1LXL`6k4H#d8Fdj9zFqo$_j
z*RNmy{{73#%PTG}uB)qCv0_D4RTaZ17|;;N>O7qX$^a!ne!&b5&u*kKFfecyctjR6
zFmMZjFyp1Wb$=Kb6c{{R978JRyq(+bEERqE!%5#oZmp?P)tWS#T9p)Jmo~dBjR**E
zJkZv}krj~C^Y8WjGdEo?9{FS!Z?bdex#*^QqGk1SjMHz;Jp6Fa$=SrA{Vx0F<>#$i
z_wManJFVUOf1A}$e^Y0-!JJES@!6zVb0pr>c(7fM|6!-+7ypC#pSxv0!~6-R+OjWy
zet2gXS@%$SXGHvtiiiC_;#01QKDge0*==g|qUCSryZ`v}`BH;Lcir`8-u1`+M=p!e
zu8UKZ_l;_+vbOsZ=McBhUhLmywu?XKWM9;OA{XUq<(^)B`}cirkC=xy*T>XPQv0<k
zGX4wK&V{m3FIzajy<n(fbyym+ROQ)voj;bJb$DuyJUuk+;xp-&f4_YEyV&a2Q^ru6
zox*zgXZEj%tbN&EHSf)#KSJhx-_nJqE&R8xzu#}eb%v59-%|Kir{0sOfBN}~cm0jx
z6t15km*u>y__$sie$4zrltI=?WYUYejb*$YOzS>epZ;%;y6a>4-*KniU76D3zc1(a
z=UEWWu;uRC$$`f*c2&fz>t4QhW9!QMIeXUkU)?X8rn2hc$;NftzVDa6aP4<z;Z6pD
z+*-?(HSLKdqR}&IbKP{)j=gi7D}C#G0NdpU#%vd~8BXnaEh%9bImPp2kXrbPsjr=^
z4Z2$DudgbztBpMysru{T!p3jQ*)M1_SXE!YcG1@0k;F9B7c)11c^Jql(d%0s9y9Ca
z=js1G%s;VehtRE0DX9w@tr9qY|7}?F{$72?>lczUBuu5hOgU0K?O##IW3vjDOP`!7
zzD`|!JM-_4(=!b<OL>$Q*e9?=-v9gg{O|sT74=CcG^c9@9a}oLWM9DADc&|4Yi~)<
z_`hc6-5Oi3;NHnGA&WNjlzl6ysrY|H>AzLOgW!An|9|)xT%DhOf5&a54XLVf*=fHw
z6!c7JNwU5#-?3BdSz7q{|Nm>Y-Ti#^^2*D5ub%zvUeSKK^{qy(wA|aA`nJA0RfiTq
zg;y_LzLk+IJyrT@$%z*?Pb}Hr;+Hl3shg~!@9*_t&#o)a`f%k{GXIaoF>mtToozFn
zc>eY2)1ObDKK=Ujy7Ld&?<e+2dsSz|Jo&HV@P5Y3Z!1?X-@iHkie-+#4UJnbI@7)t
zw>zvnv{z4Ync;7f`_&tSqRU*xu01;xY$3Dn-Mf2|k>a~|?|%M#_3GuDADa3e*=o06
z!eYm#s=sym6IZWpZgxoct9U%^t&mvd#Cw09Gb(l13ApW@D?Irzho|UyucmpubJxDD
zF)S(h^LA2n9)pI0s+@D!hcn^qjZ=>vjmVidH9}|Gj!i-q3`#Zsw$%FQh;g?%$!UKO
z`Y-m+<l6zEl`BOO1%qd+|Gs$s$7Y6&Jq$ta)&B1f967P#aLz@p5Y8?(pTO)i?YY01
z7OXnH^^~f3gz3KNUQ4U?p4+YdVRhBYFMBWU&@0|K)oX28OzP7eVZXx~_pjkTx^ez_
zqqEx|UGoXclzaL1moVdAWvSUbDomLh_}eB$=1o|cTj=E?-FW$!WP{i9Pw{-+3!NUm
zV3C)ex7(GYZ}DO$jgUW+&Og8O^6%QUJQLT}{yD9**{$y1%fBvJ3>r&Ilou>NyWl=!
zM~`xvLhY|BSMT|1^jh6{mMGzyHC4$kHM3L2;_*k9#nNG~Z}L@s3OgA8W=^E}qKm5M
zeJ*57xv+(!by+5-(zd*(T~|-H{aqfo>-^TkJ`;W&W;9haoMN@>Ry9NLbCv=rbIZGS
zJFhI5ta(*yw$enOpb)L8XE&Yq_ej~iQp8nta%YRv(r~U6tF<9njuWM}ST#mDUOf0B
zOit(9&-r)zS9diWnEL-RqhZg98fLE!PWRyd4$mLB+~=4eRnDNjIlm%8?|6E?=#NM}
z`EN7t<}E*IXlG?*Vrj`_WNE_EaJEQS;>`o8aQ(OTmz`dlH(1@W`}43N&th*nn{d&g
zk1Whw0blufN|@Gm?%TI-Vl~tLSF<H#-pIUo|Ni~kw`?z8Htuh<e<dR$X>^jc(9=YA
zmFcs(BKy<s?UKr>&JObbRU6*%sxz=IDezI$m54Cd@{aT0I_4+BUeVG!=lpSHpCwTH
z_%M@J##!0g=s%VVWRru^X1(|~opIO0FY^>zS8%LhZ;fGi7xJ0^-sUhdxA2fH>H8~m
z?)?5(_pJZZ|11aHCG*tRUT0q1pBrmC*EucnQpL2@MfIC59p~ckc>d!$^RNBf%`cpz
z!{4_!uUZty&04o-{#2)bXC$sq%s5`pbHVx;$KM|-YZET1FEE&C^ewqhA>c%`s?LJt
zhaKx>6}C9s-u3JEoVJ#Wv#c{)>UYd<4&Y<RJpO-n!wHFBH!fbb)H`k&_T$^)wJ%&9
zI2o>de);(F$4&c%F0ju?c1}yZwprBb+rI+)e*t;TVG_rz|1WNsAh6=4-S$4NCZS&!
zXFR*lRONQ$Yd*`D^S`(C<wYEK;C$L&VSnW8vS>!zl}-QL99FdKvOcbBW;ILOB<=m(
zb4MdI#Fyq?y7*s5p{K5%Df;4aH}8(!W$(+%jw<%tjQ)4K;nprTwX;nk882_uM*oVD
z@N&--WvB`}@^w86i`R<P^+z-pr)}%H`ulwOxnzdKM?dYkIotxiw|Gjor@qN}dhcz{
zG=>Qt`v3izopfzGPTz?9_hO&omS470;!gcr&bT+3q1QWCD0^MOeF3Xng9f$#mm3Ns
zrCrmN!v*eXZ=R_oetF)SsvrCLIOg;w+EyhmtuCFo`RSv5>Z}d(rknqn&G>W5&7~zP
zYR=E+FYb=!S&;se_kWl}?%Ti0b_OlqoTty)z1_I{B!kpXe`crh(jz*HZK97xJ$d(b
zO=8x(pkHpk<_9-?pU&juykh(Lm5bAijy|sbz1QSEpQOXy^BRS<->)<M>S);F$y0IU
z-90|fv%yTCjfGd&t1CP@&p+!x&>c&gUE<r1U-?rndtvwYHJWP;=GE@Z_uAdZZ+vjc
zoBez*n3*<ds9dW_{FQfCd1b7}sXOP-*!=(5@Gg~ee%+#S-{7j4yvaFFxE}4En)X^}
zLFazv3-<r-ESc)r_Or5wV*%r}>pR3tV(orT;yhMb&#u76KYLO7rw`?u&h|5A$xD1~
zT)(mQ{&j_wl`LQO9C;<r+i}!+m6?aGyL3_&n@W<`;`NUIUt}K<2ylA-$D5({z@sc3
zaV1lSx3RMG3sh`dJ3gAKNv8KyZ}-Uf_@42|l8M&0cK_b^V$J&e4V(9G-@W&BaP;lq
z4v!G28s0}eq3^7c8P~)HWXuKm;9x_9o$cRdWoN$0mtU6j@PGB?VNjNF>-RG`c3q<I
zw8xEq>x_>v8U5vLxL5zfW7~llXNp!HOxSRu*6;X*6Av89`FR!}cN65i&8#3>wfguv
z>+Qt>Cn8nrc@-+o98|o#Aw+%hNtUdoXA(ZnJf{BJs+#elyV%9%h6~ZI>2LD>Hce-}
z@>86FiS@4Wh36kUzfM|vC~#Jvc1Tv^!K5-C+r|#g+x|0nUaXb7s~hq~Sz&e~>zAI}
zKNd5VmX!OQ+N`)wdrzfZ`CCub5Ur_E?1wvCuY4<Z(NSnulsi+ibNY{m;ziOd7dDr5
z|2^37FOjkLbl;8CjDzucQ?@<goE@dc>LNUM?_1ei`FgjG!sqHTmv$7Y$6M?uw!YjN
zGbKz?=Dg0kAD<a{Po{gZe?I;Bo{&D9*~cnFkE6m`jfpobZ<#v?{A~&7ww|y5Bl`Wb
zLww2|VV?j0HsqB~h*`ZT!)mtaGUnCGR~NHCI;`W^vUtV*<*Rw$?yYXw5U?@5;Lak0
zsN&X_)(yu5Cj5KPa3$twP0-w+sUATgCL&sg|7N{PkJMTx<Z-s|<iUI2<_lz%K6n0h
zt%5!H&d2KvziwQ-XK!fvuB|n0!L{2W+bXgS?`udrxPU|8q)wiM%iH;N3P+alwTE(e
z+?f^qS4(FJ<AkR>S<~uG6gEZf+Pi;qe#V_lxosX>neJ%2roZBz^P%LTb1>J|gSK2P
z9pR<&0oF{5%(pr3xz->Me21}tZC<$C7k1{Pn$Snxygc7}d3tBhv0Ewj{ch_1AJ5C4
zC+*Rnw8QJQ^xN#dh1LzXX6?Khu-8;!OQgHQtNpAO?B9Gl`!4Q|ADi9G=yjpDCQV7X
z&HYNn=Iz3qO%Ds5UeszYOxx2eGIMH_dCr=93{}^r-LsbpFqU&MQ+qUT_rG(U3k$cq
zF82>ux#GLFg3uw8$ur&6-w7u%_|D>7@cLTE&8$v_N&R-4%O3W#l?WH)zT1)gUQS|8
z$qZd1>8W!wUGywAiwdS*{^@oy>Y7srFUL&QFG0Ib<gR_Ja#erPe%1@VC+6LhZQZyz
zFXF0<U9*(Q#lDKX;9%vJHny3%XMCN`)U^n1cVKyEv)y!wMQLxtlzLu;9S5U5Bx+e*
zm}?j3t#okgR5_kKXXoRPpwt5X(z5MBNvB2bMjVe^vqfx|-&E({^K=-h(!QRa&)?B_
zB&f>2r0o5JC7BVcz0zKuHb{Th(zSZ&InOWW?Dyoe9&tOvm(8tPZhV?a>ep%p)Av(d
zuN>u3N>!S=>Rh3TrPjhNGu+s!^3E<ybKqb|<$K>EayTYO?#pzhq&C5gy*I+FL%w}T
z(BCvSL+_h>gwv6WZ{HffEVz7Q?gS-f4}(ADOuHmq=I`2N?Ji?C*KXbt{pEJ~nju#A
ze;ir6XdkP|WXm<%#15Q^Wm<6MKKF`DyG^=l6J`a5q?XodF1$V~apU`>s{+DWGYv8g
zpH*FvDpvg(%#iVE=GWl=b`Eb8vVONbtl93m(j)El>PI3wQWvbKwlmzRCpLkZ@o9gQ
zc8kY*aV`ei&2_KhIXZkf4w@XkdPXT&<>jv;jm+RE8D-z@S!)G~Bqkl4`)BTgFNe&7
z?4SN#&1iU;Cw%ic!O1ZR-RZ5bTX)P`vGAMOqUEy{kE*nZM0>AL+M1NsHtFxvhFM)J
zJT)fHp1WFg3Y&R^^BIAv^J2G;_g>rW_;Nq@1^%<l@BU2x-g03{@Tx7IVHOXS_xikR
z*gB6z!tmKCrc<I(*=Owjzh?Yf-2L?Vr*)Y+=A4ZuSKPW@pd`(-Hh)Uw>x-qouiUlN
z^L<d(du_$u*E?o#23dVB?vD9y;NWYOqu$3~{(tY<g;|PMtSz#xt@`@&M2PFslvqBt
z0RQJZSQ%S?tZi7upmCC^%B}GDeAbSy+w-bsZSakKS7N+V*Cd%^>-X=y{HMQ|WtYwm
zI{9STzB(S!MX%2@+}bhwT7uSxlJn~x{wZeoTkQN?IkWikCDG;GQ-7O=JgHJMR@tDL
z;qSHZI&XjSlgG-;8CMofa4BxRw&mC-PNqw<e((Ap+c2xduI|XTv>Wj&w{QRNRwcP}
z<-%V-7Fyoj;Lx^0u~exv?Cg=NJ0>mMd4ge*@`4Ky-ciZ_o)kR4&%Q$PeP;G+h1^|M
z?4Flbdb-`{3tsY4B-pu?`6ct}nG&W?F0b5l|L}Z&5vFeD`G1wUIkvamKlxk0p>XZ)
z^}i!|cm3mVFu%CL--oSP#o*4fWjpTrEx+6%8ggSpP6kW%imF@I9)|a-m$~QE&p)ZO
zAYo(F?XZ_;oSAJcgl7u6xNmnpB<8Sj@nK`J3!Ak*{9|x9tHE#fLPp|<j6~VN%da{z
zcyofyxu*qq>K1JletjlE;bDq07pJ-;pJHk5<ij5?W$=7Wnj3fApHWw?*3$UjYzEWP
z^S=Lsa;#Q{Xiv@B%jL4(E2wIzgF=ATRHm6e3Kt}w*e%b@*py$eKweEc@}XVnL4iqJ
z8UOW;i-u+wa+E4AXjGh&RL;0oVL{8oo1q8xOJDG<VUK>0w05rJvM|j_$G!+|d$Tmt
z|Ej!3^`ws}rz*-KJiI4yO$}N$nQ!*pB@+E1<y#iclWS5Gk%<;Kr@>MbapIPJ?V)(S
z+XnBIb6#$0c{{a-Q<w3}bLlSK#AoOB1x}uM@_@Q)=KDMMUf$X>q1saHSwYzGOEd3$
zpW3=|@6Oe8H1aOL{^~XNn$epwA3vUw!#TfLnpw9@2vR)xyg5a&S@8-}$9H9g=lhug
zj5l4rYHQH=Qg3dMsQELeqpPMH#)$oS^m0a;ZkV2!bk2>ErL#^y?+I~A4CdZa^!<lN
zdcO6B7q8@GjIu)uCz{R*I@#vAPp*0|?_|HUwI_cvvn(<ABh6r%F0T1SR=q-K%2fGz
zzus)GzHZ9>`CHbp#~)L+H7U)=VlC8JR2X}6`Siny|Lt_WR2wJyy_1>MaPbnWvB(<N
znYvq5_lQiCanG-={(hdJ^1o?A-s02D!p=U~FPAcX=lb%}>)hkWQxVOJQVuN(;!atx
z;Oc>M5@%g(=lxyHeeP(|%E0^@!=%m$)iSTo+^VipSG&uWy2!{h)boWw)BVfL*|*O#
zdj8{Wh}yz$T@!R$JNRM51BV%cfhSwM)`uV7we;$wXKQa95xZvUYBSSTJC;@K`o6d~
zZQ`pVXJ2}7IFrqU?SSg#mD=%^^Vc#x+FbVCjPYu8759(-F%IRg%5OZp+;{l6iO$rO
zDnH+Uex6v}c1}%{YpT>Vt>zHBH^qy4Il>m*RNpR<pz|`fYl%mZn##>5H{A>tUgKN5
zj_r6#!HHY}34V*>$}cBAgg2)+Ux{^Caw0U*fcKltdafT+`+9dspH93Kz2;lul+EsY
z#6FtyHH%DhI-St@Y3AHzh0D(B?~tAByqItDWpkbBucl;0+n5SV9p2|q{Vl_3?ct(x
z2OIq=v_C|yt;<(yOzc1S?_cM9hFNK=8~!Ueq`!}Hwlt5kxM)|q*l%ap0{^rh#ji#A
zmu^@&CF6;O>|$r-7nQsl`n1df)oiEuM)WQ}X0=&%V|HHYHW%$LMk_08ijtU2_lC{?
zaK*?|Xx=-P(~fz&`A@{1a8)&XIiDrtd91h2^IBp4n@gEaMXuf!c<|BHPv14BHY~lZ
zU_RTey&##tV(Eh-Q)gKp=F~MN%*C8-b94pI>pjhKDrCG?x>Sr!aL1O#e%-gGY1P;V
zb1YeQ^5DUJALSWhH#ErbGw#x4&TxAc_xQtNKD8;IJ2{^U?BBxNetySIg$=6Bri$z5
zEl)fdl=al^_zRBLnWd!$YbV$n<u3DdekT`TT01!+UG0Ll(8(z&v*oqDH*C6NYiGi8
zIB?nWQ^neHAIy&>rv2l{DDSy4F?r%^e}=m~?{EMA|L$)$^R55woli}iEpLSHUcI-z
z;F8L5Ck_65$2pvrR;sM=IP7<4<)!;~n;Cn}%$79%@8>kyHnExM!YY~4UrUUZdI^db
z9^U*&)@$jMUk9$1|Jw4ZWy0puTVFm|ws4|n`%`v@N74@VVmr;6_sY*=S|87Nq3k-x
zil_@3M|S^lnJ2Wh|K<X}OIxnmZQW#=ykzqRxyDqRlYH_<B~fZmeR)NNg&FtrwoPPg
zoA~jC)*hKf1z%>)^^>0wyz@lsgrG@^sZ|^kp1M2eGM?S$KmUf`y<GWwwH1X9KOMK<
zd{g$wY?-6WmDal79mx^x>YJZ1KYy5I@@is7ghNVvBEPWk?;BhzBux)(5M*=PP$Q*n
z^;quryP~#D59P#-rFd3eI8{DT?)tXC<zLtx4$WuI+Gp(+o1kXgRQ~bb<!)xKnH~x5
zT(88xzbGj$H@@sWacYH@AfI~Cj^tRQOP*7GUKRK8`%c<;?a+(Ed%yN~%5HtU+u}@6
zqgLY6>@Y34n6poc7^ZlH?w8JG>aMQ2qZxXK`ODPf47+Z(e@=V)!{thh{kKc+TU57f
z-~BxJdN;F`p@ztVm{(Je>}+X&FC*h*H|0q1p--ng42#8hy@EI^oFX26oWb0{vi*35
z?k4B2>OCGimG%i*?6`X3-VB$8LK(blGvg-Objk*2HJ^W2ApMTn>iNTq0l%yp^2D#{
z6&*W%;=&6Hu31uZ@BY>2>ySQ^vPN#PMyEA<!-WS&Iu54?cuq5F;ZJ{8RBbQJduhj6
z&NJ!VtZ&ngYZ%{@sJ**O@{ih{^Vc37Jhaqfs`+xKLRN`Ds~?(ymgR37{=O)i73r{j
z>XYYR)fUV)dO7>zWxu4L#cJCtBl?VT%4WN<tH=GaDD^wC^rFj$oI9uIs4JTG`ZSbg
zEc7<Kp8o8?lvv(*RiYcNFPg%2SARxd)XLU~?#Vlz828w1$(g&`)U?`K-ErniQOCF=
z`+b=emj<m5cw(|UW~xtK*>4GlrO^&P3vHP@WE@XNeAQLlomlY4phT0Q`Ch_D%VY5}
z7kX=YKdcs7Da>n?`}p|(8o3h}MP{6Ev|4v*HS3G+pL2R5TO5CFv);`enZ9&2du_<t
zC`GT&%E@vwPE^JG&R$m)l)x}|?QZ^#mCDyo&u+NE*<HbQknQWkhn5e7m#a7?o8>W2
zzo1n9w_>%v((KI>o87GR<lP<GZt0|#=h+Ex9I-QQmx+7h`lj_vSfI`S%6ZcrS4XK$
zPGq>n%giakxX4=C;AVpKF`?rJe+6ndRqy82;yb11sH(d3y=Fk=;iAY#b_#2h*&TA!
z!_$5k2%c3uu$Vc2hF+1r_n(IF8xNKRSIvBLl#z8AKi{9^ucrf!&A2ejU0v-#SleU8
zhoyCgH;df8p<kE%;mD!ai;Wi-KI7iJ|BJ#~!>V&VoKxrJl$1TvyVv;p_tV)ezdAja
zPO3Q1-}EuXNN)LxH|76&qSU8GvwUZKYsxs$s;FXfnn%_onJ1}>dtPq*@GPeyzxZp(
z*VnT?=&Y<LbTFOTaW2SncAVR`z%srG%&!tOZa?sJ2okZG>eTAV!y4OrcJ8^ex7Y9Y
zU%y`WdXJ~jPX_)YEWvO8)m4TGZf(B)Zkkr^yrSCK%Q}`+Jd~=L<GQNnzlgwY;l?Fb
zJJzw=i|1(B*8KBI$vU69e!5ieuDe@z?hg3A$6|qS^VziKjSHCb8Gd~E{z$OSVh(Fg
z7W-!FtffMxi=z~8YAu^?b5ZM>S@x-yYv)Ye^pZ7!#mZg%z0xjTt*?(cmwJWXIlMN1
zX;4K`NTTBm7TMLIYVR4X_VO*YeG|qj(<eXUvbC?o#U+b&etNE%|MP^FU}~_YVD8$V
z>FKT9{PwrjPn>W#VL}rxd!E(HSq&HMf1L7pbJD-4=)=_12tNCWB~f#ImTgm=^dYov
z-uM2Wu@60%m(2=V;H)k5f8XA2pDoe+EpNPJN~I4R-fuV8e({GKUC*_XSb3L)22a}E
zu<Vq1g9np*_a%3?vtn~^xlNDN`~PLB`pSR<;;Vvg9;jK&o%HZLU%;=Wlir)mlz825
zGWCT5y9jTCsfi^Ep9M$q)Q8;d!m|S&TnN&1aa?>cn6r8A5o^m+mlM(_1)AKbPhVtu
zJm9`YMpkX%)WeGlIF9yKayneKWyz@Ec>U>Ok=oa5Y)hTCgv@-rCdK13(+_XmnqVfI
z2Rf2HHlK3#yKJ*oQ&T%ol)iRf|B?pg?I*tSf8pnOAQ<VJ_)T<I?O`$IJ91X9zf8QJ
zEkAocSHI-fjA=U#MkiL6Z}>H9<ErWpD^lhLi9FDeer#~`kx-t8;)IhS_6&!NT{iP9
zFl+12j94C4v2JgpXrWr(;Z#N+7XhAlt`M_V&)FIOIo+%}UQu^;QP20aq7J(1$p^0}
zm&!7nY>W=sYINtA_r;P8Hrsa}v$p*5V(WwM1-p)|<4*BZekfqlRL$N#N38KvPGRrt
z-eAwx!qhr9ZQ&I`-x<ydIe0OxVBRAtVP7<N-YMCPJqu?}VVaz4FxBu1_dm8{Ay@SI
zH9oJa<hpVE_N-mirYTPf48CdDzY%Lu=FEv&>$5WKw#dqor_$fE%Kio{WG*#(lQu>2
zn9GffDDlbCh8!$P@BX9)P23<Et|V;`8mjp?)*(@Ew=~y3xft$8t5&SIz|_9qQS%Ga
z;SJR?k7rtJVE^5AK=PVuoXmxD*3T3+eE;5L{oel0lph-oxg7Cmyuf07^T`2^1!0Ga
zru)R}ayuVg;icA4$kK0U=y0gd$6}lKRl8%7tg9v)uD+M%-6AFQ!`b!Jj*rC-b0tD&
z%qWRU+4f^v_hunqtt(dCC)2(^cDm%;<fpdN@#CY0bN9Bk7|vF^7po{H?Kkb&xzqQ~
zIX-jnSj1(Zx$H`J+M=D!KWmtJm_lx->BPNwuX>QvMpST)kL8Q<nK{pN7KW`<$>iK2
zTX<{7##(j(xy!Se9GX9r3mfPr{)u2-UXv{ooTJt>cTTOllizyg7iMpZ)lKT``Tm@L
zdo5&B?RNfPTR!$MzeZaHSN5R!C%CnDe&J#DVry1cTcqs}x#76$q+p{`wxvSLRQJB^
zJpNeID&y?ds?Ujc-b@ZXEnE9RwCB;mJ5#Q%|H(J4<-j8uS;-fw2Yrf!Ra8}{9*t+b
zFnOkEnTVl#*S8Jq>klQ*mg#%;i$720*}F{tbNeGWE|qBYF&fEp%<^Z`jV@q)y;-cM
z#MP!^#`F%Ck_($BYj0tgmCO(+qipc(Oi-h)<Wu)`nH9#CeDmjh^LLRiD@nBJOR0&E
z^R!>j@}BwTW^XMKM|b1Rr`?&HBNkXVJzD*0iHA_nw6yf_EV;!k%MOGGHyh>!s|XoH
zc?9^WUCv6aiW1^kwt8kl!7<^pcNn*XF*-!tGq5u0`^UNUaqkpWuBmx942^Ew_A6pt
z!BK6k-q98Is@{5mbz+Fn1!>pni%iW-j|~&-{7aH<iOh4KyCi*4di$T^b1Usd=5k8C
zv}VeS4O)1-RKIw}#&<2B!Y0i9GJUaiLl=XGeyO#O-O3=xr%4Zu<{pUo>XBX^F6>`!
zfAJ^VOe;yBY`My9)7h`|gl{!`R(fA$b6MkD4Q1A@!#5tJHUzE+vQ3TIl;)ItLqnlP
zpsUIut?6RP(R1ss^A*2b;WA~BP#4RNC%1n_>CV6H_kMZt(aB;C6++wGmt5j&juO^b
zvE}vZh)E3}lb!5jQ_3bDP%0EleU+g3thO-x@yW?mH~)T^>%q?B!W`AXWp#FKvGc_x
z2Q9CdU+C8Eiq1aGwzi%3pOtV@+~e@BpMO3^_%NTZFSOdeZ07UYj|UutJZ-Ket$p`g
z?8BNj`U|z*%PHt^P0X6wb;T{Av`TH=B;MI-*43ViHZ^nVSe+4T_7UZ|`8>v6hVM&P
z!>o%5MimCjdtPsmvRP1()p;d9=Uip?m5TWEdi$t7UZ<jVUfS~HX83ibiMQ8r%?^I(
zv0&aj&T~3%m-tuw+Zyrs_D4^Rl91i}9euZ1HmC$0JXWJTBjms@Q_B-;-dXIN5#%{n
zCwgwY*fq0B`f~3o_8jWjQZCsbdbsl}!_=zQn}17O7#QUHL2ChCOgOG9rmg)WKzwr}
z6YDME%Wu-wo(i`8@z7$cG$;FyvV{}MXKsr!zI}Ao-O`OaBOZnIt=`J@UQ8>`B4$!R
z;fIYuTeb=<TDjv^!ZD>aa*tj$ygSGmylly~*BhVC@>m=EPtW1Z8>jk-TLP4xuI&_g
zyK~;-n%=ofE{8tcvSE|H&<t5;<sBW8U#|GP_<gW{dEBN&A3q;``YP~+f&3}))zdF$
zi_clPI_UAHpq)9Eb5a+E-RYNd3|*ShX}CF6BydH8TjcvBrpx~#TGuRJKmBOCTx*cp
z)PHgg<|{R3e9EynKkdtupUH;~+*-Blpo{E<dUjn~JHEr-tJ$SBLImw4YHs|N*)23(
ze}5?Vo!75Yo8RAJ&M3S0y=bS-K30*Ht(Pt?U^%~Z{!Ok(!^gaACKbySGIBjrt6G~5
zz2#QroOd~|a96y|>W{__I`jF05}!?xW?AKOZAa?;CocP*esY&QwJeG2L&98h>$!P5
z@}*t9&uKlH%I+@EzPWnW1AWs|)2CJ~KKOZ8!rI%`0-wE>9=j3i5aw@?!Bh3^_^Uvx
zr2$e0?wCw|AiK@Wdzl7jdEAVT0WU7hn5#T_KeK@J^F!aFBNEjv-wu+zcWRT`n@36i
z0u&DLESe&t*}t7HUfaj6s$R<U%d3}Hu3XVs6RD8B`8(eu+uqK~ukY`_w)vgJa^>o?
zKVN1{IKKHlYst2jZwIg4@Y3jr-FIN#0gky`Hg{B5pM|7V<*!v}`tPu+@0WEw^MbTn
z>#G;=xACvp9(n$wO?vs#S#gUFTsoZ6f0MJWjgy`K1xu}s>Y~Nd7x0uR|0&uUz|nYd
z^VY3f=W`eSTzB)DTDkcA<wq5g|D>8sD^m`y*&T6a|Jou}hubq>1er+bu9vB12#8tO
z5v&xYWVnc>`QoQ^zaO`p(?yLe%d&Fb*ZtMHo;F7$*&<KEt}`JuRd0{pnI#EnoFx%X
z{BbWhek@E7kKB^Q+9T(Ga_h;NQ9AD*e=*p^&pfXsU9&jk`}+CY1RnYO`+xpxc&RKa
z>*nkE+p6;!YuB|FNoJQQ?>ek~Fl4doN}b#<E(f3VxfLcnEtuOQTh$Xe`x<+9^mlC$
z{X6VO)LacWzWX4_vh9tT{T|Es+Y2Te-0|d;TlUnD!MgKL$cMjd-Ha8-Zk!Y<X!KM_
zYH<sd{?f2}YW|t~3b#sQEBA&sx*kiI)f-#+w=vA2_0BcP2NpR`Z00HO%$fP(T%F$Z
z_0wMOsq*xhwnlBi#m;~8w)I_SD><EhLgo5P(VLS`#H}fu)|A?PWxr3;>sC{v2YN}K
zbCt9wrYt)sGv`tBXHCW8Lv5VxE;ciltPt6;-aGyGPp8_wo{8q0Hf`D@@mof1|AjRy
zOx@cXVzxTfX(!)3(Hpwx#d3zbZx1_dWz2s5cG?1id}pPg7X>VP?G(&X?_BNmom8S_
zRV*}PbN-S?KJ2$IPCV#$NALR4HfL7Oi7C%g<mUY<wtYPFpp<051EWcSn{Qs|^?xK{
zdAfDg)8=Oiw_>B`&5!R}bM}$){B_60p67>JGTk~qC-=&m%qv$e8h=R5j?v$37U$D?
zIN0FRvX*%{F`7r^dS&0P=kEC6_?&68Zq(mvB@2$&a;b&r%sW@N>7meJxfd}Uk2Y+(
z{qUXXpI6t|`l=(Uo)!tMR;$!za7lfs;InD*>9+luOff!db#*eH9l9Y`P@a`oxmWap
zAj768Zp-tN(leDOb6?%j%dq*>+g(StI=xsC^nLfWV>X^^4oba!{jS#6VNLNV6OSVA
ztCiQEZE4quG1pz>>B4r|a5CRcD^Ka-?hgk}-*Ku^ms;}J>+pt~XLGc?k9ba!oU%sc
zg{8N=-1OIfZl5^vEJuQkIr4tlVeajlkAHpp#M^4~#{aBs=O>kFhp&kFoWwKVH$USw
zPqT*5W47z{Dqc;zmN~CpS07FNcdX`E&W_}W-J8#GMhI(7nv(bE=MA6dGj+T+@OG~-
z{r<+3;mO2+s<#_%rxZ<Ix75drV|sdk%C)tB0+*^hxxcKl+&?{ixrBkZ?yIArE9I7z
z8{N@2HmKY7snyGQ$C;k>XIC$_=?mf%e4W_lrxwbz^5n-|4H0(C!i)2`ZOy7vbB{V-
zN|U!Y`>B%YIo0Oly#0ZC*ITcuw%&Qm(C*-sTi9AwXemGCOvQmE8{ef|+IgXHrunn|
zvO2q~m#^+=y^^Ia=y2`J($ZthpH~O`)JqY)^2$+lOYYo-n_WJ7t9W1kCNS6Q)zVMb
znXhc&zwNp2fclA>`k9Sl-ga(zA8HbK8G8CI9^;Z;b8Gh8TaROo^rf-9`*^W1GUNn{
zrC)g8`9;@!toF`5E!(zgy6VR-2jA-KzVY|rib{qO&W3a6*7)d%{n(&=XWsPav*|Vo
zSt~?1C3ZS4o*|s)@nVYC->h?4m-j2E?%`{;dp9%COV`f4jmL1-@duf|ulRj?%OKBr
zTd}BI%Vv3}j=y;3+UlC3qAPRmi0SK}X-%9ORT|5=nn7JeYt9wD{oKp<Zrtmhf9$BO
z-m>!vt^MzE+V`1OFh2WqbM@=|g@0GHY+5-r%hkx6p>Wv_w?LbJQ4M)_%6r;puUK(N
z;b@lc8HO_By)S3laxGEdsx5zPDyhEu^r2UYdD>Y%0{1hTrrgY4DS2VT^v^5ep8uJC
zHEZp+x0_;wZtZRSeSG<S=8$!w-}f(Z%wF1k{Q4g4WoKW{+Fw#R<+j1H3;ZFs875q8
z=Cxn;W2^43sSJkS5~bBTf2-Z~X6-!xvY>~5;wvjL|IMz8k|WZ*FFMNA?aXfU&c5KW
z{E=3pSncA2=Nz|5@cj143)!=x<dC7__L{pIACFuPZ#;gwGN#u{gE#r;uKI|l*Z!Uf
zxq9REoym9j)=Y|6zU26uOZ#Tbyc_@g&wAl4=|30Lv9Vu`IyZyy97ou%B(1KykDX41
zIofgyMOLNp%vto|hS{_7O`fx*LM+7|ef|EO-@vlC)<%0~<Sou##fg_C)*lh>di$^W
zs5%29m%&ow-w75|-<-*~>~sCJ3u7SX-njKlkCiIIcFA@;=ihsMz0m8uKTTiuOuPK)
zqF~x(NAc=U%(s)7&L}rqaqhGJubuww0Y?otk4;1Udo|aJy*o6!a;`|Q>FcF_d9&p6
z{T~)x&%%x!TlP0xd*ku_AI=|gTRX#h`AMethrYg5VtTy%m+Iq*OCE8}_F8+Qvh}CW
zua@KN{p*f$*9AJ1f9bbAb@oR=ze4d9;p#o7e2;47J)9tNVE2U(Mt`lwY6Fj70^4_%
z2s_-kd$==m_8P-oQ{DBMLr+E>s21qZ{Vx%i9eY+O+2)<+#|;%<)&|BOxj%pR5mkwh
z7XO%qi)`ZmNG&v+=)xVF6tik={=P#TS?k{WtSsBWRx@KAr|emy6>9Rw4Q9rvR-7vE
zRbpJaKw16jgtP7D)%@yiYVL(RiAsV~a<>M_70*qc#4OWuQ~vt5yVF+OVv3Jh6|(yH
z)Yn$K4CdTC8g0ilHFxoy6U*0%R8@7V+;Wz%tLAl(nCt#IJ>^d3Y1ekolUcvdzR29h
zn6$>Z>NnSw^RLPS&T>T-w~L(9W%G-d*Niy8_C19|u>95Tg4AyZr88t5XRXeB_}ysx
zod=v38RqO2di1Nbjh*Ahmy%tVPTXMeX^UTeMO#Bq*Q!S4#P8D#hR+iwUYUMS`J>^{
z8M>`)YpVU%$R{&C{uKY#P0EIQkBIm88Lu{TZaUARZMR_-v-3nvPKhHw1K!S3-&gg)
zQ7_8p<yO)6TV@<*Ztc5&=o#1glE@Qt6ASl8C9IM0%JEw2kj>bBK3A@-Rbk?yMe8?o
zCEmYKwq@Sk!<U{+I%jL*`02r!ObK7Rxd+@?#iT3)@~+CU+69?Qd8+)lc(&x+K_)j#
zu_Ju^$xGyQt$NsG7YfQ&_idUnJO1ORw+fd(81DXj=>3UwwjUfRr(Vo-T5v?jb@S!M
z_?Bos@6=O29=XoBR(^wbmHg`CyjHHqk{K`Wlz)Ex_wA3DFW$CHxpvEClB%5FR86^_
z%Bfc@kEqz}p3$OiCU)sniq##lG=m79ES^otC%9uP=ly-Cctz>q*Pln3*WZ61d;jU1
zb>`2*gY*M9S-kEXS~NN7h`7!K!JvO1r5euNOI*FHvv70BvTrfdgH-~qADtIjV!XfY
zj8W@}4AqZc_f`c=y5v1~$$|&L?4EpyuSDloY_*%J|NN2F&7ih(Ri84~6x_V27vh!t
z?|5#8+qY-eOa!n0+Qnw4uB21gA7CHMRcqjC_T#~{TKSt(?2MSMiTPEY*Je;s|1#s@
z>l3U>p^Vk14!5UmwJBzs5;=WAZ#4S~|MItip4ZY8YBtPcDBscaRcHFCpo=pXgxVaP
zxmF`}X26xG>lr%^CYWsgy0l97i9NeO#fH_vi6xIM5;ySo^M7AF<JOH$T2~WPl8pG;
zC!932vf}!-OF_}dEuJyJoj-HBq<!3jAH8hfFC>(Er@#5WU_ZOs-6+;vALH8Ia3i;g
zPOs<5ym*(9t-N;Sh5wVhbAO7SwW`ngS#mX0<V1>Bt(N+e_MVb;jQ0+w-u-{)DVsv$
zt$REl4!k{)YH)s*cko9Q!40BcBUE2~{^@Y?pw>&v>Ou$W_qTo*GKS~4TD-RQ>dySM
zY`c~8etC()rhl2AB2Tbqw(|YHmeg+~B>PJGx|YzDNfnbfYu&kLWi#c3$HKY3j8Pse
z!p5^shF6~cuipJGDUyfnOQO~0jV6=N8wVP7UgVg@KX;Lk)|Znxo@Y3o&NnvrzhC9^
zy7Hu&h~*PFzEA7sY^;%)onZEJf?j<sANQL0%w=yszxuvFMe}p-Bh6{@Gd~18PuX+s
zykxKR)R$6gFP$#9zf4B>XqEKj+Xs?fyuNW=J?}~18DDPcsf!Q4{kwK<jNz$MY$y9G
z4_J#WEimVny|Y5^-~4;u>L;Gr%_wyLq>kP*jj7jcuH1aH{@9b}yV;LF_4+V>=Evf~
z)Tv9Rd@6jVBB*xILSuUztI>`VD^gdupS%|@tQoBMvv)^E+H>!<`z*HqJhJxAsh6iD
z*2h?D$vykr-Wro<J@=mf^2?S}-u~?|?fU8Ix#dIct*?*fv8BJZ{U+`$b^5fZmEs1A
zysFRlH8SQa_(k7bcVm9B<HWN~bN^l7OJLZU`YI=gt9!<krs}%8enEo9EYr9$H8d`(
zt6uzaF}1d;@U6Pzk@+XzS;?nGtgR|33DFJr_v2a^u(2c2{D&*YirjRwMbhfs%XjZC
zp7lKVzkKTI+$-vvCHH4PE7zF%Fpa_RXy^Q@4yIF8EoaQPMt-`$Ik!4xLHo@wE-@lb
zho7(+?*6#v-o&(LrBmM2T+|ZYq8_})^vGq#v!B&mEEpP2O`q!Z^pf4Nr*UCf4lBdt
ztT|$0W7nS9eJ#1sfoJN!)@M%{m)@SsR{JSqn({Kyro=RcyAcj=_X_iM&zmH2<3+KK
z@<Nuwi|5|;IUE(l<Rmp~LT|8h4$sQ{lHU|ud#zHPL~KsW7FL%1U-ayu)RyR<udE()
zSN6UxT3on+ZFS_#=$&gmCtLiBlHGpy^XJbuKXjkp__of6;nsO^<HD_1N^Vb==TA|y
zHAyY3>fA4Vt$|mTlhsvAbDPbvxsGT4iG47dad^Y;h~;wTd=C?&av~S|<Sst2`aWOi
zzV4swpNr4WNDcnXxIdOdPx5`j)MBZb@iCEwXKUxhmnTY1i{O4<{Q2^p_fKD2y?<(c
z<*C}1ZCA>2ROcQ|o)e`mA=hO2^2n`S-q&sB%Rihm?ckg1Gb8z%-?lf`DzT}nv9Yty
zOcP9D_pUCM*ZXnjq)6KQ%dTI{_nZ%MPJA@6xAW*_-`g)^im&cqQU7nvpVz$k^{RFw
zpRO}MK20mB3z3Zf<p1%-j!%7U{|;0r95!mbx~_AocB#SSZ9P-&JyM9h-N9^s!SZ0A
ztjZM`JC$O4C#mv;T>fQY7ZsVOm-g)6RQB<UZtL`9#`W{<&mI@Le|Lj+S%QA}>Z`Z5
zd*_|B-!8eaecKwjP1n*lPZHN>wkx@{>He}q?wX=e$155><Z^VVR4i)z{MBpWg$r+{
zre(BV>$&K5r^Dieo4L&6vuSC<&CGj!%BM^$oFCS2Eu6MthD`8k(f3^&6u0R6+19$x
zi7bd@W@p!ySUtC^cj}I<%A0ybS6#idDSOQ<@A;J~D_OQ_2JHP4)^fohHP%w}{E?|e
z5)Qh;Jmx{Oo)|rzk+y5bIdO09I_<e4Ckz`b4t^;uPAXyM{&>evOn8;zn@(>hcjLg<
zH_x5(3$2;C@tt|hX6@cfGhSPA|9y5VeY&<$`>&YC;@3`ZWzvlF&VTMyTBy5!Z|Yn|
zet90fm0_!^K5p?p=<qr0y0Hk~f`8wtg?WxSo~!S?`S|eat;tqP54Gi{gdRWFknlv}
z#5~@WH4+9t@A#D{C%&AdHF?YNU98h$?c{}aFWa8T(W<xq>blm~=Vv6&>Hd5*G_7#f
zr$a^cF?Y^QsO1gJ<_nfH*t?0VG4Te^c7^(%Rxg$B-n6n<$!XHRJ5qmNC5QeBL9O}x
zY||HAoP4vOFX%+gvW1>JD;|B)4S4nVV#$=S6|79#Hg6I6J~8`h;epBjgt$WAJd(Om
zD)~qw#o$%q|NXhe{WmI~zM6h!lA*V%<NUK{B+}EGgaU)sPoBNe?~u)(Pir+-ow{%*
z%9NWqBjrIEL*n5Ao0;kpSGqc$)T`7gW}nw`>5<IbIWnw&S9>jDTkx8D^Q_8wrkxWz
zT!Pjr=XyU@I+G@{O0+t~yr5*pz0Rt%rWGp=imm!=dVb5Y&NJQKTMzpfq#nNK9OW9r
zI8V0q?K2&_oI=iJzfSirSd|j>*>;8s^NPo53=iYV-{ee=6RBpHpdKN8d-<2B83~h}
z`5L#Lv48M%^G5+sO&?Bk4Xb$mBR||HvDBOwI)AflW0c^!{Gznhs{wp$40Dg#>RA8G
za(;2uCViS=(W|G0&NCB&4Bp7dms>nNydzV7cSF>Pa|L&z7T0Gwh)+FsFKX5%LEbMf
z5BGL<%>A|X*Mk3_I|GGy*tQ>4oRM(2&og3|&&<_3S8DcFXwIH_e|A*Fn&)c{@>tfV
z_3dW)Y`A$Uw`}p=h#fEV!?||K`gpAfN$^kan!2m@>Cc<{&L=N@oXg*u_{lNIlxv#$
zWf{3Sc0cT!eZD=a4l9>7^h;58oVH<I|NDG4fgcG$sjn^_HBIW=^fh7Oj0@g#orUKL
zD?dJX+HK`QUAD&|CR4gEeXKC@tN-YJ?b=cIol4jD*C;&c6i?)}vVAbs<7SrzWBhIh
z#ZOE8*Bw27ep$XA*Xh<C7k)k^EB%Ul4V`bc9Q&aywpn^g)_L!A(=zYR!A`f98T&ta
zd1^azMpBGkaOCvs=QDbOThk6_?mc6E@497!+9ua!;RpX~c%BwsDrFw0waGhOZgKkK
z4_t>EgO|TB*S&po&+A(cuL(&kj9Td^V4l`B{m{$w+xr-1R7;$F^<Z~){&C%G<r~jj
z+P?OiO^wUX6|r%9?QL#;Q<S}B-V&*v7h$|Ei`G<iS(~?QJtgFs>*zDt_}Kx0BW{!U
zF8!Z=cdfRw*OIMM1WgJ{_pMA06aQH@X~vD23x&O8c@(RZ<5%CF&zo`T^y(*zrzF-a
z+P{1G?3X@kg4I`qh<VGG^I5FhqWkfZRmSzLJ-3dUn;ghkF#GY>CrwAL{YjGgE8E%r
ze7lxI@At3C?OX;^HvV3Jvh$_&5f#%HDOJ*WpW>`;-(R=+<b(Ca8@2yStpBLHC6`q<
zCHSUBrzv~GyuWkjSG{J?P(8fw+24vuCShueKRdZgKgwE>vp#6o^zcjK#YcDCVvwu4
ze)eaxLBobFXQSF%2{wmLvu^a@kIPEu-@SbQ<QtcEIG^lw=DfnR=AGtAo*ywgFKOO7
zBzV0>XWPC9kFM`DHT&l0Z8P(5{@0i3zwa*(-*Z~&+x=r9H&n#Faf@hn8cNvCnHPJG
zv3REAs_LI|X~mVIZ51Am4?Sa$I>Ptm_pF`zCLb1-$H*8iJz~IqbGu&@_k(}i?8??9
zo|XyvVJdvr^Z9WzLv<~g$MLK&vuD3fc-6Ri!(7YT9Z?sB9{JiwuYJeb@>F?)%j2w^
zOK&DOvvR$gyZixf&(-1`o39$Z`L?%0@VREa+fq|u{bnA8q9>v{iLX*ZjkmclEH&Mo
z+UjF>@20n(P~z?212c|m@yTaSYmR+e*dpS!gZJm1-+T48$m{5zIp;cU`t-N=S1mlO
zzcc3DhZUCuKF6LnZ7~x+y41^Xui%nkPEj4!h|0&F^3~IK27U;=8nyGLp~<gD4SS?T
zR%H|f&t!Bt*C+kyWsdYc2e$9KnHS73=W<h$<NG~v%ZG$r{~oQ%KBi~q^~P-C8L9m@
zra$lC-&!58@7d4mW##_QpC#B{?$|l~{wj$L51O3c*WO7~jWqoB^wX9NjkAR}h-&Db
z>dH77bocg(r_)syS>(COypoovDRfxc;`Bh-_{}$-yPOdxGJmVhf61Z1*}1lG>(ML6
z<@O(cBb@*4i)(+*^1zK%i!v33Pe<IHJ$qekHpg^x%k0mmv&AKn_|9~nep<wQZ0i39
zpOYK(%Ayyo5`4c!pjq~4jn(GHf2YoDkNBH&Oyi```sMix{)>L=o|=>3+W+9-j_t-d
zmvRMMlx5<kF`QyOmJtyA`0VBHc4p_54z`(Rg-+62SG=!kyZO0G5s^n{>Q6njux4Yx
zQ$P8hj}?y&DAm8oa@_pryPn*Q<$u|=x%+)LS~px{is1dcH*TG5qu6FW*UwV}Ofp=)
z>X`fbefhp+``$lwh6}xTUv2-L*48-N$|7sp%C+4aOSpcsu<hObZ_O@A9>to1&382<
z?X>(4>wR-SG;vb98Jq2+*mKYSu&sD(9C41%`Rc9hT+7t-Do;;5IwS4-ou_-b&e+Fz
zw_Y+jYEk`}QGdR@{6q5s%`;24e_OmkB8W3>wMAI||I6PVHN2^cEap`<?pYG_l<9Vu
zrm~XnUo(?AQ<tof>`T3U*WYS`ewtI#+-Es`Pq$r?<9dDH*7fWa)rxIycRa;yZ+ku8
zCnM&(aPi|?UzJwwyWO+K{m_5*a=SNC|9Nce5Bp?)kou`nv3H8o%C9rk*k^uv5}vW+
z?Btg-9FCvmkv^dO-RA427O%h$`{(`qJSooH#_EL3UiWi5k6m*!GCgbifPGr4T&vgG
zaFxv^1~VQ{KUnIoD!k*eNb*H#Ysmv4Hmjy31)u-^D8F@P{`2gK9clrGgCwLMIKI7n
zc8hXN>$JC~oAXy}U%d2ZdGz^~!|9J(E2r?9AJuG1+IaDSwCsyt9>4VVs>lAnQ#9A>
z5U=|xxlX3VsZle796Nhjy9`B-f4%<p*s(2D4_d5Wt$C^M9`o_wr^l0D7j_n0mY&pd
zru}Q|htRuU8mbB%p03eoynA_$+9m%}HaP)mE|WH=_Q@Zf<9+c(qOxr=OR{hF$Daqb
z8cgtgkkB8~#jHJ5<K08ny$+LO{ihzCWNM`>7`Q{%cp^(br!~uiW9tL9Hnn!0KWqD6
zL44LmuHdto!KV#mT+X!=S{$3Jzwb=`x<zm9a{a6<onCxyPsH6jDe-syxqo_nxBK(8
z`S1T-<ln?uw6F5tejnp0-Jj1|e=pSjul>oqa`OLaZ|40!fBAjrk?1_HH=WwgZ@!+#
zRXz9fjMqo}wK;kJ|L6$|m^a}=U~hH7cix|8`qy9HR2yEu`AoijVdl)e=YAh4T|M_q
z>0^J<J#*%LxnJ|6{dktq(KoI>p-DTMf4)2#eBNc*ue^5?>mEt#Z@eyR^Kshh!)HpH
z)V1cAmA@-7E3o&;Sl7O@#d7|=^M3?tADPun++la`&ci3dPg(a%UHD#Jp8E2j{tKm3
zF@Y-fxyJS%<ahnL-u3+(o4t+U%6h{EHwC}_-F2h>zWtw{Z)A#-FI1OJ*dtf#xAlbn
zglp?RzWV50Z@56>cUilX;p=xD@_WkWe${{W@GIA6qc2Bd|7e}u&Y)#m_fntjNc#PA
z=VxZ8#}&%gc{3LuHQn>iE$;8<E3<xgr%cacoKpYimN?Uq=NS<WQ`_~|8HOLQ+LWcZ
zK1Dz7@u?G6T(}i3K0bZpJ<FC8F&7tRo;x#HJ?~L?=WA!~1^bSFz4xAF%kyNtnR$In
zkAlVbx1J9MsXnsOXnKp;(<kwNPv^TNEOE43*Bfa$f5XIjZH2P8i^6AoeWTtUvA5^R
ziQ~Ly4CMd+F!~nFICs}c)n=hj=a-AGpP2SEds3jC=rJKpyQ+`*tVb*}L)q3pNjso)
z?95ulf9jv!Us_z)exLirD$xmlJEMQ3e%jevGcR@T>_4k(zf7#tU$8U!{QtWTy1$EL
zcs2ZVusZYOi*5h4<$vNF=A6-8uvY!ugX<?HJ~vv=Hv075{&RoqpV^GPf7>LFtu&CA
zc*HXQ<H`M!6PCUFx_@@XR>@<Q$#xS@>wWLP|0tiWBr%7ns%GQgsYUCO?FxH}PwqKk
zQ}#8Vtwi`!?e<Scc>h>swi)#^zu~C5;{NY$15-|b$G16W=k9k)(oL5Y%&gCm{C&4U
zsb}Liz3)e!|99GW|MBM^M&EWb>Xz)WT9E&p(RNqQ-#mwj*V(@$hyT8%9RB}1L++-D
zamTNPwS`_!?~nO+pLxr%dlG6K8PA?3-@8%IFChIw^`g4j?u%bN&d>ZWw_sU$^V{T|
zXHFmAr1{_0VXK(NS<(784^Pi-nAbJkoN=Z6{xzH#vo;^AisXNOv}2Feg0y41xxdda
z`8?;o+`fIBD-zT{JxIx6k`kT#dYznynyI>ls^8}I^9nA-%U)2M+*F-@sOLLV_OfO2
z`}T2mOl4R8<Lj_SLe9hCjNhGF`)A!%E^)E}#*eiXkH_#B+S^RB*~9+AF|>q#!rO&B
zXZL=uzQX2QS?X~5O>gZ%`7+lt{L1|Aed^2<?tf-@D|h$l=a5y}m%g29`15A&)RX?c
zt{)1VmKKU%Xx^%@dYSe0mGU(ox-(bJyz%!*rB$d@Vz-0bMW+2>ChR>1!T*haUp{<s
zS8KENrw6UOyUW*g+fMpuA20tnj9dNA%M-@0Ec}_zNbjp){5hMrt?>wDf7E`~GqD{0
Ud;W%rAm}6kPgg&ebxsLQ0BLVz5dZ)H

literal 0
HcmV?d00001

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf605bb9da1a..42533636ed5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4915,6 +4915,8 @@ let
 
   ### DEVELOPMENT / TOOLS
 
+  alloy = callPackage ../development/tools/alloy { };
+
   augeas = callPackage ../tools/system/augeas { };
 
   ansible = callPackage ../tools/system/ansible { };

From 9870b076f59bc3e46328066184c2b30ae8173b04 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 02:49:36 +0200
Subject: [PATCH 0630/1143] phc-intel: don't try to build on _grsec kernels

It will fail.
---
 pkgs/os-specific/linux/phc-intel/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index 1b4ee3218eb0..ac60501929a8 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, kernel, which }:
 
 assert stdenv.isLinux;
-# don't bother with older versions, though some would probably work:
+# Don't bother with older versions, though some would probably work:
 assert stdenv.lib.versionAtLeast kernel.version "4.0";
+# Disable on grsecurity kernels, which break module building:
+assert !kernel.features ? grsecurity;
 
 let version = "0.4.0-rev17"; in
 stdenv.mkDerivation rec {

From 62382e6a6f9ed45e7962f38c3e0e8b6dfa630e44 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 03:17:33 +0200
Subject: [PATCH 0631/1143] alloy: use installPhase instead of ./builder.sh

Also pass on any arguments from the shell wrapper to the .jar.
And be less clever with shell strings.
---
 pkgs/development/tools/alloy/builder.sh  | 16 ----------------
 pkgs/development/tools/alloy/default.nix | 21 +++++++++++++++++----
 2 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/tools/alloy/builder.sh

diff --git a/pkgs/development/tools/alloy/builder.sh b/pkgs/development/tools/alloy/builder.sh
deleted file mode 100644
index e737fc5eec73..000000000000
--- a/pkgs/development/tools/alloy/builder.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-source $stdenv/setup
-
-jar=${src##*/}
-jar=$out/share/alloy/${jar#*-}
-
-install -Dm644 $src $jar
-
-cat << EOF > alloy
-#! $SHELL
-exec $jre/bin/java -jar $jar
-EOF
-
-install -Dm755 alloy $out/bin/alloy
-
-install -Dm644 $icon $out/share/pixmaps/alloy.png
-cp -r ${desktopItem}/share/applications $out/share
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index d25ccc1a7a5e..da247072b070 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -38,11 +38,24 @@ stdenv.mkDerivation rec {
     categories = "Development;IDE;Education;";
   };
 
-
   buildInputs = [ jre ];
-  inherit jre;
 
-  icon = ./icon.png;
+  phases = [ "installPhase" ];
 
-  builder = ./builder.sh;
+  installPhase = ''
+    jar=`basename ${src}`
+    jar=$out/share/alloy/alloy${version}.jar
+
+    install -Dm644 ${src} $jar
+
+    cat << EOF > alloy
+    #!${stdenv.shell}
+    exec ${jre}/bin/java -jar $jar "\''${@}"
+    EOF
+
+    install -Dm755 alloy $out/bin/alloy
+
+    install -Dm644 ${./icon.png} $out/share/pixmaps/alloy.png
+    cp -r ${desktopItem}/share/applications $out/share
+  '';
 }

From 2b45d39720b20361a4970b8e94e47248d9538721 Mon Sep 17 00:00:00 2001
From: Richard Wallace <rwallace@thewallacepack.net>
Date: Fri, 8 May 2015 23:17:47 -0700
Subject: [PATCH 0632/1143] no longer need to patch reactive-banana, latest
 version has all the necessary instances

---
 .../haskell-modules/configuration-ghcjs.nix         | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index e2a3739a496b..6fbb28d026ee 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -66,19 +66,6 @@ self: super: {
     '';
   });
 
-  reactive-banana = overrideCabal super.reactive-banana (drv: {
-    patchPhase = ''
-      cat >> src/Reactive/Banana/Switch.hs <<EOF
-      instance Functor (AnyMoment Identity) where
-        fmap = liftM
-
-      instance Applicative (AnyMoment Identity) where
-        pure = return
-        (<*>) = ap
-      EOF
-    '';
-  });
-
   transformers-compat = overrideCabal super.transformers-compat (drv: {
     configureFlags = [];
   });

From 4672fa43d95e96fa91bf341d5ec64ca97a4b65cf Mon Sep 17 00:00:00 2001
From: Aistis Raulinaitis <sheganinans@gmail.com>
Date: Fri, 8 May 2015 23:45:07 -0700
Subject: [PATCH 0633/1143] z3 opt

---
 lib/maintainers.nix                           |  1 +
 .../science/logic/z3_opt/default.nix          | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/science/logic/z3_opt/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6f4a7be21f6e..6906abd2c78c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -184,6 +184,7 @@
   schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
+  sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>";
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
diff --git a/pkgs/applications/science/logic/z3_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix
new file mode 100644
index 000000000000..b4d8fbc95298
--- /dev/null
+++ b/pkgs/applications/science/logic/z3_opt/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, python }:
+
+# Copied shamelessly from the normal z3 .nix
+
+stdenv.mkDerivation rec {
+  name = "z3_opt-${version}";
+  version = "4.3.2";
+
+  src = fetchFromGitHub {
+    owner  = "Z3Prover";
+    repo   = "z3";
+    rev    = "9377779e5818b2ca15c4f39921b2ba3a42f948e7";
+    sha256 = "15d6hsb61hrm5vy3l2gnkrfnqr68lvspnznm17vyhm61ld33yaff";
+  };
+
+  buildInputs = [ python ];
+  enableParallelBuilding = true;
+
+  configurePhase = "python scripts/mk_make.py --prefix=$out && cd build";
+
+  # z3's install phase is stupid because it tries to calculate the
+  # python package store location itself, meaning it'll attempt to
+  # write files into the nix store, and fail.
+  soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
+    cp ../src/api/z3*.h       $out/include
+    cp ../src/api/c++/z3*.h   $out/include
+    cp z3                     $out/bin
+    cp libz3${soext}          $out/lib
+    cp libz3${soext}          $out/lib/${python.libPrefix}/site-packages
+    cp z3*.pyc                $out/lib/${python.libPrefix}/site-packages
+    cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages
+  '';
+
+  meta = {
+    description = "A high-performance theorem prover and SMT solver, optimization edition";
+    homepage    = "http://github.com/Z3Prover/z3";
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice sheganinans ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42533636ed5e..de29fff28e61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13817,6 +13817,7 @@ let
   yices = callPackage ../applications/science/logic/yices {};
 
   z3 = callPackage ../applications/science/logic/z3 {};
+  z3_opt = callPackage ../applications/science/logic/z3_opt {};
 
   boolector   = boolector15;
   boolector15 = callPackage ../applications/science/logic/boolector {};

From 81549b0136f643d514030a766f8a0952bb013f01 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 09:10:47 +0000
Subject: [PATCH 0634/1143] Added jellyfish python package.

---
 pkgs/top-level/python-packages.nix | 39 ++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ec6df9a865f..11773446e940 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6189,6 +6189,24 @@ let
     };
   });
 
+  jellyfish = buildPythonPackage rec {
+    version = "0.5.0";
+    name = "jellyfish-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jellyfish/${name}.tar.gz";
+      sha256 = "04p80gwwlhxjp8zpjf70a62x69l9rlvnz1pwi5ar52gyajn8z6z1";
+    };
+
+    buildInputs = with self; [ pytest unicodecsv ];
+
+    meta = with stdenv.lib; {
+      homepage = http://github.com/sunlightlabs/jellyfish;
+      description = "Approximate and phonetic matching of strings";
+      maintainers = [ maintainers.koral ];
+    };
+  };
+
   jinja2 = buildPythonPackage rec {
     name = "Jinja2-2.7.3";
 
@@ -12671,6 +12689,27 @@ let
     };
   };
 
+  unicodecsv = buildPythonPackage rec {
+    version = "0.12.0";
+    name = "unicodecsv-${version}";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/u/unicodecsv/${name}.tar.gz";
+      sha256 = "012yvwza38bq84z9p8xzlxn7bkz0gf5y2nm5js7cyn766cy53dxh";
+    };
+
+    # ImportError: No module named runtests
+    #buildInputs = with self; [ unittest2 ];
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Drop-in replacement for Python2's stdlib csv module, with unicode support";
+      homepage = https://github.com/jdunck/python-unicodecsv;
+      maintainers = [ maintainers.koral ];
+    };
+  };
+
   unittest2 = buildPythonPackage rec {
     version = "0.5.1";
     name = "unittest2-${version}";

From 132e0fed795b45d72d75050dca926706bcec5476 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 May 2015 14:38:34 +0200
Subject: [PATCH 0635/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/533fd30acc55cb1db3f3a8339b66e99c934566c9
 with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba

---
 .../haskell-modules/hackage-packages.nix      | 260 +++++++++++++-----
 1 file changed, 191 insertions(+), 69 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 74b79921291c..93c7bbbf43ac 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1434,8 +1434,8 @@ self: {
      }:
      mkDerivation {
        pname = "BiobaseXNA";
-       version = "0.9.1.0";
-       sha256 = "0mwfzfhsywrv70gz8fc7s84v5hra0qidckjv4y0ps80ha7qv4kci";
+       version = "0.9.1.1";
+       sha256 = "1r9axc6g4fqc3sb47km3pfadx193s68ign8ac4va9wj8a5hilbgq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -1551,6 +1551,7 @@ self: {
          hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
          process split strict temporary transformers
        ];
+       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -10492,17 +10493,17 @@ self: {
 
   "MusicBrainz" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
-     , HTTP, http-conduit, http-types, monad-control, old-locale
-     , resourcet, text, time, transformers, vector, xml-conduit
+     , HTTP, http-conduit, http-types, monad-control, resourcet, text
+     , time, time-locale-compat, transformers, vector, xml-conduit
      , xml-types
      }:
      mkDerivation {
        pname = "MusicBrainz";
-       version = "0.2.3";
-       sha256 = "0xwyrjxrff38ijyppfbxsr2nbhg6zd7k0i2avch10dn15xfxapk8";
+       version = "0.2.4";
+       sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj";
        buildDepends = [
          aeson base bytestring conduit conduit-extra HTTP http-conduit
-         http-types monad-control old-locale resourcet text time
+         http-types monad-control resourcet text time time-locale-compat
          transformers vector xml-conduit xml-types
        ];
        homepage = "http://floss.scru.org/hMusicBrainz";
@@ -12290,9 +12291,9 @@ self: {
      mkDerivation {
        pname = "QuickCheck-safe";
        version = "0.1.0.1";
-       revision = "1";
+       revision = "3";
        sha256 = "0rxqd1n814b9mf6zg1i0g9d96ym9xqdgky7w7qf5bnnnpkk1ckc7";
-       editedCabalFile = "7609c326853799a0cd519bd258c03f89664ee37795ff3099aa3d5004d1f2dee8";
+       editedCabalFile = "4e791ac9fa2f2e73029ab92d17e3ab93571ec5b1d5acda0ea1f340c5ee1346f6";
        buildDepends = [ base QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
@@ -19632,8 +19633,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.7.0.1";
-       sha256 = "12wkny82bn843zbvq6vcwmd7lxzdg9g978bhyy9r9gc81mgmwf8s";
+       version = "0.7.1.0";
+       sha256 = "1kvn725ac7d8mx6r3wak046i706v8m7b7wlaxkkm8lc9b7hr5s9z";
        buildDepends = [
          aeson attoparsec base bifunctors bytestring either HTTP http-client
          http-conduit http-types text transformers
@@ -19642,7 +19643,6 @@ self: {
          aeson base bytestring Cabal containers hspec http-conduit text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -32011,8 +32011,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "clock";
-       version = "0.4.5.0";
-       sha256 = "0qa59yj4qr9hah1mljfmjv511p0nh7m67dgdz1zh9lnwwgky7biw";
+       version = "0.4.6.0";
+       sha256 = "0xrkw13dixj5pv79l10bl0z51kmplbkg30rhbykzx2imvv9rxixr";
        buildDepends = [ base ];
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
@@ -43654,16 +43654,15 @@ self: {
      }) {};
 
   "dynamic-state" = callPackage
-    ({ mkDerivation, base, binary, bytestring, concrete-typerep
-     , hashable, unordered-containers
+    ({ mkDerivation, base, binary, bytestring, hashable
+     , unordered-containers
      }:
      mkDerivation {
        pname = "dynamic-state";
-       version = "0.1.1.0";
-       sha256 = "18dc6fbnyk3q7n7gvqrgy98qc2grq0algr2jnc1ai3vm9bqh2x8n";
+       version = "0.2.0.0";
+       sha256 = "1dp0sp5cjk7rga9jkjdhl1alpj9g6g51zm57g58b64h070b9r82k";
        buildDepends = [
-         base binary bytestring concrete-typerep hashable
-         unordered-containers
+         base binary bytestring hashable unordered-containers
        ];
        description = "Optionally serializable dynamic state keyed by type";
        license = stdenv.lib.licenses.gpl2;
@@ -44940,7 +44939,9 @@ self: {
      mkDerivation {
        pname = "email-validate";
        version = "2.1.1";
+       revision = "1";
        sha256 = "1wka2zd6s8zf99d33z6mzprxq3aaxmm9z9rnfjs4j83930h61qdq";
+       editedCabalFile = "ec98fb65657fbd6705b80a2fbad8836246515f7ed84f3f382d88e0ee2d92645f";
        buildDepends = [ attoparsec base bytestring ghc-prim ];
        testDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -46278,8 +46279,8 @@ self: {
     ({ mkDerivation, base, groups }:
      mkDerivation {
        pname = "exact-pi";
-       version = "0.1.0.0";
-       sha256 = "01vljbgsqwiv6chlp1nfvmfc4wd3nq89mvn7x8s68dhfd8f8m2g6";
+       version = "0.1.1.0";
+       sha256 = "1n62886wjnnmdi1bjvw51ka21v882m1yc0m87kzq7kx7knvh1xxx";
        buildDepends = [ base groups ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
@@ -47148,8 +47149,8 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.6.1.0";
-       sha256 = "1hxp7r08cca8yyfgkgv2vrk8i989bxw6pd211zy65xsfd6gmf7nr";
+       version = "0.6.1.1";
+       sha256 = "1jwsf0mrr98wn5m4aavdqclv667kkgfqlgjn3dvrgnw8jrywzzd2";
        buildDepends = [
          base containers foldl lens parsec pipes pipes-group pipes-text
          split text
@@ -52665,16 +52666,16 @@ self: {
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, conduit, conduit-extra, containers, crypto-api
-     , cryptohash, curl, data-default, dataenc, DAV, dbus, directory
-     , dlist, dns, edit-distance, esqueleto, exceptions, fdo-notify
-     , feed, filepath, git, gnupg1, gnutls, hamlet, hinotify, hslogger
-     , http-client, http-conduit, http-types, IfElse, json, lsof
-     , MissingH, monad-control, monad-logger, mtl, network, network-info
+     , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
+     , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
+     , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client
+     , http-conduit, http-types, IfElse, json, lsof, MissingH
+     , monad-control, monad-logger, mtl, network, network-info
      , network-multicast, network-protocol-xmpp, network-uri, old-locale
      , openssh, optparse-applicative, path-pieces, perl, persistent
      , persistent-sqlite, persistent-template, process, QuickCheck
-     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, securemem
-     , shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
+     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
+     , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
      , tasty-rerun, template-haskell, text, time, torrent, transformers
      , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp
      , warp-tls, wget, which, xml-types, yesod, yesod-core
@@ -52682,25 +52683,25 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150420";
-       sha256 = "0jigzf550qzphzcc3wma03kdzq478s6azd992hkcxv9ymxhg2l7x";
+       version = "5.20150508";
+       sha256 = "07p9ifk1h0i9gmg36vdrn6nkp0m46g4pkv1jkjm7ip5bgc76382c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
          case-insensitive clientsession conduit conduit-extra containers
-         crypto-api cryptohash data-default dataenc DAV dbus directory dlist
-         dns edit-distance esqueleto exceptions fdo-notify feed filepath
-         gnutls hamlet hinotify hslogger http-client http-conduit http-types
-         IfElse json MissingH monad-control monad-logger mtl network
-         network-info network-multicast network-protocol-xmpp network-uri
-         old-locale optparse-applicative path-pieces persistent
-         persistent-sqlite persistent-template process QuickCheck random
-         regex-tdfa resourcet SafeSemaphore securemem shakespeare stm tasty
-         tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
-         torrent transformers unix unix-compat utf8-string uuid wai
-         wai-extra warp warp-tls xml-types yesod yesod-core yesod-default
-         yesod-form yesod-static
+         crypto-api cryptohash data-default DAV dbus directory dlist dns
+         edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
+         hamlet hinotify hslogger http-client http-conduit http-types IfElse
+         json MissingH monad-control monad-logger mtl network network-info
+         network-multicast network-protocol-xmpp network-uri old-locale
+         optparse-applicative path-pieces persistent persistent-sqlite
+         persistent-template process QuickCheck random regex-tdfa resourcet
+         SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit
+         tasty-quickcheck tasty-rerun template-haskell text time torrent
+         transformers unix unix-compat utf8-string uuid wai wai-extra warp
+         warp-tls xml-types yesod yesod-core yesod-default yesod-form
+         yesod-static
        ];
        buildTools = [
          bup curl git gnupg1 lsof openssh perl rsync wget which
@@ -57398,6 +57399,7 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time time-locale-compat
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -82502,8 +82504,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.1.0";
-       sha256 = "1smki1bp50vnmq6i2gxafj271sqwbizfdyqx0ggar6zbxv436gzm";
+       version = "0.1.1";
+       sha256 = "0kzziark5y41ig6z3qaa66x5avibwp6k74qcs9jf38hnl9z74pfr";
        buildDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
          monad-control monad-time mtl old-locale split stm text time
@@ -93770,6 +93772,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "osc" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring
+     , data-binary-ieee754, network
+     }:
+     mkDerivation {
+       pname = "osc";
+       version = "1.0.0.2";
+       sha256 = "0f7diw6nna7mq5rsn63jk9n230pnrr5ppi5dp8rcpniqry2gs1q3";
+       buildDepends = [
+         attoparsec base binary bytestring data-binary-ieee754 network
+       ];
+       homepage = "https://github.com/peacememories/haskell-osc";
+       description = "A library to handle messages in the OSC protocol";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "osdkeys" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , containers, libnotify, process, resourcet, time, transformers
@@ -94186,20 +94204,21 @@ self: {
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051, split
-     , syb, tagsoup, temporary, text, time, vector, xml-conduit, yaml
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time, vector
+     , xml-conduit, yaml
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.6.0.1";
-       sha256 = "05w6djrgpgf68shhbiv42gl0lvjiv8n9rrn0cd959dl3zdznssdg";
+       version = "0.7";
+       sha256 = "1ayh9gpkj128rsxiqjbgwr62fipc5a5h5vkkjnicjxgpwshnrcb8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson aeson-pretty attoparsec base bytestring containers
          data-default directory filepath hs-bibutils mtl old-locale pandoc
-         pandoc-types parsec process rfc5051 split syb tagsoup temporary
-         text time vector xml-conduit yaml
+         pandoc-types parsec process rfc5051 setenv split syb tagsoup
+         temporary text time vector xml-conduit yaml
        ];
        testDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -95033,6 +95052,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path" = callPackage
+    ({ mkDerivation, base, exceptions, filepath, hspec, HUnit, mtl
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "path";
+       version = "0.0.0";
+       sha256 = "1gk9z25d7swhg7zi6nxd076wcqfw2hxvq29hxqzc3drdaas2sc0b";
+       buildDepends = [ base exceptions filepath template-haskell ];
+       testDepends = [ base hspec HUnit mtl ];
+       description = "Path";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "path-pieces" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -96327,19 +96360,52 @@ self: {
      }) {};
 
   "pg-harness" = callPackage
+    ({ mkDerivation, async, base, bytestring, HTTP, ini
+     , postgresql-simple, random, scotty, text, transformers
+     }:
+     mkDerivation {
+       pname = "pg-harness";
+       version = "0.2.1";
+       sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         async base bytestring HTTP ini postgresql-simple random scotty text
+         transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/BardurArantsson/pg-harness";
+       description = "REST service and library for creating/consuming temporary PostgreSQL databases";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
+  "pg-harness-client" = callPackage
+    ({ mkDerivation, base, bytestring, HTTP }:
+     mkDerivation {
+       pname = "pg-harness-client";
+       version = "0.3.1";
+       sha256 = "12z5354in4zswn219cvxhqbva76p2jsccmzdn5iyw5g401546lr2";
+       buildDepends = [ base bytestring HTTP ];
+       homepage = "https://github.com/BardurArantsson/pg-harness";
+       description = "Client library for pg-harness-server";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "pg-harness-server" = callPackage
     ({ mkDerivation, async, base, ini, postgresql-simple, random
      , scotty, text, transformers
      }:
      mkDerivation {
-       pname = "pg-harness";
-       version = "0.1.0";
-       sha256 = "0ds161h0pcazq1lnbf5m89vm36mwjnhxakglyb2ixg39sd5a03g1";
+       pname = "pg-harness-server";
+       version = "0.3.1";
+       sha256 = "0459i1x5hsxkihyb5a8ca947ngs0gg8866s77bcdsifjw6b3cb4a";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          async base ini postgresql-simple random scotty text transformers
        ];
        jailbreak = true;
+       homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service for creating temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -113496,6 +113562,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sorted-list" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "sorted-list";
+       version = "0.1.2.1";
+       sha256 = "0jjzhi2wj4ca8bvwbv5nnljyli7c9ravigkndk85wdyzz74n0qbh";
+       buildDepends = [ base ];
+       homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
+       description = "Type-enforced sorted lists and related functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sorting" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -119650,14 +119728,14 @@ self: {
     ({ mkDerivation, base, c2hs, termbox }:
      mkDerivation {
        pname = "termbox-bindings";
-       version = "0.1.0.0";
-       sha256 = "050m1yl6x619pnkmfmg0zkr4rw5l93vgb1pjg9xizrdrqfh5dxhi";
+       version = "0.1.0.3";
+       sha256 = "00s3j6ccc63ycbj2lxzl2200ffwzslaxdny7d0b9dyzgn6n1pal7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base ];
        buildTools = [ c2hs ];
        extraLibraries = [ termbox ];
-       homepage = "github.com/luciferous/termbox-bindings";
+       homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the termbox library";
        license = stdenv.lib.licenses.bsd3;
      }) { termbox = null;};
@@ -121062,6 +121140,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-typegraph" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, data-default
+     , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl
+     , syb, template-haskell, text, th-desugar, th-orphans
+     , th-reify-many
+     }:
+     mkDerivation {
+       pname = "th-typegraph";
+       version = "0.14";
+       sha256 = "1f2wgr429hkv687mk9qgaqnr1n9nznl90cy7w74w4jzp6fd6rskp";
+       buildDepends = [
+         base containers data-default haskell-src-exts lens mtl syb
+         template-haskell th-desugar th-orphans
+       ];
+       testDepends = [
+         array base bytestring containers deepseq ghc-prim hspec hspec-core
+         lens mtl syb template-haskell text th-desugar th-orphans
+         th-reify-many
+       ];
+       homepage = "https://github.com/seereason/th-typegraph";
+       description = "Graph of the subtype relation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "themoviedb" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, either
      , http-client, http-client-tls, http-types, mtl, network
@@ -124044,15 +124146,14 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.1.1.4";
-       sha256 = "006qdp9imdnaprpaf4yk0zks0p3ry4ngag4i533wyik2xrz3q8ir";
+       version = "0.1.1.5";
+       sha256 = "1205s5a7x8vnv09717x6a2dv7y8rvzcxmmh6hm4cyph6b5p485vz";
        buildDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
        testDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
-       jailbreak = true;
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
@@ -125165,22 +125266,23 @@ self: {
      }) {};
 
   "unbound-generics" = callPackage
-    ({ mkDerivation, base, containers, contravariant, mtl, QuickCheck
-     , tasty, tasty-hunit, tasty-quickcheck, transformers
-     , transformers-compat
+    ({ mkDerivation, base, containers, contravariant, mtl, profunctors
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.1";
-       sha256 = "10flwmkmpnkxib1v9f5qv11wnvjmnn3aiag4f2qgpdc3hadq6j0q";
+       version = "0.1.2";
+       sha256 = "14mcv61ci6azzykx287b9cpcwyzbzr66i5s43vdd9wnzrg4mia03";
        buildDepends = [
-         base containers contravariant mtl transformers transformers-compat
+         base containers contravariant mtl profunctors template-haskell
+         transformers transformers-compat
        ];
        testDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://github.com/lambdageek/unbound-generics";
-       description = "Reimplementation of Unbound using GHC Generics";
+       description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -134039,6 +134141,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-crud" = callPackage
+    ({ mkDerivation, base, classy-prelude, containers, monad-control
+     , persistent, random, stm, uuid, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-crud";
+       version = "0.1.1";
+       sha256 = "06m24i27842pc599zrmj5nv0afx8ci07961gjagdsc02zhpx7896";
+       buildDepends = [
+         base classy-prelude containers monad-control persistent random stm
+         uuid yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "https://github.com/league/yesod-crud";
+       description = "Generic administrative CRUD operations as a Yesod subsite";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-datatables" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, data-default
      , HUnit, monad-control, persistent, persistent-sqlite
@@ -135785,7 +135905,9 @@ self: {
      mkDerivation {
        pname = "zlib";
        version = "0.6.1.0";
+       revision = "1";
        sha256 = "1yc4zfysbj28px064bfwz9n3b3i57c1dsfvkzgfxxmgj1mq65q7n";
+       editedCabalFile = "4efd1cd219decf6e6a97795a52344922c36aace77dc4b6834502c218d48b9f13";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck

From 192cc6917677cbaecff2bd379357d9902d3ea696 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 09:37:34 +0000
Subject: [PATCH 0636/1143] mpv: 0.8.3 -> 0.9.1

---
 pkgs/applications/video/mpv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 464f5130b67a..8e516fd91e32 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -59,11 +59,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.8.3";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "1kw9hr957cxqgm2i94bgqc6sskm6bwhm0akzckilhs460b43h409";
+    sha256 = "17hpx8wb4b6hjhc208jn71p02s0gd6665vzyyy249k6jfn2nh8sx";
   };
 
   buildInputs = 

From 60d405f573255bcc5fbc0441064d164799ea788d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 11:39:38 +0200
Subject: [PATCH 0637/1143] haskell-smaoin has been fixed upstream.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 54c1fe2be1bf..f0863b6fa06b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -811,7 +811,4 @@ self: super: {
   # https://github.com/adamwalker/sdr/issues/1
   sdr = dontCheck super.sdr;
 
-  # Reported upstream by e-mail.
-  smaoin = dontCheck super.smaoin;
-
 }

From 839f3c3ab70f48a23bb613e90b29fb47072f0788 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 10:45:14 +0000
Subject: [PATCH 0638/1143] rmlint: 2.0.0 -> 2.1.0

---
 pkgs/tools/misc/rmlint/default.nix     |  6 ++----
 pkgs/tools/misc/rmlint/fix-scons.patch | 22 ----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/misc/rmlint/fix-scons.patch

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index aed93775ce98..9e61a5c195e4 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -4,15 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rmlint-${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
-    sha256 = "14jiswagipsmzxclcskn672ws4126p65l6hlzkkvanyv8gmpv90f";
+    sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g";
   };
 
-  patches = [ ./fix-scons.patch ];
-
   configurePhase = "scons config";
 
   buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ];
diff --git a/pkgs/tools/misc/rmlint/fix-scons.patch b/pkgs/tools/misc/rmlint/fix-scons.patch
deleted file mode 100644
index 4d7d832f13d7..000000000000
--- a/pkgs/tools/misc/rmlint/fix-scons.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git b/SConstruct a/SConstruct
-old mode 100644
-new mode 100755
-index a7fca2e..561007e
---- b/SConstruct
-+++ a/SConstruct
-@@ -404,11 +404,10 @@ options = dict(
-     SHLINKCOMSTR=link_shared_library_message,
-     LINKCOMSTR=link_program_message,
-     PREFIX=GetOption('prefix'),
--    ENV={
--        'PATH': os.environ['PATH'],
--        'TERM': os.environ['TERM'],
--        'HOME': os.environ['HOME']
--    }
-+    ENV = dict([ (key, os.environ[key])
-+                 for key in os.environ
-+                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
-+              ])
- )
- 
- if ARGUMENTS.get('VERBOSE') == "1":

From cc8a0372e472d268d601004a2c49b8e2d1665821 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 10:52:25 +0000
Subject: [PATCH 0639/1143] ranger: 1.7.0 -> 1.7.1

---
 pkgs/applications/misc/ranger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index cc8bd42ec39f..7c08bf9d2e79 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, python, fetchurl }:
 
 buildPythonPackage rec {
-  name = "ranger-1.7.0";
+  name = "ranger-1.7.1";
 
   meta = {
     description = "File manager with minimalistic curses interface";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://ranger.nongnu.org/${name}.tar.gz";
-    sha256 = "066lp1k2zcz2lnww2aj0m3fgn9g5ms67kxgclhgq66pxkjwgc4kx";
+    sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q";
   };
 
   propagatedBuildInputs = with python.modules; [ curses ];

From 856f1c79e12732d7614c7b3b12ea2ba7d1fd0626 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 11:02:19 +0000
Subject: [PATCH 0640/1143] slock: 1.1 -> 1.2

---
 pkgs/misc/screensavers/slock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index c88be58abb22..5c731ff20d7f 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, xproto, libX11, libXext }:
 stdenv.mkDerivation rec {
-  name = "slock-1.1";
+  name = "slock-1.2";
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "1r70s3npmp0nyrfdsxz8cw1i1z8n9phqdlw02wjphv341h3yajp0";
+    sha256 = "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il";
   };
   buildInputs = [ xproto libX11 libXext	];
   installFlags = "DESTDIR=\${out} PREFIX=";

From 29daa71ce9bb3464d3392477b2b87469d73016f3 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 9 May 2015 11:46:31 +0000
Subject: [PATCH 0641/1143] git: 2.3.6 -> 2.4.0

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 474d509297f3..620d3264be88 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.3.6";
+  version = "2.4.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1z30gj5a9n0sylqlwd35vvpi49051ql44xzmarkkcirbx5a1rq1w";
+    sha256 = "095v8n0b0c314sfg5mrnxjx2d9mklbjcmajh92kmi6b5jkfkhd5k";
   };
 
   patches = [

From d4843286195c5556eb6431bd45b664d9019f3e08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 11:40:02 +0200
Subject: [PATCH 0642/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/7424fa13dba1209a3dccbd01c99675ea44e41b05
 with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022

---
 .../haskell-modules/hackage-packages.nix      | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 93c7bbbf43ac..56c6418afc6b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12497,6 +12497,7 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAwolf" = callPackage
@@ -14777,6 +14778,7 @@ self: {
        homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypingTester" = callPackage
@@ -29306,8 +29308,8 @@ self: {
      }:
      mkDerivation {
        pname = "caramia";
-       version = "0.7.2.1";
-       sha256 = "01l6i8cb2q73vc4w6fbn90mkx7sxxsnwzhj0jg4yjhnrg4js0hlh";
+       version = "0.7.2.2";
+       sha256 = "1cvpyad7kmkndan1bfpfaav6lara8g78x02pgascrq8n73b2jcgs";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -29318,7 +29320,6 @@ self: {
          base containers HUnit linear sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/Noeda/caramia/";
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
@@ -32480,10 +32481,13 @@ self: {
      mkDerivation {
        pname = "cndict";
        version = "0.6.1";
+       revision = "1";
        sha256 = "0pi0n1chwv6y3ch7dw2smrllwsdiy6r295lmmsnfnbprc8w6gksq";
+       editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468";
        buildDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
        license = stdenv.lib.licenses.publicDomain;
@@ -93346,26 +93350,26 @@ self: {
 
   "opml-conduit" = callPackage
     ({ mkDerivation, base, case-insensitive, conduit
-     , conduit-combinators, containers, data-default, exceptions, lens
-     , mono-traversable, monoid-subclasses, mtl, network-uri, QuickCheck
+     , conduit-combinators, containers, data-default, exceptions
+     , hashable, hashable-time, hlint, lens, mono-traversable
+     , monoid-subclasses, mtl, network-uri, QuickCheck
      , quickcheck-instances, resourcet, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, xml-conduit, xml-types
+     , tasty-quickcheck, text, time, timerep, unordered-containers
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.1.0.0";
-       revision = "2";
-       sha256 = "055ngv2ibb7bk99y67ag9y7xxhyzag08mgb6zf1aqfjgpna6dkcf";
-       editedCabalFile = "74ca928e036892a1db09b1309addb87cba9dd7332fc5c9aab8413e6635e357c9";
+       version = "0.2.0.0";
+       sha256 = "0dpsxssr8h3ph9c5plrmpxv9mv1mg5zb3wrwfbkyb5g7ja91qs4b";
        buildDepends = [
          base case-insensitive conduit containers data-default exceptions
-         lens mono-traversable monoid-subclasses network-uri QuickCheck
-         quickcheck-instances semigroups text time timerep xml-conduit
-         xml-types
+         hashable hashable-time lens mono-traversable monoid-subclasses
+         network-uri QuickCheck quickcheck-instances semigroups text time
+         timerep unordered-containers xml-conduit xml-types
        ];
        testDepends = [
-         base conduit conduit-combinators containers exceptions lens mtl
-         network-uri resourcet tasty tasty-hunit tasty-quickcheck
+         base conduit conduit-combinators containers exceptions hlint lens
+         mtl network-uri resourcet tasty tasty-hunit tasty-quickcheck
          xml-conduit
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
@@ -99414,6 +99418,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prettyFunctionComposing" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "prettyFunctionComposing";
+       version = "1.0.1";
+       sha256 = "0c39dyjlcrah1aq2rkk7zqysmzxqym6chv8x9zmifclvn5a4j98b";
+       buildDepends = [ base ];
+       description = "prettier function composition by (°)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prettyclass" = callPackage
     ({ mkDerivation, base, pretty }:
      mkDerivation {
@@ -99755,8 +99770,11 @@ self: {
      mkDerivation {
        pname = "process-listlike";
        version = "1.0";
+       revision = "1";
        sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r";
+       editedCabalFile = "72b239b889868394c365985197588cda0ec8aac03d4796a9e212b4044c966f16";
        buildDepends = [ base bytestring deepseq ListLike process text ];
+       jailbreak = true;
        homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
@@ -113494,6 +113512,7 @@ self: {
        homepage = "https://github.com/mhwombat/som";
        description = "Self-Organising Maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sonic-visualiser" = callPackage
@@ -119738,6 +119757,7 @@ self: {
        homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the termbox library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { termbox = null;};
 
   "terminal-progress-bar" = callPackage
@@ -125284,6 +125304,7 @@ self: {
        homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbounded-delays" = callPackage

From c65e48ca96bcd7b86f7e6d988cbef1607fc2047c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 11:49:54 +0200
Subject: [PATCH 0643/1143] haskell-sandi: jailbreak restriction on "base ==
 4.8.*" so that we can build git-annex and hledger

Reported in https://github.com/magthe/sandi/issues/7.
---
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 5 +++++
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 1adccd36dca1..8be816b0c9b6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -80,4 +80,9 @@ self: super: {
   # and are virtually impossible to compile on Hydra.
   conduit = super.conduit_1_2_4_1;
 
+  # https://github.com/magthe/sandi/issues/7
+  sandi = overrideCabal super.sandi (drv: {
+    patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
+  );
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index f481f75c2f8d..21fdc86d89a6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -136,4 +136,9 @@ self: super: {
   # and are virtually impossible to compile on Hydra.
   conduit = super.conduit_1_2_4_1;
 
+  # https://github.com/magthe/sandi/issues/7
+  sandi = overrideCabal super.sandi (drv: {
+    patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
+  );
+
 }

From 535cbdbf73886d473ce91bfff8f7bc4547d24ef9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 12:18:04 +0200
Subject: [PATCH 0644/1143] haskell-email-validate: disable test suite to fix
 the build

Reported in https://github.com/Porges/email-validate-hs/issues/12.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f0863b6fa06b..ac8ac4263b47 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -811,4 +811,7 @@ self: super: {
   # https://github.com/adamwalker/sdr/issues/1
   sdr = dontCheck super.sdr;
 
+  # https://github.com/Porges/email-validate-hs/issues/12
+  email-validate = dontCheck super.email-validate;
+
 }

From 57348105a2a08ec246f34cbdcdf6d2de369d9e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 9 May 2015 14:58:40 +0200
Subject: [PATCH 0645/1143] doc/stdenv: fix manual build after #7711

---
 doc/stdenv.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a03b3716a87b..6fdebda09f98 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -545,13 +545,13 @@ script) if it exists.</para>
     such.</para></footnote>.  If this is undesirable, set this
     variable to true.</para></listitem>
   </varlistentry>
-  
+
   <varlistentry>
     <term><varname>dontDisableStatic</varname></term>
     <listitem><para>By default, when the configure script has
     <option>--enable-static</option>, the option
     <option>--disable-static</option> is added to the configure flags.</para>
-    <para></para>If this is undesirable, set this variable to
+    <para>If this is undesirable, set this variable to
     true.</para></listitem>
   </varlistentry>
 

From a7a0fcfbd21d6253ab681c9a1a66f22ca8833e26 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Fri, 8 May 2015 12:10:40 +0200
Subject: [PATCH 0646/1143] Add s3ql package

S3QL is a file system that stores all its data online using storage
services like Google Storage, Amazon S3, or OpenStack. S3QL effectively
provides a hard disk of dynamic, infinite capacity that can be accessed
from any computer with internet access running Linux, FreeBSD or OS-X.
---
 pkgs/tools/backup/s3ql/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/backup/s3ql/default.nix

diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
new file mode 100644
index 000000000000..b455c672b104
--- /dev/null
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, python3Packages, sqlite  }:
+
+python3Packages.buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "s3ql";
+  version = "2.13";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
+    sha256 = "0bxps1iq0rv7bg2b8mys6zyjp912knm6zmafhid1jhsv3xyby4my";
+  };
+
+  propagatedBuildInputs = with python3Packages;
+    [ sqlite apsw pycrypto requests defusedxml dugong llfuse ];
+
+  meta = with stdenv.lib; {
+    description = "A full-featured file system for online data storage";
+    homepage = "https://bitbucket.org/nikratio/s3ql";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ rushmorem ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de29fff28e61..d3d05602b095 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9676,6 +9676,8 @@ let
 
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
+  s3ql = callPackage ../tools/backup/s3ql { };
+
   sassc = callPackage ../development/tools/sassc { };
 
   schedtool = callPackage ../os-specific/linux/schedtool { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11773446e940..e03efe9f7858 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1005,6 +1005,28 @@ let
     };
   };
 
+  defusedxml = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "defusedxml";
+    version = "0.4.1";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.gz";
+      sha256 = "0y147zy3jqmk6ly7fbhqmzn1hf41xcb53f2vcc3m8x4ba5d1smfd";
+    };
+  };
+
+  dugong = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "dugong";
+    version = "3.5";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.bz2";
+      sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24";
+    };
+
+    disabled = pythonOlder "3.3";	# Library does not support versions older than 3.3
+  };
+
   iowait = buildPythonPackage rec {
     name = "iowait-0.2";
 

From 8bba7c5cf1593f8533c92a131ae2091d603e2ad9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 03:43:40 +0200
Subject: [PATCH 0647/1143] Add cfr 0_100: another Java decompiler

---
 pkgs/development/tools/java/cfr/default.nix | 41 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/java/cfr/default.nix

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
new file mode 100644
index 000000000000..6025a59f44cb
--- /dev/null
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, jre }:
+
+let version = "0_100"; in
+stdenv.mkDerivation rec {
+  name = "cfr-${version}";
+
+  src = fetchurl {
+    sha256 = "0q5kh5qdksykz339p55jz0q5cjqvxdzv3a7r4kkijgbfjm1ldr5f";
+    url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Another java decompiler";
+    longDescription = ''
+      CFR will decompile modern Java features - Java 8 lambdas (pre and post
+      Java beta 103 changes), Java 7 String switches etc, but is written
+      entirely in Java 6.
+    '';
+    homepage = http://www.benf.org/other/cfr/;
+    license = with licenses; mit;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ jre ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    jar=$out/share/cfr/cfr_${version}.jar
+
+    install -Dm644 ${src} $jar
+
+    cat << EOF > cfr
+    #!${stdenv.shell}
+    exec ${jre}/bin/java -jar $jar "\''${@}"
+    EOF
+    install -Dm755 cfr $out/bin/cfr
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3d05602b095..fac9c82ee0a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5046,6 +5046,8 @@ let
     ruby = ruby_2_0_0;
   };
 
+  cfr = callPackage ../development/tools/java/cfr { };
+
   chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; };
 
   chrpath = callPackage ../development/tools/misc/chrpath { };

From 5dae1f659e4db2e647dcacd3f98a2864e7216cd7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 05:25:01 +0200
Subject: [PATCH 0648/1143] man-pages 3.83 -> 4.00

---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 5c93ecc94690..14cd41adbec0 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let version = "3.83"; in
+let version = "4.00"; in
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1wksxxfvn8avfl01qk0i61zzgkkay29lpmbfal26a542yahydz3j";
+    sha256 = "18zb1g12s15sanffh0sykmmyx0j176pp7q1xxs0gk0imgvmn8hj4";
   };
 
   makeFlags = "MANDIR=$(out)/share/man";

From 4081886d1accaa3e9d178fe48be5f1fda097388d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 17:40:51 +0200
Subject: [PATCH 0649/1143] alloy: remove left-over no-op

---
 pkgs/development/tools/alloy/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index da247072b070..2c16f1f6f6cf 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
   phases = [ "installPhase" ];
 
   installPhase = ''
-    jar=`basename ${src}`
     jar=$out/share/alloy/alloy${version}.jar
 
     install -Dm644 ${src} $jar

From a6f1db46e7bd66888b562559342435c2ff663ff0 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Thu, 7 May 2015 13:00:01 -0600
Subject: [PATCH 0650/1143] Add EventStore package

This turns the V8 expression into a generic build, so that we can
build with the required version.
---
 pkgs/development/libraries/v8/3.24.10.nix |  6 ++
 pkgs/development/libraries/v8/default.nix | 71 ++--------------------
 pkgs/development/libraries/v8/generic.nix | 73 +++++++++++++++++++++++
 pkgs/servers/nosql/eventstore/default.nix | 54 +++++++++++++++++
 pkgs/top-level/all-packages.nix           |  8 +++
 5 files changed, 145 insertions(+), 67 deletions(-)
 create mode 100644 pkgs/development/libraries/v8/3.24.10.nix
 create mode 100644 pkgs/development/libraries/v8/generic.nix
 create mode 100644 pkgs/servers/nosql/eventstore/default.nix

diff --git a/pkgs/development/libraries/v8/3.24.10.nix b/pkgs/development/libraries/v8/3.24.10.nix
new file mode 100644
index 000000000000..e7b10f23ac8a
--- /dev/null
+++ b/pkgs/development/libraries/v8/3.24.10.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "3.24.10";
+  sha256 = "1blz5h9syk93bb4x3shcai3s2jhh6ai4bpymr9rz0f1ysvg60x75";
+})
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index dbf2f376d0f9..6ae5c896efa1 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -1,69 +1,6 @@
-{ stdenv, fetchurl, gyp, readline, python, which, icu }:
+{ callPackage, ... } @ args:
 
-assert readline != null;
-
-let
-  arch = if stdenv.is64bit then "x64" else "ia32";
-in
-
-stdenv.mkDerivation rec {
-  name = "v8-${version}";
+callPackage ./generic.nix (args // {
   version = "3.30.33.16";
-
-  src = fetchurl {
-    url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
-        + "${name}.tar.bz2";
-    sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45";
-  };
-
-  patchPhase = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
-  '';
-
-  configurePhase = ''
-    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
-    PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
-      build/gyp_v8 \
-        -f make \
-        --generator-output="out" \
-        -Dflock_index=0 \
-        -Dv8_enable_i18n_support=1 \
-        -Duse_system_icu=1 \
-        -Dconsole=readline \
-        -Dcomponent=shared_library \
-        -Dv8_target_arch=${arch}
-  '';
-
-  nativeBuildInputs = [ which ];
-  buildInputs = [ readline python icu ];
-
-  buildFlags = [
-    "LINK=g++"
-    "-C out"
-    "builddir=$(CURDIR)/Release"
-    "BUILDTYPE=Release"
-  ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-    install -vD out/Release/d8 "$out/bin/d8"
-    ${if stdenv.system == "x86_64-darwin" then ''
-    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
-    '' else ''
-    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
-    ''}
-    cp -vr include "$out/"
-  '';
-
-  postFixup = if stdenv.isDarwin then ''
-    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
-    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
-  '' else null;
-
-  meta = with stdenv.lib; {
-    description = "Google's open source JavaScript engine";
-    platforms = with platforms; linux;
-    license = licenses.bsd3;
-  };
-}
+  sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45";
+})
diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix
new file mode 100644
index 000000000000..b056ba640d2d
--- /dev/null
+++ b/pkgs/development/libraries/v8/generic.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, gyp, readline, python, which, icu
+, version
+, sha256
+, ...
+}:
+
+assert readline != null;
+
+let
+  arch = if stdenv.is64bit then "x64" else "ia32";
+in
+
+stdenv.mkDerivation rec {
+  name = "v8-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+        + "${name}.tar.bz2";
+    inherit sha256;
+  };
+
+  patchPhase = ''
+    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
+  '';
+
+  configurePhase = ''
+    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
+    PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
+      build/gyp_v8 \
+        -f make \
+        --generator-output="out" \
+        -Dflock_index=0 \
+        -Dv8_enable_i18n_support=1 \
+        -Duse_system_icu=1 \
+        -Dconsole=readline \
+        -Dcomponent=shared_library \
+        -Dv8_target_arch=${arch}
+  '';
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ readline python icu ];
+
+  buildFlags = [
+    "LINK=g++"
+    "-C out"
+    "builddir=$(CURDIR)/Release"
+    "BUILDTYPE=Release"
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -vD out/Release/d8 "$out/bin/d8"
+    ${if stdenv.system == "x86_64-darwin" then ''
+    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
+    '' else ''
+    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
+    ''}
+    cp -vr include "$out/"
+  '';
+
+  postFixup = if stdenv.isDarwin then ''
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+  '' else null;
+
+  meta = with stdenv.lib; {
+    description = "Google's open source JavaScript engine";
+    platforms = with platforms; linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
new file mode 100644
index 000000000000..e13d99c104d4
--- /dev/null
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchgit, fetchpatch, git, mono, v8, icu }:
+
+# There are some similarities with the pinta derivation. We should
+# have a helper to make it easy to package these Mono apps.
+
+stdenv.mkDerivation rec {
+  name = "EventStore-${version}";
+  version = "3.0.3";
+  src = fetchgit {
+    url = "https://github.com/EventStore/EventStore.git";
+    rev = "a1382252dd1ed0554ddb04015cdb2cbc1b0a65c1";
+    sha256 = "07ir6jlli2q1yvsnyw8r8dfril6h1wmfj98yf7a6k81585v2mc6g";
+    leaveDotGit = true;
+  };
+
+  patches = [
+    # see: https://github.com/EventStore/EventStore/issues/461
+    (fetchpatch {
+      url = https://github.com/EventStore/EventStore/commit/9a0987f19935178df143a3cf876becaa1b11ffae.patch;
+      sha256 = "04qw0rb1pypa8dqvj94j2mwkc1y6b40zrpkn1d3zfci3k8cam79y";
+    })
+  ];
+
+  buildPhase = ''
+    ln -s ${v8}/lib/libv8.so src/libs/libv8.so
+    ln -s ${icu}/lib/libicui18n.so src/libs/libicui18n.so
+    ln -s ${icu}/lib/libicuuc.so src/libs/libicuuc.so
+
+    ./build.sh js1
+    ./build.sh quick ${version}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib/eventstore/clusternode}
+    cp -r bin/clusternode/* $out/lib/eventstore/clusternode/
+    cat > $out/bin/clusternode << EOF
+    #!/bin/sh
+    exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@"
+    EOF
+    chmod +x $out/bin/clusternode
+  '';
+
+  buildInputs = [ git v8 mono ];
+
+  dontStrip = true;
+
+  meta = {
+    homepage = https://geteventstore.com/;
+    description = "Event sourcing database with processing logic in JavaScript.";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fac9c82ee0a0..e3b505bd0035 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7879,6 +7879,10 @@ let
     inherit (pythonPackages) gyp;
   };
 
+  v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix {
+    inherit (pythonPackages) gyp;
+  };
+
   v8 = callPackage ../development/libraries/v8 {
     inherit (pythonPackages) gyp;
   };
@@ -8471,6 +8475,10 @@ let
 
   elasticmq = callPackage ../servers/elasticmq { };
 
+  eventstore = callPackage ../servers/nosql/eventstore {
+    v8 = v8_3_24_10;
+  };
+
   etcdctl = callPackage ../development/tools/etcdctl { };
 
   exim = callPackage ../servers/mail/exim { };

From f7dc64575df798db9a48d1ef9147a02fef5dcc9b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 9 May 2015 20:40:42 +0200
Subject: [PATCH 0651/1143] libsodium: 1.0.2 -> 1.0.3

---
 pkgs/development/libraries/libsodium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 3433417fb921..43f43d3cb88a 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.2";
+  name = "libsodium-1.0.3";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
+    sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp";

From 34b50b6765042512b6bc1139bd96e7ebc612fc41 Mon Sep 17 00:00:00 2001
From: Erik Timan <dev@timan.info>
Date: Sat, 9 May 2015 19:32:32 +0000
Subject: [PATCH 0652/1143] python-packages: azure 0.10.0 -> 0.10.2

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e03efe9f7858..2c5814721f7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -733,12 +733,12 @@ let
   }));
 
   azure = buildPythonPackage rec {
-    version = "0.10.0";
+    version = "0.10.2";
     name = "azure-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/azure/${name}.zip";
-      md5 = "305b0036df5696d68369807835f554ae";
+      md5 = "8eaa0f8e649b21b6527a5ee801cef33a";
     };
 
     propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ];

From 7dbe0ff77b76479d0141caf3b8b61c835d1fca01 Mon Sep 17 00:00:00 2001
From: Erik Timan <dev@timan.info>
Date: Sat, 9 May 2015 20:02:40 +0000
Subject: [PATCH 0653/1143] python-packages: disable older than 2.7 for azure

---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c5814721f7f..d3f10c4722b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -735,6 +735,7 @@ let
   azure = buildPythonPackage rec {
     version = "0.10.2";
     name = "azure-${version}";
+    disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/azure/${name}.zip";

From d57a93f04bc1b11f8abd37692e6d1c595369a62e Mon Sep 17 00:00:00 2001
From: Erik Timan <dev@timan.info>
Date: Sat, 9 May 2015 19:45:09 +0000
Subject: [PATCH 0654/1143] python-packages: icalendar 3.8.4 -> 3.9.0

dateutil is a new depencency for icalendar 3.9.0.
---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3f10c4722b7..a7e9e5de8b57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6063,16 +6063,16 @@ let
   };
 
   icalendar = buildPythonPackage rec {
-    version = "3.8.4";
+    version = "3.9.0";
     name = "icalendar-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/icalendar/${name}.zip";
-      md5 = "d700e6e75613fd1ee882c4b11c58940c";
+      url = "https://pypi.python.org/packages/source/i/icalendar/${name}.tar.gz";
+      md5 = "072c67a4c461864abd604631d7cf67e7";
     };
 
     buildInputs = with self; [ setuptools ];
-    propagatedBuildInputs = with self; [ pytz ];
+    propagatedBuildInputs = with self; [ dateutil pytz ];
 
     meta = with stdenv.lib; {
       description = "A parser/generator of iCalendar files";

From 6c0b0a0248e8d74a54804c278208bc2720162c29 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sat, 9 May 2015 18:13:52 -0400
Subject: [PATCH 0655/1143] avxsynth: refactor & 2013-05-10 -> 2015-04-07

---
 pkgs/applications/video/avxsynth/default.nix | 50 +++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index a9a2ec46397f..d8ec715a38cb 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -1,26 +1,42 @@
-{ stdenv, fetchurl, ffmpeg, autoconf, automake, libtool, pkgconfig, log4cpp
-, pango, cairo, python, libjpeg, ffms
-, enableQt ? true, qt4}:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, cairo, ffmpeg, ffms, libjpeg, log4cpp, pango
+, avxeditSupport ? false, qt4 ? null
+}:
+
+let
+  inherit (stdenv.lib) enableFeature optional;
+in
 
 stdenv.mkDerivation rec {
-  name = "avxsynth-4.0-e153e672bf";
+  name = "avxsynth-${version}";
+  version = "2015-04-07";
 
-  src = fetchurl {
-    url = https://github.com/avxsynth/avxsynth/tarball/e153e672bf;
-    name = "${name}.tar.gz";
-    sha256 = "16l2ld8k1nfsms6jd9d9r4l247xxbncsak66w87icr20yzyhs14s";
+  src = fetchFromGitHub {
+    owner = "avxsynth";
+    repo = "avxsynth";
+    rev = "80dcb7ec8d314bc158130c92803308aa8e5e9242";
+    sha256 = "0kckggvgv68b0qjdi7ms8vi97b46dl63n60qr96d2w67lf2nk87z";
   };
 
-  buildInputs = [ ffmpeg autoconf automake libtool pkgconfig log4cpp pango cairo python
-    libjpeg ffms ]
-    ++ stdenv.lib.optional enableQt qt4;
+  configureFlags = [
+    "--enable-autocrop"
+    "--enable-framecapture"
+    "--enable-subtitle"
+    "--enable-ffms2"
+    (enableFeature avxeditSupport "avxedit")
+    "--with-jpeg=${libjpeg}/lib"
+  ];
 
-  preConfigure = "autoreconf -vfi";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  meta = {
-    homepage = https://github.com/avxsynth/avxsynth/wiki;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+  buildInputs = [ cairo ffmpeg ffms libjpeg log4cpp pango ]
+    ++ optional avxeditSupport qt4;
+
+  meta = with stdenv.lib; {
+    description = "A script system that allows advanced non-linear editing";
+    homepage = https://github.com/avxsynth/avxsynth;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ codyopel viric ];
+    platforms = platforms.linux;
   };
 }

From c250cf6f53ad035a5586dab764eb07b92ce29bb2 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sat, 9 May 2015 18:20:02 -0400
Subject: [PATCH 0656/1143] libsodium: refactor & remove duplicate

---
 .../haskell-modules/hackage-packages.nix      |  6 ++--
 .../libraries/libsodium/default.nix           |  5 ++--
 pkgs/development/libraries/sodium/default.nix | 28 -------------------
 .../libraries/sodium/default.upstream         |  1 -
 pkgs/servers/nosql/hyperdex/default.nix       |  2 +-
 pkgs/servers/nosql/hyperdex/libmacaroons.nix  |  4 +--
 pkgs/top-level/all-packages.nix               |  2 --
 7 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/sodium/default.nix
 delete mode 100644 pkgs/development/libraries/sodium/default.upstream

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 56c6418afc6b..7c724523c5d7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -107016,7 +107016,7 @@ self: {
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
-     , QuickCheck, saltine, sodium, tasty, tasty-quickcheck
+     , QuickCheck, saltine, libsodium, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "saltine-quickcheck";
@@ -107028,12 +107028,12 @@ self: {
        testDepends = [
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
-       extraLibraries = [ sodium ];
+       extraLibraries = [ libsodium ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) sodium;};
+     }) { inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 43f43d3cb88a..f824ab864a16 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    description = "Version of NaCl with hardware tests at runtime, not build time";
+    description = "A modern and easy-to-use crypto library";
+    homepage = http://doc.libsodium.org/;
     license = licenses.isc;
-    maintainers = with maintainers; [ viric wkennington ];
+    maintainers = with maintainers; [ raskin viric wkennington ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix
deleted file mode 100644
index 7bdec155813b..000000000000
--- a/pkgs/development/libraries/sodium/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, fetchurl}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="sodium";
-    version="1.0.2";
-    name="${baseName}-${version}";
-    hash="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
-    url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.2.tar.gz";
-    sha256="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
-  };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  meta = {
-    inherit (s) version;
-    description = ''A cryptography library with simple API'';
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/sodium/default.upstream b/pkgs/development/libraries/sodium/default.upstream
deleted file mode 100644
index ccc02cd89785..000000000000
--- a/pkgs/development/libraries/sodium/default.upstream
+++ /dev/null
@@ -1 +0,0 @@
-url http://download.dnscrypt.org/libsodium/releases/
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix
index 7ed3661b87ff..659081281ef0 100644
--- a/pkgs/servers/nosql/hyperdex/default.nix
+++ b/pkgs/servers/nosql/hyperdex/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool,
-  python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
+  python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
   flex, pandoc, help2man, autoconf-archive, callPackage }:
 
 assert stdenv.isLinux;
diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix
index 2d709c5bbd1d..5d91a82a8ec6 100644
--- a/pkgs/servers/nosql/hyperdex/libmacaroons.nix
+++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, autoconf, automake, libtool, 
-  pkgconfig, sodium, python }:
+  pkgconfig, libsodium, python }:
 stdenv.mkDerivation rec {
   name = "libmacaroons-${version}";
   version = "HEAD";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip";
     sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik";
   };
-  buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ];
+  buildInputs = [ unzip autoconf automake libtool python libsodium pkgconfig ];
   preConfigure = "autoreconf -i";
   
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3b505bd0035..80ff1ced0d80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7692,8 +7692,6 @@ let
 
   socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
 
-  sodium = callPackage ../development/libraries/sodium {};
-
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
 
   soprano = callPackage ../development/libraries/soprano { };

From 3da4a55ac44e01e22d841072457a980d48700a19 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 9 May 2015 17:41:40 -0700
Subject: [PATCH 0657/1143] screenfetch: 3.6.2 -> 2015-04-20

---
 pkgs/tools/misc/screenfetch/default.nix | 32 +++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 442922b78054..418afee8135f 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -1,21 +1,33 @@
-{ stdenv, fetchgit, xdpyinfo, xprop }:
+{ stdenv, fetchgit, makeWrapper
+, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop
+}:
 
-let
-  version = "3.6.2";
-in
 stdenv.mkDerivation {
-  name = "screenFetch-${version}";
-  pname = "screenfetch";
+  name = "screenFetch-2015-04-20";
 
   src = fetchgit {
     url = git://github.com/KittyKatt/screenFetch.git;
-    rev = "dec1cd6c2471defe4459967fbc8ae15b55714338";
-    sha256 = "138a7g0za5dq27jx7x8gqg7gjkgyq0017v0nbcg68ys7dqlxsdl3";
+    rev = "53e1c0cccacf648e846057938a68dda914f532a1";
+    sha256 = "1wyvy1sn7vnclwrzd32jqlq6iirjkhp2ak55brhkpp9rj1qxk3q6";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   installPhase = ''
-    install -Dm 0755 $pname-dev $out/bin/$pname
-    install -Dm 0644 $pname.1 $out/man/man1/$pname.1
+    install -Dm 0755 screenfetch-dev $out/bin/screenfetch
+    install -Dm 0644 screenfetch.1 $out/man/man1/screenfetch.1
+
+    # Fix all of the depedencies of screenfetch
+    patchShebangs $out/bin/screenfetch
+    wrapProgram "$out/bin/screenfetch" \
+      --set PATH : "" \
+      --prefix PATH : "${coreutils}/bin" \
+      --prefix PATH : "${gawk}/bin" \
+      --prefix PATH : "${procps}/bin" \
+      --prefix PATH : "${gnused}/bin" \
+      --prefix PATH : "${findutils}/bin" \
+      --prefix PATH : "${xdpyinfo}/bin" \
+      --prefix PATH : "${xprop}/bin" \
   '';
 
   meta = {

From 4827deaf00d87660b230022d9e6327d564ed728f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 May 2015 10:11:29 +0200
Subject: [PATCH 0658/1143] pythonPackages: a bunch of build fixes

---
 pkgs/top-level/python-packages.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a7e9e5de8b57..f346b0a2b21c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2002,11 +2002,11 @@ let
   };
 
   coverage = buildPythonPackage rec {
-    name = "coverage-3.7";
+    name = "coverage-3.7.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz";
-      md5 = "055d82e6849d882ec6cf2ae1faca8e56";
+      sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni";
     };
 
     meta = {
@@ -2088,7 +2088,7 @@ let
 
     buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
                     self.iso8601 self.pyasn1 self.pytest ];
-    propagatedBuildInputs = [ self.six self.cffi  ];
+    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi; 
   };
 
   cryptography_vectors = buildPythonPackage rec {
@@ -3154,7 +3154,7 @@ let
       sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x";
     };
 
-    patchPhase = ''
+    prePatch = ''
       substituteInPlace setup.py \
         --replace "httplib2==0.8" "httplib2" \
         --replace "iso8601==0.1.4" "iso8601"
@@ -6664,6 +6664,8 @@ let
     buildInputs = with self; [ markupsafe nose mock ];
     propagatedBuildInputs = with self; [ markupsafe ];
 
+    doCheck = !isPyPy;  # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25
+
     meta = {
       description = "Super-fast templating language";
       homepage = http://www.makotemplates.org;
@@ -7278,8 +7280,8 @@ let
     };
   };
 
-  MySQL_python = buildPythonPackage {
-    name = "MySQL-python-1.2.3";
+  MySQL_python = buildPythonPackage rec {
+    name = "MySQL-python-1.2.5";
 
     disabled = isPy3k;
 
@@ -7287,13 +7289,13 @@ let
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = mirror://sourceforge/mysql-python/MySQL-python-1.2.3.tar.gz;
-      sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx";
+      url = "http://pypi.python.org/packages/source/M/MySQL-python/${name}.zip";
+      sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
     };
 
     buildInputs = with self; [ nose pkgs.openssl ];
 
-    propagatedBuildInputs = with self; [ pkgs.mysql pkgs.zlib ];
+    propagatedBuildInputs = with self; [ pkgs.mysql.lib pkgs.zlib ];
 
     meta = {
       description = "MySQL database binding for Python";
@@ -11073,11 +11075,11 @@ let
 
 
   scikitlearn = buildPythonPackage {
-    name = "scikit-learn-0.15.2";
+    name = "scikit-learn-0.16.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz";
-      md5 = "d9822ad0238e17b382a3c756ea94fe0d";
+      sha256 = "19jzmbi3j4ix8418i80ayl595dwyi4gy474kb2nc1v8kdwgqi2hs";
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];

From 5c6f159cd50c5f4ed390c706dd508cc4e8eee6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 May 2015 11:39:42 +0200
Subject: [PATCH 0659/1143] subunit: split package into everything and python
 lib

---
 .../development/libraries/subunit/default.nix | 26 +++++++++++++++++++
 pkgs/servers/samba/4.x.nix                    |  4 +--
 pkgs/top-level/all-packages.nix               |  3 ++-
 pkgs/top-level/python-packages.nix            | 21 +++------------
 4 files changed, 34 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/libraries/subunit/default.nix

diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix
new file mode 100644
index 000000000000..fa007da7d9cc
--- /dev/null
+++ b/pkgs/development/libraries/subunit/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }:
+
+# NOTE: for subunit python library see pkgs/top-level/python-packages.nix
+
+stdenv.mkDerivation rec {
+  name = "subunit-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m";
+  };
+
+  buildInputs = [ pkgconfig check cppunit perl pythonPackages.wrapPython ];
+
+  propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ];
+
+  postFixup = "wrapPythonPrograms";
+
+  meta = with stdenv.lib; {
+    description = "A streaming protocol for test results";
+    homepage = https://launchpad.net/subunit;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 49b81794f044..c785d76ddce7 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
 , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent
-, ldb, popt, iniparser, pythonPackages, libbsd, nss_wrapper, socket_wrapper
+, ldb, popt, iniparser, subunit, libbsd, nss_wrapper, socket_wrapper
 , uid_wrapper, libarchive
 
 # source3/wscript optionals
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42
     docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser
-    pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper
+    subunit libbsd nss_wrapper socket_wrapper uid_wrapper
     libarchive
 
     kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80ff1ced0d80..d5bd3d71c956 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8770,7 +8770,6 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    pythonPackages = python2Packages;
     kerberos = heimdal;
     gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
@@ -12184,6 +12183,8 @@ let
     pythonBindings = true;
   });
 
+  subunit = callPackage ../development/libraries/subunit { };
+
   surf = callPackage ../applications/misc/surf {
     webkit = webkitgtk2;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f346b0a2b21c..2e9469160546 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12085,26 +12085,13 @@ let
     };
   };
 
-  subunit = stdenv.mkDerivation rec {
-    name = "subunit-${version}";
-    version = "1.0.0";
-
-    src = pkgs.fetchurl {
-      url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
-      sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m";
-    };
-
-    buildInputs = (with pkgs; [ pkgconfig check cppunit perl ]) ++ [ self.wrapPython ];
+  subunit = buildPythonPackage rec {
+    name = pkgs.subunit.name;
+    src = pkgs.subunit.src;
 
     propagatedBuildInputs = with self; [ testtools testscenarios ];
 
-    postFixup = "wrapPythonPrograms";
-
-    meta = {
-      description = "A streaming protocol for test results";
-      homepage = https://launchpad.net/subunit;
-      license = licenses.asl20;
-    };
+    meta = pkgs.subunit.meta;
   };
 
 

From 3ed214e53c69d3350dc3bd1c6c81ad963dcffcbc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 11:55:21 +0300
Subject: [PATCH 0660/1143] Update ZPAQ

---
 pkgs/tools/archivers/zpaq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 5f8a03e2d67b..c8f3a890487f 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="704";
+    version="705";
     name="${baseName}-${version}";
-    hash="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91";
-    url="http://mattmahoney.net/dc/zpaq704.zip";
-    sha256="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91";
+    hash="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
+    url="http://mattmahoney.net/dc/zpaq705.zip";
+    sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
   };
   buildInputs = [
     unzip

From 8add274418e59bf7738009087eda3118af3b1d30 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 11:57:13 +0300
Subject: [PATCH 0661/1143] Update Nginx

---
 pkgs/servers/http/nginx/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index b47b67792b82..d9d9857e33b8 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -10,10 +10,10 @@
 with stdenv.lib;
 
 let
-  version = "1.7.11";
+  version = "1.9.0";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "15cnlrhiqklqfzwfspkp0i6g04zdhc092dh593yqnqqf450dgnfs";
+    sha256 = "0j7j4yfz39jl433ci9wgxnz3y70pr93vxixw1s4dxv81nzas2ap1";
   };
 
   rtmp-ext = fetchFromGitHub {

From c9da13e240724e79564686a773c7ff0a04dfe415 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 11:59:01 +0300
Subject: [PATCH 0662/1143] Update SQLite

---
 pkgs/development/libraries/sqlite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index d161fab31b62..ee8aec79af15 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.9";
+  name = "sqlite-3.8.10.1";
 
   src = fetchurl {
-    url = "http://sqlite.org/2015/sqlite-autoconf-3080900.tar.gz";
-    sha1 = "p6vwiqalhk7ybcx5p8n322vhd3idww6v";
+    url = "http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz";
+    sha1 = "86bfed5752783fb24c051f3efac5972ce11023f0";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];

From 749cc094c6760a512d8f5aafc0e96887eb5a8c6b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:02:09 +0300
Subject: [PATCH 0663/1143] Update allegro5-unstable

---
 pkgs/development/libraries/allegro/5-unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
index 72589ad1065d..71a521e23096 100644
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -16,7 +16,7 @@ let
   sourceInfo = rec {
     baseName="allegro";
     folderSuffix = "-unstable";
-    version = "5.1.9";
+    version = "5.1.10";
     name="${baseName}-${version}";
     project="alleg";
     url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
@@ -26,7 +26,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = "0jn1x2l1kz0vi2fvabpk5sbn1cx4k6hwncmf2j8wnrhk8pm5af5h";
+    sha256 = "13dfs007pyh908bm1hg7hz71y8fr9fj51byh5w149h8dsq2dds78";
   };
 
   inherit (sourceInfo) name version;

From be221a05edef04cf68177c2035ef4eefdbd4b5ca Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:03:28 +0300
Subject: [PATCH 0664/1143] Update Regina/REXX

---
 pkgs/development/interpreters/regina/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index e6c84edacaf2..596b748a4f61 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -12,7 +12,7 @@ let
   sourceInfo = rec {
     baseName="Regina-REXX";
     pname="regina-rexx";
-    version = "3.9.0";
+    version = "3.9.1";
     name="${baseName}-${version}";
     url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
   };
@@ -20,7 +20,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = "051w6i5xyjq7j9yrhw4r14kw105gpylby6z5x9v31f5g824n4mfr";
+    sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
   };
 
   inherit (sourceInfo) name version;

From ebadf1ff3fb523a6f9daf0b4e63a5699b790ebaa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:07:06 +0300
Subject: [PATCH 0665/1143] Update firejail

---
 pkgs/os-specific/linux/firejail/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 91c039c875bc..99c99cd36628 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.24";
+    version="0.9.26";
     name="${baseName}-${version}";
-    hash="15fz6hjxakjnsn505w3wlc6bqvf5pjwn8zfhp5aw9zq6vxr7f317";
-    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.24-rc1.tar.bz2";
-    sha256="15fz6hjxakjnsn505w3wlc6bqvf5pjwn8zfhp5aw9zq6vxr7f317";
+    hash="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
+    url="http://softlayer-ams.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.26-rc2.tar.bz2";
+    sha256="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
   };
   buildInputs = [
   ];

From 986a949a42d093062c5e43e1a7dea32ac89d6c9c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:08:15 +0300
Subject: [PATCH 0666/1143] Update XDaliClock

---
 pkgs/tools/misc/xdaliclock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 7d731650288c..16a54c819464 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -12,7 +12,7 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="xdaliclock";
-    version = "2.41";
+    version = "2.43";
     name="${baseName}-${version}";
     project="${baseName}";
     url="http://www.jwz.org/${project}/${name}.tar.gz";
@@ -21,7 +21,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = "1crkjvza692irkqm9vwgn58m8ps93n0rxigm6pasgl5dnx3p6d1d";
+    sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
   };
 
   inherit (sourceInfo) name version;

From b5b7c825f6d5e3ff4e9ebe6133e519597fd10c23 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:09:40 +0300
Subject: [PATCH 0667/1143] Update atanks

---
 pkgs/games/atanks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index edad4b4b456e..9ebfb724779d 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -11,11 +11,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="atanks";
-    version = "6.1";
+    version = "6.2";
     name="${baseName}-${version}";
     project="${baseName}";
     url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz";
-    sha256 = "1azs9amqkgs7qglx0vk9bg2fhn73lq89372scnfp45hinrh52vqi";
+    sha256 = "1s1lb87ind0y9d6hmfaf1b9wks8q3hd6w5n9dibq75rxqmcfvlpy";
   };
 in
 rec {

From 87eb733e5b344f9077f72e00b6bd0732f8d7812a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:11:53 +0300
Subject: [PATCH 0668/1143] Update IPMIutil

---
 pkgs/tools/system/ipmiutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index c19b6007f018..4fd3cb0f4a48 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.5";
+  version = "2.9.6";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "1rnv72qfrijcm0kiy2lsbdckjxnxdma8sf8y6y6iypp75rcg007b";
+    sha256 = "068mfxaay91m5qqs0lb4jwvsbxb665n2hgcp0g1k62zvicyiyk48";
   };
 
   buildInputs = [ openssl ];

From 53f8245494870a29f043fc346e0aa91134a280b4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:13:16 +0300
Subject: [PATCH 0669/1143] Update luarocks

---
 pkgs/development/tools/misc/luarocks/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index dfd5c2994fd0..2296bc3a9890 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.2.1";
+    version="2.2.2";
     name="${baseName}-${version}";
-    hash="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi";
-    url="http://luarocks.org/releases/luarocks-2.2.1.tar.gz";
-    sha256="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi";
+    hash="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g";
+    url="http://luarocks.org/releases/luarocks-2.2.2.tar.gz";
+    sha256="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g";
   };
   buildInputs = [
     lua curl makeWrapper which

From 84ffa4d489e98973e65f8006324e2ca42d159ae0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:15:56 +0300
Subject: [PATCH 0670/1143] Update CL-Launch

---
 pkgs/development/tools/misc/cl-launch/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index a6ea7ed766ee..755e8001e881 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.1.2";
+    version="4.1.3.1";
     name="${baseName}-${version}";
-    hash="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.2.tar.gz";
-    sha256="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90";
+    hash="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.1.tar.gz";
+    sha256="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z";
   };
   buildInputs = [
   ];
@@ -24,6 +24,10 @@ stdenv.mkDerivation {
     mkdir -p "$out/bin"
   '';
 
+  preBuild = ''
+    sed -e 's/\t\t@/\t\t/g' -i Makefile
+  '';
+
   meta = {
     inherit (s) version;
     description = ''Common Lisp launcher script'';

From b51dbb22dd75927745f7056d808bb272223c57c5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:16:33 +0300
Subject: [PATCH 0671/1143] Update badvpn

---
 pkgs/tools/networking/badvpn/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix
index e11d454154b6..22da8486a80b 100644
--- a/pkgs/tools/networking/badvpn/default.nix
+++ b/pkgs/tools/networking/badvpn/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="badvpn";
-    version="1.999.129";
+    version="1.999.130";
     name="${baseName}-${version}";
-    hash="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl";
-    url="https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz";
-    sha256="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl";
+    hash="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z";
+    url="https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz";
+    sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z";
   };
   buildInputs = [
     cmake openssl nss pkgconfig nspr

From 3dab0e11ee82fdf56f395a6b68797a42016d9807 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:17:33 +0300
Subject: [PATCH 0672/1143] Update GlusterFS

---
 pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 768614673489..bfab9454d6df 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -4,11 +4,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.6.2";
+    version="3.6.3";
     name="${baseName}-${version}";
-    hash="1kz0kmj0apkhkmw1zy72bsx06b1ii6z8y3fq365cy5l3xnjibdaa";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.2/glusterfs-3.6.2.tar.gz";
-    sha256="1kz0kmj0apkhkmw1zy72bsx06b1ii6z8y3fq365cy5l3xnjibdaa";
+    hash="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.3/glusterfs-3.6.3.tar.gz";
+    sha256="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From 8a4630d9dde7c9a11d57d3c98de88ffb1472741a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:27:07 +0300
Subject: [PATCH 0673/1143] Update Wine unstable

---
 pkgs/misc/emulators/wine/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index a7a1e02da3b6..aac97fe05b8e 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.cc.cc.isGNU or false;
 
 let
-    version = "1.7.40";
+    version = "1.7.42";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "1dnasmw1rnlz7wk1bn0x1zmy3r78hgrn9y53z4vm8xjkllwyd0hd";
+      sha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss";
     };
 
     gecko = fetchurl {

From 6219db292c192d3e643b25c45fcd3c7326715889 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:31:53 +0300
Subject: [PATCH 0674/1143] Update LiquidWar

---
 pkgs/games/liquidwar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index cd7478d99c8d..3a3774bc1dd3 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -15,7 +15,7 @@ rec {
 
   src = a.fetchurl {
     url = "mirror://gnu/liquidwar6/${name}.tar.gz";
-    sha256 = "1q58liqm5cgp494yjj6rfc2xj5b4gm8r8yvi46jzwqll353mabwl";
+    sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn";
   };
 
   inherit buildInputs;
@@ -36,7 +36,7 @@ rec {
     platforms = with a.lib.platforms; 
       linux;
   homepage = "http://www.gnu.org/software/liquidwar6/";
-  version = "0.4.3681";
+  version = "0.6.3902";
   updateWalker=true;
   };
 }

From ae3b88aae4ac50aba72ebb3ad65ec939b07775f4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:45:23 +0300
Subject: [PATCH 0675/1143] Update SBCL

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index d76a59c8dec4..b9e3011194d8 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.10";
+  version = "1.2.11";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "11gn25knjk0zdyi3s6w0blcnrxjgyj4iifg5h07pv2r7hm83s92m";
+    sha256 = "0w1ymazyck5a8bjmsbnq1hps1n4824h3ajh849f1y09dwzd09al8";
   };
 
   buildInputs = [ which ]

From ed38a2d32b643e5ea545f09058d3774b097675b4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 12:46:21 +0300
Subject: [PATCH 0676/1143] Explicitly pass -pthread flag to fix the build
 after some updates

---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index a615854a6b25..b0de8c151460 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -77,6 +77,10 @@ stdenv.mkDerivation rec {
     (mkEnable true                   "heimdal-documentation" null)
   ];
 
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread"
+  '';
+
   # We need to build hcrypt for applications like samba
   postBuild = ''
     (cd lib/hcrypto; make)

From a31b9e1816daeb7d420b75ef7356edb215fc54b9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 13:25:07 +0300
Subject: [PATCH 0677/1143] Update Wine staging to match Wine unstable

---
 pkgs/misc/emulators/wine/staging.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 2aa588592ac1..a6ff309b08e3 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, wine, perl, autoconf, utillinux
 , pulseaudio, libtxc_dxtn }:
 
-let version = "1.7.40";
+let version = "1.7.42";
     patch = fetchFromGitHub {
       owner = "wine-compholio";
       repo = "wine-staging";
       rev = "v${version}";
-      sha256 = "0l14yy6wbvbs2xrnn9z3a35lbnpl8ibkmc0vh983fimf9nxckpan";
+      sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17";
     };
 
 in assert (builtins.parseDrvName wine.name).version == version;

From de02c8e8807d797e1b71ba8fb327eb30ede23318 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 May 2015 13:32:35 +0300
Subject: [PATCH 0678/1143] Update Pipelight to use wine-staging

---
 pkgs/tools/misc/pipelight/default.nix | 39 ++-------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index aa0be62ed64c..cb130c8e9178 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -1,44 +1,9 @@
-{ stdenv, fetchurl, fetchgit, autoconf, automake, wineUnstable, perl, xlibs
+{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs
   , gnupg, gcc48_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
   }:
 
 let
-  wine_patches_version = "1.7.38";
-  wine_hash = "1h3bsga9qzqkavf9wlv62ldl3a8mz7grr68nxv8vicmnglzfj7lq";
-
-  wine_patches = fetchgit {
-    url = "git://github.com/compholio/wine-compholio.git";
-    rev = "refs/tags/v${wine_patches_version}";
-    sha256 = "0lcagswy1lgqz6qlpf0ng7ksl2sbaqldrgnhf0n1278jj82rq80n";
-  };
-
-  wine_custom =
-    stdenv.lib.overrideDerivation wineUnstable (args: rec {
-      name = "wine-${wine_patches_version}";
-      version = "${wine_patches_version}";
-      src = null;
-      srcs = [
-	      (fetchurl {
-                url = "mirror://sourceforge/wine/${name}.tar.bz2";
-                sha256 = wine_hash;
-	      })
-	      wine_patches ];
-      sourceRoot = "./${name}";
-      buildInputs = args.buildInputs ++ [ 
-        autoconf perl utillinux automake attr 
-      ];
-      nativeBuildInputs = args.nativeBuildInputs ++ [ 
-        autoconf perl utillinux automake attr 
-      ];
-      postPatch = ''
-        export wineDir=$(pwd)
-        patchShebangs $wineDir/tools/
-        chmod u+w $wineDir/../${wine_patches.name}/debian/tools/
-        patchShebangs $wineDir/../${wine_patches.name}/debian/tools/
-        chmod -R +rwx ../${wine_patches.name}/
-        make -C ../${wine_patches.name}/patches DESTDIR=$wineDir install
-      '';
-    });
+  wine_custom = wineStaging;
 
   mozillaPluginPath = "/lib/mozilla/plugins";
 

From 862510079a4ac370d8e7c6015f38a049231fd640 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 13:30:45 -0700
Subject: [PATCH 0679/1143] cups: 1.7.5 -> 2.0.2

---
 pkgs/misc/cups/default.nix      | 25 ++++++++++++++++++++-----
 pkgs/top-level/all-packages.nix |  4 +++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index e62cfcff8327..d2170cfc332f 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb, acl, gmp }:
+, dbus, acl, gmp
+, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
+}:
 
-let version = "1.7.5"; in
+let version = "2.0.2"; in
 
+with stdenv.lib;
 stdenv.mkDerivation {
   name = "cups-${version}";
 
@@ -10,15 +13,27 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq";
+    sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5";
   };
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
     ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
 
   propagatedBuildInputs = [ openssl gmp ];
 
-  configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-systemd=\${out}/lib/systemd/system"
+    "--enable-raw-printing"
+    "--enable-threads"
+  ] ++ optionals stdenv.isLinux [
+    "--enable-dbus"
+    "--enable-pam"
+  ] ++ optional (libusb != null) "--enable-libusb"
+    ++ optional (gnutls != null) "--enable-ssl"
+    ++ optional (avahi != null) "--enable-avahi"
+    ++ optional (libpaper != null) "--enable-libpaper";
 
   installFlags =
     [ # Don't try to write in /var at build time.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5bd3d71c956..09c7fa0b2745 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13983,7 +13983,9 @@ let
 
   beep = callPackage ../misc/beep { };
 
-  cups = callPackage ../misc/cups { libusb = libusb1; };
+  cups = callPackage ../misc/cups {
+    libusb = libusb1;
+  };
 
   cups_filters = callPackage ../misc/cups/filters.nix { };
 

From b89bf5668aa660dde20021030ecbad10dbf8dc09 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 28 Apr 2015 12:11:41 +0200
Subject: [PATCH 0680/1143] cups: Refactor meta attributes

---
 pkgs/misc/cups/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index d2170cfc332f..cd6b6b4d12d5 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
+    ++ optionals stdenv.isLinux [ pam dbus.libs acl ] ;
 
   propagatedBuildInputs = [ openssl gmp ];
 
@@ -61,10 +61,10 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    homepage = "http://www.cups.org/";
+    homepage = https://cups.org/;
     description = "A standards-based printing system for UNIX";
-    license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest
-    maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
+    maintainers = with maintainers; [ urkud simons jgeerds ];
+    platforms = platforms.linux;
   };
 }

From 252bc4a4b987ba3d115b21f191270be314785efc Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 28 Apr 2015 12:42:53 +0200
Subject: [PATCH 0681/1143] cups: Add xdg_utils to build inputs

---
 pkgs/misc/cups/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index cd6b6b4d12d5..45b042960d2e 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, acl, gmp
+, dbus, acl, gmp, xdg_utils
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
-    ++ optionals stdenv.isLinux [ pam dbus.libs acl ] ;
+    ++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ;
 
   propagatedBuildInputs = [ openssl gmp ];
 

From e9cf6cd34ff956f87b6d2d4f76872477f080a399 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 28 Apr 2015 20:37:34 +0200
Subject: [PATCH 0682/1143] cups: Use systemd files provided by CUPS

---
 nixos/modules/services/printing/cupsd.nix |  9 +++------
 pkgs/misc/cups/default.nix                | 13 +++++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index b573a356b351..a69a8aab86a3 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -183,10 +183,10 @@ in
     # gets loaded, and then cups cannot access the printers.
     boot.blacklistedKernelModules = [ "usblp" ];
 
-    systemd.services.cups =
-      { description = "CUPS Printing Daemon";
+    systemd.packages = [ cups ];
 
-        wantedBy = [ "multi-user.target" ];
+    systemd.services.cups =
+      { wantedBy = [ "multi-user.target" ];
         wants = [ "network.target" ];
         after = [ "network.target" ];
 
@@ -200,9 +200,6 @@ in
             mkdir -m 0755 -p ${cfg.tempDir}
           '';
 
-        serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd";
-
         restartTriggers =
           [ config.environment.etc."cups/cups-files.conf".source
             config.environment.etc."cups/cupsd.conf".source
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 45b042960d2e..10fd71a07541 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -58,6 +58,19 @@ stdenv.mkDerivation {
     ''
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint
+
+      # Rename systemd files provided by CUPS
+      for f in $out/lib/systemd/system/*; do
+        substituteInPlace "$f" \
+          --replace "org.cups.cupsd" "cups" \
+          --replace "org.cups." ""
+
+        if [[ "$f" =~ .*cupsd\..* ]]; then
+          mv "$f" "''${f/org\.cups\.cupsd/cups}"
+        else
+          mv "$f" "''${f/org\.cups\./}"
+        fi
+      done
     '';
 
   meta = {

From f4d9c9043c75ae758b3a1a99a29bca72f2a19970 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 28 Apr 2015 20:40:03 +0200
Subject: [PATCH 0683/1143] cups: Remove deprecated config options from
 cupsd.conf

---
 nixos/modules/services/printing/cupsd.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index a69a8aab86a3..2515c1c16681 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -260,8 +260,6 @@ in
         SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
 
         Browsing On
-        BrowseOrder allow,deny
-        BrowseAllow @LOCAL
 
         DefaultAuthType Basic
 

From 65e2b83b36c5b7efba3165d6ff4db132e4ea79dc Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sat, 2 May 2015 15:33:22 +0200
Subject: [PATCH 0684/1143] cups: Fix printing tests

It seems like there's an upstream bug in the "lpstat" command. We need
to specify the server's port.

Further information: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711327

[root@client:~]# lpstat -H
/var/run/cups/cups.sock

[root@client:~]# lpstat -h server -H
/var/run/cups/cups.sock:631

[root@client:~]# CUPS_SERVER=server lpstat -H
server:631

[root@client:~]# lpstat -h server:631 -H
server:631
---
 nixos/tests/printing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index ba10f23582d7..65d573e690b5 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -48,7 +48,7 @@ import ./make-test.nix ({pkgs, ... }: {
 
       # Do some status checks.
       $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die;
-      $client->succeed("lpstat -h server -a") =~ /DeskjetLocal accepting requests/ or die;
+      $client->succeed("lpstat -h server:631 -a") =~ /DeskjetLocal accepting requests/ or die;
       $client->succeed("cupsdisable DeskjetRemote");
       $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die;
       $client->succeed("cupsenable DeskjetRemote");

From 6f69dd46d7282db8ae31a83b873396524b8fc053 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 4 May 2015 22:32:35 +0200
Subject: [PATCH 0685/1143] cups: Add defaultShared, browsing and webInterace
 config option

---
 nixos/modules/services/printing/cupsd.nix | 30 ++++++++++++++++++++++-
 nixos/tests/printing.nix                  |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 2515c1c16681..fd9589883edc 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -72,6 +72,30 @@ in
         '';
       };
 
+      defaultShared = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Specifies whether local printers are shared by default.
+        '';
+      };
+
+      browsing = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Specifies whether shared printers are advertised.
+        '';
+      };
+
+      webInterface = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Specifies whether the web interface is enabled.
+        '';
+      };
+
       cupsdConf = mkOption {
         type = types.lines;
         default = "";
@@ -259,7 +283,11 @@ in
 
         SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
 
-        Browsing On
+        DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
+
+        Browsing ${if cfg.browsing then "Yes" else "No"}
+
+        WebInterface ${if cfg.webInterface then "Yes" else "No"}
 
         DefaultAuthType Basic
 
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 65d573e690b5..708ff5391570 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -9,6 +9,7 @@ import ./make-test.nix ({pkgs, ... }: {
       { config, pkgs, ... }:
       { services.printing.enable = true;
         services.printing.listenAddresses = [ "*:631" ];
+        services.printing.defaultShared = true;
         services.printing.extraConf =
           ''
             <Location />

From c4c0ec0581dc77aeaeace3400fed5f6d8e34ee50 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 4 May 2015 22:51:24 +0200
Subject: [PATCH 0686/1143] cups: Add changelog for the upcoming NixOS release

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 6b2cf55bb8d3..c4691aa663f4 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -49,6 +49,19 @@ was accordingly renamed to <literal>bomi</literal>
     </para>
 </listitem>
 
+<listitem>
+  <para>
+	The CUPS printing service has been updated to version <literal>2.0.2</literal>.
+	Furthermore its systemd service has been renamed to <literal>cups.service</literal>.
+  </para>
+  <para>
+	Local printers are no longer shared or advertised by default. This behavior
+	can be changed by enabling <literal>services.printing.defaultShared</literal>
+	or <literal>services.printing.browsing</literal> respectively.
+  </para>
+</listitem>
+
+
 </itemizedlist>
 </para>
 

From 652d06207d5a495269a7d2cb63a59ed6a1e62e71 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 10 May 2015 00:04:59 +0200
Subject: [PATCH 0687/1143] cups: Rename "browsing" config option to
 "advertise"

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 2 +-
 nixos/modules/services/printing/cupsd.nix      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index c4691aa663f4..f1e652a53bb3 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -57,7 +57,7 @@ was accordingly renamed to <literal>bomi</literal>
   <para>
 	Local printers are no longer shared or advertised by default. This behavior
 	can be changed by enabling <literal>services.printing.defaultShared</literal>
-	or <literal>services.printing.browsing</literal> respectively.
+	or <literal>services.printing.advertise</literal> respectively.
   </para>
 </listitem>
 
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index fd9589883edc..d7f87413e6c7 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -80,7 +80,7 @@ in
         '';
       };
 
-      browsing = mkOption {
+      advertise = mkOption {
         type = types.bool;
         default = false;
         description = ''
@@ -285,7 +285,7 @@ in
 
         DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
 
-        Browsing ${if cfg.browsing then "Yes" else "No"}
+        Browsing ${if cfg.advertise then "Yes" else "No"}
 
         WebInterface ${if cfg.webInterface then "Yes" else "No"}
 

From 4f2b49744d411ef1f68b2c5d502f3718b4575963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 May 2015 12:26:53 +0200
Subject: [PATCH 0688/1143] docker: fix build

---
 pkgs/applications/virtualization/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 240973044d1e..905830381451 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   buildPhase = ''
-    patchShebangs ./project
+    patchShebangs .
     export AUTO_GOPATH=1
     export DOCKER_GITCOMMIT="03nzhikx"
     ./hack/make.sh dynbinary

From b7f15c43da7822f0def11b0cf1afbf4f45707204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 May 2015 13:44:50 +0200
Subject: [PATCH 0689/1143] fix evals /cc @ttuegel

---
 pkgs/applications/audio/musescore/default.nix       |  2 +-
 .../applications/audio/sonic-visualiser/default.nix |  2 +-
 .../display-managers/lightdm/default.nix            |  6 +++---
 pkgs/applications/misc/calibre/default.nix          |  2 +-
 .../applications/networking/irc/quassel/default.nix |  3 +++
 pkgs/applications/networking/linssid/default.nix    |  2 +-
 .../applications/networking/p2p/firestr/default.nix |  2 +-
 pkgs/applications/video/obs-studio/default.nix      |  2 +-
 pkgs/applications/video/shotcut/default.nix         |  2 +-
 .../libraries/phonon-backend-vlc/qt4/default.nix    | 13 ++++---------
 pkgs/development/libraries/quazip/default.nix       |  2 +-
 11 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 7d4768d23324..9dbebe31a38e 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    makeWrapper cmake qt5 pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis
+    makeWrapper cmake qt5.base pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis
   ];
 
   patchPhase = ''
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 7bda4fb27670..104a458d6a06 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ libsndfile qt5 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
+    [ libsndfile qt5.base fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
       serd
       sord
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 79163945c0ce..8a613ee68617 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -17,15 +17,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
-    qt4 qt5
-  ];
+    qt4
+  ] ++ stdenv.lib.optional (qt5 != null) qt5.base;
 
   configureFlags = [
     "--enable-liblightdm-gobject"
     "--localstatedir=/var"
     "--sysconfdir=/etc"
   ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"
-    ++ stdenv.lib.optional (qt5 != null) "--enable-liblightdm-qt5";
+    ++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5";
 
   installFlags = [
     "sysconfdir=\${out}/etc"
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 670d7667e1b9..0f9dbf8d4223 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
-      fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils
+      fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
       pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index b5bf86690edc..5aeafab79e3c 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -10,6 +10,9 @@
 , phonon_qt5, libdbusmenu_qt5
 , stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf }:
 
+
+assert stdenv.isLinux;
+
 assert monolithic -> !client && !daemon;
 assert client || daemon -> !monolithic;
 assert withKDE -> kdelibs != null;
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 2b4c5f564bec..de5dc849148b 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
   };
 
-  buildInputs = [ qt5 pkgconfig boost ];
+  buildInputs = [ qt5.base pkgconfig boost ];
 
   postPatch = ''
     sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix
index 49d15f59c7fa..65ec54cf0f76 100644
--- a/pkgs/applications/networking/p2p/firestr/default.nix
+++ b/pkgs/applications/networking/p2p/firestr/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation {
   name = "firestr-0.8";
 
-  buildInputs = [ cmake boost botan snappy libopus libuuid qt5 libXScrnSaver openssl ];
+  buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base libXScrnSaver openssl ];
 
   src = fetchFromGitHub {
     owner  = "mempko";
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 87e3047ed19f..e414a6e723a9 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                   jansson
                   libv4l
                   libxkbcommon
-                  qt5
+                  qt5.base
                   x264
                 ];
 
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 9ad739a361d7..c0458748c96c 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1504ds3ppqmpg84nb2gb74qndqysjwn3xw7n8xv19kd1pppnr10f";
   };
 
-  buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ];
+  buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5.base ];
 
   configurePhase = "qmake PREFIX=$out";
 
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
index 8883f5c11d9e..70b6174c635c 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
@@ -1,16 +1,13 @@
-{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon
-, qt4 ? null, qt5 ? null, withQt5 ? false }:
+{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon, qt4}:
 
 with stdenv.lib;
 
-assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
-
 let
   pname = "phonon-backend-vlc";
   v = "0.8.1";
   # Force same Qt version in phonon and VLC
-  vlc_ = vlc.override { inherit qt4 qt5 withQt5; };
-  phonon_ = phonon.override { inherit qt4 qt5 withQt5; };
+  vlc_ = vlc.override { inherit qt4; };
+  phonon_ = phonon.override { inherit qt4; };
 in
 
 stdenv.mkDerivation {
@@ -23,9 +20,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake pkgconfig automoc4 xz ];
 
-  buildInputs = [ vlc_ phonon_ (if withQt5 then qt5 else qt4)];
-
-  cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
+  buildInputs = [ vlc_ phonon_ qt4 ];
 
   meta = {
     homepage = http://phonon.kde.org/;
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 9364b94e355e..119fda9eb80a 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "INSTALL_ROOT=$(out)";
 
-  buildInputs = [ zlib qt.base ];
+  buildInputs = [ zlib (qt.base or qt) ];
 
   meta = {
     description = "Provides access to ZIP archives from Qt programs";

From 5927faa13893f09d0c7065d9f9f8deef05346ce5 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 10 May 2015 14:07:25 +0200
Subject: [PATCH 0690/1143] add Lassulus to maintainers.nix

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8f148ba91c40..8a8ff7ffa09f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -116,6 +116,7 @@
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
   kragniz = "Louis Taylor <kragniz@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
+  lassulus = "Lassulus <lassulus@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   linquize = "Linquize <linquize@yahoo.com.hk>";

From ae6d2796bc1d1a0ebc729f8826ae6ff5b97256e2 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 21 Apr 2015 18:00:59 +0200
Subject: [PATCH 0691/1143] wine: add 64 bit build and nixpkgs configuration

The default release channel (stable/unstable) and the default
build (wine32/wine64/wineWow) can be customized via the "wine" key in config
---
 pkgs/misc/emulators/wine/base.nix       | 61 +++++++++++++++++++
 pkgs/misc/emulators/wine/builder-wow.sh | 29 +++++++++
 pkgs/misc/emulators/wine/default.nix    | 15 +++++
 pkgs/misc/emulators/wine/packages.nix   | 60 ++++++++++++++++++
 pkgs/misc/emulators/wine/stable.nix     | 81 -------------------------
 pkgs/misc/emulators/wine/unstable.nix   | 78 ------------------------
 pkgs/misc/emulators/wine/versions.nix   | 25 ++++++++
 pkgs/top-level/all-packages.nix         | 24 ++++----
 8 files changed, 201 insertions(+), 172 deletions(-)
 create mode 100644 pkgs/misc/emulators/wine/base.nix
 create mode 100644 pkgs/misc/emulators/wine/builder-wow.sh
 create mode 100644 pkgs/misc/emulators/wine/default.nix
 create mode 100644 pkgs/misc/emulators/wine/packages.nix
 delete mode 100644 pkgs/misc/emulators/wine/stable.nix
 delete mode 100644 pkgs/misc/emulators/wine/unstable.nix
 create mode 100644 pkgs/misc/emulators/wine/versions.nix

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
new file mode 100644
index 000000000000..ce39740f1133
--- /dev/null
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -0,0 +1,61 @@
+{ stdenv, lib, pkgArches,
+  name, version, src, monos, geckos, platforms,
+  buildScript ? null, configureFlags ? ""
+}:
+
+assert stdenv.isLinux;
+assert stdenv.cc.cc.isGNU or false;
+
+stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
+  builder = buildScript;
+}) // {
+  inherit name src configureFlags;
+
+  buildInputs = lib.concatLists (map (pkgs: (with pkgs; [
+    pkgconfig alsaLib ncurses libpng libjpeg lcms2 fontforge libxml2 libxslt
+    openssl gnutls cups makeWrapper flex bison mesa mesa_noglu.osmesa
+  ]) ++ (with pkgs.xlibs; [
+    xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
+  ])) pkgArches);
+
+  # Wine locates a lot of libraries dynamically through dlopen().  Add
+  # them to the RPATH so that the user doesn't have to set them in
+  # LD_LIBRARY_PATH.
+  NIX_LDFLAGS = map (path: "-rpath ${path}/lib") ([
+    stdenv.cc.cc
+  ] ++ (lib.concatLists (map (pkgs:
+        (with pkgs; [
+    freetype fontconfig mesa mesa_noglu.osmesa libdrm
+    libpng libjpeg openssl gnutls cups ncurses
+  ]) ++ (with pkgs.xlibs; [
+    libXinerama libXrender libXrandr libXcursor libXcomposite
+  ])) pkgArches)));
+
+  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
+  # elements specified above.
+  dontPatchELF = true;
+
+  ## FIXME
+  # Add capability to ignore known failing tests
+  # and enable doCheck
+  doCheck = false;
+  
+  postInstall = let
+    links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";
+  in ''
+    mkdir -p $out/share/wine/gecko $out/share/wine/mono/
+    ${lib.strings.concatStringsSep "\n"
+          ((map (links "share/wine/gecko") geckos)
+        ++ (map (links "share/wine/mono")  monos))}
+  '';
+  
+  enableParallelBuilding = true;
+
+  meta = {
+    inherit version platforms;
+    homepage = "http://www.winehq.org/";
+    license = "LGPL";
+    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
+    maintainers = [stdenv.lib.maintainers.raskin];
+  };
+})
diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh
new file mode 100644
index 000000000000..9f946f3b71fd
--- /dev/null
+++ b/pkgs/misc/emulators/wine/builder-wow.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+source $stdenv/setup
+
+unpackPhase
+patchPhase
+
+configureScript=$TMP/$sourceRoot/configure
+mkdir -p $TMP/wine-wow $TMP/wine64
+
+cd $TMP/wine64
+sourceRoot=`pwd`
+configureFlags="--enable-win64"
+configurePhase
+buildPhase
+# checkPhase
+
+cd $TMP/wine-wow
+sourceRoot=`pwd`
+configureFlags="--with-wine64=../wine64"
+configurePhase
+buildPhase
+# checkPhase
+
+eval "$preInstall"
+cd $TMP/wine64 && make install
+cd $TMP/wine-wow && make install
+eval "$postInstall"
+fixupPhase
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
new file mode 100644
index 000000000000..962aee9fb5d9
--- /dev/null
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -0,0 +1,15 @@
+## Configuration:
+# Control you default wine config in nixpkgs-config:
+# wine = {
+#   release = "stable"; # "stable", "unstable"
+#   build = "wineWow"; # "wine32", "wine64", "wineWow"
+# };
+# Make additional configurations on demand:
+# wine.overrideConfig { build = "wine32"; };
+{ lib, system, callPackage,
+  wineRelease ? "stable",
+  wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32") }:
+
+lib.getAttr wineBuild (callPackage ./packages.nix {
+  inherit wineRelease;
+})
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
new file mode 100644
index 000000000000..4d95dc911dce
--- /dev/null
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -0,0 +1,60 @@
+{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl,
+  wineRelease ? "stable"
+}:
+
+let sources = with lib.getAttr wineRelease (import ./versions.nix); {
+      version = wineVersion;
+      src = fetchurl {
+        url = "mirror://sourceforge/wine/wine-${wineVersion}.tar.bz2";
+        sha256 = wineSha256;
+      };
+
+      wineGecko32 = fetchurl {
+        url = "mirror://sourceforge/wine/wine_gecko-${geckoVersion}-x86.msi";
+        sha256 = geckoSha256;
+      };
+
+      wineGecko64 = fetchurl {
+        url = "mirror://sourceforge/wine/wine_gecko-${gecko64Version}-x86_64.msi";
+        sha256 = gecko64Sha256;
+      };
+
+      wineMono = fetchurl {
+        url = "mirror://sourceforge/wine/wine-mono-${monoVersion}.msi";
+        sha256 = monoSha256;
+      };
+    };
+    inherit (sources) version;
+in {
+  wine32 = import ./base.nix {
+    name = "wine32-${version}";
+    inherit (sources) version src;
+    inherit (pkgsi686Linux) lib stdenv;
+    pkgArches = [ pkgsi686Linux ];
+    geckos = with sources; [ wineGecko32 ];
+    monos = with sources; [ wineMono ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+  wine64 = import ./base.nix {
+    name = "wine64-${version}";
+    inherit (sources) version src;
+    inherit lib stdenv;
+    pkgArches = [ pkgs ];
+    geckos = with sources; [ wineGecko64 ];
+    monos = with sources; [ wineMono ];
+    configureFlags = "--enable-win64";
+    platforms = [ "x86_64-linux" ];
+  };
+  wineWow = import ./base.nix {
+    name = "wineWow-${version}";
+    inherit (sources) version src;
+    inherit lib;
+    stdenv = stdenv_32bit;
+    pkgArches = [ pkgs pkgsi686Linux ];
+    geckos = with sources; [ wineGecko32 wineGecko64 ];
+    monos = with sources; [ wineMono ];
+    buildScript = ./builder-wow.sh;
+    platforms = [ "x86_64-linux" ];
+  };
+}
+
diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix
deleted file mode 100644
index bdf696f541f9..000000000000
--- a/pkgs/misc/emulators/wine/stable.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
-, ncurses, libpng, libjpeg, lcms2, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
-}:
-
-assert stdenv.isLinux;
-assert stdenv.cc.cc.isGNU or false;
-
-let
-    version = "1.6.2";
-    name = "wine-${version}";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh";
-    };
-
-    gecko = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi";
-      sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
-    };
-
-    gecko64 = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi";
-      sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
-    };
-
-    mono = fetchurl {
-      url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi";
-      sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
-    };
-
-in stdenv.mkDerivation rec {
-  inherit version name src;
-
-  buildInputs = [
-    pkgconfig
-    xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
-    xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
-    xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
-    alsaLib ncurses libpng libjpeg lcms2 fontforge
-    libxml2 libxslt openssl gnutls cups makeWrapper
-  ];
-
-  # Wine locates a lot of libraries dynamically through dlopen().  Add
-  # them to the RPATH so that the user doesn't have to set them in
-  # LD_LIBRARY_PATH.
-  NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
-    freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm
-    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
-    xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
-    openssl gnutls cups
-  ];
-
-  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
-  # elements specified above.
-  dontPatchELF = true;
-
-  postInstall = ''
-    install -D ${gecko} $out/share/wine/gecko/${gecko.name}
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
-    install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
-  '' + ''
-    install -D ${mono} $out/share/wine/mono/${mono.name}
-
-    paxmark psmr $out/bin/wine{,-preloader}
-
-    wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "http://www.winehq.org/";
-    license = "LGPL";
-    inherit version;
-    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
deleted file mode 100644
index aac97fe05b8e..000000000000
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
-, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
-}:
-
-assert stdenv.isLinux;
-assert stdenv.cc.cc.isGNU or false;
-
-let
-    version = "1.7.42";
-    name = "wine-${version}";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss";
-    };
-
-    gecko = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.36-x86.msi";
-      sha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
-    };
-
-    gecko64 = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.36-x86_64.msi";
-      sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh";
-    };
-
-    mono = fetchurl {
-      url = "mirror://sourceforge/wine/wine-mono-4.5.4.msi";
-      sha256 = "1wnn273f232141x9x0sahg4w499x0g2p0xphxmwm5wh1xrzyvg10";
-    };
-
-in stdenv.mkDerivation rec {
-  inherit version name src;
-
-  buildInputs = [
-    pkgconfig
-    xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
-    xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
-    xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
-    alsaLib ncurses libpng libjpeg lcms fontforge
-    libxml2 libxslt openssl gnutls cups makeWrapper
-  ];
-
-  # Wine locates a lot of libraries dynamically through dlopen().  Add
-  # them to the RPATH so that the user doesn't have to set them in
-  # LD_LIBRARY_PATH.
-  NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
-    freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm
-    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
-    xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
-    openssl gnutls cups ncurses
-  ];
-
-  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
-  # elements specified above.
-  dontPatchELF = true;
-
-  postInstall = ''
-    install -D ${gecko} $out/share/wine/gecko/${gecko.name}
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
-    install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
-  '' + ''
-    install -D ${mono} $out/share/wine/mono/${mono.name}
-    wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "http://www.winehq.org/";
-    license = "LGPL";
-    inherit version;
-    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
new file mode 100644
index 000000000000..e599f04f8575
--- /dev/null
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -0,0 +1,25 @@
+{
+  unstable = {
+    wineVersion = "1.7.42";
+    wineSha256  = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss";
+    geckoVersion = "2.36";
+    geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
+    gecko64Version = "2.36";
+    gecko64Sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh";
+    monoVersion = "4.5.6";
+    monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
+  };
+  stable = {
+    wineVersion = "1.6.2";
+    wineSha256  = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh";
+    geckoVersion = "2.21";
+    geckoSha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
+    gecko64Version = "2.21";
+    gecko64Sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
+    monoVersion = "4.5.6";
+    monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
+    ## TESTME wine stable should work with most recent mono
+    #monoVersion = "0.0.8";
+    #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ba211f9e59a..716349d60741 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14345,27 +14345,25 @@ let
 
   VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
-  # Wine cannot be built in 64-bit; use a 32-bit build instead.
-  wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix {
-    bison = bison2;
+  # Wine defaults to a mixed 64 / 32 build on x86_64 and to pure 32 on x86
+  wine = callPackage ../misc/emulators/wine {
+    wineRelease = config.wine.release or "stable";
+    wineBuild = config.wine.build or (if system == "x86_64-linux" then "wineWow" else "wine32");
+  };
+  wineStable = wine.override { wineRelease = "stable"; };
+  wineUnstable = wine.override { wineRelease = "unstable"; };
+
+  winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
+    inherit (gnome2) zenity;
   };
 
-  wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix {
-    bison = bison2;
-  });
-
-  wine = wineStable;
-
+  ### FIXME integrate wineStaging into 64bit
   wineStaging = callPackage_i686 ../misc/emulators/wine/staging.nix {
     wine = pkgsi686Linux.wineUnstable;
     # Patent issues
     libtxc_dxtn = pkgsi686Linux.libtxc_dxtn_s2tc;
   };
 
-  winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
-    inherit (gnome2) zenity;
-  };
-
   wmutils-core = callPackage ../tools/X11/wmutils-core { };
 
   wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };

From 8a82935d46850b51aed5e9ceb864c330990771da Mon Sep 17 00:00:00 2001
From: Stewart Mackenzie <setori88@gmail.com>
Date: Sun, 10 May 2015 23:43:17 +0800
Subject: [PATCH 0692/1143] gnuradio-osmosdr: add hackrf support

---
 pkgs/applications/misc/gnuradio-osmosdr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
index ec48a9da92f1..360d98537ccf 100644
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd
-, makeWrapper
+, makeWrapper, hackrf
 , pythonSupport ? true, python, swig
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper
+    cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper hackrf
   ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
 
   postInstall = ''

From d8b93eb1cde070cf740fe3c6150c3acfdd259fe8 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 10 May 2015 18:50:07 +0200
Subject: [PATCH 0693/1143] Fix compilation of language-glsl. The issue / patch
 https://github.com/noteed/language-glsl/pull/10 fixes a compilation problem
 with language-glsl. The packages pretty and prettyclass conflicted when
 compiled with GHC 7.10.

---
 .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 65281a758b8a..a05f70e5d442 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -55,6 +55,11 @@ self: super: {
     sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
   });
 
+  language-glsl = appendPatch super.language-glsl (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/noteed/language-glsl/pull/10.patch";
+    sha256 = "1d8dmfqw9y7v7dlszb7l3wp0vj77j950z2r3r0ar9mcvyrmfm4in";
+  });
+
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
   bytestring-builder = dontHaddock super.bytestring-builder;

From 6305e506b307fccca6ab15331825e0abb8433b44 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Sun, 10 May 2015 12:46:09 -0600
Subject: [PATCH 0694/1143] Fix Hydra build of EventStore

Need to patch the build.sh shebang to make it pure.
---
 pkgs/servers/nosql/eventstore/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index e13d99c104d4..fd83ba889b96 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     ln -s ${icu}/lib/libicui18n.so src/libs/libicui18n.so
     ln -s ${icu}/lib/libicuuc.so src/libs/libicuuc.so
 
+    patchShebangs build.sh
     ./build.sh js1
     ./build.sh quick ${version}
   '';

From 19dbe42aeb762ec6ddae9e6af20959424857703a Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 10 May 2015 20:47:50 +0200
Subject: [PATCH 0695/1143] Revert "cups: Rename "browsing" config option to
 "advertise""

This reverts commit 48e65cec4ecd6bef08233460cf5ffedb023cc7c6.
---
 nixos/doc/manual/release-notes/rl-unstable.xml | 2 +-
 nixos/modules/services/printing/cupsd.nix      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index f1e652a53bb3..c4691aa663f4 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -57,7 +57,7 @@ was accordingly renamed to <literal>bomi</literal>
   <para>
 	Local printers are no longer shared or advertised by default. This behavior
 	can be changed by enabling <literal>services.printing.defaultShared</literal>
-	or <literal>services.printing.advertise</literal> respectively.
+	or <literal>services.printing.browsing</literal> respectively.
   </para>
 </listitem>
 
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index d7f87413e6c7..fd9589883edc 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -80,7 +80,7 @@ in
         '';
       };
 
-      advertise = mkOption {
+      browsing = mkOption {
         type = types.bool;
         default = false;
         description = ''
@@ -285,7 +285,7 @@ in
 
         DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
 
-        Browsing ${if cfg.advertise then "Yes" else "No"}
+        Browsing ${if cfg.browsing then "Yes" else "No"}
 
         WebInterface ${if cfg.webInterface then "Yes" else "No"}
 

From 7b49289c7435573a6585b51f38bead8472998e25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 14:40:11 +0200
Subject: [PATCH 0696/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/4f492cbdcc631f75bee47cc7659b573a8bf4ab6f
 with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e

---
 .../haskell-modules/hackage-packages.nix      | 477 +++++++++++-------
 1 file changed, 296 insertions(+), 181 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7c724523c5d7..ccf42a3fc0d9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2468,6 +2468,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "CirruParser" = callPackage
+    ({ mkDerivation, aeson, base, text, vector }:
+     mkDerivation {
+       pname = "CirruParser";
+       version = "0.0.1";
+       sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9";
+       buildDepends = [ aeson base text vector ];
+       homepage = "https://github.com/Cirru/parser.hs";
+       description = "Cirru Parser in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ClassLaws" = callPackage
     ({ mkDerivation, base, ChasingBottoms, mtl, QuickCheck }:
      mkDerivation {
@@ -17013,8 +17025,8 @@ self: {
      }:
      mkDerivation {
        pname = "ad";
-       version = "4.2.1.1";
-       sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka";
+       version = "4.2.2";
+       sha256 = "032ch6gjg88zfiwid4f1f7rms86z4x7jfmq496cgr50ycx9gsjxf";
        buildDepends = [
          array base comonad containers data-reify erf free nats reflection
          transformers
@@ -21799,16 +21811,17 @@ self: {
      }) {};
 
   "auto" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, deepseq
-     , MonadRandom, profunctors, random, semigroups, transformers
+    ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
+     , deepseq, MonadRandom, profunctors, random, semigroups
+     , transformers
      }:
      mkDerivation {
        pname = "auto";
-       version = "0.4.2.1";
-       sha256 = "0q5zz6q0dcc9chypbd2kci7kkn69ib0vdv48186jqzb3f50l59zw";
+       version = "0.4.2.2";
+       sha256 = "1n2kknp7b8agkvn3nk6w6cabzh3n89jakzx8pi46ig2ghcxz90wf";
        buildDepends = [
-         base bytestring cereal containers deepseq MonadRandom profunctors
-         random semigroups transformers
+         base base-orphans bytestring cereal containers deepseq MonadRandom
+         profunctors random semigroups transformers
        ];
        homepage = "https://github.com/mstksg/auto";
        description = "Denotative, locally stateful programming DSL & platform";
@@ -23119,8 +23132,8 @@ self: {
     ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }:
      mkDerivation {
        pname = "base58string";
-       version = "0.9.1";
-       sha256 = "1j7vk3par9z2svq8mwwxm73yd5yks25412l3n9mr081ybvywkckd";
+       version = "0.10.0";
+       sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv";
        buildDepends = [ aeson base binary bytestring text ];
        testDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -23502,12 +23515,11 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers, parsec }:
      mkDerivation {
        pname = "bencode";
-       version = "0.5.0.1";
-       sha256 = "1zr2sa76s761qhrmh1aymjr6drp8vxads5xf42r63rfdrzm6l3yj";
+       version = "0.6.0.0";
+       sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv";
        buildDepends = [ base binary bytestring containers parsec ];
        description = "Parser and printer for bencoded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bencoding" = callPackage
@@ -23575,8 +23587,8 @@ self: {
      }:
      mkDerivation {
        pname = "bert";
-       version = "1.2.2.3";
-       sha256 = "1waq40hd9wqavzhnvfk1i6wjqkmfb4pl17h4acfzzyz8bj76alkq";
+       version = "1.2.2.4";
+       sha256 = "1vcbylvci91rqq5dxsa2gxc709klr0xkcflpdhcng69s6pihgsg4";
        buildDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          containers mtl network parsec time unix void
@@ -25341,15 +25353,15 @@ self: {
 
   "bitcoin-block" = callPackage
     ({ mkDerivation, base, binary, bitcoin-tx, bitcoin-types
-     , bytestring, cryptohash, hexstring, hspec, largeword
+     , bytestring, cryptohash, hexstring, hspec, largeword, lens
      }:
      mkDerivation {
        pname = "bitcoin-block";
-       version = "0.9.0";
-       sha256 = "0xqdf7hqcgrzmafh3lp3sq3jm6nblqbhfwvfihmjm4srdj1x77m2";
+       version = "0.13.0";
+       sha256 = "0xiljk9dfd4g2kqphj8xf03kx8d7jd296s8i5rgflc4140npaz20";
        buildDepends = [
          base binary bitcoin-tx bitcoin-types bytestring cryptohash
-         hexstring largeword
+         hexstring largeword lens
        ];
        testDepends = [
          base bitcoin-tx bitcoin-types bytestring hexstring hspec
@@ -25401,15 +25413,15 @@ self: {
 
   "bitcoin-tx" = callPackage
     ({ mkDerivation, base, binary, bitcoin-script, bitcoin-types
-     , bytestring, cryptohash, hexstring, hspec
+     , bytestring, cryptohash, hexstring, hspec, lens
      }:
      mkDerivation {
        pname = "bitcoin-tx";
-       version = "0.12.1";
-       sha256 = "130ci02j4zcpzmysg0ij54jvzh4j510jb37aa753fm3hpbgczzm5";
+       version = "0.13.0";
+       sha256 = "13iv72l8b2scz6l8319r1yshwn7h67l3dn1z8fl181njkiz5xk0w";
        buildDepends = [
          base binary bitcoin-script bitcoin-types bytestring cryptohash
-         hexstring
+         hexstring lens
        ];
        testDepends = [ base bitcoin-script bytestring hexstring hspec ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -25423,8 +25435,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-types";
-       version = "0.9.1";
-       sha256 = "0hk03crwl8xh9gm3b53fgf76qd0jn4wbvvxjm1035lrbi028cm4y";
+       version = "0.9.2";
+       sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp";
        buildDepends = [
          base base58string binary bytestring hexstring text
        ];
@@ -26821,20 +26833,21 @@ self: {
      }) {};
 
   "breve" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, configurator
-     , cryptohash, directory, hashtables, mtl, random, simple
-     , transformers, wai, wai-extra, warp, xdg-basedir
+    ({ mkDerivation, aeson, base, binary, blaze-html, bytestring
+     , configurator, cryptohash, directory, hashtables, http-types, mtl
+     , random, Spock, text, transformers, wai, wai-extra
+     , wai-middleware-static, warp, xdg-basedir
      }:
      mkDerivation {
        pname = "breve";
-       version = "0.2.0.0";
-       sha256 = "0dndy14lxj18l0kr7ay1dclp3c960lmd6vqhnz8lkdz1p6cdq9hd";
+       version = "0.3.0.0";
+       sha256 = "14vhwicdi1cln594bfhhj65kwaxmimpzg4jh35mrycw0fpbfk6rp";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         aeson base binary bytestring configurator cryptohash directory
-         hashtables mtl random simple transformers wai wai-extra warp
-         xdg-basedir
+         aeson base binary blaze-html bytestring configurator cryptohash
+         directory hashtables http-types mtl random Spock text transformers
+         wai wai-extra wai-middleware-static warp xdg-basedir
        ];
        homepage = "https://github.com/rnhmjoj/breve";
        description = "a url shortener";
@@ -28170,6 +28183,7 @@ self: {
        testDepends = [ base ];
        description = "Simple interface to Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install_1_18_1_0" = callPackage
@@ -31095,6 +31109,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cirru-parser" = callPackage
+    ({ mkDerivation, aeson, base, text, vector }:
+     mkDerivation {
+       pname = "cirru-parser";
+       version = "0.0.2";
+       sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz";
+       buildDepends = [ aeson base text vector ];
+       homepage = "https://github.com/Cirru/parser.hs";
+       description = "Cirru Parser in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "citation-resolve" = callPackage
     ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers
      , curl, data-default, directory, doctest, download-curl, either
@@ -31363,8 +31389,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.3";
-       sha256 = "0x5qza2xv26m27inr0cm59vlizlbimb3gfdc1amal6nznjgrsflc";
+       version = "0.5.4";
+       sha256 = "08is6gr5z2i478lmah6liqinbp8r72zjqfcbfmrxa4vjr3ajrpw7";
        buildDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -31397,15 +31423,12 @@ self: {
      }) {};
 
   "clash-prelude-quickcheck" = callPackage
-    ({ mkDerivation, base, clash-prelude, containers, mtl, QuickCheck
-     }:
+    ({ mkDerivation, base, clash-prelude, QuickCheck }:
      mkDerivation {
        pname = "clash-prelude-quickcheck";
-       version = "0.1.2.0";
-       revision = "1";
-       sha256 = "1vnw7gaaj1ixz6j96dg6lqcafjbijkzxww0pij8hy4z3sm2370w0";
-       editedCabalFile = "f746784b2f0ed039d21e46d8b3adabb39ab6eb002d1c83fd8091619863be7f28";
-       buildDepends = [ base clash-prelude containers mtl QuickCheck ];
+       version = "0.1.2.1";
+       sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w";
+       buildDepends = [ base clash-prelude QuickCheck ];
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31417,8 +31440,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.5.3";
-       sha256 = "06b224qjvj1yqywzs2cz8pzb37n1p8y9zpw4jjb9q76qvr0x68q3";
+       version = "0.5.4";
+       sha256 = "1n35k6mmwf8ky99kc22nw5zwkp75pasjs1yx175h46ln3cqlm289";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31435,8 +31458,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5.3";
-       sha256 = "1x43w6sjscvkikrczjdq94wq24k0q92fwifk4561kp6qm2brlw1q";
+       version = "0.5.4";
+       sha256 = "1zmbgsvqa6mgz3aj6xpv3daiic57rccbav1c5dnsfjbsp8x2jgnc";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -33391,9 +33414,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "composition";
-       version = "1.0.1.0";
-       sha256 = "1gx27vz2djiiwygcjaygjmiwjnls084b5v9km3jpimlz312qh5hc";
-       homepage = "http://patch-tag.com/r/DanBurton/composition/home";
+       version = "1.0.1.1";
+       sha256 = "112ypxszskri2skj0qbf2a13j2kqnz2pbsrkyja32gs37ln7ca1p";
        description = "Combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33515,8 +33537,8 @@ self: {
      }:
      mkDerivation {
        pname = "conceit";
-       version = "0.3.0.0";
-       sha256 = "1sy8qz7lf4a09b4i7nnzn2bl4lbmkmc613l9pjs7y2xf1qniawhg";
+       version = "0.3.1.0";
+       sha256 = "1nllcnwjzf7brsmgrrqfil0fppqinysmwcpr1k5ralrhaabwk64l";
        buildDepends = [
          base bifunctors exceptions mtl semigroupoids transformers void
        ];
@@ -33904,9 +33926,10 @@ self: {
      mkDerivation {
        pname = "conduit-audio";
        version = "0.1";
+       revision = "1";
        sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb";
+       editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c";
        buildDepends = [ base conduit vector ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
        license = "LGPL";
@@ -33919,12 +33942,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-lame";
        version = "0.1";
+       revision = "1";
        sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w";
+       editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a";
        buildDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
        extraLibraries = [ mp3lame ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
@@ -33938,12 +33962,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-samplerate";
        version = "0.1";
+       revision = "1";
        sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg";
+       editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63";
        buildDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
        extraLibraries = [ samplerate ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
@@ -33957,12 +33982,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-sndfile";
        version = "0.1";
+       revision = "1";
        sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd";
+       editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87";
        buildDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsndfile audio file library";
        license = "LGPL";
@@ -34026,7 +34052,9 @@ self: {
      mkDerivation {
        pname = "conduit-extra";
        version = "1.1.7.3";
+       revision = "1";
        sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l";
+       editedCabalFile = "d90996b02f7aeb417e54658bab2ecba414221de6cde817d2b18186d09e605091";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -34827,7 +34855,9 @@ self: {
      mkDerivation {
        pname = "control-monad-free";
        version = "0.6.1";
+       revision = "1";
        sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy";
+       editedCabalFile = "d08dceee154098bee492a1c00ef699a2a3a0e8a3851c5d49ccd49d5645a501a4";
        buildDepends = [ base prelude-extras transformers ];
        homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
@@ -37786,8 +37816,8 @@ self: {
      }:
      mkDerivation {
        pname = "dash-haskell";
-       version = "1.0.0.4";
-       sha256 = "12nggfrc10i4kmjjqgiqjw9lz2mapqxxvs9d6cba43x43pb8z893";
+       version = "1.0.0.5";
+       sha256 = "1asfcifmvyrkw0nfb7g7djwzqlgw7l021a5q9i66wj598fgxqn1j";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -43248,16 +43278,15 @@ self: {
      mkDerivation {
        pname = "dtab";
        version = "1.0";
-       revision = "1";
+       revision = "2";
        sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3";
-       editedCabalFile = "2a7a20cc1b621e5a04b3ca28b3d03d11792731256fb39e94882e5e735d52ac15";
+       editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base binary bytestring containers data-binary-ieee754 pretty
          transformers
        ];
-       jailbreak = true;
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44124,15 +44153,20 @@ self: {
      }) { inherit (pkgs) libedit;};
 
   "editor-open" = callPackage
-    ({ mkDerivation, base, bytestring, process, temporary, unix }:
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , directory, process, resourcet, temporary, transformers, unix
+     }:
      mkDerivation {
        pname = "editor-open";
-       version = "0.2.0.0";
-       sha256 = "0lv7rkapyvhsrri1094ls4biv7s5p5a30zm20ghqaky3nka2n18p";
+       version = "0.3.0.0";
+       sha256 = "1yfwwd3z3w6yadqqv96n65795gsg418iid35cwgxyf9l1jgk79f1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring process temporary unix ];
-       homepage = "https://notabug.org/pharpend/editor-open";
+       buildDepends = [
+         base bytestring conduit conduit-extra directory process resourcet
+         temporary transformers unix
+       ];
+       homepage = "https://github.com/pharpend/editor-open";
        description = "Open the user's $EDITOR for text input";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -46208,8 +46242,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.7.0.1";
-       sha256 = "1k94kh1wgskhh51by522sz58lzxpgv8qddfalwjmy845dfivbswg";
+       version = "0.7.1.0";
+       sha256 = "058r7csqf2lzcqskc9fv9lwr1h1glpirblyc51kn0qb16szigpwv";
        buildDepends = [
          aeson async base bytestring cereal containers network protobuf
          random sodium text time uuid
@@ -48531,8 +48565,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fixed-list";
-       version = "0.1.5";
-       sha256 = "07b1kzysf96jckx7yghb2a93l884x8fvxxd0g2ja3hwb5y403911";
+       version = "0.1.6";
+       sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb";
        buildDepends = [ base ];
        homepage = "http://github.com/jvranish/FixedList/tree/master";
        description = "A fixed length list type";
@@ -50192,8 +50226,8 @@ self: {
      }:
      mkDerivation {
        pname = "friday";
-       version = "0.2.1.1";
-       sha256 = "1snbmr1q60lg94zzfxfc0pfzyi695m7dc79vpi66c8kb5anwahw8";
+       version = "0.2.1.2";
+       sha256 = "08w97jbcg5641brd0pf1bnj6mk0lf7xa57v88y686mx6lsl80i3q";
        buildDepends = [
          base convertible deepseq primitive ratio-int transformers vector
        ];
@@ -51316,7 +51350,9 @@ self: {
      mkDerivation {
        pname = "generic-deepseq";
        version = "2.0.1.1";
+       revision = "1";
        sha256 = "1yajkzp79ri5i7n5ynv0i6spxyg6kyi6qvqj46brlgjag98526iv";
+       editedCabalFile = "58ed9aeb48cc2a00e3122780fcbf2732c4d6fc46198434926a8b1bcc91d4a29b";
        buildDepends = [ base ghc-prim ];
        description = "Generic deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -57017,7 +57053,9 @@ self: {
      mkDerivation {
        pname = "haddock-library";
        version = "1.2.0";
+       revision = "1";
        sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56";
+       editedCabalFile = "39bebb4a575c547378a245ee6028135602cbb73e5adbb4f7743449e5717517da";
        buildDepends = [ base bytestring deepseq transformers ];
        testDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
@@ -58429,7 +58467,9 @@ self: {
      mkDerivation {
        pname = "happstack-server";
        version = "7.4.3";
+       revision = "1";
        sha256 = "0ij359i1lmxs1gpzl6spli94s0mpp6mbbhjcf4jrbxkpavdg8g73";
+       editedCabalFile = "3da7c2f6d5add9d58bc1013cdb0f64bb07aec1ebc88bac40372c4533ed932cf6";
        buildDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -64436,8 +64476,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjcase";
-       version = "0.1.0.0";
-       sha256 = "0n2wy39i3v2asifk3n9mlz1dwgyv9fr2mkqp9dbdbawnk2g96y4l";
+       version = "0.2.0.0";
+       sha256 = "0d1pb24jqk2dj635hy1way9axr9719g1ppxmxr4jpbb0sj6xphjk";
        buildDepends = [
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers vector
@@ -75855,8 +75895,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.4.1";
-       sha256 = "0dmnv20nqv72wm42m5widcq0b63rnrslg8ylabc6hqp7xdqa7vil";
+       version = "0.4.1.1";
+       sha256 = "0caqvq7pl0jbka915xqy3sljjmwc2adk1hkm2775vnsvswh9nysg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -75864,7 +75904,6 @@ self: {
          filepath HPDF JuicyPixels process property-list resourcet temporary
          transformers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
@@ -79090,6 +79129,7 @@ self: {
          ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -85827,9 +85867,10 @@ self: {
      mkDerivation {
        pname = "midi-util";
        version = "0.1.1.1";
+       revision = "1";
        sha256 = "1g8rhx1n6rhyi49x6rkim1bnv7rg6wc0x89dzkrbzyxm28hkvjfk";
+       editedCabalFile = "2c42b8e0940125f6354a9174ad5cb19da6fc0122b4947576e28abb753a7cff14";
        buildDepends = [ base containers event-list midi non-negative ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/midi-util";
        description = "Utility functions for processing MIDI files";
        license = "GPL";
@@ -90268,18 +90309,20 @@ self: {
 
   "nested-routes" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
-     , constraints, containers, hspec, http-media, http-types, lucid
-     , mtl, poly-arity, pred-trie, QuickCheck, quickcheck-instances
-     , regex-compat, semigroups, text, transformers, wai, wai-extra
+     , clay, composition, constraints, containers, hspec, http-media
+     , http-types, lucid, mtl, poly-arity, pred-trie, QuickCheck
+     , quickcheck-instances, regex-compat, semigroups, shakespeare, text
+     , transformers, wai, wai-extra, wai-util, witherable
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "0.3.2.1";
-       sha256 = "1mj6l01pfyjasa4zaff41vixbbcwdwwwhqv925bq3n1wkznwkzic";
+       version = "1.0.0.1";
+       sha256 = "04j11mamfpmc0isnxpss6b8qf21mlfs3ndpb8xbdcbcs9hp0xrrq";
        buildDepends = [
-         aeson attoparsec base blaze-html bytestring constraints containers
-         http-media http-types lucid mtl poly-arity pred-trie regex-compat
-         semigroups text transformers wai wai-extra
+         aeson attoparsec base blaze-html bytestring clay composition
+         constraints containers http-media http-types lucid mtl poly-arity
+         pred-trie regex-compat semigroups shakespeare text transformers wai
+         wai-extra wai-util witherable
        ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Declarative, compositional Wai responses";
@@ -93359,8 +93402,8 @@ self: {
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.2.0.0";
-       sha256 = "0dpsxssr8h3ph9c5plrmpxv9mv1mg5zb3wrwfbkyb5g7ja91qs4b";
+       version = "0.2.0.1";
+       sha256 = "1c787c8hq68g2zl1jji6bh2p8hm9fmpdcs898kr8n7b8xbw9jxfk";
        buildDepends = [
          base case-insensitive conduit containers data-default exceptions
          hashable hashable-time lens mono-traversable monoid-subclasses
@@ -94214,8 +94257,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.7";
-       sha256 = "1ayh9gpkj128rsxiqjbgwr62fipc5a5h5vkkjnicjxgpwshnrcb8";
+       version = "0.7.0.1";
+       sha256 = "09ihb3pxw6rk456a0kmgc51fvykz0f499fjd8idns5q1335l18q4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -95207,6 +95250,7 @@ self: {
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
@@ -96421,15 +96465,15 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "8.1";
-       sha256 = "1zzxgap0ipr4l63fc2rf7wxda03ss0f3wxpz6mlh066p7h9wfhyj";
+       version = "8.2";
+       sha256 = "04yydjvwnjilyxwqwrbwg5c2mph58728bacz2q8pbd0084lp77nd";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base bytestring Cabal configurator directory filepath HTTP
          network-uri process tagsoup text vty vty-ui
        ];
-       description = "pgdownloader";
+       description = "simply download a video from webpage and play it";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -106773,10 +106817,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "safe";
-       version = "0.3.8";
-       sha256 = "0k5lk85z2y8kgk7dx7km32g8vi55vnwln8ys2gs174ljd136cjdf";
+       version = "0.3.9";
+       sha256 = "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh";
        buildDepends = [ base ];
-       homepage = "http://community.haskell.org/~ndm/safe/";
+       homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107016,7 +107060,7 @@ self: {
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
-     , QuickCheck, saltine, libsodium, tasty, tasty-quickcheck
+     , QuickCheck, saltine, sodium, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "saltine-quickcheck";
@@ -107028,12 +107072,12 @@ self: {
        testDepends = [
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
-       extraLibraries = [ libsodium ];
+       extraLibraries = [ sodium ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libsodium;};
+     }) { inherit (pkgs) sodium;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
@@ -107258,8 +107302,8 @@ self: {
      }:
      mkDerivation {
        pname = "sandi";
-       version = "0.3.4";
-       sha256 = "1f2id34ga5d7cfas9z3n9b28yxpga44rkn5qvkma41cpf4djg72r";
+       version = "0.3.5";
+       sha256 = "19dfiph5rrxs4shpw286r4agcz739f6afw2wyrlkl66lpaaxjvl5";
        buildDepends = [ base bytestring conduit exceptions ];
        testDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
@@ -108391,8 +108435,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdr";
-       version = "0.1.0.1";
-       sha256 = "1sy5sn401bdsnip99jc8qxp81j2ladrw9yvzmf3xf5hljyq7sxif";
+       version = "0.1.0.2";
+       sha256 = "17i16f9pgd8a2l9ywl516zh29mmk5z08j964blajl46wr38g320j";
        buildDepends = [
          array base bytestring cairo cereal Chart Chart-cairo colour
          containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL
@@ -109224,42 +109268,61 @@ self: {
      }) {};
 
   "servant" = callPackage
-    ({ mkDerivation, base, hspec, parsec, QuickCheck
-     , string-conversions, template-haskell, text
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , bytestring-conversion, case-insensitive, doctest, filemanip
+     , hspec, http-media, http-types, network-uri, parsec, QuickCheck
+     , quickcheck-instances, string-conversions, text, url
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.2.2";
-       sha256 = "1pblmnarq1939d2krwbmd9ssm68ar9ip54dl28zjv2j51vhhhzhc";
+       version = "0.4.0";
+       sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5";
        buildDepends = [
-         base parsec string-conversions template-haskell text
+         aeson attoparsec base bytestring bytestring-conversion
+         case-insensitive http-media http-types network-uri
+         string-conversions text
        ];
        testDepends = [
-         base hspec parsec QuickCheck string-conversions text
+         aeson attoparsec base bytestring doctest filemanip hspec parsec
+         QuickCheck quickcheck-instances string-conversions text url
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-blaze" = callPackage
+    ({ mkDerivation, base, blaze-html, http-media, servant }:
+     mkDerivation {
+       pname = "servant-blaze";
+       version = "0.4.0.0";
+       sha256 = "17l0fm296zg5nwfc6srnjl82qckabyac5yxm1dhqxwxq45kj42an";
+       buildDepends = [ base blaze-html http-media servant ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "Blaze-html support for servant";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-client" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
      , either, exceptions, hspec, http-client, http-client-tls
-     , http-types, network, network-uri, QuickCheck, safe, servant
-     , servant-server, string-conversions, text, transformers, wai, warp
+     , http-media, http-types, HUnit, network, network-uri, QuickCheck
+     , safe, servant, servant-server, string-conversions, text
+     , transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.2.2";
-       sha256 = "0b96aglic4aawdcpaxyv9k807kjfrr0a9kniqgj5nfcpgwglnp5r";
+       version = "0.4.0";
+       sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
-         http-client-tls http-types network-uri safe servant
+         http-client-tls http-media http-types network-uri safe servant
          string-conversions text transformers
        ];
        testDepends = [
-         aeson base bytestring deepseq either hspec http-types network
-         QuickCheck servant servant-server wai warp
+         aeson base bytestring deepseq either hspec http-client http-media
+         http-types HUnit network QuickCheck servant servant-server text wai
+         warp
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
@@ -109267,45 +109330,62 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable
-     , lens, servant, string-conversions, system-filepath, text
-     , unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
+     , case-insensitive, hashable, hspec, http-media, http-types, lens
+     , servant, string-conversions, text, unordered-containers
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.3.1";
-       sha256 = "1xbwi5ix5yanrcldc97dwim7s358g7hbr5pwk3r6azknwjzf5fd4";
+       version = "0.4.0";
+       sha256 = "0fbbs4w0yz0kj3gvms0xbikzfqjdqbbi19z26z3zdmc06crkhn4m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson aeson-pretty base bytestring hashable lens servant
-         string-conversions system-filepath text unordered-containers
+         aeson base bytestring bytestring-conversion case-insensitive
+         hashable http-media http-types lens servant string-conversions text
+         unordered-containers
        ];
+       testDepends = [ aeson base hspec servant string-conversions ];
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-jquery" = callPackage
-    ({ mkDerivation, aeson, base, filepath, hspec, language-ecmascript
-     , lens, servant, servant-server, stm, transformers, warp
+    ({ mkDerivation, aeson, base, charset, filepath, hspec
+     , hspec-expectations, language-ecmascript, lens, servant
+     , servant-server, stm, text, transformers, warp
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.2.2.1";
-       sha256 = "0s3c85jpy630bfnzq0wlzv38bkr18cpw5lffn6wh8pjwshd5y8zi";
+       version = "0.4.0";
+       sha256 = "1p8pdrqyj1pyrwghv3k26s4y4aprlkasbzcba9j5n528xvfg0zw5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base filepath lens servant servant-server stm transformers
-         warp
+         aeson base charset filepath lens servant servant-server stm text
+         transformers warp
+       ];
+       testDepends = [
+         base hspec hspec-expectations language-ecmascript lens servant
        ];
-       testDepends = [ base hspec language-ecmascript servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-lucid" = callPackage
+    ({ mkDerivation, base, http-media, lucid, servant }:
+     mkDerivation {
+       pname = "servant-lucid";
+       version = "0.4.0.0";
+       sha256 = "05jadyh3msl2jlrq1d8bmazxb356qdv0gzwpj9gkvrsp4i6ldgcl";
+       buildDepends = [ base http-media lucid servant ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "Servant support for lucid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-pandoc" = callPackage
     ({ mkDerivation, base, bytestring, pandoc-types, servant-docs, text
      , unordered-containers
@@ -109384,27 +109464,29 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
-     , either, exceptions, hspec, hspec-wai, http-types, network
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , bytestring-conversion, directory, doctest, either, exceptions
+     , filemanip, hspec, hspec-wai, http-types, mmorph, mtl, network
      , network-uri, parsec, QuickCheck, safe, servant, split
      , string-conversions, system-filepath, temporary, text
      , transformers, wai, wai-app-static, wai-extra, warp
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.2.4";
-       sha256 = "11bds7zhkvqg9w27kb0dd792qvz8gjgkmkpbnijvwwzah5gmipi0";
+       version = "0.4.0";
+       sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson attoparsec base bytestring either http-types network-uri safe
-         servant split string-conversions system-filepath text transformers
-         wai wai-app-static warp
+         aeson attoparsec base bytestring either http-types mmorph mtl
+         network-uri safe servant split string-conversions system-filepath
+         text transformers wai wai-app-static warp
        ];
        testDepends = [
-         aeson base bytestring directory either exceptions hspec hspec-wai
-         http-types network parsec QuickCheck servant string-conversions
-         temporary text transformers wai wai-extra warp
+         aeson base bytestring bytestring-conversion directory doctest
+         either exceptions filemanip hspec hspec-wai http-types mtl network
+         parsec QuickCheck servant string-conversions temporary text
+         transformers wai wai-extra warp
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
@@ -113582,12 +113664,12 @@ self: {
      }) {};
 
   "sorted-list" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "sorted-list";
-       version = "0.1.2.1";
-       sha256 = "0jjzhi2wj4ca8bvwbv5nnljyli7c9ravigkndk85wdyzz74n0qbh";
-       buildDepends = [ base ];
+       version = "0.1.4.1";
+       sha256 = "119h4dz8bkwgpl0w9x5q7q7s50jf5zsr7bikh1l446xqzyax2wi4";
+       buildDepends = [ base deepseq ];
        homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -114983,8 +115065,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-build-plan";
-       version = "0.1.0.0";
-       sha256 = "01vnfmsxx6m6x9wip5pqbg5yffprlc94cdj5ahqs2fyqvzs4j8rb";
+       version = "0.1.1.0";
+       sha256 = "1slqkcmvnrbbg50qdf368q5h7svngw77b984mpg39p44mc7ghwyg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -119744,21 +119826,20 @@ self: {
      }) {};
 
   "termbox-bindings" = callPackage
-    ({ mkDerivation, base, c2hs, termbox }:
+    ({ mkDerivation, base, c2hs }:
      mkDerivation {
        pname = "termbox-bindings";
-       version = "0.1.0.3";
-       sha256 = "00s3j6ccc63ycbj2lxzl2200ffwzslaxdny7d0b9dyzgn6n1pal7";
+       version = "0.1.0.5";
+       sha256 = "0hv72kkpx6narykfbf6m59gq4l8gym6fm52n1zzazac1802zw0dv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base ];
        buildTools = [ c2hs ];
-       extraLibraries = [ termbox ];
        homepage = "https://github.com/luciferous/termbox-bindings";
-       description = "Bindings to the termbox library";
+       description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { termbox = null;};
+     }) {};
 
   "terminal-progress-bar" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, HUnit, stm, stm-chans
@@ -122784,7 +122865,6 @@ self: {
        ];
        description = "BitTorrent file parser and generater";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tostring" = callPackage
@@ -125292,8 +125372,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.1.2";
-       sha256 = "14mcv61ci6azzykx287b9cpcwyzbzr66i5s43vdd9wnzrg4mia03";
+       version = "0.1.2.1";
+       sha256 = "0vwqbq3xmacc9fa95wvy2l6r4h831a8g6w1pbxbip2bgqmybsfvk";
        buildDepends = [
          base containers contravariant mtl profunctors template-haskell
          transformers transformers-compat
@@ -130998,15 +131078,13 @@ self: {
      }) {};
 
   "word-trie" = callPackage
-    ({ mkDerivation, base, binary, containers, derive, hspec
-     , QuickCheck
-     }:
+    ({ mkDerivation, base, binary, containers, hspec, QuickCheck }:
      mkDerivation {
        pname = "word-trie";
-       version = "0.2.0.4";
-       sha256 = "0qgljhl2pj54mhsan9w6gchf3l94rs2c5bi9f93q1nz55va1027f";
-       buildDepends = [ base binary containers derive ];
-       testDepends = [ base binary containers derive hspec QuickCheck ];
+       version = "0.3.0";
+       sha256 = "10ljyb1hl4awg2c3wq5shdqj2s53q5fklf7p6np1jhn6i30c5wx3";
+       buildDepends = [ base binary containers ];
+       testDepends = [ base binary containers hspec QuickCheck ];
        homepage = "https://github.com/yi-editor/word-trie";
        description = "Implementation of a finite trie over words";
        license = stdenv.lib.licenses.gpl2;
@@ -131203,35 +131281,35 @@ self: {
      }) {};
 
   "wreq" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base16-bytestring, base64-bytestring, byteable, bytestring
      , case-insensitive, containers, cryptohash, directory, doctest
      , exceptions, filepath, ghc-prim, hashable, http-client
      , http-client-tls, http-types, HUnit, lens, lens-aeson, mime-types
-     , network-info, old-locale, PSQueue, QuickCheck, snap-core
+     , network-info, old-locale, psqueues, QuickCheck, snap-core
      , snap-server, template-haskell, temporary, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , transformers, unix-compat, unordered-containers, uuid
+     , transformers, unix-compat, unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "wreq";
-       version = "0.3.0.1";
-       sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4";
+       version = "0.4.0.0";
+       sha256 = "15vjamr3sain8cdgqhg0jfy0rz3bbb6chrivyzvki5rs2g6pzrja";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive containers cryptohash exceptions ghc-prim hashable
          http-client http-client-tls http-types lens lens-aeson mime-types
-         old-locale PSQueue template-haskell text time unordered-containers
+         old-locale psqueues template-haskell text time unordered-containers
        ];
        testDepends = [
-         aeson aeson-pretty aeson-qq base base64-bytestring bytestring
+         aeson aeson-pretty base base64-bytestring bytestring
          case-insensitive containers directory doctest filepath hashable
          http-client http-types HUnit lens lens-aeson network-info
          QuickCheck snap-core snap-server temporary test-framework
-         test-framework-hunit test-framework-quickcheck2 text transformers
-         unix-compat uuid
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers unix-compat uuid vector
        ];
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
@@ -132260,8 +132338,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.2.5.1";
-       sha256 = "1p3rhmp0j8yayylx936asq7ggn9z50fg3vmd108bfrab2wzqrs4f";
+       version = "1.2.6";
+       sha256 = "1ybl0maakz4arqbblipafwggh0m2n8ljyp91iiihb4674kynrciz";
        buildDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
@@ -135234,23 +135312,23 @@ self: {
 
   "yi-language" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
-     , data-default, derive, filepath, hashable, hspec, lens
-     , oo-prototypes, pointedlist, QuickCheck, regex-base, regex-tdfa
-     , template-haskell, transformers-base, unordered-containers
+     , data-default, filepath, hashable, hspec, lens, oo-prototypes
+     , pointedlist, QuickCheck, regex-base, regex-tdfa, template-haskell
+     , transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "yi-language";
-       version = "0.1.1.0";
-       sha256 = "1gsh0njslncfh0r5wg1rq9w4f03ixkk5grd9zigkspsndhij7379";
+       version = "0.2.0";
+       sha256 = "1a0lvddn35q9jqr0w7g2m268dy8s9dwsss7sf4460rvkg1xvkvvh";
        buildDepends = [
-         array base binary containers data-default derive hashable lens
+         array base binary containers data-default hashable lens
          oo-prototypes pointedlist regex-base regex-tdfa template-haskell
          transformers-base unordered-containers
        ];
        testDepends = [
-         array base binary containers data-default derive filepath hashable
-         hspec lens pointedlist QuickCheck regex-base regex-tdfa
-         template-haskell transformers-base unordered-containers
+         array base binary containers data-default filepath hashable hspec
+         lens pointedlist QuickCheck regex-base regex-tdfa template-haskell
+         transformers-base unordered-containers
        ];
        buildTools = [ alex ];
        homepage = "https://github.com/yi-editor/yi-language";
@@ -135570,6 +135648,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yxdb-utils" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bimap, binary
+     , binary-conduit, bytestring, Codec-Compression-LZF, conduit
+     , conduit-combinators, conduit-extra, containers, csv-conduit
+     , Decimal, directory, exceptions, ghc-prim, HUnit, lens
+     , monad-loops, mtl, newtype, old-locale, parsec, primitive
+     , QuickCheck, quickcheck-instances, reinterpret-cast, resourcet
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, text-binary, time, transformers, vector, xml-conduit
+     }:
+     mkDerivation {
+       pname = "yxdb-utils";
+       version = "0.1.0.1";
+       sha256 = "05aba4fdpqx7sar7yrw4gg341wzfhhlbvx7453ns8mccqhx9dag8";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         array attoparsec base bimap binary binary-conduit bytestring
+         Codec-Compression-LZF conduit conduit-combinators conduit-extra
+         containers csv-conduit Decimal directory exceptions ghc-prim lens
+         monad-loops mtl newtype old-locale parsec primitive
+         reinterpret-cast resourcet text text-binary time transformers
+         vector xml-conduit
+       ];
+       testDepends = [
+         array attoparsec base bimap binary binary-conduit bytestring
+         Codec-Compression-LZF conduit conduit-combinators conduit-extra
+         containers csv-conduit Decimal directory exceptions ghc-prim HUnit
+         lens monad-loops mtl newtype old-locale parsec primitive QuickCheck
+         quickcheck-instances reinterpret-cast resourcet test-framework
+         test-framework-hunit test-framework-quickcheck2 text text-binary
+         time transformers vector xml-conduit
+       ];
+       description = "Utilities for reading and writing Alteryx .yxdb files";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "z3" = callPackage
     ({ mkDerivation, base, containers, gomp, hspec, mtl, QuickCheck, z3
      }:

From 7f761506628b515e62fd9da69fec62d03f0bf34f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 May 2015 13:17:43 +0200
Subject: [PATCH 0697/1143] haskell-call: build should be fixed, but the
 dependency audiovisual is still broken

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b9c80eab34d9..a60bfd8507cf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -517,10 +517,6 @@ self: super: {
   # https://github.com/cgaebel/stm-conduit/issues/33
   stm-conduit = dontCheck super.stm-conduit;
 
-  # https://github.com/fumieval/call/issues/3
-  call = markBrokenVersion "0.1.2" super.call;
-  rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;     # depends on call
-
   # The install target tries to run lots of commands as "root". WTF???
   hannahci = markBroken super.hannahci;
 
@@ -724,6 +720,8 @@ self: super: {
 
   # https://github.com/fumieval/audiovisual/issues/1
   audiovisual = markBroken super.audiovisual;
+  call = dontDistribute super.call;
+  rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;
 
   # https://github.com/alephcloud/hs-stm-queue-extras/issues/2
   stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; });

From c2c724bcafb8a7e7ebe877c06849cf58433dc244 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 May 2015 13:20:16 +0200
Subject: [PATCH 0698/1143] haskell-stm-queue-extras: override is no longer
 necessary

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a60bfd8507cf..4f8f2f6875de 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -723,9 +723,6 @@ self: super: {
   call = dontDistribute super.call;
   rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;
 
-  # https://github.com/alephcloud/hs-stm-queue-extras/issues/2
-  stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; });
-
   # https://github.com/GaloisInc/cryptol/issues/197
   cryptol = overrideCabal super.cryptol (drv: {
     postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs";

From e9e07667b224bb440475d2777d9980dac3c4e180 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 May 2015 13:21:06 +0200
Subject: [PATCH 0699/1143] haskell-cryptol: override is no longer necessary

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4f8f2f6875de..f32cf9b42f82 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -723,11 +723,6 @@ self: super: {
   call = dontDistribute super.call;
   rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;
 
-  # https://github.com/GaloisInc/cryptol/issues/197
-  cryptol = overrideCabal super.cryptol (drv: {
-    postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs";
-  });
-
   # https://github.com/haskell/haddock/issues/378
   haddock-library = dontCheck super.haddock-library;
 

From eafd67b45eb5cdbe2bb03f0778f3219816ab94be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 May 2015 21:58:01 +0200
Subject: [PATCH 0700/1143] haskell-wreq has been fixed upstream

---
 .../haskell-modules/configuration-ghc-7.10.x.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index a05f70e5d442..eebc80a44ea9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -323,11 +323,11 @@ self: super: {
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
   vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
 
-  # https://github.com/bos/wreq/issues/61
-  wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq);
-  wreq-sb = dontDistribute (dontCheck super.wreq-sb);
+  # https://github.com/purefn/hipbot/issues/1
   hipbot = dontDistribute super.hipbot;
-  bitcoin-api = dontDistribute super.bitcoin-api;
+
+  # https://github.com/solatis/haskell-bitcoin-api/issues/1
+  bitcoin-api = markBroken super.bitcoin-api;
   bitcoin-api-extra = dontDistribute super.bitcoin-api-extra;
 
   # https://github.com/HugoDaniel/RFC3339/issues/14

From 9d9e21c7fd7e898b51438a1900dc18366a1fb229 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 5 May 2015 23:55:14 -0400
Subject: [PATCH 0701/1143] mesos: 0.21.0 -> 0.22.0

This also enables the network isolation feature that was introduced in
Mesos 0.20.0.
---
 .../networking/cluster/mesos/default.nix      | 68 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index b298fb559011..9458ffc39256 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,35 +1,38 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
 , automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
 , setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion
-, leveldb, glog
+, leveldb, glog, perf, utillinux, libnl, iproute
 }:
 
-let version = "0.21.0";
-in stdenv.mkDerivation {
-  dontDisableStatic = true;
+let
+  mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
+  soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
 
+in stdenv.mkDerivation rec {
+  version = "0.22.0";
   name = "mesos-${version}";
 
+  dontDisableStatic = true;
+
   src = fetchurl {
     url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz";
-    sha256 = "01ap8blrb046w26zf3i4r7vvnnhjsbfi20vz5yinmncqbzjjyx6i";
+    sha256 = "0z8c1vr7b06l3nqgbxq8ydcz79ayw75y2szipfqkw17c7gv6d7v8";
   };
 
   buildInputs = [
     makeWrapper autoconf automake libtool curl sasl jdk maven
     python wrapPython boto distutils-cfg setuptools leveldb
     subversion apr glog
+  ] ++ lib.optionals stdenv.isLinux [
+    libnl
   ];
 
   propagatedBuildInputs = [
     pythonProtobuf
   ];
 
-  mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
-
   preConfigure = ''
-    export MAVEN_OPTS="-Dmaven.repo.local=$(pwd)/.m2"
-    ln -s $mavenRepo .m2
+    export MAVEN_OPTS="-Dmaven.repo.local=${mavenRepo}"
 
     substituteInPlace src/launcher/fetcher.cpp \
       --replace '"tar' '"${gnutar}/bin/tar'    \
@@ -37,6 +40,29 @@ in stdenv.mkDerivation {
 
     substituteInPlace src/cli/mesos-scp        \
       --replace "'scp " "'${openssh}/bin/scp "
+
+    substituteInPlace src/cli/python/mesos/cli.py \
+      --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'"
+
+  '' + lib.optionalString (stdenv.isLinux) ''
+
+    substituteInPlace configure.ac             \
+      --replace /usr/include/libnl3 ${libnl}/include/libnl3
+
+    substituteInPlace src/linux/perf.cpp       \
+      --replace '"perf ' '"${perf}/bin/perf '
+
+    substituteInPlace src/slave/containerizer/isolators/filesystem/shared.cpp \
+      --replace '"mount ' '"${utillinux}/bin/mount ' \
+
+    substituteInPlace src/slave/containerizer/isolators/namespaces/pid.cpp \
+      --replace '"mount ' '"${utillinux}/bin/mount ' \
+
+    substituteInPlace src/slave/containerizer/isolators/network/port_mapping.cpp \
+      --replace '"tc ' '"${iproute}/bin/tc '   \
+      --replace '"ip ' '"${iproute}/bin/ip '   \
+      --replace '"mount ' '"${utillinux}/bin/mount ' \
+      --replace '/bin/sh' "${stdenv.shell}"
   '';
 
   configureFlags = [
@@ -45,27 +71,29 @@ in stdenv.mkDerivation {
     "--with-svn=${subversion}"
     "--with-leveldb=${leveldb}"
     "--with-glog=${glog}"
+    "--with-glog=${glog}"
+    "--enable-optimize"
     "--disable-python-dependency-install"
+  ] ++ lib.optionals stdenv.isLinux [
+    "--with-network-isolator"
   ];
 
   postInstall = ''
     rm -rf $out/var
     rm $out/bin/*.sh
 
-    ensureDir $out/share/java
+    mkdir -p $out/share/java
     cp src/java/target/mesos-*.jar $out/share/java
 
-    shopt -s extglob
-    MESOS_NATIVE_JAVA_LIBRARY=$(echo $out/lib/libmesos.*(so|dylib))
-    shopt -u extglob
+    MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos.${soext}
 
-    ensureDir $out/nix-support
+    mkdir -p $out/nix-support
     touch $out/nix-support/setup-hook
     echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
     echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
 
     # Inspired by: pkgs/development/python-modules/generic/default.nix
-    ensureDir "$out/lib/${python.libPrefix}"/site-packages
+    mkdir -p $out/lib/${python.libPrefix}/site-packages
     export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
     ${python}/bin/${python.executable} src/python/setup.py install \
       --install-lib=$out/lib/${python.libPrefix}/site-packages \
@@ -85,14 +113,14 @@ in stdenv.mkDerivation {
       fi
     done
 
+    for f in $out/libexec/mesos/python/mesos/*.py; do
+      ${python}/bin/${python.executable} -c "import py_compile; py_compile.compile('$f')"
+    done
+
     # wrap the python programs
-    declare -A pythonPathsSeen=()
-    program_PYTHONPATH="$out/libexec/mesos/python"
-    program_PATH=""
-    _addToPythonPath "$out"
     for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do
       wrapProgram "$out/bin/$prog" \
-        --prefix PYTHONPATH ":" $program_PYTHONPATH
+        --prefix PYTHONPATH ":" "$out/libexec/mesos/python"
       true
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53cb16b95c08..cc81eec8a20f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4640,6 +4640,7 @@ let
     sasl = cyrus_sasl;
     inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython;
     pythonProtobuf = pythonPackages.protobuf2_5;
+    perf = linuxPackages.perf;
   };
 
   mesos-dns = callPackage ../servers/dns/mesos-dns { };

From 760169663e9d96db9a3917067fa982ac044107e4 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 10 May 2015 16:38:19 -0400
Subject: [PATCH 0702/1143] mesos: fix indentation in service definition

---
 nixos/modules/services/misc/mesos-master.nix | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
index 5609cf75bb5c..11e21c334472 100644
--- a/nixos/modules/services/misc/mesos-master.nix
+++ b/nixos/modules/services/misc/mesos-master.nix
@@ -40,10 +40,10 @@ in {
 
       extraCmdLineOptions = mkOption {
         description = ''
-	  Extra command line options for Mesos Master.
+          Extra command line options for Mesos Master.
 
-	  See https://mesos.apache.org/documentation/latest/configuration/
-	'';
+          See https://mesos.apache.org/documentation/latest/configuration/
+        '';
         default = [ "" ];
         type = types.listOf types.string;
         example = [ "--credentials=VALUE" ];
@@ -82,20 +82,20 @@ in {
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
       serviceConfig = {
-	ExecStart = ''
-	  ${pkgs.mesos}/bin/mesos-master \
-	    --port=${toString cfg.port} \
-	    --zk=${cfg.zk} \
-	    ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${toString cfg.quorum}"} \
-	    --work_dir=${cfg.workDir} \
-	    --logging_level=${cfg.logLevel} \
-	    ${toString cfg.extraCmdLineOptions}
-	'';
-	Restart = "on-failure";
-	PermissionsStartOnly = true;
+        ExecStart = ''
+          ${pkgs.mesos}/bin/mesos-master \
+            --port=${toString cfg.port} \
+            --zk=${cfg.zk} \
+            ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${toString cfg.quorum}"} \
+            --work_dir=${cfg.workDir} \
+            --logging_level=${cfg.logLevel} \
+            ${toString cfg.extraCmdLineOptions}
+        '';
+        Restart = "on-failure";
+        PermissionsStartOnly = true;
       };
       preStart = ''
-	mkdir -m 0700 -p ${cfg.workDir}
+        mkdir -m 0700 -p ${cfg.workDir}
       '';
     };
   };

From 62ad22b8aed863aa261f26a017b07db04f669069 Mon Sep 17 00:00:00 2001
From: Linus Arver <linusarver@gmail.com>
Date: Sun, 10 May 2015 15:28:56 -0700
Subject: [PATCH 0703/1143] doc: language-support: fix typo

---
 doc/language-support.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 4fd704319505..87f500a491ba 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -624,7 +624,7 @@ $ cat > Gemfile
 source 'https://rubygems.org'
 gem 'sensu'
 $ bundler package --path /tmp/vendor/bundle
-$ $(nix-build '&nixpkgs>' -A bundix)/bin/bundix
+$ $(nix-build '<nixpkgs>' -A bundix)/bin/bundix
 $ cat > default.nix
 { lib, bundlerEnv, ruby }:
 

From ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 10 May 2015 18:13:00 -0400
Subject: [PATCH 0704/1143] mesos service: only pass --zk if quorum > 0

The ZooKeeper URL is not necessary when using in-memory slave
registration.
---
 nixos/modules/services/misc/mesos-master.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
index 11e21c334472..52f08c53b1dc 100644
--- a/nixos/modules/services/misc/mesos-master.nix
+++ b/nixos/modules/services/misc/mesos-master.nix
@@ -85,8 +85,9 @@ in {
         ExecStart = ''
           ${pkgs.mesos}/bin/mesos-master \
             --port=${toString cfg.port} \
-            --zk=${cfg.zk} \
-            ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${toString cfg.quorum}"} \
+            ${if cfg.quorum == 0
+              then "--registry=in_memory"
+              else "--zk=${cfg.zk} --registry=replicated_log --quorum=${toString cfg.quorum}"} \
             --work_dir=${cfg.workDir} \
             --logging_level=${cfg.logLevel} \
             ${toString cfg.extraCmdLineOptions}

From 7493d6f1f6ca132aa392b88f4dd54cf82f2f22bb Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 10 May 2015 19:56:46 -0400
Subject: [PATCH 0705/1143] marathon: 0.8.0 -> 0.8.1

---
 pkgs/applications/networking/cluster/marathon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 1714aa274f0e..3eebc6de3cf3 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-v${version}";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
-    url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "794c915e205aebd8273f2b40c6faea1517fc683cdc0169194c4a67ce8779fa41";
+    url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";
+    sha256 = "1g2z2c8p47rryyappwv0k3najb6bypvwgg7z9z8prvph2x6rafp6";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];

From aa75bb25d8a681d971aefe9bcd263c9dbf8acf50 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 11 May 2015 02:45:26 +0200
Subject: [PATCH 0706/1143] grsecurity: Update stable and test patches

stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test:   3.1-4.0.2-201505072057   -> 3.1-4.0.2-201505101122
---
 nixos/modules/security/grsecurity.nix     | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index b116d8bfef28..40942644868a 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -38,7 +38,7 @@ in
         type = types.bool;
         default = false;
         description = ''
-          Enable the testing grsecurity patch, based on Linux 3.19.
+          Enable the testing grsecurity patch, based on Linux 4.0.
         '';
       };
 
@@ -223,7 +223,7 @@ in
           message   = ''
             If grsecurity is enabled, you must select either the
             stable patch (with kernel 3.14), or the testing patch (with
-            kernel 3.19) to continue.
+            kernel 4.0) to continue.
           '';
         }
         { assertion = !(cfg.stable && cfg.testing);
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 628dda0ac4b7..4e5facc4483b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.41";
-      revision  = "201505072056";
+      revision  = "201505101121";
       branch    = "stable";
-      sha256    = "1fgi63y61mjmxj0mq2a24lwq0i0186kyvcdsjflw48adwjm6v0kg";
+      sha256    = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "4.0.2";
-      revision  = "201505072057";
+      revision  = "201505101122";
       branch    = "test";
-      sha256    = "0njvgd6n9z35hyxnligb8aq9shxzbwrkrdvpbxc0qxmwya0midv2";
+      sha256    = "14fi31xwlgirbwk7f1xh8vanjxk8b473rz7z38savl4nx2wr5r24";
     };
 
   grsec_fix_path =

From d9838753622a230ff6a0957993deba1e7ffecfc5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 10 May 2015 18:06:29 -0700
Subject: [PATCH 0707/1143] gcc-5: Fix build on darwin

---
 pkgs/development/compilers/gcc/5/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 1c61d57729df..7096467854c7 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -33,6 +33,7 @@
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
 , gnused ? null
+, binutils ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -47,6 +48,9 @@ assert libelf != null -> zlib != null;
 # Make sure we get GNU sed.
 assert stdenv.isDarwin -> gnused != null;
 
+# Need c++filt on darwin
+assert stdenv.isDarwin -> binutils != null;
+
 # The go frontend is written in c++
 assert langGo -> langCC;
 
@@ -285,6 +289,7 @@ stdenv.mkDerivation ({
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
     ++ (optional stdenv.isDarwin gnused)
+    ++ (optional stdenv.isDarwin binutils)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";

From 142b48688c257022d2a697fb1c3a4986cacac447 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 10 May 2015 18:18:23 -0700
Subject: [PATCH 0708/1143] edac-utils: Add derivation

---
 pkgs/os-specific/linux/edac-utils/default.nix | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/linux/edac-utils/default.nix

diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix
new file mode 100644
index 000000000000..0a2f38ffd8af
--- /dev/null
+++ b/pkgs/os-specific/linux/edac-utils/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, perl, makeWrapper
+, sysfsutils, dmidecode, kmod }:
+
+stdenv.mkDerivation {
+  name = "edac-utils-2015-01-07";
+
+  src = fetchFromGitHub {
+    owner = "grondo";
+    repo = "edac-utils";
+    rev = "f9aa96205f610de39a79ff43c7478b7ef02e3138";
+    sha256 = "1dmfqb15ffldl5zirbmwiqzpxbcc2ny9rpfvxcfvpmh5b69knvdg";
+  };
+
+  nativeBuildInputs = [ perl makeWrapper ];
+  buildInputs = [ sysfsutils ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ];
+
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+  ];
+
+  postInstall = ''
+    wrapProgram "$out/sbin/edac-ctl" \
+      --set PATH : "" \
+      --prefix PATH : "${dmidecode}/bin" \
+      --prefix PATH : "${kmod}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/grondo/edac-utils;
+    description = "handles the reporting of hardware-related memory errors.";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc81eec8a20f..739878d1a743 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -808,6 +808,8 @@ let
     linuxHeaders = linuxHeaders_3_14;
   };
 
+  edac-utils = callPackage ../os-specific/linux/edac-utils { };
+
   eggdrop = callPackage ../tools/networking/eggdrop { };
 
   enca = callPackage ../tools/text/enca { };

From e3696ed37fc18f7395d4e0a23a299977173dac09 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 11 May 2015 00:46:24 -0400
Subject: [PATCH 0709/1143] ghcjs: bump ghcjs-prim

closes #7768
---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index eebc80a44ea9..fe3207ada243 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -145,8 +145,8 @@ self: super: {
     version = "0.1.0.0";
     src = fetchgit {
       url = git://github.com/ghcjs/ghcjs-prim.git;
-      rev = "ca08e46257dc276e01d08fb47a693024bae001fa"; # ghc-7.10 branch
-      sha256 = "0w7sqzp5p70yhmdhqasgkqbf3b61wb24djlavwil2j8ry9y472w3";
+      rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch
+      sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy";
     };
     buildDepends = [ primitive ];
     license = pkgs.stdenv.lib.licenses.bsd3;

From 54de18c4aa487098eda1bb40caff1a767f367790 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 11 May 2015 01:19:24 -0400
Subject: [PATCH 0710/1143] smtube: 15.1.0 -> 15.5.10

---
 pkgs/applications/video/smtube/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 128227d8765d..37cae1cd0ed1 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "smtube-15.1.0";
+  name = "smtube-15.5.10";
+
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0l87afj1fwhq8lnhv0djqdc8fy0kvs4q4jrvyiz46ifq7q10qyaf";
+    sha256 = "1if2b0h6snfmj5hnx4cs55zjbdvwagx95jv62f2jgh3m5gis0cbz";
   };
 
-  buildInputs = [ qt4 ];
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
 
-  preConfigure = ''
-    makeFlags="PREFIX=$out"
-  '';
+  buildInputs = [ qt4 ];
 
   meta = with stdenv.lib; {
     description = "Play and download Youtube videos";

From 6f634e3c3abdffdaac9405c872f683f4fcf465fe Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Mon, 11 May 2015 01:57:15 +0800
Subject: [PATCH 0711/1143] Add kbdlight package and setuid wrapper

update nixos/modules/programs/kbdlight.nix to use mkEnableOption
---
 lib/maintainers.nix                         |  1 +
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/programs/kbdlight.nix         | 16 +++++++++++++
 pkgs/os-specific/linux/kbdlight/default.nix | 26 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 5 files changed, 46 insertions(+)
 create mode 100644 nixos/modules/programs/kbdlight.nix
 create mode 100644 pkgs/os-specific/linux/kbdlight/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6906abd2c78c..b1d44ba51474 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -221,6 +221,7 @@
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
   wjlroe = "William Roe <willroe@gmail.com>";
+  womfoo = "Kranium Gikos Mendoza <kranium@gikos.net>";
   wkennington = "William A. Kennington III <william@wkennington.com>";
   wmertens = "Wout Mertens <Wout.Mertens@gmail.com>";
   wscott = "Wayne Scott <wsc9tt@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bf70715cea4c..959d19a25ab6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -62,6 +62,7 @@
   ./programs/environment.nix
   ./programs/info.nix
   ./programs/ibus.nix
+  ./programs/kbdlight.nix
   ./programs/light.nix
   ./programs/nano.nix
   ./programs/screen.nix
diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix
new file mode 100644
index 000000000000..0172368e968f
--- /dev/null
+++ b/nixos/modules/programs/kbdlight.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.kbdlight;
+
+in
+{
+  options.programs.kbdlight.enable = mkEnableOption "kbdlight";
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.kbdlight ];
+    security.setuidPrograms = [ "kbdlight" ];
+  };
+}
diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix
new file mode 100644
index 000000000000..1bc07f357a8a
--- /dev/null
+++ b/pkgs/os-specific/linux/kbdlight/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "kbdlight-${version}";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "hobarrera";
+    repo = "kbdlight";
+    rev = "v${version}";
+    sha256 = "1f08aid1xrbl4sb5447gkip9lnvkia1c4ap0v8zih5s9w8v72bny";
+  };
+
+  preConfigure = ''
+    substituteInPlace Makefile \
+      --replace /usr/local $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/hobarrera/kbdlight;
+    description = "A very simple application that changes MacBooks' keyboard backlight level";
+    license = licenses.isc;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 739878d1a743..4e713f0c91a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9155,6 +9155,8 @@ let
 
   kbd = callPackage ../os-specific/linux/kbd { };
 
+  kbdlight = callPackage ../os-specific/linux/kbdlight { };
+
   kmscon = callPackage ../os-specific/linux/kmscon { };
 
   latencytop = callPackage ../os-specific/linux/latencytop { };

From f8caa8f9400a7d0243ec57d3741851bc5beb7848 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 10 May 2015 22:34:53 -0700
Subject: [PATCH 0712/1143] vlc: 2.2.0 -> 2.2.1

---
 pkgs/applications/video/vlc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index e25f833eabc3..6a1e9552d3c6 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -18,11 +18,11 @@ assert (!withQt5 -> qt4 != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy";
+    sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal";
   };
 
   buildInputs =

From df3d2010aeed12f007acee02e23b10dcf4c5ac84 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 10 May 2015 22:35:05 -0700
Subject: [PATCH 0713/1143] libinput: 0.14.1 -> 0.15.0

---
 pkgs/development/libraries/libinput/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 0c55353c30c1..87d8154e5aa4 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.14.1";
+  name = "libinput-0.15.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0r0v5jqbnwgndq6ns3ss3kv1438ny302m7bg1najcl1dpqp21v9b";
+    sha256 = "07gw2bhjikiix6bgln03n0zqnbqw18svlf2dfpsv893xjwcdnmhn";
   };
 
   configureFlags = [

From 5a117814b8b223bebf3a07243020720167939bd2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 10 May 2015 22:39:31 -0700
Subject: [PATCH 0714/1143] pam: 1.1.8 -> 1.2.0

---
 .../os-specific/linux/pam/CVE-2014-2583.patch | 49 -------------------
 pkgs/os-specific/linux/pam/default.nix        |  9 ++--
 2 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/pam/CVE-2014-2583.patch

diff --git a/pkgs/os-specific/linux/pam/CVE-2014-2583.patch b/pkgs/os-specific/linux/pam/CVE-2014-2583.patch
deleted file mode 100644
index 25b1f7549fae..000000000000
--- a/pkgs/os-specific/linux/pam/CVE-2014-2583.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Wed, 26 Mar 2014 22:17:23 +0000
-Subject: pam_timestamp: fix potential directory traversal issue (ticket #27)
-
-pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of
-the timestamp pathname it creates, so extra care should be taken to
-avoid potential directory traversal issues.
-
-* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat
-"." and ".." tty values as invalid.
-(get_ruser): Treat "." and ".." ruser values, as well as any ruser
-value containing '/', as invalid.
-
-Fixes CVE-2014-2583.
-
-Reported-by: Sebastian Krahmer <krahmer@suse.de>
-
-diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c
-index 5193733..b3f08b1 100644
---- a/modules/pam_timestamp/pam_timestamp.c
-+++ b/modules/pam_timestamp/pam_timestamp.c
-@@ -158,7 +158,7 @@ check_tty(const char *tty)
- 		tty = strrchr(tty, '/') + 1;
- 	}
- 	/* Make sure the tty wasn't actually a directory (no basename). */
--	if (strlen(tty) == 0) {
-+	if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) {
- 		return NULL;
- 	}
- 	return tty;
-@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t ruserbuflen)
- 		if (pwd != NULL) {
- 			ruser = pwd->pw_name;
- 		}
-+	} else {
-+		/*
-+		 * This ruser is used by format_timestamp_name as a component
-+		 * of constructed timestamp pathname, so ".", "..", and '/'
-+		 * are disallowed to avoid potential path traversal issues.
-+		 */
-+		if (!strcmp(ruser, ".") ||
-+		    !strcmp(ruser, "..") ||
-+		    strchr(ruser, '/')) {
-+			ruser = NULL;
-+		}
- 	}
- 	if (ruser == NULL || strlen(ruser) >= ruserbuflen) {
- 		*ruserbuf = '\0';
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 43b8204f50c2..29cfa64b22d8 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchurl, flex, cracklib }:
 
 stdenv.mkDerivation rec {
-  name = "linux-pam-1.1.8";
+  name = "linux-pam-${version}";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2;
-    sha256 = "0m8ygb40l1c13nsd4hkj1yh4p1ldawhhg8pyjqj9w5kd4cxg5cf4";
+    url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2";
+    sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd";
   };
 
-  patches = [ ./CVE-2014-2583.patch ];
-
   nativeBuildInputs = [ flex ];
 
   buildInputs = [ cracklib ];

From 4b07d1682754ba782b43611499f31cf9f750e569 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 11 May 2015 03:11:30 -0400
Subject: [PATCH 0715/1143] intltool: refactor

---
 .../tools/misc/intltool/default.nix           | 40 +++++++------------
 .../tools/misc/intltool/default.upstream      |  2 -
 2 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/intltool/default.upstream

diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index 40b7ea3b5782..761cd6edfc2c 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -1,33 +1,21 @@
-{ stdenv, fetchurl, perl, perlXMLParser, gettext }:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="intltool";
-    version="0.51.0";
-    name="${baseName}-${version}";
-    hash="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
-    url="https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz";
-    sha256="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
-  };
-  propagatedBuildInputs = [perl perlXMLParser];
-  buildInputs = [];
-  in
-stdenv.mkDerivation {
-  inherit (s) name version;
+{ stdenv, fetchurl, gettext, perl, perlXMLParser }:
+
+stdenv.mkDerivation rec {
+  name = "intltool-${version}";
+  version = "0.51.0";
+
   src = fetchurl {
-    inherit (s) url sha256;
+    url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
   };
-  inherit buildInputs;
 
-  # not needed by intltool itself but (probably) needed for its usage
-  propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ];
+  propagatedBuildInputs = [ gettext perl perlXMLParser ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Translation helper tool";
-    homepage = "http://launchpad.net/intltool/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
-    inherit (s) version;
+    homepage = http://launchpad.net/intltool/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/intltool/default.upstream b/pkgs/development/tools/misc/intltool/default.upstream
deleted file mode 100644
index 323bf21f45a1..000000000000
--- a/pkgs/development/tools/misc/intltool/default.upstream
+++ /dev/null
@@ -1,2 +0,0 @@
-attribute_name intltool
-url https://launchpad.net/intltool/+download

From b8f1d6c9dbc456930ac33347c01f789c0525e70a Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 11 May 2015 04:22:26 -0400
Subject: [PATCH 0716/1143] global: refactor

---
 .../development/tools/misc/global/default.nix | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 7b61d96e3e7e..0fa547097885 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,5 +1,6 @@
-{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite
-, pythonPackages, makeWrapper }:
+{ fetchurl, stdenv, libtool, makeWrapper
+, coreutils, ctags, ncurses, pythonPackages, sqlite, pkgconfig
+}:
 
 stdenv.mkDerivation rec {
   name = "global-6.4";
@@ -9,16 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri";
   };
 
-  buildInputs = [ libtool ncurses makeWrapper ];
+  nativeBuildInputs = [ libtool makeWrapper ];
+
+  buildInputs = [ ncurses ];
+
   propagatedBuildInputs = [ pythonPackages.pygments ];
 
-  configurePhase =
-    '' ./configure --prefix="$out" --disable-static ''
-    + ''--with-posix-sort=$(type -p sort) ''
-    + ''--with-ltdl-include=${libtool}/include --with-ltdl-lib=${libtool}/lib ''
-    + ''--with-ncurses=${ncurses} ''
-    + ''--with-sqlite3=${sqlite} ''
-    + ''--with-exuberant-ctags=${ctags}/bin/ctags'';
+  configureFlags = [
+    "--with-ltdl-include=${libtool}/include"
+    "--with-ltdl-lib=${libtool}/lib"
+    "--with-ncurses=${ncurses}"
+    "--with-sqlite3=${sqlite}"
+    "--with-exuberant-ctags=${ctags}/bin/ctags"
+    "--with-posix-sort=${coreutils}/bin/sort"
+  ];
 
   doCheck = true;
 
@@ -34,7 +39,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Source code tag system";
-
     longDescription = ''
       GNU GLOBAL is a source code tagging system that works the same way
       across diverse environments (Emacs, vi, less, Bash, web browser, etc).
@@ -45,11 +49,8 @@ stdenv.mkDerivation rec {
       independence of any editor.  It runs on a UNIX (POSIX) compatible
       operating system like GNU and BSD.
     '';
-
-    license = licenses.gpl3Plus;
-
     homepage = http://www.gnu.org/software/global/;
-
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.unix;
   };

From 1199d23a39a4ffd97476176b5fd29b36f8a5112d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 10 May 2015 23:15:46 -0700
Subject: [PATCH 0717/1143] ceph: 0.94.1 -> 0.94.1.1

---
 pkgs/tools/filesystems/ceph/0.94.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index a14259184a57..b8d87506b7e5 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.94.1";
+  version = "0.94.1.1";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0rrl10vda4xv22al2c5ccd8v8drs26186dvkrxndvqz8p9999cjx";
+    sha256 = "1qvjj2iqzv2xz5037ksbk7mqjv6gsx2jsprizdzzzij3hnlricp5";
   };
 
   patches = [ ./fix-pgrefdebugging.patch ];

From 4cba460737bcaace3609a4bc78fecf6805293e4b Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 11 May 2015 05:27:53 -0400
Subject: [PATCH 0718/1143] ctags: 804 -> 816

---
 pkgs/development/tools/misc/ctags/default.nix | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix
index bf13a5daa666..26b186c11eab 100644
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/pkgs/development/tools/misc/ctags/default.nix
@@ -1,27 +1,22 @@
-{ stdenv, fetchsvn, automake, autoconf}:
+{ stdenv, fetchsvn, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "ctags-${revision}";
-  revision = "804";
+  revision = "816";
 
   src = fetchsvn {
-    url = "http://ctags.svn.sourceforge.net/svnroot/ctags/trunk";
+    url = "https://ctags.svn.sourceforge.net/svnroot/ctags/trunk";
     rev = revision;
-    sha256 = "16gln1mah2jqp32ki1z0187dwkbjx1xcnmyiardcq6c9w3p4qwcr";
+    sha256 = "0jmbkrmscbl64j71qffcc39x005jrmphx8kirs1g2ws44wil39hf";
   };
 
-  buildInputs = [ automake autoconf ];
-
-  preConfigure = "autoreconf -i";
+  nativeBuildInputs = [ autoreconfHook ];
 
   # don't use $T(E)MP which is set to the build directory
-  configureFlags="--enable-tmpdir=/tmp";
+  configureFlags= [ "--enable-tmpdir=/tmp" ];
 
-  meta = {
-    homepage = "http://ctags.sourceforge.net/";
+  meta = with stdenv.lib; {
     description = "A tool for fast source code browsing (exuberant ctags)";
-    license = stdenv.lib.licenses.gpl2Plus;
-
     longDescription = ''
       Ctags generates an index (or tag) file of language objects found
       in source files that allows these items to be quickly and easily
@@ -30,9 +25,10 @@ stdenv.mkDerivation rec {
       alternatively, the index entry created for that object).  Many
       programming languages are supported.
     '';
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    homepage = http://ctags.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ simons ];
+    platforms = platforms.unix;
   };
 
 }

From caf62e8bfb7924f52af0b22f27b899ec9ec1b17b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 9 May 2015 20:39:49 +0200
Subject: [PATCH 0719/1143] add charybdis to nixpkgs

---
 pkgs/servers/irc/charybdis/default.nix        | 34 +++++++++++++++++++
 .../servers/irc/charybdis/remove-setenv.patch | 12 +++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/servers/irc/charybdis/default.nix
 create mode 100644 pkgs/servers/irc/charybdis/remove-setenv.patch

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
new file mode 100644
index 000000000000..ab0ba4fd9343
--- /dev/null
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchgit, bison, flex, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "charybdis-3.5.0-rc1";
+
+  src = fetchgit {
+    url = "https://github.com/atheme/charybdis.git";
+    rev = "43a9b61c427cd0f3fa2c192890b8a48d9ea6fb7f";
+    sha256 = "ae2c8a72e6a29c901f9b51759b542ee12c4ec918050a2d9d65e5635077a0fcef";
+  };
+
+  patches = [
+     ./remove-setenv.patch
+  ];
+
+  configureFlags = [
+    "--enable-epoll"
+    "--enable-ipv6"
+    "--enable-openssl=${openssl}"
+    "--with-program-prefix=charybdis-"
+  ];
+
+  buildInputs = [ bison flex openssl ];
+
+  meta = {
+    description = "An extremely scalable ircd with some cooperation with the ratbox and ircu guys";
+    homepage    = https://github.com/atheme/charybdis;
+    license     = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+
+
+}
diff --git a/pkgs/servers/irc/charybdis/remove-setenv.patch b/pkgs/servers/irc/charybdis/remove-setenv.patch
new file mode 100644
index 000000000000..c53c1ff294e0
--- /dev/null
+++ b/pkgs/servers/irc/charybdis/remove-setenv.patch
@@ -0,0 +1,12 @@
+diff --git a/src/bandbi.c b/src/bandbi.c
+index 03dd907..3698e85 100644
+--- a/src/bandbi.c
++++ b/src/bandbi.c
+@@ -82,7 +82,6 @@ start_bandb(void)
+ 	const char *suffix = "";
+ #endif
+ 
+-	rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1);
+ 	if(bandb_path == NULL)
+ 	{
+ 		rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..c38831625f69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8371,6 +8371,8 @@ let
   bosun = callPackage ../servers/monitoring/bosun {};
   scollector = callPackage ../servers/monitoring/bosun/scollector.nix {};
 
+  charybdis = callPackage ../servers/irc/charybdis {};
+
   couchdb = callPackage ../servers/http/couchdb {
     spidermonkey = spidermonkey_185;
     python = python27;

From 304cab2b4648070859a3e55b6004fb5d0adadfe8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 9 May 2015 21:35:29 +0200
Subject: [PATCH 0720/1143] add charybdis nixos module

---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/charybdis.nix | 98 +++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 nixos/modules/services/networking/charybdis.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d182359b5cff..6333baf1d6cc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -252,6 +252,7 @@
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
   ./services/networking/btsync.nix
+  ./services/networking/charybdis.nix
   ./services/networking/chrony.nix
   ./services/networking/cjdns.nix
   ./services/networking/cntlm.nix
diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
new file mode 100644
index 000000000000..91729ebd60a5
--- /dev/null
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -0,0 +1,98 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf mkOption singleton types;
+  inherit (pkgs) coreutils charybdis;
+  cfg = config.services.charybdis;
+
+  configFile = pkgs.writeText "charybdis.conf" ''
+    ${cfg.config}
+  '';
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.charybdis = {
+
+      enable = mkEnableOption "Charybdis IRC daemon";
+
+      config = mkOption {
+        type = types.string;
+        description = ''
+          Charybdis IRC daemon configuration file.
+        '';
+      };
+
+      statedir = mkOption {
+        type = types.string;
+        default = "/var/lib/charybdis";
+        description = ''
+          Location of the state directory of charybdis.
+        '';
+      };
+
+      user = mkOption {
+        type = types.string;
+        default = "ircd";
+        description = ''
+          Charybdis IRC daemon user.
+        '';
+      };
+
+      group = mkOption {
+        type = types.string;
+        default = "ircd";
+        description = ''
+          Charybdis IRC daemon group.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton {
+      name = cfg.user;
+      description = "Charybdis IRC daemon user";
+      uid = config.ids.uids.ircd;
+      group = cfg.group;
+    };
+
+    users.extraGroups = singleton {
+      name = cfg.group;
+      gid = config.ids.gids.ircd;
+    };
+
+    systemd.services.charybdis = {
+      description = "Charybdis IRC daemon";
+      wantedBy = [ "multi-user.target" ];
+      environment = {
+        BANDB_DBPATH = "${cfg.statedir}/ban.db";
+      };
+      serviceConfig = {
+        ExecStart   = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}";
+        Group = cfg.group;
+        User = cfg.user;
+        PermissionsStartOnly = true; # preStart needs to run with root permissions
+      };
+      preStart = ''
+        if ! test -d /var/lib/charybdis; then
+          ${coreutils}/bin/mkdir -p ${cfg.statedir}
+          ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}
+        fi
+      '';
+
+    };
+
+  };
+
+}

From 748be0b5d00a8270cf7c7bbd757a3caf698da2a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 11:46:57 +0200
Subject: [PATCH 0721/1143] thunderbird: Update to 31.6.0

Fixes various critical vulnerabilities.
---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 5124b78d071f..6d5dd577bf22 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "31.4.0"; in
+let version = "31.6.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
-    sha1 = "00b55e28f55b84e3cd257407d797e07a363aeef8";
+    sha1 = "147ba0f3c7da29a7814ee9ce4265fb107744559e";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx

From 46d30ae22f741e58c24d14755c76a337c88c9404 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 11 May 2015 06:20:12 -0400
Subject: [PATCH 0722/1143] mkvtoolnix: 7.8.0 -> 7.9.0

---
 .../applications/video/mkvtoolnix/default.nix | 79 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 01d96542c2e7..0dbf42713831 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,49 +1,74 @@
-{ stdenv, fetchurl
-, libmatroska
-, flac
-, libvorbis
-, file
-, boost
-, xdg_utils
-, expat
-, withGUI ? true
-, wxGTK
-, zlib
-, ruby
-, gettext
-, pkgconfig
-, curl
+{ stdenv, fetchurl, gettext, pkgconfig, ruby
+, boost, expat, file, flac, libebml, libmatroska, libogg, libvorbis, xdg_utils, zlib
+# pugixml (not packaged)
+, buildConfig ? "all"
+, withGUI ? false, qt5 ? null # Disabled for now until upstream issues are resolved
+, legacyGUI ? true, wxGTK ? null
+# For now both qt5 and wxwidgets gui's are enabled, if wxwidgets is disabled the
+# build system doesn't install desktop entries, icons, etc...
 }:
 
-assert withGUI -> wxGTK != null;
+let
+  inherit (stdenv.lib) enableFeature optional;
+in
+
+assert withGUI -> qt5 != null;
+assert legacyGUI -> wxGTK != null;
 
 stdenv.mkDerivation rec {
-  version = "7.8.0";
   name = "mkvtoolnix-${version}";
+  version = "7.9.0";
 
   src = fetchurl {
     url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
-    sha256 = "0m7y9115bkfsm95hv2nq0hnd9w73jymsm071jm798w11vdskm8af";
+    sha256 = "0jmsgfkxrnplpmwlzynqdb4xf3x1z3dminz97gmddswwgnjqyy1r";
   };
 
+  patchPhase = ''
+    patchShebangs ./rake.d/
+    patchShebangs ./Rakefile
+    # Force ruby encoding to use UTF-8 or else when enabling qt5 the Rakefile may
+    # fail with `invalid byte sequence in US-ASCII' due to UTF-8 characters
+    # This workaround replaces an arbitrary comment in the drake file
+    sed -e 's,#--,Encoding.default_external = Encoding::UTF_8,' -i ./drake
+  '';
+
+  configureFlags = [
+    "--with-boost-libdir=${boost.lib}/lib"
+    "--without-curl"
+  ] ++ (
+    if (withGUI || legacyGUI) then [
+      "--with-mkvtoolnix-gui"
+      "--enable-gui"
+      (enableFeature withGUI "qt")
+      (enableFeature legacyGUI "wxwidgets")
+    ] else [
+      "--disable-gui"
+    ]
+  );
+
+  nativeBuildInputs = [ gettext pkgconfig ruby ];
+
   buildInputs = [
-    libmatroska flac libvorbis file boost xdg_utils
-    expat zlib ruby gettext pkgconfig curl
-    ] ++ stdenv.lib.optional withGUI wxGTK;
+    boost expat file flac libebml libmatroska libogg libvorbis xdg_utils zlib
+  ] ++ optional withGUI qt5
+    ++ optional legacyGUI wxGTK;
+
+  enableParallelBuilding = true;
 
-  configureFlags = "--with-boost-libdir=${boost.lib}/lib";
   buildPhase = ''
-    ruby ./drake
+    ./drake
   '';
 
   installPhase = ''
-    ruby ./drake install
+    ./drake install
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Cross-platform tools for Matroska";
     homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ codyopel fuuzetsu ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 716349d60741..9ac1bd592e34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7144,6 +7144,8 @@ let
 
   mkvtoolnix-cli = mkvtoolnix.override {
     withGUI = false;
+    qt5 = null;
+    legacyGUI = false;
     wxGTK = null;
   };
 

From c13f189b19e16e25d49152ed176b2f62b65057dc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 11 May 2015 06:41:53 -0400
Subject: [PATCH 0723/1143] ats-extsolve: bump

---
 .../compilers/ats-extsolve/default.nix        |  11 +-
 .../compilers/ats-extsolve/misc-fixes.patch   | 136 ------------------
 2 files changed, 5 insertions(+), 142 deletions(-)
 delete mode 100644 pkgs/development/compilers/ats-extsolve/misc-fixes.patch

diff --git a/pkgs/development/compilers/ats-extsolve/default.nix b/pkgs/development/compilers/ats-extsolve/default.nix
index 9cd6d3adb324..c1a7f2882a0a 100644
--- a/pkgs/development/compilers/ats-extsolve/default.nix
+++ b/pkgs/development/compilers/ats-extsolve/default.nix
@@ -1,22 +1,21 @@
 { stdenv, fetchurl, ats2, python, z3, pkgconfig, json_c }:
 
 stdenv.mkDerivation {
-  name = "ats-extsolve-0pre6a9b752";
+  name = "ats-extsolve-0pre11177d9";
 
   buildInputs = [ python z3 ats2 pkgconfig json_c ];
 
   src = fetchurl {
-    url = "https://github.com/githwxi/ATS-Postiats-contrib/archive/6a9b752efb8af1e4f77213f9e81fc2b7fa050877.tar.gz";
-    sha256 = "1zz4fqjm1rdvpm0m0sdck6vx55iiqlk2p8z078fca2q9xyxqjkqd";
+    url = "https://github.com/wdblair/ATS-Postiats-contrib/archive/11177d9194b852392d5e92e67d0ecc7b6abc02bf.tar.gz";
+    sha256 = "12fhlcpq5b4pc3h21w1i7yv1ymrll2g4zlf1pvg0v8cr6aa6i813";
   };
 
   postUnpack = ''
-    export PATSHOMERELOC="$PWD/$sourceRoot";
+    export PATSHOMERELOC="$PWD/$sourceRoot"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PATSHOMERELOC"
+    export INCLUDE_ATS="-IATS $PATSHOMERELOC"
   '';
 
-  patches = [ ./misc-fixes.patch ];
-
   preBuild = "cd projects/MEDIUM/ATS-extsolve";
 
   buildFlags = [ "setup" "patsolve" ];
diff --git a/pkgs/development/compilers/ats-extsolve/misc-fixes.patch b/pkgs/development/compilers/ats-extsolve/misc-fixes.patch
deleted file mode 100644
index 8775bb83ba4c..000000000000
--- a/pkgs/development/compilers/ats-extsolve/misc-fixes.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From bfc7216250e666a59e304f3b7518f8b0bccccbae Mon Sep 17 00:00:00 2001
-From: Shea Levy <shea@shealevy.com>
-Date: Thu, 30 Apr 2015 16:50:47 -0400
-Subject: [PATCH] Add missing case in fprint_s2rt
-
----
- projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats b/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats
-index a841b5f..5bc28d7 100644
---- a/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats
-+++ b/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats
-@@ -113,6 +113,7 @@ case+ s2t0 of
- | S2RTfun (args, ret) => fprint (out, "S2RTfun()")
- | S2RTtup () => fprint (out, "S2RTtup()")
- | S2RTerr () => fprint (out, "S2RTerr()")
-+| S2RTuninterp (str) => fprint! (out, "S2RTuninterp(", str, ")")
- //
- | S2RTignored () => fprint (out, "S2RTignored()")
- //
-From 9d4c7669d0d3bc8725648684391a2962ed5a922e Mon Sep 17 00:00:00 2001
-From: Shea Levy <shea@shealevy.com>
-Date: Thu, 30 Apr 2015 17:13:35 -0400
-Subject: [PATCH] ATS-extsolve: Get rid of verbose . overload
-
----
- projects/MEDIUM/ATS-extsolve/solving/solver.dats | 2 +-
- projects/MEDIUM/ATS-extsolve/solving/solver.sats | 6 ------
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver.dats b/projects/MEDIUM/ATS-extsolve/solving/solver.dats
-index 8446cd5..f2f77b4 100644
---- a/projects/MEDIUM/ATS-extsolve/solving/solver.dats
-+++ b/projects/MEDIUM/ATS-extsolve/solving/solver.dats
-@@ -250,7 +250,7 @@ end // end of [c3nstr_solve_main]
- implement c3nstr_solve (c3t, scripts, verbose) = let
-   var env : smtenv
-   val _ = smtenv_nil (env)
--  val () = env.verbose (verbose)
-+  val () = smtenv_set_verbose(env, verbose)
-   val () = 
-       case+ scripts of 
-           | list_nil () => ()
-diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver.sats b/projects/MEDIUM/ATS-extsolve/solving/solver.sats
-index e43a028..dae452c 100644
---- a/projects/MEDIUM/ATS-extsolve/solving/solver.sats
-+++ b/projects/MEDIUM/ATS-extsolve/solving/solver.sats
-@@ -39,14 +39,8 @@ fun smtenv_load_scripts (env: &smtenv, scripts: List0(string)): void
- 
- fun smtenv_get_solver (env: &smtenv): solver
- 
--fun smtenv_get_verbose (env: &smtenv): bool
--
--overload .verbose with smtenv_get_verbose
--
- fun smtenv_set_verbose (env: &smtenv, verbose: bool): void
- 
--overload .verbose with smtenv_set_verbose
--
- fun formula_cst (s2c: s2cst): formula
- 
- (* ****** ****** *)
-From e3473a8d9dc7c56cda1111a439db7123254d00b4 Mon Sep 17 00:00:00 2001
-From: Shea Levy <shea@shealevy.com>
-Date: Thu, 30 Apr 2015 18:09:33 -0400
-Subject: [PATCH 1/2] solver_smt.dats: Don't use mapfree on linear list of
- non-linear values
-
----
- projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats b/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats
-index 04055b9..b49602d 100644
---- a/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats
-+++ b/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats
-@@ -348,7 +348,7 @@ in
-         //
-         val () = assertloc (length(pairs) > 0)
-         //
--        implement list_vt_mapfree$fopr<@(s2exp,s2exp)><formula>(x) = let
-+        implement list_vt_map$fopr<@(s2exp,s2exp)><formula>(x) = let
-           val (pf, fpf | Env) = $UN.ptr1_vtake{smtenv}(addr@ env)
-           val met = formula_make (!Env, x.0)
-           val bound = formula_make (!Env, x.1)
-@@ -362,7 +362,8 @@ in
-         end
-         //
-         val assertions =
--          list_vt_mapfree<(s2exp,s2exp)><formula> (pairs)
-+          list_vt_map<(s2exp,s2exp)><formula> (pairs)
-+        val () = list_vt_free(pairs)
-         //
-         implement 
-         list_vt_fold$init<formula><formula> (x) = x
-
-From 50de956561e6bf43190d7efb385bb6da658f1637 Mon Sep 17 00:00:00 2001
-From: Shea Levy <shea@shealevy.com>
-Date: Thu, 30 Apr 2015 18:18:56 -0400
-Subject: [PATCH 2/2] ats-extsolve/main.dats: Don't use mapfree on linear list
- of non-linear values
-
----
- projects/MEDIUM/ATS-extsolve/main.dats | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/projects/MEDIUM/ATS-extsolve/main.dats b/projects/MEDIUM/ATS-extsolve/main.dats
-index ac30ca0..930697d 100644
---- a/projects/MEDIUM/ATS-extsolve/main.dats
-+++ b/projects/MEDIUM/ATS-extsolve/main.dats
-@@ -34,7 +34,7 @@ dynload "commarg.dats"
- 
- (* ****** ****** *)
- 
--overload mapfree with list_vt_mapfree
-+overload map with list_vt_map
- overload filter with list_vt_filter
- 
- (* ****** ****** *)
-@@ -56,12 +56,13 @@ implement main0 (argc, argv) = let
-       | Script (s) => true
-       | _ =>> false
-   implement
--  list_vt_mapfree$fopr<commarg><string> (x) =
-+  list_vt_map$fopr<commarg><string> (x) =
-     case- x of
-       | Script (s) => s
-   //
-   val scriptargs = filter (list_vt_copy (args))
--  val scripts = mapfree<commarg><string> (scriptargs)
-+  val scripts = map<commarg><string> (scriptargs)
-+  val () = list_vt_free (scriptargs)
-   //
-   implement
-   list_find$pred<commarg> (x) =

From 492471b453d0b3fd9c8ffac58e274d97306878da Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 12:39:37 +0200
Subject: [PATCH 0724/1143] Apply some overrides to upstream systemd units

This removes the need for the following patches:

https://github.com/edolstra/systemd/commit/9a6cade993f432b520d4a2f77d0a15e08abc4dfa
https://github.com/edolstra/systemd/commit/9f7e832c901815d80d0ef38c3cbb68abb07fd914
---
 nixos/modules/system/boot/systemd.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 0f210d506881..1fde720bba0d 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -736,10 +736,18 @@ in
         ${concatStringsSep "\n" cfg.tmpfiles.rules}
       '';
 
+    # Some overrides to upstream units.
+    systemd.services."systemd-backlight@".restartIfChanged = false;
+    systemd.services."systemd-rfkill@".restartIfChanged = false;
     systemd.services."user@".restartIfChanged = false;
-
-    systemd.services.systemd-remount-fs.restartIfChanged = false;
     systemd.services.systemd-journal-flush.restartIfChanged = false;
+    systemd.services.systemd-journald.restartIfChanged = false; # FIXME: shouldn't be necessary with systemd 219
+    systemd.services.systemd-random-seed.restartIfChanged = false;
+    systemd.services.systemd-remount-fs.restartIfChanged = false;
+    systemd.services.systemd-update-utmp.restartIfChanged = false;
+    systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
+    systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
+    systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
 
   };
 

From 61432ad2a6a266aef8381a1edf0211a8d2e6546a Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 11 May 2015 13:12:24 +0200
Subject: [PATCH 0725/1143] qgis: update to 2.8.2

---
 pkgs/applications/gis/qgis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index f3141a30bf15..08e804b7ae93 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -2,7 +2,7 @@
   pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.8.1";
+  name = "qgis-2.8.2";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "19acb74e4e2739238b87bf64f2750e10e366e9d61d070a4b8ca341ce01ca9741";
+    sha256 = "fd3c01e48224f611c3bb279b0af9cc1dff3844cdc93f7b45e4f37cf8f350bc4b";
   };
 
   postInstall = ''

From c206c9cd95811749ec8ee11905422d0ea046470d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 14:44:24 +0200
Subject: [PATCH 0726/1143] libmicrohttpd: Don't enable some expensive features
 by default

Commit c5d13d4fe96674a4fcb04b54ea552847302e13ee caused libmicrohttpd
to be not so micro anymore, increasing its closure size from 40 MiB to
283 MiB, which is annoying for packages like systemd that use it. So
don't enable httpd/spdy support by default.
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0053a5f17759..07e8d91a477c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6763,7 +6763,10 @@ let
 
   libmemcached = callPackage ../development/libraries/libmemcached { };
 
-  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
+  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd {
+    openssl = null;
+    gnutls = null;
+  };
 
   libmikmod = callPackage ../development/libraries/libmikmod { };
 

From c7893e960d0dc179812139d352d1c51ae4ecc6e8 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 11 May 2015 14:25:17 +0000
Subject: [PATCH 0727/1143] efibootmgr/var: upgrade

---
 pkgs/tools/system/efibootmgr/default.nix | 6 +++---
 pkgs/tools/system/efivar/default.nix     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 67b97ea75b15..3f26760e621b 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "efibootmgr-${version}";
-  version = "0.7.0";
+  version = "0.11.0";
 
   buildInputs = [ perl efivar pciutils zlib ];
 
   src = fetchgit {
-    url = "git://github.com/vathpela/efibootmgr.git";
+    url = "git://github.com/rhinstaller/efibootmgr.git";
     rev = "refs/tags/${name}";
-    sha256 = "1nazmqxppx2xa8clv4bjdb1b6gyyimgjdj85n2hmf1smqr8krrmz";
+    sha256 = "1di7cipi6jh4qaiq1ckyk6aimgpagb85yr37k3c1kj1m9p5qra4j";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 618623146baa..fadf99f9b977 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "0.10";
+  version = "0.15";
 
   src = fetchgit {
-    url = "git://github.com/vathpela/efivar.git";
+    url = "git://github.com/rhinstaller/efivar.git";
     rev = "refs/tags/${version}";
-    sha256 = "04fznbmrf860b4d4i8rshx3mgwbx06v187wf1rddvxxnpkq8920w";
+    sha256 = "1k5krjghb2r04wv6kxnhs1amqwzk7khzm7bsh0wnbsz7qn92masr";
   };
 
   buildInputs = [ popt ];

From 4ead7bc0b79c2b99b10954de28114f9b43e8b732 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 May 2015 22:42:27 +0200
Subject: [PATCH 0728/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/65d3f6a305833c5dabde5fa93e130ab575bdedbe
 with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e

---
 .../haskell-modules/hackage-packages.nix      | 293 +++++++++++-------
 1 file changed, 189 insertions(+), 104 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7ed9ef9195d8..2361129113d0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10641,6 +10641,7 @@ self: {
          hashtables intern stringable system-filepath text
          unordered-containers vector vector-th-unbox
        ];
+       jailbreak = true;
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Alphabet and word representations";
        license = stdenv.lib.licenses.bsd3;
@@ -13186,6 +13187,7 @@ self: {
        version = "0.3.0.1";
        sha256 = "0w14kra36ksa8jn72rr9b01f36gff33fi6ffrcws640v4pwisrg5";
        buildDepends = [ attoparsec base bytestring cereal text ];
+       jailbreak = true;
        homepage = "http://github.com/bergey/STL";
        description = "STL 3D geometry format parsing and pretty-printing";
        license = stdenv.lib.licenses.bsd3;
@@ -17266,22 +17268,22 @@ self: {
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
-     , QuickCheck, scientific, syb, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, time
-     , unordered-containers, vector
+     , old-locale, QuickCheck, scientific, syb, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "0.8.0.2";
-       sha256 = "1mc8cwmswx69r77wv7dfim525jqajnlxbcx5xf3ygpszzf6mh1q7";
+       version = "0.8.1.0";
+       sha256 = "0dr0pnql4hlb6fxg9wvzg8a7ssjnzc89gpv0rxlkpaqrbb2hk32m";
        buildDepends = [
          attoparsec base blaze-builder bytestring containers deepseq dlist
          ghc-prim hashable mtl scientific syb template-haskell text time
-         unordered-containers vector
+         transformers unordered-containers vector
        ];
        testDepends = [
-         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
-         template-haskell test-framework test-framework-hunit
+         attoparsec base bytestring containers ghc-prim HUnit old-locale
+         QuickCheck template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
        ];
        homepage = "https://github.com/bos/aeson";
@@ -17452,8 +17454,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-schema";
-       version = "0.3.0.4";
-       sha256 = "05iizrs50q0ndrh3p20hj1pfv45b5q678njhaxd22fcpqypvr56k";
+       version = "0.3.0.5";
+       sha256 = "04hnllvvgpd941bgjymd0spqv31rww1khaidbvdnrqa3i9gpmvjp";
        buildDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -17557,8 +17559,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-utils";
-       version = "0.3";
-       sha256 = "12rb5dfhcr5rahk14nxc5ac416sxpzsihyciwk551kyyvahmrp3v";
+       version = "0.3.0.1";
+       sha256 = "1y6nm841y3bvd7kixhwqk7h0pf7ipvfwj2hdq15ij08nlr48dzyl";
        buildDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -19657,6 +19659,7 @@ self: {
          aeson base bytestring Cabal containers hspec http-conduit text
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -21445,18 +21448,20 @@ self: {
   "attoparsec" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , QuickCheck, quickcheck-unicode, scientific, test-framework
-     , test-framework-quickcheck2, text, vector
+     , test-framework-quickcheck2, text, transformers, vector
      }:
      mkDerivation {
        pname = "attoparsec";
-       version = "0.12.1.6";
-       sha256 = "1a06vhg0ykix94q7qxvmh30v017fjl9j2i1b860wjb937a6bc2yf";
+       version = "0.13.0.0";
+       sha256 = "12b4xi6nlnhpwz8apn4mk880mkhcv1sfvf4j3z1h5dgkadi2zgbi";
        buildDepends = [
          array base bytestring containers deepseq scientific text
+         transformers
        ];
        testDepends = [
          array base bytestring deepseq QuickCheck quickcheck-unicode
-         scientific test-framework test-framework-quickcheck2 text vector
+         scientific test-framework test-framework-quickcheck2 text
+         transformers vector
        ];
        homepage = "https://github.com/bos/attoparsec";
        description = "Fast combinator parsing for bytestrings and text";
@@ -21518,6 +21523,7 @@ self: {
        version = "0.3.3";
        sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w";
        buildDepends = [ attoparsec base bytestring enumerator text ];
+       jailbreak = true;
        homepage = "https://john-millikin.com/software/attoparsec-enumerator/";
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
@@ -21527,8 +21533,8 @@ self: {
     ({ mkDerivation, attoparsec, base }:
      mkDerivation {
        pname = "attoparsec-expr";
-       version = "0.1.1.1";
-       sha256 = "09305lp9q3cgvpv4d878c34dk07g7p13hc07hrp2xlwl7rc3nac3";
+       version = "0.1.1.2";
+       sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d";
        buildDepends = [ attoparsec base ];
        description = "Port of parsec's expression parser to attoparsec";
        license = stdenv.lib.licenses.bsd3;
@@ -22040,6 +22046,7 @@ self: {
          mtl QuickCheck quickcheck-instances resourcet tagged tasty
          tasty-quickcheck text time transformers transformers-base
        ];
+       jailbreak = true;
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -22875,6 +22882,7 @@ self: {
          attoparsec base HUnit test-framework test-framework-hunit text
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/fanjam/banwords";
        description = "Generalized word blacklister";
        license = stdenv.lib.licenses.mit;
@@ -25313,8 +25321,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-api";
-       version = "0.11.0";
-       sha256 = "1k2ca8bszj13g5lsm3rm1mrfkrh4c7knl50alpn2l9zlwsg7whqx";
+       version = "0.11.1";
+       sha256 = "16slfsqwmpr8c5sl2zpf763d21sqgii7jgmw0ra1nidv6zl01glb";
        buildDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
@@ -25357,8 +25365,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-block";
-       version = "0.13.0";
-       sha256 = "0xiljk9dfd4g2kqphj8xf03kx8d7jd296s8i5rgflc4140npaz20";
+       version = "0.13.1";
+       sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp";
        buildDepends = [
          base binary bitcoin-tx bitcoin-types bytestring cryptohash
          hexstring largeword lens
@@ -25402,8 +25410,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-script";
-       version = "0.11.0";
-       sha256 = "010vkqma0nx3msg4hgazi7700a64x51p8zaajayli7px6yffblw1";
+       version = "0.11.1";
+       sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r";
        buildDepends = [ base base16-bytestring binary bytestring text ];
        testDepends = [ base bytestring hspec ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -25417,8 +25425,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-tx";
-       version = "0.13.0";
-       sha256 = "13iv72l8b2scz6l8319r1yshwn7h67l3dn1z8fl181njkiz5xk0w";
+       version = "0.13.1";
+       sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v";
        buildDepends = [
          base binary bitcoin-script bitcoin-types bytestring cryptohash
          hexstring lens
@@ -27196,6 +27204,7 @@ self: {
          mtl old-time process text time transformers unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/JPMoresmau/BuildWrapper";
        description = "A library and an executable that provide an easy API for a Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
@@ -29568,6 +29577,7 @@ self: {
        testDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
@@ -29641,6 +29651,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/tibbe/cassava";
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
@@ -29859,16 +29870,15 @@ self: {
      }:
      mkDerivation {
        pname = "cayley-client";
-       version = "0.1.2.1";
-       sha256 = "0c2n37p8530awkpwnygrpz7zssv22ycjjml2623f61x7q8ilb8p6";
+       version = "0.1.3.0";
+       sha256 = "0wzpnylzlyx0lanjqg44b134s2irb55072dz5s8ljq76acg1jmfl";
        buildDepends = [
          aeson attoparsec base bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
          unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/MichelBoucey/cayley-client";
-       description = "A Haskell client for Cayley graph database";
+       description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -34271,6 +34281,7 @@ self: {
          attoparsec base cmdargs process system-fileio system-filepath text
          time unordered-containers
        ];
+       jailbreak = true;
        description = "A command line tool for resolving conflicts of file synchronizers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37497,11 +37508,12 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , dataenc, directory, filepath, FindBin, ghc, hashable, haskeline
-     , html, HUnit, mmap, mtl, old-time, parsec, process, QuickCheck
-     , random, regex-applicative, regex-compat-tdfa, shelly, split, tar
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, transformers, transformers-compat, unix, unix-compat
-     , utf8-string, vector, zip-archive, zlib
+     , html, HTTP, HUnit, mmap, mtl, network, old-locale, old-time
+     , parsec, process, QuickCheck, random, regex-applicative
+     , regex-compat-tdfa, shelly, split, tar, terminfo, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, transformers-compat, unix, unix-compat, utf8-string
+     , vector, zip-archive, zlib
      }:
      mkDerivation {
        pname = "darcs";
@@ -37512,10 +37524,10 @@ self: {
        buildDepends = [
          array attoparsec base base16-bytestring binary bytestring
          containers cryptohash data-ordlist dataenc directory filepath
-         hashable haskeline html mmap mtl old-time parsec process random
-         regex-applicative regex-compat-tdfa tar text time transformers
-         transformers-compat unix unix-compat utf8-string vector zip-archive
-         zlib
+         hashable haskeline html HTTP mmap mtl network old-locale old-time
+         parsec process random regex-applicative regex-compat-tdfa tar
+         terminfo text time transformers transformers-compat unix
+         unix-compat utf8-string vector zip-archive zlib
        ];
        testDepends = [
          array base binary bytestring cmdargs containers cryptohash dataenc
@@ -37526,6 +37538,7 @@ self: {
        ];
        extraLibraries = [ curl ];
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
+       jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -44976,10 +44989,8 @@ self: {
      }:
      mkDerivation {
        pname = "email-validate";
-       version = "2.1.1";
-       revision = "1";
-       sha256 = "1wka2zd6s8zf99d33z6mzprxq3aaxmm9z9rnfjs4j83930h61qdq";
-       editedCabalFile = "ec98fb65657fbd6705b80a2fbad8836246515f7ed84f3f382d88e0ee2d92645f";
+       version = "2.1.2";
+       sha256 = "13r67kk5rjl54mwk4shap1rf8jdp1hsd6wpg4hgkf10vzk5vara5";
        buildDepends = [ attoparsec base bytestring ghc-prim ];
        testDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -45152,6 +45163,7 @@ self: {
          free monad-loops mwc-random stm stm-delay text transformers
          unordered-containers vector websockets
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
@@ -45891,6 +45903,7 @@ self: {
          aeson attoparsec attoparsec-expr base bytestring regex-compat text
          unordered-containers vector yaml
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/kayo/ert";
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
@@ -51307,10 +51320,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-aeson";
-       version = "0.2.0.4";
-       revision = "1";
-       sha256 = "1h5vj66dx25iais9yia33ia95nr0ywxsbnrcm71v50jvj73ywhbx";
-       editedCabalFile = "1f690c3d9f5359349399f9409ba65dc79bd5a13301cb98ad0961db1b2241c643";
+       version = "0.2.0.5";
+       sha256 = "109jxrny3r1wsf2kr23vvgdid4rmq5lpqjlfbk4n7yxb9bvdbhy5";
        buildDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -52533,6 +52544,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghcjs-websockets" = callPackage
+    ({ mkDerivation, base, base64-bytestring, binary, bytestring
+     , ghcjs-base, text
+     }:
+     mkDerivation {
+       pname = "ghcjs-websockets";
+       version = "0.3.0.0";
+       revision = "1";
+       sha256 = "09ll2fyfbbflciq6mxhclgypn800qmm7l8dk9gcclphraf2x9jy3";
+       editedCabalFile = "cfc25baa01cf440b2f965ca3ee738467f8138adb74f759b9a225717ed183c66a";
+       buildDepends = [
+         base base64-bytestring binary bytestring ghcjs-base text
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/mstksg/ghcjs-websockets";
+       description = "GHCJS interface for the Javascript Websocket API";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) { ghcjs-base = null;};
+
   "ghclive" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, diagrams-lib, diagrams-svg, directory, file-embed
@@ -53615,8 +53646,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss";
-       version = "1.9.3.1";
-       sha256 = "01a4l164f7ffwskd626q10z9klsbn6dkh3nbik3iq68426jryvns";
+       version = "1.9.4.1";
+       sha256 = "1rdgcv9jmawzgvshnc6pgdl7f2p6a3f09jwjnhmkfxx3gdwr8q5i";
        buildDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
@@ -53642,8 +53673,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, gloss }:
      mkDerivation {
        pname = "gloss-algorithms";
-       version = "1.9.3.1";
-       sha256 = "1fdbjnrc1f42jxzgi362wccdx8fdhb1ws6bg3ds7cfanffkkf6an";
+       version = "1.9.4.1";
+       sha256 = "0j8n0769690ikrqwbqp4ba6zz2l4i6211alic3l7mqc2h6rggjs0";
        buildDepends = [ base containers ghc-prim gloss ];
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
@@ -53683,8 +53714,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-examples";
-       version = "1.9.3.1";
-       sha256 = "0d9wh50n2n6ia9vds2pnd8p9wdyxl423c7s135bbjx1iwrsvyq11";
+       version = "1.9.4.1";
+       sha256 = "02qsxxbrg8d4338mcj3ka3l2f9qyf3r515b32dm5iingjb8dn5ly";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -53730,8 +53761,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-raster";
-       version = "1.9.3.1";
-       sha256 = "1siwsmx8n0yaalcbm0c2dwxfxk5im1gpddbc2nkbf9br5yvn7py5";
+       version = "1.9.4.1";
+       sha256 = "0q6mqgmi3gx2yx8a3rq4nzk2mz2iidnzl26b5h4zhjgmgz8jawv9";
        buildDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
@@ -57420,8 +57451,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.6.8.1";
-       sha256 = "0f8c2b9zy55pscmkmwjb72qqsm2kmrjlwfhkl6igpj631r804iyr";
+       version = "4.6.9.0";
+       sha256 = "0z0gfs7czqwrkgd43pcx6rjdsgwpkhan5pmgfbkiixih993f9s2l";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -57441,7 +57472,6 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time time-locale-compat
        ];
-       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -61094,6 +61124,7 @@ self: {
          old-locale postgresql-binary QuickCheck quickcheck-instances
          scientific text time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-postgres";
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
@@ -62436,6 +62467,7 @@ self: {
          map-syntax MonadCatchIO-transformers mtl process random text time
          transformers unordered-containers vector xmlhtml
        ];
+       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
@@ -64173,8 +64205,8 @@ self: {
      }:
      mkDerivation {
        pname = "hipbot";
-       version = "0.2";
-       sha256 = "1fi96mfkdn3dr1wzz4a1bab4ynlzfdm0j5626dh460m2bdb2lfw6";
+       version = "0.2.1";
+       sha256 = "12rixjkgxg43nwi93sr04vv8c9cw3v6rsyfpyklcpibcjg0yn6yn";
        buildDepends = [
          aeson base bifunctors blaze-builder bytestring either exceptions
          http-client http-client-tls http-types jwt lens mtl network-uri
@@ -67191,6 +67223,7 @@ self: {
        ];
        testDepends = [ aeson attoparsec base QuickCheck text vector ];
        extraLibraries = [ ruby ];
+       jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ruby;};
@@ -68315,8 +68348,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "hscolour";
-       version = "1.22";
-       sha256 = "1iqmxvpvj3icg7mhx4450p2wqjsfx1xh3lwgrrmxvm339hksx3rw";
+       version = "1.23";
+       sha256 = "1c4i2zpami8g3w9949nm3f92g7xwh5c94vkx658zz7ihrjp7w5lp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers ];
@@ -70342,6 +70375,7 @@ self: {
          attoparsec base-prelude text unordered-containers
        ];
        testDepends = [ base base-prelude directory doctest filepath ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-entities";
        description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
@@ -70398,6 +70432,7 @@ self: {
          conversion-case-insensitive conversion-text text
        ];
        testDepends = [ base base-prelude directory doctest filepath ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-tokenizer";
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
@@ -70859,8 +70894,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-date";
-       version = "0.0.6";
-       sha256 = "0f1s4bfazckl016pi2nzrmmiv0f6pnr9mgvsdj33ysvknp0md3c9";
+       version = "0.0.6.1";
+       sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj";
        buildDepends = [ array attoparsec base bytestring ];
        testDepends = [ base bytestring doctest hspec old-locale time ];
        description = "HTTP Date parser/formatter";
@@ -72716,8 +72751,8 @@ self: {
      }:
      mkDerivation {
        pname = "ide-backend";
-       version = "0.9.0.8";
-       sha256 = "0jrjpx7kx5q9lixvi4c02xb5sjq7wsd4mkh07b2ak4w784gndz8q";
+       version = "0.9.0.9";
+       sha256 = "0zpavp3q70h8mnjz7w4shxfbh6dzdv00f9igldygzhhr9xmr192m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -72748,8 +72783,8 @@ self: {
      }:
      mkDerivation {
        pname = "ide-backend-common";
-       version = "0.9.1";
-       sha256 = "1gix76gbc9ccx1hkddymk8hfx418kf1i7caajyzmdp6k8snvkc12";
+       version = "0.9.1.1";
+       sha256 = "1k3sp9byqmhk80l918jnklck635dp1cfx48akah483jkhzjph0fj";
        buildDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
@@ -74049,6 +74084,7 @@ self: {
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
@@ -74673,6 +74709,7 @@ self: {
          time transformers vector zlib zlib-bindings
        ];
        configureFlags = [ "-fnointeractivetests" ];
+       jailbreak = true;
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75027,6 +75064,7 @@ self: {
          free haskell-lexer lens network old-locale split stm text time tls
          transformers vty x509 x509-store x509-system x509-validation
        ];
+       jailbreak = true;
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
        license = stdenv.lib.licenses.bsd3;
@@ -76706,8 +76744,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-schema";
-       version = "0.7.3.4";
-       sha256 = "0p9m706hl8phl12zb9inn6hkrgzxgd3k9lg2p1kav53j5mz17w0p";
+       version = "0.7.3.5";
+       sha256 = "1x7bm83745nsf947kb4m3h8zh4li1548dpbcm2yz16ppg5db182h";
        buildDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -76877,6 +76915,7 @@ self: {
          aeson attoparsec base bytestring conduit conduit-extra mtl text
          transformers unordered-containers
        ];
+       jailbreak = true;
        description = "JSON-RPC 2.0 server over a Conduit.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -78015,6 +78054,7 @@ self: {
          attoparsec base-prelude either record system-fileio system-filepath
          template-haskell text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/laika";
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
@@ -79075,6 +79115,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ attoparsec base bytestring ];
+       jailbreak = true;
        homepage = "http://www.github.com/bgamari/language-openscad";
        description = "A simple parser for OpenSCAD";
        license = stdenv.lib.licenses.bsd3;
@@ -79948,8 +79989,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-aeson";
-       version = "1.0.0.3";
-       sha256 = "0wfbnazarwcza5dn3icsdvsmkyf9ki5lr5d5yidmgijhs63ak7ac";
+       version = "1.0.0.4";
+       sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v";
        buildDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
@@ -81817,6 +81858,7 @@ self: {
        testDepends = [
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
@@ -84421,6 +84463,7 @@ self: {
          template-haskell text time tls transformers transformers-base
          unordered-containers utf8-string vector wai warp x509-system
        ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
@@ -85514,6 +85557,7 @@ self: {
          base bytestring cereal containers QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th text
        ];
+       jailbreak = true;
        homepage = "https://github.com/rodrigosetti/messagepack";
        description = "Serialize instance for Message Pack Object";
        license = stdenv.lib.licenses.mit;
@@ -87457,15 +87501,16 @@ self: {
 
   "monad-unlift" = callPackage
     ({ mkDerivation, base, constraints, exceptions, monad-control, mtl
-     , mutable-containers, stm, transformers, transformers-base
+     , mutable-containers, resourcet, stm, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "monad-unlift";
-       version = "0.1.0.1";
-       sha256 = "0mgz9yxyvsrxp7l01frr7qdlpqg2krci472fj4id2ndnn7gk4mmf";
+       version = "0.1.1.0";
+       sha256 = "1x86xpgirp97rda1y22129xf3fbkyb442jndpjsb9j1k4lplh7y2";
        buildDepends = [
          base constraints exceptions monad-control mtl mutable-containers
-         stm transformers transformers-base
+         resourcet stm transformers transformers-base
        ];
        homepage = "https://github.com/fpco/monad-unlift";
        description = "Typeclasses for representing monad transformer unlifting";
@@ -90723,6 +90768,7 @@ self: {
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
        ];
+       jailbreak = true;
        homepage = "https://github.com/markhibberd/network-api-support";
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
        license = stdenv.lib.licenses.bsd3;
@@ -90766,6 +90812,7 @@ self: {
          aeson attoparsec base bytestring cookie HTTP http-client http-types
          network QuickCheck text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/mndrix/network-bitcoin";
        description = "An interface to bitcoind";
        license = stdenv.lib.licenses.bsd3;
@@ -92398,6 +92445,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "numtype-dk" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "numtype-dk";
+       version = "0.5";
+       sha256 = "0gd1a5hf0bw4vc56f1n7y143bsjkdc97pysv4q1gxpwrnj1sgbxd";
+       buildDepends = [ base ];
+       homepage = "https://github.com/bjornbm/numtype-dk";
+       description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "numtype-tf" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -92972,6 +93031,7 @@ self: {
        testDepends = [
          base postgresql-simple product-profunctors profunctors time
        ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
@@ -93768,8 +93828,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.1.0.4";
-       sha256 = "098zl8nyph459zyla0y2mkqiy78zp74yzadrnwa6xv07i5zs125h";
+       version = "0.1.1.0";
+       sha256 = "1hrbfifm9476n28l2gxyr9m00hjibnl78anc5m7inqm8wr1s3cl0";
        buildDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
@@ -93830,6 +93890,7 @@ self: {
        buildDepends = [
          attoparsec base binary bytestring data-binary-ieee754 network
        ];
+       jailbreak = true;
        homepage = "https://github.com/peacememories/haskell-osc";
        description = "A library to handle messages in the OSC protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -94868,15 +94929,16 @@ self: {
   "parsers" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, charset, containers
      , directory, doctest, filepath, parsec, QuickCheck
-     , quickcheck-instances, text, transformers, unordered-containers
+     , quickcheck-instances, scientific, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "parsers";
-       version = "0.12.1.1";
-       sha256 = "1yx75xbmg3lms0hj79r5w9fl81g5cbsm842lijhd9jnnbli2mzfw";
+       version = "0.12.2.1";
+       sha256 = "0wrzqx282ygc3m05nff2zkshgnx4lkws8d54qhkd9pjxja0fbjn7";
        buildDepends = [
-         attoparsec base charset containers parsec text transformers
-         unordered-containers
+         attoparsec base charset containers parsec scientific text
+         transformers unordered-containers
        ];
        testDepends = [
          attoparsec base bytestring containers directory doctest filepath
@@ -95105,8 +95167,8 @@ self: {
      }:
      mkDerivation {
        pname = "path";
-       version = "0.0.0";
-       sha256 = "1gk9z25d7swhg7zi6nxd076wcqfw2hxvq29hxqzc3drdaas2sc0b";
+       version = "0.1.0";
+       sha256 = "04yj79cw4l4zkfhmfjc382zjkmimhxm523fgq9ijn4dcj6v5z9yw";
        buildDepends = [ base exceptions filepath template-haskell ];
        testDepends = [ base hspec HUnit mtl ];
        description = "Path";
@@ -96891,6 +96953,7 @@ self: {
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -96911,6 +96974,7 @@ self: {
          attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit
          text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-attoparsec";
        description = "Attoparsec and Pipes integration";
        license = stdenv.lib.licenses.bsd3;
@@ -98658,6 +98722,7 @@ self: {
          base-prelude bytestring HTF postgresql-libpq QuickCheck
          quickcheck-instances scientific text time uuid
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
@@ -100047,6 +100112,7 @@ self: {
          aeson attoparsec base bytestring filepath text unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
@@ -100599,8 +100665,8 @@ self: {
      }:
      mkDerivation {
        pname = "psqueues";
-       version = "0.2.0.1";
-       sha256 = "1c1m5dzglpn3la61gxd6cz1b9fdmn9fkc9y5xnl4wf12fwpsg8bf";
+       version = "0.2.0.2";
+       sha256 = "1mv86li4acx7jchlbh1nfyqyy9wqf7nifzmlph06wd1kvcs0cj73";
        buildDepends = [ base deepseq ghc-prim hashable ];
        testDepends = [
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged
@@ -107964,6 +108030,7 @@ self: {
          resourcet tar text transformers unix unordered-containers
          utf8-string vector zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/JPMoresmau/scion-class-browser";
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
@@ -108556,8 +108623,8 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.3.0.4";
-       sha256 = "0hw3a43fz11sys8z8ngsfl7nc6prfaa4j6vzs1j8m3cni3hmrl5v";
+       version = "0.4.0.0";
+       sha256 = "1xmlfdvcic11pi8ik9pasljq4h61nsnxpykcw2c9i9pgkl6bkwj9";
        buildDepends = [
          base base16-bytestring binary bytestring conduit containers
          exceptions hashable hashtables hslogger http2 lens network
@@ -108567,7 +108634,7 @@ self: {
        buildTools = [ cpphs ];
        extraLibraries = [ openssl ];
        jailbreak = true;
-       homepage = "https://github.com/alcidesv/second-transfer";
+       homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109276,7 +109343,9 @@ self: {
      mkDerivation {
        pname = "servant";
        version = "0.4.0";
+       revision = "1";
        sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5";
+       editedCabalFile = "b9f6399d21ba876a4e30cb8e48cb040a972fe82dbac93c62691dc6eae530c25b";
        buildDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -109313,7 +109382,9 @@ self: {
      mkDerivation {
        pname = "servant-client";
        version = "0.4.0";
+       revision = "1";
        sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm";
+       editedCabalFile = "9a7ca5856ef66a4345f4732e7ca5680f55502b899bbe1e2f1397b0e55d33ad37";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -109474,7 +109545,9 @@ self: {
      mkDerivation {
        pname = "servant-server";
        version = "0.4.0";
+       revision = "1";
        sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx";
+       editedCabalFile = "2e024f79e857aa5ad15cf171c1883b99eb45e901ec888eb68d9c6099c88bbbe8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -109488,6 +109561,7 @@ self: {
          parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -112160,6 +112234,7 @@ self: {
          stm syb template-haskell text time transformers
          unordered-containers vector vector-algorithms xmlhtml
        ];
+       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -112267,6 +112342,7 @@ self: {
          hashable HUnit MonadCatchIO-transformers mtl random regex-posix
          text time unix unix-compat unordered-containers vector zlib-enum
        ];
+       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework (core interfaces and types)";
        license = stdenv.lib.licenses.bsd3;
@@ -112285,6 +112361,7 @@ self: {
          attoparsec base bytestring case-insensitive hashable network
          network-uri snap text transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
@@ -112433,6 +112510,7 @@ self: {
          old-locale snap-core text time unix unix-compat
        ];
        configureFlags = [ "-fopenssl" ];
+       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -113508,6 +113586,7 @@ self: {
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113584,8 +113663,8 @@ self: {
      }:
      mkDerivation {
        pname = "som";
-       version = "8.0.3";
-       sha256 = "0pb4hdcs9pfs12nflbnvp5ja1nxbrijjjqvybzg4pn81kaps897m";
+       version = "8.0.4";
+       sha256 = "0jax009wbqlkkdhli5g0d01cgl7lvc8j2a86lp6p1msdk8rb6nls";
        buildDepends = [ base containers grid MonadRandom ];
        testDepends = [
          base containers grid MonadRandom QuickCheck random test-framework
@@ -113667,8 +113746,8 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "sorted-list";
-       version = "0.1.4.1";
-       sha256 = "119h4dz8bkwgpl0w9x5q7q7s50jf5zsr7bikh1l446xqzyax2wi4";
+       version = "0.1.4.2";
+       sha256 = "1prfxpfvsx03lvk5q33azpcif2a3j80v4naw2kn48r1kb84r60m1";
        buildDepends = [ base deepseq ];
        homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
@@ -115225,15 +115304,15 @@ self: {
 
   "stackage-types" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
-     , hashable, semigroups, text, unordered-containers, vector
+     , hashable, semigroups, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "stackage-types";
-       version = "1.0.0";
-       sha256 = "17077awl2bfrhpdlqsl4dxb7hxq4dr5hxqcviyv1cbxlk6z38a4z";
+       version = "1.0.1";
+       sha256 = "0dgxkpx97ndmc9m46ql5chsg42f3ibzzqj0brh89xc5dvd5gdhhd";
        buildDepends = [
          aeson base Cabal containers exceptions hashable semigroups text
-         unordered-containers vector
+         time unordered-containers vector
        ];
        homepage = "https://github.com/fpco/stackage-types";
        description = "Shared data types between various Stackage packages";
@@ -115244,8 +115323,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
        pname = "stackage-update";
-       version = "0.1.1.1";
-       sha256 = "1w5d3kgpr6cyy9wzifhgh54x3sbx8k1sy7l7yzrjjiypy4ij29gb";
+       version = "0.1.1.3";
+       sha256 = "01f9809scpkix54w0yfw4yjf1aak4y612bq7mjn1j573s10xa2iy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath process ];
@@ -117370,6 +117449,7 @@ self: {
        version = "0.1.2";
        sha256 = "1p2rnx045zw9qqd88m5ldx5p3xmbsi6rkdh1bfk6ab1a0krjiifa";
        buildDepends = [ attoparsec base bytestring containers ];
+       jailbreak = true;
        homepage = "http://github.com/bgamari/svm-light-utils";
        description = "Parsers and formatters for the SVMlight input file format";
        license = stdenv.lib.licenses.bsd3;
@@ -120712,6 +120792,7 @@ self: {
        sha256 = "1xnpfj1890l2zqqhr6b95qpqacpssi8qzgqgnpdxml8wfzan8xwl";
        buildDepends = [ attoparsec base text text-icu ];
        testDepends = [ base hspec QuickCheck smallcheck text text-icu ];
+       jailbreak = true;
        description = "Easy replacement when using text-icu regexes";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -122579,8 +122660,8 @@ self: {
      }:
      mkDerivation {
        pname = "tn";
-       version = "1.0.2";
-       sha256 = "0rk7zqzwxc1sjar0n3k919snjpxw7an9vgxjh6b407mkzvz62n94";
+       version = "1.0.2.1";
+       sha256 = "07jhbg8b33h9b0x94di5x8dskm4mq6r7mkjcx6zzcvr26ymmyrmy";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -122797,6 +122878,7 @@ self: {
        buildDepends = [
          attoparsec base bytestring containers old-locale time
        ];
+       jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -127370,6 +127452,7 @@ self: {
        testDepends = [
          attoparsec base directory filepath process QuickCheck text
        ];
+       jailbreak = true;
        homepage = "https://github.com/hamishmack/vado";
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;
@@ -130236,6 +130319,7 @@ self: {
          http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/webcrank/webcrank.hs";
        description = "Webmachine inspired toolkit for building http applications and services";
        license = stdenv.lib.licenses.bsd3;
@@ -130297,6 +130381,7 @@ self: {
          transformers-base unordered-containers vector zip-archive
        ];
        testDepends = [ base parallel text ];
+       jailbreak = true;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -130513,8 +130598,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.9.3.1";
-       sha256 = "0yqq2jj22a17n0cqcd54f0a7vjwwak2zr3wybbh1iq6gz0p5qf76";
+       version = "0.9.4.0";
+       sha256 = "0wpiy5i5vs2506s8xy24rxs9szpzga73xdhf1kfmdhl3gka0q7g0";
        buildDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy mtl network random SHA text

From d9383746e6b0562c682a60e3bab1bb36fb029c22 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 11 May 2015 18:15:14 +0200
Subject: [PATCH 0729/1143] bgs: update from 0.6 to 0.7

---
 pkgs/tools/X11/bgs/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index 00cf9a54fb7e..984fc9158cca 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -3,21 +3,21 @@
 stdenv.mkDerivation rec {
 
   name = "bgs-${version}";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchurl {
-    url = "https://github.com/Gottox/bgs/archive/${version}.tar.gz";
-    sha256 = "19xwslh74686qln0ylaql28z3ng45c7srrb3cxxvfp35lz7hjpf0";
+    url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz";
+    sha256 = "1w1zz9nzj0a0r9rlnq5psjj7n2ff1zfghcs6j268i5c7nkyaw28a";
   };
 
   buildInputs = [ libX11 libXinerama imlib2 ];
 
   preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
 
-  meta = {
-      description = "Extremely fast and small background setter for X";
-      license = stdenv.lib.licenses.mit;
-      hydraPlatforms = stdenv.lib.platforms.linux;
-      maintainers = with stdenv.lib.maintainers; [pSub];
+  meta = with stdenv.lib; {
+    description = "Extremely fast and small background setter for X";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From 5cbf69564b59c12aea5db02eb017d0d7d6b8ade6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 17:53:08 +0200
Subject: [PATCH 0730/1143] pulseaudio: Combat dependency bloat

In particular, don't depend on GTK+ 3.
---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07e8d91a477c..95eabc5a3c4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8625,6 +8625,10 @@ let
     bluez5 = null;
     tdb = null;
     gdbm = null;
+    gtk3 = null;
+    webrtc-audio-processing = null;
+    gconf = null;
+    libasyncns = null;
   };
 
   pulseaudioFull = callPackage ../servers/pulseaudio {

From a3e14b94cb622bd6ff6d3f97f9939745122d28d4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 11 May 2015 21:24:41 +0200
Subject: [PATCH 0731/1143] llpp: update to HEAD

Current latest tagged version (v21) has been broken
since mupdf has been updated to 1.7.
---
 pkgs/applications/misc/llpp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index f2e23e0babfe..bbae8aca2b8b 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -4,12 +4,12 @@
 let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
 in stdenv.mkDerivation rec {
   name = "llpp-${version}";
-  version = "21";
+  version = "21-git-2015-04-27";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
-    rev  = "refs/tags/v${version}";
-    sha256 = "0rxdq6j3bs4drnhlxgm0gcwkhxi98vmxm22lnkpic7h67lgsz51q";
+    rev = "66868744188151eaa433d42c807e1efc5f623aa4";
+    sha256 = "04hjbkzxixw88xmrpbr1smq486wfw3q9hvy7b4bfcb9j32mazk5c";
   };
 
   buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl

From a4fc6eb5968c18d46a8a2b441b3176c6e5951ddf Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Mon, 11 May 2015 22:46:41 +0300
Subject: [PATCH 0732/1143] vimPlugins: update

---
 pkgs/misc/vim-plugins/default.nix | 278 +++++++++++++++---------------
 1 file changed, 140 insertions(+), 138 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8155d4942fd9..9b1c181c2a47 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -19,6 +19,16 @@ in
 rec {
 
   ### section I: manually mantained plugins
+  airline = vim-airline;
+  alternative = a; # backwards compat, added 2014-10-21
+  command_T = command-t; # backwards compat, added 2014-10-18
+  gitgutter = vim-gitgutter;
+  haskellConceal = haskellconceal; # backwards compat, added 2014-10-18
+  necoGhc = neco-ghc; # backwards compat, added 2014-10-18
+  nerdcommenter = The_NERD_Commenter;
+  stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18
+  tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18
+  youcompleteme = YouCompleteMe;
 
   a = buildVimPlugin {
     name = "a-git-2010-11-06";
@@ -33,8 +43,6 @@ rec {
     };
   };
 
-  airline = vim-airline;
-
   align = buildVimPlugin {
     name = "align-git-2012-08-07";
     src = fetchgit {
@@ -48,27 +56,26 @@ rec {
     };
   };
 
-  alternative = a; # backwards compat, added 2014-10-21
-
   calendar = buildVimPlugin {
-    name = "calendar-git-2015-03-19";
+    name = "calendar-git-2015-04-24";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim.git";
-      rev = "a1b9d1a11e301a25bc48350da833469ef8bb6c9f";
-      sha256 = "a3a8da7890c5eedba72e2def86760b79092b3b5cf2ca3999deda5fa8eddecd49";
+      rev = "4149b7bdbe159d9a7670fea9238fe3acac618d67";
+      sha256 = "4a04a03343f94fcbdb0eca44ba1eef8e1669f31e7aa5bf411e6fca4e5b8cdb30";
     };
     meta = {
-      homepage = https://github.com/itchyny/calendar.vim; 
+      homepage = https://github.com/itchyny/calendar.vim.git; 
       maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
 
-  command-t = buildVimPlugin rec {
-    name = "command-t-git-2015-01-12";
+
+  command-t = buildVimPlugin {
+    name = "command-t-git-2015-04-29";
     src = fetchgit {
       url = "https://github.com/wincent/Command-T";
-      rev = "13760a725779b65fa0f2ebef51806f3c05a52550";
-      sha256 = "0cb284w1m8sxcc8ph64pm0cvqslpixss593a1ffnx9c09g6d7m8w";
+      rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b";
+      sha256 = "0l0ajdi3dj2w0zfvgy5fkyl8wln6r8x6ikqvr31rxxzkpwmyxmr1";
     };
     buildInputs = [ perl ruby ];
     buildPhase = ''
@@ -79,27 +86,26 @@ rec {
     '';
   };
 
-  command_T = command-t; # backwards compat, added 2014-10-18
-
   easymotion = buildVimPlugin {
-    name = "easymotion-git-2015-02-24";
+    name = "easymotion-git-2015-04-21";
     src = fetchgit {
-      url = "https://github.com/lokaltog/vim-easymotion.git";
-      rev = "8acdfc60e58bb0600ded42a4f752bec6e3b6d882";
-      sha256 = "1177d1c06a16fe7c1e681a729d158a6cacf3fed9c14bd8c4ece35a069f21dc07";
+      url = "https://github.com/lokaltog/vim-easymotion";
+      rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f";
+      sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54";
     };
     meta = {
       homepage = https://github.com/lokaltog/vim-easymotion; 
       maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
-  
+
+
   eighties = buildVimPlugin {
-    name = "eighties-git-2015-02-12";
+    name = "eighties-git-2015-04-16";
     src = fetchgit {
       url = "https://github.com/justincampbell/vim-eighties";
-      rev = "5d0ebf5424adb8017bec049de0cd51f6fa427281";
-      sha256 = "b4216c805e54f923efcbd8d914f97883f135c989f33e87d2eee69b488b57e747";
+      rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24";
+      sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c";
     };
     buildPhase = ":";
     meta = with stdenv.lib; {
@@ -112,7 +118,6 @@ rec {
   };
 
 
-  gitgutter = vim-gitgutter;
 
   golang = buildVimPlugin {
     name = "golang-git-2014-08-06";
@@ -153,7 +158,6 @@ rec {
     };
   };
 
-  haskellConceal = haskellconceal; # backwards compat, added 2014-10-18
 
   hasksyn = buildVimPlugin {
     name = "hasksyn-git-2014-09-03";
@@ -222,11 +226,11 @@ rec {
   };
 
   latex-box = buildVimPlugin {
-    name = "latex-box-git-2015-03-05";
+    name = "latex-box-git-2015-05-11";
     src = fetchgit {
-      url = "https://github.com/latex-box-team/latex-box.git";
-      rev = "0992511ad9b250cbe53bccbec3b0cb24feca64ec";
-      sha256 = "8e73020a4ad275dfb8887bfc6a85c8aa059a081feefb680b2fd7c85267137440";
+      url = "https://github.com/latex-box-team/latex-box";
+      rev = "ede8371663e89c6e033f8ae387590422b8ea6dd0";
+      sha256 = "1d0f5244e681cc5c972ad043ebc2b8b5f751ba216ca44d4c07821dcb641c5f3d";
     };
     meta = {
       homepage = https://github.com/latex-box-team/latex-box; 
@@ -248,11 +252,11 @@ rec {
   };
 
   neco-ghc = buildVimPlugin {
-    name = "neco-ghc-git-2015-03-21";
+    name = "neco-ghc-git-2015-04-07";
     src = fetchgit {
-      url = "https://github.com/eagletmt/neco-ghc.git";
-      rev = "7d2c360736679064986925873b8d1e2b1978d9f8";
-      sha256 = "3c4d1b00c79953e56379792a64df036075a456cb10a7b891e1691d04c9f15310";
+      url = "https://github.com/eagletmt/neco-ghc";
+      rev = "a45f4f98ee3f25eaa64a39328c253d4f78cd5fda";
+      sha256 = "50bd8530b435c3ba0e0f01b230d7717074002ec229ddcc0cb20ee59ef2a28d59";
     };
     meta = {
       homepage = https://github.com/eagletmt/neco-ghc; 
@@ -260,14 +264,12 @@ rec {
     };
   };
 
-  necoGhc = neco-ghc; # backwards compat, added 2014-10-18
-
   neocomplete = buildVimPlugin {
-    name = "neocomplete-git-2015-03-24";
+    name = "neocomplete-git-2015-05-11";
     src = fetchgit {
-      url = "https://github.com/Shougo/neocomplete.vim.git";
-      rev = "1ef1c33cfdcae43d8b3c6381c4f54f0e93a17287";
-      sha256 = "5c61629c30906aacc00924ab5aaad720aba0011df348ea8835b6aaa53199550a";
+      url = "https://github.com/Shougo/neocomplete.vim";
+      rev = "425eaacdaa126db647c1fc24c3357e6326c48bdc";
+      sha256 = "bb7dac68562fa5456aad0f993ee2caf962d53425e29659b7c5ae3d33d815a3ed";
     };
     meta = {
       homepage = https://github.com/Shougo/neocomplete.vim; 
@@ -275,12 +277,13 @@ rec {
     };
   };
 
+
   neosnippet = buildVimPlugin {
-    name = "neosnippet-git-2015-01-19";
+    name = "neosnippet-git-2015-05-04";
     src = fetchgit {
-      url = "https://github.com/Shougo/neosnippet.vim.git";
-      rev = "044c9cb8ca46a5e27eec37198990c26fe707b02a";
-      sha256 = "c448fac34e432a496ec1d76e07b478b27e66e6e4ec99c1b3923e66c781b74fc8";
+      url = "https://github.com/Shougo/neosnippet.vim";
+      rev = "48689a972d41256b423aa635dff689868a48e5bd";
+      sha256 = "a46be238526e0e39b4561c9a53351bbb43a5fec3a912bdf0b86ab2f031ccc383";
     };
     meta = {
       homepage = https://github.com/Shougo/neosnippet.vim; 
@@ -288,12 +291,13 @@ rec {
     };
   };
 
+
   neosnippet-snippets = buildVimPlugin {
-    name = "neosnippet-snippets-git-2015-03-25";
+    name = "neosnippet-snippets-git-2015-05-10";
     src = fetchgit {
-      url = "https://github.com/Shougo/neosnippet-snippets.git";
-      rev = "dfa436157c9e72f16f0f0d088fa181b37e226c2f";
-      sha256 = "00a65d1f6a1309acef42c0ca70f333ab355db521319c14db8247be38d28da730";
+      url = "https://github.com/Shougo/neosnippet-snippets";
+      rev = "c35446a74d3a5c11838a96b9f2e3673e56ced384";
+      sha256 = "92be7af28c0a64e8e3f0c5c7973fee36f7401d943ff97bd5deffe3f0e2760e5d";
     };
     meta = {
       homepage = https://github.com/Shougo/neosnippet-snippets; 
@@ -302,27 +306,26 @@ rec {
   };
 
 
-  nerdcommenter = The_NERD_Commenter;
-
   quickrun = buildVimPlugin {
-    name = "quickrun-git-2015-03-26";
+    name = "quickrun-git-2015-05-02";
     src = fetchgit {
-      url = "https://github.com/thinca/vim-quickrun.git";
-      rev = "2d03b3a7405da0e95ff7f6f617843ba9f536395f";
-      sha256 = "803e902a083b79c70ea3f826a89864b8879897cd36a655d9e789a0d651127eb3";
-     };
+      url = "https://github.com/thinca/vim-quickrun";
+      rev = "b40cdc36c3600fd096323d3e08c3bbd5d55ec8a8";
+      sha256 = "32e5870ff9bb7ae3fdd2c279c6580935c0f3cd9b306ce34a9e14b227d59e193b";
+    };
     meta = {
-      homepage = https://github.com/thinca/vim-quickrun;
+      homepage = https://github.com/thinca/vim-quickrun; 
       maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
 
+
   racer = buildVimPlugin {
-    name = "racer-git-2015-03-23";
+    name = "racer-git-2015-05-04";
     src = fetchgit {
       url = "https://github.com/phildawes/racer";
-      rev = "c6f557bfd9a22d45476651fa95f7d8415ed897a8";
-      sha256 = "697d92e0acbb3a8c1d691eaebc008bec422060df10e3c4cf6fad448b30391852";
+      rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c";
+      sha256 = "938516aef0674053886fcf032faa5ae87d14e4412c77aadd981dbe145a01ae51";
     };
     buildPhase = ''
       find . -type f -not -name 'racer.vim' -exec rm -rf {} \;
@@ -348,19 +351,18 @@ rec {
   };
 
   stylish-haskell = buildVimPlugin {
-    name = "stylish-haskell-git-2014-07-14";
+    name = "stylish-haskell-git-2015-05-10";
     src = fetchgit {
-      url = "https://github.com/nbouscal/vim-stylish-haskell.git";
-      rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75";
-      sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c";
-     };
+      url = "https://github.com/nbouscal/vim-stylish-haskell";
+      rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
+      sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6";
+    };
     meta = {
-      homepage = https://github.com/nbouscal/vim-stylish-haskell;
+      homepage = https://github.com/nbouscal/vim-stylish-haskell; 
       maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
 
-  stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18
 
   tabmerge = buildVimPlugin {
     name = "tabmerge-git-2010-10-17";
@@ -424,7 +426,6 @@ rec {
     };
   };
 
-  tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18
 
   tslime = buildVimPlugin {
     name = "tslime-git-2015-02-10";
@@ -484,11 +485,11 @@ rec {
   };
 
   vimproc = buildVimPlugin {
-    name = "vimproc-git-2015-02-23";
+    name = "vimproc-git-2015-05-10";
     src = fetchgit {
-      url = "https://github.com/shougo/vimproc.vim.git";
-      rev = "0f68bcd93399ecbcde3eaa4efd09107314c9bdee";
-      sha256 = "850cb6d347f4c353782c48533f2dc6e3150a3982dc71efbd5f6b0a921264f939";
+      url = "https://github.com/shougo/vimproc.vim";
+      rev = "421827f0971a62ba3d67e2ed158a7d282c5d05bb";
+      sha256 = "158d6d3990528730dbf699326cfb402c33ab3322e5d7ab6c95d84b0bd6292aee";
     };
     buildInputs = [ which ];
 
@@ -503,12 +504,12 @@ rec {
     };
   };
 
-  vimshell = buildVimPlugin rec {
-    name = "vimshell-git-2015-03-24";
+  vimshell = buildVimPlugin {
+    name = "vimshell-git-2015-05-01";
     src = fetchgit {
       url = "https://github.com/Shougo/vimshell.vim";
-      rev = "41d3ad325852e80588ab57c64433fa338789d6ac";
-      sha256 = "bf76ee252a3cbb121013ce10547cee7d31a64d10c46687ddfaa988e7c5baf095";
+      rev = "4939e10609c434becf6423b2f3876bb9c2be3464";
+      sha256 = "72bc6ca7b8ebcdf1d4617c73fc2688486f71a9f8b8601627fbbada3a4cfb28ca";
     };
     meta = with stdenv.lib; {
       description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script";
@@ -548,14 +549,14 @@ rec {
   };
 
   watchdogs = buildVimPlugin {
-    name = "watchdogs-git-2015-03-20";
+    name = "watchdogs-git-2015-04-16";
     src = fetchgit {
-      url = "https://github.com/osyo-manga/vim-watchdogs.git";
-      rev = "01ba53074fd3bedd81f5aed2dcc4fec092f62ba9";
-      sha256 = "7b363779a0b035a0aaec025653a29e2f4dbd9e1518a34a6e993c43e8ec810d57";
-     };
+      url = "https://github.com/osyo-manga/vim-watchdogs";
+      rev = "5e3d1db592297f7d4c563900a6d224ff559f533e";
+      sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a";
+    };
     meta = {
-      homepage = https://github.com/osyo-manga/vim-watchdogs;
+      homepage = https://github.com/osyo-manga/vim-watchdogs; 
       maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
@@ -588,13 +589,14 @@ rec {
     };
   };
 
-  YouCompleteMe = buildVimPlugin {
+
+ YouCompleteMe = buildVimPlugin {
+    name = "YouCompleteMe-git-2015-05-07";
     src = fetchgit {
-      rev = "2f8109020644ad28e5cd795c29bc1150f87b3cb4";
       url = "https://github.com/Valloric/YouCompleteMe";
-      sha256 = "15d3dhxan602qxz2wixjf4pjrf210qwa51ckzyjyh5kqak9lx8pi";
-     };
-    name = "youcompleteme-2015-03-27";
+      rev = "295769ccfd304246c1fae847416a2a15771f7d98";
+      sha256 = "04qcbbxm3qhb2f3awhrwprffm3jh54z4ag6r49aa8xk0l9k8i8sp";
+    };
 
     buildInputs = [
       python cmake
@@ -633,7 +635,6 @@ rec {
     };
   };
 
-  youcompleteme = YouCompleteMe;
 
   YUNOcommit = buildVimPlugin {
     name = "YUNOcommit";
@@ -681,7 +682,6 @@ rec {
 
   ### The following derivations are generated by nix#ExportPluginsForNix
 
-
   "Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Colour_Sampler_Pack";
     src = fetchurl {
@@ -698,11 +698,11 @@ rec {
 
   };
   "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-03-25";
+    name = "Gist-2015-05-06";
     src = fetchgit {
       url = "git://github.com/mattn/gist-vim";
-      rev = "22eeb3a72f116818dec0e2f9fe3ea46443141b95";
-      sha256 = "9ecaa593267958c5860d6e34be5fc1e3280da5265a1fb35bdb2904163049325f";
+      rev = "6130b8ee438ad55572c5de1cb974ef824163a1f4";
+      sha256 = "5142abefc6f5eaf5f2cce4f5222782b7d9e1033a3e54db7bca0dcf2bd7575853";
     };
     dependencies = [];
 
@@ -748,11 +748,11 @@ rec {
 
   };
   "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-03-25";
+    name = "Syntastic-2015-05-09";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "dac07db61758590c71d655ed5403181af4e845a2";
-      sha256 = "96ae43056b79a50c34272f483c5c7a3cf55f5aa8699b319fe9ed5f7ba12ed0d7";
+      rev = "5dba05af4fb9e69472a994bb1228c6b86a47911a";
+      sha256 = "a6f2a77dec55d2bb2abe742e24865d2311c12f030290f31ad9219e4d787a6d3c";
     };
     dependencies = [];
 
@@ -768,11 +768,11 @@ rec {
 
   };
   "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2015-03-17";
+    name = "Tagbar-2015-05-10";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "3634e7ab4feeab8ad49166e9e716638c20f1637c";
-      sha256 = "cecbb15e025b300f688a7a67cc886a2e8a8afaf3e8fdca4a4d8ba73dabda8ab2";
+      rev = "399b75256ac7333d7119d11047f6b3aff8fa2828";
+      sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c";
     };
     dependencies = [];
 
@@ -788,21 +788,21 @@ rec {
 
   };
   "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2014-11-20";
+    name = "The_NERD_tree-2015-05-06";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921";
-      sha256 = "deec2ce33249829ae3925478d7d1925ea99e20c37dcc86db7c3bfac4fdc706e0";
+      rev = "a87b1bf3c566c3f80090996a2a2a1201318478a8";
+      sha256 = "4422563a44f14aa008b5e7ef8b7df1f7fc1ffdca1323a3cb1c115409e325a87e";
     };
     dependencies = [];
 
   };
   "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-03-05";
+    name = "UltiSnips-2015-05-11";
     src = fetchgit {
       url = "git://github.com/sirver/ultisnips";
-      rev = "1971030b506a8f0e2e0398fb166f21a5341f8c7a";
-      sha256 = "84c07f73ea22a34422c843c5ccb40aa8d3967175ff38ab6155303ba3c039e859";
+      rev = "188e00f7b87297ea7737f9494d531c7073637332";
+      sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c";
     };
     dependencies = [];
 
@@ -873,11 +873,11 @@ rec {
 
   };
   "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-02-20";
+    name = "fugitive-2015-03-31";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "0095769029709b531d2505ee6ad9907dd9bd72a0";
-      sha256 = "83184b527538d0aac01783074ec29addfa18b62880ec8959dae6e404c6ff3d11";
+      rev = "4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c";
+      sha256 = "f7e79b5e823639d0b9e2c46c29cdae621b22b3bb0c601dce058083877dad2e13";
     };
     dependencies = [];
 
@@ -964,21 +964,21 @@ rec {
 
   };
   "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2014-11-24";
+    name = "sensible-2015-04-04";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
-      rev = "b30dcf387af977acfa21732592bfca05598b2188";
-      sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f";
+      rev = "d0beb8ab42627bea2c747564ca46ec663e3ba0ba";
+      sha256 = "c1893990e7b0b3f409b2ec4f4e1fb7f00f61a5146b94314ad28d86231d3ab6f7";
     };
     dependencies = [];
 
   };
   "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2015-03-21";
+    name = "snipmate-2015-04-04";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
-      rev = "2079ea5aadaada568f78acfc6b565945625ed97d";
-      sha256 = "47f5d131485f8a57389a0b455c6e83f8f543d71a04cbaa7af594b3abe9099d9f";
+      rev = "2d3e8ddc4424088d8e19c33764fff077f3116f55";
+      sha256 = "fe23f38cf074b12082879256a5c4c16e6f55233e0af0735867b4d5c21b72ff09";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1004,21 +1004,21 @@ rec {
 
   };
   "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2015-03-17";
+    name = "table-mode-2015-04-21";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "c0a6d43f2191b841c01cec0638a33a8116f7f920";
-      sha256 = "222532a9803f855b5f261eb311359980625606716c1b9419703b97874554c49d";
+      rev = "cc723fe8cdab054f325292c288103229b0193147";
+      sha256 = "4daee279dc4e9c48af41a70bc45385136fa02546bdc8525f68ce44404db7a84a";
     };
     dependencies = [];
 
   };
   "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2015-02-23";
+    name = "tlib-2015-05-04";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "2376d1233e7d1db8157fdc3157278dda7a2c796f";
-      sha256 = "07966a0f2a073ae07e8d2a63a8a265ec0053997721545b41cedff910bcc24de0";
+      rev = "ecf9e08de8b8ed8cf5e1f69f69471b04b7d55652";
+      sha256 = "5d3d5f066b23be90c3c4de54967056378fff931594154c4e5541a3bcd424b795";
     };
     dependencies = [];
 
@@ -1234,11 +1234,11 @@ rec {
 
   };
   "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2014-10-10";
+    name = "vim-coffee-script-2015-04-20";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "827e4a38b07479433b619091469a7495a392df8a";
-      sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0";
+      rev = "32fe889b8cafd3a4921ef8e6485156453ff58c42";
+      sha256 = "d7162b2546c9949c96811d7a72c17ae2db9871697ee65ed0b1a8f0287d278690";
     };
     dependencies = [];
 
@@ -1252,13 +1252,23 @@ rec {
     };
     dependencies = [];
 
+  };
+  "vim-gista" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-gista-2015-01-29";
+    src = fetchgit {
+      url = "git://github.com/lambdalisue/vim-gista";
+      rev = "e450417a6eaeb99d3982b880507697dce85b7217";
+      sha256 = "a7665dbc63a35d1fe9b7679a498deafb80c8dfb05fced37ac4722212c673f2ec";
+    };
+    dependencies = [];
+
   };
   "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2015-03-23";
+    name = "vim-gitgutter-2015-05-08";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "8345c35770ffc6fc4088c36406d1e24170aabcc6";
-      sha256 = "f7580832ebfd60f0b7cf05e697ac44e4b59a0f606fe49b7ef392052a50c69ad3";
+      rev = "339f8ba079ed7d465ca442c9032b36bc56c21f61";
+      sha256 = "f306cc7bac8560fe2864161be675545c1023486b950900da8d8c74f98d568e15";
     };
     dependencies = [];
 
@@ -1284,31 +1294,21 @@ rec {
 
   };
   "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2015-01-12";
+    name = "vim-signature-2015-04-24";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45";
-      sha256 = "c065eb81669fd76a8bf6d19e220c85ad07ede73e6a9b3dd12634611146303675";
-    };
-    dependencies = [];
-
-  };
-  "vim-gista" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2015-01-29";
-    src = fetchgit {
-      url = "git://github.com/lambdalisue/vim-gista";
-      rev = "e450417a6eaeb99d3982b880507697dce85b7217";
-      sha256 = "a7665dbc63a35d1fe9b7679a498deafb80c8dfb05fced37ac4722212c673f2ec";
+      rev = "7586613e5dcfd2f09d32197aa5a10ed025da21f4";
+      sha256 = "0bce1c37adc06a386438e13c6e3e0af5829a13e4e65fbd703234680bc3d769fc";
     };
     dependencies = [];
 
   };
   "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-03-24";
+    name = "vim-snippets-2015-05-05";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "707f005ccddaa15a0b8c207a7a711b0a9590578a";
-      sha256 = "0c5807b82e18530a6b83f4f1c0010564a1a4b39f687672ab235b95e694095d03";
+      rev = "1327c1ba54c8c367995b536b8cb7d8e7cc7c4c03";
+      sha256 = "fb6a7a2fa0939a64f8bac4411dfa36dc5a6e1385e5016978045614039ab89720";
     };
     dependencies = [];
 
@@ -1346,6 +1346,8 @@ rec {
        url = "http://www.vim.org/scripts/script.php?script_id=2465";
     };
 
+
   };
 
+
 }

From 087892c42d581aedb747be70d7f5fd14f903c356 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 19:56:16 +0200
Subject: [PATCH 0733/1143] haskell-aeson test suite is broken.
 haskell-email-validate test suite has been fixed.

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2a83cab3ad4f..36ae1a181d79 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -801,7 +801,7 @@ self: super: {
   # https://github.com/adamwalker/sdr/issues/1
   sdr = dontCheck super.sdr;
 
-  # https://github.com/Porges/email-validate-hs/issues/12
-  email-validate = dontCheck super.email-validate;
+  # https://github.com/bos/aeson/issues/253
+  aeson = dontCheck super.aeson;
 
 }

From c7c10f28ad5fb5add4484c6981299a45bac74ec0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 10 May 2015 05:16:20 +0200
Subject: [PATCH 0734/1143] netsniff-ng -> 0.5.9

---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 8e3f5d34f1ea..967504a00047 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "v0.5.9-rc5-22-gdafb89c"; in
+let version = "0.5.9"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "dafb89c7a307272189b29a5c74bd6e33068ac831";
-    sha256 = "0j6gii9jw93pdnbdk8yxddcc67g30623r2xvgdvrbhg3v2q6k1qm";
+    rev = "9118e9e8673eb88ebf4f7af33d8ed9856f3ed554";
+    sha256 = "0zxwkpaad0mjgkhgnii4bj8sfji3inqqf1zqbv7807nk34bqr6qp";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From 6e8d1f84f229bc481b2c0aafdeac986f4f3deb8c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 May 2015 22:52:43 +0200
Subject: [PATCH 0735/1143] python-packages: SQLAlchemy: build

Fix test failure by adding pysqlite dependency (buildInputs only).
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e9469160546..32fea28dc45c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11892,7 +11892,7 @@ let
       md5 = "470ca4da4a0081efc830f0d90dd91682";
     };
 
-    buildInputs = with self; [ nose mock ];
+    buildInputs = with self; [ nose mock pysqlite ];
 
     propagatedBuildInputs = with self; [ modules.sqlite3 ];
 

From 1eec4a4a10997ccb58d8b242999d00007babf287 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 23:15:29 +0200
Subject: [PATCH 0736/1143] python-SQLAlchemy: add pysqlite module to fix the
 test suite

http://hydra.cryp.to/build/817910/nixlog/1/raw
---
 pkgs/top-level/python-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32fea28dc45c..a7807504c725 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11866,6 +11866,7 @@ let
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
+    propagatedBuildInputs = [self.pysqlite];
   };
 
   sqlalchemy8 = self.sqlalchemy9.override rec {
@@ -11880,6 +11881,7 @@ let
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
+    propagatedBuildInputs = [self.pysqlite];
   };
 
   sqlalchemy9 = buildPythonPackage rec {
@@ -11894,7 +11896,7 @@ let
 
     buildInputs = with self; [ nose mock pysqlite ];
 
-    propagatedBuildInputs = with self; [ modules.sqlite3 ];
+    propagatedBuildInputs = with self; [ modules.sqlite3 pysqlite ];
 
     checkPhase = ''
       ${python.executable} sqla_nose.py

From d9e83b77a6a4e4dcaa42630ab2e07fac1816b778 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 23:21:18 +0200
Subject: [PATCH 0737/1143] python-packages.nix: drop trailing whitespace

---
 pkgs/top-level/python-packages.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a7807504c725..cddec5dfafd0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2088,7 +2088,7 @@ let
 
     buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
                     self.iso8601 self.pyasn1 self.pytest ];
-    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi; 
+    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi;
   };
 
   cryptography_vectors = buildPythonPackage rec {
@@ -15367,7 +15367,7 @@ let
     };
   };
 
-  
+
   markdown2 = buildPythonPackage rec {
     name = "markdown2-${version}";
     version = "2.3.0";
@@ -15384,8 +15384,8 @@ let
       maintainers = with maintainers; [ hbunke ];
     };
   };
-  
-  
+
+
   evernote = buildPythonPackage rec {
     name = "evernote-${version}";
     version = "1.25.0";
@@ -15405,7 +15405,7 @@ let
       maintainers = with maintainers; [ hbunke ];
      };
   };
-    
+
   thrift = buildPythonPackage rec {
     name = "thrift-${version}";
     version = "0.9.2";
@@ -15423,11 +15423,11 @@ let
 
     };
   };
-  
+
   geeknote = buildPythonPackage rec {
     version = "2015-03-02";
     name = "geeknote-${version}";
-    disabled = ! isPy27; 
+    disabled = ! isPy27;
 
     src = pkgs.fetchFromGitHub {
       owner = "VitaliyRodnenko";
@@ -15436,13 +15436,13 @@ let
       sha256 = "0lw3m8g7r8r7dxhqih08x0i6agd201q2ig35a59rd4vygr3xqw2j";
     };
 
-    /* build with tests fails with "Can not create application dirictory : 
+    /* build with tests fails with "Can not create application dirictory :
      /homeless-shelter/.geeknotebuilder". */
     doCheck = false;
 
-    propagatedBuildInputs = with self; [ 
-        thrift 
-        beautifulsoup4 
+    propagatedBuildInputs = with self; [
+        thrift
+        beautifulsoup4
         markdown2
         sqlalchemy
         html2text

From b37e68b09f1701a14817e5d2851785c1c37ae51c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 23:25:37 +0200
Subject: [PATCH 0738/1143] python-packages.nix: fix Emacs syntax highlighting

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cddec5dfafd0..7b4a3fcbcd84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10687,7 +10687,7 @@ let
 
     # Remove Windows .bat files
     postInstall = ''
-      rm "$out"/bin/*.bat
+      rm "$out/bin/"*.bat
     '';
 
     meta = with stdenv.lib; {
@@ -14831,7 +14831,7 @@ let
     propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ];
 
     preFixup = ''
-        wrapProgram $out/bin/* \
+        wrapProgram "$out/bin/"* \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
     '';
 

From c6ca7a0be151d3cb90ac2cc1483ddcfc728d03f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 23:29:19 +0200
Subject: [PATCH 0739/1143] anki: update to SQLAlchemy 9

---
 pkgs/games/anki/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index dab4e2b6afff..cbe02824c8f3 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       sha256 = "0g5rmg0yqh40a3g8ci3y3if7vw4jl5nrpq8ki1a13a3xmgch13rr";
     };
 
-    pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]
+    pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio ]
               ++ lib.optional plotsSupport py.matplotlib;
 
     buildInputs = [ python py.wrapPython lame mplayer pulseaudio ];

From f5d8fb8409e250032de65c16a4cee2a603b2d24a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 23:30:15 +0200
Subject: [PATCH 0740/1143] anki: fix Emacs syntax highlighting

---
 pkgs/games/anki/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index cbe02824c8f3..145ffed94f2a 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
     postInstall = ''
       mkdir -p "$out/lib/${python.libPrefix}/site-packages"
-      ln -s $out/share/anki/* $out/lib/${python.libPrefix}/site-packages/
+      ln -s "$out/share/anki/"* $out/lib/${python.libPrefix}/site-packages/
       export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
       wrapPythonPrograms
     '';

From 0c32585e67279c00336ee26777aab8f02c82a1a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 23:30:50 +0200
Subject: [PATCH 0741/1143] anki: polish meta section

---
 pkgs/games/anki/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 145ffed94f2a..8cb38c859ed1 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation rec {
     meta = {
       homepage = http://ankisrs.net/;
       description = "Spaced repetition flashcard program";
-      # Copy-pasted from the homepage
+      license = stdenv.lib.licenses.gpl3;
+
       longDescription = ''
         Anki is a program which makes remembering things easy. Because it is a lot
         more efficient than traditional study methods, you can either greatly
@@ -60,15 +61,11 @@ stdenv.mkDerivation rec {
         Anyone who needs to remember things in their daily life can benefit from
         Anki. Since it is content-agnostic and supports images, audio, videos and
         scientific markup (via LaTeX), the possibilities are endless. For example:
-
-        * learning a language
-        * studying for medical and law exams
-        * memorizing people's names and faces
-        * brushing up on geography
-        * mastering long poems
-        * even practicing guitar chords!
+        learning a language, studying for medical and law exams, memorizing
+        people's names and faces, brushing up on geography, mastering long poems,
+        or even practicing guitar chords!
       '';
-      license = stdenv.lib.licenses.gpl3;
+
       maintainers = with stdenv.lib.maintainers; [ the-kenny ];
       platforms = stdenv.lib.platforms.mesaPlatforms;
     };

From ea0c877858e071d2258680cb4779786ff1f0dea0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 23:36:13 +0200
Subject: [PATCH 0742/1143] python-SQLAlchemy: test suite dependencies don't
 need to propagate

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b4a3fcbcd84..623f96d37bcf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11866,7 +11866,7 @@ let
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
-    propagatedBuildInputs = [self.pysqlite];
+    buildInputs = [self.pysqlite];
   };
 
   sqlalchemy8 = self.sqlalchemy9.override rec {
@@ -11881,7 +11881,7 @@ let
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
-    propagatedBuildInputs = [self.pysqlite];
+    buildInputs = [self.pysqlite];
   };
 
   sqlalchemy9 = buildPythonPackage rec {
@@ -11896,7 +11896,7 @@ let
 
     buildInputs = with self; [ nose mock pysqlite ];
 
-    propagatedBuildInputs = with self; [ modules.sqlite3 pysqlite ];
+    propagatedBuildInputs = with self; [ modules.sqlite3 ];
 
     checkPhase = ''
       ${python.executable} sqla_nose.py

From 395829686d0219b3e14fe6ffae60a24b4e50370b Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 11 May 2015 14:30:13 -0700
Subject: [PATCH 0743/1143] add is{GNU,Clang} attrs to cc-wrapper.

These will be more pleasant to use than the existing

    (cc.cc.isClang or false)

nonsense we currently do.
---
 pkgs/build-support/cc-wrapper/default.nix |  3 ++-
 pkgs/stdenv/darwin/default.nix            | 14 ++++++++------
 pkgs/stdenv/linux/default.nix             |  2 ++
 pkgs/stdenv/nix/default.nix               |  1 +
 pkgs/top-level/all-packages.nix           |  4 ++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index f6826c837ca1..c8af548a2ca4 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -10,6 +10,7 @@
 , zlib ? null, extraPackages ? []
 , dyld ? null # TODO: should this be a setup-hook on dyld?
 , setupHook ? ./setup-hook.sh
+, isGNU ? false, isClang ? false
 }:
 
 with stdenv.lib;
@@ -41,7 +42,7 @@ stdenv.mkDerivation {
   # The wrapper scripts use 'cat', so we may need coreutils.
   coreutils = if nativeTools then null else coreutils;
 
-  passthru = { inherit nativeTools nativeLibc nativePrefix; };
+  passthru = { inherit nativeTools nativeLibc nativePrefix isGNU isClang; };
 
   buildCommand =
     ''
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index f06170b5cb10..ac396ecdf12b 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -90,6 +90,7 @@ rec {
           cc      = "/usr";
           outPath = nativePrefix;
         };
+        isClang      = true;
       };
     };
     pkgs = allPackages {
@@ -129,13 +130,14 @@ rec {
 
     cc = import ../../build-support/cc-wrapper {
       inherit stdenv;
-      nativeTools  = false;
-      nativeLibc   = true;
-      binutils  = pkgs.darwin.cctools;
-      cc        = pkgs.llvmPackages.clang-unwrapped;
-      coreutils = pkgs.coreutils;
-      shell     = "${pkgs.bash}/bin/bash";
+      nativeTools   = false;
+      nativeLibc    = true;
+      binutils      = pkgs.darwin.cctools;
+      cc            = pkgs.llvmPackages.clang-unwrapped;
+      coreutils     = pkgs.coreutils;
+      shell         = "${pkgs.bash}/bin/bash";
       extraPackages = [ pkgs.libcxx ];
+      isClang       = true;
     };
 
     shell = "${pkgs.bash}/bin/bash";
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index d432206a9e13..722d40bf7fbe 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -91,6 +91,7 @@ rec {
           nativeTools = false;
           nativeLibc = false;
           cc = gccPlain;
+          isGNU = true;
           libc = glibc;
           inherit binutils coreutils;
           name = name;
@@ -234,6 +235,7 @@ rec {
       gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
         nativeTools = false;
         nativeLibc = false;
+        isGNU = true;
         cc = stage4.stdenv.cc.cc;
         libc = stage4.pkgs.glibc;
         inherit (stage4.pkgs) binutils coreutils;
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 79c9fb3a1378..75e1c3814ed0 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -20,6 +20,7 @@ import ../generic rec {
     inherit stdenv;
     binutils = pkgs.binutils;
     cc = pkgs.gcc.cc;
+    isGNU = true;
     coreutils = pkgs.coreutils;
     shell = pkgs.bash + "/bin/sh";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95eabc5a3c4b..5ab8b2fb69f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3433,6 +3433,7 @@ let
 
   clangWrapSelf = build: (import ../build-support/cc-wrapper) {
     cc = build;
+    isClang = true;
     stdenv = clangStdenv;
     libc = glibc;
     binutils = binutils;
@@ -4479,6 +4480,8 @@ let
     nativePrefix = stdenv.cc.nativePrefix or "";
     cc = baseCC;
     libc = libc;
+    isGNU = baseCC.isGNU or false;
+    isClang = baseCC.isClang or false;
     inherit stdenv binutils coreutils zlib;
   };
 
@@ -4518,6 +4521,7 @@ let
     nativePrefix = stdenv.cc.nativePrefix or "";
     cc = baseGCC;
     libc = glibc;
+    isGNU = true;
     inherit stdenv binutils coreutils zlib;
     setupHook = ../build-support/cc-wrapper/setup-hook-stdinc.sh;
   };

From 662a6b1ca62b2e44115f6e29999f30896ddfa075 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 11 May 2015 14:37:53 -0700
Subject: [PATCH 0744/1143] remove all references to
 `stdenv.cc.cc.is{GNU,Clang}`

use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
---
 pkgs/applications/graphics/inkscape/default.nix         | 2 +-
 pkgs/applications/networking/browsers/opera/default.nix | 2 +-
 pkgs/development/compilers/gcl/default.nix              | 2 +-
 pkgs/development/compilers/llvm/3.5/clang.nix           | 2 +-
 pkgs/development/compilers/llvm/3.6/clang/default.nix   | 2 +-
 pkgs/development/guile-modules/guile-lib/default.nix    | 2 +-
 pkgs/development/libraries/ffmpeg/generic.nix           | 2 +-
 pkgs/development/libraries/fftw/default.nix             | 2 +-
 pkgs/development/libraries/gamin/default.nix            | 2 +-
 pkgs/development/libraries/glib/default.nix             | 2 +-
 pkgs/development/libraries/glibc/default.nix            | 2 +-
 pkgs/development/libraries/gsm/default.nix              | 2 +-
 pkgs/development/libraries/jbigkit/default.nix          | 2 +-
 pkgs/development/libraries/judy/default.nix             | 2 +-
 pkgs/development/libraries/libcdr/default.nix           | 2 +-
 pkgs/development/libraries/libfpx/default.nix           | 2 +-
 pkgs/development/libraries/libmad/default.nix           | 2 +-
 pkgs/development/libraries/librevenge/default.nix       | 2 +-
 pkgs/development/libraries/libsodium/default.nix        | 2 +-
 pkgs/development/libraries/pixman/default.nix           | 2 +-
 pkgs/development/tools/misc/astyle/default.nix          | 2 +-
 pkgs/servers/x11/xorg/overrides.nix                     | 2 +-
 pkgs/tools/networking/atftp/default.nix                 | 2 +-
 pkgs/tools/security/tor/default.nix                     | 2 +-
 pkgs/tools/video/rtmpdump/default.nix                   | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index ca52a4f2766d..41531ed0de84 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     patchShebangs share/extensions
   ''
   # Clang gets misdetected, so hardcode the right answer
-  + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) ''
+  + stdenv.lib.optionalString stdenv.cc.isClang ''
     substituteInPlace src/ui/tool/node.h \
       --replace "#if __cplusplus >= 201103L" "#if true"
   '';
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index ced16da5f7ee..b29f2d1974c0 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -6,7 +6,7 @@
 , kdeSupport ? false, qt4, kdelibs
 }:
 
-assert stdenv.isLinux && stdenv.cc.cc.isGNU or false && stdenv.cc.libc != null;
+assert stdenv.isLinux && stdenv.cc.isGNU && stdenv.cc.libc != null;
 
 let
   mirror = http://get.geo.opera.com/pub/opera;
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index a31517afbeb1..f1844a1a632b 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -10,7 +10,7 @@ in
 
 (
 assert a.stdenv ? cc ;
-assert a.stdenv.cc.cc.isGNU or false ;
+assert a.stdenv.cc.isGNU ;
 assert a.stdenv.cc ? libc ;
 assert a.stdenv.cc.libc != null ;
 
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index 2398b0c59ac5..05ac4be01e5f 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -1,6 +1,6 @@
 { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
 let
-  gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc;
+  gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation {
   name = "clang-${version}";
 
diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix
index 7be535ada1e5..898ca37558e4 100644
--- a/pkgs/development/compilers/llvm/3.6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
 
 let
-  gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc;
+  gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation {
   name = "clang-${version}";
 
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index 10d98dbf7c3d..7cce27c387e0 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, guile, texinfo}:
 
-assert stdenv ? cc && stdenv.cc.cc.isGNU or false;
+assert stdenv ? cc && stdenv.cc.isGNU;
 
 stdenv.mkDerivation rec {
   name = "guile-lib-0.2.2";
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 1f127d948afc..9a373c522786 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
       "--disable-stripping"
     # Disable mmx support for 0.6.90
       (verFix null "0.6.90" "--disable-mmx")
-  ] ++ optional (stdenv.cc.cc.isClang or false) "--cc=clang";
+  ] ++ optional stdenv.cc.isClang "--cc=clang";
 
   nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
 
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 104b7229bb19..2bcc1cd69a70 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ++ optional (precision != "double") "--enable-${precision}"
     # all x86_64 have sse2
     ++ optional stdenv.isx86_64 "--enable-sse2"
-    ++ optional (stdenv.cc.cc.isGNU or false) "--enable-openmp";
+    ++ optional stdenv.cc.isGNU "--enable-openmp";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 0b22aa501e64..e6b1875a9e0c 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
 
   patches = [ ./deadlock.patch ]
     ++ map fetchurl (import ./debian-patches.nix)
-    ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./returnval.patch;
+    ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch;
 
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 91832ac650e6..7d61bea64e11 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-assert !stdenv.isDarwin -> stdenv.cc.cc.isGNU or false;
+assert !stdenv.isDarwin -> stdenv.cc.isGNU;
 
 # TODO:
 # * Add gio-module-fam
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index ccf6d2c0686e..08eaf555e02d 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -8,7 +8,7 @@
 , withGd ? false, gd ? null, libpng ? null
 }:
 
-assert stdenv.cc.cc.isGNU or false;
+assert stdenv.cc.isGNU;
 
 let
   build = import ./common.nix;
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 706bd7692193..fb9ff8eb0fbc 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "SHELL=${stdenv.shell}"
     "INSTALL_ROOT=$(out)"
-  ] ++ optional (stdenv.cc.cc.isClang or false) "CC=clang";
+  ] ++ optional stdenv.cc.isClang "CC=clang";
 
   preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}";
 
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix
index 2e0c75c14526..7dba9e025198 100644
--- a/pkgs/development/libraries/jbigkit/default.nix
+++ b/pkgs/development/libraries/jbigkit/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile
-  '' + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) ''
+  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
     substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \
       --replace "CC = gcc" "CC = clang"
   '';
diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix
index 13b50286380f..6e2c085f3ba2 100644
--- a/pkgs/development/libraries/judy/default.nix
+++ b/pkgs/development/libraries/judy/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   # gcc 4.8 optimisations break judy.
   # http://sourceforge.net/p/judy/mailman/message/31995144/
-  preConfigure = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) ''
+  preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU ''
     configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
   '';
 
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 21666ed3034e..90318e3e9917 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  configureFlags = if (stdenv.cc.cc.isClang or false)
+  configureFlags = if stdenv.cc.isClang
     then [ "--disable-werror" ] else null;
 
   CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix
index 2540d22b8d4d..9616461177e6 100644
--- a/pkgs/development/libraries/libfpx/default.nix
+++ b/pkgs/development/libraries/libfpx/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null;
 
   # This dead code causes a duplicate symbol error in Clang so just remove it
-  postPatch = if (stdenv.cc.cc.isClang or false) then ''
+  postPatch = if stdenv.cc.isClang then ''
     substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
   '' else null;
 
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 7739c3627ec9..37823af12e9a 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
   # It is included here in order to fix a build failure in Clang
   # But it may be useful to fix other, currently unknown problems as well
-  ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) [ ./optimize.diff ];
+  ++ stdenv.lib.optional stdenv.cc.isClang [ ./optimize.diff ];
 
   nativeBuildInputs = [ autoconf ];
 
diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix
index ff7886d0513a..b35432361581 100644
--- a/pkgs/development/libraries/librevenge/default.nix
+++ b/pkgs/development/libraries/librevenge/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   # Clang generates warnings in Boost's header files
   # -Werror causes these warnings to be interpreted as errors
   # Simplest solution: disable -Werror
-  configureFlags = if (stdenv.cc.cc.isClang or false)
+  configureFlags = if stdenv.cc.isClang
     then [ "--disable-werror" ] else null;
 
   meta = {
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index f824ab864a16..0b0656df4f66 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp";
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 14529c6c643b..d50c0c5d69c5 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   postInstall = glib.flattenInclude;
 
-  patches = stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./fix-clang36.patch;
+  patches = stdenv.lib.optional stdenv.cc.isClang ./fix-clang36.patch;
 
   meta = {
     homepage = http://pixman.org;
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index 770162c237e4..3951212495d4 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv";
   };
 
-  sourceRoot = if (stdenv.cc.cc.isClang or false)
+  sourceRoot = if stdenv.cc.isClang
     then "astyle/build/clang"
     else "astyle/build/gcc";
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0965a72c43c7..e7a5bdb1018a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -80,7 +80,7 @@ in
   };
 
   libxkbfile = attrs: attrs // {
-    patches = lib.optional (stdenv.cc.cc.isClang or false) ./libxkbfile-clang36.patch;
+    patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch;
   };
 
   libpciaccess = attrs : attrs // {
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index 930d9f4968b6..c98dc5baea5f 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }:
 assert stdenv.isLinux;
-assert stdenv.cc.cc.isGNU or false;
+assert stdenv.cc.isGNU;
 let
 version = "0.7";
 debianPatch = fetchurl {
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 1237890f6214..603dd05fc659 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   # ./configure time check for any of this.
   buildInputs = [ libevent openssl zlib torsocks ];
 
-  CFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lgcc_s";
+  CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
 
   # Patch 'torify' to point directly to torsocks.
   patchPhase = ''
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 552023278b6a..de26cc41d744 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ++ optional gnutlsSupport "CRYPTO=GNUTLS"
     ++ optional opensslSupport "CRYPTO=OPENSSL"
     ++ optional stdenv.isDarwin "SYS=darwin"
-    ++ optional (stdenv.cc.cc.isClang or false) "CC=clang";
+    ++ optional stdenv.cc.isClang "CC=clang";
 
   buildInputs = [ zlib ]
     ++ optional gnutlsSupport gnutls

From 3e5a0c0034ab68aed388796b2918d50e9d4cee62 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 14:59:05 -0700
Subject: [PATCH 0745/1143] pulseaudio: Fix logic

---
 pkgs/servers/pulseaudio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index df5a26e42c11..1161d73c28f3 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -39,7 +39,7 @@ let
   optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
   optEsound = if libOnly then null else shouldUsePkg esound;
   optGlib = if libOnly then null else shouldUsePkg glib;
-  optGtk3 = if libOnly || hasXlibs then null else shouldUsePkg gtk3;
+  optGtk3 = if libOnly || !hasXlibs then null else shouldUsePkg gtk3;
   optGconf = if libOnly then null else shouldUsePkg gconf;
   optAvahi = if libOnly then null else shouldUsePkg avahi;
   optLibjack2 = if libOnly then null else shouldUsePkg libjack2;

From 26c37ded73ce084275d748be26887cf4023c91d6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 15:12:38 -0700
Subject: [PATCH 0746/1143] curl: Improve .pc and .la patching

---
 pkgs/tools/networking/curl/default.nix | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index f8b3ad9355ad..689dc3d7d5ef 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -103,24 +103,30 @@ stdenv.mkDerivation rec {
   ];
 
   # Fix all broken refernces to dependencies in .la and .pc files
-  postInstall = optionalString (optZlib != null) ''
-    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  postInstall = ''
+    sed -i \
+  '' + optionalString (optZlib != null) ''
+      -e 's,\(-lz\),-L${optZlib}/lib \1,' \
   '' + optionalString (optOpenssl != null) ''
-    sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+      -e 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' \
   '' + optionalString (optLibssh2 != null) ''
-    sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+      -e 's,\(-lssh2\),-L${optLibssh2}/lib \1,' \
   '' + optionalString (optLibnghttp2 != null) ''
-    sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+      -e 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' \
   '' + optionalString (optC-ares != null) ''
-    sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+      -e 's,\(-lcares\),-L${optC-ares}/lib \1,' \
   '' + optionalString (optGss != null) ''
-    sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+      -e 's,\(-lgss\),-L${optGss}/lib \1,' \
   '' + optionalString (optRtmpdump != null) ''
-    sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+      -e 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' \
   '' + optionalString (optOpenldap != null) ''
-    sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+      -e 's,\(-lgss\),-L${optOpenldap}/lib \1,' \
   '' + optionalString (optLibidn != null) ''
-    sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+      -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \
+  '' + optionalString (!stdenv.isDarwin) ''
+    $out/lib/libcurl.la \
+  '' + ''
+    $out/lib/pkgconfig/libcurl.pc
   '';
 
   meta = {

From 0b3af3074ef66724c2083ae0e9c6a0a5567be67a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 15:14:22 -0700
Subject: [PATCH 0747/1143] libgcrypt: Fix darwin build

---
 pkgs/development/libraries/libgcrypt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index bbc625173a95..7d327a499bcc 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postInstall = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
-  '' + stdenv.lib.optionalString (optLibcap != null) ''
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) ''
     sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la
   '';
 

From 5eda8246a46d885b99eea582ad2165e081f71c92 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 15:15:04 -0700
Subject: [PATCH 0748/1143] gss: Fix on darwin

---
 pkgs/development/libraries/gss/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 71dd8c78edae..71652e3cae38 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Fixup .la files
-  postInstall = stdenv.lib.optionalString (shishi != null) ''
+  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin && shishi != null) ''
     sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
   '';
 

From 2c9481e0fdea4ce96053d6c0720adbdba21db334 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 15:18:08 -0700
Subject: [PATCH 0749/1143] libssh2: Fix for darwin

---
 pkgs/development/libraries/libssh2/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index dfaee9096206..3434fde1a623 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -55,13 +55,17 @@ stdenv.mkDerivation rec {
     (mkEnable false                      "examples-build" null)
   ];
 
-  postInstall = optionalString (optZlib != null) ''
-    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/libssh2.la
+  postInstall = optionalString (!stdenv.isDarwin) (''
+    sed -i \
+  '' + optionalString (optZlib != null) ''
+      -e 's,\(-lz\),-L${optZlib}/lib \1,' \
   '' + optionalString (cryptoStr == "openssl") ''
-    sed -i 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' $out/lib/libssh2.la
+      -e 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' \
   '' + optionalString (cryptoStr == "libgcrypt") ''
-    sed -i 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' $out/lib/libssh2.la
-  '';
+      -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \
+  '' + ''
+      $out/lib/libssh2.la
+  '');
 
   meta = {
     description = "A client-side C library implementing the SSH2 protocol";

From 430c3e08b47f4adb3202cf137529bcc3f79236f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 12 May 2015 00:34:12 +0200
Subject: [PATCH 0750/1143] python-SQLAlchemy: the buildInput attributes in the
 derived expressions are unnecessary

---
 pkgs/top-level/python-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 623f96d37bcf..92d3a5f52d49 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11866,7 +11866,6 @@ let
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
-    buildInputs = [self.pysqlite];
   };
 
   sqlalchemy8 = self.sqlalchemy9.override rec {
@@ -11881,7 +11880,6 @@ let
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
-    buildInputs = [self.pysqlite];
   };
 
   sqlalchemy9 = buildPythonPackage rec {

From bd69c51ddf12d313734e940ee7745c852ad6158b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 15:03:07 -0700
Subject: [PATCH 0751/1143] trousers: Fix darwin build

---
 pkgs/tools/security/trousers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 38ff4acc43bd..9d15b16a1885 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lgcc_s";
 
   # Fix broken libtool file
-  preFixup = ''
+  preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed 's,-lcrypto,-L${openssl}/lib -lcrypto,' -i $out/lib/libtspi.la
   '';
 

From 1938dc9b54963ecc79c5f74ae502e09235873300 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 16:27:53 -0700
Subject: [PATCH 0752/1143] nixos/consul: Remove the joinNodes and joinRetries
 options as they are now built in consul options

---
 nixos/modules/services/networking/consul.nix | 37 ++------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 5308fd995085..23e5b2f5e7ea 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -6,11 +6,9 @@ let
   dataDir = "/var/lib/consul";
   cfg = config.services.consul;
 
-  configOptions = {
-    data_dir = dataDir;
-  }
-  // (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { })
-  // cfg.extraConfig;
+  configOptions = { data_dir = dataDir; } //
+    (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { }) //
+    cfg.extraConfig;
 
   configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ]
     ++ cfg.extraConfigFiles;
@@ -52,23 +50,6 @@ in
         '';
       };
 
-      joinNodes = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        description = ''
-          A list of addresses of nodes which should be joined at startup if the
-          current node is in a left state.
-        '';
-      };
-
-      joinRetries = mkOption {
-        type = types.int;
-        default = 10;
-        description = ''
-          The number of times to retry connecting to the join nodes.
-        '';
-      };
-
       interface = {
 
         advertise = mkOption {
@@ -219,18 +200,6 @@ in
       + ''
         echo "}" >> /etc/consul-addrs.json
       '';
-      postStart = ''
-        # Issues joins to nodes which we statically connect to
-        ${flip concatMapStrings cfg.joinNodes (addr: ''
-          for i in {0..${toString cfg.joinRetries}}; do
-            # Try to join the other nodes ${toString cfg.joinRetries} times before failing
-            consul join "${addr}" && break
-            sleep 1
-          done &
-        '')}
-        wait
-        exit 0
-      '';
     };
 
     systemd.services.consul-alerts = mkIf (cfg.alerts.enable) {

From b6e26aa8df5fc37c0d7f9e89f3c2716871697d2d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 16:45:04 -0700
Subject: [PATCH 0753/1143] nixos/consul: Support a config directory for health
 checks

---
 nixos/modules/services/networking/consul.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 23e5b2f5e7ea..75e2a6921410 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -144,6 +144,8 @@ in
 
     environment = {
       etc."consul.json".text = builtins.toJSON configOptions;
+      # We need consul.d to exist for consul to start
+      etc."consul.d/dummy.json".text = "{ }";
       systemPackages = with pkgs; [ consul ];
     };
 
@@ -151,10 +153,12 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ] ++ systemdDevices;
       bindsTo = systemdDevices;
-      restartTriggers = [ config.environment.etc."consul.json".source ];
+      restartTriggers = [ config.environment.etc."consul.json".source ]
+        ++ mapAttrsToList (_: d: d.source)
+          (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
 
       serviceConfig = {
-        ExecStart = "@${pkgs.consul}/bin/consul consul agent"
+        ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d"
           + concatMapStrings (n: " -config-file ${n}") configFiles;
         ExecReload = "${pkgs.consul}/bin/consul reload";
         PermissionsStartOnly = true;

From 2806491cc410527aace39395fa521d6df1326967 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 11 May 2015 17:44:07 -0700
Subject: [PATCH 0754/1143] nixos/consul: Add shell for health checks

---
 nixos/modules/services/networking/consul.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 75e2a6921410..53a9f4626254 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -140,6 +140,8 @@ in
     users.extraUsers."consul" = {
       description = "Consul agent daemon user";
       uid = config.ids.uids.consul;
+      # The shell is needed for health checks
+      shell = "/run/current-system/sw/bin/bash";
     };
 
     environment = {

From 1677b3316249f198a7b3941586861d518b8ebf91 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 11 May 2015 20:54:17 -0400
Subject: [PATCH 0755/1143] networkmanager: enable nmtui, the curses interface

---
 pkgs/tools/networking/network-manager/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index c39d1a9f5ba6..899577c6d19b 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
 , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
 , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
-, gobjectIntrospection, modemmanager, openresolv, libndp }:
+, gobjectIntrospection, modemmanager, openresolv, libndp, newt }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
@@ -39,10 +39,11 @@ stdenv.mkDerivation rec {
     "--with-kernel-firmware-dir=/run/current-system/firmware"
     "--with-session-tracking=systemd"
     "--with-modem-manager-1"
+    "--with-nmtui"
   ];
 
   buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp
-                  xz bluez5 gobjectIntrospection modemmanager readline ];
+                  xz bluez5 gobjectIntrospection modemmanager readline newt ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
 

From aabee7eb462f606329b38b8293012596caac5639 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 11 May 2015 16:53:28 +0200
Subject: [PATCH 0756/1143] r-modules: regenerate 2015-05-11T14:48:00+0100

---
 pkgs/development/r-modules/cran-packages.nix | 846 +++++++++++--------
 pkgs/development/r-modules/default.nix       |   3 +-
 2 files changed, 475 insertions(+), 374 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 23cc654d6a51..79770b6a620a 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -6,7 +6,7 @@
 { self, derive }: with self; {
 A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; };
 ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; };
-ABCanalysis = derive { name="ABCanalysis"; version="1.0"; sha256="0qmy11lv4x1zgbjifpcy2zhkf3ba5a5b4jbiazcqws35j1p3q835"; depends=[Hmisc plotrix]; };
+ABCanalysis = derive { name="ABCanalysis"; version="1.0.1"; sha256="1q1ms76nzg93sf71r0v3d3yx3a8agpccndlv9lz49cr6asa9iwl0"; depends=[Hmisc plotrix]; };
 ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
 ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; };
 ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
@@ -16,6 +16,7 @@ ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfb
 ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; };
 ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
 ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
+ADPclust = derive { name="ADPclust"; version="0.6.3"; sha256="0lr4zkjhqr9azqxnxpxp9i0ppn8wi8ndb61ki7h2dzfgv27fingk"; depends=[dplyr cluster fields knitr]; };
 AER = derive { name="AER"; version="1.2-3"; sha256="0823zjpl0b7fzhszi28lg1paa41vbxq2xpjil1d4f6dxdysalxlx"; depends=[car lmtest sandwich survival zoo Formula]; };
 AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; };
 AGD = derive { name="AGD"; version="0.32"; sha256="1jjkclqylh43vm1bj1g4cml7a84sxdl94kmhxgmk04rdkmgf8c47"; depends=[gamlss gamlss_dist]; };
@@ -38,7 +39,7 @@ AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0by
 ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
 ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
 ARTool = derive { name="ARTool"; version="0.9.3"; sha256="188k3whgm93jm2kpvh711d4l73gickn9iwidz95srwdcdlf9cf1y"; depends=[lme4 car plyr pbkrtest]; };
-ASMap = derive { name="ASMap"; version="0.4"; sha256="0nfycg62y6bq3z11ldkdfgv469k4zw6jl9mv7qlczm8f01dh5r1m"; depends=[qtl gtools fields lattice]; };
+ASMap = derive { name="ASMap"; version="0.4-1"; sha256="0nslmzhf99vl1zkp702xgcrd36xvis45yb5b0hx0mvf4dfv233lm"; depends=[qtl gtools fields lattice]; };
 ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp Rcpp RcppArmadillo]; };
 ATE = derive { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
 ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
@@ -68,8 +69,10 @@ AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zc
 AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[rjson plyr assertthat httr leafletR]; };
 AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; };
 Anthropometry = derive { name="Anthropometry"; version="1.1"; sha256="1yqdps5n07jl05nv7136jwhfndn01vim2kx9s76mk4alvsw7s8ls"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster biclust]; };
+ApacheLogProcessor = derive { name="ApacheLogProcessor"; version="0.1"; sha256="0wdf9438c5rww0fm5k44ahvivg95vzn3dpnhf4mhpvrjd1am546z"; depends=[foreach doParallel]; };
 AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
 AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; };
+ArArRedux = derive { name="ArArRedux"; version="0.1"; sha256="1fgll399plraijbh1xrhf1nmc308daqhhsi5krq2lm7q2cn584pc"; depends=[]; };
 ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
 ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[lme4 fractal fracdiff]; };
 ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; };
@@ -88,7 +91,7 @@ BAMMtools = derive { name="BAMMtools"; version="2.0.5"; sha256="1xrhif8872w5rwib
 BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network coda]; };
 BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; };
 BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
-BAT = derive { name="BAT"; version="1.2.1"; sha256="073qqx2xmiccf4h7allfavmr2sxhvwc1njnkc0slmyn46nlsk7sl"; depends=[vegan spatstat nls2]; };
+BAT = derive { name="BAT"; version="1.3.0"; sha256="0a8l3hzlgxyp604dg20qm9hvxl97dyh1lm0hj85p6s6nz0qwi8jy"; depends=[vegan spatstat nls2]; };
 BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; };
 BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; };
 BBEST = derive { name="BBEST"; version="0.1-4"; sha256="0yqsz97lljlydhphiy0fb7vwbqxpjzn5v0v665c39dlprxv3jg3b"; depends=[DEoptim wmtsa ggplot2 reshape2 shiny]; };
@@ -99,9 +102,10 @@ BCA = derive { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23
 BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; };
 BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; };
 BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
-BCEA = derive { name="BCEA"; version="2.1-0"; sha256="120xmgd7ipnrbiyh8h7z80i0bw9iv9rjf8nnb3f988h9bx8xiwp4"; depends=[]; };
+BCEA = derive { name="BCEA"; version="2.1-1"; sha256="1j2zb2icv5b6kwgbjzvidbzvciag89227ina6qcb2m4g6spyxcrm"; depends=[]; };
 BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; };
-BDgraph = derive { name="BDgraph"; version="2.17"; sha256="03r44x6wvnirw46hq1kjvj12n83l8d9wzdxxivxw6rdi7pvv51yz"; depends=[Matrix igraph]; };
+BCRA = derive { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; };
+BDgraph = derive { name="BDgraph"; version="2.18"; sha256="08cm4lk587ffrbr57s4krvwgb7fdpnd767g4adnadq0hv0r27xqq"; depends=[Matrix igraph]; };
 BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; };
 BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; };
 BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; };
@@ -122,7 +126,7 @@ BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw
 BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; };
 BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; };
 BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
-BNPTSclust = derive { name="BNPTSclust"; version="1.0"; sha256="04qryrhbhi4qfp9rckw3x0g3292lyfrvphcwgb1p5ig661pxgg7p"; depends=[mvtnorm MASS]; };
+BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[mvtnorm MASS]; };
 BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; };
 BNSP = derive { name="BNSP"; version="1.0.2"; sha256="0hbrx02mybfrzfab5g7kwi6g68jdzj2dc69zxkn3hpyf4rqwbw4x"; depends=[]; };
 BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[hash DIME]; };
@@ -194,6 +198,7 @@ BioStatR = derive { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqg
 Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; };
 BiodiversityR = derive { name="BiodiversityR"; version="2.5-2"; sha256="0l23nlibv7wjmkv1jnssaab3iwm2i5wrkzjji2x9rr5131aj82gn"; depends=[vegan Rcmdr]; };
 Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[etm msm Epi lubridate reshape plyr survival mstate ggplot2]; };
+BivarP = derive { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[dfoptim survival copula]; };
 BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; };
 BlandAltmanLeh = derive { name="BlandAltmanLeh"; version="0.1.0"; sha256="0y35zkxiallp4x09646qb8wj9bayh7mpnjg43qmzhxkm7l95b78r"; depends=[]; };
 Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; };
@@ -238,7 +243,7 @@ CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk
 CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
 CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
 CDM = derive { name="CDM"; version="4.2-12"; sha256="18ix2l3mlk9vzv7iks16mdi4h0194bfjcvsxmya5219dfmw5vqfz"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr WrightMap lattice Rcpp RcppArmadillo]; };
-CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; };
+CDNmoney = derive { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
 CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; };
 CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; };
 CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[MASS DEoptim]; };
@@ -314,6 +319,7 @@ CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc
 CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; };
 CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
 Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; };
+Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr2qpyj3j93m9dn07m0bjbpmx0y0bm9c"; depends=[gdata ape phytools strap]; };
 ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; };
 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; };
 ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; };
@@ -329,7 +335,7 @@ CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq
 CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; };
 CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; };
 CommunityCorrelogram = derive { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; };
-Comp2ROC = derive { name="Comp2ROC"; version="1.0"; sha256="0vymjbxdlvm5dvss4z4zjdc7y7040s3j972gh2138wfygji1szg7"; depends=[ROCR boot]; };
+Comp2ROC = derive { name="Comp2ROC"; version="1.1"; sha256="0vhpw6k9barcx5fl3kw3r7152mcrlpr127i5b70bx64g8g9ffs1v"; depends=[ROCR boot]; };
 CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp Rcpp]; };
 CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
 CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; };
@@ -351,6 +357,7 @@ CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0d
 CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; };
 CorReg = derive { name="CorReg"; version="1.0"; sha256="061lb443wydlrgrnrpi9ibrwa0xw328wcyhsx7lndzjrni9mhcbp"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; };
 CorrBin = derive { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat geepack dirmult mvtnorm]; };
+CorrMixed = derive { name="CorrMixed"; version="0.1-11"; sha256="18n70yx6yysvcn3wsf1zmnp4z2hs3783mr1n0pjp2ph5yd9xk4mg"; depends=[nlme psych]; };
 Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
 CosmoPhotoz = derive { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[ggplot2 ggthemes arm COUNT gridExtra pcaPP mvtnorm shiny]; };
 CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[Formula expm numDeriv]; };
@@ -393,12 +400,13 @@ DEoptim = derive { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7
 DEoptimR = derive { name="DEoptimR"; version="1.0-2"; sha256="00viy7x3br3094az635lmjydm826d48vv2f14rwmdhqmv03066kq"; depends=[]; };
 DFIT = derive { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[simex mvtnorm ggplot2]; };
 DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; };
+DIFtree = derive { name="DIFtree"; version="1.0.0"; sha256="08s6ba44517xq783fysksb1h53zkqsk7zakaibi1c2npq1gzny9p"; depends=[penalized plotrix]; };
 DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; };
 DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; };
 DLMtool = derive { name="DLMtool"; version="1.34"; sha256="0ir1131r408ya235k7syg854bfgsim39hh2k1498n5hrbaa99xfx"; depends=[snowfall boot MASS]; };
 DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
 DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; };
-DNAprofiles = derive { name="DNAprofiles"; version="0.2"; sha256="15la7csf45175g4hkfdz41jgbj5njad5d4jwfhpadxkb9v2mgaw4"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; };
+DNAprofiles = derive { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; };
 DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[Rsolnp multicool Rcpp Rcpp]; };
 DNMF = derive { name="DNMF"; version="1.0"; sha256="0s484hzzvvkqdh4s5cb6znz26wx07f9k7y940ghx3dkdc7rb0hrx"; depends=[]; };
 DOBAD = derive { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[numDeriv lattice]; };
@@ -414,8 +422,8 @@ DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjc
 DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
 DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
 DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
-DTR = derive { name="DTR"; version="1.5"; sha256="1c73ay0j6jkjm4iv32waz3wnn0qy399k1h72l7rwfzpyidnaprvi"; depends=[survival ggplot2 gridExtra aod proto]; };
-DVHmetrics = derive { name="DVHmetrics"; version="0.2"; sha256="04161py13kcj5h5xpd3zpzyr99hjl0x51m8a83l8hm4ip9gpymy1"; depends=[ggplot2 reshape2 shiny KernSmooth markdown]; };
+DTR = derive { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmwddm0zgg041s5q992cih36g"; depends=[survival ggplot2 gridExtra aod proto]; };
+DVHmetrics = derive { name="DVHmetrics"; version="0.3"; sha256="1ndrzd5q12kabpk3yj95s24kn7ri61w1h4aa50zw9qb12f5dzc98"; depends=[ggplot2 reshape2 shiny KernSmooth markdown]; };
 Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
 DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
 DatABEL = derive { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
@@ -433,17 +441,17 @@ Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmi
 DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
 Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
 DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; };
-Deriv = derive { name="Deriv"; version="3.2"; sha256="025br1w6s7av1qm2jifms23qsyq3hy6842y0k6vgrs2rzdb9iyyb"; depends=[]; };
+Deriv = derive { name="Deriv"; version="3.4"; sha256="03fawwlcc3lxp7y3labbhvhpzcp9yfxhbwq7bq8av1fvq92l4xi6"; depends=[]; };
 DescTools = derive { name="DescTools"; version="0.99.10"; sha256="0sfjx1bmp0864l55yj7f0zgf4s9kyi2y1p1dajaaxq8mnclqdfz2"; depends=[manipulate boot mvtnorm]; };
 DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; };
 DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; };
 DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
 Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; };
 DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; };
-DiagrammeR = derive { name="DiagrammeR"; version="0.5"; sha256="1h8j4yahn7w7lf0fsv3rb4zlm3806106n7x23m673cmczqyq7m32"; depends=[htmlwidgets rstudioapi V8]; };
+DiagrammeR = derive { name="DiagrammeR"; version="0.6"; sha256="021i1nvw5airli3392rwz9vq1zxwm2pdlw1y6wqw4968g8yc0k9f"; depends=[htmlwidgets rstudioapi]; };
 DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; };
 DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; };
-DiceKriging = derive { name="DiceKriging"; version="1.5.4"; sha256="09i92jj5qlxr13a3x05aiy3q1z6pxz7ddar6639g4jq87vqq2vd9"; depends=[]; };
+DiceKriging = derive { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; };
 DiceOptim = derive { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging rgenoud MASS lhs mnormt]; };
 DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; };
 DiffCorr = derive { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[igraph fdrtool]; };
@@ -485,7 +493,7 @@ EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszc
 EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
 EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
 ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[locfit lattice latticeExtra xlsx]; };
-ELYP = derive { name="ELYP"; version="0.7-1"; sha256="0z0j3s943bs5xmy8x866kiqvflwwfwbh1n8v54g5p6k5wcrgjhd7"; depends=[survival]; };
+ELYP = derive { name="ELYP"; version="0.7-2"; sha256="1aji3b9mixhzc6zv7qksacx328drpi0q7pgv3gi6iazira7lybdy"; depends=[survival]; };
 EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[survival xtable heatmap_plus GSA MASS FactoMineR cluster]; };
 EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[mvtnorm MASS]; };
 EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; };
@@ -512,6 +520,7 @@ ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahi
 ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; };
 ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
 ETLUtils = derive { name="ETLUtils"; version="1.2"; sha256="0mlfq23v7nl6lslscknk9mdx4dxk8xyc5imnvzlhzhag0k50mqj2"; depends=[ff]; };
+EW = derive { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
 EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools Rcpp]; };
 EasyABC = derive { name="EasyABC"; version="1.4"; sha256="0v3i7vlx2pnfkcqxka4g7ss8k8zphyx3vq5l0c1b433qp0fnjwf3"; depends=[abc pls mnormt MASS lhs]; };
 EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; };
@@ -525,8 +534,9 @@ EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s
 EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
 EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; };
+EffectLiteR = derive { name="EffectLiteR"; version="0.3-3"; sha256="14v5samvkzpiy0gq6lq1vs5jqi084sq1if2sih0lk57qxz2647qh"; depends=[lavaan shiny foreign ggplot2 nnet survey lavaan_survey car]; };
 EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; };
-EffectTreat = derive { name="EffectTreat"; version="0.1-1"; sha256="1kcd1ns6m0l88qdz6ch3v85i69kl3z2mlvnlrbcnckyxvhpscy4n"; depends=[]; };
+EffectTreat = derive { name="EffectTreat"; version="0.1-11"; sha256="1ps3jac3wc1v325maf4vx9jkirxbc1dfflr218xbzbgrj0zx9diz"; depends=[]; };
 EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
 ElemStatLearn = derive { name="ElemStatLearn"; version="2012.04-0"; sha256="107x2mybadqgw03j3yq8ibq3ljs4fpx90chvsirpylqhv77wsabl"; depends=[]; };
 EloRating = derive { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; };
@@ -551,7 +561,7 @@ Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5
 EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
 EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
 EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
-EvalEst = derive { name="EvalEst"; version="2012.4-1"; sha256="19yn4haxkny9kij0jhkwdbp34c9h2cc5l2n2b14khjhv1msqcfmi"; depends=[setRNG tframe tfplot dse]; };
+EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[tfplot dse setRNG tframe]; };
 Evapotranspiration = derive { name="Evapotranspiration"; version="1.5"; sha256="181s9wwil07740n79gz2ar9c1bjxy45v4fyxxkqjmdfly72la542"; depends=[zoo]; };
 EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
 ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
@@ -621,7 +631,7 @@ FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x
 FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; };
 FeaLect = derive { name="FeaLect"; version="1.8"; sha256="04vmf89kgn7hh9wzj6b654546d3jvz0zz675xhcd11gjzlsp8pgc"; depends=[lars rms]; };
 FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[Rcpp Matrix digest magrittr Rcpp digest BH]; };
-FedData = derive { name="FedData"; version="1.0"; sha256="1rg35w0450fsy41i3q1j5zdxsik6r47zryba6878pzc429lrx2sn"; depends=[sp raster rgdal igraph Hmisc]; };
+FedData = derive { name="FedData"; version="1.1.0"; sha256="0s5blfhlizl4lv22lxjhqrwrf10mxgy2cd5z4a9xg05k419q7alr"; depends=[sp rgdal raster RCurl rgeos igraph data_table devtools soilDB]; };
 FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; };
 FieldSim = derive { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[rgl RColorBrewer]; };
 FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
@@ -641,14 +651,14 @@ FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphv
 Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
 ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
 ForImp = derive { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals sampling mvtnorm]; };
-ForeCA = derive { name="ForeCA"; version="0.2.0"; sha256="06p8rcaswl85658w2insfi3qw3ygqdp13zccxn6c2dgj5qxkydpd"; depends=[ifultools MASS sapa]; };
+ForeCA = derive { name="ForeCA"; version="0.2.2"; sha256="1iszhiqn0vg3l2c8cgshk8qir0dqml4jsl942hdsmjm6raxlb6n9"; depends=[ifultools MASS sapa]; };
 FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
 Formula = derive { name="Formula"; version="1.2-1"; sha256="02in5325zzrqbhlygx6s0dinj6ymw845q70y56frqacv25ayzcax"; depends=[]; };
 ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
 FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
 FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; };
 FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
-Frames2 = derive { name="Frames2"; version="0.1.0"; sha256="06rmpp2ckdy42zi65f0xg9x8hgfh8hdx9an53nq3xgpz3vhaxavg"; depends=[sampling]; };
+Frames2 = derive { name="Frames2"; version="0.1.1"; sha256="004h3w5bfnbbxa8yczlcd8m0bc9xq91dg5ph6yql28ivibw24q1l"; depends=[sampling]; };
 FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; };
 FunChisq = derive { name="FunChisq"; version="2.0.2"; sha256="0j767iwf1hr7r532hdkrl9q2xiz997gd3rc7aca18fj743w6ras9"; depends=[Rcpp BH Rcpp RcppClassic]; };
 FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; };
@@ -673,13 +683,14 @@ GAR = derive { name="GAR"; version="1.0"; sha256="1278rdln23pl5ay87nb6w15ywdh6ls
 GAabbreviate = derive { name="GAabbreviate"; version="1.0"; sha256="0c9407i6dq7psw744fpkf190as99fssd9n9k0xbvwif10agm278l"; depends=[GA psych]; };
 GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; };
 GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
-GCD = derive { name="GCD"; version="3.0.4"; sha256="1mrgscbrljfyzxprclyw9rcwlkcnifm15kkkapkv56c5ms2ic2i5"; depends=[sp raster ggplot2]; };
+GCD = derive { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; };
 GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fizm3q3cl7vbzp88vbhpij4rnk4jl"; depends=[Rcpp RcppProgress Rcpp RcppProgress]; };
+GDAdata = derive { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
 GDAtools = derive { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; };
 GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
 GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
-GENLIB = derive { name="GENLIB"; version="1.0.3"; sha256="0c1x9kjff1071d0jkzjhj9j6syb442r0a4d929daq6j9jcbly4q6"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; };
-GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; };
+GENLIB = derive { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; };
+GEOmap = derive { name="GEOmap"; version="2.3-5"; sha256="11sxlijfcswxmry6p9pb4g6prrql0qnqcqc21f72a0jp3k3670nc"; depends=[RPMG splancs fields]; };
 GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; };
 GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; };
 GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; };
@@ -694,7 +705,7 @@ GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9c
 GLDEX = derive { name="GLDEX"; version="2.0.0.2"; sha256="16vy50jgk9b57h9f48097m17zrla6ksmi3wm4z2yadfg81sg8721"; depends=[cluster]; };
 GLDreg = derive { name="GLDreg"; version="1.0.2"; sha256="179qjcsfgzcw39gmmwlz9h608cq865kz2lvh76dwgyyn519l3y8g"; depends=[GLDEX]; };
 GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[mvtnorm corpcor]; };
-GMCM = derive { name="GMCM"; version="1.2"; sha256="13nafnj86pg50svqzlicsw0pdps2bnbh1xdd81i9d7hgm1v7nmjp"; depends=[Rcpp Rcpp RcppArmadillo]; };
+GMCM = derive { name="GMCM"; version="1.2.1"; sha256="1s45xmbx64h3sb10py8n444jpxcgsz4pc36cz3zinfq55amf8r6r"; depends=[Rcpp Rcpp RcppArmadillo]; };
 GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
 GMDH = derive { name="GMDH"; version="1.0"; sha256="194bx1gg0d50fq9002ga8lwx288csfk5vfr1qwkn886wiw97wl9n"; depends=[MASS]; };
 GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; };
@@ -708,6 +719,7 @@ GPFDA = derive { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln
 GPLTR = derive { name="GPLTR"; version="1.1"; sha256="0yp4b3ddvcd6s7rjpbmszl3a0x8qq6s138jjkm135yvbgp1jk5jz"; depends=[rpart]; };
 GPareto = derive { name="GPareto"; version="1.0.0"; sha256="0mzrl4xs7f5rkx0m4lkqy1456dnsa232hprmbg3bpris1rla780b"; depends=[DiceKriging emoa Rcpp rgenoud pbivnorm pso randtoolbox KrigInv MASS Rcpp]; };
 GPfit = derive { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lhs lattice]; };
+GPlab = derive { name="GPlab"; version="0.1.0"; sha256="05lp5hm5f9pwqcw88x2206babb8yd0nw5smsd6j555qikx8nv88i"; depends=[Rcpp testthat MASS numDeriv Rcpp]; };
 GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
 GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Rcpp RcppArmadillo Matrix numDeriv Rcpp RcppArmadillo]; };
 GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; };
@@ -715,17 +727,18 @@ GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy
 GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
 GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; };
 GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[Rcpp MASS ggplot2 Rcpp RcppArmadillo]; };
-GSIF = derive { name="GSIF"; version="0.4-4"; sha256="1z1wa8vlm12dfbidr09zsw98a47jyji9hm0yiplpz593x5c75dji"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; };
+GSIF = derive { name="GSIF"; version="0.4-5"; sha256="041w4jvg7cwf90l03wl0jff24vf3lkzm3xqvl15117piix82lsf4"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; };
 GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; };
 GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
-GUILDS = derive { name="GUILDS"; version="1.2"; sha256="0nirrbq8z7axnrgwbykv5886yf3akf64zynza8l2m96nvzlkzf4y"; depends=[Rcpp pracma subplex Rcpp]; };
+GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[Rcpp pracma subplex Rcpp]; };
 GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; };
-GUTS = derive { name="GUTS"; version="0.5.2"; sha256="13i3653364lqw53wjc4va139yd78kplkchv1r95c9j9kzd0dvx36"; depends=[Rcpp Rcpp BH]; };
+GUTS = derive { name="GUTS"; version="0.9.1"; sha256="1rxgvhpy8ss2a5vaidv1ay3rvq3msv7hv3rcyykmdxj34nvz19bb"; depends=[Rcpp Rcpp BH]; };
 GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; };
 GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[geepack coxme lme4]; };
 GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
 GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
-GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; };
+GWLelast = derive { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel geosphere sp spgwr glmnet foreach]; };
+GWRM = derive { name="GWRM"; version="2.0"; sha256="1dfrwxr12dn6i39mv6i3j6k341f9rvd76skh0350jn6zx1cdkj9k"; depends=[SuppDists]; };
 GWmodel = derive { name="GWmodel"; version="1.2-5"; sha256="14pp1hy4bqr6kg9fy9nchjm6kb3l85f58rl2449b7wv7vsk3yfvk"; depends=[maptools robustbase sp]; };
 GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; };
 GaDiFPT = derive { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; };
@@ -759,6 +772,7 @@ GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527
 GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
 Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; };
 GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
+GlobalFit = derive { name="GlobalFit"; version="1.0"; sha256="0cx4jpr5yhjdqbvnswqjwx7542mnmk73dy99klwg8bsz0c36ii5k"; depends=[sybil]; };
 GlobalOptions = derive { name="GlobalOptions"; version="0.0.6"; sha256="0g10zf3hn4ns7faffqzc9xbscz9p84vcqhlg4jp9jl063ma2pvqm"; depends=[]; };
 Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[Rcpp htmlTable lattice Hmisc forestplot abind knitr magrittr Rcpp]; };
 GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; };
@@ -831,7 +845,7 @@ HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca
 HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
 HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[Hmisc ash stringr]; };
 HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[RColorBrewer plyr jpeg png rgl xtable tkrgl]; };
-Hmisc = derive { name="Hmisc"; version="3.15-0"; sha256="0i2k64yji4c3sicfa89af220hz48hz74dqjfqdjs0417nzs5sn8q"; depends=[lattice survival Formula ggplot2 proto scales latticeExtra cluster rpart nnet acepack foreign]; };
+Hmisc = derive { name="Hmisc"; version="3.16-0"; sha256="03d372bld4mikyrvmfw00ljiz6jf7szkmhrlgxs5vqk3v81kkp2f"; depends=[lattice survival Formula ggplot2 proto scales latticeExtra cluster rpart nnet acepack foreign gtable gridExtra]; };
 Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; };
 HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[RGtk2 MenuCollection deSolve]; };
 HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="0zb02wcpq09lr7lr4wcgrbw9x7jcvhi34g7f4s6h88zz7xg9daw5"; depends=[Rglpk]; };
@@ -890,7 +904,7 @@ InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256
 Interatrix = derive { name="Interatrix"; version="1.0"; sha256="1lkkjckxc0fc8hg1livgzrgphqwcp53cib0r0vii5jp4zkcna595"; depends=[MASS tkrplot]; };
 Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
 Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; };
-InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-1"; sha256="0j2zy3dwb8p16akl2iq3b1200blb7nd28xdjdzf429b69gc01lin"; depends=[glmnet mboost jointDiag]; };
+InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-2"; sha256="09s6jwcb6wyi6p1nqxvyfvv4140fq6svfv7w681nk8g57xlgc1h1"; depends=[glmnet mboost jointDiag]; };
 InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
 IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; };
 IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[Rcpp plyr magrittr nnet Rcpp]; };
@@ -905,7 +919,7 @@ JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqac
 JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
 JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; };
 JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; };
-JMbayes = derive { name="JMbayes"; version="0.7-0"; sha256="03cm3h2f4m96bhpgk53c4g5mpypc3b6s63srlyrx8ndwgx0aqzf3"; depends=[MASS nlme survival]; };
+JMbayes = derive { name="JMbayes"; version="0.7-2"; sha256="087brgljj158my1xc0vmbjkh4hqr0509zf8j4fq1b9lj52z7rdl5"; depends=[MASS nlme survival]; };
 JMdesign = derive { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
 JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[Rsolnp dglm]; };
 JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
@@ -918,7 +932,7 @@ JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb
 Julia = derive { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
 KANT = derive { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[]; };
 KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; };
-KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kajbyqddcc9j20wrsmrbf8g97in61s7"; depends=[]; };
+KFAS = derive { name="KFAS"; version="1.1.1"; sha256="16r86kcx5av11j1p0dad8qvcj4dszh3kvcy8zp7kaw247kjvr3pv"; depends=[]; };
 KFKSDS = derive { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
 KMDA = derive { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
 KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
@@ -930,7 +944,7 @@ KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb66
 Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
 KernSmooth = derive { name="KernSmooth"; version="2.23-14"; sha256="1dl22pncdlrlysmny0q89yg1s6iafdh75dh31l2hjy16gzlrbhk0"; depends=[]; };
 KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[Rcpp plotrix rgl Rcpp]; };
-Kernelheaping = derive { name="Kernelheaping"; version="0.2"; sha256="1063ic6bgnppgh0cpbva5rdrd6kp7z5znkcf7xc3987ywnymsb30"; depends=[plyr evmix MASS]; };
+Kernelheaping = derive { name="Kernelheaping"; version="0.5"; sha256="02hvb1w7z04nn44czxkkg7g1c1fyq0ki0v4shrpi5akwaac30dgj"; depends=[plyr evmix MASS corpcor]; };
 Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[Rcpp data_table lattice knitr markdown Rcpp]; };
 KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; };
 Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
@@ -955,7 +969,7 @@ LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh0
 LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[limSolve diagram]; };
 LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; };
 LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
-LLSR = derive { name="LLSR"; version="0.0.1.9015"; sha256="1dmk7km1qbc9m90qh8dp95g44jxqhvama9svzyh7vqxpww2hs9sb"; depends=[rootSolve]; };
+LLSR = derive { name="LLSR"; version="0.0.1.9225"; sha256="0jn1svnzn89d55hal64fadhv5bmrc37g4qz3pmcd196s5frvyhai"; depends=[rootSolve XLConnect digest]; };
 LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[Matrix lme4 LCFdata rgl fields mgcv]; };
 LMest = derive { name="LMest"; version="2.1"; sha256="1jbwbmamgxbbipzdpjmr7l9csydx55by4zd9h13lnaibdxr4xn5q"; depends=[MASS MultiLCIRT]; };
 LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
@@ -967,7 +981,7 @@ LPTime = derive { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fd
 LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Rglpk Matrix]; };
 LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
 LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[LS2W matrixStats geoR RandomFields spdep]; };
-LSAfun = derive { name="LSAfun"; version="0.3.2"; sha256="1pxa3paq7kq07h3a14hdkx4s3g3dq4wn2q5nvp1083gg0zk0fpgh"; depends=[lsa rgl]; };
+LSAfun = derive { name="LSAfun"; version="0.4"; sha256="178lbk5f2vjcpxand15l1dlqf77zkxap22i9lid5db1bmqh9rpk9"; depends=[lsa rgl]; };
 LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; };
 LSD = derive { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; };
 LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; };
@@ -979,20 +993,21 @@ LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3
 Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; };
 LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.1"; sha256="1k764w8f30jfz1xkq9xjm9rwfdll5kp7jv3zc4932ck8cgqam3jv"; depends=[rLakeAnalyzer plyr]; };
 Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
-LambertW = derive { name="LambertW"; version="0.5"; sha256="19xkm27015q552g1c1j9bsckg4z4jb0avzxs2vs6hscyf5vh41zr"; depends=[moments MASS gsl]; };
+LambertW = derive { name="LambertW"; version="0.5.1"; sha256="0mhw748nkikaq96azps7yyzkz5glibhb8rh6f748vj9lrq3wa5mn"; depends=[moments MASS gsl]; };
 Laterality = derive { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
 LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[spam fields]; };
 LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
 LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
-LeafArea = derive { name="LeafArea"; version="0.0.6"; sha256="0n5znjxs1ixnlzx248jkhjpglzvb3wzxaqng9vi02smwlwaszvwn"; depends=[]; };
+LeafArea = derive { name="LeafArea"; version="0.1.0"; sha256="0gl31iv1pqb9w352h70y4x57dgfs4v15391fyhsc221803hk2fdn"; depends=[]; };
 LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
 LiblineaR = derive { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; depends=[]; };
 LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; };
 LinCal = derive { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
-LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-0"; sha256="0yk5ys8rc8ilxrbdkf1kmqpkny66lcm47fbip90m0n83v21f1jkk"; depends=[rpanel xtable]; };
-LindenmayeR = derive { name="LindenmayeR"; version="0.1-0"; sha256="0pkb6wgbn2iqszq4zr088x90k16jkk0r8pzmfpvzxv6k3m2lrv87"; depends=[stringr]; };
+LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
+LindenmayeR = derive { name="LindenmayeR"; version="0.1.4"; sha256="05aq7qmzb7a6kw24pwlg78ch17y945ggrxqn7l2rypn1vfm0br9x"; depends=[stringr]; };
 LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[kernlab LiblineaR expectreg]; };
 Lmoments = derive { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqrb1qr8kjcn40y57kzd10kkm98vzfjcwg4y4"; depends=[]; };
+LocFDRPois = derive { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
 Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; };
 LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
 LogicForest = derive { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[LogicReg CircStats gtools plotrix]; };
@@ -1002,10 +1017,10 @@ LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24
 LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
 LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; };
 LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
-Luminescence = derive { name="Luminescence"; version="0.4.2"; sha256="042dpx26yqfsaqpqnz0bss7w9w2prhxrggpzapxmjl50sy39ziwk"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table Rcpp Rcpp]; };
+Luminescence = derive { name="Luminescence"; version="0.4.3"; sha256="11nrgi403ryjj7y1p995fxcyqz117qawyharv1yad8f33l610d5m"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table Rcpp minpack_lm Rcpp]; };
 M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; };
 MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; };
-MAINT_Data = derive { name="MAINT.Data"; version="0.3"; sha256="1qh7kdcnwfibzyhr53inqjz61srbpypcqjri60zdl32jpf109vng"; depends=[MASS miscTools]; };
+MAINT_Data = derive { name="MAINT.Data"; version="0.4"; sha256="0338q1yh7b0mbnmh3rbli8vq0fzxyx4qxx0143p615ahsf68jw1c"; depends=[]; };
 MALDIquant = derive { name="MALDIquant"; version="1.11"; sha256="1jnpmv44j9zry64wvnv37hcda61570hypnv16z99arjazpi4nzmn"; depends=[]; };
 MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; };
 MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; };
@@ -1018,9 +1033,9 @@ MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z
 MASS = derive { name="MASS"; version="7.3-40"; sha256="05mmbhswp5dqjd2c6v9w1z1710sm46d53j3prq8maj6bc9qr634y"; depends=[]; };
 MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; };
 MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp Rcpp RcppArmadillo]; };
-MATA = derive { name="MATA"; version="0.2"; sha256="0jmsgis1jkyqywa4i5rq5inb72hsgc9s4xwmaqyfdnfa6lw44sfx"; depends=[]; };
+MATA = derive { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
 MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
-MAVIS = derive { name="MAVIS"; version="1.0"; sha256="0xx8axy9c6g20r8in57zdphjdf3yb046w5gqqsi8y4ph46rpy5xk"; depends=[shiny shinyAce metafor MAd MAc quantreg ggplot2 compute_es]; };
+MAVIS = derive { name="MAVIS"; version="1.1"; sha256="1nbvm6nfwymim63xvfqpvyk1w5fv6cwfh6cl2089myimid22ws1l"; depends=[shiny shinyAce metafor MAc MAd quantreg ggplot2 compute_es SCMA SCRT shinyBS]; };
 MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach multcomp randomForest MASS]; };
 MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
 MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[party plsgenomics st e1071]; };
@@ -1036,7 +1051,7 @@ MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41a
 MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh2j90b9yx8yg7q52c3l7a9lks6w"; depends=[Rglpk Kendall glpkAPI]; };
 MCL = derive { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
 MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; };
-MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.5"; sha256="19dznc7iyifkc3lap9nlsq7n8c0h4xbqrxqb6nj1aqa0nlfi0aqw"; depends=[MCMCglmm ggplot2 coda]; };
+MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.7"; sha256="0hqbl38r2acvwmxkx7j6lab6an90ykia4bffjmy9a319l0dps5l4"; depends=[MCMCglmm ggplot2 coda]; };
 MCMC4Extremes = derive { name="MCMC4Extremes"; version="1.0"; sha256="1ib3rllvqjni9xg3634ankrr66f1lj376kl3xhfwnwbfsbi4a8pw"; depends=[evir]; };
 MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; };
 MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; };
@@ -1071,6 +1086,7 @@ MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3
 MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; };
 MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
 MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
+MLmetrics = derive { name="MLmetrics"; version="1.0.0"; sha256="05j8hwcvfrsslib5k4w3xwkllb3rxdxazsld26zpjf3dc643ag9a"; depends=[]; };
 MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; };
 MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; };
 MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; };
@@ -1085,12 +1101,12 @@ MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54s
 MPDiR = derive { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
 MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
 MPSEM = derive { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; };
-MPTinR = derive { name="MPTinR"; version="1.7.5"; sha256="0bxakcar4i30nhjbnwi00wxnbbl0qdzyx6pwwihcl3zvcbclvc79"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; };
+MPTinR = derive { name="MPTinR"; version="1.8.0"; sha256="0nxiicjdq41bbpfwgzlczm1zrgdilx29nyspvs8m1lx58br1hh8i"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; };
 MPV = derive { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
 MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
 MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
 MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[survival KMsurv coda]; };
-MRIaggr = derive { name="MRIaggr"; version="1.0"; sha256="17p3syy1n00vanisc0r8l8g5v7f3xdbvqbg9p6zsxirdpm9mq075"; depends=[Rcpp RANN spam Matrix ROCR fields mritc oro_dicom oro_nifti Rcpp RcppArmadillo]; };
+MRIaggr = derive { name="MRIaggr"; version="1.1"; sha256="0yq5qjc04rgssjb8pskvrcnr3xv1dlzakily39p9ya526zm9lrmv"; depends=[Rcpp spam Matrix Rcpp RcppArmadillo]; };
 MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; };
 MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[matrixcalc Formula]; };
 MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; };
@@ -1116,7 +1132,7 @@ MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb
 Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; };
 ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
 Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; };
-MapGAM = derive { name="MapGAM"; version="0.7-4"; sha256="1y1f0xmbssc7k6fw1dcs2kg06brza9mj5a2c33b8ln226hvnhk3z"; depends=[sp gam maptools]; };
+MapGAM = derive { name="MapGAM"; version="0.7-5"; sha256="0bpswdi7iic7hsqrwcxwv27n4095m292nv5db6d4mj9gvp13h7i7"; depends=[sp gam maptools]; };
 MareyMap = derive { name="MareyMap"; version="1.2"; sha256="1l7s1ffl9bg1zx5nyb1r3dba188mxiaprdda3gqm2cr1f33jmr51"; depends=[tkrplot]; };
 MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[matrixcalc sandwich gtools]; };
 MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
@@ -1162,7 +1178,7 @@ MissMech = derive { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l
 MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; };
 MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
 MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41gjvff4v465syxr0nppn1qqz5910jql0"; depends=[rtkpp Rcpp rtkpp]; };
-MixGHD = derive { name="MixGHD"; version="1.4"; sha256="0c7d9yf4hl7s8a1alzxjs12kcq98s9wna277vw20rnxa60b6dsqm"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; };
+MixGHD = derive { name="MixGHD"; version="1.5"; sha256="1wjjz300yr9mj5kwrpybdji0znqrh26i2jlhbjcxkn3j4frkhlh3"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv mixture]; };
 MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
 MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; };
 MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; };
@@ -1184,6 +1200,7 @@ MuMIn = derive { name="MuMIn"; version="1.13.4"; sha256="1zk8glw5laismhhfgkbxk05
 MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
 MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; };
 MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
+MultiJoin = derive { name="MultiJoin"; version="0.1"; sha256="02wdn2rcci4n553jjd7ivw3afp6w6zcjc002yj0pvi0ai3jw6p92"; depends=[]; };
 MultiLCIRT = derive { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[MASS limSolve]; };
 MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[gtable mvtnorm expm ggplot2 reshape2]; };
 MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; };
@@ -1194,7 +1211,7 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102
 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
 Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
 NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
-NAM = derive { name="NAM"; version="1.2"; sha256="17jjg8ilxka00k90ca1zjg59g4d2l4s0dj3dsszpa4ab6nddc2zl"; depends=[Rcpp missForest Rcpp]; };
+NAM = derive { name="NAM"; version="1.3.2"; sha256="0rzhqs9qcry3w4q1lcfzmp4fndbmj4bm8981i7nn4cipcjfx7635"; depends=[Rcpp randomForest Rcpp]; };
 NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[plyr NanoStringNorm]; };
 NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
 NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
@@ -1207,20 +1224,22 @@ NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fms
 NHPoisson = derive { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; };
 NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
 NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; };
-NLP = derive { name="NLP"; version="0.1-6"; sha256="19ynrfzj70swlk6z1r8bh23dzdk2qk8z0bk3xn39vpv0wplyc9i3"; depends=[]; };
-NLPutils = derive { name="NLPutils"; version="0.0-1"; sha256="036pafnjcbz7ihdgsjss4jq8fb420j8fmxyymv7kr4pr78wjysbx"; depends=[NLP SnowballC qdap]; };
+NLP = derive { name="NLP"; version="0.1-7"; sha256="1r7m6mq7i6xcf2qxzwvwx129fq89gx6f8kxqn76iw5a5nfarq87w"; depends=[]; };
+NLPutils = derive { name="NLPutils"; version="0.0-2"; sha256="1ny1q4b4pd1pl6d3lgv9zfkrw5wjd6pvhwlahj82fr1z3nq46bwb"; depends=[NLP SnowballC qdap]; };
 NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
 NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; };
 NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
-NMOF = derive { name="NMOF"; version="0.34-1"; sha256="0agh22p4rr3dfq1wipm2435hvb932wf9vp0r5992g3wbfnphs29g"; depends=[]; };
+NMOF = derive { name="NMOF"; version="0.34-2"; sha256="1hqq0gypry614jfc8hcagwkf6xz6z98pb9hzkl9ygykv4rfs5bms"; depends=[]; };
+NNTbiomarker = derive { name="NNTbiomarker"; version="0.28"; sha256="1y9lkn12a7p1qwi10pzzidhjgkzazn6lfflihnc46phf6yzgdrs6"; depends=[shiny xtable stringr]; };
 NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
 NORRRM = derive { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
 NORTARA = derive { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; };
 NPBayesImpute = derive { name="NPBayesImpute"; version="0.5"; sha256="0ym227hz6g51bfn218k1g377ci66j4i2sx9zmm5n62sg1dzj3xaj"; depends=[Rcpp Rcpp]; };
-NPCD = derive { name="NPCD"; version="1.0-7"; sha256="11h460h1q50qixr2hk4wd4v6wgwblp3cqvksbzqkdcinzzp8z6zh"; depends=[BB R_oo R_methodsS3]; };
+NPC = derive { name="NPC"; version="1.0.0"; sha256="0cx1rqbzn1bmizixf86idqyxz29yip8aq55mbi6l7bfnqp1hq105"; depends=[permute dplyr coin matlab]; };
+NPCD = derive { name="NPCD"; version="1.0-8"; sha256="0wpyxcq2s97iy155sz4pihcgwk8wgk56s7cgszbkz2hl6cijjcbb"; depends=[BB R_oo R_methodsS3]; };
 NPCirc = derive { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; };
 NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; };
-NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="2.0"; sha256="0x8pfsi79rb7d29908hlnkqh521csccz6vz04r412z9znsj4pnkl"; depends=[]; };
+NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="2.1"; sha256="1v15ylgflbdr03pgh55fan1l6mymd1d5n6h9jhbcqahjlcsxkwq3"; depends=[]; };
 NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; };
 NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
 NPS = derive { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
@@ -1238,7 +1257,7 @@ NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvx
 NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
 NetIndices = derive { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; };
 NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp Rcpp]; };
-NeuralNetTools = derive { name="NeuralNetTools"; version="1.0.1"; sha256="1gxlv595jxbvpis1vp1bxkspwhqk32f0d0lhkzah8d5ijjzdqihf"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; };
+NeuralNetTools = derive { name="NeuralNetTools"; version="1.3.1"; sha256="0nk2rs1rfv1lp99kfmqfcwgli92pljzrf4dgxp5q3icgpyf88kqv"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; };
 Newdistns = derive { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; };
 NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
 Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; };
@@ -1308,7 +1327,7 @@ PBD = derive { name="PBD"; version="1.0"; sha256="1q8ijjmcwxi8f3wgggpj4y522wmxad
 PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[MASS lme4 Matrix]; };
 PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
 PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; };
-PBSmapping = derive { name="PBSmapping"; version="2.68.68"; sha256="1g58jz7mc7fkrv2c739pkg048pcgmklq650800wf6px073db2kc3"; depends=[]; };
+PBSmapping = derive { name="PBSmapping"; version="2.69.76"; sha256="1fci7mx5m3jqy92nqfaw5w5yd5rw6f0bk5kya1v0mmvf7j715kar"; depends=[]; };
 PBSmodelling = derive { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; };
 PCAmixdata = derive { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; };
 PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[nleqslv matrixcalc]; };
@@ -1317,7 +1336,7 @@ PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99
 PCIT = derive { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
 PCPS = derive { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[SYNCSA vegan ape picante phylobase plotrix]; };
 PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; };
-PCovR = derive { name="PCovR"; version="2.5"; sha256="1as3qd2gqznfy95mil8k31nkqrf36sgpja5s9zdwvk0vpaxv1fr7"; depends=[GPArotation ThreeWay MASS Matrix]; };
+PCovR = derive { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation ThreeWay MASS Matrix]; };
 PDQutils = derive { name="PDQutils"; version="0.1.1"; sha256="0klzh7ilgs02i0cvb5j6jd65dxyg2c3yk5rc82wcjn9ixhr8ks9b"; depends=[orthopolynom moments]; };
 PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
 PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; };
@@ -1328,7 +1347,7 @@ PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zy
 PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; };
 PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
 PGRdup = derive { name="PGRdup"; version="0.2"; sha256="12vxdw4093xmmpcl6ars7h03f1a21gjl5p29r5d19hp68h4hchi1"; depends=[data_table igraph stringdist stringi]; };
-PHENIX = derive { name="PHENIX"; version="1.1"; sha256="0bdb31hqhjz73dz4659i11y9qh0r0j139024285ci7z3xx22cdy5"; depends=[ppcor SuppDists]; };
+PHENIX = derive { name="PHENIX"; version="1.2"; sha256="0fnrx2xf6q9ng9pwfxbbbzvcf6kqj12byd81x0q0vfl85h1xddws"; depends=[ppcor SuppDists]; };
 PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
 PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; };
 PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; };
@@ -1348,6 +1367,7 @@ PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3m
 PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8nqp307v065aiy61ii0kizj9f70"; depends=[]; };
 PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp Rcpp]; };
 PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
+PPtreeViz = derive { name="PPtreeViz"; version="1.0.1"; sha256="0010ixyxgal7q5vwpsslvw6p6bb8qkhbysh41rf0ymdwn37p085p"; depends=[gridExtra ggplot2 Rcpp reshape2 Rcpp RcppArmadillo]; };
 PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[Matrix gplots ggplot2]; };
 PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; };
 PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
@@ -1377,7 +1397,7 @@ PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yh
 PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
 PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2 Rcpp RcppArmadillo]; };
 PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; };
-Peptides = derive { name="Peptides"; version="1.0.3"; sha256="06q4sdm3yy5rjkfr6yqkmgjsr1bhrbpghyjqkzqh416wc4lnp073"; depends=[]; };
+Peptides = derive { name="Peptides"; version="1.0.4"; sha256="0qpppbdsz7c3dw6l5m3sxggma4xxdx0vflwlxpa0d7wynqpsn3wn"; depends=[]; };
 PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[ltm mirt fda Hmisc irtoys MASS Matrix]; };
 PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp Rcpp]; };
 PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; };
@@ -1405,9 +1425,10 @@ Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv0
 PopED = derive { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zxpx02xcycbm19bdk9z1mv06fkg9dj"; depends=[ggplot2 MASS mvtnorm nlme dplyr codetools]; };
 PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
 PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod GGally]; };
-PopGenome = derive { name="PopGenome"; version="2.1.0"; sha256="150n0fdi047nx4iyfdm7ql4gn98wcj1v99llcpaaba78ca7dm83n"; depends=[ff]; };
-PopVar = derive { name="PopVar"; version="1.0"; sha256="1gn6skjw7l4ljqs8c7vyx3gq9i7qp96vj84grld6bhsg63m0vbwh"; depends=[BGLR qtl rrBLUP]; };
+PopGenome = derive { name="PopGenome"; version="2.1.6"; sha256="1wk5k5f80l7k6haiaikhgaqn67q5n7gm632i3yz3frj1ph7bwjb7"; depends=[ff]; };
+PopVar = derive { name="PopVar"; version="1.1"; sha256="1125yynxdg13r84wzbm2h50yqhw1if0zrkaqlcjvmavymmx0vln2"; depends=[BGLR qtl rrBLUP]; };
 PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; };
+PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[zoo xts foreach PerformanceAnalytics]; };
 PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
 PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; };
 Power2Stage = derive { name="Power2Stage"; version="0.3-1"; sha256="0a5llzbhl6s71bh21ka2x50pjissl9gg7f5sskailzcmi60yz2zk"; depends=[PowerTOST]; };
@@ -1436,6 +1457,7 @@ PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6
 QCA = derive { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; };
 QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
 QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
+QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.0"; sha256="0rv2pfaj5fh8zva47k2r2rwzpnilj48jigaazkw2ibs8zq5f3qwz"; depends=[]; };
 QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[stringr QCA ggplot2 directlabels]; };
 QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
 QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv Rcpp]; };
@@ -1446,34 +1468,34 @@ QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzyp
 QoLR = derive { name="QoLR"; version="1.0"; sha256="1ah6x1fcs4l571jvgm0c257cgxhhpkzfhqimwbb9j7xbz3h55lp3"; depends=[survival zoo]; };
 QuACN = derive { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat igraph]; };
 QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[survival ggplot2]; };
-Quandl = derive { name="Quandl"; version="2.4.0"; sha256="0apgwc85ija33dl9qgb8nr2wj5rx0xv6wlmg427nkxnr8pnar8ih"; depends=[xts RCurl RJSONIO zoo]; };
+Quandl = derive { name="Quandl"; version="2.6.0"; sha256="1mz39sj7dxfh9p5kdq7bxlifbg9izqz04l3ilnfchva7qq1ij01q"; depends=[xts httr zoo]; };
 QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
-QuantifQuantile = derive { name="QuantifQuantile"; version="1.0"; sha256="0r3yz8k68z6c751r0ryxv744spch4aws50313miq498r5mvr4w1y"; depends=[rgl]; };
+QuantifQuantile = derive { name="QuantifQuantile"; version="2.1"; sha256="1d3dcpri8d98mn2c0nfipp1pdr67a8h35p0y7bdil6il71h4qldm"; depends=[rgl]; };
 QuasiSeq = derive { name="QuasiSeq"; version="1.0-6"; sha256="0hv6fmw8kqdg82nwdiqb9naryw4x42rv9xw1zmahgqyxr9ffnrgr"; depends=[Matrix mgcv]; };
 Quor = derive { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; };
 R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; };
 R_devices = derive { name="R.devices"; version="2.13.0"; sha256="1ys4sxns2y5cgqb18scclsv99jfkyy3l9mq0jcnh76c48gpzaisp"; depends=[R_methodsS3 R_oo R_utils base64enc]; };
-R_filesets = derive { name="R.filesets"; version="2.7.0"; sha256="12aghswi40qr6n6rzyv2bpy1wlp61ij7h1yblbhlmdk3p4rd0bs1"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
+R_filesets = derive { name="R.filesets"; version="2.7.1"; sha256="0awvjqkk5h8wzbdgn255m3gy3w5dsnlqp4wj7gzqgqm5mwg4jdyh"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
 R_huge = derive { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
 R_matlab = derive { name="R.matlab"; version="3.2.0"; sha256="1c87m6pv62ciqwpmsp8l7rkixcv04s9nkdn4yjbgyqvcslfaw26m"; depends=[R_methodsS3 R_oo R_utils]; };
 R_methodsS3 = derive { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; };
 R_oo = derive { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; };
 R_rsp = derive { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_methodsS3 R_oo R_utils R_cache]; };
-R_utils = derive { name="R.utils"; version="2.0.0"; sha256="1ldrz6nj45mnggk1zsx8j479kzfi2pjp402zid5yrnqmh50q61sb"; depends=[R_oo R_methodsS3]; };
+R_utils = derive { name="R.utils"; version="2.0.2"; sha256="1bqykygqbgx2wwqypvgj9siyiqa77cbchjnqw0qgg1rg8q2ldw65"; depends=[R_oo R_methodsS3]; };
 R0 = derive { name="R0"; version="1.2-5"; sha256="13f0dvxf1gz9j8ih1n8giyhb4s7nrh1r7ncc5smvh06kjgr5b341"; depends=[MASS]; };
-R1magic = derive { name="R1magic"; version="0.2"; sha256="07kqpdpf2grmgkv609l79f3w6ljkldfsyrn9l1yg6birzp3p69v1"; depends=[]; };
+R1magic = derive { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; };
 R2BayesX = derive { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; };
 R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz66d0z32qy55par36jj987qglpl25zmax"; depends=[]; };
 R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; };
 R2GUESS = derive { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkcsq13v6s323k4wdhvkydmvyhlgvlpcl"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; };
 R2HTML = derive { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; };
-R2MLwiN = derive { name="R2MLwiN"; version="0.8-0"; sha256="1fjns3v6prjkd4iwdcj846sj5ji1bg4b7axxx18wlsvrin83gd9k"; depends=[lattice coda Matrix foreign rbugs digest]; };
+R2MLwiN = derive { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s7vr5nbfkrlykaph3lv20xq8cc8nz9zzx"; depends=[lattice coda Matrix foreign rbugs digest]; };
 R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[coda boot]; };
 R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; };
 R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; };
 R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; };
 R2admb = derive { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; };
-R2jags = derive { name="R2jags"; version="0.05-03"; sha256="02r68g005cmcc7dg1a52awdyak2sg2pszpl6ckw4bw19sk9nnd48"; depends=[rjags abind coda R2WinBUGS]; };
+R2jags = derive { name="R2jags"; version="0.5-6"; sha256="0zknl9qrypp96qz6rx7bkxg7bslvsnlhrgh749q4q566fz944n1g"; depends=[rjags abind coda R2WinBUGS]; };
 R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; };
 R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; };
 R4CouchDB = derive { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; };
@@ -1484,10 +1506,11 @@ RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5s
 RAM = derive { name="RAM"; version="1.2.0"; sha256="1xf296a2xqv9nq3m5lswnbfy023s6dp0yv8y0hr8xq0mw9mym3v3"; depends=[vegan ggplot2 gridExtra RColorBrewer gplots plyr reshape2 scales labdsv ggmap permute VennDiagram data_table FD MASS RgoogleMaps ape lattice reshape]; };
 RAMP = derive { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; };
 RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; };
-RANN = derive { name="RANN"; version="2.4.1"; sha256="13d2wi3r4b190f6s6y4zipqf43gy9c1h71b9j7qmc3lqca4nvzmd"; depends=[]; };
+RANN = derive { name="RANN"; version="2.5"; sha256="007cgqg9bybg2zlljbv5m6cmlm3r6i251018rpgjcn0xnm9sjsj7"; depends=[]; };
+RANN_L1 = derive { name="RANN.L1"; version="2.5"; sha256="0sjf92hdw9jczvq1wl5syckhvik7wv0k9vrrgw4nnnsabc25v9pf"; depends=[]; };
 RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
 RAPIDR = derive { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[data_table PropCIs]; };
-RAdwords = derive { name="RAdwords"; version="0.1.3"; sha256="1i9s28q58571y8lx3gfc3div9iy1j2bcxbrf6n1v4lis0xn60vl1"; depends=[RCurl rjson]; };
+RAdwords = derive { name="RAdwords"; version="0.1.4"; sha256="0zqxvspza60sh65k0fr3c51qdxk8mzkrh8fm421lyd6054n6az21"; depends=[RCurl rjson]; };
 RApiSerialize = derive { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
 RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; };
 RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
@@ -1504,9 +1527,9 @@ RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10m
 RColorBrewer = derive { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
 RConics = derive { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
 RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RJSONIO RCurl]; };
-RCurl = derive { name="RCurl"; version="1.95-4.5"; sha256="0a99awma5ylcagr6y9adv82hr5wk5cg4i5flra5q0cpvhp9w8sd2"; depends=[bitops]; };
+RCurl = derive { name="RCurl"; version="1.95-4.6"; sha256="145li081kqa07w3bzb5zaad6jkr3zr0hcpkjwar76ybrvc4jyi4s"; depends=[bitops]; };
 RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
-RDML = derive { name="RDML"; version="0.8-3"; sha256="077mz3j3iy0ddbsr05a21l2lqlm24mxgnafxnijnkiqxci3nj5rl"; depends=[R6 assertthat XML plyr dplyr]; };
+RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[R6 assertthat XML plyr dplyr]; };
 RDS = derive { name="RDS"; version="0.7-1"; sha256="1vkrplzak95yqykrxgzjxgvyb4g255rnk6msh1yi5mgrd32f0gdl"; depends=[gridExtra ggplot2 Hmisc igraph reshape2 scales]; };
 RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; };
 RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
@@ -1546,8 +1569,8 @@ RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsd
 RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
 RIGHT = derive { name="RIGHT"; version="0.2.0"; sha256="1mwm7l5l2hj67j03d895rx1181hax31a0nn3nq7rjcgpbljd2gjx"; depends=[ggplot2 plyr rjson shiny]; };
 RISmed = derive { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh440y1p2sy5c4i3v2yph99326pzxbyw7q"; depends=[]; };
-RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; };
-RImpala = derive { name="RImpala"; version="0.1.5"; sha256="0kx2h6gkjxrsp6c33p1j7irs205rn5lpknlmc8as3v1ziigi4d51"; depends=[rJava]; };
+RImageJROI = derive { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
+RImpala = derive { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; };
 RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; };
 RInside = derive { name="RInside"; version="0.2.12"; sha256="09dx9md5i4vdgadmqfzcchs5nhkml4nwr8ckgmmqll0y3xph2f3h"; depends=[Rcpp Rcpp]; };
 RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; };
@@ -1555,6 +1578,7 @@ RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vp
 RJSDMX = derive { name="RJSDMX"; version="1.3"; sha256="1z4l6iw404qn3syk2877msywkr8369nic5zzvnx1qj0gj9x2mm2p"; depends=[rJava zoo]; };
 RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
 RJaCGH = derive { name="RJaCGH"; version="2.0.3"; sha256="0wz7vhlgzf8smzl7gx01dx070266fnmzw66wpl0im20nxfy8mr0l"; depends=[]; };
+RJafroc = derive { name="RJafroc"; version="0.0.1"; sha256="0zjyr7qz50wvzkais6q9kyf3wp29g15kan73b8wdqrvab0f5rjqs"; depends=[xlsx ggplot2 stringr]; };
 RKEA = derive { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[RKEAjars rJava tm]; };
 RKEAjars = derive { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; };
 RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv Rcpp]; };
@@ -1571,12 +1595,12 @@ RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw
 RMark = derive { name="RMark"; version="2.1.12"; sha256="0b8yzng9c74yxl1a1nkc4knf2a9114mjkis19b1pdnclyxcnx45z"; depends=[snowfall matrixcalc msm coda]; };
 RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; };
 RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
-RMySQL = derive { name="RMySQL"; version="0.10.2"; sha256="1yzlldgnncbd8aqkhphnwb8bk164ds4ql3hq1h2qdlicf6x806kz"; depends=[DBI]; };
+RMySQL = derive { name="RMySQL"; version="0.10.3"; sha256="0791pshzr7rjjcnlm9md7gfsqkzizhzr9vwgnk2acc7sw5hikga6"; depends=[DBI]; };
 RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
 RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[maps RColorBrewer abind fields fossil tgp sp]; };
 RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
-RNeXML = derive { name="RNeXML"; version="2.0.1"; sha256="10p9njlrpkwgnyjkcz7w579dwi0nwdmksyl2gpbq106fzqvh0s47"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
-RNetCDF = derive { name="RNetCDF"; version="1.6.3-1"; sha256="0c112qwxzml3mbdss69607amxvhpkfgs7ihymxidgkv0s3ra7cp5"; depends=[]; };
+RNeXML = derive { name="RNeXML"; version="2.0.2"; sha256="1giqwpcvr3v7na0z25qwps3qlrnffji0frcx694ifdfa89fn0s4d"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
+RNetCDF = derive { name="RNetCDF"; version="1.7-3"; sha256="1blpwkmdi7scm876mvk9m23k4kfx83rc6hcy342236rbmxdzahhg"; depends=[]; };
 RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; };
 RNiftyReg = derive { name="RNiftyReg"; version="1.1.3"; sha256="1z980rwlq7wg4zjslppzs9d2cxhj7l63sgg8x8g6zgs5ag3pzgi7"; depends=[reportr oro_nifti]; };
 ROAuth = derive { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[RCurl digest]; };
@@ -1600,7 +1624,8 @@ ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n40
 ROracle = derive { name="ROracle"; version="1.1-12"; sha256="1ydmckr0wzjgvhhh410l4ih7idbr8140g6v11avh655wffk02q5p"; depends=[DBI]; };
 RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdviar29z0py050748qw7ab326lqp5d"; depends=[ape picante pspline deSolve]; };
 RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
-RPMG = derive { name="RPMG"; version="2.1-5"; sha256="1ck6bz72h1kwi7gg8vd0zw1q61pqv23rish84zri2p18z7nd9kvh"; depends=[]; };
+RPEnsemble = derive { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0aybdj7bk2chhbggzh7h1w7snddgdvvj6cz10"; depends=[MASS class]; };
+RPMG = derive { name="RPMG"; version="2.1-7"; sha256="1nkmnqrys65vg377mys6qzpbwfh43adgy76c6jfdg336nf8qx2wd"; depends=[]; };
 RPMM = derive { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; };
 RPPairwiseDesign = derive { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
 RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; };
@@ -1610,13 +1635,14 @@ RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df
 RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; };
 RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp Rcpp]; };
 RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
+RRTCS = derive { name="RRTCS"; version="0.0.1"; sha256="05ws5n2ajisdh4gfzmilvkz6jvvbl6fiwkcjzwm8bll2rhl916z4"; depends=[sampling samplingVarEst]; };
 RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; };
 RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[lavaan ggplot2 lattice tkrplot plyr RColorBrewer aplpack]; };
 RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
 RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; };
 RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; };
 RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; };
-RSEIS = derive { name="RSEIS"; version="3.3-3"; sha256="13fb4mx3sgnbrcn1kkxy0a490kikjrq49ii3x14xw2s8ci030wlr"; depends=[RPMG Rwave]; };
+RSEIS = derive { name="RSEIS"; version="3.4-5"; sha256="0wh7977vm721hb566lh721mwn6b4x0p7x6xb7gv0nvrd3kpsw9zn"; depends=[RPMG Rwave]; };
 RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; };
 RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
 RSNNS = derive { name="RSNNS"; version="0.4-6"; sha256="1p4gv2v9vzbgaksiibg66l9l9nabnm5lblc17md2cdcb6rygh3hp"; depends=[Rcpp Rcpp]; };
@@ -1629,6 +1655,7 @@ RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkb
 RSelenium = derive { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[RCurl RJSONIO XML caTools]; };
 RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
 RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.3"; sha256="003mazcwz7w814pm8i9zdfmsbijf02n80w48ml4grmjjn1v7x5ar"; depends=[jsonlite httr plyr base64enc digest stringr]; };
+RSocrata = derive { name="RSocrata"; version="1.6.0-12"; sha256="0db1p3bxlh07d43rlg4cmj2gbasqd21mg8qnrrp8zkqasmjdzhn7"; depends=[httr jsonlite mime curl]; };
 RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp Rcpp]; };
 RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RJSONIO RCurl]; };
 RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
@@ -1637,7 +1664,7 @@ RSurvey = derive { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9l
 RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
 RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
 RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; };
-RTOMO = derive { name="RTOMO"; version="1.1-2"; sha256="15swp7jx5xmj87hjcfdar3r5sqnnb795qclf8b7l4bvx80h9nh2i"; depends=[RPMG GEOmap RSEIS splancs]; };
+RTOMO = derive { name="RTOMO"; version="1.1-3"; sha256="10qkqdx2zj2m854z9s57ddf5jbzagac9mq5v6z5393c0s8bx10x8"; depends=[RPMG GEOmap RSEIS splancs]; };
 RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[SparseM randomForest tree nnet tm e1071 ipred caTools maxent glmnet tau]; };
 RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
 RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; };
@@ -1658,14 +1685,14 @@ RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai2
 RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[XML kappalab]; };
 RXshrink = derive { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; };
 RYoudaoTranslate = derive { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
-RadOnc = derive { name="RadOnc"; version="1.0.9"; sha256="13fr838l38cvx84dx0k55p6riw5v86n7m51lg25is2fcyn17bq2r"; depends=[rgl geometry oro_dicom ptinpoly]; };
+RadOnc = derive { name="RadOnc"; version="1.1.0"; sha256="0gjrs78aaqbizzlcyjshc785ams3nclr503p4s2xsmd6sxj4khwi"; depends=[rgl geometry oro_dicom ptinpoly]; };
 RadTran = derive { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
 RadioSonde = derive { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; };
 Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
 Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; };
 RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
 RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3nq3mw88439z6hjaf3gkz9sf7dqm9iipgk333qw1s6sfk"; depends=[sp]; };
-RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.1"; sha256="1nxq4sbgza0bsrspgs24mq9a7py9dhyx1dcaflpsvharc5m41ywc"; depends=[]; };
+RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.2"; sha256="12vja6ilihy2xq78h6nj1i60vgd5b6pqr2knpw7yq1nix22v4qn9"; depends=[]; };
 RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
 RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
 Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; };
@@ -1677,7 +1704,7 @@ Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhp
 Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp Rcpp RcppArmadillo]; };
 Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
 Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
-Rchoice = derive { name="Rchoice"; version="0.2"; sha256="06xlz8ii1w42wcvkymxv68dn8pzvnn3xbyarplmdalv4p8c4jchk"; depends=[Formula maxLik msm plm plotrix]; };
+Rchoice = derive { name="Rchoice"; version="0.3"; sha256="1ac2nw03g66z2rgxzv8jqad74cp4c9ry0hvnw77d57ddaxszkrva"; depends=[Formula maxLik msm plm plotrix]; };
 Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; };
 Rcmdr = derive { name="Rcmdr"; version="2.1-7"; sha256="1qn0bfh36shdnm2qbjwggjv19vqkkhng82x39sdbljx0z3g3bmdg"; depends=[RcmdrMisc car tcltk2 abind]; };
 RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[car sandwich abind Hmisc MASS e1071]; };
@@ -1720,11 +1747,11 @@ RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sh
 RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; };
 Rcolombos = derive { name="Rcolombos"; version="1.5.2"; sha256="1whjn447jk2bjyjf0fwl0165f8x41fjzmkmagl6dfq1c4373sf27"; depends=[httr]; };
 Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; };
-Rcpp = derive { name="Rcpp"; version="0.11.5"; sha256="0vmdprnf2i0hvy4pz5v0zdvwgyfv1kgmiwdgjjxppz5p84n59xs9"; depends=[]; };
+Rcpp = derive { name="Rcpp"; version="0.11.6"; sha256="153gwzg2inxmzs5qrr87r3zabjvfh32i8kdivdy77b3c5yfrl5za"; depends=[]; };
 Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
 RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp Rcpp]; };
-RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.5"; sha256="1acgwwcgb7qqvwg3j0qk7jvk3nb76zw0lqn8bswywvgawalw49ah"; depends=[Rcpp Rcpp BH]; };
-RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.650.1.1"; sha256="1i11nnkbzhk0sckj29fza32g45jkkjh11yx4q78byhawpr8s30jq"; depends=[Rcpp Rcpp]; };
+RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp Rcpp]; };
+RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.100.1.0"; sha256="0126g932fq24ns4yzj3z2dwagdy9qb7ckprk30zs7alq6rayfmn5"; depends=[Rcpp Rcpp]; };
 RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; };
 RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; };
 RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; };
@@ -1742,11 +1769,12 @@ RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7
 RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp Rcpp]; };
 RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp Rcpp]; };
 RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[Rcpp Rcpp BH]; };
+RcppTOML = derive { name="RcppTOML"; version="0.0.3"; sha256="0v9gxbr5gb7k273ld6vx2n0vzy22px13s7cvackbm7mhc68bp5jw"; depends=[Rcpp Rcpp]; };
 RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts Rcpp xts]; };
 RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp Rcpp RcppGSL]; };
 Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
 Rd2roxygen = derive { name="Rd2roxygen"; version="1.6"; sha256="0y0vh1dfflh8lrgrdj9wfmwh70ywd9kiia49f09h849mv1ln1z60"; depends=[roxygen2 formatR]; };
-Rdistance = derive { name="Rdistance"; version="1.2.1"; sha256="0ci0dg8j28a6b4s4i53p3sahcr4czw9fhrkd14q30wcd9is8dgkz"; depends=[]; };
+Rdistance = derive { name="Rdistance"; version="1.2.2"; sha256="0njfcgcaw8vkvayd102wd5cdp1ai9ghqhi8zsijv6iifxs6yvwq9"; depends=[]; };
 Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; };
 Rdsdp = derive { name="Rdsdp"; version="1.0.2"; sha256="0rpy3897dargrfrn6qd5m1j6i1pvfk2qa3cny0iacqkgqbg8a4wx"; depends=[]; };
 Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
@@ -1762,7 +1790,7 @@ RegressionFactory = derive { name="RegressionFactory"; version="0.7.1"; sha256="
 RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
 Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
 ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; };
-Renext = derive { name="Renext"; version="2.1-0"; sha256="19920kb3qd97vm285zbxqarpq8dyyrx1k6sks990xjbgpy7vyj3y"; depends=[evd numDeriv]; };
+Renext = derive { name="Renext"; version="2.1-10"; sha256="1c18v9xya73j8qnqvkb4fc7bfvzxnw904z5n9n9rgch70nrccqfn"; depends=[evd numDeriv]; };
 RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhghxvdy51cibylgm7bdbzgqsn1nbxam39yhvfv9"; depends=[gWidgets gWidgetstcltk Renext]; };
 Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[XML RCurl ape]; };
 ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp Rcpp]; };
@@ -1786,6 +1814,7 @@ Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88w
 Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
 Rlabkey = derive { name="Rlabkey"; version="2.1.127"; sha256="1bacl4ax9bgn27180hgh6gr4y0bwl3q4y18mc0cyb06yagzci5d9"; depends=[RCurl rjson]; };
 Rlibeemd = derive { name="Rlibeemd"; version="1.3.2"; sha256="0db6x2cry011ymmfy1pxgdyjdn6l93d8wmixp59r51yij2s775xq"; depends=[Rcpp Rcpp]; };
+Rlinkedin = derive { name="Rlinkedin"; version="0.1"; sha256="0w30zv4a842vckk4yqsh8hhkdz2gy650a0x29aacp77p9y79g9yn"; depends=[httr XML httpuv]; };
 Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp Rcpp]; };
 Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
 Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp Rcpp]; };
@@ -1813,7 +1842,7 @@ RoughSets = derive { name="RoughSets"; version="1.2-1"; sha256="06bykfd26qdll0xa
 Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; };
 Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
 Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; };
-Rquake = derive { name="Rquake"; version="2.2"; sha256="0gkarqqhmiakc968ffwywkwy7npm1ly5gd6bbhr8fjfwdnhjam5n"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl]; };
+Rquake = derive { name="Rquake"; version="2.3-1"; sha256="0xb8j76jjv6k3r8nzjxdddic4rq1yj7qsh85asl38qwj7483cyc4"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl cda]; };
 Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; };
 Rrdrand = derive { name="Rrdrand"; version="0.1-10"; sha256="1j72v44scmghm29jxjdy0651qlkhsnrb3bb5qff82451mbd17bzb"; depends=[]; };
 Rsampletrees = derive { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[haplo_stats ape]; };
@@ -1832,7 +1861,7 @@ Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6
 RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; };
 Rvcg = derive { name="Rvcg"; version="0.11"; sha256="0id732zhncy6x47qdbyddcm3f8l1r4j53ya4qj3zcf81q15dadw0"; depends=[Rcpp Rcpp RcppEigen]; };
 Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
-Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; };
+Rwave = derive { name="Rwave"; version="2.4"; sha256="1ynj6higx0j6iv033lx8h3i9hlg5b53nl2gv6fwjny4ygm8b1mjm"; depends=[]; };
 Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
 RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; };
 RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[rJava fingerprint data_table rcdk]; };
@@ -1869,7 +1898,7 @@ SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z
 SEAsic = derive { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
 SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
 SEER2R = derive { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
-SEERaBomb = derive { name="SEERaBomb"; version="2014.4.1"; sha256="1vlk6hcn05vdjfc7c8dhvsd1hc2yq1pdmhb7i48b689lkxg82igz"; depends=[RSQLite LaF]; };
+SEERaBomb = derive { name="SEERaBomb"; version="2015.1"; sha256="1pab5088pjhsx0lwh2xgm7hril0qpb0jprwm61d8c30bgrrqxni9"; depends=[RSQLite LaF dplyr rgl XLConnect Rcpp reshape2 mgcv DBI Rcpp]; };
 SEL = derive { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[quadprog lattice]; };
 SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; };
 SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; };
@@ -1886,9 +1915,10 @@ SIMMS = derive { name="SIMMS"; version="1.0.1"; sha256="08kl9kzxqmzlacs8jfys0w7r
 SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
 SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; };
 SIS = derive { name="SIS"; version="0.7-5"; sha256="197zf4s4f5wm8sl9h5vxwywmml7n05fwqlxbldn6wkpxix7gx0xm"; depends=[glmnet ncvreg survival]; };
-SKAT = derive { name="SKAT"; version="1.0.1"; sha256="03kc9df36kg9q1qr5l5zvfq3i5h5gz5f2m0mh054m6x76s796k1z"; depends=[]; };
+SKAT = derive { name="SKAT"; version="1.0.7"; sha256="0f8ln37871qsnxfcfcrnq91krcgwd85cz6g0p78px4yg3g4jwsn3"; depends=[]; };
 SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
 SLHD = derive { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; };
+SLOPE = derive { name="SLOPE"; version="0.1.1"; sha256="1v58jcd60i7hhs8wirdfqr1sskdrynnwcnqsr3q19vgnj4x1dn8f"; depends=[Rcpp Rcpp]; };
 SMC = derive { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; };
 SMCP = derive { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; };
 SMCRM = derive { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; };
@@ -1922,7 +1952,7 @@ SPIAssay = derive { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khln
 SPIn = derive { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
 SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; };
 SPODT = derive { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
-SPOT = derive { name="SPOT"; version="1.0.4184"; sha256="0rikfs2rha7q2xbycvky8si2ccgmamcn662g8ni105cr6m9hvvpc"; depends=[rpart emoa]; };
+SPOT = derive { name="SPOT"; version="1.0.5543"; sha256="0y8rj0wxy8sdk7si9k11i4pb96vp1q78h48ihs4r7d383zykk827"; depends=[rpart emoa twiddler rgl AlgDesign randomForest rsm MASS mco]; };
 SPREDA = derive { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[survival nlme]; };
 SPRT = derive { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
 SPSL = derive { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
@@ -1932,8 +1962,8 @@ SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghf
 SQUAREM = derive { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; };
 SRCS = derive { name="SRCS"; version="1.0"; sha256="0aha9fqdigvsx8dvck4y2yb8c7v58rivz50z0xwi0bhwzdddx52f"; depends=[]; };
 SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[tcltk2 gtools]; };
-SSDforR = derive { name="SSDforR"; version="1.4.8"; sha256="0bypbcb2d79cc4pl2i7c95l9lg65p66h5xl4sf2akpmffb3vf953"; depends=[psych TTR MASS TSA]; };
-SSN = derive { name="SSN"; version="1.1.4"; sha256="0n6xxbhvbqs15zn7w66vsr98adibfyr2qa0w7pfbw6vmrrmmn23z"; depends=[RSQLite sp MASS igraph maptools lattice BH]; };
+SSDforR = derive { name="SSDforR"; version="1.4.9"; sha256="1ka6zy77ml4kccfqjszvijh9dvlhzcp7fhsd2zsirsn6sdz0wrp0"; depends=[psych TTR MASS TSA]; };
+SSN = derive { name="SSN"; version="1.1.5"; sha256="1iymq6zzs3zfbjkz7h2ss8djdzvw2b3n68qazvw8vnrnkq3iyzry"; depends=[RSQLite sp MASS igraph maptools lattice BH]; };
 SSrat = derive { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; };
 SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
 STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[survival mgcv R2HTML gss codetools]; };
@@ -1951,6 +1981,7 @@ SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46
 SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; };
 SamplerCompare = derive { name="SamplerCompare"; version="1.2.6"; sha256="1n94fp6frawlbxcnvi0v6lhgs3yyc47lj1r46y3jg6zb9z3va3fa"; depends=[mvtnorm]; };
 SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; };
+Scale = derive { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[psych Hmisc MASS]; };
 SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; };
 SciencesPo = derive { name="SciencesPo"; version="1.02.12"; sha256="0v947xjfwyidl2fa6i7drvv9vnskz06kq4rmz46qzns7g0lwfjnq"; depends=[ggplot2 foreign MASS data_table lubridate xtable]; };
 ScoreGGUM = derive { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
@@ -2017,9 +2048,11 @@ SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxm
 SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; };
 SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
 SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
+SpatialPosition = derive { name="SpatialPosition"; version="0.9"; sha256="0w09yrn32pis4w3hkbghkgwpyy7mnnzzkhhp289xl738lymv207a"; depends=[raster sp]; };
 SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp Rcpp RcppArmadillo]; };
 SpatialVx = derive { name="SpatialVx"; version="0.2-2"; sha256="16qww58az1523pk8b4b5hzqnpb8djgvph2ykf6bjp8zz5qdfyhjs"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
 SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; };
+SpecHelpers = derive { name="SpecHelpers"; version="0.1.6"; sha256="1h14a1rsk7x5qafn4hcpmannkdf2wdphkzaa3b6nbb9jqjs1szi0"; depends=[gsubfn]; };
 SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
 SpecsVerification = derive { name="SpecsVerification"; version="0.3-0"; sha256="19vr4xlx9gx0ph6k2kf59bpbhmzncm1mmzz7ld3pjc7k4jfba3np"; depends=[]; };
 SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; };
@@ -2033,7 +2066,7 @@ Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvl
 StanHeaders = derive { name="StanHeaders"; version="2.6.0-10"; sha256="0bw11myc16ddi1qhh8dcsf8dqg6dcp1wjbyrp5p98dcc1rym7kmg"; depends=[]; };
 StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
 Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
-StatDA = derive { name="StatDA"; version="1.6.7"; sha256="140hqg56axwg5ckfr4n4rr453ppsgf5bmmd7kg4mai1xnj4wmg8b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; };
+StatDA = derive { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; };
 StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; };
 StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[proxy clue survey RANN lpSolve]; };
 StatMeasures = derive { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; };
@@ -2045,7 +2078,7 @@ StereoMorph = derive { name="StereoMorph"; version="1.4"; sha256="0xar1vx05q6dbf
 Storm = derive { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; };
 StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; };
 StratSel = derive { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[MASS memisc Formula mnormt]; };
-StreamMetabolism = derive { name="StreamMetabolism"; version="1.0"; sha256="03pr7i1c3qddqwibfc2x08d2nh8fih02k7a1xhqs1awfs43x56is"; depends=[zoo chron maptools]; };
+StreamMetabolism = derive { name="StreamMetabolism"; version="1.1.1"; sha256="1r9p6awf3a2d08w9rdlggkwlfhksn14xbhdhdnmxz79ym5mgdd8f"; depends=[zoo chron maptools]; };
 StressStrength = derive { name="StressStrength"; version="1.0.1"; sha256="15sgdisgz8zcq4i9z4zm7isr5ckyd7bk6yl1g7a5kngams282ipx"; depends=[]; };
 SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
 SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; };
@@ -2071,8 +2104,9 @@ TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cm
 TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[signal fdrtool]; };
 TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[normalp survival mcmc R_utils coda Rsolnp BMS]; };
 TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; };
+TDCor = derive { name="TDCor"; version="0.1-1"; sha256="001rmwi2v4vy1b2d7wwvvca4xnkizz8dmys3q3xbjv7wrfxyvai8"; depends=[deSolve]; };
 TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; };
-TDMR = derive { name="TDMR"; version="1.2"; sha256="0w056qxh7c56m3p6jlrp8fv2j2r1njxzgwzk3l1lhyxr94gff263"; depends=[testit SPOT]; };
+TDMR = derive { name="TDMR"; version="1.3"; sha256="0bbd2an18ayxaxprsjqrybb877lkk74dpxbvbv7qdwc1ivqm8g96"; depends=[SPOT twiddler testit adabag]; };
 TDboost = derive { name="TDboost"; version="1.1"; sha256="1pyqssqxkr9bwyz4h1l5isbb78asmvddy20vyxq8snxra2r06hbf"; depends=[lattice]; };
 TED = derive { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[foreach zoo fields animation geoR RcppArmadillo]; };
 TEEReg = derive { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; };
@@ -2086,7 +2120,7 @@ TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4
 TH_data = derive { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47sly65grjkm3wvrbr3nl52q1vdmy1xsgm"; depends=[]; };
 TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8xcf4xdgxq2zjbzsx4f0p0nf5ymj"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; };
 TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; };
-TKF = derive { name="TKF"; version="0.0.3"; sha256="0kdrza02nn4vkfpc5kwpywls24adhj3kywa5w83v4wpx8dmmh10z"; depends=[expm numDeriv]; };
+TKF = derive { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[expm numDeriv ape phytools phangorn]; };
 TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; };
 TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk gdata]; };
 TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
@@ -2096,24 +2130,22 @@ TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1
 TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
 TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; };
 TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; };
-TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; };
+TSMySQL = derive { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[TSdbi DBI tframe TSsql RMySQL]; };
 TSP = derive { name="TSP"; version="1.1-0"; sha256="0d38n6z531jcg34q39fv0qsmccjbx5yil14fw5pmvyympyjsf5kq"; depends=[foreach]; };
-TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; };
+TSPostgreSQL = derive { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[TSdbi DBI tframe tframePlus TSsql RPostgreSQL]; };
 TSPred = derive { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; };
-TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; };
+TSSQLite = derive { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[TSdbi DBI tframe tframePlus TSsql RSQLite]; };
 TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; };
 TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; };
-TScompare = derive { name="TScompare"; version="2013.9-1"; sha256="1gghr7xsg524sc9lhy1ymlhigaz6pi69fnccgn784ff2hl3w6d8w"; depends=[TSdbi tframe tfplot]; };
-TSdata = derive { name="TSdata"; version="2013.9-1"; sha256="1r3x6w17517if2jpcz2mr8jk5i080dkx4nlffblrcsxjhfvlz0xh"; depends=[]; };
-TSdbi = derive { name="TSdbi"; version="2013.9-1"; sha256="12v9dv7hrq626q44v3lws950m241fq5fsfsnmgvfbbyya5ixis86"; depends=[DBI tframe]; };
+TScompare = derive { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[TSdbi tframe tfplot DBI]; };
+TSdata = derive { name="TSdata"; version="2015.4-1"; sha256="0h8gxgfal4ak2jmxmql02qpq4lcgj8m263aq9h83l5gmvzd173q7"; depends=[]; };
+TSdbi = derive { name="TSdbi"; version="2015.1-1"; sha256="1bqxpd4g0ppm1261srgwjzghfwwl53vybkihz99azckky0539m1s"; depends=[DBI tframe]; };
 TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[proxy zoo xts dtw TSclust KernSmooth locpol pdc longitudinalData cluster]; };
-TSfame = derive { name="TSfame"; version="2013.8-2"; sha256="19awl7jrx97y93wsms3h87w8qdgpdrkbbpsjsa2aqsnyq5vgy82l"; depends=[TSdbi DBI tframe tframePlus fame tis]; };
-TSgetSymbol = derive { name="TSgetSymbol"; version="2013.9-1"; sha256="1hn78xrfdnwhjrgcnn71ihvdgv4qwdxhpjwcqp0pbkgbxj3q5w3k"; depends=[TSdbi quantmod DBI zoo tframe tframePlus]; };
-TShistQuote = derive { name="TShistQuote"; version="2013.9-1"; sha256="06din7frxmbk4qxkpv0z5srh8nh0wkmrfl9lz17y7cwsmldl4hvr"; depends=[TSdbi DBI tframe tframePlus zoo tseries]; };
-TSodbc = derive { name="TSodbc"; version="2013.9-1"; sha256="0s0bgid5slvyqlsrc0jvybqd73qjbs7qb0klws4ynk51rw6rilml"; depends=[TSdbi RODBC DBI tframe tframePlus TSsql]; };
-TSsql = derive { name="TSsql"; version="2014.4-1"; sha256="10h83z0d9xjc1g0pnjvr4idz5c2vwf36x6qx1lpa48ybap50s215"; depends=[DBI tframe TSdbi]; };
-TSxls = derive { name="TSxls"; version="2013.8-2"; sha256="1a0cmw41jf9jqibg25s4s04lawdb86c5r4bkxp8bznzkkhihpxn1"; depends=[TSdbi DBI tframe tframePlus gdata]; };
-TSzip = derive { name="TSzip"; version="2013.9-1"; sha256="09fqjsppj7qmbiiy19s64j77kf6drqfiphk5dfz25w5df1lzdw0f"; depends=[TSdbi DBI tframe tframePlus gdata]; };
+TSfame = derive { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[TSdbi DBI tframe tframePlus fame tis]; };
+TSmisc = derive { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[TSdbi DBI tframe tframePlus zoo xts its tseries quantmod gdata]; };
+TSodbc = derive { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[TSdbi DBI tframe tframePlus TSsql RODBC]; };
+TSsdmx = derive { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6vf34dljs0cjhxls9gpal4w0bjmvmc67khb"; depends=[TSdbi DBI tframe tframePlus RJSDMX rJava]; };
+TSsql = derive { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe TSdbi tframePlus zoo]; };
 TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; };
 TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts xts]; };
 TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; };
@@ -2127,14 +2159,15 @@ Taxonstand = derive { name="Taxonstand"; version="1.7"; sha256="0xs2kdsd6sa5vpxa
 TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[lme4 ggplot2 GSA reshape2 gtools gplots cluster stringr]; };
 TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
 TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; };
-TeachingSampling = derive { name="TeachingSampling"; version="3.2.1"; sha256="1diw8qz6yi3g7d1ysklrvxwbzda9ybi039yr6agzw0w0b2b59jj4"; depends=[]; };
-TestScorer = derive { name="TestScorer"; version="1.6"; sha256="11125i0dwh961q5xbg57lli5bzzls3y482iw5f0qwalwkppk7sv0"; depends=[]; };
+TeachingSampling = derive { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; };
+TestScorer = derive { name="TestScorer"; version="1.7"; sha256="1rzpy4aa61l21qx2qxrmk16cxrvbygacxk4rkm766769aq2jqa09"; depends=[]; };
 TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; };
 Thermimage = derive { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp4g5wpmgzf0ii2aa0gawcq74rfn4frfizzdy0ad"; depends=[]; };
 Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
 ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
 ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
 ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; };
+TickExec = derive { name="TickExec"; version="1.0"; sha256="0ylmf0mxp9hnijnq9rq6l4xahzsyrh8pfjjbgzz6v77ycvzzz5sh"; depends=[]; };
 TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
 Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; };
 TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; };
@@ -2152,7 +2185,7 @@ TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5
 TreeSimGM = derive { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; };
 TriMatch = derive { name="TriMatch"; version="0.9.4"; sha256="008mi58sv82ykvwzil229z3zq3addyn3bik0xzfajcx4h7sdmsfg"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics gridExtra]; };
 TrialSize = derive { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
-TripleR = derive { name="TripleR"; version="1.4"; sha256="1hzfdip9n390cizk329k6bdpz1vkxj76khc8lxm0yx9jbc50ng6d"; depends=[ggplot2 reshape2 plyr]; };
+TripleR = derive { name="TripleR"; version="1.4.1"; sha256="028xvy3l72n1jhhfzv1fx1a51ya9bx008icz81ixjdwghzqr0wmi"; depends=[ggplot2 reshape2 plyr]; };
 Tsphere = derive { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
 TukeyC = derive { name="TukeyC"; version="1.1-5"; sha256="08s9scsd2l6wavc7qqlffjbf89vkd6xpb4iawvbqf7jh8jiyvw17"; depends=[]; };
 TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; };
@@ -2174,8 +2207,9 @@ V8 = derive { name="V8"; version="0.6"; sha256="1cr9nm5wvi3b2766fpdgihnfmn1ckrwr
 VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
 VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; };
 VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; };
+VCA = derive { name="VCA"; version="1.1.1"; sha256="14xm220ymg5p1m2h2xvjkbgaqfhi7dmf8fmi4zmfm5gksgf4v351"; depends=[Matrix numDeriv]; };
 VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
-VGAM = derive { name="VGAM"; version="0.9-7"; sha256="0477y0flxzvw06qi5dk1ky8s19b67jvw0lzxz7pzffzdbv9mj806"; depends=[]; };
+VGAM = derive { name="VGAM"; version="0.9-8"; sha256="0wizv2r1k79ifg9m0z9m2l80bshvfmajanznk5a5370ih3fih33a"; depends=[]; };
 VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; };
 VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
 VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
@@ -2183,7 +2217,7 @@ VIFCP = derive { name="VIFCP"; version="1.0"; sha256="19jpwhbw5ml46ic8mzkl0ll7qa
 VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; };
 VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; };
 VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
-VLMC = derive { name="VLMC"; version="1.4-0"; sha256="0ifrmwq095xpmn3r303l3b9z31fri224nk3jn7aim6chcjmy1r71"; depends=[MASS]; };
+VLMC = derive { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; };
 VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgslngs6a13g54d5q9aa4nnxm8w"; depends=[]; };
 VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; };
 VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; };
@@ -2203,7 +2237,7 @@ VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kc
 Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
 VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
 W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[waveslim wavemulcor]; };
-W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-1"; sha256="1bxgsm6yl62adp3apvkihvvw40130z5ki49gnriv3syaw2bgwa0r"; depends=[XML RCurl]; };
+W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-2"; sha256="162bjf8g94xxif86c6545kjvn2m06v618kna6ic2b3alyx577fww"; depends=[XML RCurl]; };
 WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; };
 WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
 WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
@@ -2213,6 +2247,7 @@ WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59
 WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
 WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS reshape plyr]; };
 WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
+WaterML = derive { name="WaterML"; version="1.0.0"; sha256="125aivc23qgarndbwxif3xmqjp4n32vyk8cb7f7a2v3y51z332j2"; depends=[XML RJSONIO httr]; };
 Watersheds = derive { name="Watersheds"; version="1.0"; sha256="11hrprl8ldbgk1j1f8z4cb327c8d94x1fc29dpacqck48gdb4wmp"; depends=[sp maptools rgeos lattice splancs]; };
 Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
 WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[waveslim lattice]; };
@@ -2224,11 +2259,12 @@ WhiteStripe = derive { name="WhiteStripe"; version="1.0"; sha256="0j8f10dwc14a0y
 WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; };
 WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp Rcpp]; };
 WikipediR = derive { name="WikipediR"; version="1.1.0"; sha256="19hc1vmyv0bnf00q8vwmfr6jxrcd1h5xzb9pphy5grghbj01bcl8"; depends=[httr jsonlite]; };
+WikipediaR = derive { name="WikipediaR"; version="1.0"; sha256="0kx966q5zn7jq1m7b8w1y1zllxvslr66bz6ji1lr11vk0fykl3kn"; depends=[XML]; };
 WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
 WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
 WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
 WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; };
-XBRL = derive { name="XBRL"; version="0.99.15"; sha256="0fscvl7i205h0ax8g78v5n75bfqbna6cr7lg8jkicjbf4v791hhz"; depends=[Rcpp Rcpp]; };
+XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp Rcpp]; };
 XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[XLConnectJars rJava]; };
 XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; };
 XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; };
@@ -2252,7 +2288,8 @@ aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0
 aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[data_table plyr caret seqinr lattice randomForest ROCR reshape2 protiq]; };
 aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; };
 aRxiv = derive { name="aRxiv"; version="0.5.8"; sha256="0kwphz9x4ljsznvxxvm03mmbrv3ipyy2fh8lgik4zvv4c63mlxsh"; depends=[httr XML]; };
-abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfjii2v9a74pf488iaywc1kd7d"; depends=[nnet quantreg MASS locfit]; };
+abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data nnet quantreg MASS locfit]; };
+abc_data = derive { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
 abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; };
 abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; depends=[abc abind plyr]; };
 abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[nlme lattice mosaic]; };
@@ -2287,7 +2324,7 @@ addreg = derive { name="addreg"; version="1.2"; sha256="1xgf9q0z3prvchyba1vaai6i
 ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn3pv4v5iwxz5n39f685p9lkc2nn"; depends=[]; };
 ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
 adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; };
-adegraphics = derive { name="adegraphics"; version="1.0-1"; sha256="1gj7x43n0x24gaq4lhdhgdzmflv5dyvcjak82m5qmbxn34pasrv9"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
+adegraphics = derive { name="adegraphics"; version="1.0-2"; sha256="1jhi761rhrq1k27gxfns46j67x0ajbff6mz9cwl5jkcqg2mbcg8q"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
 adehabitat = derive { name="adehabitat"; version="1.8.17"; sha256="0cy98fd6mcbjc152vv41mnh5xj19xdfag8n950fvffbrpvpgbcpb"; depends=[ade4 tkrplot shapefiles sp]; };
 adehabitatHR = derive { name="adehabitatHR"; version="0.4.13"; sha256="140ar1naf67v996d5p0i2v07g02pf9c4c6h1pjicai5n59s7z72v"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; };
 adehabitatHS = derive { name="adehabitatHS"; version="0.3.11"; sha256="0sbhc1mvdc8pxq56plbgk0ry65chxcv3zjry4151hiv7yxpn39ri"; depends=[sp ade4 adehabitatMA adehabitatHR]; };
@@ -2321,6 +2358,7 @@ alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c9
 allelematch = derive { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; };
 allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
 alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; };
+alphaOutlier = derive { name="alphaOutlier"; version="1.0.0"; sha256="1f4jma487sp5csrvp5z7rx7k78kj8d4rkw7i3ql764rmm0pbk1h8"; depends=[Rsolnp nleqslv quantreg]; };
 alphahull = derive { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 tripack sgeostat spatstat splancs]; };
 alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; };
 alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
@@ -2346,7 +2384,7 @@ anominate = derive { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6ba
 antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[MASS evd BB numDeriv ggplot2]; };
 aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
 aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[lme4 boot]; };
-aoos = derive { name="aoos"; version="0.1.0"; sha256="06jnkw8sw77rjag8sqbbp2g60p8vvc3vxl4l4gxzldk400wlkcnq"; depends=[]; };
+aoos = derive { name="aoos"; version="0.2.0"; sha256="0dnhbynkc02mi1a5xsl992dqks44k57z9a05q7k2s25953bqfqq3"; depends=[]; };
 aoristic = derive { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML MASS sp maptools RColorBrewer]; };
 apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
 apc = derive { name="apc"; version="1.1"; sha256="0gnjniy7gm5fh4wn7vwml3z5bw6ydd1xxq5npvqljbzy4vhh8k5a"; depends=[]; };
@@ -2359,13 +2397,13 @@ apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nq
 appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
 apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
 approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
-aprean3 = derive { name="aprean3"; version="1.0"; sha256="1ar83xnd9wwn5avz37qzwz5wsknrf5q3fb2a4w98g3nm0qy8yxhd"; depends=[]; };
+aprean3 = derive { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
 aprof = derive { name="aprof"; version="0.2.4"; sha256="0gw5qj6c5ygjc6nwx2lb8biykkk73fv2x3j1xxabpgnsfq1whwyc"; depends=[]; };
-apsimr = derive { name="apsimr"; version="0.1"; sha256="03j1g16drch5xkxb86czxmihs9a96f0v2kxjp73k7vig9md625dy"; depends=[ggplot2 XML lubridate reshape2]; };
+apsimr = derive { name="apsimr"; version="1.0"; sha256="1lk8n0vb20sxs02s6xx16d2xrh09p08b6i50b99bx9k7dhlgn6cf"; depends=[ggplot2 XML lubridate reshape2 MASS mgcv]; };
 apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
 apt = derive { name="apt"; version="2.3"; sha256="0yrgxdqzwa5zv6rv8d8nnlraxngq60i1f0yrkygwsj4kngv2yhyv"; depends=[erer gWidgets car urca copula]; };
 aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
-aqp = derive { name="aqp"; version="1.8"; sha256="12z8lsnjwjrnxj5a79can2r2h9sdmp39jfnx9kxn8zwm9klzl3jg"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS]; };
+aqp = derive { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2qmw4qqh40ywahq3dchpbxmlzd"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS digest]; };
 aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; };
 archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; };
 archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
@@ -2388,6 +2426,7 @@ arules = derive { name="arules"; version="1.1-6"; sha256="0xq0j4phwqw9cx2yzxx8xx
 arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; };
 arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; };
 arulesViz = derive { name="arulesViz"; version="1.0-0"; sha256="0g4bqfn8jya992r2wbi044v68mj508h52snrdcd5ijhdhw8xq9xc"; depends=[arules scatterplot3d vcd seriation igraph]; };
+asVPC = derive { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; };
 asbio = derive { name="asbio"; version="1.1-5"; sha256="1br9rhj6nghwx54i2hpjrsdhwg8v38s66cy8fc4pg97zypdnikpj"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice multcompView]; };
 ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
 ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; };
@@ -2452,7 +2491,7 @@ bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm
 bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[survival coda smoothSurv]; };
 bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[mvtnorm MASS coda wpp2012]; };
 bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; };
-bayescount = derive { name="bayescount"; version="0.9.99-4"; sha256="1ylz7wwc3kdff9b7gs8k36i90bc7pa8z207mhnxn0qzjv1qwjq6r"; depends=[runjags rjags coda]; };
+bayescount = derive { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[runjags rjags coda]; };
 bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; };
 bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[rjags coda]; };
 bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
@@ -2482,7 +2521,7 @@ beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli
 beanplot = derive { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
 bear = derive { name="bear"; version="2.6.4"; sha256="1v5rcb7aqzc7zjbbwwcy02z79crxq90mxs32k2gfvf7jzky09hpy"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; };
 beepr = derive { name="beepr"; version="1.1"; sha256="187gww50yc8hzrzwz6j9ib101196g6ci9fx3dqyhg764ydn8if1n"; depends=[stringr audio]; };
-beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8vmcprss5ivgb0dlyly07jywj3vrf2z81yhy"; depends=[]; };
+beeswarm = derive { name="beeswarm"; version="0.2.0"; sha256="05yhddljmls35xdffp7iikgwh3jh5s4b7w5d2gw89w7l8hr62ypz"; depends=[]; };
 benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
 benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; };
 benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; };
@@ -2547,9 +2586,10 @@ biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw
 biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; };
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
 biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; };
+biorxivr = derive { name="biorxivr"; version="0.1.0"; sha256="0277kand29vsxczjg1wnlvx494w67x6pd1ybg735ni62is567adg"; depends=[XML]; };
 bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; };
 biosignalEMG = derive { name="biosignalEMG"; version="1.0.2"; sha256="0ywb59w3rgac59gif1jba8qi7rjdsdj7y5czj7kv8lf01vd5dl3l"; depends=[]; };
-biotools = derive { name="biotools"; version="2.0"; sha256="02yw5pfj9858j02yi30bvll5pp67dpkzx3y5ka5bwwz7a5g7dvx3"; depends=[rpanel tkrplot MASS boot]; };
+biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[rpanel tkrplot MASS boot]; };
 bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[vegan sna fields igraph MASS permute]; };
 biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; };
 birdring = derive { name="birdring"; version="1.2"; sha256="1jhhvdipsx3kw8n6gw6amm1vq0m83l48dkark9vvi2hpd730ca1y"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
@@ -2560,7 +2600,7 @@ bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xw
 bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; };
 bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
 bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
-biwavelet = derive { name="biwavelet"; version="0.17.5"; sha256="01zhpwq1a3g1pjwbjqh3p1q9jhqqngrxcs9vp4r2zrj3rn9d5x38"; depends=[fields]; };
+biwavelet = derive { name="biwavelet"; version="0.17.10"; sha256="0rvlpqfrgajaw5bifc3103ixj2akdhpcxqhgw9fv0r1c5kv98qz0"; depends=[fields]; };
 biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; };
 bizdays = derive { name="bizdays"; version="0.2.2"; sha256="1n2bh7vy0fhxq20s4lnbhgig1012di34kfl61i0ap7pc6464kg8d"; depends=[]; };
 blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
@@ -2573,9 +2613,9 @@ blockTools = derive { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs
 blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp Rcpp RcppEigen]; };
 blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
 blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
-blockmodels = derive { name="blockmodels"; version="1.0.4"; sha256="0xnnb1knz2x702aqcdxynskp1b85b4x6ik0r2g2jry569clhvxl0"; depends=[Rcpp digest Rcpp RcppArmadillo]; };
+blockmodels = derive { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[Rcpp digest Rcpp RcppArmadillo]; };
 blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
-blocksdesign = derive { name="blocksdesign"; version="1.5"; sha256="06i8yphfp5g5bhs6s0gl0mb51vdk8idqifv18bkaqlh9qvbrd6rd"; depends=[crossdes]; };
+blocksdesign = derive { name="blocksdesign"; version="1.6"; sha256="1d188c1lyf5zvdffcw3w7imzjxxmr7nmr29zj9z1b64p1ddrryh4"; depends=[crossdes]; };
 blowtorch = derive { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[ggplot2 foreach iterators]; };
 blsAPI = derive { name="blsAPI"; version="0.1.1"; sha256="1d9mzhhr9yrx1kca6mzrq3gqqismv2q5wf1zx76srqvpaja2wszq"; depends=[rjson RCurl]; };
 bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
@@ -2584,12 +2624,12 @@ bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834l
 bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
 bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
 bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[lpSolve LowRankQP]; };
-bnlearn = derive { name="bnlearn"; version="3.7.1"; sha256="0wfly2c3il48c31jz3fvmhz285z4kapw6v0k993608gjli0sg86m"; depends=[]; };
+bnlearn = derive { name="bnlearn"; version="3.8"; sha256="1jy47sy8pqjwjykdrcfrrdjzrgwgvmzpjxcnh73pgaa2scm9lpk6"; depends=[]; };
 bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
 bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
 boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; };
-boilerpipeR = derive { name="boilerpipeR"; version="1.2.2"; sha256="0hcjlinzq2778zhwvsdyif099w8qjz5yidvpsyhphk4r6jyk4k2w"; depends=[rJava]; };
-bold = derive { name="bold"; version="0.2.0"; sha256="06dnhhf2bmiqxizarsqd6l2dcsldz4135srqa7yz90flsl9ihzwx"; depends=[XML httr stringr assertthat jsonlite reshape plyr]; };
+boilerpipeR = derive { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
+bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvdgpkd71h431gizz71ssayanzp67"; depends=[XML httr stringr assertthat jsonlite reshape plyr]; };
 boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; };
 boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
 boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
@@ -2597,7 +2637,7 @@ boot = derive { name="boot"; version="1.3-15"; sha256="0pyznvhbb8237nqab6ylmis73
 bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; };
 bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; };
 bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
-bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag586xliapp1ninz7qxczl8jmxa9sx9z89"; depends=[]; };
+bootSVD = derive { name="bootSVD"; version="0.2"; sha256="1b31gxlbysng5ysa18mzlp3vlc9jhn51hia0z1j9g47wi0r0f274"; depends=[ff]; };
 bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
 bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[ggplot2 IsingFit qgraph dplyr gtools corpcor]; };
 bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; };
@@ -2624,11 +2664,12 @@ brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6y
 brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl XML stringdist]; };
 brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
+brms = derive { name="brms"; version="0.1.0"; sha256="0cx01d65vwsrxlhvxwwlaviz1lvxhl0hd8qw0bna99w8ypsqfp3i"; depends=[ggplot2 Rcpp coda ggmcmc gridExtra]; };
 brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
-broman = derive { name="broman"; version="0.48-2"; sha256="0w3fxs753ds2d4vzz7mck3cdjh4d1mjbwdbzqkb2rxdx5l4w2jp8"; depends=[assertthat]; };
-broom = derive { name="broom"; version="0.3.6"; sha256="0z3np7g9yidsyj58y5mnxqzcn6n841pfmxhwbiy2d6sm5i463lmh"; depends=[plyr dplyr tidyr psych stringr]; };
+broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat RPushbullet jsonlite ggplot2]; };
+broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[plyr dplyr tidyr psych stringr]; };
 bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; };
-bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; };
+bspec = derive { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
 bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
 bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[rpart gbm]; };
 bsts = derive { name="bsts"; version="0.6.1"; sha256="0hs2inbwwpafpcr6y51qnmxms121z8cy8mil6acjfhrfc27f1msd"; depends=[BoomSpikeSlab zoo xts Boom Boom BH]; };
@@ -2654,17 +2695,17 @@ calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1
 calmate = derive { name="calmate"; version="0.12.0"; sha256="1jd1ag1v10bpgkqpf5134av0yc7xph1679q40y541kyr59df0lxw"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; };
 camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; };
 cancerTiming = derive { name="cancerTiming"; version="3.0.0"; sha256="1sc5mz2gnrzvkc9kfnspq9vddk48a0a99yyywkwy1vvj0q2dgmyn"; depends=[LearnBayes gplots]; };
-candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; };
+candisc = derive { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylmzraa6q3ys9m0r1cn21dm8rzzjxid9g3g"; depends=[car heplots]; };
 cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd qpcR Matrix igraph fdrtool shape]; };
 caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
-capm = derive { name="capm"; version="0.7.0"; sha256="00bvrc5km6k9zvlznvqc6gj806fgb3r0x0yrnmxyk21b0acl5g20"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; };
+capm = derive { name="capm"; version="0.8.0"; sha256="1vz17x0v5cjs5kdqkbay08f91kclsx4rcli5vgh9yxlk4ih9w4dd"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; };
 capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; };
 capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
 car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
-carcass = derive { name="carcass"; version="1.3"; sha256="1psxdxdqlc999xylizj5vg1p1pzyrikg9gjqvpv4k0q9b5h0nrpj"; depends=[lme4 survival expm arm MASS]; };
+carcass = derive { name="carcass"; version="1.4"; sha256="16apmiackw194p5n0fivkgd2ymca9bfajasypl82xqyfk6amh088"; depends=[lme4 survival expm arm MASS]; };
 cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot pastecs lattice]; };
 care = derive { name="care"; version="1.1.8"; sha256="0r1j2q23rz54rcx528n53m3hmhvb8ndqjpmmzm6j1y6lmixpqh41"; depends=[corpcor]; };
-caret = derive { name="caret"; version="6.0-41"; sha256="0dwh6j1gvyd34my88kykrpifmnj3slp8q1if5vi428hp1p151cz7"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; };
+caret = derive { name="caret"; version="6.0-47"; sha256="0mpmch0435gcszj5yq4p7jpq7y9q8jk1bz3i1c9ij7a73kq2368i"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; };
 caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools pbapply ggplot2 digest plyr lattice gridExtra]; };
 caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
 caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
@@ -2678,7 +2719,7 @@ catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2
 cati = derive { name="cati"; version="0.96"; sha256="07vvhar1skcmx0sqkp4bcrrlmb88llqpgg4vmdi4nqhw48kjyjqn"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume FD geometry vegan]; };
 catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; };
 catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
-causaleffect = derive { name="causaleffect"; version="1.0"; sha256="1xg0dczqk10nnybm3i9rcnsqr34y86dngb7p6vl1n7bhxrn580jf"; depends=[igraph XML]; };
+causaleffect = derive { name="causaleffect"; version="1.1.1"; sha256="1rsn3zfi24vv1s03ki0aghw4kjls95dr25473fpbmsrmm8n48cqi"; depends=[ggm igraph XML]; };
 causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; };
 cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; };
 ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
@@ -2698,6 +2739,7 @@ cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.4"; sha256="0b
 cec2013 = derive { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; };
 celestial = derive { name="celestial"; version="1.2"; sha256="1bwxr37vkgxavl230jmvk1yp3acnkcpc8im10fsxh1nfxys254ap"; depends=[]; };
 cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; };
+cellranger = derive { name="cellranger"; version="0.1.0"; sha256="1nfvh0bd99q7cili0hj6ifcg8r57fxv5k4634b7vkshy5rbc5fw1"; depends=[]; };
 cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; };
 censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
 censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; };
@@ -2717,8 +2759,8 @@ changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh9
 cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
 chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; };
 checkmate = derive { name="checkmate"; version="1.5.2"; sha256="0sllckm82lxiar3mm3sl4zcf9nhp7x7hfhpz1kiawaxfq7z9436g"; depends=[]; };
-checkpoint = derive { name="checkpoint"; version="0.3.9"; sha256="1qgjma8nbg4gixzj44q4zr24kca1bnznrnksqpjjy58vxi69s61n"; depends=[]; };
-cheddar = derive { name="cheddar"; version="0.1-626"; sha256="16dl267zbqnix739827mvdgchg5xzgz5q14hh8cw2fq089frjlz9"; depends=[]; };
+checkpoint = derive { name="checkpoint"; version="0.3.10"; sha256="147phhsv5g8k23fd355jqjqpjjj8n3s0bblm8mv5c3d0322li7ac"; depends=[]; };
+cheddar = derive { name="cheddar"; version="0.1-629"; sha256="13fmr37jj7dky5jrpr20z1iai9jbnpmwsh2pbzjwvib7561pyd6x"; depends=[]; };
 chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
 chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[rpart class e1071 MASS nnet pcaPP robustbase som lars pls mclust]; };
 chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; };
@@ -2731,7 +2773,7 @@ choiceDes = derive { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffd
 choplump = derive { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
 chopthin = derive { name="chopthin"; version="0.1"; sha256="1xnyd5mvgqksk7c0mf4irrnshkjgih2h19b55yi4finxh6wrn8l4"; depends=[Rcpp Rcpp]; };
 chords = derive { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; };
-choroplethr = derive { name="choroplethr"; version="3.0.0"; sha256="1fj0gklqcr884l42c78crn6f7s5rk336ywlnqqm5ba7kxjs464k5"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; };
+choroplethr = derive { name="choroplethr"; version="3.1.0"; sha256="0nv47hx8z06xh58a1ff63zncl1776pakxa6dbf1skhc23wfafi86"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; };
 choroplethrAdmin1 = derive { name="choroplethrAdmin1"; version="1.0.0"; sha256="1pnj5155h809sh9mp703y72348mi7mxnwid07kp1s489512ysfwr"; depends=[ggplot2]; };
 choroplethrMaps = derive { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; };
 chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[dplyr httr data_table]; };
@@ -2779,6 +2821,7 @@ clusterSEs = derive { name="clusterSEs"; version="1.2"; sha256="0ykfwvibps20w62x
 clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; };
 clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; };
 clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
+clustering_sc_dp = derive { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; };
 clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; };
 clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; };
 clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
@@ -2790,7 +2833,7 @@ cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl
 cmprskQR = derive { name="cmprskQR"; version="0.9.0"; sha256="1vnrfhlmmyamkpd8lsfznfpcq0mspkiwn3j23yj4sarfx5n32s9a"; depends=[survival quantreg]; };
 cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; };
 cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[emulator elliptic]; };
-cna = derive { name="cna"; version="1.0-2"; sha256="06q335jr4kdydk79s8f1fg67wflhcb5ngl6gk1fqb096zkmhszxf"; depends=[]; };
+cna = derive { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; };
 cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="0iwsaqqnh142syag91rzwwsc9n2qiw4xh5x1gjsgc74ywdm4g5fz"; depends=[rgl tcltk2 tkrplot]; };
 coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
 coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
@@ -2829,7 +2872,7 @@ compareGroups = derive { name="compareGroups"; version="3.0"; sha256="0dgh72virr
 compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
 comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
 compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; };
-compendiumdb = derive { name="compendiumdb"; version="0.1.0"; sha256="1dvgkbrsj2fw3mr454mfqhjcz0lbhvz848hgj1ld76p10zhs2vyk"; depends=[RMySQL]; };
+compendiumdb = derive { name="compendiumdb"; version="1.0.0"; sha256="14dpfyknb4rnig3k2k7684ly45mwx8b22q8bffbiqx1ah827nrna"; depends=[RMySQL]; };
 complmrob = derive { name="complmrob"; version="0.5.8"; sha256="0hhn6w8kvwzs2qflqf8qiqac0n93pi4rkbh8idbcfn8shkhnjzjs"; depends=[robustbase ggplot2 boot scales]; };
 compoisson = derive { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
 compositions = derive { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[tensorA robustbase energy bayesm]; };
@@ -2845,10 +2888,10 @@ coneproj = derive { name="coneproj"; version="1.5"; sha256="1xk6v5hp5v5hcxnl8fhb
 conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
 confidence = derive { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[knitr markdown plyr xtable ggplot2]; };
 conformal = derive { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret ggplot2 randomForest e1071]; };
-confreq = derive { name="confreq"; version="1.3"; sha256="0dxd7zdcrgj95f4x19izysqjixgpwi1xx752bwdc28d7h1ds2ym5"; depends=[gmp]; };
+confreq = derive { name="confreq"; version="1.3-1"; sha256="1d4ianimksnfwkld7cg9mkhbpwiaqy5bcilwfy45dwby5bai6cjx"; depends=[gmp]; };
 conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
 conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
-constrainedKriging = derive { name="constrainedKriging"; version="0.2.3"; sha256="1hppfc0pv0jphmj7pip1cn65sfrcwvnpymlvpyp7sbn3nmy2qqrb"; depends=[sp spatialCovariance rgeos RandomFields]; };
+constrainedKriging = derive { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[sp spatialCovariance rgeos RandomFields]; };
 contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; };
 conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[mvtnorm BMS gtools tseries coda]; };
 contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
@@ -2883,7 +2926,7 @@ covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhx
 covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; };
 covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; };
 covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
-coxinterval = derive { name="coxinterval"; version="1.0"; sha256="0x6xnc5wf5sivwn0hd99lmb52wj5swj01r9wrky9f61nji3fjv4v"; depends=[Matrix survival timereg]; };
+coxinterval = derive { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[survival timereg Matrix]; };
 coxme = derive { name="coxme"; version="2.2-4"; sha256="186867w9lcx6il2nfa79g4fbljhak2imjn7hcwczmwz7k7sfa4nk"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; };
 coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; };
 coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; };
@@ -2899,12 +2942,14 @@ cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m
 crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; };
 cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
 crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; };
+cranlogs = derive { name="cranlogs"; version="2.0.0"; sha256="13c8sa3s1xvb5naj4cy7d5azcbf716l0gp4x086sqd5dg1hqdy8b"; depends=[httr jsonlite]; };
 crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
 crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; };
 crayon = derive { name="crayon"; version="1.2.0"; sha256="1qgc1bakj5hp4fwmm2m6bzqf0mi84v6zcvw04dgck3lk00dxd0k9"; depends=[memoise]; };
 crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
 crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; };
 crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
+crimelinkage = derive { name="crimelinkage"; version="0.0.3"; sha256="018ni9jgnm4k8vybz99drsx8phb0ar3x0raa5ydkfpgqp525sayi"; depends=[igraph geosphere]; };
 crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[]; };
 crn = derive { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
 crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
@@ -2916,12 +2961,12 @@ crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
 crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
 crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
-crunch = derive { name="crunch"; version="1.0.2"; sha256="0rfiqsd7hn3yngavw484dbzw0sg91dc0q4wp7v4gll7y5n2xf2b4"; depends=[httr RJSONIO RCurl]; };
+crunch = derive { name="crunch"; version="1.1.1"; sha256="0a1nja6nnhga4f9kq4wy330pdrl8mj9c2mr75fdqkqgdll7dd96j"; depends=[httr jsonlite RCurl]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
 cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; };
 cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; };
-csn = derive { name="csn"; version="1.1.1"; sha256="0ns92jqbsc7hnwwkph47mi8z53mj5ygrpys75l9n4d0qmdgpw0nn"; depends=[mnormt]; };
+csn = derive { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; };
 csrplus = derive { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
 cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
 csvread = derive { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
@@ -2952,9 +2997,9 @@ cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bf
 cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
 cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
 d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
-dae = derive { name="dae"; version="2.4-0"; sha256="1gf3x751if3g2p7yy8jsvpn612w36mjhkz8qkh0y0kajm0nipzkb"; depends=[ggplot2]; };
+dae = derive { name="dae"; version="2.7-0"; sha256="1pfd3zyvs29ij8xa1ngz2din4srl45rjnjc576h1mz16l7h5kx53"; depends=[ggplot2]; };
 daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; };
-daff = derive { name="daff"; version="0.1.2"; sha256="17ixi2yvh6wxwnhzbg8xsjmxbakh7lyazin5a93q33160vvsiday"; depends=[V8 jsonlite]; };
+daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[V8 jsonlite]; };
 dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
 dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
 dagbag = derive { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; };
@@ -2965,8 +3010,8 @@ dashboard = derive { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q
 data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; };
 data_tree = derive { name="data.tree"; version="0.1.6"; sha256="09pk4c5jkj69m6sxa2pbs1wh1w4rsg799w72fx9ib4jv22hjvrhc"; depends=[R6]; };
 dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
-dataRetrieval = derive { name="dataRetrieval"; version="2.2.0"; sha256="17vjmyrp0mymh9ns2afzphkc95a70sp8h3gqlq64g56n2jcsi35w"; depends=[XML RCurl reshape2 lubridate plyr]; };
-datacheck = derive { name="datacheck"; version="1.0.4"; sha256="1ns5cmsvmqswzpa33mqcmj92b4j3l32v29ki3crg0kayrpdmyrbw"; depends=[Hmisc shiny stringr]; };
+dataRetrieval = derive { name="dataRetrieval"; version="2.2.1"; sha256="1mq32blqdsc1zj3l7wbxdc9asl2nkrby5kijdk0rix574cxml9qm"; depends=[XML RCurl reshape2 lubridate plyr]; };
+datacheck = derive { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[stringr Hmisc shiny]; };
 dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; };
 datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; };
 datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
@@ -2986,12 +3031,13 @@ dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8clj
 dbmss = derive { name="dbmss"; version="2.2.0"; sha256="0ngf7l7nsp03jvspa7xfhal2ccaxcvjny5sd5aypfwfgrndrd71z"; depends=[spatstat Rcpp cubature Rcpp]; };
 dbstats = derive { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; };
 dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[Matrix igraph dnet]; };
-dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; };
+dcemriS4 = derive { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
 dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; };
 dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; };
 dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
 dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
 ddalpha = derive { name="ddalpha"; version="1.1.0"; sha256="0kij4s24v4zchlfk4za5373ispapd1yzkp9ld2bwv4w562amnl5w"; depends=[MASS class robustbase Rcpp BH Rcpp]; };
+ddeploy = derive { name="ddeploy"; version="1.0.2"; sha256="115k379l39gzddvn0l45l0sr0wyd7r486i28qs2hfyjnk1288vrs"; depends=[httr jsonlite]; };
 ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; };
 deSolve = derive { name="deSolve"; version="1.11"; sha256="014fbrgzlarg2w27kq9qy7631hvhlf7ldrn5g8x2xibb260832s1"; depends=[]; };
 deTestSet = derive { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vakiks04rz7hgv9b5j6s77acavd5s5mpi51ysh7"; depends=[deSolve]; };
@@ -3005,7 +3051,7 @@ decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9j
 deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; };
 deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
 degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
-degreenet = derive { name="degreenet"; version="1.3"; sha256="06f22n8wz7i1w9qm6zxvspwnmcgaynlhf8m5qpmwzjqs823qf2qd"; depends=[igraph network]; };
+degreenet = derive { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; };
 deldir = derive { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; };
 deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; };
 demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; };
@@ -3020,13 +3066,13 @@ denovolyzeR = derive { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cv
 denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; };
 densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; };
 denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
-depend_truncation = derive { name="depend.truncation"; version="2.2"; sha256="0frszpsnhf5ci471h6izsp0qan87li8spvpdvr47kklg3qxq0py2"; depends=[mvtnorm]; };
+depend_truncation = derive { name="depend.truncation"; version="2.3"; sha256="1n0v5cwmgpdyapr185s9przdsrxwaqf32038zm1na0yna8qmj8wl"; depends=[mvtnorm]; };
 depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; };
 depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; };
 depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; };
 depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
 descomponer = derive { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; };
-descr = derive { name="descr"; version="1.1"; sha256="0qqhzwnklz97gqklscr5j299g56f7wdzkhigxd7bgm0l1mwq44hc"; depends=[xtable]; };
+descr = derive { name="descr"; version="1.1.1"; sha256="1flnz05j390izwadsv2l5bcxgl6zmq4vzz1aycfifjz75zyqqy8s"; depends=[xtable]; };
 deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[lattice FitAR]; };
 designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
 desirability = derive { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; };
@@ -3034,13 +3080,14 @@ desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af
 detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; };
 detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
 devEMF = derive { name="devEMF"; version="2.0"; sha256="19wraakvf7xsf1i108dz3ipl1hdixgwa6h0bizxfyajw5yqmw8mw"; depends=[]; };
-devtools = derive { name="devtools"; version="1.7.0"; sha256="0d1hic61niw4fkjw9jnzslc25jcvprjn8mn6wapfpxpkm63499ff"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite roxygen2]; };
+devtools = derive { name="devtools"; version="1.8.0"; sha256="14q1c6jfnvljn50ccl2irfq8awa03z8fni3n5fdsdv4l9cdwj29p"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite roxygen2 rversions git2r]; };
 df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
-dfcomb = derive { name="dfcomb"; version="2.0-2"; sha256="0a3larpfm9v195kmiv17njv8l4qnmlxav9rcg9pxvlhbni5pv3dw"; depends=[RcppArmadillo BH RcppProgress Rcpp]; };
+dfcomb = derive { name="dfcomb"; version="2.1-3"; sha256="0mjvk0yc229x80z97dmnmbph9lpgfxpqagwdf57369mkwzms5kx2"; depends=[RcppArmadillo BH RcppProgress Rcpp]; };
 dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; };
 dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
-dfmta = derive { name="dfmta"; version="1.1-2"; sha256="147d3qakv2mpcr1rl4pshmw6kg1xah46j45crz1fr2iigy9ail14"; depends=[RcppArmadillo BH RcppProgress Rcpp]; };
+dfmta = derive { name="dfmta"; version="1.3-2"; sha256="1x3hz6by82mjcs8y6h7n380wr884dlx2pjpfsbz84zrk78hhnh5g"; depends=[RcppArmadillo BH RcppProgress Rcpp]; };
 dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; };
+dga = derive { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
 dglars = derive { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; };
 dglm = derive { name="dglm"; version="1.8.1"; sha256="12q49nf30ji4c7vysf2s48bif7crwlmqn8cx0wy23xlhj5x2p4b3"; depends=[statmod]; };
 dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[MASS abind]; };
@@ -3052,7 +3099,7 @@ dice = derive { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfql
 dichromat = derive { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
 dicionariosIBGE = derive { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
 dielectric = derive { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
-difR = derive { name="difR"; version="4.5"; sha256="0qlaqpywyjggw74h5y5r2aivcyknc6b7l8b1p69g3lyx4d2hz8wp"; depends=[lme4 ltm]; };
+difR = derive { name="difR"; version="4.6"; sha256="1803j0ql1g8gdy9i0wy4sz9sbl52dqjqcwbnknyrb34r51jmij5k"; depends=[lme4 ltm]; };
 diffEq = derive { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[deSolve rootSolve bvpSolve ReacTran deTestSet shape]; };
 diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; };
 diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; };
@@ -3067,10 +3114,11 @@ diptest = derive { name="diptest"; version="0.75-6"; sha256="158azvdf76h5mp26lw2
 directPA = derive { name="directPA"; version="1.1"; sha256="0sri3981vk997qjl3c3zchn3vx0h3pdbnagcvds4bnrpycvn4bz8"; depends=[rgl calibrate]; };
 directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; };
 dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
+discSurv = derive { name="discSurv"; version="1.0.0"; sha256="0yq0vpdg6n21ar2r3jbgv2kxy7jn6gssyrrs6vfw4rk1q0bw6b2w"; depends=[functional Matrix matrixcalc mvtnorm numDeriv caret mgcv]; };
 disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
 disclapmix = derive { name="disclapmix"; version="1.6"; sha256="0g1yg4n4pfy0295faw2scfh45m978ymmlx9bl3h8849kfaizkysi"; depends=[Rcpp disclap cluster Rcpp]; };
 discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
-discreteRV = derive { name="discreteRV"; version="1.2"; sha256="04brc3yg5vqiprkjfmw1kdd4j8dk7557an7zkqwas5n891np8d3m"; depends=[plyr MASS]; };
+discreteRV = derive { name="discreteRV"; version="1.2.1"; sha256="06gvfn5v54gbal7kpnfcxwaacbq8354yvc47kjipn29bqpw9b6mb"; depends=[plyr MASS]; };
 discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
 discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
 diseasemapping = derive { name="diseasemapping"; version="1.2.0"; sha256="1l6w1f4zxfp1hrhvmxgijj2kwy7x0na2yf75ifqrbh1i499j8zjq"; depends=[sp]; };
@@ -3107,7 +3155,7 @@ dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0
 dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
 dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; };
 dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a6cqfky3z4s5zc87q6y1z5g2s"; depends=[MASS mnormt]; };
-dmm = derive { name="dmm"; version="1.5-1"; sha256="0rblwhlr0gms7zlxgfc6wajf9mphzk2xlg9dk1agd5pdnffljxb9"; depends=[MASS Matrix nadiv robustbase pls]; };
+dmm = derive { name="dmm"; version="1.6-1"; sha256="0bls3ka8fwnsd0v74ncy8nbgxk0a3z1gw9dgm3vibz1lsypfs72a"; depends=[MASS Matrix nadiv robustbase pls]; };
 dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; };
 dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
 dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[igraph Matrix]; };
@@ -3118,7 +3166,7 @@ doParallel = derive { name="doParallel"; version="1.0.8"; sha256="1z6cwqnjvqsbck
 doRNG = derive { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach rngtools iterators pkgmaker]; };
 doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[rredis foreach iterators]; };
 doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; };
-docopt = derive { name="docopt"; version="0.4.2"; sha256="0x2n79iw1818qsmdvyjyglaa8jzp91nahrijd9aijdqxdhb1mp8r"; depends=[stringr]; };
+docopt = derive { name="docopt"; version="0.4.3.3"; sha256="1vpq5q3kfgwijrgblvfipxqkw0m75rahnlmddpiyfgziyszbmidm"; depends=[stringr]; };
 documair = derive { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
 domino = derive { name="domino"; version="0.2-6"; sha256="0xbp9gb38gxfdxfbzm792g4fnjsfp2ncncm8cmyra5wja6qwcwl8"; depends=[]; };
 dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; };
@@ -3137,7 +3185,7 @@ drat = derive { name="drat"; version="0.0.3"; sha256="1dxgicvjdkhiwkyadxwb6lfvvi
 drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
 drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[MASS car gtools multcomp plotrix scales]; };
 drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; };
-drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; };
+drgee = derive { name="drgee"; version="1.1.1"; sha256="0fb5k26c76d5hh09z97mhzx02fr52y2wixgxfgndbp48w826iqpc"; depends=[nleqslv survival]; };
 drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
 drmdel = derive { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
 dropR = derive { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
@@ -3153,15 +3201,16 @@ dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9di
 dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; };
 dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; };
 dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
-dummy = derive { name="dummy"; version="0.1.2"; sha256="1rvq6fp9blhgy42bj7ynbf69j1x9yl2w4b7hlmhawdkr6qzk1iap"; depends=[]; };
-dunn_test = derive { name="dunn.test"; version="1.2.3"; sha256="1p9bmjq3rj674mss1ml2m94nzfrqpg95cb2l6vfrcldc5zja0z7l"; depends=[]; };
+dummy = derive { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
+dunn_test = derive { name="dunn.test"; version="1.2.4"; sha256="01z9rxhp9mli9b21in9gvrjiyxlkx5imspfangg2qvkyrb8jl9i5"; depends=[]; };
 dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
 dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
 dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; };
 dygraphs = derive { name="dygraphs"; version="0.4.3"; sha256="1pg23lsmjg46nlb17r4shmr6aal3c3pqzkcznfadcc6cgm0afqp2"; depends=[magrittr htmlwidgets zoo xts]; };
 dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; };
-dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.2"; sha256="1lcd164lxrrmzxr3rp3xwvwsnpa7am6c916vrbwy74ccg2bpbv7m"; depends=[tcltk2 tkrplot]; };
+dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.3"; sha256="1wgxxn0nlmza7npvjbkfq6nmp30n719yqrav6jzxcp00dk3ymg6g"; depends=[tcltk2 tkrplot]; };
 dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
+dynRB = derive { name="dynRB"; version="0.1"; sha256="16klhc3lrz9jnpd2br4niqsxzcbqri5y8qr2pr1fnqm64dvhnc8x"; depends=[]; };
 dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; };
 dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
 dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; };
@@ -3171,14 +3220,15 @@ dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4
 dynsim = derive { name="dynsim"; version="1.0"; sha256="0w4brs8kcps6gkamkic57nj61iz7zdxq972jwzs17i43wfcrw32c"; depends=[ggplot2 gridExtra MASS]; };
 dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[survival reshape plyr nleqslv ggplot2 BH]; };
 e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; };
-eHOF = derive { name="eHOF"; version="1.5.7"; sha256="05xvhnq0c8ddpq4x7mncspwy2lh54pl76yz6y38ibw5p8c0gazbs"; depends=[mgcv lattice]; };
+eHOF = derive { name="eHOF"; version="1.5.8"; sha256="19zs0krz13m7rbiw72clnhh1rbb6qgzp85ndchqbparw7f9yji1s"; depends=[mgcv lattice]; };
 eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[MASS Matrix lattice]; };
 eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; };
 eaf = derive { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
 earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; };
-earth = derive { name="earth"; version="4.2.0"; sha256="11fkjl8bvzsalrwc0v6vmk2xkzd1np7z2frygckpy5kyr9zs9l5l"; depends=[plotmo plotrix]; };
+earth = derive { name="earth"; version="4.3.0"; sha256="1i52gm0ib1n6ffamb29np88b665l8vdigv482kvzh545kxc1z0jh"; depends=[plotmo]; };
 easyanova = derive { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
 easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
+ebGenotyping = derive { name="ebGenotyping"; version="1.0"; sha256="07dpvxl9xspkzvzkywclg8whgcw7vyakls38pshfypjpyd6iv8ga"; depends=[]; };
 ebSNP = derive { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
 eba = derive { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; };
 ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
@@ -3205,19 +3255,19 @@ eegkit = derive { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96
 eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
 eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; };
 effects = derive { name="effects"; version="3.0-3"; sha256="10v99rv18jl10q0zhd4rvkx7dgab3b8w46jv1npqk9lx172iaf1y"; depends=[pbkrtest lme4 nnet lattice colorspace]; };
-effsize = derive { name="effsize"; version="0.5.2"; sha256="0xhrq1a7vjcbipvmslmkw4widnp0scfcir80sr5npcx5pvxagsq3"; depends=[]; };
+effsize = derive { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; };
 ega = derive { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; };
 egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[zoo xts TTR ggplot2 tseries MASS urca fArma]; };
 eggCounts = derive { name="eggCounts"; version="0.4-1"; sha256="16prkcmpfjl1lab8m9hm0sfbdlh94ds3wi6ra9n2wnrpdn32fl20"; depends=[actuar boot coda]; };
 egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
-eha = derive { name="eha"; version="2.4-2"; sha256="0n3j9zl4xs5pc87j01symnj4yz523fng1gysrj8pz4wra4zlg83m"; depends=[survival]; };
+eha = derive { name="eha"; version="2.4-3"; sha256="1dfilgw9m4m78ny3fd89nl8f9c9y5z5bnj912hpbfff3v5yfm3iq"; depends=[survival]; };
 eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; };
 eigeninv = derive { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
 eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; };
 eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
 eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp Rcpp]; };
 eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[gtools coda lattice]; };
-elastic = derive { name="elastic"; version="0.3.0"; sha256="1lr2g7badfmmxdpv9z3gzjnd99di2nn0c2mhmrvjdclwzv4pk83c"; depends=[httr jsonlite]; };
+elastic = derive { name="elastic"; version="0.4.0"; sha256="03cj0vljad4bkz7zmlp7cr6y734pddngmlzwa1h4ja1nr8nv8xf4"; depends=[httr RCurl jsonlite]; };
 elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
 elec = derive { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
 elec_strat = derive { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
@@ -3228,16 +3278,17 @@ elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3
 elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
 emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp Rcpp RcppArmadillo]; };
 embryogrowth = derive { name="embryogrowth"; version="6.0"; sha256="0l08imqagn2w1q8s4f84bb1zlc17zjkfc5qz1gpmqc7dbw9nvxph"; depends=[deSolve HelpersMG coda polynom]; };
-emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; };
-emdbook = derive { name="emdbook"; version="1.3.7"; sha256="134j9mkf975h1bh4bjg5kl3gjzfii9acj4a20k1c4jnbz5v272a1"; depends=[MASS lattice plyr rgl coda bbmle]; };
+emdatr = derive { name="emdatr"; version="0.3"; sha256="1ccm45al90wa467n19dqs33q2w74in4qnwdrsh94g3d67cw5fsfc"; depends=[RCurl]; };
+emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[MASS lattice plyr rgl coda bbmle]; };
 emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
+emg = derive { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
 emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7aysbwashfs6whnsi7f9dbigw6cd"; depends=[]; };
 emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; };
 emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
 emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
 emov = derive { name="emov"; version="0.1"; sha256="1jzssxk7c26ylfb70p9s631bz63fgvrqc105p7536n0kgxy21f7b"; depends=[]; };
 empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.1"; sha256="12w3ald2ngaj01rm98k445ai3xl3ggr58y27mfxzlsg697yrx83c"; depends=[]; };
-emplik = derive { name="emplik"; version="0.9-9-6"; sha256="0qrrsws9hnb9f2zv50q4v9zx467n6hm83g841h3ba511iwjpp32r"; depends=[quantreg]; };
+emplik = derive { name="emplik"; version="1.0-1"; sha256="1kwgikdnxh52wsmzrzqv7sp8s55w9q40aq9kpfd3zshkflx7w8g1"; depends=[quantreg]; };
 emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
 emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
 enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; };
@@ -3251,7 +3302,7 @@ enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqflj
 enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
 ensembleBMA = derive { name="ensembleBMA"; version="5.1.1"; sha256="1apzfapzycpjhdn4f2cj77rifc9xrxshq35b1j53rb6qqns7ydyz"; depends=[chron]; };
 ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; };
-ensurer = derive { name="ensurer"; version="1.0"; sha256="07bjiq9sk5njksb1dyi5kqx3k4a454x8jy0q5v6n1m5lpyqf0py7"; depends=[]; };
+ensurer = derive { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
 entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; };
 entropy = derive { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
 enviPat = derive { name="enviPat"; version="1.9"; sha256="0xm23gv4ixmsal9rf0cbq0lwvlpagpmapskz3c4d8qzvhr8qrl3b"; depends=[]; };
@@ -3285,24 +3336,24 @@ esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl
 estimability = derive { name="estimability"; version="1.1"; sha256="1inw2ir83bzz40gynwfcjzx7f6v99pqlphq7p3rmql01ikd2b6r9"; depends=[]; };
 estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
 etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; };
-etasFLP = derive { name="etasFLP"; version="1.2.0"; sha256="0h81fm71q8qb2h0gz669cvqpzcd8jwq5yk2b8vwsiv4jlgfiq85g"; depends=[mapdata rgl fields maps]; };
+etasFLP = derive { name="etasFLP"; version="1.2.1"; sha256="1jkkpzvnkf3n3jalqj90brk5n4r4znc521kgx13n45y9j8b6ni50"; depends=[mapdata rgl fields maps]; };
 etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[survival lattice]; };
 eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; };
 eurostat = derive { name="eurostat"; version="1.0.16"; sha256="017ri3vvlp60r9h5b0y4j2adggkrkjbapkjynpl0vg92islspqkz"; depends=[plyr tidyr]; };
-evaluate = derive { name="evaluate"; version="0.6"; sha256="1ma3ry07b9r7rkbsq8fgxnyg4qva6lyfx8vfhgxrnj1nik9qgxy0"; depends=[stringr]; };
+evaluate = derive { name="evaluate"; version="0.7"; sha256="0sh58pysabz1iinl8gp0f2v03fwzawpagbk18jbsnfr2vvc927bk"; depends=[stringr]; };
 evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; };
 evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
 eventInterval = derive { name="eventInterval"; version="1.2"; sha256="15g934n7flkl1g5q8qhxv60iakx8i9ndpx88yiqqr3n38hcnifrs"; depends=[MASS]; };
 events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
 eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; };
 evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
-evmix = derive { name="evmix"; version="2.4"; sha256="0a2mdvv5ckg58f7lc5x63c33pmcaf7drhv3z9xzi0ramgrmx8ahm"; depends=[MASS gsl SparseM]; };
+evmix = derive { name="evmix"; version="2.5"; sha256="0v1raxxxj0qhampaia2q00asprl7ra7vk3s7vvcfpzmg4476vm50"; depends=[MASS gsl SparseM]; };
 evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; };
 evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4lx6jslx96nbhsl9m2c4ra6264bparbgrg34byg9x"; depends=[coda]; };
 evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; };
 evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
 evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
-exCon = derive { name="exCon"; version="0.1-3"; sha256="0z09nwv721ld3dbi7c14rd2pjz96kj9pniljmwy9r41fhz36i4yf"; depends=[jsonlite]; };
+exCon = derive { name="exCon"; version="0.1.5"; sha256="08gq257qp814960ykp16qdk9xpc7ag9mxs1qhnnzlk1v2cnhilaq"; depends=[jsonlite]; };
 exact2x2 = derive { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; };
 exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
 exactRankTests = derive { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; };
@@ -3368,7 +3419,7 @@ fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pkl
 fanc = derive { name="fanc"; version="1.23"; sha256="01bsny14r3i0a0yxbq3c670vh6m17g0lcjiphm6g5427rkn70whq"; depends=[Matrix]; };
 fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; };
 fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; };
-faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; };
+faoutlier = derive { name="faoutlier"; version="0.5"; sha256="1via1gggcj6cpdkyn61fbvlvhl47dwv9hi81x2jlq15lh340ljd4"; depends=[sem mvtnorm lattice lavaan mirt MASS]; };
 far = derive { name="far"; version="0.6-4"; sha256="166lhswdd1shx591wvx8a3lwzjini60mc37rbb3qvm6fxrb6fl55"; depends=[nlme]; };
 faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; };
 farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
@@ -3379,7 +3430,7 @@ fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wj
 fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp Rcpp RcppArmadillo]; };
 fastR = derive { name="fastR"; version="0.8-1"; sha256="08p03i72zn0cbwjsxpnsknk0148dx3pfwkw740x7f52c3jgbb1gi"; depends=[mosaic lattice mosaicData]; };
 fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; };
-fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbqgkfw4l9mw32sg4p5pvcg4v24z1q44pgnwn4y"; depends=[lattice igraph MASS Matrix]; };
+fastclime = derive { name="fastclime"; version="1.2.5"; sha256="12k7bkq4gkkyh8lr2whmi73mzcy7wmfzwgi20kli7r4g39n3a1kv"; depends=[lattice igraph MASS Matrix]; };
 fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; };
 fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; };
 fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; };
@@ -3387,6 +3438,7 @@ fastpseudo = derive { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j
 fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; };
 fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
 fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; };
+fbroc = derive { name="fbroc"; version="0.1.0"; sha256="1zpg796day8qlvah3d4qy8118knxx7vfa3gf50jcsv97b8r15dmz"; depends=[ggplot2 Rcpp Rcpp]; };
 fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; };
 fclust = derive { name="fclust"; version="1.1"; sha256="1nimfgirpcff5dqqx2jqn25ma9j0agffimymrv9x5ivfdncdflbg"; depends=[]; };
 fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; };
@@ -3414,6 +3466,7 @@ fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh
 fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
 fgpt = derive { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
 fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; };
+fheatmap = derive { name="fheatmap"; version="1.0.0"; sha256="0braywpc0zghv1lnwb0c83p8ls2w7b8d2gbvv0p4123rhax5limw"; depends=[RColorBrewer gdata ggplot2 reshape2 gplots]; };
 fields = derive { name="fields"; version="8.2-1"; sha256="1zsi3ngp50f61nn93lh1v895as4lp63znf7bzn2q3hsl6ncaylbc"; depends=[spam maps]; };
 fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; };
 filehash = derive { name="filehash"; version="2.2-2"; sha256="0766wrc42qh7r99bd2zy50vvdnqlz0vkzplskzkm5f4g63qdhjxh"; depends=[]; };
@@ -3426,7 +3479,7 @@ finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqk
 fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; };
 fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
 fishmethods = derive { name="fishmethods"; version="1.7-0"; sha256="0kgfv78f8a460nfvpfrrqfiy3ipbl3775axydal3vm1zf4l6k2z3"; depends=[MASS boot bootstrap]; };
-fishmove = derive { name="fishmove"; version="0.3-1"; sha256="1k0kl68j8n1bw72ywgjwxjy20ccjclfkzblqb8rq063a8pyp91nn"; depends=[ggplot2 plyr MASS boot]; };
+fishmove = derive { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[ggplot2 plyr MASS boot]; };
 fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; };
 fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; };
 fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
@@ -3457,12 +3510,12 @@ foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28
 forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; };
 foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
 forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; };
-forecast = derive { name="forecast"; version="5.9"; sha256="0x77jdr0qsb3mn9gwzm6gbbhnnn9yhsd1b1hsldj9lpf5ykzf4qc"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
+forecast = derive { name="forecast"; version="6.0"; sha256="13pim2jz14jy9czjjaliv8x86iqcdaglzvdl9dz3xjj47c5nhhac"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
 foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; };
 forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; };
 forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
 forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; };
-formatR = derive { name="formatR"; version="1.1"; sha256="0pds6s4byykrlzm5fgkjky4nfj1y7dxci84pyjbav8w468vxbh73"; depends=[]; };
+formatR = derive { name="formatR"; version="1.2"; sha256="0dlj728qdm7wmxcxvw1ip64pl4ajgmi8ax69zafrn3306pg9y136"; depends=[]; };
 formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; };
 fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
 forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
@@ -3474,6 +3527,7 @@ fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh7
 fpp = derive { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[forecast fma expsmooth lmtest tseries]; };
 fptdApprox = derive { name="fptdApprox"; version="2.0"; sha256="152bajs76wrapp0zdbkckff6kdkkm6sqqlqd2w220hsi96l2p9dh"; depends=[]; };
 fracdiff = derive { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
+fracprolif = derive { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; };
 fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[splus2R ifultools sapa wmtsa scatterplot3d]; };
 fractaldim = derive { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; };
 fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger timeDate quantmod]; };
@@ -3493,7 +3547,7 @@ frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3
 frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; };
 frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
 frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
-fscaret = derive { name="fscaret"; version="0.9.3"; sha256="0jfksc0m2jjgik2zbrmhjb8ngr5s58nxqrx68wd59vpnxixn0fv4"; depends=[caret gsubfn hmeasure]; };
+fscaret = derive { name="fscaret"; version="0.9.4"; sha256="0cna1cixq021lka7c8jgfqr6h8vvyvylckkbfay10ng7cxpqa44c"; depends=[caret gsubfn hmeasure]; };
 fsia = derive { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; };
 fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40kfjnf108nmkrwndvwl864i99w"; depends=[stringr oro_nifti matrixStats]; };
 fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
@@ -3509,7 +3563,7 @@ functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9
 funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
 funtimes = derive { name="funtimes"; version="1.0"; sha256="0jdl09x0fvfz08xyg1yfyhn0lgg8ycqbli4ag9js0yva8pwab7lh"; depends=[Jmisc]; };
 futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; };
-futile_logger = derive { name="futile.logger"; version="1.4"; sha256="1sn28kmphjxxq1bqyjbsv75bnh71pwngcfar5l18jr8x9ymjq4zk"; depends=[lambda_r futile_options]; };
+futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[lambda_r futile_options]; };
 futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; };
 futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
 futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
@@ -3575,15 +3629,16 @@ gazepath = derive { name="gazepath"; version="1.0"; sha256="00k6617wra9pcvyr94mr
 gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; };
 gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
 gbm = derive { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[survival lattice]; };
+gbm2sas = derive { name="gbm2sas"; version="1.0"; sha256="0khw1nqc4yl2719h3zc70yl26s4lmngfz5iqw00pcv838z8myc0i"; depends=[gbm]; };
 gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; };
 gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; };
 gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
 gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
-gcmr = derive { name="gcmr"; version="0.6.1"; sha256="0a47xpgi6bfsc0nn7vkid1q9r29h01q0vjkysaxh1i4zbmxnx5dl"; depends=[nlme sandwich geoR betareg Formula]; };
+gcmr = derive { name="gcmr"; version="0.7.0"; sha256="17wv1qgshakn390719r8zzd8fbbvnkfjhlbcwk2rd2pic05x8msm"; depends=[nlme sandwich geoR betareg Formula car sp]; };
 gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
 gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; };
 gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; };
-gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; };
+gdata = derive { name="gdata"; version="2.16.1"; sha256="14ssq8z45zf1wwgfgxlc33i6hsdhc0b71kfncfclxz5ahxaqdkdm"; depends=[gtools]; };
 gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; };
 gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[raster igraph Matrix sp]; };
 gdm = derive { name="gdm"; version="1.0"; sha256="08wafxvds4sxaxv7mbbkbzilkpfz1xnzdc5jdw3pldvmbgk861vd"; depends=[Rcpp raster reshape2 vegan plyr Rcpp]; };
@@ -3595,7 +3650,7 @@ geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3
 geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; };
 gelnet = derive { name="gelnet"; version="1.0"; sha256="06cyd5g5yxmyqiqjvp02f2k2ha50sk8qjqmmwcfxhaxysk9vbaag"; depends=[]; };
 gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[MASS msm plyr data_table]; };
-gemtc = derive { name="gemtc"; version="0.6-1"; sha256="1da5z1gvad5rgc5cm3w69x58qjqfg7x65z71h91g89f5nvwxkl2c"; depends=[coda igraph meta XML]; };
+gemtc = derive { name="gemtc"; version="0.6-2"; sha256="0bkcbyh71aq3p7w75w78l472gfschfb2qf9wcv7s2vyy6ypbvh2q"; depends=[coda igraph meta XML plyr]; };
 gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; };
 genMOSS = derive { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; };
 genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
@@ -3604,7 +3659,7 @@ genalg = derive { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5
 genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; };
 gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
 gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; };
-genderizeR = derive { name="genderizeR"; version="1.0.0"; sha256="1a4zjbg8v7ig6hglbkvxbsp4q9hyy3zr751vmcsv529ikgiikkji"; depends=[jsonlite stringr tm data_table magrittr RCurl]; };
+genderizeR = derive { name="genderizeR"; version="1.1.0"; sha256="0hdphzmjqlzwk1gnhncidsdqrbc1lra3a4nl992ap9gfk890rvi4"; depends=[stringr httr tm data_table magrittr]; };
 geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
 geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; };
 genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
@@ -3616,14 +3671,15 @@ genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni4
 gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
 geoBayes = derive { name="geoBayes"; version="0.2.150402"; sha256="123b2xds69clkgjvczkdbl673cahmiprrr1cki2alspryy37icar"; depends=[coda sp]; };
 geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp Rcpp RcppArmadillo]; };
-geoR = derive { name="geoR"; version="1.7-4.1"; sha256="19mafynvnpabwm5i6m4ax6d9rrh3fgyg9sslb552v6ry9nfq31h0"; depends=[sp MASS splancs RandomFields]; };
-geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; };
+geoR = derive { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS sp splancs RandomFields]; };
+geoRglm = derive { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; };
 geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi0rncjcf0aydda68wnsrbmqzsgc1f1has2rb1g9p0"; depends=[httr]; };
+geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[sp rgdal rgeos httr maptools jsonlite magrittr V8]; };
 geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
 geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; };
 geomorph = derive { name="geomorph"; version="2.1.4"; sha256="19zf9g0lpkrdl3pkkjryzas42h3ng9q01ap182xxd36vr8p55sd8"; depends=[rgl jpeg ape geiger phytools]; };
 geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
-geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; };
+geophys = derive { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[RPMG RSEIS RFOC GEOmap cluster]; };
 georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; };
 geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; };
 geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; };
@@ -3657,8 +3713,8 @@ ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ij
 giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
 gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
 gimme = derive { name="gimme"; version="0.1-1"; sha256="1snzlwq6d86ygpn778m3inlfqpymp0l05pdlrdkm8ip4wgir0hvs"; depends=[lavaan qgraph]; };
-gistr = derive { name="gistr"; version="0.1.0"; sha256="1izas53whxa4n8gdkifv1a9c8f3fpi21vs81kn2dk51xmhs8qhh2"; depends=[jsonlite httr magrittr knitr]; };
-git2r = derive { name="git2r"; version="0.7"; sha256="02b4p7knrywr1sqijg85mxnm5y4mlp5z3rgylia8vdz473z6prr9"; depends=[]; };
+gistr = derive { name="gistr"; version="0.2.0"; sha256="1812qh3f4nwbpqaiq4gfkalfckwqvn84j7v7qfj69gd4jzxcwywz"; depends=[jsonlite httr magrittr assertthat knitr rmarkdown dplyr]; };
+git2r = derive { name="git2r"; version="0.10.1"; sha256="1damlhxf3ma0flqw4am42wj2dxk3m232wh0wpl1ikgx0dcfn9l8f"; depends=[]; };
 gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; };
 glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf9mg4sklcmqi0gdn8nxm1pkdpb86rba"; depends=[MASS]; };
 glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
@@ -3674,10 +3730,10 @@ glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjij
 glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
 glmgraph = derive { name="glmgraph"; version="1.0.1"; sha256="1jzkz2lri7nbxxkryhf95503wd651ic59h6iafkx9ahwpmibyv4l"; depends=[Rcpp Rcpp RcppArmadillo]; };
 glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
-glmm = derive { name="glmm"; version="1.0.2"; sha256="0qlsqg1sp4p4qy95k52dc7c58lfmlxh0vk0jdpqzpi4rrh7ngpan"; depends=[trust mvtnorm Matrix]; };
+glmm = derive { name="glmm"; version="1.0.3"; sha256="0bs543x9czg8mbgpy0zhgnfll2nrmj8xz5kwkddf3k6hp859h0v8"; depends=[trust mvtnorm Matrix]; };
 glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; };
 glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; };
-glmmLasso = derive { name="glmmLasso"; version="1.3.3"; sha256="122dl5l4ngl9xvyz1kr58hryyxmld0zpwp5437ckwbnkf9bv1ldk"; depends=[minqa]; };
+glmmLasso = derive { name="glmmLasso"; version="1.3.4"; sha256="14x74640vvyrg72pq19gqb8db7wq97xhc30iakh84fdh1llyykpn"; depends=[minqa]; };
 glmmML = derive { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; };
 glmnet = derive { name="glmnet"; version="2.0-2"; sha256="1nfbh1y41ly09lcdb5z02dy8l4qkll21yicmwg25wlkzk5sxb3z3"; depends=[Matrix foreach]; };
 glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; };
@@ -3699,7 +3755,7 @@ gmnl = derive { name="gmnl"; version="1.0"; sha256="1nvk6x5412bfqdg54051hnisbnfm
 gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; };
 gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; };
 gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
-gnm = derive { name="gnm"; version="1.0-7"; sha256="1jnh39i4462ky9vwnrlwq30d8qbp0jg73p8mwm6hnl8sdh53nkr1"; depends=[MASS Matrix nnet qvcalc relimp]; };
+gnm = derive { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; };
 gnmf = derive { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; };
 gnumeric = derive { name="gnumeric"; version="0.7-2"; sha256="14c7a8aiqvqfbrjb1akpfjwidrzdhrw8a07ask083krki6vbi7hh"; depends=[XML]; };
 goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; };
@@ -3715,7 +3771,7 @@ gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3d
 gpclib = derive { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
 gpk = derive { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
 gplm = derive { name="gplm"; version="0.7-2"; sha256="0pr39fbkv61iwd110lq76p2fi4dvx9qz6mjsvg6bpja9pfbb6wc0"; depends=[AER]; };
-gplots = derive { name="gplots"; version="2.16.0"; sha256="19xz8225ckjw0a44mwvfj0gk8m47x2xkgnxjqrxsbjg5qiqwl9nh"; depends=[gtools gdata caTools KernSmooth]; };
+gplots = derive { name="gplots"; version="2.17.0"; sha256="0dyysysl595khv00m4h68s7zx7xlfnpxzfkc49av1s3fc58bvmr5"; depends=[gtools gdata caTools KernSmooth]; };
 gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[isotone plyr ggplot2 foreach]; };
 gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
 gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[Matrix fields]; };
@@ -3728,7 +3784,7 @@ granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5z
 graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w1hhvkqpxya3wr78p2b1irfyivc7njxw8a2595rc347"; depends=[Rcpp Matrix glasso glmnet mvtnorm qgraph Rcpp RcppArmadillo]; };
 graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; };
 graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape sp snowfall rgl]; };
-greport = derive { name="greport"; version="0.5-2"; sha256="0lmska9m29hsz9f4myix6my6mg53awr5abigg642i3i2axv7cjd7"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; };
+greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[Hmisc data_table rms lattice latticeExtra ggplot2 Formula survival]; };
 gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
 gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; };
 gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; };
@@ -3736,7 +3792,7 @@ gridGraphics = derive { name="gridGraphics"; version="0.1-3"; sha256="09ml9vy4lz
 gridGraphviz = derive { name="gridGraphviz"; version="0.1"; sha256="14zcr0w2c9cgdw6ij93w52k3bkmgdmx809snh9jjf2amy08p2gbg"; depends=[]; };
 gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkkiw9glhdljwxlc8kkr1fgkbrwmsi053iwk"; depends=[RJSONIO XML]; };
 grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
-groc = derive { name="groc"; version="1.0.4"; sha256="1v32gwr8ghv47dmzp1x02n3aaqv3cfywh7xzx2486v4p960s42gc"; depends=[rrcov pls mgcv robust robustbase MASS]; };
+groc = derive { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[rrcov pls mgcv robust robustbase MASS]; };
 grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; };
 groupRemMap = derive { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
 grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
@@ -3777,12 +3833,14 @@ gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz
 gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
 gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
 h2o = derive { name="h2o"; version="2.8.4.4"; sha256="03mj2p5wsgdn0jnv1fsrj7012v2am0mvyayj24zp7q56sfsgxigf"; depends=[statmod survival RCurl rjson]; };
+h5 = derive { name="h5"; version="0.9.1"; sha256="1q20i5hnfzr88kb63yvvgn7z39cvk514fj2770i29lm71jdph00q"; depends=[Rcpp Rcpp]; };
 hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
 haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
 hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; };
-hapassoc = derive { name="hapassoc"; version="1.2-7"; sha256="1cyx68fzazyyihhp2r237c6igspnfklswnja2k4z3my528ggbq7k"; depends=[]; };
+hapassoc = derive { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
 haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
 haplo_stats = derive { name="haplo.stats"; version="1.6.11"; sha256="0j3zh4n2rly8dij8srm8ck6fl63haw6d27m3nfnrxywr87pljg14"; depends=[]; };
+haplotypes = derive { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; };
 harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[plyr digest]; };
 hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; };
 hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; };
@@ -3810,11 +3868,11 @@ heatmap3 = derive { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k
 heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; };
 heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; };
 helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
-helsinki = derive { name="helsinki"; version="0.9.24"; sha256="1ljqgwcmvcmir8fq3izym4k8ljakwqpgq94wfhrdxp0q393zb8rq"; depends=[maptools RCurl rjson sp]; };
-heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; };
+helsinki = derive { name="helsinki"; version="0.9.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; };
+heplots = derive { name="heplots"; version="1.0-15"; sha256="0sl5pqc57lhhh8s8hym0l874saq974hms6vsq7ll6g60rifx4lbq"; depends=[car MASS]; };
 hergm = derive { name="hergm"; version="2.2-1"; sha256="0pii3dgpjgh4s5a1cjj0nyw3p8g0b7f0hhfbfc9mwr5mz84yidlh"; depends=[ergm latentnet network sna]; };
 heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; };
-hermite = derive { name="hermite"; version="1.0.2"; sha256="0hmh3vpla3xjr4gasv9jsq4ldpchzip8hqbz31c2a77kkhbmrg22"; depends=[maxLik]; };
+hermite = derive { name="hermite"; version="1.1.0"; sha256="184f7iixsmpli5hp4f0frjxfwpxpicjn1yrk6sf8y4il49cx0s4v"; depends=[maxLik]; };
 het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
 hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; };
 hexView = derive { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; };
@@ -3833,11 +3891,12 @@ hierDiversity = derive { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9
 hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; };
 hierarchicalDS = derive { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[truncnorm mvtnorm Matrix coda xtable mc2d ggplot2 rgeos]; };
 hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[gtools ade4]; };
+hiertest = derive { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; };
 highD2pop = derive { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
 highTtest = derive { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
 highfrequency = derive { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; };
-highlight = derive { name="highlight"; version="0.4.5"; sha256="004ncg3dhfj4dywa2pk32r2pwcm90dp0vnanip0fqflkgwn1qbbp"; depends=[]; };
-highr = derive { name="highr"; version="0.4.1"; sha256="1ssjq92p8351i8ry4k239s1n6dkail9aj5al8asb7h9z6ibfwvhw"; depends=[]; };
+highlight = derive { name="highlight"; version="0.4.7"; sha256="1gpwj4phq45hhx4x6r8rf6wc6ak6y4fkbad9v23fl8wldb4a8dyg"; depends=[]; };
+highr = derive { name="highr"; version="0.5"; sha256="0jnab5pk5sg4f5krsg5jdamr4y40z2pzxhp5h6fb6wys3m75hzny"; depends=[]; };
 hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
 hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
 hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; };
@@ -3845,7 +3904,7 @@ hisse = derive { name="hisse"; version="1.0"; sha256="0vbwc006ypn9jcaw86dcvmg2hy
 histmdl = derive { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; };
 histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
 historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
-hitandrun = derive { name="hitandrun"; version="0.5"; sha256="1f7h963hqyhir3c26dyi0gvv5pf0a7x8sw2km3wh4ncwx2barfzq"; depends=[rcdd]; };
+hitandrun = derive { name="hitandrun"; version="0.5-1"; sha256="0qgja0xw6687hr9qw4cwl9gq1vbv8gdnh6fkq2wx5cahgjz1p3bj"; depends=[rcdd]; };
 hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pkl20rm24wxnf1y1xv695v3j58ibd"; depends=[rJava XML]; };
 hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; };
 hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
@@ -3865,11 +3924,11 @@ hpcwld = derive { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgz
 hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr]; };
 hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
 hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
-hsdar = derive { name="hsdar"; version="0.1.2"; sha256="1zzz0drvykcs4mfj7xxcvvzcmk6l2038l0ngpjx52ih05yzajzxi"; depends=[sp raster rgdal rootSolve signal]; };
+hsdar = derive { name="hsdar"; version="0.1.3"; sha256="0vwiavzzfxz81iskgjy0af8gwh8fkjiyzhql82s2n9snvy7d36fk"; depends=[sp raster rgdal rootSolve signal]; };
 hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
 hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
 hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; };
-htmlTable = derive { name="htmlTable"; version="1.2"; sha256="06hbc3wvymksr83cxy9rjkfw860sfg513ylipgdnxzr5h986hfad"; depends=[stringr knitr magrittr]; };
+htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[stringr knitr magrittr]; };
 htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; };
 htmlwidgets = derive { name="htmlwidgets"; version="0.3.2"; sha256="1r0n3c2xvj9k7x892nbqyclpc66lq5wyxc2y0nybs5wcz3jx9s2p"; depends=[htmltools RJSONIO yaml]; };
 hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; };
@@ -3922,10 +3981,11 @@ ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j432
 ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
 ica = derive { name="ica"; version="1.0-0"; sha256="009xv1ycgbnw6ysx1wxrgygny7qa2wd2mcjrg2fwxg958mzyrx4z"; depends=[]; };
 icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; };
-icamix = derive { name="icamix"; version="1.0.1"; sha256="06jaznzgixglbrrmvmp3cnghdldv30h5nfjghvdymia27m7ssdrr"; depends=[Rcpp Rcpp RcppArmadillo]; };
+icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkqls52a8qiw7y9r26jwxs71nxl85clqcs"; depends=[Rcpp Rcpp RcppArmadillo]; };
 icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
 iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp Rcpp RcppArmadillo]; };
-icd9 = derive { name="icd9"; version="1.1"; sha256="10swy0zhzip412icc9nf324za3czcjfpby6d9ha480504073fakm"; depends=[Rcpp checkmate Rcpp]; };
+icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[Rcpp checkmate Rcpp]; };
+icenReg = derive { name="icenReg"; version="1.1.1"; sha256="0q1h94r6sv56jxrg1lxc8ms1drrcrqf7k888jb63qmg4wscp33bi"; depends=[survival foreach]; };
 icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp Rcpp]; };
 idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
 identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
@@ -3934,6 +3994,7 @@ ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4f
 ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
 ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
 ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[splus2R MASS]; };
+ig_vancouver_2014_topcolour = derive { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
 igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; };
 igraphdata = derive { name="igraphdata"; version="0.2.2"; sha256="0lmgz9zglz0rn0iyjs9kdcm1xp09kh21sv91wnj74666jp0wsg4x"; depends=[]; };
 igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
@@ -3951,7 +4012,7 @@ inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089g
 inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp Rcpp]; };
 incReg = derive { name="incReg"; version="1.0"; sha256="1kckx64hn8g9wvjg7g9xild5hclim1rs7z2m7rgmbdwlbayxpwgv"; depends=[car]; };
 indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7iq95wfnlv9rj46cyp9xy68bzqkbwdi3m"; depends=[httr rjson stringr png]; };
-indicspecies = derive { name="indicspecies"; version="1.7.4"; sha256="1b9fgdsprh89siqps30v2yz0hsvfxffz2ynp1z74dmvx52iih4vs"; depends=[permute sp rgeos]; };
+indicspecies = derive { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; };
 ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
 inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
 inferference = derive { name="inferference"; version="0.4.61"; sha256="02rsirwh4arqkgxpw3vnd0m2k055ir2074mlz27gbzmwz0ycpfzk"; depends=[numDeriv lme4 Formula]; };
@@ -3977,7 +4038,7 @@ interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm
 interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
 intergraph = derive { name="intergraph"; version="2.0-1"; sha256="03ycay3x4wd3j7r0mad9qgi4h77krapg613ans3jf9qa4ys2njlv"; depends=[network igraph]; };
 internetarchive = derive { name="internetarchive"; version="0.1.2"; sha256="08gbkqbzx963c1jy3a540fsd0ff9ylr7la1clwjn46lp4cc4yv1h"; depends=[httr jsonlite dplyr]; };
-interpretR = derive { name="interpretR"; version="0.2.1"; sha256="02k1a864ldb6ych76vk0rdpv8idxpjynwhdh0d85y013xi5fsc3k"; depends=[randomForest AUC]; };
+interpretR = derive { name="interpretR"; version="0.2.2"; sha256="048qhq9mf3qna48v8ml7hfa7imrsrhrl0hrb44arh1ik3i5a2xx6"; depends=[randomForest AUC]; };
 interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; };
 intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; };
 interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
@@ -4015,7 +4076,7 @@ isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibf
 iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[partitions VGAM MASS ape apTreeshape geiger gtools]; };
 iterLap = derive { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; };
 iterators = derive { name="iterators"; version="1.0.7"; sha256="1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv"; depends=[]; };
-iterpc = derive { name="iterpc"; version="0.2.6"; sha256="1pr8b349cs40364mdkcicm7sccjghxrmhy46zzv6cdk8fs0fn2fi"; depends=[Rcpp polynom Rcpp]; };
+iterpc = derive { name="iterpc"; version="0.2.7"; sha256="041gihbcv9i7f1jzvlldkyfm58p86pyv2sf4hbk09xp00azp8ahf"; depends=[Rcpp polynom Rcpp]; };
 itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
 itertools2 = derive { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; };
 itree = derive { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
@@ -4026,6 +4087,7 @@ ivbma = derive { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1k
 ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
 ivivc = derive { name="ivivc"; version="0.2.2"; sha256="1qychbszcg9lmbmrnpv65xcv1i5k2xarsa374fs6gw7zlp5nrvap"; depends=[reshape optimx sciplot png deSolve minpack_lm]; };
 ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm plyr lmtest]; };
+ivmodel = derive { name="ivmodel"; version="1.0"; sha256="14ic49vyikx5fiz2ccjmd53f0vcg3jh3fs6fqhl8w3hm9z9x4qvz"; depends=[Matrix]; };
 ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER sandwich lmtest]; };
 ivpanel = derive { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
 ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; };
@@ -4034,7 +4096,7 @@ jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0b
 jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
 jagsUI = derive { name="jagsUI"; version="1.3.1"; sha256="18g755dxmlwv5abjdv3sip5qxpd13sx79f85wb0ji5i4fjax26ky"; depends=[lattice rjags coda]; };
 james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[rjson naturalsort]; };
-jiebaR = derive { name="jiebaR"; version="0.4"; sha256="0vm41z2kc5zvvqmamwfqacc1ndpa0npk515zn7v4bd6gv6dw2lgn"; depends=[jiebaRD Rcpp Rcpp]; };
+jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp Rcpp]; };
 jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
 jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
 joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; };
@@ -4079,7 +4141,7 @@ kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y
 kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
 kmodR = derive { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
 knitcitations = derive { name="knitcitations"; version="1.0.5"; sha256="1a9lw9gdb31akdwiif5xzbs4s0s9xkhm3n735xnkiyc9n6afwzn3"; depends=[RefManageR digest httr]; };
-knitr = derive { name="knitr"; version="1.9"; sha256="17kwz14n16c3zjrpvm3c6rfn501gwlzgiikzwmc6krxvxafghik9"; depends=[evaluate digest formatR highr markdown stringr]; };
+knitr = derive { name="knitr"; version="1.10.5"; sha256="1qxpsnjwb4bdq44k3nglfrznpvqaqj18njx4imbpk3njzcjif7a7"; depends=[evaluate digest formatR highr markdown stringr yaml]; };
 knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
 knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
 knnIndep = derive { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
@@ -4105,7 +4167,7 @@ kzft = derive { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp6
 kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; };
 l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; };
 laGP = derive { name="laGP"; version="1.1-3"; sha256="11blzdnil0nw3q5vf4y1rv7l4zxjx8ilynv9jpkm14azv5dsr8jw"; depends=[tgp]; };
-labdsv = derive { name="labdsv"; version="1.6-1"; sha256="0bcsjznq9w1arv503895060hkri0447fnc49nj4ynry7fi35ci22"; depends=[mgcv MASS]; };
+labdsv = derive { name="labdsv"; version="1.7-0"; sha256="1r5vbmdijcrw0n3phdmfv8wiy7s08pidvhac4pnsxfmf98f74jby"; depends=[mgcv MASS rgl cluster]; };
 label_switching = derive { name="label.switching"; version="1.3"; sha256="05kbxvrp0lm5913lhy7pgxr9cq64sm5hiz6ydmmgfmbmfirrcqyx"; depends=[combinat lpSolve]; };
 labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
 labeling = derive { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
@@ -4157,11 +4219,13 @@ leafletR = derive { name="leafletR"; version="0.3-2"; sha256="183qrfmcanb4c5n3w0
 leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; };
 leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
+learnstats = derive { name="learnstats"; version="0.1.0"; sha256="03rlyh7ynxxvnkx8r8611ss36aqc8mdk6w2kjajmmsdwzp81lgnc"; depends=[RcmdrPlugin_epack ggplot2 shiny rmarkdown Rcmdr]; };
 lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape picante geiger fBasics SDMTools vegan]; };
 leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-lessR = derive { name="lessR"; version="3.3"; sha256="0hzvf85x81p5lcszrpf897azh4fgpij2zyk0z5icma67aifdf5bf"; depends=[car leaps MBESS foreign gdata triangle]; };
+lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54cyk2ja5cy4cq0xzqya6wn04mbicg"; depends=[car leaps MBESS foreign gdata triangle]; };
 lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
-letsR = derive { name="letsR"; version="2.0"; sha256="0z695c2mcswhw064cfq9nj7ai2mfxd9hjy764wgjdnwp4x1bnjh8"; depends=[raster maps XML geosphere fields maptools sp rgdal]; };
+letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[raster maps XML geosphere fields maptools sp rgdal]; };
+lfactors = derive { name="lfactors"; version="0.4.0"; sha256="1f4p5mp6m11njrj421vjl5398laicgyg8m04srshfmpi74hf1nb9"; depends=[]; };
 lfe = derive { name="lfe"; version="2.2-1699"; sha256="1a2y4f25isvnvk0yg6j36s729makr8b1bzwivx4x67aqg8fd09rv"; depends=[Matrix Formula xtable]; };
 lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; };
 lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; };
@@ -4171,7 +4235,7 @@ lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0
 lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
 lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
 libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; };
-lifecontingencies = derive { name="lifecontingencies"; version="1.1.5"; sha256="0v4rdq4ajd12ri1agn9i57nigxpgvg67clpskks761b7n1b6l77v"; depends=[markovchain]; };
+lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp Rcpp]; };
 likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim ggplot2 gtools rtf gdata]; };
 likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
 likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb3m5irvw6yivirrj45wscxn3kz5s1"; depends=[ggplot2 xtable psych reshape gridExtra plyr]; };
@@ -4203,7 +4267,7 @@ lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqk
 lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; };
 lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
 lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; };
-lmerTest = derive { name="lmerTest"; version="2.0-20"; sha256="1x3h78lnj7j002lzx0yxg36vl98z5xmk913k3h2wssxfva9ljp0w"; depends=[Matrix lme4 plyr numDeriv MASS Hmisc gplots]; };
+lmerTest = derive { name="lmerTest"; version="2.0-25"; sha256="13psyrll5srxahyk4fhp77fds9mxgnargpv2wxjpy3cv8f5b1vpm"; depends=[Matrix lme4 plyr MASS Hmisc ggplot2]; };
 lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
 lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[nlme MASS]; };
 lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; };
@@ -4214,7 +4278,7 @@ lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93
 lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
 lmom = derive { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; };
 lmomRFA = derive { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; };
-lmomco = derive { name="lmomco"; version="2.1.3"; sha256="1baxs9c385rgcw73hr1616gknb7fs5v81bv5jv5g1fwzr1qxxm7k"; depends=[]; };
+lmomco = derive { name="lmomco"; version="2.1.4"; sha256="02c2yhfr08hzlyn2nmfdfvmc3xrc3pp4agc6nkg4w6kk74r003h1"; depends=[]; };
 lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; };
 loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; };
 localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
@@ -4237,7 +4301,7 @@ logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lh
 logitchoice = derive { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; };
 logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; };
 loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
-logmult = derive { name="logmult"; version="0.6.1"; sha256="1wa6srl7fk2cpgszxa0nsd8dqrjk3ksyzm3yfna841l3rss823qv"; depends=[gnm qvcalc]; };
+logmult = derive { name="logmult"; version="0.6.2"; sha256="0i6sabg56x52aw5n7i61ick4n0hsbs28iagyzp0nvd2qrvz8p9ma"; depends=[gnm qvcalc]; };
 logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp92whgxgn7w87cadgxr65pp7nv6m5pvj130i3p"; depends=[]; };
 lokern = derive { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; };
 lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
@@ -4248,6 +4312,7 @@ longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdg
 longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
 longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[Matrix lme4 nlme]; };
 loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
+loopr = derive { name="loopr"; version="1.0.0"; sha256="19gk3phi45ylkvdfyyr0j0r13ndz7wxl73x0znp2n59vazdgy24w"; depends=[plyr dplyr magrittr lazyeval R6]; };
 lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; };
 lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
 lpSolve = derive { name="lpSolve"; version="5.6.11"; sha256="0mgpns9wflqaz9ynwxwkvmc1694yhf275wgrqfjfy3qxz1hxq7s0"; depends=[]; };
@@ -4260,18 +4325,18 @@ lpridge = derive { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjf
 lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
 lqmm = derive { name="lqmm"; version="1.5.1"; sha256="1myv2v2059vlni1npxyv6ii846aiqz1mvyz9r9n5vpzgz92abizi"; depends=[SparseGrid nlme]; };
 lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; };
-lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; };
+lsa = derive { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
 lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb937nw8s7ky25njc3fnl4hdpc8rj7m44hwf"; depends=[ggplot2 plyr clue gridExtra reshape2 Rcpp Rcpp]; };
 lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
 lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; };
 lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
-lsmeans = derive { name="lsmeans"; version="2.16"; sha256="1cmxg4cxf7snmpnargdwvgr061acpbish934pcdmnhslr1k2sj9j"; depends=[estimability multcomp plyr Matrix mvtnorm]; };
+lsmeans = derive { name="lsmeans"; version="2.17"; sha256="0jpyqrc84w1zxgw7vbrp2263fcbk8rahxq2lqhcf8by47xcgk5kk"; depends=[estimability coda multcomp plyr mvtnorm]; };
 lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
 lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
 lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
 ltbayes = derive { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; };
 ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; };
-ltmle = derive { name="ltmle"; version="0.9.3-1"; sha256="0nvcxl55nmcabsz79vkjxmnifzm2vxg0lgwcjqiwsj242vhnfjhh"; depends=[]; };
+ltmle = derive { name="ltmle"; version="0.9-5"; sha256="07z576ry6i73l4jp073l360gvhzfdq845x43vrpfq258h7mqhgg4"; depends=[Matrix]; };
 ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; };
 ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
 ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6gjl0h37wfis1i6l9k6hiaqhb6vr"; depends=[fields]; };
@@ -4303,25 +4368,27 @@ mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sg
 mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[rJava stringr R_utils]; };
 makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
 mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
-managelocalrepo = derive { name="managelocalrepo"; version="0.1.4"; sha256="060r9wkrn2v6wij926l7qlxlw8k2zbgrmwf2awf1x6llfs4vaiby"; depends=[stringr assertthat]; };
+managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[stringr assertthat]; };
+manifestoR = derive { name="manifestoR"; version="0.9-12"; sha256="1hz45555941b9jplac4l8l6h4dn387fp4nk873c17mds7xaxzidq"; depends=[NLP tm dplyr httr jsonlite functional]; };
 manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
 mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
-mapStats = derive { name="mapStats"; version="2.3"; sha256="0kws795f8s6rgbwyzjz90vzlh2ipp0c0mwdbsry5aasg4qj97ns0"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; };
+mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; };
 mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
 mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
 mapmisc = derive { name="mapmisc"; version="1.2.1"; sha256="1sds83cbsdfb6ac2y13fy1lm7bi27qzkkpjv1cjml8yjwcazfbfj"; depends=[sp raster]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
 mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
 maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; };
-maptools = derive { name="maptools"; version="0.8-34"; sha256="1ii4vgapdbf0i9f71agfmv85lmw1da686igw1252kgfrbf2mjdfw"; depends=[sp foreign lattice]; };
+maptools = derive { name="maptools"; version="0.8-36"; sha256="0064b9qqv7241298dswv5kkkqf6y2iyn7dhjcyvfkqn4kvc9g2m8"; depends=[sp foreign lattice]; };
 maptpx = derive { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
 maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
 mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
 marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[shape seacarb]; };
 marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
-markdown = derive { name="markdown"; version="0.7.4"; sha256="09bqwv75mvfnjwbsz4v0zr9mmjdccwwgayiv7f6db48lngijng4f"; depends=[mime]; };
+markdown = derive { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; };
 marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[lme4 R2admb truncnorm coda ggplot2 Matrix numDeriv Rcpp plyr optimx expm Rcpp]; };
-markovchain = derive { name="markovchain"; version="0.1.1"; sha256="1y4f4xf8557jq20yd8n2sl4sjhx2pkdjyr6fqikrfh1m4cydrz73"; depends=[igraph Matrix matlab expm]; };
+markovchain = derive { name="markovchain"; version="0.2"; sha256="03lmvnfdcn4s274ydi5i8xwwm8bl4fv64dwm8mb61nf0i5d0w6ky"; depends=[igraph Matrix matlab expm Rcpp RcppParallel Rcpp RcppParallel]; };
+marl = derive { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
 marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA ggplot2]; };
 marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
 matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; };
@@ -4337,8 +4404,8 @@ maxLik = derive { name="maxLik"; version="1.2-4"; sha256="1b2qr16s2w76nxqdlq3hfl
 maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp Rcpp]; };
 maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; };
 maxstat = derive { name="maxstat"; version="0.7-22"; sha256="0fgpc5y3c5cidy7hxil10hxzdjxfmag2pp2ksh02z9smb8m0sdqb"; depends=[exactRankTests mvtnorm]; };
-mbbefd = derive { name="mbbefd"; version="0.6.1"; sha256="18vi4cans7h7lykfablrzvpvzd1zvfp2ycjf47gwjvg54ri1nnml"; depends=[Rcpp Rcpp]; };
-mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; };
+mbbefd = derive { name="mbbefd"; version="0.7"; sha256="0l8dq1j1ky83jl1cka0mrjcf7rcby36jkp0zn7wmpnxjrmdrixgb"; depends=[actuar gsl Rcpp Rcpp]; };
+mbest = derive { name="mbest"; version="0.3"; sha256="0j6v6c1s11gvzwcnj5dnd9anj11hpmy7c83c8ribb7lx75mwj4k4"; depends=[lme4]; };
 mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
 mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
 mboost = derive { name="mboost"; version="2.4-2"; sha256="104qs8hbsm4ps5ybzxrdz6lz0lqn925xy4k3m4rmbk4r62wj9v61"; depends=[stabs Matrix survival lattice nnls quadprog]; };
@@ -4353,7 +4420,7 @@ mcgibbsit = derive { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh469
 mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
 mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[statmod locfit]; };
 mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; };
-mclust = derive { name="mclust"; version="5.0.0"; sha256="0ny6px5qf4ks16l19m7ffzibvcgsylih96cxs3wnw4rnhglilvwh"; depends=[]; };
+mclust = derive { name="mclust"; version="5.0.1"; sha256="10h8y4a0v1vq01v8i92yr3dcxfq74xsm44nh0ldh1a4d6j270zyp"; depends=[]; };
 mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
 mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda sfsmisc colorspace denstrip]; };
 mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
@@ -4361,9 +4428,9 @@ mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2b
 mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; };
 mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
 mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; };
-mda = derive { name="mda"; version="0.4-4"; sha256="18a12fnhcx911ii8wfqkyi8yxrhbiw2pi6mhywgxzsl3a09g8ghh"; depends=[class]; };
+mda = derive { name="mda"; version="0.4-6"; sha256="0v6avsq1j3vd8pmnilxcbx6v42kb5gvsy03q2srwzf3z04807n8i"; depends=[class]; };
 mdatools = derive { name="mdatools"; version="0.6.0"; sha256="13pfzr3lvqifln9lzdd0dpnygdibxp9ka7zwfisxjrw21m8mhmm3"; depends=[]; };
-mded = derive { name="mded"; version="0.1-1"; sha256="1r2sjg661abzsbqdyq2mlyacnv5rd60jfg2156cq5qyknxkin01m"; depends=[]; };
+mded = derive { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
 mdscore = derive { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; };
 mdsdt = derive { name="mdsdt"; version="1.0"; sha256="0ngf2p6lm32124qyfh18zlgf0dipj3njn6d0m8f192563kp50q0p"; depends=[ellipse mnormt polycor]; };
 measuRing = derive { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; };
@@ -4384,7 +4451,7 @@ memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3x
 memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; };
 merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; };
 metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; };
-meta = derive { name="meta"; version="4.1-0"; sha256="0zf2917ljzpbc8izprzx7a78wc37q2k23lzdk8rmm5chml16mb3f"; depends=[]; };
+meta = derive { name="meta"; version="4.2-0"; sha256="1cbrgy3ry70l52da02vx2qflxhnqw7kmy6r10d9wzhmc1gf85snp"; depends=[]; };
 metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; };
 metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[SMVar]; };
 metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table Matrix gtools Rmpi ggplot2]; };
@@ -4393,7 +4460,7 @@ metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mk
 metacom = derive { name="metacom"; version="1.4.3"; sha256="0djq2ry2vriayn839f0pgkq4j8j1zyd8ribmzn6ngfhz305fszlq"; depends=[devtools vegan lattice]; };
 metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; };
 metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS Rcpp RcppArmadillo]; };
-metafor = derive { name="metafor"; version="1.9-5"; sha256="1ayvkm57c7s91m9kcsdax0fk61v0kvsbgaymlzg1sgsxkgnwcgj4"; depends=[Matrix]; };
+metafor = derive { name="metafor"; version="1.9-6"; sha256="1bjhzkim64035xk04kc1ra4ih6gxfsn389gag21mf9zhk0mi6yd0"; depends=[Matrix]; };
 metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; };
 metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; };
 metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; };
@@ -4412,7 +4479,7 @@ mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wc
 mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; };
 mht = derive { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; };
 mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; };
-mi = derive { name="mi"; version="0.10-2"; sha256="01dyrxq37cm3xs4j178zn4b4xsjqnbjkpzn70pgk8ciis9158k43"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS nlme]; };
+mi = derive { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[Matrix arm]; };
 miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
 miRtest = derive { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor MASS RepeatedHighDim]; };
 micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; };
@@ -4428,7 +4495,7 @@ micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rh
 midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[sandwich optimx MASS numDeriv Matrix forecast]; };
 migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; };
 migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
-migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; };
+migui = derive { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[gWidgets2 mi arm]; };
 mime = derive { name="mime"; version="0.3"; sha256="1i9f9z88cahvb5whdgmp0ipk0b9glk0xn8ik519vzpydnn1slvxk"; depends=[]; };
 minPtest = derive { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[scrime Epi]; };
 minerva = derive { name="minerva"; version="1.4.1"; sha256="0dg5xnl9srdvid49na8478bnvagv0khiv6hl7z8gw6m745681i89"; depends=[]; };
@@ -4442,7 +4509,7 @@ minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s42
 minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
 mipfp = derive { name="mipfp"; version="2.0"; sha256="1sh33lgvq31nk8vkl9p195v4z3whv2c1fc7bnhc8wxgglm6vc126"; depends=[cmm Rsolnp numDeriv]; };
 mirt = derive { name="mirt"; version="1.9"; sha256="0bav1ykmbw8d64l61iwd4ma2xz4y3z2wqx8ba63583rmbsynkkvk"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; };
-mirtCAT = derive { name="mirtCAT"; version="0.4.2"; sha256="133q6kdj8hkgfrby6sb9kdpmlk097zzwapb0nh2lnswyxfpl7s6w"; depends=[mirt shiny lattice Rcpp Rcpp RcppArmadillo]; };
+mirtCAT = derive { name="mirtCAT"; version="0.5"; sha256="0lv4dxpby3izmh3avl70i0iiaj8rz1fpb666cwga5590ks7rq4lr"; depends=[mirt shiny lattice Rcpp markdown Rcpp RcppArmadillo]; };
 misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
 miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
 miscFuncs = derive { name="miscFuncs"; version="1.2-7"; sha256="1cnhd23fi6akr3fsr2b85s5cn36ksy4h3c4iyyjqcpc49wa819d0"; depends=[roxygen2 mvtnorm]; };
@@ -4455,11 +4522,12 @@ mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6
 mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
 mix = derive { name="mix"; version="1.0-8"; sha256="0wlp6wkn8dwwnjfq3qzk0hjb3xsjh5ld5zxbd6nf12awpkwa1j9y"; depends=[]; };
 mixAK = derive { name="mixAK"; version="3.10"; sha256="1mma3515p1r5nhbmdyxzvv73ni5iw4arnzq94nw9gib1dgjpm7c5"; depends=[colorspace lme4 fastGHQuad mnormt coda]; };
-mixOmics = derive { name="mixOmics"; version="5.0-3"; sha256="1b8ms3jz4acvbfm2b1iw30h2d80lpqgabwr5j9k2gy3nvqm72nxq"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; };
+mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; };
 mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[survival lattice]; };
 mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
 mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
 mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
+mixedMem = derive { name="mixedMem"; version="1.0.2"; sha256="1nlnlww2xbmlifcp9l293041csnh38hvr686sczyqpb7c5jf39g3"; depends=[Rcpp gtools Rcpp RcppArmadillo BH]; };
 mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
 mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[gdata lattice daewr]; };
 mixlm = derive { name="mixlm"; version="1.0.8.5"; sha256="1xbkh6aaw4j57vkn6ng7i5wkpz2clhvj3sx0mhfmpwhg13rpdkaj"; depends=[multcomp pls pracma leaps lme4 car]; };
@@ -4468,7 +4536,8 @@ mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88i
 mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
 mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; };
 mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; };
-mixtools = derive { name="mixtools"; version="1.0.2"; sha256="0x809m6lbzprd5kq6wqk528x9apaj5df3sidzk9jiw06qklngwg8"; depends=[boot MASS segmented]; };
+mixtNB = derive { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
+mixtools = derive { name="mixtools"; version="1.0.3"; sha256="01ix019cvplqz09q55pz9w7cc281k37khh1i3xf1k6l9f2cj519z"; depends=[boot MASS segmented]; };
 mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
 mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; };
 mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[Rcpp raster sp Rcpp]; };
@@ -4489,7 +4558,7 @@ mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ix
 mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; };
 mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; };
 mlxR = derive { name="mlxR"; version="2.1.1"; sha256="13ddm4hhnjx7r058qlvvxn9npqa0vq6y5l1g0zrlhckjp7bpp90a"; depends=[ggplot2 XML Rcpp]; };
-mma = derive { name="mma"; version="1.0-1"; sha256="0xg3010fljc95as2jf777jd2qlrhzmpw1swm5hrjh4a2svkj1yf2"; depends=[gbm]; };
+mma = derive { name="mma"; version="2.0-0"; sha256="0fdb2lbg08l47wnrsjf3rarf2n0qsw0qrx9b9aa08ablwpip4k69"; depends=[gbm]; };
 mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; };
 mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
 mmcm = derive { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; };
@@ -4518,7 +4587,7 @@ momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx
 moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
 mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
 mongolite = derive { name="mongolite"; version="0.2"; sha256="0lyq565c8xqxcm5sbg1rp3myppbw4hbqr3fiqzvcqpp72ar6ywvv"; depends=[jsonlite]; };
-monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbca9ahdra9cid1piidwhjc4f6vqsbkp479"; depends=[tuneR]; };
+monitoR = derive { name="monitoR"; version="1.0.3"; sha256="0g2dhyz3411pa6kcsmmi9x77ygvdrvas3k9ps0w2r69mfab785c6"; depends=[tuneR]; };
 monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
 monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; };
 monreg = derive { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
@@ -4543,7 +4612,7 @@ mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkk
 mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[MASS KernSmooth]; };
 mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; };
 mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; };
-mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; };
+mpoly = derive { name="mpoly"; version="0.1.0"; sha256="0q0ypaj1r12yc72b6qb22rvgrzc703v4n7ns2yg1n9ff20y5m4z0"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; };
 mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; };
 mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; };
 mra = derive { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; };
@@ -4570,6 +4639,7 @@ mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8
 mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
 muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
 muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
+muir = derive { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
 multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[mvtnorm survival TH_data sandwich codetools]; };
 multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
 multgee = derive { name="multgee"; version="1.5.1"; sha256="1ycbbri26hahbi3q4mrsyhrh9bwj89dyv6gvrpx58ghrlsnakjy1"; depends=[gnm VGAM]; };
@@ -4580,14 +4650,15 @@ multiband = derive { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl
 multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl tkrplot RODBC]; };
 multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; };
 multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[psych abind foreach mvtnorm sciplot]; };
-multicool = derive { name="multicool"; version="0.1-5"; sha256="01a429hyizqjg3dglnm0b3gl1lclp1az40cr3wr9qcx12jn30fbz"; depends=[Rcpp Rcpp]; };
+multicool = derive { name="multicool"; version="0.1-6"; sha256="0hzwxrcsz7dm4ilv8rpkcwi61ssym94ki8ayssfh2r2ghy9w9xlw"; depends=[Rcpp Rcpp]; };
 multigroup = derive { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
 multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; };
 multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 xtable PSAgraphics plyr psych reshape proto party]; };
+multimark = derive { name="multimark"; version="1.1.4"; sha256="045lfgzxwz4m1y5gny2y92cmix6wxi1sl486gajal2scfib31rgv"; depends=[statmod Matrix RMark coda Brobdingnag mvtnorm]; };
 multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
 multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[rgenoud MASS mvtnorm]; };
 multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[survival gam]; };
-multiplex = derive { name="multiplex"; version="1.2"; sha256="06wrzglgrvahavlcknf80cp0j4k840dhmclw9g6wqv51pq9brj2f"; depends=[]; };
+multiplex = derive { name="multiplex"; version="1.5"; sha256="1sc4jnmh3lfpx92cpqd8phm09dn9xaq4qdq9301dccw3f0m260md"; depends=[]; };
 multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
 multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8l1m5bdh98fsmhvzj8s0b2mcp9cqrvnhp1irc"; depends=[]; };
 multisensi = derive { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; };
@@ -4601,11 +4672,10 @@ multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4z
 muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; };
 munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb4x538sbczrblb70a3ysxf4q8c1ihmly9"; depends=[memisc MASS]; };
 munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; };
-muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; };
 musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
 mutoss = derive { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[mvtnorm plotrix multcomp]; };
 mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[mutoss multcomp plotrix rJava JavaGD CommonJavaJars JGR]; };
-mvMORPH = derive { name="mvMORPH"; version="1.0.4"; sha256="1071wcnbgrys9hmr2xv7aqsnzvaci2s15pf6b984w8mbr5drwix8"; depends=[phytools ape corpcor subplex spam]; };
+mvMORPH = derive { name="mvMORPH"; version="1.0.5"; sha256="184ywvgi2dz77ivl2g7spx065wh1ap2lpmvbrhik9sgysygkijs2"; depends=[phytools ape corpcor subplex spam]; };
 mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; };
 mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ouch ape numDeriv mvtnorm corpcor]; };
 mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
@@ -4643,7 +4713,7 @@ nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql1
 nCal = derive { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6w1xpmwx5bvil4kjb82gccsb95ir10"; depends=[drc gdata gWidgets kyotil]; };
 nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
 nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; };
-nLTT = derive { name="nLTT"; version="1.0"; sha256="0yvsjfrsx48p2gyisdyvisplz61d7kkaw1bkdkj3q11g3xq84hx9"; depends=[ape coda deSolve]; };
+nLTT = derive { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; };
 nabor = derive { name="nabor"; version="0.4.4"; sha256="0465wkyggz4665b2ph1qpyxsmak0arfzpxaci1r0lrf5ddyp0n6y"; depends=[Rcpp Rcpp RcppEigen BH]; };
 nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; };
 namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
@@ -4663,13 +4733,14 @@ ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky
 ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; };
 ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; };
 ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
-ncvreg = derive { name="ncvreg"; version="3.3-0"; sha256="0kwqfk9sp01x1k708qqr99cd8gkhr0jqjkfz1l7g0b6w6wm0yavb"; depends=[]; };
+ncvreg = derive { name="ncvreg"; version="3.4-0"; sha256="12ns62l0wdj9vkmqbdyxcwb15g3hz45dxcm7zl189iljcsl65977"; depends=[]; };
 ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS Rcpp]; };
-ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykacy3ll7y5fx4n5jik0avwcaclgkc"; depends=[network networkDynamic animation sna MASS statnet_common]; };
+ndtv = derive { name="ndtv"; version="0.6.1"; sha256="0833n3ddhx1ixqi540j6b2bfmzhpdpg8cwd6d5y7shfxslrnpay9"; depends=[network networkDynamic animation sna MASS statnet_common jsonlite base64]; };
 neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
 needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
 negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; };
 neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
+neotoma = derive { name="neotoma"; version="1.2-0"; sha256="0mb7b4qncn63nppq3hxl3a6hgipb413rygsm9qhira61ysnay51m"; depends=[RJSONIO RCurl plyr reshape2]; };
 nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
 nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxldyzy2i2gc575rx67zdfb8c9j0fv400nw509cwx5w6ya35x"; depends=[]; };
 netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; };
@@ -4760,8 +4831,8 @@ nsga2R = derive { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l
 nsgp = derive { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; };
 nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; };
 nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[ggplot2 MASS plyr dplyr moments fpc]; };
-numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; };
-numOSL = derive { name="numOSL"; version="1.7"; sha256="1hgyjjxpirgf2vmn273s861mnpyq2363kaafnkzgbcg0s08xxj1r"; depends=[]; };
+numDeriv = derive { name="numDeriv"; version="2014.2-1"; sha256="114wd0hwn2mwlyh84hh3yd2bvcy63f166ihbpnp6xn6fqp019skd"; depends=[]; };
+numOSL = derive { name="numOSL"; version="1.8"; sha256="0md55gfxjvdmjy4hy58wp11c788xy7kq9wl32m1r76ja6g03wwbl"; depends=[]; };
 numbers = derive { name="numbers"; version="0.5-6"; sha256="17v7by1gvqg2mdm5vrmf05kfrbvc2yz8ldb7bd0lrhcyrm5bbbwa"; depends=[gmp]; };
 nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; };
 nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
@@ -4792,12 +4863,12 @@ onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix
 onlinePCA = derive { name="onlinePCA"; version="1.0-1"; sha256="0gca0ijcc30b3z5i390n1yk6c7sc15z8d0zpxpfb3hh99g7vinx4"; depends=[rARPACK Rcpp Rcpp RcppArmadillo]; };
 onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89rap0pql9h181s7i68wa20xdg05z"; depends=[minpack_lm]; };
 opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
-openNLP = derive { name="openNLP"; version="0.2-4"; sha256="11zgqi8ydv6pqjs1sbi9gsh2fxg6jyaba16h5kbi15rc75fcvw47"; depends=[NLP openNLPdata rJava]; };
+openNLP = derive { name="openNLP"; version="0.2-5"; sha256="0jc4ii6zsj0pf6nlx3l0db18p6whp047gzvc7q0dbwpa8q4il2mb"; depends=[NLP openNLPdata rJava]; };
 openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; };
 openair = derive { name="openair"; version="1.5"; sha256="0swhaldfhz6zgs50aws18kypilv15k7w99nqcmb7y0wgvkkwda2h"; depends=[lazyeval dplyr maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapproj hexbin mapdata RgoogleMaps Rcpp Rcpp]; };
 opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[evaluate httpuv knitr jsonlite devtools httr brew openssl]; };
 openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
-openssl = derive { name="openssl"; version="0.3"; sha256="0h71jc1w99qg4y01q6j3yhmjhwf06r9pv150id2ls5f1z3hr0l6p"; depends=[]; };
+openssl = derive { name="openssl"; version="0.4"; sha256="1gfhzxjjssid2z8xmw3vnnd4gj2f6a3zzazkhpg9b1ymmcp9b288"; depends=[]; };
 opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; };
 openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp Rcpp]; };
 operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; };
@@ -4808,6 +4879,7 @@ optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4
 optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; };
 optextras = derive { name="optextras"; version="2013-10.28"; sha256="1sm025xwrpm5c63l4kiqfndxb7rwq2bcmidy4k2b24g5a8x7cpfv"; depends=[numDeriv]; };
 optiRum = derive { name="optiRum"; version="0.35"; sha256="0hfby5791jmzpacd8a4jj45b6sr5fph9g24kv6sr9db35y07ca36"; depends=[data_table ggplot2 AUC knitr plyr scales stringr XML]; };
+optifunset = derive { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
 optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
 optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
 optimx = derive { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[numDeriv ucminf BB Rcgmin Rvmmin minqa setRNG dfoptim svUnit]; };
@@ -4833,8 +4905,8 @@ orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxh
 orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
 orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; };
 orloca_es = derive { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; };
-oro_dicom = derive { name="oro.dicom"; version="0.4.3"; sha256="1n0rvinq14fbylg11h8a3ijqwyl9xlzs2ygwh38wrpi2z60afl18"; depends=[oro_nifti]; };
-oro_nifti = derive { name="oro.nifti"; version="0.4.3"; sha256="1sr91x0fzl7zc6m5mndhql7abmmsckyjl7s45rj4n3g8qzbqn790"; depends=[bitops]; };
+oro_dicom = derive { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; };
+oro_nifti = derive { name="oro.nifti"; version="0.5.2"; sha256="0zf5lb51b81602lwg118x3j2myrbrm6wjaflbpxxzqigz4q60rkg"; depends=[bitops abind]; };
 oro_pet = derive { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; };
 orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; };
 orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
@@ -4851,7 +4923,7 @@ p3state_msm = derive { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64
 pBrackets = derive { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; };
 pGLS = derive { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; };
 pRF = derive { name="pRF"; version="1.0"; sha256="17m86l29ys4n6z4ndibwy7yz9shyp7nf9hjnbgbvmc0ycf1may6i"; depends=[dplyr ggplot2 permute randomForest reshape2 magrittr]; };
-pROC = derive { name="pROC"; version="1.7.3"; sha256="1xbz50phi2ygrgvcv36vnbc2icga8abjiha2ap35bwffg5d2zmvi"; depends=[plyr Rcpp Rcpp]; };
+pROC = derive { name="pROC"; version="1.8"; sha256="0rva08hnaah9qv6hapzgfsdy2g06fdvnjmw0l733wm5j2g44ps8m"; depends=[plyr Rcpp Rcpp]; };
 pRSR = derive { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; };
 pSI = derive { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
 pa = derive { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; };
@@ -4866,19 +4938,19 @@ pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb9
 paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
 pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
 pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
-pairsD3 = derive { name="pairsD3"; version="0.0.6"; sha256="1fkwz8b9cqzhi7a8hv5bzgna9b0i0dvvpkffvbknsd9d24sjzr6c"; depends=[htmlwidgets shiny]; };
+pairsD3 = derive { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
 pairwise = derive { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; };
 pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; };
 palaeoSig = derive { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[vegan TeachingDemos rioja mgcv MASS]; };
 paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; };
 paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; };
 paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[raster maps rjson gtools RCurl plyr scales]; };
-paleofire = derive { name="paleofire"; version="1.1.5"; sha256="18ymcybsq4hqxyrqslaqda8n2pyf4yl45mgs3yzl1gbw77zas1bl"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; };
-paleotree = derive { name="paleotree"; version="2.3"; sha256="0zfav7s7x6g7rndbl6jg186fyxsq200b6z0l1zdvcm9528svv9wp"; depends=[ape phangorn]; };
+paleofire = derive { name="paleofire"; version="1.1.6"; sha256="1fzmnc4ywhqb6sr3cclsqy6y9v27j69bxszlrrgbnqb0kyg28rd7"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; };
+paleotree = derive { name="paleotree"; version="2.4"; sha256="1rrsxll5qcvr9a96wg5bdljvyy7zy26zd9f0b17xswmp77gxmahb"; depends=[ape phangorn]; };
 palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; };
 pamctdp = derive { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 xtable FactoClass]; };
 pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; };
-pampe = derive { name="pampe"; version="1.0"; sha256="0dfwhcnsxw71sn14m44fx1fxbx924rjpi2vvz292jzr404krcvny"; depends=[leaps]; };
+pampe = derive { name="pampe"; version="1.1.1"; sha256="1ha4jbmi2j35i375ziv4rbs4rijlp6fxwvb0vfr2905d1vl3cbap"; depends=[leaps]; };
 pamr = derive { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
 pan = derive { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3n2xl55f7q7ghj09fhwg1br"; depends=[]; };
 pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; depends=[digest Rcpp Rcpp]; };
@@ -4889,7 +4961,7 @@ parallelMap = derive { name="parallelMap"; version="1.2"; sha256="1rd4q644xml29n
 parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
 paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; };
 paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
-parboost = derive { name="parboost"; version="0.1.3"; sha256="1ziqbbcxvhc3v0vjpf9y6jhk3rqbgn9cilwcfxlxjbw73jhvvclg"; depends=[mboost party iterators plyr caret glmnet doParallel]; };
+parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[mboost party iterators plyr caret glmnet doParallel]; };
 parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[MASS glmnet ppls Epi GeneNet]; };
 parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[fossil foreach]; };
 parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; };
@@ -4910,11 +4982,11 @@ pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5
 pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; };
 patchDVI = derive { name="patchDVI"; version="1.9.1601"; sha256="0vv1rmmd78n2r14dsl9fx25v6ym9mav557ya0aagr548wqcajf0m"; depends=[]; };
 patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
-patchSynctex = derive { name="patchSynctex"; version="0.1-0"; sha256="1r9lk3shk9gg5xyiv20sbpzak1dby93q6jzaa6vx1abawjdkmz0c"; depends=[stringr]; };
+patchSynctex = derive { name="patchSynctex"; version="0.1-2"; sha256="1ssjs4mcsjad7g0yfi5sxwfyywsziry81rzwb4sly3afw8g538p9"; depends=[stringr]; };
 pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; };
 pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
 pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
-pathological = derive { name="pathological"; version="0.0-3"; sha256="1zl5vid1i6ijzjdqpvrm5c9yl6nh08cmmdqk50s65wggwmm0iw4l"; depends=[assertive plyr stringr]; };
+pathological = derive { name="pathological"; version="0.0-6"; sha256="1a6a9q15nk8rcpyz5xpndq0gbdv7y2iq4jgqiv7sgd3j1agh26c6"; depends=[assertive plyr stringr]; };
 pauwels2014 = derive { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
 pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; };
 pawacc = derive { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; };
@@ -4933,11 +5005,11 @@ pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf
 pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
 pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
 pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; };
-pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; };
+pcaL1 = derive { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; };
 pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
 pcalg = derive { name="pcalg"; version="2.0-10"; sha256="1ph5n3hlxni039phvhr9r2nj62c4mw9zmf0857sqzv434hizdfzi"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc Rcpp RcppArmadillo BH]; };
 pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
-pcnetmeta = derive { name="pcnetmeta"; version="2.0"; sha256="0ayk9dvll321ndpbzqhvswhd7gbngmdhvzak5mn74w76wz9d4ylv"; depends=[rjags coda]; };
+pcnetmeta = derive { name="pcnetmeta"; version="2.1"; sha256="00vrlkzc6d5xgs4my8qr6f9skyjdi3i529i9sfmdcwwrwp2spr24"; depends=[rjags coda]; };
 pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; };
 pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
 pdR = derive { name="pdR"; version="1.2"; sha256="0dgw6i623a6w18q54b46fnbp38941hqdvjpcnxrbqwvcgk024pr6"; depends=[]; };
@@ -4980,9 +5052,9 @@ perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr
 pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; };
 pez = derive { name="pez"; version="1.0-0"; sha256="0d1npc2w6gzi4ki7gwqa0f4sklz0sml8q0cmgb77hpvgrny47mk3"; depends=[ape caper picante quantreg mvtnorm vegan ade4 apTreeshape FD plotrix Matrix]; };
 pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; };
-pgirmess = derive { name="pgirmess"; version="1.5.9"; sha256="1n58r5ghd2ppnid6787gd1n18f23pf0fk7yr3vagcqpzv4pk0wic"; depends=[boot nlme rgdal sp spdep splancs]; };
+pgirmess = derive { name="pgirmess"; version="1.6.0"; sha256="0b2sxk2q4cylsb5ch9bq1grdifp2sww7bv1bgl9zn0j6h611gif5"; depends=[boot nlme rgdal sp spdep splancs]; };
 pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; };
-pgmm = derive { name="pgmm"; version="1.1"; sha256="0ajdcnxxy18ifidid4xnq9a03bsrvcbh3dh2vhviggkhq8gji1dn"; depends=[]; };
+pgmm = derive { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; };
 pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
 phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
 phangorn = derive { name="phangorn"; version="1.99-13"; sha256="1d6awphvzkznqvp30bxdi6j6chlakfxrvmkk9a4by21fxa29xmp9"; depends=[ape quadprog igraph Matrix nnls]; };
@@ -4994,11 +5066,11 @@ phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp5
 phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; };
 pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; };
 pheno2geno = derive { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[qtl VGAM mixtools]; };
-phenology = derive { name="phenology"; version="4.1"; sha256="0zg77jzmj5di2kid9v95wj6w326adyfcsdf7rxlq7n84439jsbz3"; depends=[fields zoo coda HelpersMG shiny]; };
+phenology = derive { name="phenology"; version="4.2"; sha256="141k2rfjmrx0cfzzcdf3q67chxq1jqp524rxcpdq3m7bnbkv67k3"; depends=[fields zoo coda HelpersMG shiny]; };
 phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; };
 phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; };
 phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; };
-phonR = derive { name="phonR"; version="1.0-1"; sha256="11m6qm3ya90n886mig4inxm057afl2gx4iz5fbwqsncibdmqgx92"; depends=[splancs deldir plotrix]; };
+phonR = derive { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[splancs deldir plotrix]; };
 phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; };
 phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; };
 phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
@@ -5014,7 +5086,7 @@ phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m
 phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; };
 phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
 physiology = derive { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
-phytools = derive { name="phytools"; version="0.4-45"; sha256="0qhndyik687v2hrd32xr0zglpyxikv1zhp2dkz611kpjbxz0gq44"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+phytools = derive { name="phytools"; version="0.4-56"; sha256="18cib7yjlbzdpfs5piwx5cw0h7fk26s04wsb2vdfiybr306a9jk2"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
 phytotools = derive { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[insol FME]; };
 pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; };
 picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; };
@@ -5031,6 +5103,8 @@ plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wf
 plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
 planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[dielectric Rcpp statmod cubature reshape2 plyr Rcpp RcppArmadillo]; };
 planor = derive { name="planor"; version="0.2-3"; sha256="1j550zqm3h4kz7jz4fkgp0z92skwpyxz0lnr7pfif4pya1mxd6f9"; depends=[conf_design]; };
+plantecophys = derive { name="plantecophys"; version="0.6"; sha256="1gxc84njpii82p6n04djbp4n9wni49lxfvmljqz48r643hv48a7h"; depends=[]; };
+plaqr = derive { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; };
 playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; };
 plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[sfsmisc abind]; };
 plgp = derive { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
@@ -5042,11 +5116,11 @@ plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inl
 plot3D = derive { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; };
 plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; };
 plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[sp spacetime rgdal maptools lattice raster]; };
-plotKML = derive { name="plotKML"; version="0.5-0"; sha256="0sx48z27a34bc8gw7m66w52q36llbm2wm15l6kvd6zzlyzvj8cda"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; };
+plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq9d4yy5awpsaxkcp17r6q42bdrffkc0m9"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; };
 plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
 plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; };
 plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; };
-plotmo = derive { name="plotmo"; version="2.2.1"; sha256="1kgsw7xfqmzsyybhj21a42ynci1y7gm8gas1jqsbgh0vydfbzzh5"; depends=[]; };
+plotmo = derive { name="plotmo"; version="3.1.0"; sha256="1z735ks92d1gfx6hk29mnj18a9hpsmifjy8qgh5lv9z0mwd7igca"; depends=[plotrix TeachingDemos]; };
 plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; };
 plotrix = derive { name="plotrix"; version="3.5-11"; sha256="01vb3i7hkc3krvl9v4f8fnpfcv62p4ci2vbm2qs5w593h70bys7c"; depends=[]; };
 pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
@@ -5055,13 +5129,13 @@ plsRcox = derive { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79i
 plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[mvtnorm boot bipartite car]; };
 plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
 plsdof = derive { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; };
-plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="1yif4h556xjadlfp31nm6aqhd3md983sppwmbh7mg95dffxnd3im"; depends=[MASS]; };
+plsgenomics = derive { name="plsgenomics"; version="1.3"; sha256="0gzk7sgv6bqkay7j854xsmyr3vwsdb2dbcnffv1ygdxikj64icp4"; depends=[MASS boot]; };
 plspm = derive { name="plspm"; version="0.4.2"; sha256="0q7mx5ydw61z1qcs0flpwpnnrcwsfsh3razc8jnd4z1xn96i3x85"; depends=[amap diagram tester turner]; };
 plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
 plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
 plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
 plusser = derive { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[RCurl RJSONIO lubridate plyr]; };
-plyr = derive { name="plyr"; version="1.8.1"; sha256="0f2an3pr7flpng9y9mmrmyh08g3nivi6gdkfnw54arn0wxhkqfcm"; depends=[Rcpp Rcpp]; };
+plyr = derive { name="plyr"; version="1.8.2"; sha256="1dizvj3xvp1cg8sm21xpk0kgfpil1n1q60zkanz6yh9cnnp6g306"; depends=[Rcpp Rcpp]; };
 pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
 pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[rlecuyer pbdMPI MASS]; };
 pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[gWidgets gWidgetsRGtk2 proto lattice foreign MASS]; };
@@ -5074,6 +5148,7 @@ pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0
 pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
 poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[scatterplot3d MASS]; };
 pocrm = derive { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; };
+pogit = derive { name="pogit"; version="1.0.0"; sha256="0lgvf4d7b2ycz9wryjrd7qymbx1jmj4mw8jl95ax2jylz4li48zf"; depends=[BayesLogit ggplot2 logistf plyr]; };
 poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
 poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
 pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; };
@@ -5112,11 +5187,11 @@ portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5ink
 portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
 portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
 potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; };
-poweRlaw = derive { name="poweRlaw"; version="0.30.1"; sha256="078yrr4fsg0isl45j887y62jzhvdv4krd3drg420wx5a0mqj7np1"; depends=[VGAM]; };
+poweRlaw = derive { name="poweRlaw"; version="0.30.2"; sha256="1b4ngqsh5gywksb3y9cj1yjkhxs4081svwgxwf8gpsa7fnl9c0fl"; depends=[VGAM]; };
 powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
 powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
 powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.1"; sha256="0xwyqlblhdnnv6pd2jpmz11s95zg7ylh1wa2q03zj8df330jcl70"; depends=[mvtnorm pwr]; };
-powerMediation = derive { name="powerMediation"; version="0.2.3"; sha256="0i4qyjcmw2zvpdgq520kjzf38hddsrjwf0vlg4ylv1kaav7jzgsr"; depends=[]; };
+powerMediation = derive { name="powerMediation"; version="0.2.4"; sha256="1b4hzai52fb0kk04az3rdbfk2vldfkhsa4gx7g98lbsvw4gh9imb"; depends=[]; };
 powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
 powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
 ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; };
@@ -5140,10 +5215,10 @@ prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r
 presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; };
 preseqR = derive { name="preseqR"; version="1.1.1"; sha256="0hz9a7jji2k55a57l03ajkf0j7yp6dgyapyqr1ip0v18fjpfj98q"; depends=[]; };
 prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
-prettyR = derive { name="prettyR"; version="2.1"; sha256="0q6w51758yaxa3l276vqvkvry6v4xz33lx8791b5hyrq837ypx8z"; depends=[]; };
+prettyR = derive { name="prettyR"; version="2.1-1"; sha256="173n0cp0mq00y1ydba9m7l3izz04czg9vvadbflfinpi86wvcgq6"; depends=[]; };
 prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; };
 prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; };
-prevalence = derive { name="prevalence"; version="0.3.0"; sha256="0hg4vpw89pyx2i9za3zg666kyi016sn4jpbk2sp0s435fzqp74dp"; depends=[rjags coda]; };
+prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[rjags coda]; };
 prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[rgl misc3d]; };
 primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
 primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[directlabels gridExtra ggplot2 XML ape httr lubridate plyr scales stringr foreach]; };
@@ -5151,7 +5226,7 @@ princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6a
 prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
 prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; };
 probFDA = derive { name="probFDA"; version="1.0"; sha256="0aqg3f9n1c30wiqml556xmdcv9yr8rijqvymqk89jdzfc0ri25gh"; depends=[MASS]; };
-probemod = derive { name="probemod"; version="0.1"; sha256="1i7hsnnwi20afhfzwmqyh1p7la71sqk49pb0wma80850psdzycdn"; depends=[]; };
+probemod = derive { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; };
 probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
 prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; };
 profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
@@ -5187,9 +5262,9 @@ pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9
 pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; };
 pssm = derive { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[MASS abind numDeriv MHadaptive]; };
 psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-psych = derive { name="psych"; version="1.5.1"; sha256="18nlxv15dh16326jj754bclrp6nnaiw04jsklshm8i2p3m5nzr4k"; depends=[mnormt]; };
+psych = derive { name="psych"; version="1.5.4"; sha256="04n0rfr7i5yhr5ph0fdp9yrmc8m2i4zbf7bh5pvx7s7lfs08z84a"; depends=[mnormt]; };
 psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; };
-psychomix = derive { name="psychomix"; version="1.1-1"; sha256="0p3kidbsmfm09s7c3p8nlj069wcyln1cxmjmj5nj7f618c407zyf"; depends=[flexmix psychotools lattice Formula modeltools]; };
+psychomix = derive { name="psychomix"; version="1.1-2"; sha256="0kah36ps9d0dr594vfk9fy2ag2grknjjgvmkf9vzm0ny52cisc72"; depends=[flexmix psychotools lattice Formula modeltools]; };
 psychotools = derive { name="psychotools"; version="0.4-0"; sha256="17qwlxj00i0aqwf39hwr6mmxa6jy0j6dxfrp9p1xskbgi5cnvslk"; depends=[]; };
 psychotree = derive { name="psychotree"; version="0.15-0"; sha256="08mq4gssrhydn106zm6xxwb1kk43hdzw6jqclx1ya0g8xfri2rrd"; depends=[partykit psychotools Formula]; };
 psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
@@ -5218,6 +5293,7 @@ qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj4
 qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp Rcpp]; };
 qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalifdycm27hsw51r72n86049cdc"; depends=[ncdf XML gdata moments boot fields gplots]; };
 qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
+qclust = derive { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
 qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
 qdap = derive { name="qdap"; version="2.2.0"; sha256="0lbc38x4gvh6q2sb6d524ksfhpvxm8knfy85bmwbf6d3q4s0b6q4"; depends=[ggplot2 qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; };
 qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.5"; sha256="1nk432nyw4srz92zsikv830dpjxflrrgjhq5va6pd3ifpy3nzdrw"; depends=[]; };
@@ -5226,12 +5302,12 @@ qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
 qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool d3Network ggm gtools]; };
 qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[Matrix MASS]; };
-qicharts = derive { name="qicharts"; version="0.1.1"; sha256="1aisbm9h7jdzkgnfh679wi5hfzxw1asgr62z7l51zk9yw7p7mjaw"; depends=[lattice latticeExtra]; };
+qicharts = derive { name="qicharts"; version="0.1.3"; sha256="1f9flcz4w5s6rahk2bkddwjwba72q8himgaqdgza8phaksdzm58v"; depends=[lattice latticeExtra]; };
 qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
-qlcMatrix = derive { name="qlcMatrix"; version="0.9.2"; sha256="1d8953bj69d0nia3qh3s1djf9m7wkvfdxqd234026gh1d3qchkr2"; depends=[Matrix]; };
+qlcMatrix = derive { name="qlcMatrix"; version="0.9.4"; sha256="1nkk712h9nnaqshw766mvk72w6gq9abyry4q1a0ghn0naq3gyl0s"; depends=[Matrix slam]; };
 qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; };
 qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
-qmethod = derive { name="qmethod"; version="1.3.0"; sha256="1c3ifay92rff0k3cfpm9nq81mj91s157iqd0wx89b9bx5zr4d58x"; depends=[psych GPArotation digest knitr xtable]; };
+qmethod = derive { name="qmethod"; version="1.3.1"; sha256="01yj8fr6d615lydb7111lb9qhkg1c6xy8gp2225as53mzbsc890i"; depends=[psych GPArotation digest knitr xtable]; };
 qmrparser = derive { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
 qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; };
 qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; };
@@ -5239,9 +5315,10 @@ qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgv
 qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; };
 qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[matrixcalc mvtnorm ghyp quantreg psych ald]; };
 qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; };
-qrng = derive { name="qrng"; version="0.0-1"; sha256="1pi8cy6sxgqdnsgm1ygrg6s7mx7fxqc9l9s8b94ia91z3xq1yn9m"; depends=[]; };
+qrng = derive { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; };
 qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
 qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; };
+qte = derive { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; };
 qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; };
 qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
 qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; };
@@ -5267,10 +5344,11 @@ quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4
 quantspec = derive { name="quantspec"; version="1.0-3"; sha256="1g4arhhybw021dnz0imdfwwj328gc8yw75cgnnd00skdc402cfhk"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; };
 questionr = derive { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[shiny highr classInt htmltools]; };
 queueing = derive { name="queueing"; version="0.2.4"; sha256="03zz5437bkai2bmk9hcwf09cmyrnbs2cxlafbcf1lp6iahj66il9"; depends=[]; };
+quickpsy = derive { name="quickpsy"; version="0.1.0"; sha256="1p1rhv69bh842r77dxn73l0k2lwa5vj2xc27m470pjygap2zaqv0"; depends=[boot DEoptim dplyr ggplot2 tidyr MPDiR]; };
 quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; };
 quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; };
 qvcalc = derive { name="qvcalc"; version="0.8-9"; sha256="1ysbsm65n05vypvvpsbdfbrb60gij50vsmybzi4405g5z2ds1j72"; depends=[]; };
-qwraps2 = derive { name="qwraps2"; version="0.1"; sha256="1wxviwn3kyz9wp1rf937yqbpvdnib4wsfsd5yws6lpl0y3jwxshb"; depends=[dplyr ggplot2]; };
+qwraps2 = derive { name="qwraps2"; version="0.1.1"; sha256="1kikw92i9l06rxwlnp2sa17wkd8xshryx1rbk4qjzf4yfgmgbkbd"; depends=[dplyr ggplot2]; };
 r2d2 = derive { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
 r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[rgdal sp matrixStats]; };
 r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; };
@@ -5281,7 +5359,7 @@ rAltmetric = derive { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vla
 rAverage = derive { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; };
 rAvis = derive { name="rAvis"; version="0.1.2"; sha256="0m5dl8as0vmmsd3j0z0xwcpq55yfax42fa67qn4lsnaglyqmd4lm"; depends=[stringr XML RCurl scrapeR gdata scales rgdal maptools raster sp]; };
 rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
-rCMA = derive { name="rCMA"; version="1.0.0"; sha256="16d3cdxiaq65lwbvq8wjcp89vrfdp9kwrdl2jy9fynsg0v2lasvp"; depends=[rJava]; };
+rCMA = derive { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; };
 rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; };
 rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; };
 rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
@@ -5301,6 +5379,7 @@ rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v
 rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
 rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxgm9ld5md922ghnka4ymar244m"; depends=[RCurl]; };
 rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.3"; sha256="1w9z0m8ddslsk4d9r8dm5npm1s8sqdjv11x0gc08awa77iwak4wh"; depends=[plyr]; };
+rLiDAR = derive { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[spatstat sp deldir plyr raster geometry rgl bitops]; };
 rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
 rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; };
 rNOMADS = derive { name="rNOMADS"; version="2.1.3"; sha256="1m2qbkqaninczs4v558vpzkiqh0rngkmpp9sk7y4k5j3g4x1jrpf"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; };
@@ -5326,6 +5405,7 @@ raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rar
 rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
 ramify = derive { name="ramify"; version="0.2.0"; sha256="1fn2r6mr461yp00z8c7f1wsyhz3ag13q6ckf84sj11rgg6jivzjj"; depends=[]; };
 ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda maps Matrix nlme fields]; };
+randNames = derive { name="randNames"; version="0.2"; sha256="0mgfwdbadfvxg1dp8aqp2c24lkhz3bi9ssmym4ns6xjq088l3ldh"; depends=[dplyr httr jsonlite]; };
 randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
 random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; };
 random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; };
@@ -5341,6 +5421,7 @@ randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3
 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
 randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; };
 rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; };
+rankdist = derive { name="rankdist"; version="0.3.1"; sha256="0812bw2bm9837lp5l6lwbhln61qb584f0nk2k7nc60m1ppsi0dw6"; depends=[Rcpp hash optimx Rcpp]; };
 rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
 rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; };
 rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; };
@@ -5365,7 +5446,7 @@ rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293
 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
 rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
 rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
-rcbalance = derive { name="rcbalance"; version="1.4"; sha256="00l2q8rivmsry5ahbbickv1y912bmydp52h371pzq3g08rzpqknb"; depends=[MASS plyr]; };
+rcbalance = derive { name="rcbalance"; version="1.5"; sha256="1lqxx9ghxnskl8sy26x03d8baw8kn78mlxbh1gjjkszx4y5bm4vl"; depends=[MASS plyr]; };
 rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; };
 rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
@@ -5381,8 +5462,9 @@ rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdc
 rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; };
 rdrop2 = derive { name="rdrop2"; version="0.6"; sha256="1yxg38v7r34f9rid5q6q1g9f30q3zc4dnkziyps3514l5dnbvk3j"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
 rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; };
+reGenotyper = derive { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots zoo MatrixEQTL]; };
 readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; };
-readGenalex = derive { name="readGenalex"; version="0.4.1"; sha256="02rdx5ya06wpn0r6709aw6f86hk2xivfvjq5mggmm4dmlzgkwg0x"; depends=[]; };
+readGenalex = derive { name="readGenalex"; version="1.0"; sha256="1lhfw8xbwnjhslriaxziw4dskmjfawz5g31h2yl9ds2nwvwhmdwi"; depends=[pegas]; };
 readMLData = derive { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; };
 readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fkc30m6gx6pzmrxr31s80d1qgpcakspjza53qn6fjb16"; depends=[base64enc digest XML]; };
 readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; };
@@ -5422,7 +5504,7 @@ rehh = derive { name="rehh"; version="1.12"; sha256="0qqmh48vxi1yqf6ykfsi6wighly
 relSim = derive { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp Rcpp]; };
 rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
 relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; };
-relations = derive { name="relations"; version="0.6-4"; sha256="02pzyygz4jnv91v90xkldplcwsbd4z5rbmyldlgjdlbpacs3chna"; depends=[cluster slam sets]; };
+relations = derive { name="relations"; version="0.6-5"; sha256="00apza97y3v9q95if4fm5w5f7fw1i091pz4avqs1v59kysahdj9h"; depends=[cluster slam sets]; };
 relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; };
 relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; };
 relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; };
@@ -5436,6 +5518,7 @@ remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0m
 remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; };
 rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffjvs9qkmfaf67icj8k1wngqwmvl2wg88gq"; depends=[XML httr jsonlite]; };
 repfdr = derive { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; };
+replicatedpp2w = derive { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; };
 replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; };
 repmis = derive { name="repmis"; version="0.4.2"; sha256="1pjf010h4rkrwarq541wh8x1267894fsdg8na41z8cp3hr5aql21"; depends=[data_table digest httr plyr R_cache]; };
 repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
@@ -5446,6 +5529,7 @@ reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f86
 repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; };
 represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
 reproducer = derive { name="reproducer"; version="0.1.2"; sha256="067yj1dhhikjrnkklsfp6p03gp4lqxwfdwhl6z8djj4rkzi48xm5"; depends=[openxlsx ggplot2 gridExtra]; };
+rerddap = derive { name="rerddap"; version="0.1.0"; sha256="1a58vsm1m9ybafda6pak0fa7kdfscslq9855a5r2x12bzqy98k4f"; depends=[httr dplyr data_table jsonlite xml2 digest ncdf]; };
 resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
 resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; };
 reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
@@ -5460,7 +5544,7 @@ reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1m
 reval = derive { name="reval"; version="1.0"; sha256="14vzsg3azggfrm1cnrxigbhnpxpjifjf61r71hf73ggpspx2gj5r"; depends=[doParallel foreach]; };
 revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp Rcpp RcppArmadillo]; };
 reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
-rex = derive { name="rex"; version="0.2.0"; sha256="1q9dkk94w152naw1lpd2l2v08ikrfgilqx9v5z14dyqaascqbmva"; depends=[magrittr lazyeval]; };
+rex = derive { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[magrittr lazyeval]; };
 rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp Rcpp]; };
 rfPermute = derive { name="rfPermute"; version="1.6.2"; sha256="069dhv41bwyp2nywkrr2hihyz8zialhxlyzpfpq4r9lyjnamg2k9"; depends=[ggplot2 randomForest gridExtra]; };
 rfUtilities = derive { name="rfUtilities"; version="1.0-1"; sha256="0y0jn4c5dpr9drjyjg2vsgsb37s0l284hvh35zm53hs8f881ycx3"; depends=[randomForest]; };
@@ -5468,7 +5552,7 @@ rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126g
 rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; };
 rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; };
 rfoaas = derive { name="rfoaas"; version="0.1.3"; sha256="0wdb645fx2wsy4vwz43d8ynwx3divpjwbkql52zkikyr8zv21gz5"; depends=[httr]; };
-rfordummies = derive { name="rfordummies"; version="0.0-2"; sha256="01wbhn8wpwkwvkafx4m8l5zj2xjbvwjlzbnwkd4i7g2nrvw29wsx"; depends=[]; };
+rfordummies = derive { name="rfordummies"; version="0.1.1"; sha256="0k725wgba9132cfbm0ppgy476iyh9gcn6bdh9gjqab5sj3jb0iva"; depends=[]; };
 rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp Rcpp]; };
 rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
 rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp Rcpp RcppArmadillo]; };
@@ -5480,22 +5564,23 @@ rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w
 rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; };
 rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[XML Rook igraph]; };
 rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
-rgl = derive { name="rgl"; version="0.95.1201"; sha256="0vd2zww17p2lcdipv7ijclbisy6ms6d1a4qnwpj1y1kbkhcplw1j"; depends=[]; };
+rgl = derive { name="rgl"; version="0.95.1247"; sha256="1zmb09lljng1dmwd23w5ld8z9wr0xd0s365vz54il0ndwrqfhsi1"; depends=[]; };
 rglobi = derive { name="rglobi"; version="0.2.6"; sha256="042lc71j49bndlmcxmqdjly48qvqjpif7dgzk4cxsmbil5jmyzks"; depends=[rjson RCurl]; };
 rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; };
 rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[rgp shiny emoa]; };
-rgr = derive { name="rgr"; version="1.1.10"; sha256="1gmr4px70dwz45zb4w1vqddqpw1idln2rids9cdh2fxppdf9m9x8"; depends=[MASS fastICA]; };
+rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[MASS fastICA]; };
 rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; };
 rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; };
 ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
+riceware = derive { name="riceware"; version="0.2"; sha256="1rd64saags4s7nadpbi38h8m8mw6y44lmdi8vmg58mglkfcbqf32"; depends=[random]; };
 rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; };
 ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; };
 rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; };
 rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
 ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; };
 ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; };
-rio = derive { name="rio"; version="0.1.2"; sha256="0h80msbj1qcc9m4408qcckw238ydqdzzgr9frlmmc7qi4dyba4i4"; depends=[stringr foreign testthat]; };
-rioja = derive { name="rioja"; version="0.9-3"; sha256="0r164072g4mxq4lznvh72y5r6hnygmd6rwra9whn9s8p31w3g803"; depends=[vegan mgcv lattice gdata]; };
+rio = derive { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[foreign haven openxlsx readODS jsonlite XML curl data_table readxl]; };
+rioja = derive { name="rioja"; version="0.9-5"; sha256="0bi80d8ffn1kgs0b45ia8rj057id8l3mnph16y5wc5nr8fndxrm4"; depends=[vegan mgcv lattice gdata]; };
 ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp Rcpp]; };
 riskRegression = derive { name="riskRegression"; version="1.1.1"; sha256="1qjy2wmbfalbxszjfplisqrdca0n0yccr0wvdf1kbzxblba82mx6"; depends=[prodlim rms pec cmprsk survival randomForestSRC]; };
 riskSimul = derive { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
@@ -5520,7 +5605,7 @@ rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fh
 rlm = derive { name="rlm"; version="1.1"; sha256="147hn780hjbp8ly3mc5q05g36b080ndq0z0r0vq75c2qfkhybvdc"; depends=[]; };
 rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp Rcpp]; };
 rmaf = derive { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
-rmarkdown = derive { name="rmarkdown"; version="0.5.1"; sha256="08v16n4a9rdr0fh54hlmfxifbpl40nfr24g3wrjxxacml16smcsd"; depends=[knitr yaml htmltools caTools]; };
+rmarkdown = derive { name="rmarkdown"; version="0.6.1"; sha256="1j6hz7ybyvqzd5zdshb9z1v5y5gfgdlcvzacx06c5kgf8h6i0k3h"; depends=[knitr yaml htmltools caTools]; };
 rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[Matrix lattice]; };
 rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
 rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ape ade4 gtools]; };
@@ -5529,7 +5614,7 @@ rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1
 rmngb = derive { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
 rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; };
 rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; };
-rms = derive { name="rms"; version="4.3-0"; sha256="135mrl7jv310l8w1nxaa5rsvib7j27sbdxz0bi1xxi5zywb8cmf4"; depends=[Hmisc survival lattice ggplot2 gridExtra SparseM quantreg nlme rpart polspline multcomp]; };
+rms = derive { name="rms"; version="4.3-1"; sha256="07198lzk3yzl9vnqcfxqgp5kpb50s1ydg33m883rcr3a5pd9m094"; depends=[Hmisc survival lattice ggplot2 SparseM quantreg nlme rpart polspline multcomp]; };
 rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
 rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
 rnbn = derive { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; };
@@ -5541,7 +5626,7 @@ rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8
 rngwell19937 = derive { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
 rnoaa = derive { name="rnoaa"; version="0.3.3"; sha256="12iwyl0nr6d8xpl5vcqwli4rlh79y8l13sfj34457klqdzmrg126"; depends=[httr lubridate plyr ggplot2 scales sp RCurl rgdal rgeos maptools stringr XML data_table jsonlite digest]; };
 rnrfa = derive { name="rnrfa"; version="0.1.5"; sha256="0lpa0gmf9j9adq0p41jgayzcwg6220bihnsfqj55d217mfalbhnd"; depends=[XML2R RCurl zoo rjson rgdal sp stringr]; };
-robCompositions = derive { name="robCompositions"; version="1.9.0"; sha256="0kplw0zlszfarkhsk2hrakf649c3sl1ig8l8xhknj1v2qwkblbx2"; depends=[robustbase rrcov GGally MASS pls]; };
+robCompositions = derive { name="robCompositions"; version="1.9.1"; sha256="1n8mbm62ywp1wnccv85ydm91bzp05i4fjvyriid8751pcb4zndn9"; depends=[robustbase rrcov GGally MASS pls sROC]; };
 robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
 robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
 robfilter = derive { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[robustbase MASS lattice]; };
@@ -5567,7 +5652,7 @@ ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177
 rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; };
 rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp rgl sphereplot Rcpp RcppArmadillo]; };
 roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[randomForest mice nnet]; };
-rowr = derive { name="rowr"; version="1.1.1"; sha256="1bpx9vd6i2ljwww3gp4c1fxbv9lsdxh3jdwkmrqqj2s18bkf0a7a"; depends=[]; };
+rowr = derive { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; };
 roxygen2 = derive { name="roxygen2"; version="4.1.1"; sha256="0qr562p3jb9kqim6mj344956pikmq1137gv1p086b4k90h5c3wyd"; depends=[stringr brew digest Rcpp Rcpp]; };
 royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[nortest moments]; };
 rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
@@ -5579,8 +5664,8 @@ rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16x
 rpf = derive { name="rpf"; version="0.44"; sha256="1q68lb7cw4p31mrjwxyn2bkpclmgfcnln8z0brs9pkkh70j0vii8"; depends=[mvtnorm RcppEigen]; };
 rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; };
 rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
-rplexos = derive { name="rplexos"; version="0.13"; sha256="149y0y0qb18igg4pc0i27vfpwcvfvg24ixqrqcya5xvdrm1h63aj"; depends=[Rcpp dplyr RSQLite DBI data_table lubridate reshape2 stringi assertthat doParallel foreach Rcpp]; };
-rplos = derive { name="rplos"; version="0.4.6"; sha256="01vfb07fc5z0pm6d5wvcpfwjx5fha9par3fpra9v6snaqm74l3w5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; };
+rplexos = derive { name="rplexos"; version="1.0"; sha256="129izg9ipn2pfm4yq0lg597nn9rcxr8m9yslmra85jmzbisc1vfw"; depends=[Rcpp dplyr RSQLite DBI data_table lubridate reshape2 stringi assertthat doParallel foreach Rcpp]; };
+rplos = derive { name="rplos"; version="0.4.7"; sha256="0d6p6cgjmfv615mpvp6vxm92gxfdi6fn4mp0ixhj2gkm1hmpwwc5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; };
 rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
 rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
 rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hmb1ky3a84fykx5gpnbswplhidh2qhb9jz"; depends=[stringr]; };
@@ -5602,7 +5687,7 @@ rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl
 rscala = derive { name="rscala"; version="1.0.4"; sha256="05pgyzin0d5lfz5rjf0c0j7b2zj7b8r1blgd126kjlvjkj1spy84"; depends=[]; };
 rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
 rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
-rsdmx = derive { name="rsdmx"; version="0.4-5"; sha256="12rk0bcfsnkd2447jyc40857ksm7gbg4nn3slls9wsd641am6kxi"; depends=[XML RCurl plyr]; };
+rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[XML RCurl plyr]; };
 rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; };
 rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; };
 rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; };
@@ -5637,6 +5722,7 @@ rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrf
 rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
 rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
 rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; };
+rversions = derive { name="rversions"; version="1.0.0"; sha256="0k9v77bpxbxxmf5bdansg074zx3cm4hhaw6vl9f6c58xzxl567nf"; depends=[RCurl XML]; };
 rvertnet = derive { name="rvertnet"; version="0.2.2"; sha256="14afdf0mflpa2arxdy44y8mak9j3cg2cgk97idd7k4pi8vf6q0jg"; depends=[plyr jsonlite httr data_table ggplot2 maps]; };
 rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr XML selectr magrittr]; };
 rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
@@ -5646,7 +5732,7 @@ rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bf
 ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; };
 rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; };
 rzmq = derive { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; };
-s20x = derive { name="s20x"; version="3.1-15"; sha256="1l635mgqr95n2is56q34ahd0fpiymsdqbrmqf8vaa15spnfqcrwn"; depends=[]; };
+s20x = derive { name="s20x"; version="3.1-16"; sha256="10z19q28wv3jnrs8lhban4a6hxqxgivcalq633p3hpa4zhw7nsj7"; depends=[]; };
 s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; };
 s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; };
 sBF = derive { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; };
@@ -5666,7 +5752,7 @@ safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sh
 safi = derive { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
 sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; };
 sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; };
-samplesize4surveys = derive { name="samplesize4surveys"; version="2.1.0"; sha256="08vs1b4rwyd4yh3y2l1gkh8wpjhh2w52929p6b0sfj0iywp2dr03"; depends=[TeachingSampling]; };
+samplesize4surveys = derive { name="samplesize4surveys"; version="2.4.0.900"; sha256="199g2gsbv1w1acn7nnlv2wbrhq7lc1mx8vvs1w9a9a8dkxdmml0g"; depends=[TeachingSampling]; };
 sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; };
 samplingEstimates = derive { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
 samplingVarEst = derive { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq3sh69iy8p07ch210p22n5mds7cxp5s6zggzamqpf0hpnw7"; depends=[]; };
@@ -5677,7 +5763,6 @@ sandwich = derive { name="sandwich"; version="2.3-3"; sha256="1x2x0yxlrhdfyhk6jw
 sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
 sanon = derive { name="sanon"; version="1.4"; sha256="0zg0paiz3rb0fk2mgi8rlzqy9vq3afy5vx6s15k1xqz8rjgsbd1x"; depends=[]; };
 sapa = derive { name="sapa"; version="2.0-1"; sha256="11xgd2ijfz5yn0zyl5gfy97h2cxi1vyxkrijy2s9b78wm7fzpnkv"; depends=[ifultools splus2R]; };
-saps = derive { name="saps"; version="1.0.0"; sha256="02si76ckinkm4ajclq4isy6gi0cf1mwfrq3w17i5gflbfqmf2qvj"; depends=[survival reshape2]; };
 sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
 saturnin = derive { name="saturnin"; version="1.0"; sha256="0686c0y6dcnr8jcx26pd4g08hmlalbid6idg465pngshr57kl79k"; depends=[]; };
 saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
@@ -5709,8 +5794,8 @@ scrm = derive { name="scrm"; version="1.5.0-1"; sha256="176k3qmlfs1cj8gm421p3hiv
 scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp Rcpp]; };
 scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; };
 sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[entropy corpcor fdrtool]; };
-sdcMicro = derive { name="sdcMicro"; version="4.4.0"; sha256="0ig43sdzn940mpv2d8v1v0k77nb5mwwsy8amkb6vdxs0rql7qvyy"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; };
-sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; };
+sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; };
+sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[sdcMicro gWidgetsRGtk2 gWidgets cairoDevice vcd foreign Hmisc]; };
 sdcTable = derive { name="sdcTable"; version="0.18.0"; sha256="13k96ahz6vzvbnvca18p0r1pv9k6sdmxbq04cf76an7r2g4w6kji"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; };
 sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[magic foreach doParallel tuple]; };
 sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
@@ -5718,7 +5803,7 @@ sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhp
 sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; };
 sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[GPArotation ggplot2 psych raster]; };
 sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
-sdprisk = derive { name="sdprisk"; version="1.0-3"; sha256="0v490zz2c1qa0w9nfd0xs5xbbvd9g8vp39fp8x7k7cy598vby4yx"; depends=[numDeriv PolynomF rootSolve]; };
+sdprisk = derive { name="sdprisk"; version="1.1-0"; sha256="03nbvrrgzcnczj1zsnqakjy278bg15vva6yb35clks5zyipl0qdk"; depends=[numDeriv PolynomF rootSolve]; };
 sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
 sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; };
 seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x250fq8qp57gdv61gg4ck24v4jbl8qvwhla"; depends=[oce]; };
@@ -5726,12 +5811,12 @@ sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2
 searchable = derive { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
 seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
 season = derive { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[ggplot2 MASS mgcv survival coda]; };
-seasonal = derive { name="seasonal"; version="0.80.0"; sha256="06rwbvzgxrhqldni59qq0xzky4qzlkrx088i9qgs99id8ypbvvc5"; depends=[]; };
+seasonal = derive { name="seasonal"; version="0.90.0"; sha256="0r5l69vl0lqi9hdxi90wx22v38p3izwx3cn124awzlak49i2qn0l"; depends=[]; };
 seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; };
 secr = derive { name="secr"; version="2.9.4"; sha256="0g7j68ys9dd8rz1y8wsmy3lwwxpwwkps6wpx67l86lzz99nwh64g"; depends=[abind MASS nlme sp mgcv raster]; };
 secrdesign = derive { name="secrdesign"; version="2.3.0"; sha256="1f5swggkky721z0js2jr1gb3mrx9h6qlld70bjd86x9f73s9cm0n"; depends=[secr abind]; };
 secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[secr sp igraph maptools MASS]; };
-seedy = derive { name="seedy"; version="1.0"; sha256="1p9mbnkgdz3rlaj5ygaai81g8kvs68y4zcgf7745gr17vflys8kf"; depends=[]; };
+seedy = derive { name="seedy"; version="1.2"; sha256="1m800b2faaih4xjsl3jwrqd177jjygbvrf9mb1h84hdzy095b5c0"; depends=[]; };
 seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; };
 seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
 seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj803lmdvg5p1fla685xb3s2a3if1q5zc5i"; depends=[fftw tuneR]; };
@@ -5763,7 +5848,7 @@ sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqg
 sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[Matrix gtools MASS]; };
 separationplot = derive { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
 seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
-seqDesign = derive { name="seqDesign"; version="1.0.2"; sha256="0v4g4r9y79vqf4i2r96y6wgjf2aww98k06rk3lpr4cz1yp5x3gvx"; depends=[survival xtable]; };
+seqDesign = derive { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
 seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[survival Matrix coxme CompQuadForm]; };
 seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
 seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
@@ -5778,17 +5863,18 @@ servr = derive { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpn
 sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; };
 session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
 setRNG = derive { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
-sets = derive { name="sets"; version="1.0-13"; sha256="1ys17iy2gjkfnp3914g6sfx3ilgm18pdfak59cqrwalwwnhc3zaz"; depends=[]; };
+sets = derive { name="sets"; version="1.0-14"; sha256="1wfg4yc3p7zqcj2z3lb5knv6l3lw4pf20s3rkpz4yj4nsb41zs4g"; depends=[]; };
 settings = derive { name="settings"; version="0.2.1"; sha256="0dxnysa3857d141rk46pyfkbgzk6ms3fhb2bz0y41jy72bdhxmrm"; depends=[]; };
 setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; };
 severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
 sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
 sfsmisc = derive { name="sfsmisc"; version="1.0-27"; sha256="16hkm0ylwipc1zqsi8fiwyqvl9hpjgl7kyvgamibxlbp1y669qgm"; depends=[]; };
 sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; };
-sgPLS = derive { name="sgPLS"; version="1.1"; sha256="09nf9qqhlddcgp2y44lxgva9vy3dgbmw1hbl0phw95wb8b9p1m0s"; depends=[mixOmics]; };
+sgPLS = derive { name="sgPLS"; version="1.2"; sha256="1q3pf4sfh8l2qwxm0qd3sg29kvvprpcyis0afbcjhvfr10w91xpw"; depends=[mixOmics]; };
+sgd = derive { name="sgd"; version="0.1"; sha256="16jqzshkg1n1azyfjadyg454ar0hk2dmw9ba1wrn6rh7mxsngik6"; depends=[Rcpp MASS Rcpp RcppArmadillo BH]; };
 sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; };
 sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; };
-sglasso = derive { name="sglasso"; version="1.1-1"; sha256="0qfpnvk5r9a0ri2zxgv75qc46dnaf4193f3m32hvq3lmynx3cyjg"; depends=[Matrix]; };
+sglasso = derive { name="sglasso"; version="1.2"; sha256="1y2ms6p792klzmy3prhsyanlbp7n004di9hscma7ih3jx9703wsr"; depends=[Matrix igraph]; };
 sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
 sgof = derive { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; };
 sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
@@ -5806,10 +5892,12 @@ shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0y
 shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
 shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
 shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
+shinydashboard = derive { name="shinydashboard"; version="0.4.0"; sha256="0my1bz983ncnvljhz6d25q9bqc510q9dgl9wzcg8c0civyjaps39"; depends=[shiny htmltools]; };
+shinyjs = derive { name="shinyjs"; version="0.0.3.3"; sha256="1fgydm8ai0fvfqbwlkj27pa3nl242kb3xiai50lrda0ssqbrnw67"; depends=[shiny]; };
 shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; };
 shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; };
 shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
-showtext = derive { name="showtext"; version="0.3"; sha256="1spbrzjasd0ljipbf45iar7b0vksla93iajypfbq2ndwyid3yzj4"; depends=[sysfonts showtextdb]; };
+showtext = derive { name="showtext"; version="0.4-1"; sha256="1c2wd107g2xg8khlad5vimwj7wdxk7b7i2k1ydkkd7b47c6d9zhh"; depends=[sysfonts showtextdb]; };
 showtextdb = derive { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; };
 shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; };
 shrink = derive { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[survival MASS rms]; };
@@ -5826,7 +5914,7 @@ signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2n
 signal_hsmm = derive { name="signal.hsmm"; version="1.2.1"; sha256="0nxhksvwkidmp5x27hxmwxbv747lrwa19b4vi6dx72hny8prgvpc"; depends=[biogram seqinr shiny]; };
 simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; };
 simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[survival mvna]; };
-simPH = derive { name="simPH"; version="1.3"; sha256="1hazh1flag3n7mrab9agc6nmiii0amdcxlbgzadiwpgyrdbdhkjn"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; };
+simPH = derive { name="simPH"; version="1.3.1"; sha256="1i4sqaiiy77a4c3aq52d0ddn3abkkqgjh5sxj2v459gck5fd9rgs"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; };
 simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; };
 simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; };
 simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; };
@@ -5837,6 +5925,7 @@ simecol = derive { name="simecol"; version="0.8-6"; sha256="0h48klfwk0836byncqn9
 simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; };
 simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
 simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; };
+simpleNeural = derive { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
 simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; };
 simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; };
 simrel = derive { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
@@ -5845,14 +5934,14 @@ simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp
 siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; };
 sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; };
 sirt = derive { name="sirt"; version="1.5-0"; sha256="0mj6j336b4kzd2fsy3nha66r88cyfnq70cgfld36p9izlxlq6l7x"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; };
-sisVIVE = derive { name="sisVIVE"; version="1.0"; sha256="1y6zq8dp5k9mx83x6fryjh0h5f5wyry1cbi33rj3h7sss8vi3vz0"; depends=[lars]; };
+sisVIVE = derive { name="sisVIVE"; version="1.1"; sha256="1p1l07pgd88ap3bp0zwinnzda07pfg6cn92ync2pkqn5l0gmfxbs"; depends=[lars]; };
 sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; };
-sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; };
+sitar = derive { name="sitar"; version="1.0.2"; sha256="0z9r3z512s0gpkcpdbi45qdl40rp4jacpm9k0c5pjilwiga6p07z"; depends=[nlme quantreg]; };
 sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
 sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; };
-sjPlot = derive { name="sjPlot"; version="1.7"; sha256="0kk9isz105y6m83vk6x6c7i55kch51w2a4l8nlc44ffbm8zwqqa1"; depends=[ggplot2 MASS car foreign psych scales dplyr tidyr]; };
+sjPlot = derive { name="sjPlot"; version="1.8"; sha256="10hbm76qrlbcl384vfp9gkhlkxpvic8iq3l0k97pb7pv8k4482mx"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; };
 sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
-sjmisc = derive { name="sjmisc"; version="1.0.0"; sha256="1hzh39az30xhda3jvah8lldd42fm8ipc6kqyzh2pq2dhwkbnhns4"; depends=[MASS]; };
+sjmisc = derive { name="sjmisc"; version="1.0.1"; sha256="1a8i355jzp77d8ngyyyiw12yx2ppc2drh3qxs2n4b361vxcq8p6m"; depends=[MASS]; };
 skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; };
 skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
 skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
@@ -5890,7 +5979,7 @@ smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h
 smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; };
 sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; };
 smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
-sn = derive { name="sn"; version="1.2-0"; sha256="05n1kns8p1l7v87k3rxzgcz1vphq38cah7w01xq2bgcnklx677n8"; depends=[mnormt numDeriv]; };
+sn = derive { name="sn"; version="1.2-1"; sha256="0sqmabksvv13adf521mbzbi76dgbxc37xppjw4vwzmp4x6d8h0jf"; depends=[mnormt numDeriv]; };
 sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
 snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
 snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv zoo plyr reshape]; };
@@ -5907,14 +5996,15 @@ snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijy
 sns = derive { name="sns"; version="1.0.0"; sha256="0qr5gj095xg48mqj7maz1m1zizx1jdjca8qygygqvak1b7nl4ccs"; depends=[mvtnorm coda]; };
 soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; };
 softImpute = derive { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
-softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; };
+softclassval = derive { name="softclassval"; version="1.0-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; };
 soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[pls KernSmooth wavelets hexView sp GSIF]; };
-soilDB = derive { name="soilDB"; version="1.5-2"; sha256="1xiiprshh40qkx23wxd20rd7bsbwgw03pa0hv8m6q64pri7v8xq0"; depends=[aqp plyr Hmisc RCurl XML sp]; };
-soilphysics = derive { name="soilphysics"; version="2.2"; sha256="02x0xn8126g8g86nsqkj3qwabd9lkayra30ac3pbg0yn38kipz4d"; depends=[rpanel MASS]; };
+soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs04dxgbs4nv8ay27d2vi0xrkqhs99k2"; depends=[aqp plyr Hmisc RCurl XML sp]; };
+soilphysics = derive { name="soilphysics"; version="2.3"; sha256="1d64jaw5ra1l0za2kpigqfdf52a5zrxy9j9g2g7f5yffqsp0jwb5"; depends=[rpanel MASS]; };
 soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
 soiltexture = derive { name="soiltexture"; version="1.2.19"; sha256="0nw72913qb1hpifjqv0s1z5sxhgavhbalqhjczxg8b66fwqzrs7l"; depends=[sp MASS]; };
 soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
-solaR = derive { name="solaR"; version="0.38"; sha256="0cvza0d4kd47kr6749ysvw664kjja87ppn4jvan4hrklczbpdc9z"; depends=[lattice latticeExtra zoo]; };
+solaR = derive { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[zoo lattice latticeExtra RColorBrewer]; };
+solarius = derive { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[plyr ggplot2 data_table]; };
 solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[plyr httr XML assertthat rjson]; };
 som = derive { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; };
 soma = derive { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
@@ -5928,14 +6018,15 @@ sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0r
 sorvi = derive { name="sorvi"; version="0.7.20"; sha256="1cd0lg74lfdbkp314i40asc3vshs1acb20wz1cxzg62vyz6ia055"; depends=[reshape ggplot2 plyr RColorBrewer XML]; };
 sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; };
 sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; };
-sotkanet = derive { name="sotkanet"; version="0.9.03"; sha256="1h8jmwv99hcrl5hkd99ypphvl8hx6k765vb8aphzp8a0vh42pkl1"; depends=[ggplot2 rjson]; };
-soundecology = derive { name="soundecology"; version="1.2"; sha256="0vxnkqn9ibz1il687rn5fygyl9hrqbf646r1kwdiksw3qz6a16r2"; depends=[pracma oce ineq vegan tuneR seewave]; };
+sotkanet = derive { name="sotkanet"; version="0.9.10"; sha256="0nshd6caxxayr7w39d6ildz42aarr3ff8iyfpwjd544yhblkj7jh"; depends=[ggplot2 RCurl rjson]; };
+soundecology = derive { name="soundecology"; version="1.3"; sha256="1kcmsas359xcwqd0lxffr5p996jikqdag6idibq57qb6rnz3hgfz"; depends=[pracma oce ineq vegan tuneR seewave]; };
 source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
-sp = derive { name="sp"; version="1.0-17"; sha256="02j0q2b0i7j4p7i5l19n4dq92iv7dspwwg3jx2qkv3481p5dq25q"; depends=[lattice]; };
+sp = derive { name="sp"; version="1.1-0"; sha256="1lnc1vlxw15wk69hh7c26dc7vxydyxwi8rfpwrpn9wj4pm0hp8a5"; depends=[lattice]; };
 sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
 spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[coda magic abind Formula]; };
 spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; };
 spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; };
+spTest = derive { name="spTest"; version="0.1.0"; sha256="0asfgf0dx72025q41ndzgwm2n471lwha7bcc1dfk3zwib75w3lgl"; depends=[]; };
 spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; };
 spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; };
 spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
@@ -5944,7 +6035,7 @@ spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dm
 space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
 spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; };
 spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
-spacetime = derive { name="spacetime"; version="1.1-3"; sha256="04myzza2av2sr6g75dlklr3nv36hr3frvafphzn278vbhma777d9"; depends=[sp zoo xts intervals lattice]; };
+spacetime = derive { name="spacetime"; version="1.1-4"; sha256="1amxdjjqxibllwnb70chqmfnn66n95yf0wjmbrkjnzjszhbb25q2"; depends=[sp zoo xts intervals lattice]; };
 spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp Rcpp]; };
 spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; };
 spam = derive { name="spam"; version="1.0-1"; sha256="033s5ka05kg97fmc3l1li3z6x5225rwhrdxh57wwn4axrjwy1nyy"; depends=[]; };
@@ -5953,7 +6044,7 @@ sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n5
 sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
 spareserver = derive { name="spareserver"; version="1.0.0"; sha256="0vaql5v3337xh1ifjziav3v7fkjff4zhrz557mgy75ham554gs7c"; depends=[assertthat pingr httr]; };
 spark = derive { name="spark"; version="1.0.0"; sha256="0ryc7kq3hx8nd5m999p1y7lxli6x862y6hqpv8xwpqak0y863p6m"; depends=[magrittr]; };
-sparkTable = derive { name="sparkTable"; version="0.12.0"; sha256="1q0wz090db9ff46k9w6wk1qk20yr527ilg2ply4qcw3zjydk8cc5"; depends=[Cairo gridExtra ggplot2 shiny Rglpk xtable StatMatch boot pixmap RGraphics]; };
+sparkTable = derive { name="sparkTable"; version="1.0.0"; sha256="1d5vv7whayblq5g4pjrngkqf3d1pi4f0gibnskllv7rdad10n4nd"; depends=[Cairo gridExtra ggplot2 shiny Rglpk xtable StatMatch boot pixmap RGraphics]; };
 sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
 sparr = derive { name="sparr"; version="0.3-6"; sha256="1imgph2bf575rm06l4vsz0nhizkrwa3p5j6b6gdn30l0hlhxjp0j"; depends=[spatstat rgl MASS]; };
 sparseBC = derive { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[glasso fields]; };
@@ -6019,7 +6110,7 @@ splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1
 spnet = derive { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[sp shape]; };
 spocc = derive { name="spocc"; version="0.2.4"; sha256="0hhjdx3vgzfwf368pvmapgb5hll659mwkyzvgagvzz90sm44134a"; depends=[ggplot2 rgbif rinat rbison ecoengine rebird AntWeb ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr rgdal leafletR whisker gistr]; };
 sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
-sprex = derive { name="sprex"; version="1.0"; sha256="0m0v0db01a3zd934ini60hqnkc6cfyj8hbsxp2xvw06lblg46dzh"; depends=[]; };
+sprex = derive { name="sprex"; version="1.1"; sha256="1lwkdi8g1dlfdnxxvspgpz6f5h2gml176xhfrcxa9gcy3y9rlcpm"; depends=[]; };
 sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[rlecuyer ff randomForest boot e1071]; };
 sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost survival GAMBoost randomForestSRC LogicReg]; };
 sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[ggplot2 cvTools reshape2 pcaPP]; };
@@ -6043,16 +6134,17 @@ sse = derive { name="sse"; version="0.5-4"; sha256="126dc4gk0hynwfz887d3wdcs7xac
 ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
 ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
 ssize_fdr = derive { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; };
+ssizeRNA = derive { name="ssizeRNA"; version="1.1.1"; sha256="19l7kmkc1cnggf0rcqxphifw5y6iknkxas0ik3kfd1swsgmvw587"; depends=[MASS ssize_fdr]; };
 ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; };
 sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
-sspse = derive { name="sspse"; version="0.5"; sha256="1r2pfqpr5y6q0vjcf14020srxcpqd5jjab73i4m03aqqsryr8c6c"; depends=[coda]; };
+sspse = derive { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; };
 sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
 ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
 ssym = derive { name="ssym"; version="1.5.2"; sha256="0c3c4disiicavr8m2yvvi2k38gnw4akdqp0f1v6647i5zj160zkr"; depends=[GIGrvg numDeriv normalp Formula]; };
 st = derive { name="st"; version="1.2.4"; sha256="1lnrzz7kc21mrs8xrqs21fcwd92d5kzhvfiq36j02982n18f6c64"; depends=[sda fdrtool corpcor]; };
 staTools = derive { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[Rcpp VGAM magicaxis Rcpp]; };
 stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vdhv06kn229cmhqbr7dsz933vwwf"; depends=[MASS reshape]; };
-stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; };
+stabledist = derive { name="stabledist"; version="0.7-0"; sha256="06xd3kkyand0gzyj5phxlfjyygn5jlsq7gbwh62pc390by7ld2c7"; depends=[]; };
 stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; };
 stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; };
 stagePop = derive { name="stagePop"; version="1.0-1"; sha256="0yb1dbgmns6km0p35wny6f4v7xl4225v8lww0wmzrvdw7l2m8m8d"; depends=[deSolve PBSddesolve]; };
@@ -6071,7 +6163,7 @@ stcm = derive { name="stcm"; version="0.1.0"; sha256="0j2yhmg6m69igg3ilrf7rq3l37
 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
 stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
 stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; };
-stepR = derive { name="stepR"; version="1.0-1"; sha256="1iafxg0g0cy6v98b85h68xrmfndc2hbmr9x7v5nk16zgcknl8k96"; depends=[]; };
+stepR = derive { name="stepR"; version="1.0-2"; sha256="1z2jncjhaxzxw5kqa8s3jlsl9blz3b7hlnzr3phfhwmb1hr6r56k"; depends=[]; };
 stepp = derive { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; };
 stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
 stheoreme = derive { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; };
@@ -6101,9 +6193,9 @@ stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbs
 stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; };
 stringdist = derive { name="stringdist"; version="0.9.0"; sha256="0304a3qyssq2l2c7da5a90fca32n3ph5jixqnqvb3jwzdb8dxm2f"; depends=[]; };
 stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i2h4vgddfspyrxwh3am33apv8r8vr4bnj"; depends=[]; };
-stringr = derive { name="stringr"; version="0.6.2"; sha256="0dv7dd0xsivlccnf9pr5kb7zirgqn9mc6lgw5hnmkbb0s1qrrz63"; depends=[]; };
+stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[stringi magrittr]; };
 strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; };
-structSSI = derive { name="structSSI"; version="1.1"; sha256="0rmf3q65adrqh9nrc4apqm4ca7frpwqr6xh80b4mxiz0z4wfcv9q"; depends=[igraph rjson ggplot2 reshape2]; };
+structSSI = derive { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[igraph rjson ggplot2 reshape2]; };
 strum = derive { name="strum"; version="0.6"; sha256="1jd8h8fnjv4a58shl0j9fdlds7xns1j18b9qaqhrfa4hrdrw75s9"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; };
 strvalidator = derive { name="strvalidator"; version="1.4.0"; sha256="1zgfy5w4qwcm3jdqigahxi7xn8328jr568ssbj99ibzdj0m0hmfw"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; };
 stsm = derive { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; };
@@ -6124,14 +6216,16 @@ superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01
 superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust Matrix]; };
 superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; };
 superpc = derive { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
-support_BWS = derive { name="support.BWS"; version="0.1-2"; sha256="14p5b4b84x66lzn7qz1xy7sbb5i3wqwcsf6r6ap612nj83srjmqa"; depends=[]; };
-support_CEs = derive { name="support.CEs"; version="0.3-2"; sha256="0q8n4w3p682165lv20m30m8p9mhd3wzrzg8aqizf9zc2m5w9ffyd"; depends=[DoE_base MASS simex]; };
+support_BWS = derive { name="support.BWS"; version="0.1-3"; sha256="1qlh2zgmr3b6gz3xmncjawgg08c6kgfg3d2m9x78iw95x7p3p5h8"; depends=[]; };
+support_CEs = derive { name="support.CEs"; version="0.3-3"; sha256="0772j0sssf6fwig9v1ra83fwas8109yf30n0xq8s5cxsnnn41m2y"; depends=[DoE_base MASS simex]; };
 surface = derive { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape ouch MASS geiger]; };
 surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[survival plotrix flexsurv survC1]; };
 survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
 survAccuracyMeasures = derive { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[survival Rcpp Rcpp RcppArmadillo]; };
 survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
 survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; };
+survJamda = derive { name="survJamda"; version="1.1.3"; sha256="03cwp1nw8nnkcjiafysbc1w24fwb7j5ksr01rlpf0g0qdi9zlgwi"; depends=[survival survivalROC ecodist survJamda_data]; };
+survJamda_data = derive { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
 survMisc = derive { name="survMisc"; version="0.4.6"; sha256="1d16kkzg0clwvv5rgv4rlm79dxhxhhzv9bkx6420izmyx0wjcnhn"; depends=[survival KMsurv combinat Hmisc zoo km_ci ggplot2 data_table gridExtra rpart gam]; };
 survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; };
 survRM2 = derive { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; };
@@ -6178,13 +6272,14 @@ sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256
 symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[clusterSim XML rgl shapes e1071 ade4 cluster]; };
 symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
 symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; };
+synRNASeqNet = derive { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[parmigene GenKern igraph KernSmooth]; };
 synbreed = derive { name="synbreed"; version="0.10-5"; sha256="0qhcxmcxa0ixn6ql2dr7pq10g7hmv55rcn279wz4cg5mbgqkhvmm"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; };
-synbreedData = derive { name="synbreedData"; version="1.4"; sha256="0pfpvg4wvxfwpvxq8f93z1amfss98as66kwpj5mnvvlr33ffmka9"; depends=[]; };
+synbreedData = derive { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; };
 synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri BH]; };
 synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
 synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; };
 synthpop = derive { name="synthpop"; version="1.1-0"; sha256="1j9d0jpmr8dva2c7gd6z1q0a3qdxkvmm83xlv08dxkbvsfbzvmmr"; depends=[lattice MASS nnet ggplot2 coefplot rpart party foreign plyr proto]; };
-sysfonts = derive { name="sysfonts"; version="0.4"; sha256="0y33ykcxynm90inq8s5phdg3mfkx30szqld75h0b2faykpv6q3r4"; depends=[]; };
+sysfonts = derive { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; };
 systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; };
 systemicrisk = derive { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[Rcpp lpSolve Rcpp]; };
 syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[openNLP NLP]; };
@@ -6209,6 +6304,7 @@ tcR = derive { name="tcR"; version="1.3"; sha256="09jvmnyq9j0l8ng73jr2ldb70fbqry
 tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
 tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; };
 tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[rjags coda png deSolve]; };
+tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[lattice ggplot2 RColorBrewer]; };
 tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
 teigen = derive { name="teigen"; version="2.0.8"; sha256="0gh5p2rwv1krrbq92wpgl1ya74vrdxhsagd7r7wvyxvxdv3j94v5"; depends=[]; };
 tempdisagg = derive { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; };
@@ -6223,15 +6319,15 @@ testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3a
 testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; };
 texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; };
 texmexseq = derive { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; };
-texreg = derive { name="texreg"; version="1.34"; sha256="03w8fk5lkpgag22a63jnhf0cn3l5ryjh4pkfhxgqzrijvrr1v2cb"; depends=[]; };
+texreg = derive { name="texreg"; version="1.35"; sha256="0c1w6kzczzflcmvr544v3gdasvyjxcwqgdm2w2i9wp7kd1va37fr"; depends=[]; };
 textcat = derive { name="textcat"; version="1.0-2"; sha256="0sjhahmqva9pwp75zwxxf8g1cw38awid3w6rx9xfx73cpj2blcz3"; depends=[tau slam]; };
 textir = derive { name="textir"; version="2.0-3"; sha256="039xl2h0igrp3fzr1qiyb0zr6j4bbajhj36apylqvwsczzaywhwb"; depends=[distrom gamlr Matrix]; };
 textometry = derive { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
 textreg = derive { name="textreg"; version="0.1.2"; sha256="0qya0czbi78a29jp9pd3lbqh574d9k0i340hrgc6jmdhwzhimhk7"; depends=[tm NLP Rcpp Rcpp]; };
 tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
-tfplot = derive { name="tfplot"; version="2014.2-2"; sha256="1jrkzccvqmwghp6nhxay0m1qx8r5wa96zb9r8v6qihryi9m3amhs"; depends=[tframe]; };
+tfplot = derive { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1d095bhvy2s7znxplml1qyw5minc67n1mh"; depends=[tframe]; };
 tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; };
-tframePlus = derive { name="tframePlus"; version="2013.9-1"; sha256="070ad1g7yv1d5by6xrvshgn43jjxpq8waa339xhzc1am2qzb6mqr"; depends=[tframe timeSeries]; };
+tframePlus = derive { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; };
 tgp = derive { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; };
 tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
 thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27vc708xwz997pmxxhipw8449793zv6fw5aj47wcw1l5"; depends=[]; };
@@ -6241,6 +6337,7 @@ threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3
 thsls = derive { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
 tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; };
 tictoc = derive { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
+tidyjson = derive { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat jsonlite dplyr]; };
 tidyr = derive { name="tidyr"; version="0.2.0"; sha256="169i6xnr4bs5vqkv6dilj5j8v95giz0b7byhi06qk414gdlj2r8n"; depends=[reshape2 dplyr stringi lazyeval]; };
 tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
 tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; };
@@ -6250,6 +6347,7 @@ tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfa
 tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; };
 timeDate = derive { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; };
 timeROC = derive { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[pec mvtnorm]; };
+timeSeq = derive { name="timeSeq"; version="1.0.0"; sha256="1b7jcld1h3xsp3nl2nk9nqsgdg1pdi4m54hgsdlvivk9zzv3k6wr"; depends=[gss lattice pheatmap doParallel foreach reshape]; };
 timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadfs94xwn8578h8mw56wp923k0xfppzq69hcpcrhsvf"; depends=[timeDate]; };
 timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
 timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
@@ -6258,6 +6356,7 @@ timereg = derive { name="timereg"; version="1.8.7"; sha256="1xarqsdgl1zcc8ilg23g
 timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
 timeseriesdb = derive { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[RPostgreSQL RJSONIO xts zoo reshape2 shiny DBI]; };
 timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; };
+timetree = derive { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[XML phangorn]; };
 timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[Rcpp QCA reshape2 Rcpp RcppArmadillo]; };
 timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; };
 tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
@@ -6269,14 +6368,14 @@ tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx
 tlm = derive { name="tlm"; version="0.1.3"; sha256="1jj8yihq4b13wavflkkv91m9ba2l5ar3vcwp1ss6iymyf3hzdgiv"; depends=[boot]; };
 tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
 tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; };
-tm = derive { name="tm"; version="0.6"; sha256="004hswgswz3gdrpa6j61hl4rls843bxnsp5qac5kyxvfmwalsgr8"; depends=[NLP slam]; };
+tm = derive { name="tm"; version="0.6-1"; sha256="0i32gwic6vi7fkw05vg3rk8lmszzmy6gm9f5hrj0xckx7sf1ilfq"; depends=[NLP slam]; };
 tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
 tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL tm NLP slam]; };
 tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.2"; sha256="1sgm9wnzlphl4qhc69nj5im4y1qs6b0vssmn5j98fbc3xlxiyzjx"; depends=[NLP tm XML]; };
 tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; };
 tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[NLP tm XML ISOcodes]; };
 tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
-tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.2.2"; sha256="08nm2iwx897d5v144lh2gj5c3yprnky48s882p278b8blmdwnfn0"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; };
+tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; };
 tmap = derive { name="tmap"; version="0.7"; sha256="0lnlnnllj2bypw2cf8pgpv40w5zy4876kmjgav07ls8j11lklgwz"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; };
 tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp Rcpp RcppEigen]; };
 tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
@@ -6299,12 +6398,12 @@ track = derive { name="track"; version="1.1.8"; sha256="0scrww0ba1lrv39fh416wcbz
 tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; };
 traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; };
 traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; };
-trajectories = derive { name="trajectories"; version="0.1-1"; sha256="0vf1czc97bqq5snqdma9l1knb4bznyn8pcs8f1q6ssk0xfjrl3s3"; depends=[lattice sp spacetime rgdal rgeos]; };
+trajectories = derive { name="trajectories"; version="0.1-2"; sha256="1d27mb5xy29j2mgb0wh5x61q1z41vjmpidzqswqmw8fbq9g64826"; depends=[lattice sp spacetime rgdal rgeos]; };
 translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; };
 translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; };
 transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; };
 trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
-treatSens = derive { name="treatSens"; version="1.0"; sha256="0g3v9b1kdndqls9h1ijp5v17ybb1710bdclid745y6lfkia1b71w"; depends=[]; };
+treatSens = derive { name="treatSens"; version="1.1"; sha256="1h49idgv3rsday8xdj3rfqflj42ya9i5sg7cm1026arff1yqxxz8"; depends=[]; };
 tree = derive { name="tree"; version="1.0-35"; sha256="1cxn73rlr8s3qbq3icdh1v3jbbz913ns6xk6yzgk30ncifw4iq6g"; depends=[]; };
 treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[rpart cluster]; };
 treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; };
@@ -6312,6 +6411,7 @@ treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxs
 treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
 treelet = derive { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
 treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
+treeperm = derive { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
 treethresh = derive { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; };
 trend = derive { name="trend"; version="0.0.1"; sha256="05awwsqp8vm2p00dq2hkb7dglwf45djw2xx2q2mq33blrlhn31sw"; depends=[]; };
 triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; };
@@ -6331,7 +6431,7 @@ truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw
 truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; };
 trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; };
 trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Rcpp Matrix Rcpp RcppEigen]; };
-tsDyn = derive { name="tsDyn"; version="0.9-41"; sha256="1ssb0z35xmnwyrsvmk2jsxfd5h0xhnx8kp8qyxc43j4v2nz5l4kq"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; };
+tsDyn = derive { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; };
 tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
 tsallisqexp = derive { name="tsallisqexp"; version="0.9-1"; sha256="0z4csd3ircpf5jync6h1snj1k2awkd0s6vj2k4ij6rvs8w3nf8nn"; depends=[]; };
 tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
@@ -6340,7 +6440,7 @@ tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw
 tscount = derive { name="tscount"; version="1.0.0"; sha256="0n01biifzjfvnj3zhrn87qigf4l1kij2zfqf6876qz8rps1jz626"; depends=[ltsa]; };
 tseries = derive { name="tseries"; version="0.10-34"; sha256="068mjgjcsvgpynkvga8lv430cg8zhlr9frj5yapsxni2vj534pqj"; depends=[quadprog zoo]; };
 tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
-tsfa = derive { name="tsfa"; version="2014.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; };
+tsfa = derive { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; };
 tsintermittent = derive { name="tsintermittent"; version="1.5"; sha256="1qziwdpxfc2v010bk2cnhkrajza0z7lrrsjg06m49msyk5bk62z1"; depends=[MAPA]; };
 tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; };
 tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; };
@@ -6374,17 +6474,18 @@ unbalanced = derive { name="unbalanced"; version="1.1"; sha256="0crkykmyxbag4ri2
 unbalhaar = derive { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
 uniCox = derive { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
 uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
-uniftest = derive { name="uniftest"; version="1.0"; sha256="12d246f8984p4hc69p5nr5yzxs1v247yjgpxx1f0mbhkyvwp6r67"; depends=[]; };
+uniftest = derive { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
+uniqtag = derive { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
 unittest = derive { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; };
 unmarked = derive { name="unmarked"; version="0.10-6"; sha256="07mw9rg4i81fqdkgkpcb7kd7235hn4nyxpbf5b8vxzsly81ffpz7"; depends=[reshape lattice Rcpp plyr Rcpp RcppArmadillo]; };
 untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
 upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; };
 uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; };
 urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; };
-urltools = derive { name="urltools"; version="0.6"; sha256="0psi93pj1n3bv0r9h6bl1pi8462mxhilq7npnqqj3kqp1f8z64an"; depends=[Rcpp Rcpp]; };
+urltools = derive { name="urltools"; version="1.1.0"; sha256="0l0fqc1zvn8ps1cxxnpglbyfdwibyxaj3c2ivz8js8vphcr5i9zp"; depends=[Rcpp Rcpp]; };
 usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
 useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
-userfriendlyscience = derive { name="userfriendlyscience"; version="0.2-2"; sha256="0wqycrxbpsybhsn2i6jsaycyqmppfcvsdbgabmsky0qpf0hqdkv3"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; };
+userfriendlyscience = derive { name="userfriendlyscience"; version="0.3-0"; sha256="0gz59n315dbjlyh6fdqihr1x458wplnd43q2gw9s6f9b55359m2c"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; };
 uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[tmvtnorm mvtnorm MCMCpack MASS]; };
 usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; };
 ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; };
@@ -6396,7 +6497,7 @@ varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqd
 varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; };
 varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
 vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; };
-vardpoor = derive { name="vardpoor"; version="0.2.8"; sha256="02gbj5d7qwj05cybr0rc6zx2308r35rh5dzcxms0b3ijzpl32bcs"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; };
+vardpoor = derive { name="vardpoor"; version="0.3.0"; sha256="0gdvnz86c96i90zvbp5a6ljq4pcnx2zcqb0rbhcqhylcyqys054w"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; };
 vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; };
 vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
 vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
@@ -6404,7 +6505,7 @@ vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4
 vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; };
 vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[vcd gnm MASS]; };
 vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; };
-vdg = derive { name="vdg"; version="1.0.1"; sha256="1z9kgg9bsa80px94cwkna9hsjfa69kvhssmqlcidzb4h5hg7a3fd"; depends=[ggplot2 quantreg proxy]; };
+vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 quantreg proxy gridExtra]; };
 vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; };
 vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
 vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; };
@@ -6412,7 +6513,7 @@ vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmr
 vegan = derive { name="vegan"; version="2.2-1"; sha256="06rq9qrcf180isjrczscl84m3jvygz5w2gz5nc4rm1pg89rf6lrd"; depends=[permute lattice MASS cluster mgcv]; };
 vegan3d = derive { name="vegan3d"; version="0.65-0"; sha256="0c75hybhwqv56f2zpskr99rr9k6hw6rbv29bcxn0fciw5jqk01m3"; depends=[vegan rgl scatterplot3d]; };
 vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; };
-vegdata = derive { name="vegdata"; version="0.6-7"; sha256="0k680sq5dk95alzzwmixvxm856scr5cnf8gfr1k0z8cbz0gzawd2"; depends=[foreign XML]; };
+vegdata = derive { name="vegdata"; version="0.6.9"; sha256="1a8b8wwsxq8090cj8pxw1digllmc2rnby8immjfmbi5rzjbksgi3"; depends=[foreign XML]; };
 vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
 venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
 verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[fields boot CircStats MASS dtw]; };
@@ -6422,7 +6523,7 @@ violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988x
 vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
 viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
 virtualspecies = derive { name="virtualspecies"; version="1.0"; sha256="1qg5106ja17nsqzjnyswjf438f55195l197pizkybb2ilg4fw0x1"; depends=[raster ade4 dismo rworldmap]; };
-visreg = derive { name="visreg"; version="2.1-1"; sha256="16ghi7p809mcb3jfw1c9ibdd1mhq54m7x0qbcbiwxpnnd7grqy4w"; depends=[lattice]; };
+visreg = derive { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; };
 visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[gridBase flip matrixStats Hmisc]; };
 visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
 vitality = derive { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; };
@@ -6456,10 +6557,10 @@ webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m
 weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[lattice latticeExtra clv]; };
 weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; };
 weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[Hmisc gdata]; };
-weirs = derive { name="weirs"; version="0.23"; sha256="1kp49r5ba7ii1mr1nszbssx3fn0c2hcfpawm3a1kbh4rmhvy3frs"; depends=[]; };
+weirs = derive { name="weirs"; version="0.24"; sha256="15iffimdr01m92wq6srb49vf900c3cbipj99sk7rxbqbdzbb0y6g"; depends=[]; };
 wesanderson = derive { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; };
 wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm Matrix MASS]; };
-wgaim = derive { name="wgaim"; version="1.4-6"; sha256="1m3i8v12y9n19gnsnqwmbair684skdpnlvvb3ax6jh6dcbb645my"; depends=[qtl lattice]; };
+wgaim = derive { name="wgaim"; version="1.4-8"; sha256="1x1dgxw1viswdqd1k1gfbpipzhgy13lhncji0wlsgpcgfa40ap1a"; depends=[qtl lattice]; };
 wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; };
 whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
 widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
@@ -6500,6 +6601,7 @@ xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64
 xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; };
 xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
 xlsxjars = derive { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
+xml2 = derive { name="xml2"; version="0.1.0"; sha256="0p00lg8p5naw77k2fk6wbqmqdhj9iv2zn7g00gp7g253lmm8q740"; depends=[Rcpp Rcpp BH]; };
 xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
 xpose4 = derive { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[lattice gam Hmisc survival]; };
 xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5h0fdi4zibadqrsn4qbx4am30qrlqj7"; depends=[]; };
@@ -6519,8 +6621,8 @@ zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123
 zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; };
 zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
 zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; };
-zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; };
-zoib = derive { name="zoib"; version="1.2.1"; sha256="1x4x1912zjkfamifym20d2abaax81k6hnvqy5w8w4vnsx81zjrli"; depends=[rjags coda matrixcalc Formula]; };
+zoeppritz = derive { name="zoeppritz"; version="1.0-5"; sha256="0a501411gjs02vvhxdy8z3a5449arkamdidf2q6qswkkiv68qq04"; depends=[]; };
+zoib = derive { name="zoib"; version="1.3.0"; sha256="15i2gczc6sh0vyi51k105qd3bymwkpbpv2xm99jwflpa170yd8jp"; depends=[rjags coda matrixcalc Formula]; };
 zoo = derive { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; };
 zooaRch = derive { name="zooaRch"; version="1.0"; sha256="1krzwrk2cknlsmd3hn8c2lly10pd8k8jj2x12mbjhr2wws0i5fj4"; depends=[ggplot2]; };
 zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ccdfdccd0361..ecc8abf64608 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -224,7 +224,7 @@ let
     fftwtools = [ pkgs.fftw ];
     Formula = [ pkgs.gmp ];
     geoCount = [ pkgs.gsl ];
-    git2r = [ pkgs.zlib ];
+    git2r = [ pkgs.zlib pkgs.openssl ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp ];
     graphscan = [ pkgs.gsl ];
@@ -888,7 +888,6 @@ let
     "RVideoPoker" # requires Rpanel
     "rysgran" # requires soiltexture
     "samr" # requires impute
-    "saps" # requires piano, and survcomp
     "SDD" # requires rpanel
     "seeg" # requires spatstat
     "selectspm" # depends on broken ecespa

From 75ecd2e41549e6aa5492a0ba89c3b3d56caf6d8f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 May 2015 14:56:41 +0200
Subject: [PATCH 0757/1143] ccache 3.2.1 -> 3.2.2

New features and improvements:
- Added support for "CCACHE_COMPILERCHECK=string:<value>". This is a faster
  alternative to "CCACHE_COMPILERCHECK=<command>" if the command's output
  can be precalculated by the build system.
- Add support for caching code coverage results (compiling for gcov).

Bug fixes:
- Fixed bug which could result in false cache hits when source code contains
  '"' followed by " /*" or " //" (with variations).
- Made hash of cached result created with and without "CCACHE_CPP2"
  different.  This makes it possible to rebuild with "CCACHE_CPP2" set
  without having to clear the cache to get new results.
- Don't try to reset a non-existing stats file. This avoids "No such file or
  directory" messages in the ccache log when the cache directory doesn't
  exist.
- Fixed a bug where ccache deleted clang diagnostics after compiler
  failures.
- Avoid performing an unnecessary copy of the object file on a cache miss.
- Bail out on too hard compiler option "-fmodules".
- Bail out on too hard compiler option "-fplugin=libcc1plugin" (interaction
  with GDB).
- Fixed build error when compiling ccache with recent clang versions.
- Removed signal-unsafe code from signal handler.
- Corrected logic for when to output cached stderr.
- Wipe the whole cached result on failure retrieving a cached file.
- Fixed build error when compiling ccache with recent clang versions.
---
 pkgs/development/tools/misc/ccache/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 7c0cfa51cd79..b0a8e1b3e2c0 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,12 +1,16 @@
 {stdenv, fetchurl, runCommand, gcc, zlib}:
 
 let
+  name = "ccache-${version}";
+  version = "3.2.2";
+  sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag";
+
   ccache =
 stdenv.mkDerivation {
-  name = "ccache-3.2.1";
+  inherit name;
   src = fetchurl {
-    url = mirror://samba/ccache/ccache-3.2.1.tar.xz;
-    sha256 = "17dxb0adha2bqzb2r8rcc3kl9mk7y6vrvlh181liivrc3m7g6al7";
+    inherit sha256;
+    url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
   buildInputs = [ zlib ];
@@ -37,8 +41,10 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = http://ccache.samba.org/;
+    downloadPage = https://ccache.samba.org/download.html;
     license = with licenses; gpl3Plus;
     maintainers = with maintainers; [ nckx ];
   };

From 1b6fcfa24ec88e00efa499725174b094e0a116fb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 May 2015 15:06:31 +0200
Subject: [PATCH 0758/1143] clipgrab 3.4.9 -> 3.4.11

---
 pkgs/applications/video/clipgrab/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 675f0a3a2f67..1256572de7ca 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, makeDesktopItem, qt4 }:
 
-let version = "3.4.9"; in
+let version = "3.4.11"; in
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
 
   src = fetchurl {
-    sha256 = "0valq3cgx7yz11zcscz1vdjmppwbicvg0id61dcar22pyp2zkap1";
+    sha256 = "10xxcnib7xkvrx7wma2vbya5fz5s5f6syc9dmr395c83lpcwpxs8";
+    # The "Download" button is a .tar.gz, but there's a .tar.bz2 further down:
     url = "http://download.clipgrab.de/${name}.tar.bz2";
   };
 

From 6396c04d9f2895de1c22f19d4d5780446c99a3ba Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 May 2015 15:16:15 +0200
Subject: [PATCH 0759/1143] ccache: enable tests

Let's hope this doesn't break all over the place. Works here.
---
 pkgs/development/tools/misc/ccache/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index b0a8e1b3e2c0..db02fef9f2a3 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,19 +1,23 @@
-{stdenv, fetchurl, runCommand, gcc, zlib}:
+{ stdenv, fetchurl, runCommand, gcc, perl, zlib }:
 
 let
+  # TODO: find out if there's harm in just using 'rec' instead.
   name = "ccache-${version}";
   version = "3.2.2";
   sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag";
+  doCheck = true;
 
   ccache =
 stdenv.mkDerivation {
-  inherit name;
+  inherit name doCheck;
   src = fetchurl {
     inherit sha256;
     url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
-  buildInputs = [ zlib ];
+  # The test dependency on perl should be gone in the next release:
+  buildInputs = [ zlib ]
+    ++ stdenv.lib.optionals doCheck [ perl ];
 
   passthru = {
     # A derivation that provides gcc and g++ commands, but that

From 5144f01d4fee5fc1688049dd67a5117f971d473b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 12 May 2015 08:45:47 +0200
Subject: [PATCH 0760/1143] stress-ng 0.04.00 -> 0.04.02

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index a769cb77eca3..f67c556a6699 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.01"; in
+let version = "0.04.02"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "1n7980lx32jvk9z9gl5621vas83x2jvyvp3l2jzw3afh09vd5axk";
+    sha256 = "1k7h58axycwwxbr5bqqpz1ypsqvv4k2knk2fpw402l4xx9643bqv";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 1fe0ebc0ecc6d160135f0e2f26f343792702de79 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Mon, 11 May 2015 14:48:52 +0200
Subject: [PATCH 0761/1143] python-packages: new attrdict-2.0.0 package

A dict with attribute-style access.
---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a475fe3061c..ca05a89012f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -642,6 +642,23 @@ let
     };
   });
 
+  attrdict = buildPythonPackage (rec {
+    name = "attrdict-2.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/attrdict/${name}.tar.gz";
+      md5 = "8a7c1a4e737fe9e2b2b8844c0f7746f8";
+    };
+
+    propagatedBuildInputs = with self; [ coverage nose six ];
+
+    meta = {
+      description = "A dict with attribute-style access";
+      homepage = https://github.com/bcj/AttrDict;
+      license = stdenv.lib.licenses.mit;
+    };
+  });
+
   audioread = buildPythonPackage rec {
     name = "audioread-1.2.1";
 

From 7d1a4f9e3f5e58e56350ee22595bcb0c34574143 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 12 May 2015 10:38:15 +0200
Subject: [PATCH 0762/1143] libe-book: Add missing zlib dependency.

Since 287ec76, zlib is no longer propagated by libxml, so we need to add
it as a direct dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/libe-book/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix
index 81264b562b4d..fa47c1587c32 100644
--- a/pkgs/development/libraries/libe-book/default.nix
+++ b/pkgs/development/libraries/libe-book/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit}:
+{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu
+, cppunit, zlib
+}:
+
 let
   s = # Generated upstream information
   rec {
@@ -10,7 +13,7 @@ let
     sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz";
   };
   buildInputs = [
-    gperf pkgconfig librevenge libxml2 boost icu cppunit
+    gperf pkgconfig librevenge libxml2 boost icu cppunit zlib
   ];
 in
 stdenv.mkDerivation {

From b90227cd763d4e5190d25e7ffd9c38e7ca297b29 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Tue, 12 May 2015 13:49:08 +0200
Subject: [PATCH 0763/1143] add fomp: an LV2 port of the MCP, VCO, FIL, and WAH
 plugins by Fons Adriaensen

---
 pkgs/applications/audio/fomp/default.nix | 27 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/audio/fomp/default.nix

diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
new file mode 100644
index 000000000000..00b6c3e0c677
--- /dev/null
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, lv2, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "fomp-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://download.drobilla.net/${name}.tar.bz2";
+    sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
+  };
+
+  buildInputs = [ lv2  pkgconfig python ];
+
+  installPhase = ''
+    python waf configure --prefix=$out
+    python waf
+    python waf install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://drobilla.net/software/fomp/;
+    description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95eabc5a3c4b..534bf6e7c4b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10949,6 +10949,8 @@ let
     inherit pkgconfig autoconf automake gettext;
   };
 
+  fomp = callPackage ../applications/audio/fomp { };
+
   freecad = callPackage ../applications/graphics/freecad {
     boost = boost156;
     opencascade = opencascade_6_5;

From 1ba5ef6b6a052dd83d4b1666f424b134810a42e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2015 14:29:16 +0200
Subject: [PATCH 0764/1143] viber: Mark as broken

It doesn't evaluate due to Qt changes. Also improve checking in
make-tarball.nix to catch this in the future.
---
 .../networking/instant-messengers/viber/default.nix          | 1 +
 pkgs/top-level/make-tarball.nix                              | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index d268cbc55cfb..521f568ff5bb 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ jagajaga ];
+    broken = true;
   };
 
 }
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index c507acf8b1d1..d023470c48fc 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -54,7 +54,10 @@ releaseTools.sourceTarball rec {
         header "checking pkgs/top-level/all-packages.nix on $platform"
         NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \
             --show-trace --argstr system "$platform" \
-            -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null
+            -qa --drv-path --system-filter \* --system > /dev/null
+        NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \
+            --show-trace --argstr system "$platform" \
+            -qa --drv-path --system-filter \* --system --meta --xml > /dev/null
         stopNest
     done
 

From bbefd04c8979dd36647d98abbd0e6111746120b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2015 13:28:39 +0200
Subject: [PATCH 0765/1143] gcc-5: Remove obsolete mudflap reference

---
 pkgs/development/compilers/gcc/5/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 7096467854c7..5adecc47b873 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -157,7 +157,6 @@ let version = "5.1.0";
           " --disable-libssp --disable-nls" +
           " --without-headers" +
           " --disable-threads " +
-          " --disable-libmudflap " +
           " --disable-libgomp " +
           " --disable-libquadmath" +
           " --disable-shared" +

From e75b5351ac6b2f9142c3e7db2fab6c86aa8f8cda Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2015 13:46:47 +0200
Subject: [PATCH 0766/1143] gcc-4.9: Sync with changes made to the 4.8
 expression

---
 pkgs/development/compilers/gcc/4.9/builder.sh | 245 ------------------
 .../development/compilers/gcc/4.9/default.nix |  51 ++--
 .../compilers/gcc/4.9/no-sys-dirs.patch       |  41 ---
 3 files changed, 33 insertions(+), 304 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/4.9/builder.sh
 delete mode 100644 pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch

diff --git a/pkgs/development/compilers/gcc/4.9/builder.sh b/pkgs/development/compilers/gcc/4.9/builder.sh
deleted file mode 100644
index 96bbd025ba63..000000000000
--- a/pkgs/development/compilers/gcc/4.9/builder.sh
+++ /dev/null
@@ -1,245 +0,0 @@
-source $stdenv/setup
-
-
-export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
-mkdir $NIX_FIXINC_DUMMY
-
-
-if test "$staticCompiler" = "1"; then
-    EXTRA_LDFLAGS="-static"
-else
-    EXTRA_LDFLAGS=""
-fi
-
-# GCC interprets empty paths as ".", which we don't want.
-if test -z "$CPATH"; then unset CPATH; fi
-if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi
-echo "\$CPATH is \`$CPATH'"
-echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'"
-
-if test "$noSysDirs" = "1"; then
-
-    if test -e $NIX_CC/nix-support/orig-libc; then
-
-        # Figure out what extra flags to pass to the gcc compilers
-        # being generated to make sure that they use our glibc.
-        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
-        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
-
-        # Use *real* header files, otherwise a limits.h is generated
-        # that does not include Glibc's limits.h (notably missing
-        # SSIZE_MAX, which breaks the build).
-        export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include
-
-        # The path to the Glibc binaries such as `crti.o'.
-        glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"
-
-    else
-        # Hack: support impure environments.
-        extraFlags="-isystem /usr/include"
-        extraLDFlags="-L/usr/lib64 -L/usr/lib"
-        glibc_libdir="/usr/lib"
-        export NIX_FIXINC_DUMMY=/usr/include
-    fi
-
-    extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags"
-    extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
-
-    # BOOT_CFLAGS defaults to `-g -O2'; since we override it below,
-    # make sure to explictly add them so that files compiled with the
-    # bootstrap compiler are optimized and (optionally) contain
-    # debugging information (info "(gccinstall) Building").
-    if test -n "$dontStrip"; then
-        extraFlags="-O2 -g $extraFlags"
-    else
-        # Don't pass `-g' at all; this saves space while building.
-        extraFlags="-O2 $extraFlags"
-    fi
-
-    EXTRA_FLAGS="$extraFlags"
-    for i in $extraLDFlags; do
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i"
-    done
-
-    if test -n "$targetConfig"; then
-        # Cross-compiling, we need gcc not to read ./specs in order to build
-        # the g++ compiler (after the specs for the cross-gcc are created).
-        # Having LIBRARY_PATH= makes gcc read the specs from ., and the build
-        # breaks. Having this variable comes from the default.nix code to bring
-        # gcj in.
-        unset LIBRARY_PATH
-        unset CPATH
-        if test -z "$crossStageStatic"; then
-            EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include"
-            EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib"
-        fi
-    else
-        if test -z "$NIX_CC_CROSS"; then
-            EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"
-            EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS"
-            EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"
-        else
-            # This the case of cross-building the gcc.
-            # We need special flags for the target, different than those of the build
-            # Assertion:
-            test -e $NIX_CC_CROSS/nix-support/orig-libc
-
-            # Figure out what extra flags to pass to the gcc compilers
-            # being generated to make sure that they use our glibc.
-            extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"
-            extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"
-
-            # Use *real* header files, otherwise a limits.h is generated
-            # that does not include Glibc's limits.h (notably missing
-            # SSIZE_MAX, which breaks the build).
-            NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include
-
-            # The path to the Glibc binaries such as `crti.o'.
-            glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)"
-            glibc_libdir="$glibc_dir/lib"
-            configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include"
-
-            extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags"
-            extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
-
-            EXTRA_TARGET_CFLAGS="$extraFlags"
-            for i in $extraLDFlags; do
-                EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i"
-            done
-        fi
-    fi
-
-
-    # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
-    # the startfiles.
-    # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx
-    # for the startfiles.
-    makeFlagsArray=( \
-        "${makeFlagsArray[@]}" \
-        NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
-        SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
-        CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
-        CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
-        CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
-        CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
-        FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
-        LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
-        LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \
-        )
-
-    if test -z "$targetConfig"; then
-        makeFlagsArray=( \
-            "${makeFlagsArray[@]}" \
-            BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
-            BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
-            )
-    fi
-
-    if test -n "$targetConfig" -a "$crossStageStatic" == 1; then
-        # We don't want the gcc build to assume there will be a libc providing
-        # limits.h in this stagae
-        makeFlagsArray=( \
-            "${makeFlagsArray[@]}" \
-            LIMITS_H_TEST=false \
-            )
-    else
-        makeFlagsArray=( \
-            "${makeFlagsArray[@]}" \
-            LIMITS_H_TEST=true \
-            )
-    fi
-fi
-
-if test -n "$targetConfig"; then
-    # The host strip will destroy some important details of the objects
-    dontStrip=1
-fi
-
-providedPreConfigure="$preConfigure";
-preConfigure() {
-    if test -n "$newlibSrc"; then
-        tar xvf "$newlibSrc" -C ..
-        ln -s ../newlib-*/newlib newlib
-        # Patch to get armvt5el working:
-        sed -i -e 's/ arm)/ arm*)/' newlib/configure.host
-    fi
-    # Bug - they packaged zlib
-    if test -d "zlib"; then
-        # This breaks the build without-headers, which should build only
-        # the target libgcc as target libraries.
-        # See 'configure:5370'
-        rm -Rf zlib
-    fi
-
-    if test -f "$NIX_CC/nix-support/orig-libc"; then
-        # Patch the configure script so it finds glibc headers.  It's
-        # important for example in order not to get libssp built,
-        # because its functionality is in glibc already.
-        glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include"
-        sed -i \
-            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
-            gcc/configure
-    fi
-
-    if test -n "$crossMingw" -a -n "$crossStageStatic"; then
-        mkdir -p ../mingw
-        # --with-build-sysroot expects that:
-        cp -R $libcCross/include ../mingw
-        configureFlags="$configureFlags --with-build-sysroot=`pwd`/.."
-    fi
-
-    # Eval the preConfigure script from nix expression.
-    eval $providedPreConfigure;
-    env;
-    # Perform the build in a different directory.
-    mkdir ../build
-    cd ../build
-    configureScript=../$sourceRoot/configure
-}
-
-
-postConfigure() {
-    # Don't store the configure flags in the resulting executables.
-    sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile
-}
-
-
-postInstall() {
-    # Remove precompiled headers for now.  They are very big and
-    # probably not very useful yet.
-    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
-
-    # Remove `fixincl' to prevent a retained dependency on the
-    # previous gcc.
-    rm -rf $out/libexec/gcc/*/*/install-tools
-    rm -rf $out/lib/gcc/*/*/install-tools
-
-    # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
-    rm -rf $out/bin/gccbug
-    # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
-    for i in $out/libexec/gcc/*/*/*; do
-        if PREV_RPATH=`patchelf --print-rpath $i`; then
-            patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i
-        fi
-    done
-
-    # Get rid of some "fixed" header files
-    rm -rf $out/lib/gcc/*/*/include/root
-
-    # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
-    for i in $out/bin/*-gcc*; do
-        if cmp -s $out/bin/gcc $i; then
-            ln -sfn gcc $i
-        fi
-    done
-
-    for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
-        if cmp -s $out/bin/g++ $i; then
-            ln -sfn g++ $i
-        fi
-    done
-
-    eval "$postInstallGhdl"
-}
-
-genericBuild
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 7de8a140c0ab..e0c37c4390fb 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
+, langObjC ? stdenv.isDarwin
+, langObjCpp ? stdenv.isDarwin
 , langJava ? false
 , langAda ? false
 , langVhdl ? false
@@ -13,10 +15,12 @@
 , libelf                      # optional, for link-time optimizations (LTO)
 , cloog ? null, isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
-, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
+, zip ? null, unzip ? null, pkgconfig ? null
+, gtk ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, x11Support ? langJava
 , gnatboot ? null
 , enableMultilib ? false
 , enablePlugin ? true             # whether to support user-supplied plug-ins
@@ -62,7 +66,7 @@ let version = "4.9.2";
     patches = [ ]
       ++ optional enableParallelBuilding ./parallel-bconfig.patch
       ++ optional (cross != null) ./libstdc++-target.patch
-      # ++ optional noSysDirs ./no-sys-dirs.patch
+      ++ optional noSysDirs ../4.8/no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
       ++ optional langAda ./gnat-cflags.patch
@@ -80,8 +84,8 @@ let version = "4.9.2";
     # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
     # binary distribution here to allow the whole chain to be bootstrapped.
     javaAntlr = fetchurl {
-      url = http://www.antlr.org/download/antlr-3.1.3.jar;
-      sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";
+      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
     };
 
     xlibs = [
@@ -89,7 +93,7 @@ let version = "4.9.2";
       xproto renderproto xextproto inputproto randrproto
     ];
 
-    javaAwtGtk = langJava && gtk != null;
+    javaAwtGtk = langJava && x11Support;
 
     /* Platform flags */
     platformFlags = let
@@ -156,6 +160,7 @@ let version = "4.9.2";
           " --disable-libgomp " +
           " --disable-libquadmath" +
           " --disable-shared" +
+          " --disable-libatomic " +  # libatomic requires libc
           " --disable-decimal-float" # libdecnumber requires libc
           else
           (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
@@ -196,12 +201,12 @@ let version = "4.9.2";
 in
 
 # We need all these X libraries when building AWT with GTK+.
-assert gtk != null -> (filter (x: x == null) xlibs) == [];
+assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
 
 stdenv.mkDerivation ({
   name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
 
-  builder = ./builder.sh;
+  builder = ../4.8/builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
@@ -288,15 +293,21 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
 
-  preConfigure = ''
-    ${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit)
-      ''
-        export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
-        export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
-        export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
-        export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
-      ''}
-    '';
+  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+    export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+    export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+    export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+    export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
+  '';
 
   dontDisableStatic = true;
 
@@ -338,6 +349,8 @@ stdenv.mkDerivation ({
         ++ optional langAda      "ada"
         ++ optional langVhdl     "vhdl"
         ++ optional langGo       "go"
+        ++ optional langObjC     "objc"
+        ++ optional langObjCpp   "obj-c++"
         ++ optionals crossDarwin [ "objc" "obj-c++" ]
         )
       )
@@ -475,9 +488,11 @@ stdenv.mkDerivation ({
     else null;
 
   passthru =
-    { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; isGNU = true; };
+    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
 
-  inherit enableParallelBuilding;
+  inherit enableParallelBuilding enableMultilib;
+
+  inherit (stdenv) is64bit;
 
   meta = {
     homepage = http://gcc.gnu.org/;
diff --git a/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch
deleted file mode 100644
index 79901703cb82..000000000000
--- a/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c
---- gcc-4.3.1-orig/gcc/cppdefault.c	2007-07-26 10:37:01.000000000 +0200
-+++ gcc-4.3.1/gcc/cppdefault.c	2008-06-25 17:48:23.000000000 +0200
-@@ -41,6 +41,10 @@
- # undef CROSS_INCLUDE_DIR
- #endif
- 
-+#undef LOCAL_INCLUDE_DIR
-+#undef SYSTEM_INCLUDE_DIR
-+#undef STANDARD_INCLUDE_DIR
-+
- const struct default_include cpp_include_defaults[]
- #ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
-diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c
---- gcc-4.3.1-orig/gcc/gcc.c	2008-03-02 23:55:19.000000000 +0100
-+++ gcc-4.3.1/gcc/gcc.c	2008-06-25 17:52:53.000000000 +0200
-@@ -1478,10 +1478,10 @@
- /* Default prefixes to attach to command names.  */
- 
- #ifndef STANDARD_STARTFILE_PREFIX_1
--#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_1 ""
- #endif
- #ifndef STANDARD_STARTFILE_PREFIX_2
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 ""
- #endif
- 
- #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
---- gcc-4.3.1-orig/gcc/Makefile.in	2008-05-11 20:54:15.000000000 +0200
-+++ gcc-4.3.1/gcc/Makefile.in	2008-06-25 17:48:23.000000000 +0200
-@@ -3277,7 +3281,7 @@
-   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-   -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
-   -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
--  -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
-+  -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
-   -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
-   -DPREFIX=\"$(prefix)/\" \

From 7745c733ebbc071bd8f477e1afaade81b70fb951 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2015 14:54:26 +0200
Subject: [PATCH 0767/1143] gcc: Remove duplicate files

---
 .../gcc/4.4/java-jvgenmain-link.patch         |  17 --
 .../development/compilers/gcc/4.5/default.nix |   4 +-
 .../gcc/4.5/java-jvgenmain-link.patch         |  17 --
 .../development/compilers/gcc/4.6/default.nix |   6 +-
 .../compilers/gcc/4.6/gnat-cflags.patch       |  33 ---
 .../gcc/4.6/java-jvgenmain-link.patch         |  17 --
 .../compilers/gcc/4.6/libstdc++-target.patch  |  32 ---
 .../development/compilers/gcc/4.8/default.nix |  12 +-
 .../compilers/gcc/4.8/gfortran-driving.patch  |  20 --
 .../compilers/gcc/4.8/gnat-cflags.patch       |  33 ---
 .../gcc/4.8/java-jvgenmain-link.patch         |  17 --
 .../compilers/gcc/4.8/libstdc++-target.patch  |  32 ---
 .../development/compilers/gcc/4.9/default.nix |  12 +-
 .../compilers/gcc/4.9/gfortran-driving.patch  |  20 --
 .../compilers/gcc/4.9/gnat-cflags.patch       |  33 ---
 .../gcc/4.9/java-jvgenmain-link.patch         |  17 --
 .../compilers/gcc/4.9/libstdc++-target.patch  |  32 ---
 .../compilers/gcc/4.9/parallel-bconfig.patch  |  32 ---
 pkgs/development/compilers/gcc/5/builder.sh   | 255 ------------------
 pkgs/development/compilers/gcc/5/default.nix  |  10 +-
 .../compilers/gcc/5/gfortran-driving.patch    |  20 --
 .../compilers/gcc/5/gnat-cflags.patch         |  33 ---
 .../compilers/gcc/5/java-jvgenmain-link.patch |  17 --
 .../compilers/gcc/5/libstdc++-target.patch    |  32 ---
 .../compilers/gcc/5/no-sys-dirs.patch         |  28 --
 .../compilers/gcc/{4.8 => }/builder.sh        |   0
 .../gcc/{4.6 => }/gfortran-driving.patch      |   0
 .../compilers/gcc/{4.5 => }/gnat-cflags.patch |   0
 .../gcc/{4.5 => }/libstdc++-target.patch      |   0
 .../compilers/gcc/{4.8 => }/no-sys-dirs.patch |   0
 .../gcc/{4.8 => }/parallel-bconfig.patch      |   0
 31 files changed, 22 insertions(+), 759 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.6/gnat-cflags.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.6/libstdc++-target.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.8/gfortran-driving.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.8/gnat-cflags.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.8/libstdc++-target.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.9/gfortran-driving.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.9/gnat-cflags.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.9/libstdc++-target.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch
 delete mode 100644 pkgs/development/compilers/gcc/5/builder.sh
 delete mode 100644 pkgs/development/compilers/gcc/5/gfortran-driving.patch
 delete mode 100644 pkgs/development/compilers/gcc/5/gnat-cflags.patch
 delete mode 100644 pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch
 delete mode 100644 pkgs/development/compilers/gcc/5/libstdc++-target.patch
 delete mode 100644 pkgs/development/compilers/gcc/5/no-sys-dirs.patch
 rename pkgs/development/compilers/gcc/{4.8 => }/builder.sh (100%)
 rename pkgs/development/compilers/gcc/{4.6 => }/gfortran-driving.patch (100%)
 rename pkgs/development/compilers/gcc/{4.5 => }/gnat-cflags.patch (100%)
 rename pkgs/development/compilers/gcc/{4.5 => }/libstdc++-target.patch (100%)
 rename pkgs/development/compilers/gcc/{4.8 => }/no-sys-dirs.patch (100%)
 rename pkgs/development/compilers/gcc/{4.8 => }/parallel-bconfig.patch (100%)

diff --git a/pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch
deleted file mode 100644
index 2612e8bfbbbc..000000000000
--- a/pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The `jvgenmain' executable must be linked against `vec.o', among others,
-since it uses its vector API.
-
---- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
-+++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
-@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
- 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
- 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
- 
--jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
-+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
- 	rm -f $@
--	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
-+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
- 
- #
- # Build hooks:
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index c4be4f266dd1..6cde7aba92a0 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -136,11 +136,11 @@ stdenv.mkDerivation ({
 
   patches =
     [ ]
-    ++ optional (cross != null) ./libstdc++-target.patch
+    ++ optional (cross != null) ../libstdc++-target.patch
     ++ optional noSysDirs ./no-sys-dirs.patch
     # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
     # target libraries and tools.
-    ++ optional langAda ./gnat-cflags.patch
+    ++ optional langAda ../gnat-cflags.patch
     ++ optional langVhdl ./ghdl-ortho-cflags.patch
     ;
 
diff --git a/pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch
deleted file mode 100644
index 2612e8bfbbbc..000000000000
--- a/pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The `jvgenmain' executable must be linked against `vec.o', among others,
-since it uses its vector API.
-
---- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
-+++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
-@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
- 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
- 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
- 
--jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
-+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
- 	rm -f $@
--	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
-+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
- 
- #
- # Build hooks:
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 0f65a89bd209..b3caad11b716 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -52,13 +52,13 @@ let version = "4.6.4";
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
     patches = [ ]
-      ++ optional (cross != null) ./libstdc++-target.patch
+      ++ optional (cross != null) ../libstdc++-target.patch
       ++ optional noSysDirs ./no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
-      ++ optional langAda ./gnat-cflags.patch
+      ++ optional langAda ../gnat-cflags.patch
       ++ optional langVhdl ./ghdl-ortho-cflags.patch
-      ++ optional langFortran ./gfortran-driving.patch
+      ++ optional langFortran ../gfortran-driving.patch
       ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch;
 
     javaEcj = fetchurl {
diff --git a/pkgs/development/compilers/gcc/4.6/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.6/gnat-cflags.patch
deleted file mode 100644
index bf2acf065e9b..000000000000
--- a/pkgs/development/compilers/gcc/4.6/gnat-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libada/Makefile.in b/libada/Makefile.in
-index f5057a0..337e0c6 100644
---- a/libada/Makefile.in
-+++ b/libada/Makefile.in
-@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
- WARN_CFLAGS = @warn_cflags@
- 
- TARGET_LIBGCC2_CFLAGS=
--GNATLIBCFLAGS= -g -O2
-+GNATLIBCFLAGS= -g -O2 $(CFLAGS)
- GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
- 	-DIN_RTS @have_getipinfo@
- 
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
-@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
- SOME_ADAFLAGS =-gnata
- FORCE_DEBUG_ADAFLAGS = -g
- GNATLIBFLAGS = -gnatpg -nostdinc
--GNATLIBCFLAGS = -g -O2
-+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
- # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
- # should be autodetected during the configuration of libada and passed down to
- # here, but we need something for --disable-libada and hope for the best.
-@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
- # Link flags used to build gnat tools.  By default we prefer to statically
- # link with libgcc to avoid a dependency on shared libgcc (which is tricky
- # to deal with as it may conflict with the libgcc provided by the system).
--GCC_LINK_FLAGS=-static-libgcc
-+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)
- 
- # End of variables for you to override.
- 
diff --git a/pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch
deleted file mode 100644
index 2612e8bfbbbc..000000000000
--- a/pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The `jvgenmain' executable must be linked against `vec.o', among others,
-since it uses its vector API.
-
---- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
-+++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
-@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
- 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
- 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
- 
--jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
-+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
- 	rm -f $@
--	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
-+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
- 
- #
- # Build hooks:
diff --git a/pkgs/development/compilers/gcc/4.6/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.6/libstdc++-target.patch
deleted file mode 100644
index fb622b395806..000000000000
--- a/pkgs/development/compilers/gcc/4.6/libstdc++-target.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Patch to make the target libraries 'configure' scripts find the proper CPP.
-I noticed that building the mingw32 cross compiler.
-Looking at the build script for mingw in archlinux, I think that only nixos
-needs this patch. I don't know why.
-diff --git a/Makefile.in b/Makefile.in
-index 93f66b6..d691917 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
-+	CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
- RAW_CXX_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \
- 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
--	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
-+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
-+	CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
- 
- NORMAL_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \
--	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
-+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
-+	CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
- 
- # Where to find GMP
- HOST_GMPLIBS = @gmplibs@
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 0958ce7b1c97..6d5627c34d68 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -64,13 +64,13 @@ let version = "4.8.4";
     enableParallelBuilding = true;
 
     patches = [ ]
-      ++ optional enableParallelBuilding ./parallel-bconfig.patch
-      ++ optional (cross != null) ./libstdc++-target.patch
-      ++ optional noSysDirs ./no-sys-dirs.patch
+      ++ optional enableParallelBuilding ../parallel-bconfig.patch
+      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
-      ++ optional langAda ./gnat-cflags.patch
-      ++ optional langFortran ./gfortran-driving.patch;
+      ++ optional langAda ../gnat-cflags.patch
+      ++ optional langFortran ../gfortran-driving.patch;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -207,7 +207,7 @@ assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [
 stdenv.mkDerivation ({
   name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
 
-  builder = ./builder.sh;
+  builder = ../builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
diff --git a/pkgs/development/compilers/gcc/4.8/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.8/gfortran-driving.patch
deleted file mode 100644
index 70708886b405..000000000000
--- a/pkgs/development/compilers/gcc/4.8/gfortran-driving.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch fixes interaction with Libtool.
-See <http://thread.gmane.org/gmane.comp.gcc.patches/258777>, for details.
-
---- a/gcc/fortran/gfortranspec.c
-+++ b/gcc/fortran/gfortranspec.c
-@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n"));
-     {
-       fprintf (stderr, _("Driving:"));
-       for (i = 0; i < g77_newargc; i++)
-+	{
-+	  if (g77_new_decoded_options[i].opt_index == OPT_l)
-+	    /* Make sure no white space is inserted after `-l'.  */
-+	    fprintf (stderr, " -l%s",
-+		     g77_new_decoded_options[i].canonical_option[1]);
-+	  else
- 	fprintf (stderr, " %s",
- 		 g77_new_decoded_options[i].orig_option_with_args_text);
-+	}
-       fprintf (stderr, "\n");
-     }
diff --git a/pkgs/development/compilers/gcc/4.8/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.8/gnat-cflags.patch
deleted file mode 100644
index bf2acf065e9b..000000000000
--- a/pkgs/development/compilers/gcc/4.8/gnat-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libada/Makefile.in b/libada/Makefile.in
-index f5057a0..337e0c6 100644
---- a/libada/Makefile.in
-+++ b/libada/Makefile.in
-@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
- WARN_CFLAGS = @warn_cflags@
- 
- TARGET_LIBGCC2_CFLAGS=
--GNATLIBCFLAGS= -g -O2
-+GNATLIBCFLAGS= -g -O2 $(CFLAGS)
- GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
- 	-DIN_RTS @have_getipinfo@
- 
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
-@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
- SOME_ADAFLAGS =-gnata
- FORCE_DEBUG_ADAFLAGS = -g
- GNATLIBFLAGS = -gnatpg -nostdinc
--GNATLIBCFLAGS = -g -O2
-+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
- # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
- # should be autodetected during the configuration of libada and passed down to
- # here, but we need something for --disable-libada and hope for the best.
-@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
- # Link flags used to build gnat tools.  By default we prefer to statically
- # link with libgcc to avoid a dependency on shared libgcc (which is tricky
- # to deal with as it may conflict with the libgcc provided by the system).
--GCC_LINK_FLAGS=-static-libgcc
-+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)
- 
- # End of variables for you to override.
- 
diff --git a/pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch
deleted file mode 100644
index 2612e8bfbbbc..000000000000
--- a/pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The `jvgenmain' executable must be linked against `vec.o', among others,
-since it uses its vector API.
-
---- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
-+++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
-@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
- 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
- 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
- 
--jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
-+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
- 	rm -f $@
--	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
-+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
- 
- #
- # Build hooks:
diff --git a/pkgs/development/compilers/gcc/4.8/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.8/libstdc++-target.patch
deleted file mode 100644
index fb622b395806..000000000000
--- a/pkgs/development/compilers/gcc/4.8/libstdc++-target.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Patch to make the target libraries 'configure' scripts find the proper CPP.
-I noticed that building the mingw32 cross compiler.
-Looking at the build script for mingw in archlinux, I think that only nixos
-needs this patch. I don't know why.
-diff --git a/Makefile.in b/Makefile.in
-index 93f66b6..d691917 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
-+	CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
- RAW_CXX_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \
- 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
--	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
-+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
-+	CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
- 
- NORMAL_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \
--	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
-+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
-+	CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
- 
- # Where to find GMP
- HOST_GMPLIBS = @gmplibs@
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index e0c37c4390fb..16737ffc8963 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -64,13 +64,13 @@ let version = "4.9.2";
     enableParallelBuilding = true;
 
     patches = [ ]
-      ++ optional enableParallelBuilding ./parallel-bconfig.patch
-      ++ optional (cross != null) ./libstdc++-target.patch
-      ++ optional noSysDirs ../4.8/no-sys-dirs.patch
+      ++ optional enableParallelBuilding ../parallel-bconfig.patch
+      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
-      ++ optional langAda ./gnat-cflags.patch
-      ++ optional langFortran ./gfortran-driving.patch;
+      ++ optional langAda ../gnat-cflags.patch
+      ++ optional langFortran ../gfortran-driving.patch;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -206,7 +206,7 @@ assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [
 stdenv.mkDerivation ({
   name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
 
-  builder = ../4.8/builder.sh;
+  builder = ../builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
diff --git a/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch
deleted file mode 100644
index 70708886b405..000000000000
--- a/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch fixes interaction with Libtool.
-See <http://thread.gmane.org/gmane.comp.gcc.patches/258777>, for details.
-
---- a/gcc/fortran/gfortranspec.c
-+++ b/gcc/fortran/gfortranspec.c
-@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n"));
-     {
-       fprintf (stderr, _("Driving:"));
-       for (i = 0; i < g77_newargc; i++)
-+	{
-+	  if (g77_new_decoded_options[i].opt_index == OPT_l)
-+	    /* Make sure no white space is inserted after `-l'.  */
-+	    fprintf (stderr, " -l%s",
-+		     g77_new_decoded_options[i].canonical_option[1]);
-+	  else
- 	fprintf (stderr, " %s",
- 		 g77_new_decoded_options[i].orig_option_with_args_text);
-+	}
-       fprintf (stderr, "\n");
-     }
diff --git a/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch
deleted file mode 100644
index bf2acf065e9b..000000000000
--- a/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libada/Makefile.in b/libada/Makefile.in
-index f5057a0..337e0c6 100644
---- a/libada/Makefile.in
-+++ b/libada/Makefile.in
-@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
- WARN_CFLAGS = @warn_cflags@
- 
- TARGET_LIBGCC2_CFLAGS=
--GNATLIBCFLAGS= -g -O2
-+GNATLIBCFLAGS= -g -O2 $(CFLAGS)
- GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
- 	-DIN_RTS @have_getipinfo@
- 
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
-@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
- SOME_ADAFLAGS =-gnata
- FORCE_DEBUG_ADAFLAGS = -g
- GNATLIBFLAGS = -gnatpg -nostdinc
--GNATLIBCFLAGS = -g -O2
-+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
- # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
- # should be autodetected during the configuration of libada and passed down to
- # here, but we need something for --disable-libada and hope for the best.
-@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
- # Link flags used to build gnat tools.  By default we prefer to statically
- # link with libgcc to avoid a dependency on shared libgcc (which is tricky
- # to deal with as it may conflict with the libgcc provided by the system).
--GCC_LINK_FLAGS=-static-libgcc
-+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)
- 
- # End of variables for you to override.
- 
diff --git a/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch
deleted file mode 100644
index 2612e8bfbbbc..000000000000
--- a/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The `jvgenmain' executable must be linked against `vec.o', among others,
-since it uses its vector API.
-
---- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
-+++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
-@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
- 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
- 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
- 
--jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
-+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
- 	rm -f $@
--	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
-+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
- 
- #
- # Build hooks:
diff --git a/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch
deleted file mode 100644
index fb622b395806..000000000000
--- a/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Patch to make the target libraries 'configure' scripts find the proper CPP.
-I noticed that building the mingw32 cross compiler.
-Looking at the build script for mingw in archlinux, I think that only nixos
-needs this patch. I don't know why.
-diff --git a/Makefile.in b/Makefile.in
-index 93f66b6..d691917 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
-+	CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
- RAW_CXX_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \
- 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
--	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
-+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
-+	CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
- 
- NORMAL_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \
--	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
-+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
-+	CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
- 
- # Where to find GMP
- HOST_GMPLIBS = @gmplibs@
diff --git a/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch b/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch
deleted file mode 100644
index bc56ac698f5a..000000000000
--- a/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Hacky work-around for highly parallel builds.
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57125
-
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index aad927c..182f666 100644
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -3908,21 +3908,21 @@ build/gengtype-lex.o: $(BCONFIG_H)
- 
- gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \
-   $(SYSTEM_H)
--gengtype-parse.o: $(CONFIG_H)
-+gengtype-parse.o: $(CONFIG_H) $(BCONFIG_H)
- CFLAGS-gengtype-parse.o += -DGENERATOR_FILE
- build/gengtype-parse.o: $(BCONFIG_H)
- 
- gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \
-   gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \
-   $(XREGEX_H)
--gengtype-state.o: $(CONFIG_H)
-+gengtype-state.o: $(CONFIG_H) $(BCONFIG_H)
- CFLAGS-gengtype-state.o += -DGENERATOR_FILE
- build/gengtype-state.o: $(BCONFIG_H)
- 
- gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h 	\
-   rtl.def insn-notes.def errors.h double-int.h version.h $(HASHTAB_H) \
-   $(OBSTACK_H) $(XREGEX_H)
--gengtype.o: $(CONFIG_H)
-+gengtype.o: $(CONFIG_H) $(BCONFIG_H)
- CFLAGS-gengtype.o += -DGENERATOR_FILE
- build/gengtype.o: $(BCONFIG_H)
- 
diff --git a/pkgs/development/compilers/gcc/5/builder.sh b/pkgs/development/compilers/gcc/5/builder.sh
deleted file mode 100644
index dd77c67a023e..000000000000
--- a/pkgs/development/compilers/gcc/5/builder.sh
+++ /dev/null
@@ -1,255 +0,0 @@
-source $stdenv/setup
-
-
-export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
-mkdir $NIX_FIXINC_DUMMY
-
-
-if test "$staticCompiler" = "1"; then
-    EXTRA_LDFLAGS="-static"
-else
-    EXTRA_LDFLAGS=""
-fi
-
-# GCC interprets empty paths as ".", which we don't want.
-if test -z "$CPATH"; then unset CPATH; fi
-if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi
-echo "\$CPATH is \`$CPATH'"
-echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'"
-
-if test "$noSysDirs" = "1"; then
-
-    if test -e $NIX_CC/nix-support/orig-libc; then
-
-        # Figure out what extra flags to pass to the gcc compilers
-        # being generated to make sure that they use our glibc.
-        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
-        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
-
-        # Use *real* header files, otherwise a limits.h is generated
-        # that does not include Glibc's limits.h (notably missing
-        # SSIZE_MAX, which breaks the build).
-        export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include
-
-        # The path to the Glibc binaries such as `crti.o'.
-        glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"
-
-    else
-        # Hack: support impure environments.
-        extraFlags="-isystem /usr/include"
-        extraLDFlags="-L/usr/lib64 -L/usr/lib"
-        glibc_libdir="/usr/lib"
-        export NIX_FIXINC_DUMMY=/usr/include
-    fi
-
-    extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags"
-    extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
-
-    # BOOT_CFLAGS defaults to `-g -O2'; since we override it below,
-    # make sure to explictly add them so that files compiled with the
-    # bootstrap compiler are optimized and (optionally) contain
-    # debugging information (info "(gccinstall) Building").
-    if test -n "$dontStrip"; then
-        extraFlags="-O2 -g $extraFlags"
-    else
-        # Don't pass `-g' at all; this saves space while building.
-        extraFlags="-O2 $extraFlags"
-    fi
-
-    EXTRA_FLAGS="$extraFlags"
-    for i in $extraLDFlags; do
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i"
-    done
-
-    if test -n "$targetConfig"; then
-        # Cross-compiling, we need gcc not to read ./specs in order to build
-        # the g++ compiler (after the specs for the cross-gcc are created).
-        # Having LIBRARY_PATH= makes gcc read the specs from ., and the build
-        # breaks. Having this variable comes from the default.nix code to bring
-        # gcj in.
-        unset LIBRARY_PATH
-        unset CPATH
-        if test -z "$crossStageStatic"; then
-            EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include"
-            EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib"
-        fi
-    else
-        if test -z "$NIX_CC_CROSS"; then
-            EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"
-            EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS"
-            EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"
-        else
-            # This the case of cross-building the gcc.
-            # We need special flags for the target, different than those of the build
-            # Assertion:
-            test -e $NIX_CC_CROSS/nix-support/orig-libc
-
-            # Figure out what extra flags to pass to the gcc compilers
-            # being generated to make sure that they use our glibc.
-            extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"
-            extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"
-
-            # Use *real* header files, otherwise a limits.h is generated
-            # that does not include Glibc's limits.h (notably missing
-            # SSIZE_MAX, which breaks the build).
-            NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include
-
-            # The path to the Glibc binaries such as `crti.o'.
-            glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)"
-            glibc_libdir="$glibc_dir/lib"
-            configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include"
-
-            extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags"
-            extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
-
-            EXTRA_TARGET_CFLAGS="$extraFlags"
-            for i in $extraLDFlags; do
-                EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i"
-            done
-        fi
-    fi
-
-    # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
-    # the startfiles.
-    # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx
-    # for the startfiles.
-    makeFlagsArray+=( \
-        NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
-        SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
-        CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
-        CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
-        CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
-        CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
-        FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
-        LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
-        LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \
-        )
-
-    if test -z "$targetConfig"; then
-        makeFlagsArray+=( \
-            BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
-            BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
-            )
-    fi
-
-    if test -n "$targetConfig" -a "$crossStageStatic" == 1; then
-        # We don't want the gcc build to assume there will be a libc providing
-        # limits.h in this stagae
-        makeFlagsArray+=( \
-            LIMITS_H_TEST=false \
-            )
-    else
-        makeFlagsArray+=( \
-            LIMITS_H_TEST=true \
-            )
-    fi
-fi
-
-if test -n "$targetConfig"; then
-    # The host strip will destroy some important details of the objects
-    dontStrip=1
-fi
-
-providedPreConfigure="$preConfigure";
-preConfigure() {
-    if test -n "$newlibSrc"; then
-        tar xvf "$newlibSrc" -C ..
-        ln -s ../newlib-*/newlib newlib
-        # Patch to get armvt5el working:
-        sed -i -e 's/ arm)/ arm*)/' newlib/configure.host
-    fi
-
-    # Bug - they packaged zlib
-    if test -d "zlib"; then
-        # This breaks the build without-headers, which should build only
-        # the target libgcc as target libraries.
-        # See 'configure:5370'
-        rm -Rf zlib
-    fi
-
-    if test -f "$NIX_CC/nix-support/orig-libc"; then
-        # Patch the configure script so it finds glibc headers.  It's
-        # important for example in order not to get libssp built,
-        # because its functionality is in glibc already.
-        glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include"
-        sed -i \
-            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
-            gcc/configure
-    fi
-
-    if test -n "$crossMingw" -a -n "$crossStageStatic"; then
-        mkdir -p ../mingw
-        # --with-build-sysroot expects that:
-        cp -R $libcCross/include ../mingw
-        configureFlags="$configureFlags --with-build-sysroot=`pwd`/.."
-    fi
-
-    # Eval the preConfigure script from nix expression.
-    eval "$providedPreConfigure"
-
-    # Perform the build in a different directory.
-    mkdir ../build
-    cd ../build
-    configureScript=../$sourceRoot/configure
-}
-
-
-postConfigure() {
-    # Don't store the configure flags in the resulting executables.
-    sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile
-}
-
-
-preInstall() {
-    # Make ‘lib64’ a symlink to ‘lib’.
-    if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
-        mkdir -p $out/lib
-        ln -s lib $out/lib64
-    fi
-}
-
-
-postInstall() {
-    # Remove precompiled headers for now.  They are very big and
-    # probably not very useful yet.
-    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
-
-    # Remove `fixincl' to prevent a retained dependency on the
-    # previous gcc.
-    rm -rf $out/libexec/gcc/*/*/install-tools
-    rm -rf $out/lib/gcc/*/*/install-tools
-
-    # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
-    rm -rf $out/bin/gccbug
-    # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
-    for i in $out/libexec/gcc/*/*/*; do
-        if PREV_RPATH=`patchelf --print-rpath $i`; then
-            patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i
-        fi
-    done
-
-    # Get rid of some "fixed" header files
-    rm -rf $out/lib/gcc/*/*/include/root
-
-    # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
-    for i in $out/bin/*-gcc*; do
-        if cmp -s $out/bin/gcc $i; then
-            ln -sfn gcc $i
-        fi
-    done
-
-    for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
-        if cmp -s $out/bin/g++ $i; then
-            ln -sfn g++ $i
-        fi
-    done
-
-    # Disable RANDMMAP on grsec, which causes segfaults when using
-    # precompiled headers.
-    # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31
-    paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus}
-
-    eval "$postInstallGhdl"
-}
-
-genericBuild
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 5adecc47b873..95125d99893c 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -65,12 +65,12 @@ let version = "5.1.0";
     enableParallelBuilding = true;
 
     patches = [ ]
-      ++ optional (cross != null) ./libstdc++-target.patch
-      ++ optional noSysDirs ./no-sys-dirs.patch
+      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
-      ++ optional langAda ./gnat-cflags.patch
-      ++ optional langFortran ./gfortran-driving.patch;
+      ++ optional langAda ../gnat-cflags.patch
+      ++ optional langFortran ../gfortran-driving.patch;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -206,7 +206,7 @@ assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [
 stdenv.mkDerivation ({
   name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
 
-  builder = ./builder.sh;
+  builder = ../builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
diff --git a/pkgs/development/compilers/gcc/5/gfortran-driving.patch b/pkgs/development/compilers/gcc/5/gfortran-driving.patch
deleted file mode 100644
index 70708886b405..000000000000
--- a/pkgs/development/compilers/gcc/5/gfortran-driving.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch fixes interaction with Libtool.
-See <http://thread.gmane.org/gmane.comp.gcc.patches/258777>, for details.
-
---- a/gcc/fortran/gfortranspec.c
-+++ b/gcc/fortran/gfortranspec.c
-@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n"));
-     {
-       fprintf (stderr, _("Driving:"));
-       for (i = 0; i < g77_newargc; i++)
-+	{
-+	  if (g77_new_decoded_options[i].opt_index == OPT_l)
-+	    /* Make sure no white space is inserted after `-l'.  */
-+	    fprintf (stderr, " -l%s",
-+		     g77_new_decoded_options[i].canonical_option[1]);
-+	  else
- 	fprintf (stderr, " %s",
- 		 g77_new_decoded_options[i].orig_option_with_args_text);
-+	}
-       fprintf (stderr, "\n");
-     }
diff --git a/pkgs/development/compilers/gcc/5/gnat-cflags.patch b/pkgs/development/compilers/gcc/5/gnat-cflags.patch
deleted file mode 100644
index bf2acf065e9b..000000000000
--- a/pkgs/development/compilers/gcc/5/gnat-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libada/Makefile.in b/libada/Makefile.in
-index f5057a0..337e0c6 100644
---- a/libada/Makefile.in
-+++ b/libada/Makefile.in
-@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
- WARN_CFLAGS = @warn_cflags@
- 
- TARGET_LIBGCC2_CFLAGS=
--GNATLIBCFLAGS= -g -O2
-+GNATLIBCFLAGS= -g -O2 $(CFLAGS)
- GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
- 	-DIN_RTS @have_getipinfo@
- 
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
-@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
- SOME_ADAFLAGS =-gnata
- FORCE_DEBUG_ADAFLAGS = -g
- GNATLIBFLAGS = -gnatpg -nostdinc
--GNATLIBCFLAGS = -g -O2
-+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
- # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
- # should be autodetected during the configuration of libada and passed down to
- # here, but we need something for --disable-libada and hope for the best.
-@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
- # Link flags used to build gnat tools.  By default we prefer to statically
- # link with libgcc to avoid a dependency on shared libgcc (which is tricky
- # to deal with as it may conflict with the libgcc provided by the system).
--GCC_LINK_FLAGS=-static-libgcc
-+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)
- 
- # End of variables for you to override.
- 
diff --git a/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch
deleted file mode 100644
index 2612e8bfbbbc..000000000000
--- a/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The `jvgenmain' executable must be linked against `vec.o', among others,
-since it uses its vector API.
-
---- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
-+++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
-@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
- 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
- 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
- 
--jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
-+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
- 	rm -f $@
--	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
-+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
- 
- #
- # Build hooks:
diff --git a/pkgs/development/compilers/gcc/5/libstdc++-target.patch b/pkgs/development/compilers/gcc/5/libstdc++-target.patch
deleted file mode 100644
index fb622b395806..000000000000
--- a/pkgs/development/compilers/gcc/5/libstdc++-target.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Patch to make the target libraries 'configure' scripts find the proper CPP.
-I noticed that building the mingw32 cross compiler.
-Looking at the build script for mingw in archlinux, I think that only nixos
-needs this patch. I don't know why.
-diff --git a/Makefile.in b/Makefile.in
-index 93f66b6..d691917 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
-+	CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
- RAW_CXX_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \
- 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
--	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
-+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
-+	CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
- 
- NORMAL_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \
--	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
-+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
-+	CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
- 
- # Where to find GMP
- HOST_GMPLIBS = @gmplibs@
diff --git a/pkgs/development/compilers/gcc/5/no-sys-dirs.patch b/pkgs/development/compilers/gcc/5/no-sys-dirs.patch
deleted file mode 100644
index 36df51904acf..000000000000
--- a/pkgs/development/compilers/gcc/5/no-sys-dirs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c
---- gcc-4.8.3-orig/gcc/cppdefault.c	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/cppdefault.c	2014-08-18 16:20:32.893944536 +0200
-@@ -35,6 +35,8 @@
- # undef CROSS_INCLUDE_DIR
- #endif
- 
-+#undef LOCAL_INCLUDE_DIR
-+
- const struct default_include cpp_include_defaults[]
- #ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
-diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c
---- gcc-4.8.3-orig/gcc/gcc.c	2014-03-23 12:30:57.000000000 +0100
-+++ gcc-4.8.3/gcc/gcc.c	2014-08-18 13:19:32.689201690 +0200
-@@ -1162,10 +1162,10 @@
- /* Default prefixes to attach to command names.  */
- 
- #ifndef STANDARD_STARTFILE_PREFIX_1
--#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_1 ""
- #endif
- #ifndef STANDARD_STARTFILE_PREFIX_2
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 ""
- #endif
- 
- #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc/4.8/builder.sh
rename to pkgs/development/compilers/gcc/builder.sh
diff --git a/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch b/pkgs/development/compilers/gcc/gfortran-driving.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/4.6/gfortran-driving.patch
rename to pkgs/development/compilers/gcc/gfortran-driving.patch
diff --git a/pkgs/development/compilers/gcc/4.5/gnat-cflags.patch b/pkgs/development/compilers/gcc/gnat-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/4.5/gnat-cflags.patch
rename to pkgs/development/compilers/gcc/gnat-cflags.patch
diff --git a/pkgs/development/compilers/gcc/4.5/libstdc++-target.patch b/pkgs/development/compilers/gcc/libstdc++-target.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/4.5/libstdc++-target.patch
rename to pkgs/development/compilers/gcc/libstdc++-target.patch
diff --git a/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch b/pkgs/development/compilers/gcc/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc/4.8/parallel-bconfig.patch b/pkgs/development/compilers/gcc/parallel-bconfig.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/4.8/parallel-bconfig.patch
rename to pkgs/development/compilers/gcc/parallel-bconfig.patch

From 4a22a4429c2712a2cf7debe86da24efa35995eed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2015 15:00:28 +0200
Subject: [PATCH 0768/1143] gcc-3.4: Remove

No longer in use.
---
 pkgs/development/compilers/gcc/3.4/builder.sh |  63 -------
 .../development/compilers/gcc/3.4/default.nix |  47 -----
 .../compilers/gcc/3.4/no-sys-dirs.patch       | 170 ------------------
 pkgs/top-level/all-packages.nix               |   4 -
 pkgs/top-level/release-small.nix              |   3 -
 5 files changed, 287 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/3.4/builder.sh
 delete mode 100644 pkgs/development/compilers/gcc/3.4/default.nix
 delete mode 100644 pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch

diff --git a/pkgs/development/compilers/gcc/3.4/builder.sh b/pkgs/development/compilers/gcc/3.4/builder.sh
deleted file mode 100644
index 3909b605c208..000000000000
--- a/pkgs/development/compilers/gcc/3.4/builder.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-source $stdenv/setup
-
-
-export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
-mkdir $NIX_FIXINC_DUMMY
-
-
-if test "$noSysDirs" = "1"; then
-
-    if test -e $NIX_CC/nix-support/orig-libc; then
-
-        # Figure out what extra flags to pass to the gcc compilers
-        # being generated to make sure that they use our glibc.
-        extraCFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
-        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
-
-        # Use *real* header files, otherwise a limits.h is generated
-        # that does not include Glibc's limits.h (notably missing
-        # SSIZE_MAX, which breaks the build).
-        export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include
-        
-    else
-        # Hack: support impure environments.
-        extraCFlags="-isystem /usr/include"
-        extraLDFlags="-L/usr/lib64 -L/usr/lib"
-        export NIX_FIXINC_DUMMY=/usr/include
-    fi
-
-    export NIX_EXTRA_CFLAGS=$extraCFlags
-    for i in $extraLDFlags; do
-        export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i"
-    done        
-    export CFLAGS=$extraCFlags
-    export CXXFLAGS=$extraCFlags
-fi
-
-
-preConfigure() {
-    # Perform the build in a different directory.
-    mkdir ../build
-    cd ../build
-    configureScript=../$sourceRoot/configure
-}
-
-
-postInstall() {
-    # Remove precompiled headers for now.  They are very big and
-    # probably not very useful yet.
-    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
-
-    # Remove `fixincl' to prevent a retained dependency on the
-    # previous gcc.
-    rm -rf $out/libexec/gcc/*/*/install-tools
-}
-
-
-if test -z "$profiledCompiler"; then
-    buildFlags="bootstrap $buildFlags"
-else    
-    buildFlags="profiledbootstrap $buildFlags"
-fi
-
-genericBuild
diff --git a/pkgs/development/compilers/gcc/3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix
deleted file mode 100644
index 1be771ac7054..000000000000
--- a/pkgs/development/compilers/gcc/3.4/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, noSysDirs
-, langC ? true, langCC ? true, langF77 ? false
-, profiledCompiler ? false
-}:
-
-assert langC;
-
-with stdenv.lib;
-
-stdenv.mkDerivation {
-  name = "gcc-3.4.6";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2;
-    md5 = "4a21ac777d4b5617283ce488b808da7b";
-  };
-
-  patches = stdenv.lib.optional noSysDirs ./no-sys-dirs.patch;
-
-  # inspiration: https://aur.archlinux.org/packages/g77/
-  postPatch = ''
-    substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t
-  '';
-
-  inherit noSysDirs profiledCompiler;
-
-  configureFlags = "
-    --disable-multilib
-    --with-system-zlib
-    --enable-languages=${
-      concatStrings (intersperse ","
-        (  optional langC   "c"
-        ++ optional langCC  "c++"
-        ++ optional langF77 "f77"
-        )
-      )
-    }
-  ";
-
-  passthru = { inherit langC langCC langF77; isGNU = true; };
-
-  meta = {
-    homepage = "http://gcc.gnu.org/";
-    license = "GPL/LGPL";
-    description = "GNU Compiler Collection, 3.4.x";
-  };
-}
diff --git a/pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch b/pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch
deleted file mode 100644
index 2159893cde2b..000000000000
--- a/pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -rc gcc-orig/gcc/cppdefault.c gcc-patched/gcc/cppdefault.c
-*** gcc-orig/gcc/cppdefault.c	2003-03-01 15:31:12.000000000 +0100
---- gcc-patched/gcc/cppdefault.c	2004-06-29 10:08:45.000000000 +0200
-***************
-*** 41,46 ****
---- 41,50 ----
-  # undef CROSS_INCLUDE_DIR
-  #endif
-  
-+ #undef LOCAL_INCLUDE_DIR
-+ #undef SYSTEM_INCLUDE_DIR
-+ #undef STANDARD_INCLUDE_DIR
-+ 
-  const struct default_include cpp_include_defaults[]
-  #ifdef INCLUDE_DEFAULTS
-  = INCLUDE_DEFAULTS;
-diff -rc gcc-orig/gcc/Makefile.in gcc-patched/gcc/Makefile.in
-*** gcc-orig/gcc/Makefile.in	2004-04-01 18:47:54.000000000 +0200
---- gcc-patched/gcc/Makefile.in	2004-06-29 13:50:45.000000000 +0200
-***************
-*** 199,205 ****
-  CPPFLAGS = @CPPFLAGS@
-  
-  # These exists to be overridden by the x-* and t-* files, respectively.
-! X_CFLAGS =
-  T_CFLAGS =
-  
-  X_CPPFLAGS =
---- 199,205 ----
-  CPPFLAGS = @CPPFLAGS@
-  
-  # These exists to be overridden by the x-* and t-* files, respectively.
-! X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS)
-  T_CFLAGS =
-  
-  X_CPPFLAGS =
-***************
-*** 345,351 ****
-  PARTITION_H = $(srcdir)/../include/partition.h
-  
-  # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
-! NATIVE_SYSTEM_HEADER_DIR = /usr/include
-  # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
-  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
-  
---- 345,355 ----
-  PARTITION_H = $(srcdir)/../include/partition.h
-  
-  # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
-! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
-! # `fixinc' from fixing header files in /usr/include.  However,
-! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
-! # it to some dummy directory.
-! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
-  # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
-  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
-  
-diff -rc gcc-orig/libstdc++-v3/include/Makefile.in gcc-patched/libstdc++-v3/include/Makefile.in
-*** gcc-orig/libstdc++-v3/include/Makefile.in	2004-03-18 18:36:43.000000000 +0100
---- gcc-patched/libstdc++-v3/include/Makefile.in	2004-06-29 19:01:33.000000000 +0200
-***************
-*** 896,903 ****
-  	if [ ! -d "${pch_output_builddir}" ]; then \
-  	  mkdir -p ${pch_output_builddir}; \
-  	fi; \
-! 	$(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \
-! 	$(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g;
-  
-  # For robustness sake (in light of junk files or in-source
-  # configuration), copy from the build or source tree to the install
---- 896,903 ----
-  	if [ ! -d "${pch_output_builddir}" ]; then \
-  	  mkdir -p ${pch_output_builddir}; \
-  	fi; \
-! 	$(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \
-! 	$(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g;
-  
-  # For robustness sake (in light of junk files or in-source
-  # configuration), copy from the build or source tree to the install
-diff -rc gcc-orig/ltcf-cxx.sh gcc-patched/ltcf-cxx.sh
-*** gcc-orig/ltcf-cxx.sh	2003-11-19 06:29:32.000000000 +0100
---- gcc-patched/ltcf-cxx.sh	2004-06-29 15:26:01.000000000 +0200
-***************
-*** 985,991 ****
-    # the conftest object file.
-    pre_test_object_deps_done=no
-  
-!   for p in `eval $output_verbose_link_cmd`; do
-  
-      case $p in
-  
---- 985,991 ----
-    # the conftest object file.
-    pre_test_object_deps_done=no
-  
-!   for p in `true`; do
-  
-      case $p in
-  
-diff -rc gcc-orig/Makefile.in gcc-patched/Makefile.in
-*** gcc-orig/Makefile.in	2004-01-14 21:09:37.000000000 +0100
---- gcc-patched/Makefile.in	2004-06-29 16:21:36.000000000 +0200
-***************
-*** 228,234 ****
-  NM = @NM@
-  
-  LD = @LD@
-! LDFLAGS = 
-  
-  RANLIB = @RANLIB@
-  
---- 228,234 ----
-  NM = @NM@
-  
-  LD = @LD@
-! LDFLAGS = $(NIX_EXTRA_LDFLAGS)
-  
-  RANLIB = @RANLIB@
-  
-***************
-*** 277,283 ****
-  # CFLAGS will be just -g.  We want to ensure that TARGET libraries
-  # (which we know are built with gcc) are built with optimizations so
-  # prepend -O2 when setting CFLAGS_FOR_TARGET.
-! CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
-  # If GCC_FOR_TARGET is not overriden on the command line, then this
-  # variable is passed down to the gcc Makefile, where it is used to
-  # build libgcc2.a.  We define it here so that it can itself be
---- 277,283 ----
-  # CFLAGS will be just -g.  We want to ensure that TARGET libraries
-  # (which we know are built with gcc) are built with optimizations so
-  # prepend -O2 when setting CFLAGS_FOR_TARGET.
-! CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(NIX_EXTRA_CFLAGS)
-  # If GCC_FOR_TARGET is not overriden on the command line, then this
-  # variable is passed down to the gcc Makefile, where it is used to
-  # build libgcc2.a.  We define it here so that it can itself be
-***************
-*** 290,296 ****
-  RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
-  CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
-  RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
-! CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
-  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-  
-  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
---- 290,296 ----
-  RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
-  CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
-  RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
-! CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(NIX_EXTRA_CFLAGS)
-  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-  
-  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
-***************
-*** 321,327 ****
-      fi; \
-    fi`
-  
-! LDFLAGS_FOR_TARGET = 
-  
-  NM_FOR_TARGET=@NM_FOR_TARGET@
-  USUAL_NM_FOR_TARGET = ` \
---- 321,327 ----
-      fi; \
-    fi`
-  
-! LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS)
-  
-  NM_FOR_TARGET=@NM_FOR_TARGET@
-  USUAL_NM_FOR_TARGET = ` \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 534bf6e7c4b7..71307a32ecff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3474,10 +3474,6 @@ let
 
   gccApple = throw "gccApple is no longer supported";
 
-  gcc34 = wrapCC (import ../development/compilers/gcc/3.4 {
-    inherit fetchurl stdenv noSysDirs;
-  });
-
   gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
     (callPackage ../development/compilers/gcc/4.8 {
       inherit noSysDirs;
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index e8956b5a0dae..a4ae1932fcfe 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -46,10 +46,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   findutils = all;
   flex = all;
   gcc = all;
-  gcc34 = linux;
-  gcc44 = linux;
   gcj = linux;
-  ghdl = linux;
   glibc = linux;
   glibcLocales = linux;
   gnat = linux;

From 82ba13111c72937b792edd40bcbebbda1d395c7c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 12 May 2015 06:26:31 -0700
Subject: [PATCH 0769/1143] ncurses: Fix shouldUsePkg on darwin

---
 pkgs/development/libraries/ncurses/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 051d29924dfc..fd545e53625f 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -16,7 +16,11 @@ let
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg_: let
+    pkg = (builtins.tryEval pkg_).value;
+  in if stdenv.lib.any (x: x == stdenv.system) (pkg.meta.platforms or [])
+    then pkg
+    else null;
 
   buildShared = !stdenv.isDarwin;
 

From def321e81155c7055aa05806ac6802dda042de25 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 12 May 2015 08:51:55 -0500
Subject: [PATCH 0770/1143] add grantlee-5.0.0

---
 pkgs/development/libraries/grantlee/5.x.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/grantlee/5.x.nix

diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix
new file mode 100644
index 000000000000..4127280fb9a2
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5.x.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, qt5, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "grantlee-5.0.0";
+
+# Upstream download server has country code firewall, so I made a mirror.
+  src = fetchurl {
+    urls = [
+      "http://downloads.grantlee.org/${name}.tar.gz"
+      "http://www.loegria.net/grantlee/${name}.tar.gz"
+    ];
+    sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa";
+  };
+
+  buildInputs = [ cmake qt5.base qt5.script ];
+
+  meta = {
+    description = "Qt5 port of Django template system";
+    longDescription = ''
+      Grantlee is a plugin based String Template system written using the Qt
+      framework. The goals of the project are to make it easier for application
+      developers to separate the structure of documents from the data they
+      contain, opening the door for theming.
+
+      The syntax is intended to follow the syntax of the Django template system,
+      and the design of Django is reused in Grantlee.'';
+
+    homepage = http://gitorious.org/grantlee;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (qt5.base.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 534bf6e7c4b7..d9dd2cdce967 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6103,6 +6103,8 @@ let
 
   grantlee = callPackage ../development/libraries/grantlee { };
 
+  grantlee5 = callPackage ../development/libraries/grantlee/5.x.nix { };
+
   gsasl = callPackage ../development/libraries/gsasl { };
 
   gsl = callPackage ../development/libraries/gsl { };

From 332df249e6ece8c31bc7724a06c06c5bdeed5bb1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 May 2015 15:45:00 +0300
Subject: [PATCH 0771/1143] haskell-misfortune: fix patch

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index fe3207ada243..a58fffda0952 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -167,9 +167,8 @@ self: super: {
     prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal";
   });
 
-  # https://github.com/mokus0/misfortune/pull/1
   misfortune = appendPatch super.misfortune (pkgs.fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/mokus0/misfortune/pull/1.patch";
+    url = "https://github.com/mokus0/misfortune/commit/9e0a38cf8d59a0de9ae1156034653f32099610e4.patch";
     sha256 = "15frwdallm3i6k7mil26bbjd4wl6k9h20ixf3cmyris3q3jhlcfh";
   });
 

From b575dc53ad2e320113a8669ac39f7a36ac483877 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 May 2015 15:45:05 +0300
Subject: [PATCH 0772/1143] yEd: update

---
 pkgs/applications/graphics/yed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 6e9a1fdeb095..e22c7804914b 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yEd-3.14.1";
+  name = "yEd-3.14.2";
 
   src = fetchurl {
     url = "http://www.yworks.com/products/yed/demo/${name}.zip";
-    sha256 = "09zik3pjs5x0vc0jvndm762blk85y44lxac3vdfqqbinwd9gfnm2";
+    sha256 = "1i2fncp7q0xin42sf55zc79jzrkzbp25yw8rcjkgsy6hgnhl73nh";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From 367c7779e0be9be9622a655b98a11e9f0931a427 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 May 2015 15:49:03 +0300
Subject: [PATCH 0773/1143] haskell-dependent-sum-template: updated on Hackage

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index a58fffda0952..b1ff2efb8c30 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -124,10 +124,6 @@ self: super: {
   unix-time = dontCheck super.unix-time;
 
   # Until the changes have been pushed to Hackage
-  dependent-sum-template = appendPatch super.dependent-sum-template (pkgs.fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/mokus0/dependent-sum-template/pull/4.patch";
-    sha256 = "1yb1ny4ckl4d3sf4xnvpbsa9rw2dficzgipijs5s3729dnsc3rb0";
-  });
   mueval = appendPatch super.mueval (pkgs.fetchpatch {
     url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/10.patch";
     sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74";

From f83011736fbb27e5ac46896dc26240d77990c626 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 May 2015 16:09:33 +0300
Subject: [PATCH 0774/1143] haskell-mueval: update patch

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index b1ff2efb8c30..73e31a03c29e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -125,7 +125,7 @@ self: super: {
 
   # Until the changes have been pushed to Hackage
   mueval = appendPatch super.mueval (pkgs.fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/10.patch";
+    url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch";
     sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74";
   });
   present = appendPatch super.present (pkgs.fetchpatch {

From cb9764f847e1a67c69de80d7bb32ac10f1649344 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 May 2015 16:50:14 +0300
Subject: [PATCH 0775/1143] haskell-lambdabot: remove ghc 7.8 patch

---
 .../configuration-ghc-7.10.x.nix              |  3 ---
 .../configuration-ghc-7.8.x.nix               |  3 ---
 .../haskell-modules/lambdabot-fix-ghc78.patch | 22 -------------------
 3 files changed, 28 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 73e31a03c29e..529627df1171 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -182,9 +182,6 @@ self: super: {
             in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
                                           self.webkitgtk3-javascriptcore ];
 
-  # Fix evaluation in GHC >=7.8: https://github.com/lambdabot/lambdabot/issues/116
-  lambdabot = appendPatch super.lambdabot ./lambdabot-fix-ghc78.patch;
-
   # https://github.com/haskell-infra/hackage-trustees/issues/24
   brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch;
   unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 21fdc86d89a6..361d404412ea 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -123,9 +123,6 @@ self: super: {
             in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
                                           self.webkitgtk3-javascriptcore ];
 
-  # Fix evaluation in GHC >=7.8: https://github.com/lambdabot/lambdabot/issues/116
-  lambdabot = appendPatch super.lambdabot ./lambdabot-fix-ghc78.patch;
-
   # Needs hashable on pre 7.10.x compilers.
   nats = addBuildDepend super.nats self.hashable;
 
diff --git a/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch b/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch
deleted file mode 100644
index 0a0ed65803a0..000000000000
--- a/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru3 lambdabot-5.0.1.old/State/L.hs lambdabot-5.0.1/State/L.hs
---- lambdabot-5.0.1.old/State/L.hs	2015-04-15 03:26:04.818947594 +0300
-+++ lambdabot-5.0.1/State/L.hs	2015-04-15 03:26:20.386099365 +0300
-@@ -34,7 +34,6 @@
- import Control.Monad
- import Control.Monad.Cont
- import Control.Monad.Identity
--import Control.Monad.Instances
- import Control.Monad.Reader
- import Control.Monad.ST.Safe
- import Control.Monad.State
-diff -ru3 lambdabot-5.0.1.old/State/Pristine.hs lambdabot-5.0.1/State/Pristine.hs
---- lambdabot-5.0.1.old/State/Pristine.hs	2015-04-15 03:26:04.818947594 +0300
-+++ lambdabot-5.0.1/State/Pristine.hs	2015-04-15 03:26:20.386099365 +0300
-@@ -34,7 +34,6 @@
- import Control.Monad
- import Control.Monad.Cont
- import Control.Monad.Identity
--import Control.Monad.Instances
- import Control.Monad.Reader
- import Control.Monad.ST.Safe
- import Control.Monad.State

From 73e10360290be7fbde87dd2c42ec9a234befdc04 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Tue, 12 May 2015 16:28:32 +0200
Subject: [PATCH 0776/1143] add plugin-torture: a tool to test LADSPA and LV2
 plugins

---
 .../audio/plugin-torture/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/audio/plugin-torture/default.nix

diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix
new file mode 100644
index 000000000000..91b3954de0df
--- /dev/null
+++ b/pkgs/applications/audio/plugin-torture/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:
+
+stdenv.mkDerivation rec {
+  name = "plugin-torture-git-${version}";
+  version = "2013-10-03";
+
+  src = fetchgit {
+    url = "https://github.com/cth103/plugin-torture";
+    rev = "9ee06016982bdfbaa215cd0468cc6ada6367462a";
+    sha256 = "bfe9213fd2c1451d7acc1381d63301c4e6ff69ce86d31a886ece5159ba850706";
+  };
+
+  buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp plugin-torture $out/bin/
+    cp README $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/cth103/plugin-torture;
+    description = "A tool to test LADSPA and LV2 plugins";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71307a32ecff..d310b97850e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11848,6 +11848,8 @@ let
     gtksharp = gtk-sharp;
   };
 
+  plugin-torture = callPackage ../applications/audio/plugin-torture { };
+
   pommed = callPackage ../os-specific/linux/pommed {
     inherit (xorg) libXpm;
   };

From 3e17a5c1d0bfe5a72ec38dfe5df20e55306c2e58 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 May 2015 17:33:46 +0300
Subject: [PATCH 0777/1143] haskell-unlambda/brainfuck: Put a note

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 529627df1171..409b7500ae50 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -182,7 +182,7 @@ self: super: {
             in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
                                           self.webkitgtk3-javascriptcore ];
 
-  # https://github.com/haskell-infra/hackage-trustees/issues/24
+  # FIXME: remove with the next Hackage update
   brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch;
   unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch;
 

From 50c0b00592183e73ab586a83be988d8fac561140 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 12 May 2015 09:47:54 -0500
Subject: [PATCH 0778/1143] kdeApps_15_04.rocs: add missing dependencies

rocs depends on grantlee5 and kdelibs4support, although the latter is undeclared.
---
 pkgs/applications/kde-apps-15.04/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 798d6d977b0d..9de2f7a9fe15 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -90,6 +90,7 @@ let
         Gpgme = gpgme;
         Gphoto2 = libgphoto2;
         Grantlee = grantlee;
+        Grantlee5 = grantlee5;
         GSL = gsl;
         HUNSPELL = hunspell;
         HUpnp = herqq;
@@ -350,6 +351,10 @@ let
         '';
       };
 
+      rocs = super.rocs // {
+        buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]);
+      };
+
       signon-kwallet-extension =
         let signon = pkgs.signon.override { inherit qt5; };
         in super.signon-kwallet-extension // {

From e504a9301dbd6be9478d7dcb3b0c7564af06ac01 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 12 May 2015 17:24:17 +0200
Subject: [PATCH 0779/1143] bgs: update from 0.7 to 0.7.1

---
 pkgs/tools/X11/bgs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index 984fc9158cca..c305583a3f9f 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "bgs-${version}";
-  version = "0.7";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz";
-    sha256 = "1w1zz9nzj0a0r9rlnq5psjj7n2ff1zfghcs6j268i5c7nkyaw28a";
+    sha256 = "1kgm139daz4xrymx11whbmwzsnps9yn4g34a17s34ihi0raf70w8";
   };
 
   buildInputs = [ libX11 libXinerama imlib2 ];

From 4c77830a93a5cc3b909f8675d4d35a2f5f232839 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 15 Apr 2015 13:22:39 +0000
Subject: [PATCH 0780/1143] rustcMaster: Update from 2015-04-15 -> 2015-05-09

---
 pkgs/development/compilers/rustc/head.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 00e87f30e2cd..383632b2ce08 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,15 +2,15 @@
 callPackage ./makeRustcDerivation.nix {
   shortVersion = "1.0.0-dev";
   isRelease = false;
-  # src rev for master on 2015-04-15
-  srcRev = "a691f1eefea586f154700be6ee1b991158f82b7f";
-  srcSha = "1afypvxahhwhva9rssagm2q08wgidv6xcjrx85lqwzy6abyl1hsz";
-  snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
-  snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
-  snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
-  snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa";
-  snapshotDate = "2015-03-27";
-  snapshotRev = "5520801";
+  # src rev for master on 2015-05-09
+  srcRev = "95400c51c31877ea4699adc051477edccb5cfbca";
+  srcSha = "1ldgc5nd42pcbr650rpyvpnc8h6bky6gmb116fwy1g6x2ql66djw";
+  snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
+  snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
+  snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
+  snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
+  snapshotDate = "2015-04-27";
+  snapshotRev = "857ef6e";
   patches = [
     ./patches/head.patch
   ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

From 548e8db2499f38fe1b06a78fad7c1ddb53e0029d Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 12 May 2015 14:27:47 +0200
Subject: [PATCH 0781/1143] rustRegistry: 2015-04-23 -> 2015-05-12

---
 pkgs/top-level/rust-packages.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 8cbc4a73d28f..5e3977ab6d68 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,24 +7,21 @@
 { runCommand, fetchgit, git }:
 
 let
-  version = "2015-04-23";
+  version = "2015-05-12";
 
   src = fetchgit {
       url = git://github.com/rust-lang/crates.io-index.git;
 
-      rev = "965b634156cc5c6f10c7a458392bfd6f27436e7e";
-      sha256 = "1hbl3g1d6yz6x2fm76dxmcn8rdrmri4l9n6flvv0pkn4hsid7zw1";
-
-      # cargo needs the 'master' branch to exist
-      leaveDotGit = true;
-      branchName = "master";
+      rev = "9bf9e7f2b242552ccec879b47b2225a76c7c79b0";
+      sha256 = "14rrpm6and52qasn7fv5fkflhnkyr86xy0k9pjgw407k7xms0cmw";
   };
 
 in
 
 runCommand "rustRegistry-${version}-${builtins.substring 0 7 src.rev}" {} ''
   # For some reason, cargo doesn't like fetchgit's git repositories, not even
-  # if we clone them (tested with registry rev
+  # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone
+  # the repository (tested with registry rev
   # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message:
   #
   # "Target OID for the reference doesn't exist on the repository"

From cbdedca255e50dfce0e2e345181e718bbd90b46d Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 12 May 2015 14:18:58 +0200
Subject: [PATCH 0782/1143] cargo: 2015-04-14 -> 2015-05-11

---
 .../tools/build-managers/cargo/default.nix       | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 05e07b4afa2b..8e7d8cf8ee83 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
 , cmake, zlib }:
 
-with ((import ./common.nix) { inherit stdenv; version = "2015-04-14"; });
+with ((import ./common.nix) { inherit stdenv; version = "2015-05-11"; });
 
 with rustPlatform;
 
@@ -10,20 +10,12 @@ buildRustPackage rec {
 
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo.git";
-    rev = "d49b44358ed800351647571144257d35ac0886cf";
-    sha256 = "1kaims28237mvp1qpw2cfgb3684jr54ivkdag0lw8iv9xap4i35y";
+    rev = "a078e01ffab70738eafb7401704d1eaf90b94de2";
+    sha256 = "0vw62kxlmkajyix6n4cdz7w9l26dspjiw2fk4xkj33gzzc8rq9g8";
     leaveDotGit = true;
   };
 
-  cargoUpdateHook = ''
-    # Updating because version 2.1.4 has an invalid Cargo.toml
-    cargo update -p libressl-pnacl-sys --precise 2.1.5
-
-    # Updating because version 0.1.3 has a build failure with recent rustc
-    cargo update -p threadpool --precise 0.1.4
-  '';
-
-  depsSha256 = "1gj3mnjj17h5p0r1jcm3m3pm3p3l1rbfdz3l7v1cykng78dsabnq";
+  depsSha256 = "1sk79w2wxvpgfkxr0nbrqqxdih4abiqvawdd88r2p9cqzrkdg8by";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 

From e40a43cd1f4ea69f9ec95fbcbbb89621db31ccae Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 12 May 2015 16:24:52 +0200
Subject: [PATCH 0783/1143] rustRacer: 2015-04-12 -> 2015-05-04

---
 pkgs/development/tools/rust/racer/default.nix | 10 ++++---
 .../development/tools/rust/racer/pr-232.patch | 26 +++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/tools/rust/racer/pr-232.patch

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 4887736a8591..2b1f84c6b909 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -4,14 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   #TODO add emacs support
-  name = "racer-git-2015-04-12";
+  name = "racer-git-2015-05-04";
   src = fetchgit {
     url = https://github.com/phildawes/racer;
-    rev = "5437e2074d87dfaab75a0f1bd2597bed61c0bbf1";
-    sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn";
+    rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c";
+    sha256 = "0ldf05d19ghxk3fslxrc87j18zg8bam2y0ygdy456h37y2p1d1ck";
   };
 
-  depsSha256 = "13rnxr5inrfnmg5mg2vap17fd2jp32g2a70pfi1sshi6vjr8kpap";
+  patches = [ ./pr-232.patch ];
+
+  depsSha256 = "0rinyh365znx39aygxyyxmi496pw0alblf2dl7l8fbmz63nkhfv2";
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/rust/racer/pr-232.patch b/pkgs/development/tools/rust/racer/pr-232.patch
new file mode 100644
index 000000000000..354307d71e4f
--- /dev/null
+++ b/pkgs/development/tools/rust/racer/pr-232.patch
@@ -0,0 +1,26 @@
+From 3f354d69881424c7c902408d22f9138412a872b4 Mon Sep 17 00:00:00 2001
+From: Ricardo Martins <ricardo@scarybox.net>
+Date: Sat, 9 May 2015 17:12:55 +0100
+Subject: [PATCH] Use `Vec::extend` instead of binary operation `+`.
+
+---
+ src/racer/nameres.rs | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/racer/nameres.rs b/src/racer/nameres.rs
+index 60636c6..ad1e01c 100644
+--- a/src/racer/nameres.rs
++++ b/src/racer/nameres.rs
+@@ -620,9 +620,9 @@ pub fn search_scope(start: usize, point: usize, src: &str,
+         }
+ 
+         // There's a good chance of a match. Run the matchers
+-        out = out + &*run_matchers_on_blob(src, start+blobstart, start+blobend,
+-                                      searchstr,
+-                                      filepath, search_type, local, namespace);
++        out.extend(run_matchers_on_blob(src, start+blobstart, start+blobend,
++                                        searchstr,
++                                        filepath, search_type, local, namespace));
+         if let ExactMatch = search_type {
+             if !out.is_empty() {
+                 return out.into_iter();

From 7640b92c304862dcfc71a8c0e7a767190e9a0059 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 12 May 2015 16:51:38 +0100
Subject: [PATCH 0784/1143] tibia: update to 10.78

---
 pkgs/games/tibia/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 21e6a28cf857..1e4d1ad7f3fa 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.77";
+  name = "tibia-10.78";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1077.tgz;
-    sha256 = "1qz2a25irzhdwh4swwcfz4g37f1j3cxhm9c43yl763bvc718ikly";
+    url = http://static.tibia.com/download/tibia1078.tgz;
+    sha256 = "087yi8jzi8bn1fp3b8lpp913bzdwf5nszv5p5gr6hx9xyhjj97ax";
   };
 
   shell = stdenv.shell;

From 55e66db0fa3d7543d93397f60efd06ffc370232f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 12 May 2015 17:15:34 +0200
Subject: [PATCH 0785/1143] python2: Don't fail silently on module build.

A build output of such a failure can be found here:

http://hydra.nixos.org/build/21994789/nixlog/1/raw

The build_ext command doesn't return non-zero if it fails but instead
produces a file with a "_failed.so" suffix, which we're now checking
after the build_ext command.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/interpreters/python/2.6/default.nix | 1 +
 pkgs/development/interpreters/python/2.7/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index ffc4c5d2e1fa..10c52e958d8f 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -144,6 +144,7 @@ let
             'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'
 
           python ./setup.py build_ext
+          [ -z "$(find build -name '*_failed.so' -print)" ]
         '';
 
       installPhase =
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index b8b25c576c59..e9d9dc6824d0 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -161,6 +161,7 @@ let
             'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'
 
           python ./setup.py build_ext
+          [ -z "$(find build -name '*_failed.so' -print)" ]
         '';
 
       installPhase =

From a7028d3d07dade2305b7a94d39bec208d605617c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 12 May 2015 17:34:43 +0200
Subject: [PATCH 0786/1143] python2: Pass configureFlags to modules as well.

Fixes regression from 086e801d5132bcf9a4e4cac56c361651b7b22ac0.

The switch tu UCS-4 only happened for the main Python interpreter and
libraries, but the extension modules were using the same source but
without any configureFlags, so the extensions still referred to UCS-2
symbols.

Tested module builds of Python 2.7 and all modules except crypto fail.
Also tested against sqlite3 module of Python 2.6, although for other
modules there still seems to be an unrelated build failure with Tcl/Tk
libraries, so we might need to fix that later.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/interpreters/python/2.6/default.nix | 9 +++++----
 pkgs/development/interpreters/python/2.7/default.nix | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 10c52e958d8f..4e322faf66f0 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -46,6 +46,8 @@ let
       touch $out/include/python${majorVersion}/pyconfig.h
     '';
 
+  configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
+
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
     [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
@@ -58,13 +60,12 @@ let
     name = "python${if includeModules then "" else "-minimal"}-${version}";
     pythonVersion = majorVersion;
 
-    inherit majorVersion version src patches buildInputs preConfigure;
+    inherit majorVersion version src patches buildInputs preConfigure
+            configureFlags;
 
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
-
     NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
 
     setupHook = ./setup-hook.sh;
@@ -131,7 +132,7 @@ let
     if includeModules then null else stdenv.mkDerivation rec {
       name = "python-${moduleName}-${python.version}";
 
-      inherit src patches preConfigure;
+      inherit src patches preConfigure configureFlags;
 
       buildInputs = [ python ] ++ deps;
 
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index e9d9dc6824d0..ac9b9d637096 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -58,6 +58,8 @@ let
       touch $out/include/python${majorVersion}/pyconfig.h
     '';
 
+  configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
+
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
     [ bzip2 openssl ]
@@ -73,14 +75,13 @@ let
     name = "python-${version}";
     pythonVersion = majorVersion;
 
-    inherit majorVersion version src patches buildInputs preConfigure;
+    inherit majorVersion version src patches buildInputs preConfigure
+            configureFlags;
 
     LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
-
     NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
     DETERMINISTIC_BUILD = 1;
 
@@ -149,7 +150,7 @@ let
     if includeModules then null else stdenv.mkDerivation rec {
       name = "python-${moduleName}-${python.version}";
 
-      inherit src patches preConfigure;
+      inherit src patches preConfigure configureFlags;
 
       buildInputs = [ python ] ++ deps;
 

From 8549e0cc9922d9da5623439737ebcb8b0e91b4d8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 12 May 2015 17:19:32 +0200
Subject: [PATCH 0787/1143] Revert "python-packages: SQLAlchemy: build"

This reverts commit 6e8d1f84f229bc481b2c0aafdeac986f4f3deb8c.

pysqlite is not available for Python 3. Adding it to buildInputs
makes all packages dependent upon sqlalchemy equally unavailable
for no good reason.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09a17d36bc30..4f00973c87f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11909,7 +11909,7 @@ let
       md5 = "470ca4da4a0081efc830f0d90dd91682";
     };
 
-    buildInputs = with self; [ nose mock pysqlite ];
+    buildInputs = with self; [ nose mock ];
 
     propagatedBuildInputs = with self; [ modules.sqlite3 ];
 

From f0764dd6320a0f373df4ddafba042da1e483e759 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 12 May 2015 17:22:04 +0200
Subject: [PATCH 0788/1143] python-packages: SQLAlchemy: skip tests on Py3k

They would fail anyway, blocking all dependents for the sake of
a mere test dependency.
---
 pkgs/top-level/python-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f00973c87f4..1803625f6f4a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11909,10 +11909,14 @@ let
       md5 = "470ca4da4a0081efc830f0d90dd91682";
     };
 
-    buildInputs = with self; [ nose mock ];
-
+    buildInputs = with self; [ nose mock ]
+      ++ stdenv.lib.optional doCheck pysqlite;
     propagatedBuildInputs = with self; [ modules.sqlite3 ];
 
+    # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
+    # acceptable reason to make all dependents unavailable on Python 3 as well
+    doCheck = !isPy3k;
+
     checkPhase = ''
       ${python.executable} sqla_nose.py
     '';

From a989b629d977cb053874dac127f267569d5c5f9f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 12 May 2015 17:56:48 +0200
Subject: [PATCH 0789/1143] lz4 128 -> 129

- New: LZ4_compress_fast()
- Changed: New lz4 and lz4hc compression API. Previous function
  prototypes still supported.
- Changed: Sparse file support enabled by default
- New: LZ4 CLI improved performance compressing/decompressing multiple
  files
- Added: LZ4_compress_destSize()
- Fixed: GCC 4.9+ vector optimization
- Changed: Enums converted to LZ4F_ namespace convention
- Added: AppVeyor CI environment, for Visual tests
- Modified:Obsolete functions generate warnings
- Fixed : Bug #75 (unfinished stream)
- Updated: Documentation converted to MarkDown format
---
 pkgs/tools/compression/lz4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index d27ada615c71..46b3b2fd7d78 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, valgrind }:
 
-let version = "128"; in
+let version = "129"; in
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "00jrnic2jddj81av8jjipf4rdkx6x6cdf8zpsz3mp5kbmqzd0h9a";
+    sha256 = "0liq5gvnikchgvalpi52hq0npwlh84w94bj79dcbrcw19may5dwi";
     rev = "r${version}";
     repo = "lz4";
     owner = "Cyan4973";

From f168973bfd65f64580a06376e4ef7b3731d4cb75 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 12 May 2015 12:49:36 -0400
Subject: [PATCH 0790/1143] Revert "curl: Improve .pc and .la patching"

This breaks on darwin with:

> sed: -e: No such file or directory

This reverts commit 26c37ded73ce084275d748be26887cf4023c91d6.
---
 pkgs/tools/networking/curl/default.nix | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 689dc3d7d5ef..f8b3ad9355ad 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -103,30 +103,24 @@ stdenv.mkDerivation rec {
   ];
 
   # Fix all broken refernces to dependencies in .la and .pc files
-  postInstall = ''
-    sed -i \
-  '' + optionalString (optZlib != null) ''
-      -e 's,\(-lz\),-L${optZlib}/lib \1,' \
+  postInstall = optionalString (optZlib != null) ''
+    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
   '' + optionalString (optOpenssl != null) ''
-      -e 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' \
+    sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc
   '' + optionalString (optLibssh2 != null) ''
-      -e 's,\(-lssh2\),-L${optLibssh2}/lib \1,' \
+    sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
   '' + optionalString (optLibnghttp2 != null) ''
-      -e 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' \
+    sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
   '' + optionalString (optC-ares != null) ''
-      -e 's,\(-lcares\),-L${optC-ares}/lib \1,' \
+    sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
   '' + optionalString (optGss != null) ''
-      -e 's,\(-lgss\),-L${optGss}/lib \1,' \
+    sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
   '' + optionalString (optRtmpdump != null) ''
-      -e 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' \
+    sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc
   '' + optionalString (optOpenldap != null) ''
-      -e 's,\(-lgss\),-L${optOpenldap}/lib \1,' \
+    sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
   '' + optionalString (optLibidn != null) ''
-      -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \
-  '' + optionalString (!stdenv.isDarwin) ''
-    $out/lib/libcurl.la \
-  '' + ''
-    $out/lib/pkgconfig/libcurl.pc
+    sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc
   '';
 
   meta = {

From 206d63edaccfccaeedbc5d7fb8828fe8fb6d8305 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 12 May 2015 13:07:58 -0400
Subject: [PATCH 0791/1143] curl: propagate inputs instead of patching
 pkgconfig

---
 pkgs/tools/networking/curl/default.nix | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index f8b3ad9355ad..ad2c9ec68970 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   # Use pkgconfig only when necessary
   nativeBuildInputs = optional (!isLight) pkgconfig;
-  buildInputs = [
+  propagatedBuildInputs = [
     optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares
     optGss optRtmpdump optOpenldap optLibidn
   ];
@@ -102,27 +102,6 @@ stdenv.mkDerivation rec {
     (mkEnable (optC-ares != null)     "ares"              null)
   ];
 
-  # Fix all broken refernces to dependencies in .la and .pc files
-  postInstall = optionalString (optZlib != null) ''
-    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
-  '' + optionalString (optOpenssl != null) ''
-    sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '' + optionalString (optLibssh2 != null) ''
-    sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '' + optionalString (optLibnghttp2 != null) ''
-    sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '' + optionalString (optC-ares != null) ''
-    sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
-  '' + optionalString (optGss != null) ''
-    sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
-  '' + optionalString (optRtmpdump != null) ''
-    sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '' + optionalString (optOpenldap != null) ''
-    sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
-  '' + optionalString (optLibidn != null) ''
-    sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '';
-
   meta = {
     description = "A command line tool for transferring files with URL syntax";
     homepage    = http://curl.haxx.se/;

From 7e1286bf01b82c2a0b7d7b07327ebb593d0a2cd0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 12 May 2015 16:28:07 -0400
Subject: [PATCH 0792/1143] jsoncpp: don't rely on coreutils cp

---
 pkgs/development/libraries/jsoncpp/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 7eb7f393ba43..07563364e340 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0p92i0hx2k3g8mwrcy339b56bfq8qgpb65id8xllkgd2ns4wi9zi";
   };
 
+  /* During darwin bootstrap, we have a cp that doesn't understand the
+   * --reflink=auto flag, which is used in the default unpackPhase for dirs
+   */
+  unpackPhase = ''
+    cp -a ${src} ${src.name}
+    chmod -R +w ${src.name}
+    export sourceRoot=${src.name}
+  '';
+
   nativeBuildInputs = [
     # cmake can be built with the system jsoncpp, or its own bundled version.
     # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so

From 24d5eb262dddff16e53663b49e5a12a824b92b8f Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 12 May 2015 23:38:28 +0200
Subject: [PATCH 0793/1143] Pass: Add pwgen to wrapper.

---
 pkgs/tools/security/pass/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index c03029232ac0..0480962fb966 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
     getopt
     git
     gnupg
+    pwgen
     tree
     which
   ] ++ ifEnable x11Support [ dmenu xclip xdotool ]);

From d90aeb762997c98e324e6dface0233df58051ba3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 12 May 2015 17:07:34 -0500
Subject: [PATCH 0794/1143] kdeApps_15_04.libkgeomap: fix missing marble
 dependency

---
 pkgs/applications/kde-apps-15.04/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 9de2f7a9fe15..213c70bfa235 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -36,6 +36,7 @@ let
       "Kipi" = "libkipi";
       "LibKMahjongg" = "libkmahjongg";
       "LibKonq" = "kde-baseapps";
+      "Marble" = "marble";
     };
 
   mkDerivation = drv: kf5.mkDerivation (drv // {
@@ -336,6 +337,14 @@ let
         buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
       };
 
+      libkgeomap = super.libkgeomap // {
+        cmakeFlags =
+          (super.libkgeomap.cmakeFlags or [])
+          ++ [
+            "-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules"
+          ];
+      };
+
       libkipi = with pkgs; super.libkipi // {
         buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
       };
@@ -344,13 +353,6 @@ let
         buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
       };
 
-      marble = super.marble // {
-        preConfigure = ''
-          ${super.preConfigure or ""}
-          cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake"
-        '';
-      };
-
       rocs = super.rocs // {
         buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]);
       };

From ac4515958ddfd3812b2ef61b1404d45d0b9117d2 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 12 May 2015 20:04:12 -0400
Subject: [PATCH 0795/1143] ghcjs: bump ghcjs-boot

This updates the git reference of the aeson submodule; the old one
vanished.
---
 pkgs/development/compilers/ghcjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 24a361724aed..0547f80106be 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -41,8 +41,8 @@ let
   version = "0.1.0";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch
-    sha256 = "63b69a1d131cf3c7088e0f28d14750c81361dcc276fa113ad80dcccf73df5343";
+    rev = "19620b69257115a69306eec505a97ac843055e92"; # 7.10 branch
+    sha256 = "027md1glfakniccqq0z1pyrz5w4fy0myxmbl0h789rbcxz9ybv6n";
     fetchSubmodules = true;
   };
   shims = fetchgit {

From 1057771b7d4c2e2b55654291236a9644beb97082 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 13 May 2015 03:40:35 +0200
Subject: [PATCH 0796/1143] racerRust: Use stable rust platform

---
 pkgs/top-level/all-packages.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0171f35911ca..6f40ba11b46a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5360,10 +5360,7 @@ let
 
   premake = premake4;
 
-  racerRust = callPackage ../development/tools/rust/racer {
-    # racerRust still uses unstable features from the standard library
-    rustPlatform = rustUnstable;
-  };
+  racerRust = callPackage ../development/tools/rust/racer { };
 
   radare = callPackage ../development/tools/analysis/radare {
     inherit (gnome) vte;

From 4b0cfe67b44402c087ca7e9e0f484c3b1404431c Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 10 May 2015 19:50:56 +0200
Subject: [PATCH 0797/1143] add gzdoom to nixpkgs

---
 pkgs/games/gzdoom/default.nix   | 33 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/games/gzdoom/default.nix

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
new file mode 100644
index 000000000000..66d01905aaf3
--- /dev/null
+++ b/pkgs/games/gzdoom/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL2}:
+
+stdenv.mkDerivation {
+  name = "gzdoom-2015-05-07";
+  src = fetchFromGitHub{
+    owner = "coelckers";
+    repo = "gzdoom";
+    rev = "a59824cd8897dea5dd452c31be1328415478f990";
+    sha256 = "1lg9dk5prn2bjmyznq941a862alljvfgbb42whbpg0vw9vhpikak";
+  };
+
+  buildInputs = [ cmake fmod mesa SDL2 ];
+
+  cmakeFlags = [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ];
+
+  preConfigure=''
+    sed s@gzdoom.pk3@$out/share/gzdoom.pk3@ -i src/version.h
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp gzdoom $out/bin
+    mkdir -p $out/share
+    cp gzdoom.pk3 $out/share
+  '';
+
+  meta = {
+    homepage = https://github.com/coelckers/gzdoom;
+    description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
+    maintainer = [ stdenv.lib.maintainers.lassulus ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..d9c3c3da5642 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12932,6 +12932,8 @@ let
 
   gtypist = callPackage ../games/gtypist { };
 
+  gzdoom = callPackage ../games/gzdoom { };
+
   hedgewars = callPackage ../games/hedgewars {
     inherit (haskellPackages) ghc network vector utf8String bytestringShow
       random hslogger dataenc;

From aaa9f837a94ebac7347cd911f5476fc9b1343c3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 11:21:09 +0200
Subject: [PATCH 0798/1143] r-modules: fix Hydra evaluation errors

---
 pkgs/development/r-modules/default.nix | 45 ++++++++++++++------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ecc8abf64608..e0b19f465c98 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -665,9 +665,9 @@ let
     "babel" # requires edgeR
     "BACA" # requires RDAVIDWebService
     "BcDiag" # requires fabia
-    "beadarrayMSV" # requires Biobase, geneplotter, andlimma
     "bdvis" # requres taxize
     "beadarrayFilter" # requires beadarray
+    "beadarrayMSV" # requires Biobase, geneplotter, andlimma
     "bigGP" # requires MPI running. HELP WANTED!
     "bigpca" # requires NCmisc
     "Biograph" # requires mvna
@@ -681,13 +681,13 @@ let
     "CARrampsOcl" # depends on OpenCL
     "CHAT" # requires DNAcopy
     "ChemoSpec" # depends on broken speaq
-    "Crossover" # fails self-test
     "classGraph" # requires graph, and Rgraphviz
     "clpAPI" # requires clp
     "compendiumdb" # requires Biobase
     "CORM" # requires limma
     "cplexAPI" # requires CPLEX
     "crmn" # requires pcaMethods, and Biobase
+    "Crossover" # fails self-test
     "CrypticIBDcheck" # requires rJPSGCS
     "cudaBayesreg" # requres Rmath
     "curvHDR" # requires flowCore
@@ -702,6 +702,7 @@ let
     "demi" # requires affy, affxparser, and oligo
     "DepthProc" # requires samr
     "DiagrammeR" # requires V8 to build
+    "DiffCorr" # misses undeclared dependencies 'pcaMethods', 'multtest'
     "Digiroo2" # requires spatstat
     "dixon" # requires spatstat
     "dnet" # requires supraHex, graph, Rgraphviz, and Biobase
@@ -729,13 +730,14 @@ let
     "FunctionalNetworks" # requires breastCancerVDX, and Biobase
     "gamlss_demo" # requires rpanel
     "GeneticTools" # requires snpStats
+    "geojsonio" # requires V8 to build
     "GExMap" # requires Biobase and multtest
     "gitter" # requires EBImage
     "glmgraph" # test suite says: "undefined symbol: dgemv_"
     "gmatrix" # depends on proprietary cudatoolkit
+    "gMCP" # fails self-test
     "GOGANPA" # requires WGCNA
     "gputools" # depends on proprietary cudatoolkit
-    "gMCP" # fails self-test
     "gRain" # requires gRbase
     "gRapHD" # requires graph
     "gRbase" # requires RBGL, and graph
@@ -752,6 +754,7 @@ let
     "HierO" # requires rneos
     "HiPLARM" # requires MAGMA or PLASMA
     "hpoPlot" # requires Rgraphviz
+    "hsdar" # fails to build
     "HTSCluster" # requires edgeR
     "iFes" # depends on proprietary cudatoolkit
     "imputeLCMD" # requires pcaMethods, and impute
@@ -768,6 +771,7 @@ let
     "latticeDensity" # requires spatstat
     "leapp" # requires sva
     "lefse" # SDMTools.so: undefined symbol: X
+    "lfe" # fails to compile
     "lgcp" # requires rpanel
     "LinRegInteractive" # requires Rpanel
     "LogisticDx" # requires gRbase
@@ -785,13 +789,16 @@ let
     "MigClim" # SDMTools.So: Undefined Symbol: X
     "minimist" # requires broken V8
     "miRtest" # requires globaltest, GlobalAncova, and limma
+    "MixGHD" # requires mixture to build
     "mixture" # mixture.so: undefined symbol: dtrmm_
     "moduleColor" # requires impute
+    "mongolite" # doesn't find OpenSSL
     "msarc" # requires AnnotationDbi
     "MSeasy" # requires mzR, and xcms
     "MSeasyTkGUI" # requires MSeasyTkGUI
     "MSIseq" # requires IRanges
     "msSurv" # requires graph
+    "muir" # requires DiagrammeR to build
     "multiDimBio" # requires pcaMethods
     "mutossGUI" # requires mutoss
     "mutoss" # requires multtest
@@ -800,17 +807,14 @@ let
     "NCmisc" # requires BiocInstaller
     "netClass" # requires samr
     "nettools" # requires WGCNA
-    "NORRRM" # can't load SDMTools properly
     "netweavers" # requires BiocGenerics, Biobase, and limma
     "NLPutils" # requires qdap
+    "NORRRM" # can't load SDMTools properly
     "NSA" # requires aroma_core
     "OpenCL" # FIXME: requires CL/opencl.h
     "optBiomarker" # requires rpanel
     "ora" # requires ROracle
     "orQA" # requires genefilter
-    "pRF" # requires multtest
-    "PBSmapping" # fails its test suite for unclear reasons
-    "PBSddesolve" # fails its test suite for unclear reasons
     "PairViz" # requires graph
     "PANDA" # requires GO.db
     "ParDNAcopy" # requires DNAcopy
@@ -820,6 +824,8 @@ let
     "pbdDEMO" # requires pbdMPI
     "pbdDMAT" # requires pbdMPI
     "pbdSLAP" # requires pbdMPI
+    "PBSddesolve" # fails its test suite for unclear reasons
+    "PBSmapping" # fails its test suite for unclear reasons
     "pcaL1" # requires clp
     "pcalg" # requires graph, and RBGL
     "PCGSE" # requires safe
@@ -836,6 +842,7 @@ let
     "pmclust" # requires MPI running. HELP WANTED!
     "polyCub" # requires spatstat
     "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db
+    "pRF" # requires multtest
     "propOverlap" # requires Biobase
     "protiq" # requires graph, and RBGL
     "PSCBS" # requires DNAcopy
@@ -845,17 +852,18 @@ let
     "qtlnet" # requires pcalg
     "qtpaint" # can't find QtCore libraries
     "QuACN" # requires graph, RBGL
+    "quanteda" # fails to build
     "QuasiSeq" # requires edgeR
     "RADami" # requires Biostrings
     "raincpc" # SDMTools.so: undefined symbol: X
     "rainfreq" # SDMTools.so: undefined symbol: X
     "RAM" # requires Heatplus
-    "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges
     "RapidPolygonLookup" # depends on broken PBSmapping
+    "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges
     "RbioRXN" # requires fmcsR, and KEGGREST
-    "RcppAPT" # configure script depends on /bin/sh
     "RcmdrPlugin_seeg" # requires seeg
     "Rcplex" # requires cplexAPI
+    "RcppAPT" # configure script depends on /bin/sh
     "RcppRedis" # requires Hiredis
     "rDEA" # no such file or directory
     "RDieHarder" # requires libdieharder
@@ -863,6 +871,8 @@ let
     "REBayes" # requires Rmosek
     "RefFreeEWAS" # requires isva
     "retistruct" # depends on broken RImageJROI
+    "rgp" # fails self-test
+    "rgpui" # depends on broken rgp
     "RImageJROI" # requires spatstat
     "rjade" # requires V8 to build
     "rJPSGCS" # requires chopsticks
@@ -879,8 +889,6 @@ let
     "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED!
     "RQuantLib" # requires QuantLib
     "RSAP" # requires SAPNWRFCSDK
-    "rgp" # fails self-test
-    "rgpui" # depends on broken rgp
     "RSeed" # requires RBGL, and graph
     "rsig" # requires survcomp
     "RSNPset" # requires qvalue
@@ -893,6 +901,7 @@ let
     "selectspm" # depends on broken ecespa
     "semiArtificial" # requires RSNNS
     "SeqFeatR" # requires Biostrings, qvalue, and widgetTools
+    "SeqGrapheR" # depends on Biostrings
     "sequenza" # requires copynumber
     "SGCS" # requires spatstat
     "siar" # requires spatstat
@@ -913,9 +922,9 @@ let
     "speaq" # requires MassSpecWavelet
     "spocc" # requires leafletR
     "SQDA" # requires limma
-    "Statomica" # requires Biobase, multtest
     "stagePop" # depends on broken PBSddesolve
-    "SeqGrapheR" # depends on Biostrings
+    "statar" # depends on broken lfe
+    "Statomica" # requires Biobase, multtest
     "stpp" # requires spatstat
     "structSSI" # requires multtest
     "strum" # requires Rgraphviz
@@ -928,22 +937,16 @@ let
     "topologyGSA" # requires gRbase
     "TR8" # requres taxize
     "trip" # requires spatstat
+    "TROM" # misses undeclared dependencies topGO', 'AnnotationDbi', 'GO.db'
     "ttScreening" # requires sva, and limma
     "V8" # compilation error
-    "vows" # requires rpanel
     "vmsbase" # depends on broken PBSmapping
+    "vows" # requires rpanel
     "WGCNA" # requires impute
     "wgsea" # requires snpStats
     "WideLM" # depends on proprietary cudatoolkit
     "x_ent" # requires opencpu
     "zoib" # tarball is invalid on server
-    "DiffCorr" # misses undeclared dependencies 'pcaMethods', 'multtest'
-    "TROM" # misses undeclared dependencies topGO', 'AnnotationDbi', 'GO.db'
-    "lfe" # fails to compile
-    "mongolite" # doesn't find OpenSSL
-    "quanteda" # fails to build
-    "statar" # depends on broken lfe
-    "hsdar" # fails to build
   ];
 
   otherOverrides = old: new: {

From e15ed5abf5de8e88924135eb41f7d379ca5aef31 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 13 May 2015 12:37:14 +0300
Subject: [PATCH 0799/1143] Squid: remove --march=native

The Squid build default behaivour is to request optimisation for the
current CPU which is not a good idea in distro builds.
---
 pkgs/servers/squid/squids.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 587c17a3ceea..b7c428351794 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -11,7 +11,7 @@ rec {
       sha256 = "3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4";
     };
 
-    configureFlags = ["--enable-ipv6" "--disable-strict-error-checking"];
+    configureFlags = ["--enable-ipv6" "--disable-strict-error-checking" "--disable-arch-native"];
 
     meta = {
       description = "http-proxy";

From 8c1e98563ced2ce2156378d74dc995891b8deb20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 10:45:52 +0200
Subject: [PATCH 0800/1143] Remove aterm28 from release-small, it's broken

---
 pkgs/top-level/release-small.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index a4ae1932fcfe..7c3f516c4944 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -20,7 +20,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   at = linux;
   atlas = linux;
   aterm25 = all;
-  aterm28 = all;
   autoconf = all;
   automake = all;
   avahi = allBut cygwin;  # Cygwin builds fail

From 645b1cea6eeb9d4daa88904af4c3496d0e04692d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 12:17:01 +0200
Subject: [PATCH 0801/1143] wxmaxima: update to 15.04.0

---
 pkgs/applications/science/math/wxmaxima/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index a73e3dbcec04..8af49621dd98 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -2,14 +2,14 @@
 
 let
   name    = "wxmaxima";
-  version = "14.12.1";
+  version = "15.04.0";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz";
-    sha256 = "0sjxvh0y5w5p2xdq3qzz3yhlsigrg3ynib9dkymhynpfnb51x82z";
+    sha256 = "1fm47ah4aw5qdjqhkz67w5fwhy8yfffa5z896crp0d3hk2bh4180";
   };
 
   buildInputs = [wxGTK maxima makeWrapper];

From c1e62e9e8b9c615fd6a8cfea247423cc46a0390c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 12:17:16 +0200
Subject: [PATCH 0802/1143] maxima: update to version 5.36.1

---
 pkgs/applications/science/math/maxima/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index ffc16a330542..e42bd0f83ee0 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -2,7 +2,7 @@
 
 let
   name    = "maxima";
-  version = "5.35.1";
+  version = "5.36.1";
 
   searchPath =
     stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "1wwqvay9z6gal7bsyyyhhcwh0fy5ak4h2a446ali0x6zmybaklcy";
+    sha256 = "0x1rk659sn3cq0n5c90848ilzr1gb1wf0072fl6jhkdq00qgh2s0";
   };
 
   buildInputs = [sbcl texinfo perl makeWrapper];

From 3e89fab1f717c0dafcc86a57bea6d83077a8d305 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 13:08:15 +0200
Subject: [PATCH 0803/1143] haskell-rtorrent-rpc: update ticket link

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 36ae1a181d79..3c0ab9ea5d21 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -669,7 +669,7 @@ self: super: {
   # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
   unlambda = dontHyperlinkSource super.unlambda;
 
-  # https://github.com/megantti/rtorrent-rpc/issues/1
+  # https://github.com/megantti/rtorrent-rpc/issues/2
   rtorrent-rpc = markBroken super.rtorrent-rpc;
 
   # https://github.com/PaulJohnson/geodetics/issues/1

From cf013700efbf73eb077fbd43f9bd8fcb20dd36ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 13:18:24 +0200
Subject: [PATCH 0804/1143] haskell-esqueleto: remove obsolete jailbreak for
 ghc-7.10.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 409b7500ae50..1a7f16a81317 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -77,7 +77,6 @@ self: super: {
   utf8-string = overrideCabal super.utf8-string (drv: {
     patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
   });
-  esqueleto = doJailbreak super.esqueleto;
   pointfree = doJailbreak super.pointfree;
 
   # acid-state/safecopy#25 acid-state/safecopy#26

From bd3e6628ae0c7c8b22fbe9a33d620da1b9608e35 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 13:20:11 +0200
Subject: [PATCH 0805/1143] haskell-esqueleto: test suite has been fixed
 upstream

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3c0ab9ea5d21..c444b38d7a49 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -715,9 +715,6 @@ self: super: {
   HipmunkPlayground = dontDistribute super.HipmunkPlayground;
   click-clack = dontDistribute super.click-clack;
 
-  # https://github.com/prowdsponsor/esqueleto/issues/93
-  esqueleto = dontCheck super.esqueleto;
-
   # https://github.com/fumieval/audiovisual/issues/1
   audiovisual = markBroken super.audiovisual;
   call = dontDistribute super.call;

From e46a796f5d99c405111898bc5aa63783021a12de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 13:36:51 +0200
Subject: [PATCH 0806/1143] haskell-bitcoin-api has been fixed upstream

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 1a7f16a81317..b5c0f42fc780 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -317,10 +317,6 @@ self: super: {
   # https://github.com/purefn/hipbot/issues/1
   hipbot = dontDistribute super.hipbot;
 
-  # https://github.com/solatis/haskell-bitcoin-api/issues/1
-  bitcoin-api = markBroken super.bitcoin-api;
-  bitcoin-api-extra = dontDistribute super.bitcoin-api-extra;
-
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 

From 92317259efd591a6107c01123a606c3c96b9066b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 13 May 2015 14:22:06 +0200
Subject: [PATCH 0807/1143] cups: First attempt to fix our printing tests; wait
 until cups is fully initialized

---
 nixos/tests/printing.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 708ff5391570..e8c41140045c 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -34,6 +34,7 @@ import ./make-test.nix ({pkgs, ... }: {
       # Make sure that cups is up on both sides.
       $server->waitForUnit("cups.service");
       $client->waitForUnit("cups.service");
+      $client->sleep(10); # wait until cups is fully initialized
       $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
       $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
       $client->succeed("curl --fail http://localhost:631/");

From e9679ce32a43488b15cccfb77d362561dc6fa9ce Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 May 2015 15:03:01 +0300
Subject: [PATCH 0808/1143] postgresql-backup: use system postgresql package

---
 nixos/modules/services/backup/postgresql-backup.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 1f7b123eca37..c4127543f10d 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -9,7 +9,7 @@ let
 
   postgresqlBackupCron = db:
     ''
-      ${config.services.postgresqlBackup.period} root ${postgresql}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
+      ${config.services.postgresqlBackup.period} root ${config.services.postgresql.package}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
     '';
 
 in

From 5f7f793d4e1a03a5c6acec00973785be3659e123 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 13 May 2015 12:20:34 +0200
Subject: [PATCH 0809/1143] hplip: coalesce `find -exec sed` invocations

No need to scan the (biggish) source tree six times, forking a separate
process for every file each time. This was slowing down testing.
---
 pkgs/misc/drivers/hplip/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index b40aab73a4d1..41ed3e710427 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -33,12 +33,14 @@ stdenv.mkDerivation {
 
   prePatch = ''
     # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
-    find . -type f -exec sed -i s,/etc/hp,$out/etc/hp, {} \;
-    find . -type f -exec sed -i s,/etc/sane.d,$out/etc/sane.d, {} \;
-    find . -type f -exec sed -i s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, {} \;
-    find . -type f -exec sed -i s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, {} \;
-    find . -type f -exec sed -i s,/usr/lib/systemd/system,$out/lib/systemd/system, {} \;
-    find . -type f -exec sed -i s,/var/lib/hp,$out/var/lib/hp, {} \;
+    find . -type f -exec sed -i \
+      -e s,/etc/hp,$out/etc/hp, \
+      -e s,/etc/sane.d,$out/etc/sane.d, \
+      -e s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, \
+      -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \
+      -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \
+      -e s,/var/lib/hp,$out/var/lib/hp, \
+      {} +
   '';
 
   preConfigure = ''

From 97e5461f46b6e27cf3b3e18b63529d5a1483586e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 15:15:04 +0200
Subject: [PATCH 0810/1143] wxmaxima: build with GTX 3.x.

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f40ba11b46a..d6fcb1c0f95f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13910,7 +13910,7 @@ let
 
   maxima = callPackage ../applications/science/math/maxima { };
 
-  wxmaxima = callPackage ../applications/science/math/wxmaxima { };
+  wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };
 
   pari = callPackage ../applications/science/math/pari {};
 

From c22b03db0cc472878bdeff801ad280c4a457bb29 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 13 May 2015 22:19:50 +0900
Subject: [PATCH 0811/1143] firefox-bin: update to version 38.0

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 4d002119a898..2e5545d6a959 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "37.0.2";
+  version = "38.0";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "77e30ca3d592424f80cf7c6cf31e90edddbebb3d"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "c101098915d8955da06751d5bdf2afe029054e3f"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "4287ba79e3aaaa601ae36643ad281c64554b847f"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "a787ec352ad94375600185902766ddfd91ac2d5d"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "4910dab93896ca7198b0154f0518ea5613b9a3b0"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "60d2c5122a67bae8d7c27fd01caa8d8eef0a143f"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "f2b70fc8a72d3d43a28cc51776eaacff22f288ad"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "409d2981a9aff39e23bd00231761899e65e80862"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "d27e921e475608cc52e6f07a22687497eb575b01"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "3bfa7ccaff6b04f9f1d0a479c10412a1308caf4f"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "d1c94f4c5fe83d52fa8e0ee586f78747616e1aaf"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "df3d38e59a5f233caa97134713e29cfa0dce6e27"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "5d01ef1267ddcc28e89009b86f2bb0a1e70fc386"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "440a5cd423147412335636326618e6b6b4c02416"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "1b9a9758c17ae74876ee6d09373dd99e89da05a3"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "940d2a07808aedc1f9c927b62f03b75270bbecd7"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "ee3f4b60ebb6fd3639ba7e2a3acd81ffcd13ba3f"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "f97ef4f7d3264b1aaf7699fe656f7dccf2cd4238"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "1a0e2da3014a811a766164953d003c136e28c174"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "703116b7d2583d21fda09933e5d8b9244c15c6ee"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "f501f69cf65bf340d5d5ce6744394f1a83c2daf3"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "eb74b7a12a2fddf8c47e9c0b0ab9359b7da10703"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "9ecc2ca3344559a63fefee144fde9faa391f1c29"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "5121ac58aa90f6a2e3b3f87bcf7dbd8670b7c9bf"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "42b9ace3d28e103fb195599c7c88ae78f16c3e4c"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "06b81108ec1509e36de108837f3c7ed1d96ebc0e"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "5fb5aee535cbede12169d1208d59fb1510207a66"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "e8e6ebb6d70a809cfe8e9102ede99b7ce6239b8e"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "13d157533dfca54b2a81625dbf3642b915f18e47"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "f7fc30f448e981a47c63c21756dcd6feff08783c"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "c9cdc5eefca689aabb7861e1ad9f44f42b36acb0"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "a76182a74992ce7031fa2254f056694910c963d1"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "afb09acee0d8456e2bab32d7579da39244754038"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "26bca2ea48a814b7b3ffb91fc461867bf775c6dc"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "36a8bf02f324d929c52a6f4f38bb8cd413bbec3e"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "2d39187c71ad006e1fbd7ab488c7560d1c88f9cb"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "8c9843547aec04af07a09c2f9902583b2daab3f0"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7778c1588580bf735e5dd4da89ab16528163a2c3"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "8aef1a9b8c6d1297d53002f1852bf52d6728c0fa"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "b7c2ad5da9c446939bf5e7071f84a6c3f8cd7b22"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "f85f36fcd900f642f53a74d6b843e2c67b3ab950"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "9dcc21ec189c588931e9bf38310522bb994d98c2"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "df80ad28979145a116d13db19c1c4e4b516c362d"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "b4e2da05fcd224ee01e2742d86d6b68bbdc108cd"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "73a83b23f2f1edcc4114df0b728e791c0626292a"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "fd451735b82a9b609b7f5f09aa0461191b490e5a"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "471873938d52ccebe8958407be1989937181ca9a"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "fc8c668d3d66a4e42be9aa0fd46ca84cf061dade"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "599823d54919efb62ffd4f65fd8b873720d64b08"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "cc2e509b55de680d4c9a95ac84765c5fb5fa8b44"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "754b32bbc0108f0e9c3c2e78f4c3e023e0486bff"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "7ab4206b66783a72fbe66c59fda120dc1afd0e3c"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "b52814a56ee620693aa4d658ada67e816a3daf59"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "b4cbbc984c7cc9f566ddce0e180410ccb79adc13"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "874cb197fe4498a83822fa386ac0824bffc9646d"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "056746dae1ba7e88a3f2403fb11b17ee831b199b"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "70bb834ac4d70fb1f20625027c73a6ece8f24cc8"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "57202dd5e34ed24e31f30bab79b0fcbb220e81b7"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "1e7287dfcd55f79e2157f3e49875a85f8a500c75"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "a6389d117c02ad2d9a997dcac64ba54c0310d715"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "5f82328712e7a16ae6dab5928623b0c652b646bc"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "5625f288967b3afc86a5d0136d64a1ba9581a6c1"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "73afc152eca2aeb346b1ea46a35b24132061c6af"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "ea1eab3e656f1bc68fc76425cd10be01945e7d66"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "24d0bc254438b96307c650700ca58d4e1b2d5fe8"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "d5b8f8f2052985c5f6dcbcdd5b122094347ed26b"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "118d981ae14f0425e27726afb516519b8de11390"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "af883c88b1a1e31a31a5a20d603b6109209c6f6b"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "44d6d4be0a1d1ddd75f476a94b3e2f6117ffca72"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "1629ea289914570257e611323618b477b2cf6576"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c3ac3c11a490f37a6c209d753d6db5cd0c696dff"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ea778a04a997632a38e70d3b96c5cc86545056d3"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "2e71d653007e589cd93a90e3239beb0074d33e9d"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "d878a2c149a96e2181d110e5ae265f35c0d44b62"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "2669d169a07cfbba062e147d12cd2a708579c76e"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "515622615f08c49a257ba6766ff0af1984c134a1"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "98bc0711616e665dc386e2c24b6a96ca5e3bfe25"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "a87c089251356074bc039c88e040138db3485539"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "b8fb6b91641f89159485ea65efb98c0f3aa23d84"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "2a2a6cc3dcf6b988138549649ede6b030c26818c"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "611ed2ff88f2872acfd1302f2ee3defe59142dbd"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "04922ffab952b7493059304d70064956cbaf5dce"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "13a43d380043f008e26f6fb77b16e6087c622a64"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "c7d45cdd831bafba438c81efa6cf5dd3f4a5657e"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "319a922186b3a8a9bea749014498e7f492043b4b"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "fdd0485af2b0684436bd6207701c287a2f3d05c6"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "33e82dea7e4a6e421ee23a94ba3a5ca5171fef34"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "fde72e1c7f93e4bcbebc9803e78d3e1cbce2d64b"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ad702a8c047a5044ffb39039eaa74e7a86bd80ae"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b83ff7323e9e66907a02f798cbb13a114fdc652c"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "c435f7c84ee188d09b5352163334a6458ec125ba"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "dc8858ac8ae9ef92013fa73f986daf6eade1ae26"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "c1d853deba529e750b8b705581aedb218f0c57d9"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "ba819e0bd9e630a6299fd8ef1dd99d1203abbd2d"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "1ffccd73282e28a52d99b8e98e3bf8ccefcf405b"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "9d68d2cb24ecf349ff504638e04272d56a636f90"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "e7cae2f72552fdcd1ccb57c760ddd4b694218513"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "57befb5643689b0ab2b456651735c75fc47a312a"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "345e0cf27301357d46ead1ef04fcc415c9db4f99"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "ac55fbb3ca6e8ad69c7aceebad99d18ed1353cbc"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "9c8d7c1a6b79dc2ff7a28e309e24fdb2d07385ba"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "e122a13e5485d9a8bf12e91487cf0247fb652eea"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "4da07bc2cdb714f8083032f99e702333ece64dfa"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "48b5f227919b06ee995b68ee0b6117df8f428942"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "ce22701571474e14ad690ccb5ee700c790667fe8"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "d901ffdec4217b389b96268f9094fc1d01cd2263"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "2191718817cbf9eefef3f7d994849a737e9adb88"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "f21245f7b00187d8b6fb3d30f6ec83510acf7546"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "47ebc8005959e431cca843a0514c2499449ed9b2"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "18220fab22a9737d1577455ec218f5b2f9226e53"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "e4e3d2de5a899c422b85ab1518c454d81ee54bd8"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "45a2551248ee43e189492b1416ed096799857382"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "aa1374d602fff2d393be86563d3cab72b35f7384"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "acfb03ba9f3d232ff68af24d61f80c6c0a94aeca"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "a9295e006982059b01f7bd7e2c6f8959de2a2e23"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "e37dcfc6bd29e8a5034624df71726091c6c768f0"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "b81b278d31aff4d4912da328f2c3ecdbb1ec830a"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "b5c21e4d32f9f78043eee8605d131e63d9568ef1"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "56d7cc6bf3a125c9e9f5b4799a2d34a5d941dc43"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "528db467e4f64f9149f88ecd36c19c8a23835c17"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "71482b740ea057ae9cdd15cfba89467639dbda63"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "bdaff803efa7cb1e2bd31e7f7a29b4c174fb60e3"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "1f4642a4dd61ad57d833ae961ce0f0f1c6c7471a"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "3e89f59c82ae0ee52af586364bad8b6e69fdec28"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "3292597b5f499193c8a1bd1f71b9df81925e4c87"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "ddb145bb406c096be680d246b9a727d6e926f9cb"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9cedfe3a1f98db1a999f64bcfdc77e8df72cbbc5"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "a58a8593b49cbf1d6f6b35feb61df95a51717127"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "b80d8770ce0358674d1b2f39c7bb5b8a042a5d32"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "66540a388aa07190fa98aff515f09a01d1c173ee"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d9e85c6de7487b13e91f400ce8a06c0104b08ddc"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "01da681d516c6b1febd0096c6dcd8ccbc9b6fdef"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "faa22ad8c24d6465976412d1bd252c74936f937c"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "5410dcf34d4207e005f207fc430892f23f160461"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0735e4827702f896332e1461dcdb3e7088e60d90"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "8b083ad5aad313afd9fa9c4e91ebbd03f205b67f"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "2fc593cebbfe2bdae3689255f46cd9c41314f00c"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "5bfa929956b1ce9a0ef2afb08ae3510326e962c6"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "81e5a280e47fbbac82d1c0e0604828ab9937e1e6"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "fbc333306bb32eaf2b2d815efa32a5915cd15ede"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "df75129e5c618cdfe180ddf71598704f8c652e5c"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6b0556075110eac4263e1b2ba9bef29a3504d302"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "3309c2e1bcc6d623a28c01cf3e61ed9d9a2d676b"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "f729504273d11b18f3b9c1f4918a18a2a63483da"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "9d54da726bd01800a7fa41de9bc0b9aaba9202b9"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "1550492673a913ecd0ff14ccdea0289bbfc680f6"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "d8b97959e6d77ac9d1e0c512414824c9c037d2f0"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "1056467b1726dc0469745d5eb80407e3715c6aee"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "9c51bd6b10adfb2dc3cf07d38981636c3a13557a"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "9f58166807385e0e95682b361e0654125311b4d6"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "cf5b8b7266e6c6c5054aeab213c37e61df68057f"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "36a609e8e1a2002653520b7a872562ecd34d6afc"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "6c723410982cf03559199122ce358757670f0d61"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "7e0dae98aa342781a5e89c7f531545704d48b9b6"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "eb000da14a0e48ffac929e51db640c721e8c9e11"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "5696ee19d90930527370021a9eb51f0579080293"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ed9c5d17963779cebd526a65abd10d82b9b7aadc"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "7086405ab9008c91c9acbe7685590ee4497b0576"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "0f0aea80ca1dbf604a3c0ac28a255431c1952f88"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "e794ceab525cbc0314d10398a807c436ef66d17d"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "09c3427c855d7c82e44997accc80a52317d0d22d"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "af19d02ed9dbb366d0c7b34b538ae83bf2f6212c"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "3064e5bcea910f32fbef60acd41a9917145c48a1"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "a7ad2f98a7a534667370ef3f22ae00f90002a1a7"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "76726e6bbbd89eb6469df960ec889ce781cfc68b"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "031b5eb83b6e96dcd9bdf2eabdfab7a370b0becb"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "5d31c283914d67dcfc0af09525ab3814d0e05db4"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "a9e577f4e9aba0af6b019b566f98121586112552"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "f84745683934f221dc5de1b970dae5c919979a71"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "95aef2a68a86030078ac64346445f5f92a85fb63"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "53e9197a3de8d63950b5d324a4da0d3533dd492c"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "be24b818a6ba1209d383c9c43af0bb0ddd82070b"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "be808769e77a47ace01b1b2455607c56a402e795"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "9feca0a4ba5ab71b05bad4ff0324c648ccae7f38"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "057c9ead60a3819eecae1f31ed512ea3e5e2aab4"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2503f8354c07929c1b943c64ea233bb6453c2740"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "75c439a7002183aa5ad8795c1986c109714c2f00"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "add241bb07ff446df18f98f6eec18ebec3bb4e31"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "703e63e142bba42a1735acf9da88cd52e722ab02"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "93da442b9262e2191145cbf95813fae1358cd981"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "b489f1a3fbae4762e7dac947d26effa3ff0c3f60"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "fe6b38ceb279e042d238064154f6d4d8e2c6fb61"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "28bdaafca6b99f115dcdae34a0f6ce4eaeaf5507"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "726e734772bf68ff5e4b88ed789b10122fe302bc"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "ed0ab975dbf5a26c3704fdd24b47b7f358edeb3a"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "909af01cbe8eb2e2c3557a474bb0d77b03b40a6d"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "c869d42a757798d17d0b0398c6a75652e795ce4c"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "c4183741ea8383caa350c115288f32057306bc95"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "9f20f4dae0ede083f193c61935d2781c7cd29b76"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "0198b69cbf5864a1d4981e0a3e0373e7bad1b8a8"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "f2ab43ab4bd81c4dfc17657943e962a1b2ec01ab"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "f903da974577d99354ba7e2d753c8796af3cc037"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "ff88567de38d5a9195e3d31bdb3897c6db960315"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "7a4bc7296bad8fa1afad53ec9c56b933bf2f34d4"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "452515451a1a1e1640f46233d287d62213948dd1"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "715cffedcd576b8b124b67effaf72e9091bbd072"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "e8418ff4e04dd2058dd50fb2a926df4c975fd5a4"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e3e4037b8f19355b036af6c19ce9ba11a13411f1"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "edae503e6d7529ba3af7facda18cc25a9634c7d6"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b22a1784efb4ba741843360a8cb2da95e8eefa77"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "776b7edd9fdb3a02cbcd2c74f7fe237760483e37"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "19718f8e6e45ac480ea8ede27408063e3e966044"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "e74b5e40c76429cbfe84c282a8d7f3d7e39ed3b6"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "6cf56a28635a84e87a6d2735d812b5bd286f66b3"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "c062cbb2847c78990849ed34171b356ba2514a4a"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "443875f512bc1ff697d3a2848710afa0cf27149f"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "4c7ea9e5cf6c9cc790f8e738658155160062d82b"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "34ed2e0cdba5c9347c886d0f5f1dc595339001b3"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "161aa92acbd5175e0e05094a98ae4620f3e61e15"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "07fed553ab3d8942af865ef54ca45d3cb084671a"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "1d287b810ab6eb2c69861aa97279d95e5de9e00b"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "a11872f1243fb7f2afac871497f77e559c571198"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "d44d41473f9c89129316247e3b3782ac5e734a03"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "bf82fadea1008287e6b7b6c5cc3ce45297102493"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "f6f533c7c96e5b0551df12007511fb03b252d568"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "5d2c8f0729bf9dd7a33f3469e5eceb10d3b68e4c"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "f3bcdb0616e7dbb9d0c014819568c426643b01d6"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "65d0ecad9093142bc122479f71d4a8f865dab9ce"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "b8681a21ee8c59067abb8971d5dfc0c183ce9f3a"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "8b94b6866f865926142fadaa1c4a995d8a4939ab"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "a37a42035062385ed664521e6fcc64b6acc3e100"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f72bd458cf0f42894a1023b09e25ba491c666c8d"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "84eb150df148cc792398f020a06c368b0f3a5384"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "84bb82b946c227931383620f2bda7a4511c86772"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "878ac1426303882701ca99a0e54ce025d5275e84"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "a4187e25529dde37e4b6f5201035efef69810e7d"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "adb3ecd1082e944f6cfb6c224fb99868d6b204e7"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "1ebba7dde7424c0855f738fb37c71be6739ddd54"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "7247e16910263ab971fdf7957e6e075a41ce0072"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "40113a4ddf11d43ae9b382456810193c3e50204a"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "328ec405ff20ee4ac3dcdb242978f552fd471bb4"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "aeb6d54290b1c2e882e871520232f20e05c9ee49"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "b5b0d078d36ac681df735336406e3a5d5ef7347c"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cb02ced1e1e132247cba8505e1a3240bb71ac186"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "27eccc34804a058bd163f369715863486a9a578d"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "2429fbb2e011cee22024b4f2d34b6e28821ba874"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "3496749c75804f7d710edb8e3c67e7291608ca39"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "9401f038ff97bf8ed55e21e8871f33aa342268da"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "6068057c34ef0c53a70f01d29bdbccc708c57501"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "c18b0c916f7716012b7e7262351741c6c798c951"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "c32c8be17b6254bd48166062569e41bd8cf3a1ca"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "717da6c53be118f6373e8c68c2e82ef720503646"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "0e15abde00eb8e7807985deb74a2abb7c1f48ffa"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "b0f556019f0696a14b538925551b64e0d8e4f9cc"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "f07ed45bef78333cddbbe8490683867c81e4d497"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "e43a5d8034e641ffa8380cbbfec04e5e04ffe025"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7d1d7228eca1e24bbcd3f247f2cb0bcbeb7843"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "fceeca14bbad0baa0ab76c51f826701df4a35c54"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "2fdb907fc1a6d889a177eee661d246d485c0b2d7"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "11a516d9104ece3130f01c1d6a4a218409ac191b"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "290b25548e4a0f123598953e08b6ffc0ffa7f5a8"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "ea371c234e4eb6e3a4a1b92add169d7539df16a0"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "3fcaa32d2f4825b59ed7f08dee92c7ef9a5301e4"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "1118347a7bcb197bdfcdadfd96a33c315f716cd5"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "368318d6cc8393d0867fe9e0abc0109420a0ad7f"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "72c8eae63bb9298d3b54c9f93ff442a1ffa21b47"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "27255ec09da56566297af99f22d13de1f5807d0a"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "f557dc50e027f2f1b327977df9bf1b86640b035d"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "942f2c4eff380ea660deb2a3a26f0b0716d10e84"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "7e4085fc80eb4b10010f10ad7ea3b40278c60c26"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "870d720f3a56068f4c0ec3ed0393efeca5106c52"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fbafa4f4f18bf4fbfe42366a1bdcd06952d1886"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "010b18faf1f999f88a5a618ca03e05a2d1a55cee"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "0ff5b1500514c82a4199a3af511be1c66a6b17b7"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "ce4d095eda872b05045766e6cdd686a21501b78e"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "397c66d7d95eabf5ba8bf47b9700c5d52657f586"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "605cae22b8edb09bcee585c7a0ddf91bb7b8771c"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "f9bf891cfb82baaa27ecf4f6192f50d264a362ba"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "0901de7f7b50b652a640e069c811ebffb990af1a"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "7d054dfe69b4c6a2359f89ebd9936d887d432637"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "9e50b342cc1754f66f274002a04ca35e933bbe35"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "6396bfe04f896321e1bdb2a1b742ee2461e3840b"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "e0818ad23234a31355cd366fb5cecf7a157e437f"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "ca8dd6aa223dccfd65b0ef3f8d85775a38ae5f9f"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "b67d6167b13ba68731b32944a9ba4e2010e54c8c"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "c2421cd629de2cc317965e1d8e047a247dc3135d"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "8dac75acdfcd95bce9bbee2a90785aaf50d1e331"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "01318b4a164d73801d53a86b9147cc3c68090e44"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "702f772a54290f2cf73842caa1780cd054630113"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "7bf0508c975f5e14964b25d40570dd7488364169"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "d8241f3ed0d78643ae38986b2f0898f895a47ed9"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "2b499f42e831c8a949d1ac2955cb52bbe01fa516"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "b3a41ba02af12471183a07af0de203e8d1c8e679"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "d31af209483706603dfe2ac39490e8258fe1f376"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "7b97e5c6e5868e1400616bf59317e2aee54b4f9d"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "ff77fe8e75dc98d07f6fa943c2b87572e2fe821d"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "2a126616d400e1781b0d25da0b92f374f5c58764"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "f5a77f3da6dbce8f3069377c8107b6c21dc8ad33"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "213b239888c9bc9667db5b90d5327edb16533346"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "2ebe88b6e9457105abe21db5e501174c4ed6b9a3"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "dd64b8f13021007506cda02b620463a37a40cb44"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "765f498cd0a27a50148022cef1b0db0b7e272393"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "3be4f9cfab1885a891360e7e3d024c130d55b098"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "15c95ded6f5057cdaa8716c1f9a63867f7f698e9"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "2ccc54e8c8fe8fd130427d56b65f191224483d3d"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "90f8826a73042bb5019f4ef75be49beb40e47c1d"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "6d06a583ffd0520a4f8606e7dfed798363f96133"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "c91c4de37182f3c01738856e11f4ddfd867343b4"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "46c9b3f5c7c3b288e759894a4041b0854e35811b"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "0b11edafce5fca8af93f06e7d3461508456faa3c"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "43c0a898e13b5cdec73c20a8e47d7ed73340a4be"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "1a1ee21a5f935ec38b540a573e3261eb72d18737"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "9f024aa7cd88b43f1d41ca35b9602c4ce3ce0d66"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "51fb9526bc2f6ffbcca33a9db565041ec7541c17"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "4620b4ee8ac0d9f20dae06ab5039559c947e189e"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bcb56f263c9f8cf87dbfb667bcd6261b6cab3da9"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "b9e499a16b8dea07e05ab68e92b07aac09611a0e"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "69d8afea4beeea7b6f8e85d2c57834e36ec0a5da"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "15c35746a9ca5f9bba4048764ef01f38eed1d7b3"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "d068f8fc28ae96dc62a0131a5ef42f35028d8dc9"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "4127ddf36a954066deb09e967224163f4dc9e632"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "8e2f853eece4d7793db9757f32466f85d1f98029"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "85f0440039b77cbf6547fe5b7be0acaba613aee4"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0d0d661c3b6197516d3e3f990a49e327170fb8b0"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3f42e38f0a9436c6eea9cd6b84688f1c5046d9c3"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "56a9c8600f17106ee360994f2816e814f6dde054"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "e8de5922f28f494c3a6a8b1e53c270dd4f34cada"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "1fe39b3dd62180cf6b2b7a6771ac0f61b1538619"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "57739540e02371abe21f6022b3b8fa6103543279"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "56c5815007727024c6e479d81122a59836f848d8"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "f5dcf9023ca5aeeb60d04158f7efc1b6ccbd5313"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "142d95e936063a90b28d2c33e79ac4cb8052ed8b"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "489ef1bb93ca27673067d370a62f20cb227d2f55"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "50d819cbde16c384c9adb1d4d176400cbf3544ea"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "0f1f4fee615ce2ee49f5458b9953af176e13280c"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "fddac5b20e6231c9626bb966475d8a16d03efde9"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "832d040787c6cb599f956cb4124ed11c4730be74"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "a73ebbfab7e630de54b13165d428e4b2843f68a2"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "49ff3285d4b4a9efae2f434709d80fe87aa94375"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "1f77f4d495c94b6c94ecbd4bb40c56e985cae5c6"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "5c9075d55d62177e24b7a91ff25ee0d8173ca1a8"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "eac042c5080f6bbc43770e7d2b0910537a44bc1e"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "c261b8d480c1c23aaea1754857ab7e069a5ef812"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "3d83d21430a7f90ccbbe8ab4a16d0faa44efc22b"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c6a5b825196404024f4a11ea3c4f1d74b0cbe80b"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "90ff4a639dcd65ce821b9dd6545875ed5230513a"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "99f4418e230a987c12671b9fc3242b3ccc97e5ab"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "bda55fcf5719f3d43f422dd4a1e7935db598d8a0"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "dd1d269619f0377993178e9f7083301c39339513"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "c73e447f83ecb44acdd5637702b977b3d37a0593"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "c63c3509af06f4c9a19f6ac04149d2eacb201459"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "dfad91490135d6536af450b70ef96afb04413d76"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "43f60e6dd8e412aebcfab2a2c6ca1813933152f8"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "2d121c22f3a9aefb611a8ba8dee568c2c8e6e66a"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "f5841ceb3482d91dd2d805258fd9e326cba2e131"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "d16acad424a61e098b37b68aea98a2ac69efdd21"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "4c94cdc7a19fbe9adfb0aa091299efc973b37d60"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "91b5af1bd30c3821924968b03961e5295f15b0e6"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "96561c7bbb7cfbc3af8f1bbb75b054cc95649357"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "d7ea3b927eff3b229d2013d064fef8661cb088e0"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "53edf9df438d7e6b344a8e321ebfe769cd456bb6"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "9c132b7b651e3dd9c2c78ad4beada01784b2ef41"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3cacf5dfaf58467e27e4804da74a9f6da6f12de4"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "f649c726757ed1bca13d2a05dd57b7d3f56b5dc6"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e77b856a434ad6dd12594cef9362313e910b14d"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "545d3bdd564232788850cb04b1314a3191b14175"; }
   ];
 }

From fc8011ad8d23411bcb950b03c80bd5ceb56c068c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 16:22:53 +0200
Subject: [PATCH 0812/1143] Ensure that nscd, sshd are created as system users

c0f70b4694bb2be1c25ef0e23e3f11f9d718d162 removed the fixed uid
assignment, but then it becomes necessary to set isSystemUser.

http://hydra.nixos.org/build/22182588
---
 nixos/modules/services/networking/ssh/sshd.nix | 4 ++--
 nixos/modules/services/system/nscd.nix         | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index c25532511a07..6cc86b4e4b5a 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -282,8 +282,8 @@ in
   config = mkIf cfg.enable {
 
     users.extraUsers.sshd =
-      { description = "SSH privilege separation user";
-        home = "/var/empty";
+      { isSystemUser = true;
+        description = "SSH privilege separation user";
       };
 
     environment.etc = authKeysFiles ++ [
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index caedc2e42173..3c0d2043ed5d 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -42,7 +42,10 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.nscd.description = "Name service cache daemon user";
+    users.extraUsers.nscd =
+      { isSystemUser = true;
+        description = "Name service cache daemon user";
+      };
 
     systemd.services.nscd =
       { description = "Name Service Cache Daemon";

From 15ffb9ad88e557cbc3310b81dbd99c00722e350e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 16:23:57 +0200
Subject: [PATCH 0813/1143] Remove fixed uid in tests

---
 nixos/tests/common/user-account.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index aa3a0b82bcde..ded8275000af 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{ lib, ... }:
 
-{ users.extraUsers = pkgs.lib.singleton
+{ users.extraUsers = lib.singleton
     { isNormalUser = true;
       name = "alice";
       description = "Alice Foobar";
       password = "foobar";
-      uid = 1000;
     };
 }

From 020e06e410e0675a2cfa32c8f7bb75368de835d1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 May 2015 09:24:41 -0500
Subject: [PATCH 0814/1143] Add missing KDE Telepathy dependencies

---
 pkgs/applications/kde-apps-15.04/default.nix | 25 +++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 213c70bfa235..5e41712a14fb 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -64,6 +64,7 @@ let
     (with pkgs;
       {
         ACL = acl;
+        AccountsQt5 = accounts-qt.override { inherit qt5; };
         Akonadi = kde4.akonadi;
         Alsa = alsaLib;
         Automoc4 = automoc4;
@@ -95,6 +96,7 @@ let
         GSL = gsl;
         HUNSPELL = hunspell;
         HUpnp = herqq;
+        Intltool = intltool;
         Jasper = jasper;
         KActivities = kde4.kactivities;
         LCMS2 = lcms2;
@@ -122,6 +124,7 @@ let
         Samba = samba;
         Sasl2 = cyrus_sasl;
         SharedDesktopOntologies = shared_desktop_ontologies;
+        SignOnQt5 = signon.override { inherit qt5; };
         SndFile = libsndfile;
         Speechd = speechd;
         TIFF = libtiff;
@@ -193,17 +196,9 @@ let
         nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
       };
 
-      kaccounts-integration =
-        let accounts-qt = pkgs.accounts-qt.override { inherit qt5; };
-            signon = pkgs.signon.override { inherit qt5; };
-        in super.kaccounts-integration // {
-          buildInputs = super.kaccounts-integration.buildInputs
-            ++ [ accounts-qt signon ];
-        };
-
       kaccounts-providers = super.kaccounts-providers // {
         buildInputs = super.kaccounts-providers.buildInputs
-          ++ (with pkgs; [ intltool libaccounts-glib ]);
+          ++ (with pkgs; [ libaccounts-glib ]);
         preConfigure = ''
           ${super.kaccounts-providers.preConfigure or ""}
           substituteInPlace webkit-options/CMakeLists.txt \
@@ -324,6 +319,18 @@ let
           ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
       };
 
+      ktp-accounts-kcm = super.ktp-accounts-kcm // {
+        buildInputs =
+          super.ktp-accounts-kcm.buildInputs
+          ++ [ pkgs.libaccounts-glib ];
+      };
+
+      ktp-common-internals = super.ktp-common-internals // {
+        buildInputs =
+          super.ktp-common-internals.buildInputs
+          ++ (with kf5; [ kdelibs4support kparts ]);
+      };
+
       libkdcraw = with pkgs; super.libkdcraw // {
         buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
         nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];

From 3df7a9866d413cc2701096b9ff8296289e3b9fb0 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 13 May 2015 15:15:24 +0200
Subject: [PATCH 0815/1143] rustcMaster: 2015-05-09 -> 2015-05-13

---
 pkgs/development/compilers/rustc/head.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 383632b2ce08..c73a12c6f6e8 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,9 +2,9 @@
 callPackage ./makeRustcDerivation.nix {
   shortVersion = "1.0.0-dev";
   isRelease = false;
-  # src rev for master on 2015-05-09
-  srcRev = "95400c51c31877ea4699adc051477edccb5cfbca";
-  srcSha = "1ldgc5nd42pcbr650rpyvpnc8h6bky6gmb116fwy1g6x2ql66djw";
+  # src rev for master on 2015-05-13
+  srcRev = "67433c1a309d3c9457e49f15e80a2d927d165996";
+  srcSha = "0idc3nh0sfjlv7m9710azx7n6awzwj6mhw3aybsb9bbagzy2sdsg";
   snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
   snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
   snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";

From 586444c91d348cd927b968978d553bdd3c3d81b3 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 13 May 2015 16:29:18 +0200
Subject: [PATCH 0816/1143] rustRegistry: Convert fetchgit to fetchFromGitHub
 and update

---
 pkgs/top-level/rust-packages.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 5e3977ab6d68..a408ae9e36ca 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -4,21 +4,23 @@
 # version that we define here. If you're having problems downloading / finding
 # a Rust library, try updating this to a newer commit.
 
-{ runCommand, fetchgit, git }:
+{ runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-05-12";
+  version = "2015-05-13";
+  rev = "8d879d4e998db3c1fad106503638d318e10fdba6";
 
-  src = fetchgit {
-      url = git://github.com/rust-lang/crates.io-index.git;
+  src = fetchFromGitHub {
+      inherit rev;
 
-      rev = "9bf9e7f2b242552ccec879b47b2225a76c7c79b0";
-      sha256 = "14rrpm6and52qasn7fv5fkflhnkyr86xy0k9pjgw407k7xms0cmw";
+      owner = "rust-lang";
+      repo = "crates.io-index";
+      sha256 = "1100vcgxy3ddl1ih3ljd3nig4a2k44ajhawsql1lmcj9783aykav";
   };
 
 in
 
-runCommand "rustRegistry-${version}-${builtins.substring 0 7 src.rev}" {} ''
+runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" {} ''
   # For some reason, cargo doesn't like fetchgit's git repositories, not even
   # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone
   # the repository (tested with registry rev

From 981ea747b5049938cf2c90c8eb6b13071ff00db5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 13 May 2015 15:17:00 +0200
Subject: [PATCH 0817/1143] cargo: 2015-05-11 -> 2015-05-13

---
 pkgs/development/tools/build-managers/cargo/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 8e7d8cf8ee83..f7dd77a12a71 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
 , cmake, zlib }:
 
-with ((import ./common.nix) { inherit stdenv; version = "2015-05-11"; });
+with ((import ./common.nix) { inherit stdenv; version = "2015-05-13"; });
 
 with rustPlatform;
 
@@ -10,12 +10,12 @@ buildRustPackage rec {
 
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo.git";
-    rev = "a078e01ffab70738eafb7401704d1eaf90b94de2";
-    sha256 = "0vw62kxlmkajyix6n4cdz7w9l26dspjiw2fk4xkj33gzzc8rq9g8";
+    rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c";
+    sha256 = "1hvsxjv9s30qylcq2vb2nqqn8fix4sk0ah718f8c0flrcqbwa58z";
     leaveDotGit = true;
   };
 
-  depsSha256 = "1sk79w2wxvpgfkxr0nbrqqxdih4abiqvawdd88r2p9cqzrkdg8by";
+  depsSha256 = "0s9f00kg7q9dxd8g98k3z4qv404p9ra73l1bzxs6qzk54qhg44dp";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 

From b97362989f59ed08683f66023d1ad6a3e760b781 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 May 2015 13:00:54 +0200
Subject: [PATCH 0818/1143] Provide /run in VMs

---
 pkgs/build-support/vm/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 838548f94bfe..c9a9aac79734 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -120,8 +120,10 @@ rec {
     mkdir -p /fs/nix/store
     mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose
 
-    mkdir -p /fs/tmp
+    mkdir -p /fs/tmp /fs/run /fs/var
     mount -t tmpfs -o "mode=1777" none /fs/tmp
+    mount -t tmpfs -o "mode=755" none /fs/run
+    ln -sfn /run /fs/var/run
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg

From fef86de6188731c621cbbaa89e5cbe557f6f9546 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 May 2015 13:01:10 +0200
Subject: [PATCH 0819/1143] Make module loading work in VMs

Also, execute stage 2 as PID 1.
---
 pkgs/build-support/vm/default.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index c9a9aac79734..5aa1a9c092d2 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -140,15 +140,7 @@ rec {
     echo "127.0.0.1 localhost" > /fs/etc/hosts
 
     echo "starting stage 2 ($command)"
-    test -n "$command"
-
-    set +e
-    chroot /fs $command $out
-    echo $? > /fs/tmp/xchg/in-vm-exit
-
-    mount -o remount,ro dummy /fs
-
-    poweroff -f
+    exec switch_root /fs $command $out
   '';
 
 
@@ -181,12 +173,27 @@ rec {
       ${coreutils}/bin/ln -s ${bash}/bin/sh /bin/sh
     fi
 
+    # Set up automatic kernel module loading.
+    export MODULE_DIR=${linux}/lib/modules/
+    ${coreutils}/bin/cat <<EOF > /run/modprobe
+    #! /bin/sh
+    export MODULE_DIR=$MODULE_DIR
+    exec ${kmod}/bin/modprobe "\$@"
+    EOF
+    ${coreutils}/bin/chmod 755 /run/modprobe
+    echo /run/modprobe > /proc/sys/kernel/modprobe
+
     # For debugging: if this is the second time this image is run,
     # then don't start the build again, but instead drop the user into
     # an interactive shell.
     if test -n "$origBuilder" -a ! -e /.debug; then
       ${coreutils}/bin/touch /.debug
-      exec $origBuilder $origArgs
+      $origBuilder $origArgs
+      echo $? > /tmp/xchg/in-vm-exit
+
+      ${busybox}/bin/mount -o remount,ro dummy /
+
+      ${busybox}/bin/poweroff -f
     else
       export PATH=/bin:/usr/bin:${coreutils}/bin
       echo "Starting interactive shell..."

From d769b523072f7d5ca00f65d3a50776d6d79ddfaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 13 May 2015 18:39:50 +0200
Subject: [PATCH 0820/1143] python: pass stdenv.glibc to crypt module to expose
 crypt.so

---
 pkgs/development/interpreters/python/2.6/default.nix | 2 +-
 pkgs/development/interpreters/python/2.7/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 4e322faf66f0..2d28a8e6f5b6 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -169,7 +169,7 @@ let
     crypt = buildInternalPythonModule {
       moduleName = "crypt";
       internalName = "crypt";
-      deps = [ ];
+      deps = [ stdenv.glibc ];
     };
 
     curses = buildInternalPythonModule {
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index ac9b9d637096..d0880d1b7023 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -196,7 +196,7 @@ let
     crypt = buildInternalPythonModule {
       moduleName = "crypt";
       internalName = "crypt";
-      deps = [ ];
+      deps = [ stdenv.glibc ];
     };
 
     gdbm = buildInternalPythonModule {

From fc276c7aabed52b68e88057a7ef0ec5a62dc85eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 13 May 2015 18:46:59 +0200
Subject: [PATCH 0821/1143] wordnet: mark as broken

---
 pkgs/applications/misc/wordnet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index 6ead69db2209..d46790e4d72b 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation {
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    broken = true;  # we'd need older tk/tcl
   };
 }

From 38d9663367b687c94a3ca8b266c84ddc2b5ec23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 13 May 2015 19:19:08 +0200
Subject: [PATCH 0822/1143] gtkvnc: add libgpgerror as dependency

---
 pkgs/development/compilers/go/1.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index a00fe7346701..c79ab632d028 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167";
   };
 
-  buildInputs = [ bison glibc bash makeWrapper ];
+  buildInputs = [ bison glibc bash makeWrapper libgpgerror ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
 

From 88f7b04b5e4984db3c061d5efc40a84c8cadeb3f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 13 May 2015 12:38:28 -0500
Subject: [PATCH 0823/1143] go 1.2: Add a missing argument

---
 pkgs/development/compilers/go/1.2.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index c79ab632d028..113e2118efb6 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
+{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc
+, libgpgerror }:
 
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";

From 7094ae27da65c8b41843e61a8b7ba5e1fe274ab1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 May 2015 12:49:00 -0500
Subject: [PATCH 0824/1143] qt53: fix qtwebkit build with new glib

---
 .../qt-5/5.3/0013-qtwebkit-glib-2.44.patch    | 232 ++++++++++++++++++
 .../libraries/qt-5/5.3/default.nix            |   1 +
 2 files changed, 233 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch

diff --git a/pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch b/pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch
new file mode 100644
index 000000000000..29045df456ff
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch
@@ -0,0 +1,232 @@
+From f8485382e319da57abea99797387ee9f6f94d32e Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 13 May 2015 12:42:07 -0500
+Subject: [PATCH] glib mutexlocker
+
+---
+ .../gstreamer/WebKitWebSourceGStreamer.cpp         | 48 +++++++++++-----------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+index 5625873..a6d961f 100644
+--- a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
++++ b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue*
+ 
+     switch (propID) {
+     case PROP_IRADIO_MODE: {
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         priv->iradioMode = g_value_get_boolean(value);
+         break;
+     }
+@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     switch (propID) {
+     case PROP_IRADIO_MODE:
+         g_value_set_boolean(value, priv->iradioMode);
+@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src)
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     bool seeking = priv->seekID;
+ 
+@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src)
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     priv->startID = 0;
+ 
+@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
+         return ret;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     switch (transition) {
+     case GST_STATE_CHANGE_READY_TO_PAUSED:
+         GST_DEBUG_OBJECT(src, "READY->PAUSED");
+@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
+         gst_query_parse_duration(query, &format, NULL);
+ 
+         GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
+             gst_query_set_duration(query, format, src->priv->size);
+             result = TRUE;
+@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
+         break;
+     }
+     case GST_QUERY_URI: {
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         gst_query_set_uri(query, src->priv->uri);
+         result = TRUE;
+         break;
+@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler)
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
+     gchar* ret;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     ret = g_strdup(src->priv->uri);
+     return ret;
+ }
+@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr
+         return FALSE;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     g_free(priv->uri);
+     priv->uri = 0;
+@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler* handler)
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
+     gchar* ret;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     ret = g_strdup(src->priv->uri);
+     return ret;
+ }
+@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri)
+         return FALSE;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     g_free(priv->uri);
+     priv->uri = 0;
+@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src)
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->needDataID)
+         return FALSE;
+@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData)
+ 
+     GST_DEBUG_OBJECT(src, "Need more data: %u", length);
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (priv->needDataID || !priv->paused) {
+         return;
+     }
+@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->enoughDataID)
+         return FALSE;
+@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData)
+ 
+     GST_DEBUG_OBJECT(src, "Have enough data");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (priv->enoughDataID || priv->paused) {
+         return;
+     }
+@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src)
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->seekID)
+         return FALSE;
+@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+     GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (offset == priv->offset && priv->requestedOffset == priv->offset)
+         return TRUE;
+ 
+@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
+ void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
+ {
+     ASSERT(player);
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     src->priv->player = player;
+     s_cachedResourceLoader = player->cachedResourceLoader();
+ }
+@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize
+     mapGstBuffer(buffer);
+ #endif
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     priv->buffer = adoptGRef(buffer);
+     locker.unlock();
+ 
+@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response)
+ 
+     GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     // If we seeked we need 206 == PARTIAL_CONTENT
+     if (priv->requestedOffset && response.httpStatusCode() != 206) {
+@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char* data, int length)
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length);
+ 
+@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished()
+ 
+     GST_DEBUG_OBJECT(src, "Have EOS");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (!priv->seekID) {
+         locker.unlock();
+         gst_app_src_end_of_stream(priv->appsrc);
+@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*)
+ 
+     GST_ERROR_OBJECT(src, "Request was blocked");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     uri.set(g_strdup(src->priv->uri));
+     locker.unlock();
+ 
+@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)
+ 
+     GST_ERROR_OBJECT(src, "Cannot show URL");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     uri.set(g_strdup(src->priv->uri));
+     locker.unlock();
+ 
+-- 
+2.3.6
+
diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index d7ae685af6d7..55de4265d3ee 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -78,6 +78,7 @@ stdenv.mkDerivation rec {
       (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; })
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
+      ./0013-qtwebkit-glib-2.44.patch
     ];
 
   preConfigure = ''

From 6516cc48c7082700905d23ab32b28a872fdbfa58 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 13 May 2015 11:32:46 -0700
Subject: [PATCH 0825/1143] nghttp2: 0.7.13 -> 0.7.14

---
 pkgs/development/libraries/nghttp2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index b72abb57e8f2..e442cc96d2f7 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -34,12 +34,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}nghttp2-${version}";
-  version = "0.7.13";
+  version = "0.7.14";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
-    url = "http://pub.wak.io/nixos/tarballs/nghttp2-0.7.13.tar.xz";
-    sha256 = "1nz14hmfhsxljmf7f3763q9kpn9prfdivrvdr7c74x72s75bzwli";
+    url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2";
+    sha256 = "000d50yzyysbr9ldhvnbpzn35vplqm08dnmh55wc5zk273gy383f";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 413c17e43099f5f1c0959168b9a827d66e2d4e14 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Wed, 13 May 2015 16:33:17 +0200
Subject: [PATCH 0826/1143] add ladspa-sdk, move ladspaH

---
 .../applications/audio/ladspa-sdk/default.nix | 28 +++++++++++++++++++
 .../ladspah.nix                               |  0
 pkgs/top-level/all-packages.nix               |  4 ++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/ladspa-sdk/default.nix
 rename pkgs/applications/audio/{ladspa-plugins => ladspa-sdk}/ladspah.nix (100%)

diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
new file mode 100644
index 000000000000..c333492fd13e
--- /dev/null
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "ladspa-sdk-${version}";
+  version = "1.13";
+  src = fetchurl {
+    url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
+  };
+
+  patchPhase = ''
+    cd src
+    sed -i 's@/usr/@$(out)/@g'  makefile
+    sed -i 's@-mkdirhier@mkdir -p@g'  makefile
+  '';
+
+  meta = {
+    description = "The SDK for the LADSPA audio plugin standard";
+    longDescription = ''
+      The LADSPA SDK, including the ladspa.h API header file,
+      ten example LADSPA plugins and 
+      three example programs (applyplugin, analyseplugin and listplugins).
+    '';
+    homepage = http://www.ladspa.org/ladspa_sdk/overview.html;
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
similarity index 100%
rename from pkgs/applications/audio/ladspa-plugins/ladspah.nix
rename to pkgs/applications/audio/ladspa-sdk/ladspah.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6fcb1c0f95f..d8eb552f17f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11384,12 +11384,14 @@ let
 
   lash = callPackage ../applications/audio/lash { };
 
-  ladspaH = callPackage ../applications/audio/ladspa-plugins/ladspah.nix { };
+  ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { };
 
   ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
     fftw = fftwSinglePrec;
   };
 
+  ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
+
   caps = callPackage ../applications/audio/caps { };
 
   lastwatch = callPackage ../applications/audio/lastwatch { };

From 53b6a4f063bf14bec3d75d4052f347d0c7710d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 13 May 2015 21:24:48 +0000
Subject: [PATCH 0827/1143] Hack for btrfsProgs in ARM, due to a gcc bug.

It fails to build otherwise:
/tmp/nix-build-btrfs-progs-4.0.drv-4/ccUNrySY.s:4014: Error: invalid operands (.text and *UND* sections) for `-'
---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 9286d58482fd..e2ed76494a15 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -3,7 +3,7 @@
 
 let version = "4.0"; in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
@@ -28,4 +28,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin wkennington ];
     platforms = platforms.linux;
   };
-}
+} // (if stdenv.isArm then {
+  # gcc bug with -O1 on ARM
+  patchPhase = "sed -i s/-O1/-O2/ configure";
+} else {}))

From 8ffc461f91c176c72a98d6e04326723e9640277b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 13 May 2015 14:50:38 -0700
Subject: [PATCH 0828/1143] firefox: 37.0.2 -> 38.0

---
 pkgs/applications/networking/browsers/firefox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index bd8fb4d2cd7b..42786790c2b9 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "37.0.2"; in
+let version = "38.0"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "6e306d56e4e00ffdc2ddbdfbbabe4cb9fc527071";
+    sha1 = "3812a31287d3a8d9ebb1326e131a944fd27f0f2d";
   };
 
   buildInputs =

From c37888a730ee5152da1d977e8e2e1513c0ab9d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 14 May 2015 01:49:43 +0200
Subject: [PATCH 0829/1143] idea-{community,ultimate}: 14.1.2 -> 14.1.3

---
 pkgs/applications/editors/idea/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 8d150ded4ab7..d502bf42e91e 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -237,25 +237,25 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "14.1.2";
-    build = "IC-141.713.2";
+    version = "14.1.3";
+    build = "IC-141.1010.3";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "1skxbax7gsxxf7519qasxwp9q0v9ff755ibqr1w47dv2al47kjzq";
+      sha256 = "104ba057p49l41g9gdcgbywdxyqzkm4rfm7yivkcsddh5drsk4jv";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "14.1.2";
-    build = "IU-141.713.2";
+    version = "14.1.3";
+    build = "IU-141.1010.3";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "1ddy0f83rs3yx3w8v49cmlhkc8qxapdh702g26gzlapbpvfw58ay";
+      sha256 = "1flg3rpb86xfcxlys5rxywa0z9c6j9h3qd8mkadx5pnay1f97pwi";
     };
   };
 

From 6b777ba4524c1b78b1e81a2954ca6204ee56b2b6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 May 2015 20:23:30 -0500
Subject: [PATCH 0830/1143] kdeApps_15_04.kstars: add missing dependencies

---
 pkgs/applications/kde-apps-15.04/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 5e41712a14fb..4bb239afc9fc 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -72,9 +72,10 @@ let
         BISON = bison;
         Baloo = kde4.baloo;
         Boost = boost156;
+        CFitsio = cfitsio;
+        CUPS = cups;
         Canberra = libcanberra;
         Cdparanoia = cdparanoia;
-        CUPS = cups;
         DBusMenuQt = libdbusmenu_qt;
         DjVuLibre = djvulibre;
         ENCHANT = enchant;
@@ -96,6 +97,7 @@ let
         GSL = gsl;
         HUNSPELL = hunspell;
         HUpnp = herqq;
+        INDI = indilib;
         Intltool = intltool;
         Jasper = jasper;
         KActivities = kde4.kactivities;
@@ -134,6 +136,7 @@ let
         TunePimp = libtunepimp;
         UDev = udev;
         USB = libusb;
+        Xplanet = xplanet;
         Xscreensaver = xscreensaver;
         Xsltproc = libxslt;
       }
@@ -319,6 +322,12 @@ let
           ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
       };
 
+      kstars = super.kstars // {
+        buildInputs =
+          super.kstars.buildInputs
+          ++ (with kf5; [ kparts ]);
+      };
+
       ktp-accounts-kcm = super.ktp-accounts-kcm // {
         buildInputs =
           super.ktp-accounts-kcm.buildInputs

From 38bf485e72615ffe7828fe4cbd147332209b375a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 May 2015 20:52:26 -0500
Subject: [PATCH 0831/1143] Add missing KDE Games dependencies

---
 pkgs/applications/kde-apps-15.04/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 4bb239afc9fc..bf31a935e7bc 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -101,6 +101,7 @@ let
         Intltool = intltool;
         Jasper = jasper;
         KActivities = kde4.kactivities;
+        KDEGames = kde4.libkdegames;
         LCMS2 = lcms2;
         Ldap = openldap;
         LibAttica = attica;

From 1c19f91dd7d6215871fa03621759061897f2afcb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 14 May 2015 09:32:32 +0200
Subject: [PATCH 0832/1143] opam: update from 1.2.1 to 1.2.2

---
 pkgs/development/tools/ocaml/opam/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index b6dce1328688..283bd581a130 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -37,13 +37,13 @@ let
       sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73";
     };
     opam = fetchurl {
-      url = "https://github.com/ocaml/opam/archive/1.2.1.zip";
-      sha256 = "1mvsy89l5g9nvwmmls5jf46anh6gk8dk8a1dn42rmnihnb0zjcs4";
+      url = "https://github.com/ocaml/opam/archive/1.2.2.zip";
+      sha256 = "1fxd5axlh9f3jb47y9paa9ld78qwcyp7pv3m60k401ym1dps32jk";
     };
   };
 in stdenv.mkDerivation rec {
   name = "opam-${version}";
-  version = "1.2.1";
+  version = "1.2.2";
 
   buildInputs = [ unzip curl ncurses ocaml ];
 

From fd8cb1ff2d53cad7fee74e2db73d1f01056a964d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 13 May 2015 20:54:25 +0300
Subject: [PATCH 0833/1143] nix-serve: Add nixos module

This allows sharing the Nix store of the machine as a binary cache
simply by setting 'services.nix-serve.enable = true'.
---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/nix-serve.nix | 56 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 nixos/modules/services/networking/nix-serve.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e869b350e716..0b41e394b1ac 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -289,6 +289,7 @@
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
   ./services/networking/ngircd.nix
+  ./services/networking/nix-serve.nix
   ./services/networking/notbit.nix
   ./services/networking/nsd.nix
   ./services/networking/ntopng.nix
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
new file mode 100644
index 000000000000..c2c579c3177e
--- /dev/null
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -0,0 +1,56 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.nix-serve;
+in
+{
+  options = {
+    services.nix-serve = {
+      enable = mkEnableOption "nix-serve, the standalone Nix binary cache server";
+
+      port = mkOption {
+        type = types.int;
+        default = 5000;
+        description = ''
+          Port number where nix-serve will listen on.
+        '';
+      };
+
+      bindAddress = mkOption {
+        type = types.string;
+        default = "0.0.0.0";
+        description = ''
+          IP address where nix-serve will bind its listening socket.
+        '';
+      };
+
+      extraParams = mkOption {
+        type = types.string;
+        default = "";
+        description = ''
+          Extra command line parameters for nix-serve.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.nix-serve = {
+      description = "nix-serve binary cache server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = [ config.nix.package pkgs.bzip2 ];
+      environment.NIX_REMOTE = "daemon";
+
+      serviceConfig = {
+        ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
+          "--port ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
+        User = "nobody";
+        Group = "nogroup";
+      };
+    };
+  };
+}

From aef701babc933a2d8a4059029f81743ab4a555b5 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 14 May 2015 11:50:22 +0100
Subject: [PATCH 0834/1143] opentsdb: Update 2.1.0 (official release)

---
 pkgs/tools/misc/opentsdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index 6f9695ba363c..2a91f02ca099 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "opentsdb-2.1.0-rc1";
+  name = "opentsdb-2.1.0";
 
   src = fetchurl {
-    url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0RC1/opentsdb-2.1.0RC1.tar.gz;
-    sha256 = "1vvhzdl2wgbzy2lvlyx40pks47ma6szs9ka4dwjf123xyixv0rmz";
+    url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0/opentsdb-2.1.0.tar.gz;
+    sha256 = "0msijwzdwisqmdd8ikmrzbcqvrnb6ywz6zyd1vg0s5s4syi3cvmp";
   };
 
   buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ];

From e995f971ae13fa7bd2dab979faadcec601256a41 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 14 May 2015 12:11:35 +0100
Subject: [PATCH 0835/1143] bosun/scollector: Update to 20150506172827

---
 pkgs/servers/monitoring/bosun/default.nix    | 4 ++--
 pkgs/servers/monitoring/bosun/scollector.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index 4ab9148118cd..807ee7022672 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -3,14 +3,14 @@
 with goPackages;
 
 buildGoPackage rec {
-  rev = "20150409220449";
+  rev = "20150506172827";
   name = "bosun-${rev}";
   goPackagePath = "bosun.org";
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "02bvq9hx2h4pgjclv09nm0al8ybvq0syhyhn5cvw0wgnn9bwn5mb";
+    sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8";
   };
   subPackages = [ "cmd/bosun" ];
 
diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix
index 9f432f7f8c1c..bd4a5cb10478 100644
--- a/pkgs/servers/monitoring/bosun/scollector.nix
+++ b/pkgs/servers/monitoring/bosun/scollector.nix
@@ -3,14 +3,14 @@
 with goPackages;
 
 buildGoPackage rec {
-  rev = "20150409220449";
-  name = "bosun-${rev}";
+  rev = "20150506172827";
+  name = "scollector-${rev}";
   goPackagePath = "bosun.org";
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "02bvq9hx2h4pgjclv09nm0al8ybvq0syhyhn5cvw0wgnn9bwn5mb";
+    sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8";
   };
   subPackages = [ "cmd/scollector" ];
 

From 7a61a97dad5353dab49cd057584c0e50fcbaad33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 14 May 2015 16:01:16 +0200
Subject: [PATCH 0836/1143] idea updates idea.clion: 1.0 -> 1.0.1
 idea.ruby-mine: 7.0.4 -> 7.1.2

---
 pkgs/applications/editors/idea/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index d502bf42e91e..4a22b6e990a3 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -225,13 +225,13 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "1.0";
-    build = "141.353";
+    version = "1.0.1";
+    build = "141.870";
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
-      sha256 = "0xjdx13ljp1vy51a7rsj25wg3bsvry4kxq5cdng8zrc1g2y1fqw5";
+      sha256 = "17hdna6w7y9n3vqncqifw7jvys3rydgg0mz97nzax817fl4kjf1r";
     };
   };
 
@@ -261,13 +261,13 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "7.0.4";
-    build = "139.1231";
+    version = "7.1.2";
+    build = "141.1119";
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38";
+      sha256 = "1gz14lv5jhnrnshp7lkx3wgrdf0y60abs4q78yhv2x9dc6ld1gmj";
     };
   };
 

From 9c9c5865347e010560ad29b52e9c1caf91f84afe Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 14 May 2015 17:18:17 +0200
Subject: [PATCH 0837/1143] Fixed several "package has no version" warnings

---
 pkgs/applications/misc/sqliteman/default.nix       | 14 ++++++++------
 .../networking/cluster/marathon/default.nix        |  2 +-
 .../science/electronics/fritzing/default.nix       |  2 +-
 .../version-management/vcprompt/default.nix        |  7 ++++---
 pkgs/development/arduino/arduino-core/default.nix  |  2 +-
 pkgs/development/tools/misc/uncrustify/default.nix |  5 +++--
 .../tools/selenium/chromedriver/default.nix        |  6 ++++--
 pkgs/games/xsnow/default.nix                       |  4 ++--
 pkgs/tools/networking/atftp/default.nix            |  2 +-
 pkgs/tools/networking/connmanui/default.nix        |  8 +++++---
 pkgs/tools/video/atomicparsley/default.nix         |  5 +++--
 11 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix
index f655a0f8c260..a1d5ef153bbd 100644
--- a/pkgs/applications/misc/sqliteman/default.nix
+++ b/pkgs/applications/misc/sqliteman/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, cmake, qt4, qscintilla }:
+{ stdenv, fetchFromGitHub, cmake, qt4, qscintilla }:
 
 stdenv.mkDerivation rec {
-  name = "sqliteman";
-  version = "1.2.0-c41b89e1";
+  name = "sqliteman-${version}";
+  version = "1.2.0";
 
-  src = fetchurl {
-    url = https://github.com/pvanek/sqliteman/archive/1.2.0.tar.gz;
-    sha256 = "1x4ppwf01jdnz3a4ycia6vv5qf3w2smbqx690z1pnkwbvk337akm";
+  src = fetchFromGitHub {
+    repo = "sqliteman";
+    owner = "pvanek";
+    rev = version;
+    sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs";
   };
 
   buildInputs = [ cmake qt4 qscintilla ];
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 3eebc6de3cf3..1cc75a71bfa4 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, jdk, mesos, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "marathon-v${version}";
+  name = "marathon-${version}";
   version = "0.8.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index f5a835423bdd..1fa0a0d97b50 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "0.9.0b";
-  name = "fritzing";
+  name = "fritzing-${version}";
 
   src = fetchurl {
     url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2";
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index 476abd4e19bd..4afb1b20e32c 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchhg, autoconf, sqlite }:
 
-stdenv.mkDerivation {
-  name = "vcprompt";
+stdenv.mkDerivation rec {
+  name = "vcprompt-${version}";
+  version = "1.2.1";
 
   src = fetchhg {
     url = "http://hg.gerg.ca/vcprompt/";
-    rev = "1.2.1";
+    rev = version;
     sha256 = "03xqvp6bfl98bpacrw4n82qv9cw6a4fxci802s3vrygas989v1kj";
   };
 
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index a751076537a4..7a960dc931b9 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -7,7 +7,7 @@ assert withGui -> gtk2 != null;
 stdenv.mkDerivation rec {
 
   version = "1.0.6";
-  name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}";
+  name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}";
 
   src = fetchFromGitHub {
     owner = "arduino";
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index f4add9a4b9ea..70aedbb48d23 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "uncrustify";
+  name = "${product}-${version}";
+  product = "uncrustify";
   version = "0.61";
 
   src = fetchurl {
-    url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz";
+    url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz";
     sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9";
   };
 
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index f2d39938a483..8d9db34446d6 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -7,10 +7,12 @@
 assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
-  name = "chromedriver_linux64";
+  product = "chromedriver_linux64";
+  name = "${product}-2.14";
+  version = "2.14";
 
   src = fetchurl {
-    url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip";
+    url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip";
     sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin";
   };
 
diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix
index 68b77dd091b6..503deb695f7f 100644
--- a/pkgs/games/xsnow/default.nix
+++ b/pkgs/games/xsnow/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
 
   version = "1.42";
-  name = "xsnow";
+  name = "xsnow-${version}";
 
   src = fetchurl {
-    url = "http://dropmix.xs4all.nl/rick/Xsnow/xsnow-${version}.tar.gz";
+    url = "http://dropmix.xs4all.nl/rick/Xsnow/${name}.tar.gz";
     sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
   };
 
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index 930d9f4968b6..ad2d77f8cfef 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -9,7 +9,7 @@ debianPatch = fetchurl {
 };
 in
 stdenv.mkDerivation {
-  name = "atftp";
+  name = "atftp-${version}";
   inherit version;
   src = fetchurl {
     url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz";
diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix
index 62be5bf14e57..280d3d9f9fc6 100644
--- a/pkgs/tools/networking/connmanui/default.nix
+++ b/pkgs/tools/networking/connmanui/default.nix
@@ -1,10 +1,12 @@
 { stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }:
 
-stdenv.mkDerivation {
-  name = "connmanui-b838e640eddb83d296fb6d146ce756066d37c43b";
+stdenv.mkDerivation rec {
+  name = "connmanui-${version}";
+  version = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2";
+
   src = fetchgit {
     url = "git://github.com/tbursztyka/connman-ui.git";
-    rev = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2";
+    rev = version;
     sha256 = "0rml52v81s7hr0g6qbj5bamli08kn66hay84qicx8sy8679wg443";
   };
 
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index d4b662c88f17..02381badcc86 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,11 +1,12 @@
 { stdenv, pkgs, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "AtomicParsley";
+  name = "${product}-${version}";
+  product = "AtomicParsley";
   version = "0.9.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/atomicparsley/${name}-source-${version}.zip";
+    url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip";
     sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e";
   };
 

From 779b65f0193ca0d18b3d815a99cccd5886ef2126 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 14 May 2015 17:45:59 +0200
Subject: [PATCH 0838/1143] cups: Second attempt to fix our printing tests; add
 more sleep statements

---
 nixos/tests/printing.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index e8c41140045c..1e3a0057c657 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -68,6 +68,7 @@ import ./make-test.nix ({pkgs, ... }: {
 
               # Print the file on the client.
               $client->succeed("lp $file");
+              $client->sleep(10);
               $client->succeed("lpq") =~ /active.*root.*$fn/ or die;
 
               # Ensure that a raw PCL file appeared in the server's queue
@@ -75,11 +76,13 @@ import ./make-test.nix ({pkgs, ... }: {
               # course, since there is no actual USB printer attached, the
               # file will stay in the queue forever.
               $server->waitForFile("/var/spool/cups/d00001-001");
+              $server->sleep(10);
               $server->succeed("lpq -a") =~ /$fn/ or die;
 
               # Delete the job on the client.  It should disappear on the
               # server as well.
               $client->succeed("lprm");
+              $client->sleep(10);
               $client->succeed("lpq -a") =~ /no entries/;
               Machine::retry sub {
                 return 1 if $server->succeed("lpq -a") =~ /no entries/;

From cd17e50bd95bbbcb4cf8e1904eaf334066a1ac42 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 14 May 2015 18:50:16 +0300
Subject: [PATCH 0839/1143] Update CLSQL source and switch to a mirror

---
 pkgs/development/lisp-modules/lisp-packages.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 7d4c88e5c9e0..5b24c7043623 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -190,15 +190,18 @@ let lispPackages = rec {
 
   clsql = buildLispPackage rec {
     baseName = "clsql";
-    version = "git-20141112";
+    version = "git-20150514";
     description = "Common Lisp SQL Interface library";
     deps = [uffi];
     buildInputs = [pkgs.mysql.lib pkgs.zlib];
     # Source type: git
     src = pkgs.fetchgit {
-      url = ''http://git.b9.com/clsql.git'';
-      sha256 = "dacd56bc9a0348e8101184bf154b971407a98f3a753d7cce34c7a44b4b19f8fd";
-      rev = ''180b52cb686a87487e12e87b13bafe131e6c3bef'';
+      url =
+        #''http://git.b9.com/clsql.git''
+	"http://repo.or.cz/r/clsql.git"
+	;
+      sha256 = "1wzc7qsnq8hk0j0h9jmj4xczmh7h6njafwab2zylh8wxmfzwp2nw";
+      rev = ''a646f558b54191eda1d64f2926eee7b4fa763f89'';
     };
     overrides = x:{
       preConfigure = ''

From 7b028de543d7529f86233c4082ccc04f0accd8ef Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Thu, 14 May 2015 17:12:09 +0200
Subject: [PATCH 0840/1143] Fix mesos-0.22 build and update to 0.22.1

---
 pkgs/applications/networking/cluster/mesos/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 9458ffc39256..c330b8acfbf3 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
-, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
+, automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
 , setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion
 , leveldb, glog, perf, utillinux, libnl, iproute
 }:
@@ -9,18 +9,18 @@ let
   soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
 
 in stdenv.mkDerivation rec {
-  version = "0.22.0";
+  version = "0.22.1";
   name = "mesos-${version}";
 
   dontDisableStatic = true;
 
   src = fetchurl {
     url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz";
-    sha256 = "0z8c1vr7b06l3nqgbxq8ydcz79ayw75y2szipfqkw17c7gv6d7v8";
+    sha256 = "0ry0ppzgpab68fz5bzd7ry5rjbg8xjz73x1x4c5id42cpsqnn7x5";
   };
 
   buildInputs = [
-    makeWrapper autoconf automake libtool curl sasl jdk maven
+    makeWrapper autoconf automake114x libtool curl sasl jdk maven
     python wrapPython boto distutils-cfg setuptools leveldb
     subversion apr glog
   ] ++ lib.optionals stdenv.isLinux [
@@ -129,7 +129,7 @@ in stdenv.mkDerivation rec {
     homepage    = "http://mesos.apache.org";
     license     = licenses.asl20;
     description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
-    maintainers = with maintainers; [ cstrahan offline ];
+    maintainers = with maintainers; [ cstrahan offline rushmorem ];
     platforms   = with platforms; linux;
   };
 }

From 221c45d51f3140a9c70bf465528d001da1fe1aa3 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Thu, 14 May 2015 09:52:40 -0700
Subject: [PATCH 0841/1143] emacs-packages: update projectile

---
 pkgs/top-level/emacs-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 2e8d68414a43..40bfb245f39d 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -902,12 +902,12 @@ let self = _self // overrides;
 
   projectile = melpaBuild rec {
     pname   = "projectile";
-    version = "20141020";
+    version = "0.12.0";
     src = fetchFromGitHub {
       owner  = "bbatsov";
       repo   = pname;
-      rev    = "13580d83374e0c17c55b3a680b816dfae407657e";
-      sha256 = "10c28h2g53sg68lwamhak0shdhh26h5xaipipz3n4281sr1fwg58";
+      rev    = "v${version}";
+      sha256 = "1bl5wpkyv9xlf5v5hzkj8si1z4hjn3yywrjs1mx0g4irmq3mk29m";
     };
     packageRequires = [ dash helm s pkg-info epl ];
     meta = { license = gpl3Plus; };

From bb9e9cc3f84abc4363d4b15b5860d82301d5b41e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 14 May 2015 19:09:10 +0200
Subject: [PATCH 0842/1143] Turned some meta.maintainers into lists

---
 pkgs/applications/audio/pianobar/default.nix              | 8 ++++----
 .../misc/rxvt_unicode-plugins/urxvt-perls/default.nix     | 2 +-
 .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix  | 4 ++--
 .../pidgin-plugins/pidgin-latex/default.nix               | 2 +-
 pkgs/development/compilers/smlnj/default.nix              | 6 +++---
 pkgs/development/libraries/boost-process/default.nix      | 2 +-
 pkgs/development/libraries/cppzmq/default.nix             | 2 +-
 pkgs/development/libraries/double-conversion/default.nix  | 2 +-
 pkgs/development/libraries/folly/default.nix              | 2 +-
 pkgs/development/libraries/libiberty/default.nix          | 2 +-
 .../libraries/libnetfilter_conntrack/default.nix          | 8 ++++----
 pkgs/development/libraries/libxls/default.nix             | 2 +-
 pkgs/development/libraries/qpdf/default.nix               | 2 +-
 pkgs/development/libraries/xlslib/default.nix             | 2 +-
 pkgs/games/hedgewars/default.nix                          | 2 +-
 pkgs/games/onscripter-en/default.nix                      | 2 +-
 pkgs/misc/sails/default.nix                               | 2 +-
 pkgs/tools/X11/primus/default.nix                         | 2 +-
 pkgs/tools/archivers/rpmextract/default.nix               | 2 +-
 pkgs/tools/compression/lbzip2/default.nix                 | 2 +-
 pkgs/tools/networking/openvpn/update-resolv-conf.nix      | 2 +-
 21 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 3e7bcb9d912e..b76e1183c0ee 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
 
   configurePhase = "export CC=${CC}";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A console front-end for Pandora.com";
     homepage = "http://6xq.net/projects/pianobar/";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit; # expat version
-    maintainers = stdenv.lib.maintainers.eduarrrd;
+    platforms = platforms.linux;
+    license = licenses.mit; # expat version
+    maintainers = with maintainers; [ eduarrrd ];
   };
 }
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index c0cc702c9862..3c5caeda789e 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     description = "Perl extensions for the rxvt-unicode terminal emulator";
     homepage = "https://github.com/muennich/urxvt-perls";
     license = licenses.gpl2;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index a636c3bcfe56..db388cea5fbb 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)";
     homepage = "https://github.com/mina86/urxvt-tabbedex";
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index 586ce26e8c95..4a5522039c84 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
     description = "LaTeX rendering plugin for Pidgin IM";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index aa8ea9012c11..a2b8d4f63b98 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -60,11 +60,11 @@ in stdenv.mkDerivation {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Standard ML of New Jersey, a compiler";
     homepage    = http://smlnj.org;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = licenses.bsd3;
     platforms   = [ "i686-linux" ];
-    maintainers = stdenv.lib.maintainers.thoughtpolice;
+    maintainers = with maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix
index 59d25a767329..974654216e01 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/pkgs/development/libraries/boost-process/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     description = "Library to manage system processes";
     license = "boost-license";
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index fc2d04e649b9..510af3df8240 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/zeromq/cppzmq;
     license = licenses.bsd2;
     description = "C++ binding for 0MQ";
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 07f11d9fa393..6eedf6fc23be 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/floitsch/double-conversion;
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 180de724d958..0110511c3356 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     # 32bit is not supported: https://github.com/facebook/folly/issues/103
     platforms = [ "x86_64-linux" ];
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index 70d6b24cbfc5..eddc4eed55c0 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://gcc.gnu.org/;
     license = licenses.lgpl2;
     description = "Collection of subroutines used by various GNU programs";
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index f6908cd514cc..a1a343de0e22 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libmnl ];
   propagatedBuildInputs = [ libnfnetlink ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
     longDescription = ''
       libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
       by conntrack-tools among many other applications
     '';
     homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = stdenv.lib.maintainers.nckx;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index 87b4d82efc63..0d7115144449 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://sourceforge.net/projects/libxls/;
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index e9d506f58fe9..939351750920 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://qpdf.sourceforge.net/; 
     description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
     license = licenses.artistic2;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index 82f1514cd3d3..2492063be270 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://sourceforge.net/projects/xlslib/files/;
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index 042d4f9fd4aa..bb776a7a10d0 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
        contact with explosions, to zero (the damage dealt to the attacked
        hedgehog or hedgehogs after a player's or CPU turn is shown only when
        all movement on the battlefield has ceased).'';
-    maintainers = maintainers.kragniz;
+    maintainers = with maintainers; [ kragniz ];
     platforms = ghc.meta.platforms;
   };
 }
diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix
index 1d0bf636e2e9..8e9f5a988bf9 100644
--- a/pkgs/games/onscripter-en/default.nix
+++ b/pkgs/games/onscripter-en/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = "http://dev.haeleth.net/onscripter.shtml";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix
index ab68dc69015d..f6ccbf9ec76d 100644
--- a/pkgs/misc/sails/default.nix
+++ b/pkgs/misc/sails/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       Sails is a simulator designed to test the AI of autonomous sailing
       robots. It emulates the basic physics of sailing a small single sail
       boat'';
-    maintainers = maintainers.kragniz;
+    maintainers = with maintainers; [ kragniz ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix
index c5c0e3ce7809..1aa7909a43d6 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/pkgs/tools/X11/primus/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = https://github.com/amonakov/primus;
     description = "Faster OpenGL offloading for Bumblebee";
-    maintainers = maintainers.coconnor;
+    maintainers = with maintainers; [ coconnor ];
   };
 }
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix
index c5f982c955cc..c9ce6ac4d10b 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/pkgs/tools/archivers/rpmextract/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     description = "Script to extract RPM archives";
     platforms = platforms.all;
     license = licenses.gpl2;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix
index e1adefd2167d..44f6a0bb7a45 100644
--- a/pkgs/tools/compression/lbzip2/default.nix
+++ b/pkgs/tools/compression/lbzip2/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     homepage = http://lbzip2.org/;
     description = "parallel bzip2 compression utility";
     license = licenses.gpl3;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index 3afa17b0a82c..d6f67d065d99 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options";
     homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     license = licenses.gpl2;
     platforms = platforms.unix;
   };

From 21c73b63b8f11c372b5bf9d3a9b2ff3acc766581 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 14 May 2015 19:15:22 +0200
Subject: [PATCH 0843/1143] Turned two more meta.maintainers into lists

---
 .../libraries/gstreamer/legacy/gstreamermm/default.nix    | 8 ++++----
 pkgs/servers/kippo/default.nix                            | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index ea1c31ccab8e..ce6ae9318363 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "C++ bindings for the GStreamer streaming multimedia library";
     homepage = http://www.gtkmm.org/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>";
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ plcplc ];
+    platforms = platforms.unix;
   };
 
 }
diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix
index cadf6e716917..30d3fc3ab180 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/pkgs/servers/kippo/default.nix
@@ -51,15 +51,15 @@ stdenv.mkDerivation rec {
         mv $out/src/utils/* $out/bin
         '';
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = https://code.google.com/p/kippo;
       description = "SSH Honeypot";
       longDescription = ''
         Default port is 2222. Recommend using something like this for port redirection to default SSH port:
         networking.firewall.extraCommands = '''
         iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222''' '';
-      license = stdenv.lib.licenses.bsd3;
-      platforms = pkgs.stdenv.lib.platforms.linux;
-      maintainers = pkgs.stdenv.lib.maintainers.tomberek;
+      license = licenses.bsd3;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ tomberek ];
     };
 }

From 9ac11fb2efc2337869c6278b1349cad80b314664 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 14 May 2015 19:36:09 +0200
Subject: [PATCH 0844/1143] inadyn: fix & update from 1.99.10 to 1.99.13

---
 pkgs/tools/networking/inadyn/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 7e4d5fbe5f05..f95bc49580d2 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchurl, gnutls }:
+{ stdenv, fetchFromGitHub, gnutls33 }:
 
 let
-  ver = "1.99.10";
+  version = "1.99.13";
 in
 stdenv.mkDerivation {
-  name = "inadyn-${ver}";
+  name = "inadny-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/troglobit/inadyn/archive/${ver}.tar.gz";
-    sha256 = "0m3qnnq99siwf1ybcvbzdawk68lxf61vd13fw1f2ssl2m07hfxg3";
+  src = fetchFromGitHub {
+    repo = "inadyn";
+    owner = "troglobit";
+    rev = version;
+    sha256 = "19z8si66b2kwb7y29qpd8y45rhg5wrycwkdgjqqp98sg5yq8p7v0";
   };
 
   preConfigure = ''
     export makeFlags=prefix=$out
   '';
 
-  buildInputs = [ gnutls ];
+  buildInputs = [ gnutls33 ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
 

From 3dc204f42ed2c9deb862a9eebb07b0edc620dc3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 14 May 2015 20:21:56 +0200
Subject: [PATCH 0845/1143] fix eval

---
 pkgs/development/interpreters/python/2.6/default.nix | 2 +-
 pkgs/development/interpreters/python/2.7/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 2d28a8e6f5b6..29e3ecd20b1f 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -169,7 +169,7 @@ let
     crypt = buildInternalPythonModule {
       moduleName = "crypt";
       internalName = "crypt";
-      deps = [ stdenv.glibc ];
+      deps = optional (stdenv ? glibc) stdenv.glibc;
     };
 
     curses = buildInternalPythonModule {
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index d0880d1b7023..cfc52dabc5b6 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -196,7 +196,7 @@ let
     crypt = buildInternalPythonModule {
       moduleName = "crypt";
       internalName = "crypt";
-      deps = [ stdenv.glibc ];
+      deps = optional (stdenv ? glibc) stdenv.glibc;
     };
 
     gdbm = buildInternalPythonModule {

From 1194ebc7eff3797c25e1b0c0eed9bc0b1d627365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 14 May 2015 20:30:18 +0200
Subject: [PATCH 0846/1143] 15.05 release is now 15.06

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 7bc03e791d42..7c3643d5fb20 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-15.05
\ No newline at end of file
+15.06
\ No newline at end of file

From 7f2262e9a8f65ae7975242860c7ced51677ecb9c Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <pmidden@secure.mailbox.org>
Date: Mon, 11 May 2015 21:24:49 +0200
Subject: [PATCH 0847/1143] fcppt: initial import into nixpkgs

---
 lib/maintainers.nix                          |  1 +
 pkgs/development/libraries/fcppt/default.nix | 27 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/fcppt/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 641610e6d4fe..bcb07b25c0b6 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -162,6 +162,7 @@
   pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>";
   plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>";
   pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
+  pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
   prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
   pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
   puffnfresh = "Brian McKenna <brian@brianmckenna.org>";
diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix
new file mode 100644
index 000000000000..5f7d61f36018
--- /dev/null
+++ b/pkgs/development/libraries/fcppt/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, cmake, boost }:
+
+stdenv.mkDerivation rec {
+  name = "fcppt-1.3.0";
+
+  src = fetchgit {
+    url = https://github.com/freundlich/fcppt.git;
+    rev = "7787733afc7a6278c0de8c0435b3d312e0c0c851";
+    sha256 = "1vy6nhk6nymbp4yihvw75qn67q9fgmfc518f8dn3h2pq2gfjqrpy";
+  };
+
+  buildInputs = [ cmake boost ];
+
+  cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Freundlich's C++ toolkit";
+    longDescription = ''
+      Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on improving general C++ code by providing better types, a strong focus on C++11 (non-conforming compilers are mostly not supported) and functional programming (which is both efficient and syntactically affordable in C++11).
+    '';
+    homepage = http://fcppt.org;
+    license = stdenv.lib.licenses.boost;
+    maintainers = with stdenv.lib.maintainers; [ pmiddend ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95eabc5a3c4b..e0ad918fad74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1349,6 +1349,8 @@ let
     plugins = [ ];
   };
 
+  fcppt = callPackage ../development/libraries/fcppt/default.nix { };
+
   fcron = callPackage ../tools/system/fcron { };
 
   fdm = callPackage ../tools/networking/fdm {};

From 1e517dbd45bbb0968a2917dd97a4cf4a93574ba5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 15 May 2015 01:37:04 +0200
Subject: [PATCH 0848/1143] virtualbox+guest: Update to new version 4.3.28.

Contains quite a lot of fixes, so for information and details about
them, please have a look at https://www.virtualbox.org/wiki/Changelog.

We also needed to drop the hunk about NATNetworkServiceRunner.cpp in the
hardened.patch, because the file was unused and thus has been removed
from upstream in r54821:

https://www.virtualbox.org/changeset?reponame=vbox&new=54821

Tested successfully against nixos/tests/virtualbox.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../virtualization/virtualbox/default.nix           |  8 ++++----
 .../virtualbox/guest-additions/default.nix          |  2 +-
 .../virtualization/virtualbox/hardened.patch        | 13 -------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 842985dce5bb..158d99f64880 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -14,7 +14,7 @@ with stdenv.lib;
 let
   buildType = "release";
 
-  version = "4.3.26"; # changes ./guest-additions as well
+  version = "4.3.28"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -35,13 +35,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "98988";
+  extpackRevision = "100309";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
     # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
-    sha256 = "4e39a6d0da23799a31c3f6a4022b144ef3ddfe30c523e51b21bf7d9ebade62ce";
+    sha256 = "72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -60,7 +60,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961";
+    sha256 = "e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index e63f69ca2306..0d8560635220 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670";
+    sha256 = "9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch
index 3df41228ae59..37d2ad3a515b 100644
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/pkgs/applications/virtualization/virtualbox/hardened.patch
@@ -100,19 +100,6 @@ index 95dc9a7..39170bc 100644
      size_t cchBufLeft = strlen(szPath);
      szPath[cchBufLeft++] = RTPATH_DELIMITER;
      szPath[cchBufLeft] = 0;
-diff --git a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp
-index 090018e..7dcfc7a 100644
---- a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp
-+++ b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp
-@@ -75,7 +75,7 @@ int NATNetworkServiceRunner::start()
- 
-     /* get the path to the executable */
-     char exePathBuf[RTPATH_MAX];
--    const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX);
-+    const char *exePath = RTProcGetSuidPath(exePathBuf, RTPATH_MAX);
-     char *substrSl = strrchr(exePathBuf, '/');
-     char *substrBs = strrchr(exePathBuf, '\\');
-     char *suffix = substrSl ? substrSl : substrBs;
 diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
 index e9e1ba62..4d1c1e1 100644
 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp

From 3a5e10e37f297e3df0da656d08ea211aa9e1187a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 14 May 2015 17:30:55 -0700
Subject: [PATCH 0849/1143] buildGoPackage: Support adding extra sources

---
 .../go-modules/generic/default.nix            | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 76828784a9d5..fce307e063c5 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -5,7 +5,14 @@
 # Go import path of the package
 , goPackagePath
 
-, meta ? {}, ... } @ args:
+# Extra sources to include in the gopath
+, extraSrcs ? [ ]
+
+, meta ? {}, ... } @ args':
+
+let
+  args = lib.filterAttrs (name: _: name != "extraSrcs") args';
+in
 
 go.stdenv.mkDerivation ( args // {
   name = "go${go.meta.branch}-${name}";
@@ -14,10 +21,20 @@ go.stdenv.mkDerivation ( args // {
   configurePhase = args.configurePhase or ''
     runHook preConfigure
 
+    # Extract the source
     cd "$NIX_BUILD_TOP"
     mkdir -p "go/src/$(dirname "$goPackagePath")"
     mv "$sourceRoot" "go/src/$goPackagePath"
 
+  '' + lib.flip lib.concatMapStrings extraSrcs ({ src, goPackagePath }: ''
+    mkdir extraSrc
+    (cd extraSrc; unpackFile "${src}")
+    mkdir -p "go/src/$(dirname "${goPackagePath}")"
+    chmod -R u+w extraSrc/*
+    mv extraSrc/* "go/src/${goPackagePath}"
+    rmdir extraSrc
+
+  '') + ''
     GOPATH=$NIX_BUILD_TOP/go:$GOPATH
 
     runHook postConfigure

From fecf412767af5b027985871a5a3f14f12ce79f06 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 14 May 2015 17:34:50 -0700
Subject: [PATCH 0850/1143] buildGoPackage: Fix spacing

---
 .../go-modules/generic/default.nix            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index fce307e063c5..69efdfd54d3e 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -51,16 +51,16 @@ go.stdenv.mkDerivation ( args // {
     runHook renameImports
 
     if [ -n "$subPackages" ] ; then
-	for p in $subPackages ; do
+        for p in $subPackages ; do
             go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p
-	done
+        done
     else
-	find . -type d | while read d; do
+        find . -type d | while read d; do
             for i in $d/*.go; do
                 go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d
                 break
-	    done
-	done
+            done
+        done
     fi
 
     runHook postBuild
@@ -70,16 +70,16 @@ go.stdenv.mkDerivation ( args // {
     runHook preCheck
 
     if [ -n "$subPackages" ] ; then
-	for p in $subPackages ; do
+        for p in $subPackages ; do
             go test -p $NIX_BUILD_CORES -v $goPackagePath/$p
-	done
+        done
     else
-	find . -type d | while read d; do
+        find . -type d | while read d; do
             for i in $d/*_test.go; do
                 go test -p $NIX_BUILD_CORES -v $d
                 break
-	    done
-	done
+            done
+        done
     fi
 
     runHook postCheck

From 1a045673f67e1da33db9ab7c38f4ee84fc1cb664 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 14 May 2015 17:42:11 -0700
Subject: [PATCH 0851/1143] go-modules: Cleanup submodule detection

Also, only build the sources that matter for distribution
---
 .../go-modules/generic/default.nix            | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 69efdfd54d3e..62082842fcee 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -55,12 +55,10 @@ go.stdenv.mkDerivation ( args // {
             go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p
         done
     else
-        find . -type d | while read d; do
-            for i in $d/*.go; do
-                go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d
-                break
-            done
-        done
+        (cd go/src
+        find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do
+            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d
+        done)
     fi
 
     runHook postBuild
@@ -74,12 +72,10 @@ go.stdenv.mkDerivation ( args // {
             go test -p $NIX_BUILD_CORES -v $goPackagePath/$p
         done
     else
-        find . -type d | while read d; do
-            for i in $d/*_test.go; do
-                go test -p $NIX_BUILD_CORES -v $d
-                break
-            done
-        done
+        (cd go/src
+        find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq | while read d; do
+            go test -p $NIX_BUILD_CORES -v $d
+        done)
     fi
 
     runHook postCheck

From 0ff12d88eaa773b2514625c6eda2ca22e686a1a6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 14 May 2015 17:51:04 -0700
Subject: [PATCH 0852/1143] buildGoPackage: Skip directories which don't have
 buildable go packages

---
 pkgs/development/go-modules/generic/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 62082842fcee..6d52d0cc92f8 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -57,7 +57,13 @@ go.stdenv.mkDerivation ( args // {
     else
         (cd go/src
         find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do
-            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d
+            local OUT;
+            if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then
+                if ! echo "$OUT" | grep -q 'no buildable Go source files'; then
+                    echo "$OUT" >&2
+                    exit 1
+                fi
+            fi
         done)
     fi
 

From dcd5ab9cfe5b4af74fdcc9fcb4e44cfa75a8a66f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 14 May 2015 17:58:10 -0700
Subject: [PATCH 0853/1143] goPackages: Update and add some packages

---
 pkgs/top-level/go-packages.nix | 188 ++++++++++++++++++++++++++++++---
 1 file changed, 175 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8c2f090e0c10..79371696d20f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -10,14 +10,15 @@ let self = _self // overrides; _self = with self; {
   ## OFFICIAL GO PACKAGES
 
   crypto = buildGoPackage rec {
-    rev = "1351f936d976c60a0a48d728281922cf63eafb8d";
+    rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02";
     name = "go-crypto-${rev}";
     goPackagePath = "golang.org/x/crypto";
+
     src = fetchFromGitHub {
       inherit rev;
       owner  = "golang";
       repo   = "crypto";
-      sha256 = "1vf4z97y7xnhzjizik0lghr7ip77hhdj9kbb35rr4c9sn108f20j";
+      sha256 = "0plvjv56afb02p7l3c2zfwffnhscmc3f0ckj1gls9ay6vj85y7l8";
     };
   };
 
@@ -57,15 +58,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   protobuf = buildGoPackage rec {
-    rev = "5677a0e3d5e89854c9974e1256839ee23f8233ca";
+    rev = "efd7476481382c195beb33acd8ec2f1527167fb4";
     name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/golang/protobuf";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "golang";
       repo = "protobuf";
-      sha256 = "18dzxmy0gfjnwa9x8k3hv9calvmydv0dnz1iibykkzd20gw4l85v";
+      sha256 = "1wc3m4jpsdmmqdcf2isc9913mmwfyv791c0rd26kpjjwynh5dhdm";
     };
+
     subPackages = [ "proto" "protoc-gen-go" ];
   };
 
@@ -347,15 +350,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   golang_protobuf_extensions = buildGoPackage rec {
-    rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c";
+    rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
     name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "matttproud";
       repo = "golang_protobuf_extensions";
-      sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936";
+      sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
     };
+
     buildInputs = [ protobuf ];
   };
 
@@ -384,6 +389,25 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  google-api-go-client = buildGoPackage rec {
+    rev = "34c5554e6406f7f715ede3616b39034247545ce0";
+    name = "google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "google.golang.org/api";
+
+    preBuild = ''
+      rm -rf go/src/${goPackagePath}/examples
+    '';
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "google";
+      repo = "google-api-go-client";
+      sha256 = "1496h0xc7vjklr4m4j7vy1764k1qk2grpcwz5zssgplpfs9s9wfz";
+    };
+
+    buildInputs = [ x.net ];
+  };
+
   gosnappy = buildGoPackage rec {
     rev = "ce8acff4829e0c2458a67ead32390ac0a381c862";
     name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}";
@@ -493,6 +517,21 @@ let self = _self // overrides; _self = with self; {
     subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ];
   };
 
+  go-github = buildGoPackage rec {
+    rev = "9eb187bac4eba6fff5a54f80550b2df73b651523";
+    name = "go-github-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/google/go-github";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "google";
+      repo = "go-github";
+      sha256 = "123ck9nf5ggdrndg2gs1bhr4ysh4z0izph9sp7ciisxpgjkaycxq";
+    };
+
+    buildInputs = [ go-querystring x.oauth2 ];
+  };
+
   go-homedir = buildGoPackage rec {
     rev = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52";
     name = "go-homedir-${stdenv.lib.strings.substring 0 7 rev}";
@@ -557,15 +596,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   armon.go-metrics = buildGoPackage rec {
-    rev = "02567bbc4f518a43853d262b651a3c8257c3f141";
+    rev = "a54701ebec11868993bc198c3f315353e9de2ed6";
     name = "armon.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/armon/go-metrics";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "armon";
       repo = "go-metrics";
-      sha256 = "08fk3zmw0ywmdfp2qhrpv0vrk1y97hzqczrgr3y2yip3x8sr37ar";
+      sha256 = "0ia9i96nac7vnmf5qb98rs74npf3vg55kdsvmql8cwgfpmqqcfdh";
     };
+
+    buildInputs = [ prometheus.client_golang ];
   };
 
   go-msgpack = buildGoPackage rec {
@@ -605,6 +647,32 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  go-querystring = buildGoPackage rec {
+    rev = "547ef5ac979778feb2f760cdb5f4eae1a2207b86";
+    name = "go-querystring-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/google/go-querystring";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "google";
+      repo = "go-querystring";
+      sha256 = "00ani7fhydcmlsm3n93nmj1hcqp2wmzvihnb1gdzynif1hw0530y";
+    };
+  };
+
+  go-radix = buildGoPackage rec {
+    rev = "0bab926c3433cfd6490c6d3c504a7b471362390c";
+    name = "go-radix-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/armon/go-radix";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "armon";
+      repo = "go-radix";
+      sha256 = "0llq96lxh7p9426hjii8k42kq0cp1hflawh1kjwhbmi5g0jrq04d";
+    };
+  };
+
   go-runit = buildGoPackage rec {
     rev = "a9148323a615e2e1c93b7a9893914a360b4945c8";
     name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}";
@@ -709,6 +777,21 @@ let self = _self // overrides; _self = with self; {
     subPackages = [ "./" ];
   };
 
+  grpc = buildGoPackage rec {
+    rev = "f5ebd86be717593ab029545492c93ddf8914832b";
+    name = "grpc-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "google.golang.org/grpc";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "grpc";
+      repo = "grpc-go";
+      sha256 = "07dfpwwk68rrhxmqj69gq2ncsf3kfmn0zhlwscda0gc5gb57n5x1";
+    };
+
+    propagatedBuildInputs = [ http2 glog x.net protobuf x.oauth2 ];
+  };
+
   hologram = buildGoPackage rec {
     rev  = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c";
     name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
@@ -722,6 +805,21 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ];
   };
 
+  http2 = buildGoPackage rec {
+    rev = "f8202bc903bda493ebba4aa54922d78430c2c42f";
+    name = "http2-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/bradfitz/http2";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "bradfitz";
+      repo = "http2";
+      sha256 = "0cza2126jbji5vijwk4dxs05hifnff04xcr0vhxvafs6hz3sacvr";
+    };
+
+    buildInputs = [ crypto ];
+  };
+
   httprouter = buildGoPackage rec {
     rev = "bde5c16eb82ff15a1734a3818d9b9547065f65b1";
     name = "httprouter-${stdenv.lib.strings.substring 0 7 rev}";
@@ -898,6 +996,34 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  mysql = buildGoPackage rec {
+    rev = "0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b";
+    name = "mysql-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/go-sql-driver/mysql";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "go-sql-driver";
+      repo = "mysql";
+      sha256 = "0ydvd0mk53793sj3hgycsx926zvzxipxvppld1i175g3pn4d41xp";
+    };
+  };
+
+  x.net = buildGoPackage rec {
+    rev = "e0403b4e005737430c05a57aac078479844f919c";
+    name = "net-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "golang.org/x/net";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "golang";
+      repo = "net";
+      sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp";
+    };
+
+    buildInputs = [ x.text ];
+  };
+
   ntp = buildGoPackage rec {
     rev = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     name = "ntp-${stdenv.lib.strings.substring 0 7 rev}";
@@ -910,6 +1036,25 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  x.oauth2 = buildGoPackage rec {
+    rev = "f98d0160877ab4712b906626425ed8b0b320907c";
+    name = "oauth2-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "golang.org/x/oauth2";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "golang";
+      repo = "oauth2";
+      sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i";
+    };
+
+    extraSrcs = [
+      { inherit (gcloud-golang) src goPackagePath; }
+    ];
+
+    buildInputs = [ x.net ];
+  };
+
   oglematchers = buildGoPackage rec {
     rev = "4fc24f97b5b74022c2a3f4ca7eed57ca29083d3e";
     name = "oglematchers-${stdenv.lib.strings.substring 0 7 rev}";
@@ -977,6 +1122,7 @@ let self = _self // overrides; _self = with self; {
     rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
     name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/beorn7/perks";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "beorn7";
@@ -1013,21 +1159,23 @@ let self = _self // overrides; _self = with self; {
 
   prometheus.client_golang = buildGoPackage rec {
     name = "prometheus-client-${version}";
-    version = "0.3.2";
+    version = "0.5.0";
     goPackagePath = "github.com/prometheus/client_golang";
+
     src = fetchFromGitHub {
       owner = "prometheus";
       repo = "client_golang";
       rev = "${version}";
-      sha256 = "1fn56zp420hxpm0prr76yyhh62zq3sqj3ppl2r4qxjc78f8ckbj4";
+      sha256 = "0aaf20iv797dj2vr5lnqk006aw7n0cclmxlpk8xy6c6nrn6fm3nv";
     };
+
     propagatedBuildInputs = [
+      goautoneg
       protobuf
       golang_protobuf_extensions
       prometheus.client_model
       prometheus.procfs
       beorn7.perks
-      goautoneg
     ];
   };
 
@@ -1045,14 +1193,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   prometheus.procfs = buildGoPackage rec {
-    rev = "92faa308558161acab0ada1db048e9996ecec160";
+    rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d";
     name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/prometheus/procfs";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "prometheus";
       repo = "procfs";
-      sha256 = "0kaw81z2yi45f6ll6n2clr2zz60bdgdxzqnxvd74flynz4sr0p1v";
+      sha256 = "0hxssp6h1cs7l2cvnxj1hyacy3328hhpi1pd123f2a57aikha9ff";
     };
   };
 
@@ -1180,6 +1329,19 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ pty ];
   };
 
+  x.text = buildGoPackage rec {
+    rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e";
+    name = "text-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "golang.org/x/text";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "golang";
+      repo = "text";
+      sha256 = "1yvmllriqjm0k97vnxycz9q0likvh18a68xbyg1k6ddkvn9sy03y";
+    };
+  };
+
   toml = buildGoPackage rec {
     rev = "f87ce853111478914f0bcffa34d43a93643e6eda";
     name = "toml-${stdenv.lib.strings.substring 0 7 rev}";

From 5219d3e3d14d761c3fea8f6d83a1dd3667d5c294 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 14 May 2015 18:28:16 -0700
Subject: [PATCH 0854/1143] goPackages: Update and add some packages

---
 pkgs/top-level/go-packages.nix | 179 ++++++++++++++++++++++-----------
 1 file changed, 122 insertions(+), 57 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 79371696d20f..3373ebdef2f8 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -46,17 +46,40 @@ let self = _self // overrides; _self = with self; {
   };
 
   net = buildGoPackage rec {
-    rev = "3338d5f109e9";
-    name = "go.net-${rev}";
-    goPackagePath = "code.google.com/p/go.net";
-    src = fetchhg {
+    rev = "e0403b4e005737430c05a57aac078479844f919c";
+    name = "net-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "golang.org/x/net";
+
+    src = fetchFromGitHub {
       inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "0yz807y3ac07x3nf0qlaw1w1i6asynrpyssjl8jyv3pplww0qj7i";
+      owner = "golang";
+      repo = "net";
+      sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp";
     };
+
     propagatedBuildInputs = [ text ];
   };
 
+  oauth2 = buildGoPackage rec {
+    rev = "f98d0160877ab4712b906626425ed8b0b320907c";
+    name = "oauth2-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "golang.org/x/oauth2";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "golang";
+      repo = "oauth2";
+      sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i";
+    };
+
+    extraSrcs = [
+      { inherit (gcloud-golang) src goPackagePath; }
+    ];
+
+    buildInputs = [ net ];
+  };
+
+
   protobuf = buildGoPackage rec {
     rev = "efd7476481382c195beb33acd8ec2f1527167fb4";
     name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}";
@@ -73,17 +96,19 @@ let self = _self // overrides; _self = with self; {
   };
 
   text = buildGoPackage rec {
-    rev = "024681b033be";
-    name = "go.text-${rev}";
-    goPackagePath = "code.google.com/p/go.text";
-    src = fetchhg {
+    rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e";
+    name = "text-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "golang.org/x/text";
+
+    src = fetchFromGitHub {
       inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "19px5pw5mvwjb7ymivfkkkr6cyl2npv834jxlr6y0x5ca1djhsci";
+      owner = "golang";
+      repo = "text";
+      sha256 = "1yvmllriqjm0k97vnxycz9q0likvh18a68xbyg1k6ddkvn9sy03y";
     };
-    doCheck = false;
   };
 
+
   tools = buildGoPackage rec {
     rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8";
     name = "go.tools-${stdenv.lib.strings.substring 0 7 rev}";
@@ -98,6 +123,19 @@ let self = _self // overrides; _self = with self; {
 
   ## THIRD PARTY
 
+  ansicolor = buildGoPackage rec {
+    rev = "8368d3b31cf6f2c2464c7a91675342c9a0ac6658";
+    name = "ansicolor-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/shiena/ansicolor";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "shiena";
+      repo   = "ansicolor";
+      sha256 = "1fyn06vxm44s0ph8pr7r9gkab1f4x851zlyy3p6jbbwsa6an8g9w";
+    };
+  };
+
   asn1-ber = buildGoPackage rec {
     rev = "ec51d5ed21377b4023ca7b1e70ae4cb296ee6047";
     name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}";
@@ -110,6 +148,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  aws-sdk-go = buildGoPackage rec {
+    rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503";
+    name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/awslabs/aws-sdk-go";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "awslabs";
+      repo   = "aws-sdk-go";
+      sha256 = "1725y3aic53l8ms0583gdn0s915y1b783hs339qll0mmx7v09in5";
+    };
+
+    buildInputs = [ go-ini gucumber testify ];
+  };
+
   binarydist = buildGoPackage rec {
     rev = "9955b0ab8708602d411341e55fffd7e0700f86bd";
     name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}";
@@ -272,6 +325,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  gcloud-golang = buildGoPackage rec {
+    rev = "de1c38e5af44da22abe7c3b14a1edcf6264dae55";
+    name = "gcloud-golang-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "google.golang.org/cloud";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "GoogleCloudPlatform";
+      repo = "gcloud-golang";
+      sha256 = "0n6sh1zblixwyc9ykbsknmadsx2dmn3b5rsyrs30id1f96pgh4l0";
+    };
+
+    buildInputs = [ net oauth2 protobuf google-api-go-client grpc ];
+  };
+
   ginkgo = buildGoPackage rec {
     rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2";
     name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}";
@@ -405,7 +473,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1496h0xc7vjklr4m4j7vy1764k1qk2grpcwz5zssgplpfs9s9wfz";
     };
 
-    buildInputs = [ x.net ];
+    buildInputs = [ net ];
   };
 
   gosnappy = buildGoPackage rec {
@@ -529,7 +597,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "123ck9nf5ggdrndg2gs1bhr4ysh4z0izph9sp7ciisxpgjkaycxq";
     };
 
-    buildInputs = [ go-querystring x.oauth2 ];
+    buildInputs = [ go-querystring oauth2 ];
   };
 
   go-homedir = buildGoPackage rec {
@@ -581,6 +649,22 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ go-systemd osext ];
   };
 
+  gucumber = buildGoPackage rec {
+    rev = "fba94dc5a9077fa81eb85199fa9dfdaa8af82ab5";
+    name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/lsegal/gucumber";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "lsegal";
+      repo = "gucumber";
+      sha256 = "028wczwpicwmggk3221pz8ffzh30l47x8217gvdzcqq6h9iiaczr";
+    };
+
+    buildInputs = [ testify ];
+    propagatedBuildInputs = [ ansicolor ];
+  };
+
   rcrowley.go-metrics = buildGoPackage rec {
     rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
     name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
@@ -789,7 +873,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "07dfpwwk68rrhxmqj69gq2ncsf3kfmn0zhlwscda0gc5gb57n5x1";
     };
 
-    propagatedBuildInputs = [ http2 glog x.net protobuf x.oauth2 ];
+    propagatedBuildInputs = [ http2 glog net protobuf oauth2 ];
   };
 
   hologram = buildGoPackage rec {
@@ -1009,21 +1093,6 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  x.net = buildGoPackage rec {
-    rev = "e0403b4e005737430c05a57aac078479844f919c";
-    name = "net-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "golang.org/x/net";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "net";
-      sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp";
-    };
-
-    buildInputs = [ x.text ];
-  };
-
   ntp = buildGoPackage rec {
     rev = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     name = "ntp-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1036,23 +1105,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  x.oauth2 = buildGoPackage rec {
-    rev = "f98d0160877ab4712b906626425ed8b0b320907c";
-    name = "oauth2-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "golang.org/x/oauth2";
+  objx = buildGoPackage rec {
+    rev = "cbeaeb16a013161a98496fad62933b1d21786672";
+    name = "objx-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/stretchr/objx";
 
     src = fetchFromGitHub {
       inherit rev;
-      owner = "golang";
-      repo = "oauth2";
-      sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i";
+      owner = "stretchr";
+      repo = "objx";
+      sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1";
     };
-
-    extraSrcs = [
-      { inherit (gcloud-golang) src goPackagePath; }
-    ];
-
-    buildInputs = [ x.net ];
   };
 
   oglematchers = buildGoPackage rec {
@@ -1316,6 +1379,21 @@ let self = _self // overrides; _self = with self; {
     subPackages = [ "./" ]; # prevent building _demos
   };
 
+  testify = buildGoPackage rec {
+    rev = "dab07ac62d4905d3e48d17dc549c684ac3b7c15a";
+    name = "testify-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/stretchr/testify";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "stretchr";
+      repo = "testify";
+      sha256 = "0r24v9ly3g68ywqyri14fn8smvkw8zvrzbivxw3ndd6jxcvi84b7";
+    };
+
+    buildInputs = [ objx ];
+  };
+
   kr.text = buildGoPackage rec {
     rev = "6807e777504f54ad073ecef66747de158294b639";
     name = "kr.text-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1329,19 +1407,6 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ pty ];
   };
 
-  x.text = buildGoPackage rec {
-    rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e";
-    name = "text-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "golang.org/x/text";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "text";
-      sha256 = "1yvmllriqjm0k97vnxycz9q0likvh18a68xbyg1k6ddkvn9sy03y";
-    };
-  };
-
   toml = buildGoPackage rec {
     rev = "f87ce853111478914f0bcffa34d43a93643e6eda";
     name = "toml-${stdenv.lib.strings.substring 0 7 rev}";

From 01d7d24dbb2df5e70c460dc7e5c59f30979cd82a Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 23:26:16 -0400
Subject: [PATCH 0855/1143] libdvdnav: 4.2.1 -> 5.0.3

Keeping the old version around for now in order to support mplayer.
---
 pkgs/applications/video/vlc/default.nix       |  1 +
 .../development/libraries/libdvdnav/4.2.1.nix | 31 +++++++++++++++++++
 .../libraries/libdvdnav/default.nix           | 20 ++++--------
 .../libraries/libdvdread/4.9.9.nix            | 25 +++++++++++++++
 .../libraries/libdvdread/default.nix          | 11 ++++---
 pkgs/top-level/all-packages.nix               |  5 +++
 6 files changed, 74 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/libraries/libdvdnav/4.2.1.nix
 create mode 100644 pkgs/development/libraries/libdvdread/4.9.9.nix

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 6a1e9552d3c6..a404ba0d1a8a 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
       "--enable-dc1394"
       "--enable-ncurses"
       "--enable-vdpau"
+      "--enable-dvdnav"
     ]
     ++ optional onlyLibVLC  "--disable-vlc";
 
diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix
new file mode 100644
index 000000000000..9b4e912772b5
--- /dev/null
+++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, pkgconfig, libdvdread}:
+
+stdenv.mkDerivation {
+  name = "libdvdnav-4.2.1";
+  
+  src = fetchurl {
+    url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
+    sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [libdvdread];
+
+  configureScript = "./configure2"; # wtf?
+
+  preConfigure = ''
+    mkdir -p $out
+  '';
+
+  # From Handbrake
+  patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
+
+  meta = {
+    homepage = http://dvdnav.mplayerhq.hu/;
+    description = "A library that implements DVD navigation features such as DVD menus";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.wmertens ];
+  };
+
+  passthru = { inherit libdvdread; };
+}
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index 9b4e912772b5..fe625aa69e12 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -1,25 +1,17 @@
 {stdenv, fetchurl, pkgconfig, libdvdread}:
 
-stdenv.mkDerivation {
-  name = "libdvdnav-4.2.1";
-  
+stdenv.mkDerivation rec {
+  name = "libdvdnav-${version}";
+  version = "5.0.3";
+
   src = fetchurl {
-    url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
-    sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
+    url = "http://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2";
+    sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [libdvdread];
 
-  configureScript = "./configure2"; # wtf?
-
-  preConfigure = ''
-    mkdir -p $out
-  '';
-
-  # From Handbrake
-  patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
-
   meta = {
     homepage = http://dvdnav.mplayerhq.hu/;
     description = "A library that implements DVD navigation features such as DVD menus";
diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix
new file mode 100644
index 000000000000..eb5a48a99f12
--- /dev/null
+++ b/pkgs/development/libraries/libdvdread/4.9.9.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, libdvdcss}:
+
+stdenv.mkDerivation {
+  name = "libdvdread-4.9.9";
+  
+  src = fetchurl {
+    url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz;
+    sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
+  };
+
+  buildInputs = [libdvdcss];
+
+  NIX_LDFLAGS = "-ldvdcss";
+
+  postInstall = ''
+    ln -s dvdread $out/include/libdvdread
+  '';
+
+  meta = {
+    homepage = http://dvdnav.mplayerhq.hu/;
+    description = "A library for reading DVDs";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.wmertens ];
+  };
+}
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index eb5a48a99f12..311bc6dc4058 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, libdvdcss}:
 
-stdenv.mkDerivation {
-  name = "libdvdread-4.9.9";
-  
+stdenv.mkDerivation rec {
+  name = "libdvdread-${version}";
+  version = "5.0.2";
+
   src = fetchurl {
-    url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz;
-    sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
+    url = "http://download.videolan.org/pub/videolan/libdvdread/${version}/libdvdread-${version}.tar.bz2";
+    sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf";
   };
 
   buildInputs = [libdvdcss];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9704b4ce9458..713c725f5488 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6535,8 +6535,12 @@ let
   libdvdcss = callPackage ../development/libraries/libdvdcss { };
 
   libdvdnav = callPackage ../development/libraries/libdvdnav { };
+  libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix {
+    libdvdread = libdvdread_4_9_9;
+  };
 
   libdvdread = callPackage ../development/libraries/libdvdread { };
+  libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };
 
   libdwarf = callPackage ../development/libraries/libdwarf { };
 
@@ -11623,6 +11627,7 @@ let
 
   mplayer = callPackage ../applications/video/mplayer ({
     pulseSupport = config.pulseaudio or false;
+    libdvdnav = libdvdnav_4_2_1;
   } // (config.mplayer or {}));
 
   MPlayerPlugin = browser:

From be03eefc9c55b723310d7b2970b8f62ca70344a1 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Thu, 14 May 2015 21:51:07 -0700
Subject: [PATCH 0856/1143] gnutls: only demand trousers on linux

---
 pkgs/development/libraries/gnutls/generic.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 930713f59873..6f2361f1658a 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp trousers unbound ]
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ]
+    ++ stdenv.lib.optional stdenv.isLinux trousers
+    ++ [ unbound ]
     ++ stdenv.lib.optional guileBindings guile;
 
   nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
   doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
 
   # Fixup broken libtool and pkgconfig files
-  preFixup = ''
+  preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
         -e 's,-lz,-L${zlib}/lib -lz,' \
         -e 's,-lgmp,-L${gmp}/lib -lgmp,' \

From 229c442e2cf004c239ef84936d37134f60ef4ea0 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Fri, 15 May 2015 01:40:10 -0400
Subject: [PATCH 0857/1143] libpsl: add darwin to meta.platforms

---
 pkgs/development/libraries/libpsl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index f1c54d5cf5fd..d642309ed746 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://rockdaboot.github.io/libpsl/;
     license = with licenses; mit;
-    platforms = with platforms; linux;
+    platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ nckx ];
   };
 

From 9579fecd28c795cd31b5c998a0d994a2e316a538 Mon Sep 17 00:00:00 2001
From: Michael Phillips <michaelalanphillips@gmail.com>
Date: Wed, 13 May 2015 21:09:52 -0500
Subject: [PATCH 0858/1143] pyblosxom: new package

---
 pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1803625f6f4a..36feab0056e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9073,6 +9073,28 @@ let
     };
   };
 
+  pyblosxom = buildPythonPackage rec {
+    name = "pyblosxom-${version}";
+    disabled = isPy3k;
+    version = "1.5.3";
+    # FAIL:test_generate_entry and test_time
+    # both tests fail due to time issue that doesn't seem to matter in practice
+    doCheck = false; 
+    src = pkgs.fetchurl {
+      url = "https://github.com/pyblosxom/pyblosxom/archive/v${version}.tar.gz";
+      sha256 = "0de9a7418f4e6d1c45acecf1e77f61c8f96f036ce034493ac67124626fd0d885";
+    };
+  
+    propagatedBuildInputs = with self; [ pygments markdown ];
+
+    meta = with stdenv.lib; {
+      homepage = "http://pyblosxom.github.io";
+      description = "File-based blogging engine";
+      license = licenses.mit;
+    };
+  };
+
+
   pycapnp = buildPythonPackage rec {
     name = "pycapnp-0.5.1";
     disabled = isPyPy || isPy3k;

From 871b472c66174fdc653b087804a11ddb224eae32 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 15 May 2015 10:04:08 +0200
Subject: [PATCH 0859/1143] update zdoom to v2.7.1

---
 pkgs/games/zdoom/default.nix | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index 59a88191d2e4..0bc63855299e 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -1,24 +1,25 @@
-{stdenv, fetchurl, cmake, SDL, nasm, p7zip, zlib, flac, fmod, libjpeg}:
+{ stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL }:
 
 stdenv.mkDerivation {
-  name = "zdoom-2.6.1";
-  src = fetchurl {
-    url = http://zdoom.org/files/zdoom/2.6/zdoom-2.6.1-src.7z;
-    sha256 = "1ha7hygwf243vkgw0dfh4dxphf5vffb3kkci1p1p75a7r1g1bir8";
+  name = "zdoom-2.7.1";
+  src = fetchFromGitHub {
+    #url = "https://github.com/rheit/zdoom";
+    owner = "rheit";
+    repo = "zdoom";
+    rev = "2.7.1";
+    sha256 = "00bx4sgl9j1dyih7yysfq4ah6msxw8580g53p99jfym34ky5ppkh";
   };
 
-  # XXX: shouldn't inclusion of p7zip handle this?
-  unpackPhase = ''
-  mkdir zdoom
-  cd zdoom
-  7z x $src
-  '';
+  buildInputs = [ cmake fmod mesa SDL ];
 
-  buildInputs = [cmake nasm SDL p7zip zlib flac fmod libjpeg];
+  cmakeFlags = [
+    "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so"
+    "-DSDL_INCLUDE_DIR=${SDL}/include"
+  ];
 
-  cmakeFlags = [ "-DSDL_INCLUDE_DIR=${SDL}/include/SDL" ];
+  NIX_CFLAGS_COMPILE = [ "-I ${SDL}/include/SDL" ];
    
-  preConfigure=''
+  preConfigure = ''
     sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h
  '';
 
@@ -32,6 +33,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://zdoom.org/;
     description = "Enhanced port of the official DOOM source code";
+    maintainer = [ stdenv.lib.maintainers.lassulus ];
   };
 }
 

From 72c7c683d10650b1ef9d805a84c6fd33bba35427 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 15 May 2015 10:09:47 +0200
Subject: [PATCH 0860/1143] calibre: update from 2.27.0 to 2.28.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 0f9dbf8d4223..3d0bac560c08 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.27.0";
+  name = "calibre-2.28.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "13id1r2q6alw4wzb4z0njkyr6lsmzs2fjp3cflqavx3qk25darv5";
+    sha256 = "15sb74v0nlj45fhlnw1afll35l90cxw78s15fb2nx3fih7ahv3cf";
   };
 
   inherit python;

From ede16069331576981903900caabc2e1b0c0113f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 10:59:46 +0200
Subject: [PATCH 0861/1143] gwenhywfar: build with gnutls33 to avoid linker
 errors

./.libs/libgwenhywfar.so: undefined reference to `gnutls_protocol_set_priority'
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9704b4ce9458..069e230dd144 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6214,7 +6214,7 @@ let
 
   gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; };
 
-  gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
+  gwenhywfar = callPackage ../development/libraries/gwenhywfar { gnutls = gnutls33; };
 
   hamlib = callPackage ../development/libraries/hamlib { };
 

From 1b8a35b7fa827ccf488c5e52026ca9b9824b9535 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 11:01:21 +0200
Subject: [PATCH 0862/1143] gwenhywfar: update to version 4.11.1

---
 pkgs/development/libraries/gwenhywfar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix
index b8ad34427291..b6cd2e54768f 100644
--- a/pkgs/development/libraries/gwenhywfar/default.nix
+++ b/pkgs/development/libraries/gwenhywfar/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "gwenhywfar-4.10.0beta";
+  name = "gwenhywfar-4.11.1";
 
   src = fetchurl {
-    url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-4.10.0beta.tar.gz";
+    url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=${name}.tar.gz";
     name = "${name}.tar.gz";
-    sha256 = "1ihg2s263g540hl42y6g9wqcc4am70kv01yivsqfrpa9fnhbxm7f";
+    sha256 = "0ay79vc03jsw762nax204g112yg5sak340g31bm4hm93q69aiv2b";
   };
 
   propagatedBuildInputs = [ gnutls libgcrypt ];

From f66cd5dbe99b4343df58d26e0a48b87c6f471c22 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 11:01:42 +0200
Subject: [PATCH 0863/1143] aqbanking: update to version 5.5.1

---
 pkgs/development/libraries/aqbanking/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 226f792c45a4..9d4761c3da86 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aqbanking-5.4.0beta";
+  name = "aqbanking-5.5.1";
 
   src = fetchurl {
-    url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=112&file=01&dummy=aqbanking-5.4.0beta.tar.gz";
+    url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=${name}.tar.gz";
     name = "${name}.tar.gz";
-    sha256 = "0yd588sw9grc2c0bfyx8h39mr30pa1zxrcbv31p6pz6szilk2agh";
+    sha256 = "1pxd5xv2xls1hyizr1vbknzgb66babhlp72777rcxq46gp91g3r3";
   };
 
   buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ];

From 58b865cfc65e7756c148f38d25cb3d6b6f077a4d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 15 May 2015 11:02:01 +0200
Subject: [PATCH 0864/1143] go: remove renameImports and use goPackageAliases

---
 doc/language-support.xml                      | 31 +++++++++----------
 pkgs/applications/networking/pond/default.nix |  5 ---
 .../go-modules/generic/default.nix            | 23 ++++++++++----
 pkgs/top-level/go-packages.nix                |  4 +++
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 87f500a491ba..5942fe01e2ed 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -662,18 +662,16 @@ standard Go packages.
 <programlisting>
 net = buildGoPackage rec {
   name = "go.net-${rev}";
-  goPackagePath = "code.google.com/p/go.net"; <co xml:id='ex-buildGoPackage-1' />
+  goPackagePath = "golang.org/x/net"; <co xml:id='ex-buildGoPackage-1' />
   subPackages = [ "ipv4" "ipv6" ]; <co xml:id='ex-buildGoPackage-2' />
-  rev = "28ff664507e4";
-  src = fetchhg {
+  rev = "e0403b4e005";
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://${goPackagePath}";
-    sha256 = "1lkz4c9pyz3yz2yz18hiycvlfhgy3jxp68bs7mv7bcfpaj729qav";
+    owner = "golang";
+    repo = "net";
+    sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp";
   };
-  renameImports = [ <co xml:id='ex-buildGoPackage-3' />
-    "code.google.com/p/go.crypto golang.org/x/crypto"
-    "code.google.com/p/goprotobuf github.com/golang/protobuf"
-  ];
+  goPackageAliases = [ "code.google.com/p/go.net" ]; <co xml:id='ex-buildGoPackage-3' />
   propagatedBuildInputs = [ goPackages.text ]; <co xml:id='ex-buildGoPackage-4' />
   buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-5' />
 };
@@ -703,17 +701,18 @@ the following arguments are of special significance to the function:
     </para>
   </callout>
 
-  <callout arearefs='ex-buildGoPackage-4'>
+  <callout arearefs='ex-buildGoPackage-3'>
     <para>
-      <varname>renameImports</varname> is a list of import paths to be renamed before
-      building the package. The path to be renamed can be a regular expression.
+      <varname>goPackageAliases</varname> is a list of alternative import paths
+      that are valid for this library.
+      Packages that depend on this library will automatically rename
+      import paths that match any of the aliases to <literal>goPackagePath</literal>.
     </para>
     <para>
       In this example imports will be renamed from
-      <literal>code.google.com/p/go.crypto</literal> to
-      <literal>golang.org/x/crypto</literal> and from
-      <literal>code.google.com/p/goprotobuf</literal> to
-      <literal>github.com/golang/protobuf</literal>.
+      <literal>code.google.com/p/go.net</literal> to
+      <literal>golang.org/x/net</literal> in every package that depend on the
+      <literal>go.net</literal> library.
     </para>
   </callout>
 
diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix
index 4ac3a0448dea..21d99013a1a0 100644
--- a/pkgs/applications/networking/pond/default.nix
+++ b/pkgs/applications/networking/pond/default.nix
@@ -14,11 +14,6 @@ buildGoPackage rec {
 
   subPackages = [ "client" ];
 
-  renameImports = [
-    "code.google.com/p/go.crypto golang.org/x/crypto"
-    "code.google.com/p/goprotobuf github.com/golang/protobuf"
-  ];
-
   buildInputs = [ trousers net crypto protobuf ed25519 govers ];
     
   buildFlags = "--tags nogui";
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 6d52d0cc92f8..271e0ed66336 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -5,18 +5,25 @@
 # Go import path of the package
 , goPackagePath
 
+# Go package aliases
+, goPackageAliases ? [ ]
+
 # Extra sources to include in the gopath
 , extraSrcs ? [ ]
 
+, dontRenameImports ? false
+
 , meta ? {}, ... } @ args':
 
 let
   args = lib.filterAttrs (name: _: name != "extraSrcs") args';
 in
 
-go.stdenv.mkDerivation ( args // {
+go.stdenv.mkDerivation (
+  (builtins.removeAttrs args [ "goPackageAliases" ]) // {
+
   name = "go${go.meta.branch}-${name}";
-  buildInputs = [ go ] ++ buildInputs ++ (lib.optional (args ? renameImports) govers) ;
+  buildInputs = [ go ] ++ buildInputs ++ (lib.optional (!dontRenameImports) govers) ;
 
   configurePhase = args.configurePhase or ''
     runHook preConfigure
@@ -40,10 +47,12 @@ go.stdenv.mkDerivation ( args // {
     runHook postConfigure
   '';
 
-  renameImports = lib.optionalString (args ? renameImports)
-                    (lib.concatMapStringsSep "\n"
-                      (cmdargs: "govers -m ${cmdargs}")
-                      args.renameImports);
+  renameImports = args.renameImports or (
+    let
+      inputsWithAliases = lib.filter (x: x ? goPackageAliases) buildInputs;
+      rename = to: from: "echo Renaming '${from}' to '${to}'; govers -m ${from} ${to}";
+      renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases;
+    in lib.concatMapStringsSep "\n" renames inputsWithAliases);
 
   buildPhase = args.buildPhase or ''
     runHook preBuild
@@ -107,6 +116,8 @@ go.stdenv.mkDerivation ( args // {
     runHook postInstall
   '';
 
+  passthru = lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
+
   meta = meta // {
     # add an extra maintainer to every package
     maintainers = (meta.maintainers or []) ++
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3373ebdef2f8..035c152b6b18 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -13,6 +13,7 @@ let self = _self // overrides; _self = with self; {
     rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02";
     name = "go-crypto-${rev}";
     goPackagePath = "golang.org/x/crypto";
+    goPackageAliases = [ "code.google.com/p/go.crypto" ];
 
     src = fetchFromGitHub {
       inherit rev;
@@ -49,6 +50,7 @@ let self = _self // overrides; _self = with self; {
     rev = "e0403b4e005737430c05a57aac078479844f919c";
     name = "net-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "golang.org/x/net";
+    goPackageAliases = [ "code.google.com/p/go.net" ];
 
     src = fetchFromGitHub {
       inherit rev;
@@ -84,6 +86,7 @@ let self = _self // overrides; _self = with self; {
     rev = "efd7476481382c195beb33acd8ec2f1527167fb4";
     name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/golang/protobuf";
+    goPackageAliases = [ "code.google.com/p/goprotobuf" ];
 
     src = fetchFromGitHub {
       inherit rev;
@@ -409,6 +412,7 @@ let self = _self // overrides; _self = with self; {
     rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
     name = "govers-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/rogpeppe/govers";
+    dontRenameImports = true;
     src = fetchFromGitHub {
       inherit rev;
       owner = "rogpeppe";

From 07535a01aa9e61d857edc2569d59d9db96d387ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 May 2015 20:44:53 +0200
Subject: [PATCH 0865/1143] haskell-gnutls: revert to GNUTLS 3.3

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c444b38d7a49..aba1a3bf161a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -801,4 +801,7 @@ self: super: {
   # https://github.com/bos/aeson/issues/253
   aeson = dontCheck super.aeson;
 
+  # GNUTLS 3.4 causes linker errors: http://hydra.cryp.to/build/839563/nixlog/2/raw
+  gnutls = super.gnutls.override { gnutls = pkgs.gnutls33; };
+
 }

From 274d17defabddc66cf9f1b35a9c6f86197218044 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 May 2015 20:23:37 +0200
Subject: [PATCH 0866/1143] darcs: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index aba1a3bf161a..7adeb92ab156 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -155,7 +155,7 @@ self: super: {
   # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
   darcs = overrideCabal super.darcs (drv: {
     doCheck = false;            # The test suite won't even start.
-    patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal";
+    patchPhase = "sed -i -e 's|attoparsec.*,|attoparsec,|' darcs.cabal";
   });
 
   # Needs the latest version of QuickCheck to compile.

From 6a0d21eb86105ac8e631621e9425eabbab3c0a1d Mon Sep 17 00:00:00 2001
From: Jussi Maki <jussi.maki@vilea.ch>
Date: Wed, 13 May 2015 08:31:32 +0000
Subject: [PATCH 0867/1143] VMWare guest support and open-vm-tools package

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/virtualisation/vmware-guest.nix | 47 +++++++++++++++++++
 .../virtualization/open-vm-tools/default.nix  | 43 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 4 files changed, 96 insertions(+)
 create mode 100644 nixos/modules/virtualisation/vmware-guest.nix
 create mode 100644 pkgs/applications/virtualization/open-vm-tools/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bf70715cea4c..c1677ff05731 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -460,5 +460,6 @@
   ./virtualisation/openvswitch.nix
   ./virtualisation/parallels-guest.nix
   ./virtualisation/virtualbox-guest.nix
+  ./virtualisation/vmware-guest.nix
   ./virtualisation/xen-dom0.nix
 ]
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
new file mode 100644
index 000000000000..3f19f6a28b2b
--- /dev/null
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.vmwareGuest;
+  open-vm-tools = pkgs.open-vm-tools;
+in
+{
+  options = {
+    services.vmwareGuest.enable = mkEnableOption "Enable VMWare Guest Support";
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [ {
+      assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
+      message = "VMWare guest is not currently supported on ${pkgs.stdenv.system}";
+    } ];
+
+    environment.systemPackages = [ open-vm-tools ];
+
+    systemd.services.vmware =
+      { description = "VMWare Guest Service";
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
+      };
+
+    services.xserver = {
+      videoDrivers = mkOverride 50 [ "vmware" ];
+
+      config = ''
+          Section "InputDevice"
+            Identifier "VMMouse"
+            Driver "vmmouse"
+          EndSection
+        '';
+
+      serverLayoutSection = ''
+          InputDevice "VMMouse"
+        '';
+
+      displayManager.sessionCommands = ''
+          ${open-vm-tools}/bin/vmware-user-suid-wrapper
+        '';
+    };
+  };
+}
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
new file mode 100644
index 000000000000..4f32ec55a0e1
--- /dev/null
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake,
+  libmspack, openssl, pam, xercesc, icu, libdnet, procps, 
+  x11, libXinerama, libXi, libXrender, libXrandr, libXtst,
+  pkgconfig, glib, gtk, gtkmm }:
+
+let
+  majorVersion = "9.10";
+  minorVersion = "0";
+  patchSet = "2476743";
+  version = "${majorVersion}.${minorVersion}-${patchSet}";
+
+in stdenv.mkDerivation {
+  name = "open-vm-tools-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/project/open-vm-tools/open-vm-tools/stable-${majorVersion}.x/open-vm-tools-${version}.tar.gz";
+    sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1";
+  };
+
+  buildInputs = 
+    [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps
+      pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ];
+
+  patchPhase = ''
+     sed -i s,-Werror,,g configure.ac
+     sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
+     sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
+  '';
+
+  preConfigure = "autoreconf";
+  configureFlags = "--without-kernel-modules --without-xmlsecurity";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/vmware/open-vm-tools";
+    description = "Set of tools for VMWare guests to improve host-guest interaction";
+    longDescription = ''
+      A set of services and modules that enable several features in VMware products for 
+      better management of, and seamless user interactions with, guests. 
+    '';
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ joamaki ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00737083a7b3..2c5433784d1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9547,6 +9547,11 @@ let
 
   numactl = callPackage ../os-specific/linux/numactl { };
 
+  open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { 
+    inherit (xlibs) libXinerama libXi libXrender libXrandr libXtst;
+    inherit (gnome) gtk gtkmm;
+  };
+
   gocode = callPackage ../development/tools/gocode { };
 
   gotags = callPackage ../development/tools/gotags { };

From c80638905d03e53a4f51db30510b7c1a9b7773e2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 May 2015 12:32:33 -0500
Subject: [PATCH 0868/1143] Upgrade to kde-frameworks-5.10

---
 .../default.nix                               |    0
 .../dependencies.nix                          |   10 +-
 .../dependencies.sh                           |    0
 .../0001-extra-cmake-modules-paths.patch      |    0
 .../kauth/kauth-policy-install.patch          |    0
 ...utils-pluginselector-follow-symlinks.patch |    0
 ...igwidgets-helpclient-follow-symlinks.patch |    0
 .../kdoctools-no-find-docbook-xml.patch       |    0
 .../kinit/kinit-libpath.patch                 |    0
 .../kpackage/0001-allow-external-paths.patch  |    0
 ...service-kbuildsycoca-follow-symlinks.patch |    0
 ...ce-kbuildsycoca-no-canonicalize-path.patch |    0
 .../0001-no-qcoreapplication.patch            |    0
 .../kde-frameworks-5.10/manifest.nix          | 1174 +++++++++++++++++
 .../manifest.sh                               |    7 +-
 .../plasma-framework-external-paths.patch     |    0
 .../renames.nix                               |    0
 .../setup-hook.sh                             |    0
 .../libraries/kde-frameworks-5.9/manifest.nix |  589 ---------
 pkgs/top-level/all-packages.nix               |   10 +-
 20 files changed, 1189 insertions(+), 601 deletions(-)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/dependencies.nix (97%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/dependencies.sh (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/extra-cmake-modules/0001-extra-cmake-modules-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kauth/kauth-policy-install.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kcmutils/kcmutils-pluginselector-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kinit/kinit-libpath.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kpackage/0001-allow-external-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kservice/kservice-kbuildsycoca-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/ktexteditor/0001-no-qcoreapplication.patch (100%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.10/manifest.nix
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/manifest.sh (57%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/plasma-framework/plasma-framework-external-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/renames.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/setup-hook.sh (100%)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.9/manifest.nix

diff --git a/pkgs/development/libraries/kde-frameworks-5.9/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.10/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix
similarity index 97%
rename from pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix
rename to pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix
index 71dbc50a806b..8e0b434d5bd6 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix
@@ -18,7 +18,7 @@
   };
 
   frameworkintegration = {
-    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
     propagatedNativeBuildInputs = [  ];
@@ -322,9 +322,9 @@
   };
 
   knewstuff = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
+    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Attica" "KF5XmlGui" "Qt5Widgets" ];
+    propagatedBuildInputs = [ "KF5Attica" "KF5Service" "KF5XmlGui" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -338,7 +338,7 @@
   };
 
   knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -482,7 +482,7 @@
   };
 
   networkmanager-qt = {
-    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
+    buildInputs = [ "ECM" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh
rename to pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix
new file mode 100644
index 000000000000..83d10f9def6d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix
@@ -0,0 +1,1174 @@
+# This file is generated automatically. DO NOT EDIT!
+{ stdenv, fetchurl, mirror }:
+[
+  {
+    name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz";
+      sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh";
+      name = "kemoticons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz";
+      sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4";
+      name = "kpeople-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz";
+      sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr";
+      name = "kconfigwidgets-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz";
+      sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc";
+      name = "ki18n-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz";
+      sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy";
+      name = "kplotting-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz";
+      sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9";
+      name = "kservice-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz";
+      sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06";
+      name = "kbookmarks-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz";
+      sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp";
+      name = "kded-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz";
+      sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0";
+      name = "knewstuff-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz";
+      sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7";
+      name = "knotifyconfig-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz";
+      sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq";
+      name = "threadweaver-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz";
+      sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m";
+      name = "kcmutils-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz";
+      sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z";
+      name = "kwindowsystem-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz";
+      sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9";
+      name = "extra-cmake-modules-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz";
+      sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld";
+      name = "kwallet-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz";
+      sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10";
+      name = "kguiaddons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz";
+      sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x";
+      name = "plasma-framework-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz";
+      sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib";
+      name = "kcodecs-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz";
+      sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv";
+      name = "kxmlgui-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz";
+      sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr";
+      name = "ktextwidgets-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz";
+      sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav";
+      name = "kinit-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz";
+      sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh";
+      name = "kdbusaddons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz";
+      sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9";
+      name = "frameworkintegration-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz";
+      sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n";
+      name = "kjobwidgets-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz";
+      sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4";
+      name = "networkmanager-qt-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz";
+      sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli";
+      name = "kpty-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz";
+      sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k";
+      name = "kcompletion-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz";
+      sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4";
+      name = "kio-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz";
+      sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l";
+      name = "kparts-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz";
+      sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm";
+      name = "kiconthemes-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz";
+      sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx";
+      name = "kglobalaccel-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz";
+      sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm";
+      name = "kapidox-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz";
+      sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz";
+      name = "kauth-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz";
+      sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf";
+      name = "kpackage-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz";
+      sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa";
+      name = "knotifications-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz";
+      sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r";
+      name = "kdesu-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz";
+      sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7";
+      name = "kcrash-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz";
+      sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2";
+      name = "kdnssd-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz";
+      sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif";
+      name = "kunitconversion-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz";
+      sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5";
+      name = "kidletime-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz";
+      sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix";
+      name = "kjsembed-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz";
+      sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d";
+      name = "kdelibs4support-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz";
+      sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl";
+      name = "krunner-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz";
+      sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj";
+      name = "kross-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz";
+      sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv";
+      name = "khtml-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz";
+      sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl";
+      name = "kjs-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz";
+      sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z";
+      name = "kmediaplayer-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz";
+      sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365";
+      name = "kitemmodels-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz";
+      sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3";
+      name = "modemmanager-qt-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz";
+      sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk";
+      name = "kdoctools-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz";
+      sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi";
+      name = "kcoreaddons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz";
+      sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy";
+      name = "kdewebkit-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz";
+      sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg";
+      name = "kimageformats-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz";
+      sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z";
+      name = "karchive-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz";
+      sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4";
+      name = "kdeclarative-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz";
+      sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s";
+      name = "kitemviews-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz";
+      sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28";
+      name = "sonnet-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz";
+      sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik";
+      name = "kdesignerplugin-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz";
+      sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1";
+      name = "kconfig-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz";
+      sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam";
+      name = "kactivities-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz";
+      sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn";
+      name = "solid-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz";
+      sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg";
+      name = "kxmlrpcclient-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz";
+      sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b";
+      name = "ktexteditor-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz";
+      sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj";
+      name = "attica-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz";
+      sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1";
+      name = "kwidgetsaddons-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kunitconversion-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/zfya6451kbd13sqbvn37as2pbvwzblb2-kunitconversion-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz";
+      sha256 = "0dxawvihm2bnc9l9vx90bq50sbcgrnkfvlsixkwhirw2cvvz0v5p";
+      name = "kunitconversion-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kauth-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/4895lldwv2v8vmravprlvy18qrbj83ha-kauth-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kauth-5.10.0.tar.xz";
+      sha256 = "074xr0qzknh9d0f6lisbyf612p4drlqscs7lqkasmd8f0r14ixlq";
+      name = "kauth-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kio-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/360wiiib4wjpc6anq8yk3xsl52bmfi5p-kio-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kio-5.10.0.tar.xz";
+      sha256 = "1lbbxn5s6p8fsgyr4nwwyawgcw4ywldwy7mbvn8pk5xrzai3c04r";
+      name = "kio-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "threadweaver-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/ha4rcc73g899c7qsngjyjqww5wn8d24y-threadweaver-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/threadweaver-5.10.0.tar.xz";
+      sha256 = "1lfdxin8rjvjpqky3g416magsg9ivf5kjmh9r37rz4v0mxsv5knd";
+      name = "threadweaver-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcrash-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/jakl1nm1lvnyscpx35d21l4whc8p6h8n-kcrash-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kcrash-5.10.0.tar.xz";
+      sha256 = "1imgn8a8ns15f2alp5xljy6llmqy0dv7yiqqjb1n8klvyp5mynlx";
+      name = "kcrash-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "karchive-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/9lh3nmzwia4akk6zi426admgq1sd1ybx-karchive-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/karchive-5.10.0.tar.xz";
+      sha256 = "19lzv1fi7vw95l9mx0qx10nfn5q7wzkqahsg2jswp31vgf977wfw";
+      name = "karchive-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "networkmanager-qt-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/mx64rg2lj5vmx2ggijrwv8iqp5lrm2ac-networkmanager-qt-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz";
+      sha256 = "0a9yg40rmvl7mxscyx6ndq4fwqxfy6rfy6a6cb8b6wm2im29njc4";
+      name = "networkmanager-qt-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kguiaddons-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/wd7s3v68xjshl9jjy974pidv0bar6j9f-kguiaddons-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz";
+      sha256 = "033z4difclwbmy4bi0c819i08x8pb5znr0kd27c3l9xaf2z3kaxr";
+      name = "kguiaddons-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kparts-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/q4xmlj9k2lc0ansqm982xcczna33d0y4-kparts-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kparts-5.10.0.tar.xz";
+      sha256 = "0k1zkr2qvl65cgk0j3ybvmxs8wwjl0641yrgl36ngbk23lyi35rv";
+      name = "kparts-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kemoticons-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/8vyxpyy2ym3zza3rgh97ny034prss6f0-kemoticons-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kemoticons-5.10.0.tar.xz";
+      sha256 = "0i3hj04k0dh2rx77sig9qdpjh2rik0n2snpr61ckiw9ixh8fggkr";
+      name = "kemoticons-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwindowsystem-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/ay11avkmb2sslf4r4ibi00sj7sndfvw0-kwindowsystem-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz";
+      sha256 = "0grxbydcc9k88nnlav7vcn3lajzswcsim5cpjcsysx9irx8rbiqf";
+      name = "kwindowsystem-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfigwidgets-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/2lpy9ar6qh2i3bn3vn3n9kckj5inryc4-kconfigwidgets-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz";
+      sha256 = "19p073fzpvm6hn85qk959s6dlnizywwcipw4rfm92b3y3jqg77i0";
+      name = "kconfigwidgets-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjobwidgets-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/vh5k90s0ni97ffz23fgfngqxay542xb4-kjobwidgets-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz";
+      sha256 = "0b2n0wn2l4k8xsjgycv7123xvlbq06g0pmbn5q6akywr0lrnyd16";
+      name = "kjobwidgets-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/2i00n76b27gj6cpzqsqyahjdpiqncvxa-kwidgetsaddons-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz";
+      sha256 = "0c9gzwsacm4zjjqc25akzf88fgrp9nraqid3c4na6asyn1pxzkmh";
+      name = "kwidgetsaddons-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwallet-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/xdgfmrz0zga3ffrmhh6svc0xwk9j8hz4-kwallet-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kwallet-5.10.0.tar.xz";
+      sha256 = "0nrb67shmdfaw2naa87gp29f2y3nnscj6ipw854j7shxz4fl2nr4";
+      name = "kwallet-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kded-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/aw04kz9cvgl089fi7dria4bjj6lsx0gy-kded-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kded-5.10.0.tar.xz";
+      sha256 = "0n2nd96j09igbxwq4697gyl45sfij22hs5mkys1gnaw5j8byaj4a";
+      name = "kded-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcompletion-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/9x8g7xf6da032y48bjwb0qgn256nxjid-kcompletion-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kcompletion-5.10.0.tar.xz";
+      sha256 = "1cb8b7qij67bghg35xcbs2lpkh5jzl7illln7h6h9jyygzv6vq7m";
+      name = "kcompletion-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "attica-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/78shcdc7hazqjpb9zw9fi48i783dcnx9-attica-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/attica-5.10.0.tar.xz";
+      sha256 = "1immb10bvpkscdawyv1n0y52jjnfy0y3hnjxxzfwci9fj24da625";
+      name = "attica-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemviews-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/3z0i50s73z4ah1wxw0gv9r5ayllm2ws3-kitemviews-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kitemviews-5.10.0.tar.xz";
+      sha256 = "0dihi79j7iqy2x3qivjalsj9qa2b17g7jl7j705fjjfnw64xj8bi";
+      name = "kitemviews-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdbusaddons-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/fnjbqxb8pb2z48c7a3i7ngma7lalmvsq-kdbusaddons-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz";
+      sha256 = "0lk7h424lc015asqpnldck18zcjki4672fkswy3qdvmkkpzdgx3m";
+      name = "kdbusaddons-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcoreaddons-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/71ql005nih2qjlybsal2rdg4h1fgj3rf-kcoreaddons-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz";
+      sha256 = "0y1j50axd6i0givknp9xfk81jdcdzz5p7m761qvbbjflqrnznvc1";
+      name = "kcoreaddons-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifications-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/8raimajcs7nc091fa75wbli2d1rz74my-knotifications-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/knotifications-5.10.0.tar.xz";
+      sha256 = "16qh492wwcyxanwmaqp1979wh3mrzmjkhvgnig5fxfvqzh9hxp0p";
+      name = "knotifications-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kglobalaccel-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/s9fnk5qs8qjsnf1yqdh09xf3ad7p4k6s-kglobalaccel-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz";
+      sha256 = "02nr4f991zi03spq4m9rlj11m5kvhmqghkfl2ijqnwv8m4dq2afy";
+      name = "kglobalaccel-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebkit-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/36lvpr42574d8cia2ldszawfbm88jiha-kdewebkit-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz";
+      sha256 = "08bw2ximj3z6rs06przf6kah1mczlv2nri99cgiihin99jx8f98h";
+      name = "kdewebkit-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfig-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/7hk4bl92kfr9a3qs4wz52a8w7ij8336a-kconfig-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kconfig-5.10.0.tar.xz";
+      sha256 = "1r7r4yihlnld09l9qmq2q8h9xk7clmgbry8vnggzih1bamid79dq";
+      name = "kconfig-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ki18n-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/cnhv0jch823qnim7z0zdvbyjd5vrcg3y-ki18n-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/ki18n-5.10.0.tar.xz";
+      sha256 = "0xa27c42bnvhks6mdz593hxwl3idagyz6mbmp8p5dj6xsfdabrcs";
+      name = "ki18n-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kimageformats-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/0hc6flqibi46fbrc3cdfynyvhpq458z0-kimageformats-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kimageformats-5.10.0.tar.xz";
+      sha256 = "140s1lydikb87rpaxqmv6ccp139ch9vsi62r6fmyvwx6l0ffh2ay";
+      name = "kimageformats-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbookmarks-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/4w5fasxqv1s6rx9ri3jg1dppikm2hpci-kbookmarks-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz";
+      sha256 = "040n5xv8n357smmhsq24hgv43dcsbpc0wfyjhfznz41azcibbydw";
+      name = "kbookmarks-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kactivities-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/5aq6q69jylvagidgawig2laf1lqlks8l-kactivities-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kactivities-5.10.0.tar.xz";
+      sha256 = "0d2cyjv9hb4zd99sp598miwq4k1nzv4ssbgak7jmifqcimjpjjsk";
+      name = "kactivities-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktextwidgets-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/8w02lcpf5pr1y6nhr7jx33xf266napd4-ktextwidgets-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz";
+      sha256 = "0mpsikpy1i3j1dx352a5c77xx5m6iv4lfnff58yi5z0m31002mv6";
+      name = "ktextwidgets-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "extra-cmake-modules-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/m4lgg75y8c1fcw2gsskyk14x011ydbvk-extra-cmake-modules-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz";
+      sha256 = "00h62mmxl8jwslssczv14dmydgmg3rr12dd8b5471xbmx8kvqb86";
+      name = "extra-cmake-modules-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-framework-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/yy7r7d0m4l75v0l7dr9krjcgbkpq2nrw-plasma-framework-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz";
+      sha256 = "0a2lkxbpry8p8sar7ai2fcnjciiik4ir9y9snkmxci26vgql8j8a";
+      name = "plasma-framework-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kidletime-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/0n2i32wrhvwpq63xvqxf2ibgil9fmljy-kidletime-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kidletime-5.10.0.tar.xz";
+      sha256 = "0rvw4b22x9jgkqx64wisc0qnl6kx2b97sz2hxcpqh2lkj1cql4r0";
+      name = "kidletime-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kservice-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/gzc1wc32ggqrmvvzg36p6n7g5zlvxl48-kservice-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kservice-5.10.0.tar.xz";
+      sha256 = "15dmfd8ddjaac5mdb041ddhpkr3bh6gcgy0wfg404xiy1sx12dr6";
+      name = "kservice-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdnssd-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/q2pbpwp8al275xk7sd4smwzyi9yahfsh-kdnssd-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kdnssd-5.10.0.tar.xz";
+      sha256 = "0frar6j0n6m43l7hdc14n0vbvs63fjg2gv5q59zwsx856rrqfszi";
+      name = "kdnssd-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcmutils-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/nx5s67hxxldmws5292cqgwr8xjxr2dli-kcmutils-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kcmutils-5.10.0.tar.xz";
+      sha256 = "1995jbnnkwmkyiq8jav4r3x3mi3w5kv0am10c0d6g1pxjsig1xrx";
+      name = "kcmutils-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapidox-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/ymkxbdnjg74454a4k4s5i1y29cfxf6zc-kapidox-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kapidox-5.10.0.tar.xz";
+      sha256 = "1zjjj951vfnwc8833lh6schdcva0dhiws56kmhclg7m9mpnvbav4";
+      name = "kapidox-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeclarative-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/k58nmr9k6qib3kbp6yxwkbw90fxxydhv-kdeclarative-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz";
+      sha256 = "1kfsqg43inn2is991nzcgcicd7aa7yg6bzsxac3c3136p32ii9yg";
+      name = "kdeclarative-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdoctools-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/jzw1pnsjcl6xv8gfqdi02gcnr5x1301s-kdoctools-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kdoctools-5.10.0.tar.xz";
+      sha256 = "0v00pjm0jsqkxq52ndpds7qn5vbsxkgzvvy379id1ag692s55jkp";
+      name = "kdoctools-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krunner-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/dac20ijml2z02bbslxpzxlmpzsbfp4r1-krunner-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz";
+      sha256 = "15adxzsh27s6h37mfa8pwwdf47gp8whfsshj5chl7h3zdj5aa04i";
+      name = "krunner-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjs-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/qm70n66sxh6zgxc02sh2k0ii1xw2g8yk-kjs-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz";
+      sha256 = "0l3pn9g7mv5wklihgd7v3c83563ly9swwayivqlyz4rj35m7lvq1";
+      name = "kjs-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmediaplayer-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/h0k2i2vx7r57by15bx23paay9q4fah3x-kmediaplayer-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz";
+      sha256 = "0q17lgajv3844d2nccnfyzg6g55wx79fxij2iw42m25wyxg7b4df";
+      name = "kmediaplayer-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjsembed-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/3z1phizh6lphvihqgg63ajlfqj3hbn54-kjsembed-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz";
+      sha256 = "1922bvs3p2ffax5h8kmg4llw65h00m22qfs8n3qhcc952zgv1wxl";
+      name = "kjsembed-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kross-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/ifg2nrl5zk707f510nkv8cnzjwdrrc2h-kross-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz";
+      sha256 = "02mz7w920vka5wwgbnf0m774s56r4qkwplakdyal92ip3zc3m6jq";
+      name = "kross-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khtml-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/h9zaw11asgbhgxwqbsnvcdg0h97rcqfd-khtml-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz";
+      sha256 = "0wzzcysgvjkibs8j277z75b0s5dvjwby7c6lnyyzmnm5vmsw2dj2";
+      name = "khtml-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs4support-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/ii9a8qxf2xh1ijx4m5zfssjrvgfsf1wf-kdelibs4support-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz";
+      sha256 = "0j7ah078ckz8zcdb417j7dmzpcbs9vvbr42r6c49fk7rp7vy4ly2";
+      name = "kdelibs4support-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "frameworkintegration-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/7rbwib0mgkm5pl8ai6q6fjdq87zyk99d-frameworkintegration-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz";
+      sha256 = "00plajvkp19njdyq37qmf0q5xvwvl3vgx0vmls4hf2mk179yqm63";
+      name = "frameworkintegration-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knewstuff-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/k4zm5y96427bwdjfjinnj8p2knkgn12h-knewstuff-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/knewstuff-5.10.0.tar.xz";
+      sha256 = "1z24h7rk7vyavw3949gj06y924x1sbyy8jh3krr1ngpddlrsk5l7";
+      name = "knewstuff-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpackage-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/j9p1kdz7wknxjk33b92aicqx2f021i10-kpackage-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kpackage-5.10.0.tar.xz";
+      sha256 = "0c5xnks7k85lj6pkbylnlcmlhxns95zs6km9hfvdi7zh0i26y8qb";
+      name = "kpackage-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "modemmanager-qt-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/lqd4bh2da4v002ckm5cz5clzmddkvyil-modemmanager-qt-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz";
+      sha256 = "1whhc8clibiwzda4zbk8asry65c7nlnlgq10sbmh7gq008l0z9l1";
+      name = "modemmanager-qt-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktexteditor-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/x83fw1z7h9s2h03m4slydvpafzxvi1lq-ktexteditor-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz";
+      sha256 = "1axs21vklg392hxcm8j6y01qk3wphsfldh0caqnv6ifhamvcvkhh";
+      name = "ktexteditor-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifyconfig-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/chvplwyglb6zwhjhxyrb91f0rg4k2g1a-knotifyconfig-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz";
+      sha256 = "1zhddbynsk4b27sldmbd8q8mk8kbjyfv5k27vrqahlbq7ysrhflm";
+      name = "knotifyconfig-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcodecs-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/184rzn1mjkmv6dvqs8rmjhwxzsbp04yb-kcodecs-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kcodecs-5.10.0.tar.xz";
+      sha256 = "1izw6rpvpxhwnl6aqrfqh2m3v3ia5gynpsxd8syi1cxnzmajgwic";
+      name = "kcodecs-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpeople-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/1vqn907gx0b0h238zwys8v3ryxf8yqlh-kpeople-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kpeople-5.10.0.tar.xz";
+      sha256 = "0b56c3pha1rgz9h8ia0vd4k5nvmxh64wgk5vgfnxa0znij47wcka";
+      name = "kpeople-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kinit-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/rmrvk7308bi4kzximn9pzzgij9mihnll-kinit-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kinit-5.10.0.tar.xz";
+      sha256 = "02da17n19xx9cqiyzh7qlbqyy0mpy4gr3pdja1xlqaapc52k99sz";
+      name = "kinit-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/bijjk36yvjjcmnckvm3ccw9zs40ckjcx-kxmlrpcclient-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz";
+      sha256 = "1cjwqxpwwx9gxxb43dncyfcn3rjfx28af6dbh4zx7l0yqw4z4cxi";
+      name = "kxmlrpcclient-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlgui-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/fafv3gxzbrvrjvxvng6is8k9a3869g1s-kxmlgui-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz";
+      sha256 = "1m22ld9pd2z287j8nj9alk1pychq04r0w1g1vqhgr0shlxzx91pf";
+      name = "kxmlgui-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "solid-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/6shp9pnj9p4lpb2kzzdfqz2pf6ivy2gc-solid-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/solid-5.10.0.tar.xz";
+      sha256 = "1qy3bic39jffc2pl1wh36qm8sizjld6gd2qx6y4j9xzkv723r864";
+      name = "solid-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiconthemes-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/h5i2pk6zy3k4h23q1jfdbarc8fm1614b-kiconthemes-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz";
+      sha256 = "19vvg63ld4388jd47245zqzbj5bs8qj69524bvwqbv77201qg7j1";
+      name = "kiconthemes-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesignerplugin-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/jdyk0kl1ccbnnb83mzda670bg93z3w0w-kdesignerplugin-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz";
+      sha256 = "1z82kxn5hpbmhsrh4ic7mcmsz115p39gph7ysjz9fh6ylfdgcrpm";
+      name = "kdesignerplugin-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kplotting-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/b5h0i3mcfb9g7krd7pc5c0f1c2q0jma5-kplotting-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kplotting-5.10.0.tar.xz";
+      sha256 = "0g7riml9nbs762s1pld9d3y743z52kxdaiaklg3ai5cljp5v5skh";
+      name = "kplotting-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sonnet-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/ivjvsiqv1gjb0cq5lkxa7a3kb9pjcvrw-sonnet-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/sonnet-5.10.0.tar.xz";
+      sha256 = "1ad205mldwk234vwjkbalx6pnib02mz68drajg07ii5ycsczgk93";
+      name = "sonnet-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesu-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/h3vphpz0fdw7v339bcf0krqm2rgwqzsl-kdesu-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kdesu-5.10.0.tar.xz";
+      sha256 = "002ryv2svl1hmapflg0cvl7xd7qa4sh2msxnma9ijsad1ypv9nrw";
+      name = "kdesu-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpty-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/1k73m5m6vkl6p9gcn8ik4cvh0k5chlxa-kpty-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kpty-5.10.0.tar.xz";
+      sha256 = "1ys8wv1hirv6jk6jdzjnvkhw2lx3rxj8xp4sgvxfbfs833vdnqx6";
+      name = "kpty-5.10.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemmodels-5.10.0.tar.xz" ".tar";
+    store = "/nix/store/v1lmfs7h4q0d6wmp7xz21ad5sm50bxx2-kitemmodels-5.10.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz";
+      sha256 = "1c63wsy9iy842ljv2vmnjcn6p3ahnv6pm73p1kayjdqq6wy0lmq6";
+      name = "kitemmodels-5.10.0.tar.xz";
+    };
+  }
+]
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh
similarity index 57%
rename from pkgs/development/libraries/kde-frameworks-5.9/manifest.sh
rename to pkgs/development/libraries/kde-frameworks-5.10/manifest.sh
index 0075819664a7..28870e48964d 100755
--- a/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
 if [ $# -eq 0 ]; then
 
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../../.. -A autonix.manifest) \
-    http://download.kde.org/stable/frameworks/5.9/ \
-      -A '*.tar.xz'
+      "${KDE_MIRROR}/stable/frameworks/5.10/" \
+      $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
 
 else
 
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/renames.nix b/pkgs/development/libraries/kde-frameworks-5.10/renames.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/renames.nix
rename to pkgs/development/libraries/kde-frameworks-5.10/renames.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh
rename to pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix
deleted file mode 100644
index c61618b6e455..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix
+++ /dev/null
@@ -1,589 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz";
-      sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh";
-      name = "kemoticons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz";
-      sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4";
-      name = "kpeople-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz";
-      sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr";
-      name = "kconfigwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz";
-      sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc";
-      name = "ki18n-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz";
-      sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy";
-      name = "kplotting-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz";
-      sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9";
-      name = "kservice-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz";
-      sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06";
-      name = "kbookmarks-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz";
-      sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp";
-      name = "kded-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz";
-      sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0";
-      name = "knewstuff-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz";
-      sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7";
-      name = "knotifyconfig-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz";
-      sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq";
-      name = "threadweaver-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz";
-      sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m";
-      name = "kcmutils-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz";
-      sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z";
-      name = "kwindowsystem-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz";
-      sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9";
-      name = "extra-cmake-modules-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz";
-      sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld";
-      name = "kwallet-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz";
-      sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10";
-      name = "kguiaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz";
-      sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x";
-      name = "plasma-framework-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz";
-      sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib";
-      name = "kcodecs-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz";
-      sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv";
-      name = "kxmlgui-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz";
-      sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr";
-      name = "ktextwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz";
-      sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav";
-      name = "kinit-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz";
-      sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh";
-      name = "kdbusaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz";
-      sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9";
-      name = "frameworkintegration-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz";
-      sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n";
-      name = "kjobwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz";
-      sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4";
-      name = "networkmanager-qt-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz";
-      sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli";
-      name = "kpty-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz";
-      sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k";
-      name = "kcompletion-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz";
-      sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4";
-      name = "kio-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz";
-      sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l";
-      name = "kparts-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz";
-      sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm";
-      name = "kiconthemes-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz";
-      sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx";
-      name = "kglobalaccel-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz";
-      sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm";
-      name = "kapidox-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz";
-      sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz";
-      name = "kauth-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz";
-      sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf";
-      name = "kpackage-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz";
-      sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa";
-      name = "knotifications-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz";
-      sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r";
-      name = "kdesu-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz";
-      sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7";
-      name = "kcrash-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz";
-      sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2";
-      name = "kdnssd-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz";
-      sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif";
-      name = "kunitconversion-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz";
-      sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5";
-      name = "kidletime-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz";
-      sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix";
-      name = "kjsembed-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz";
-      sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d";
-      name = "kdelibs4support-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz";
-      sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl";
-      name = "krunner-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz";
-      sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj";
-      name = "kross-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz";
-      sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv";
-      name = "khtml-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz";
-      sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl";
-      name = "kjs-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz";
-      sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z";
-      name = "kmediaplayer-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz";
-      sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365";
-      name = "kitemmodels-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz";
-      sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3";
-      name = "modemmanager-qt-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz";
-      sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk";
-      name = "kdoctools-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz";
-      sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi";
-      name = "kcoreaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz";
-      sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy";
-      name = "kdewebkit-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz";
-      sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg";
-      name = "kimageformats-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz";
-      sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z";
-      name = "karchive-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz";
-      sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4";
-      name = "kdeclarative-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz";
-      sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s";
-      name = "kitemviews-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz";
-      sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28";
-      name = "sonnet-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz";
-      sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik";
-      name = "kdesignerplugin-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz";
-      sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1";
-      name = "kconfig-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz";
-      sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam";
-      name = "kactivities-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz";
-      sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn";
-      name = "solid-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz";
-      sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg";
-      name = "kxmlrpcclient-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz";
-      sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b";
-      name = "ktexteditor-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz";
-      sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj";
-      name = "attica-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz";
-      sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1";
-      name = "kwidgetsaddons-5.9.0.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 069e230dd144..d3d6ff843d29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6346,9 +6346,9 @@ let
     automake = automake111x;
   };
 
-  kf59 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.9 { });
-  kf5_latest = kf59;
-  kf5_stable = kf59;
+  kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { });
+  kf5_latest = kf510;
+  kf5_stable = kf510;
 
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
@@ -11355,7 +11355,7 @@ let
   };
 
   kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {
-    kf5 = kf59;
+    kf5 = kf510;
   });
   kdeApps_stable = kdeApps_15_04;
   kdeApps_latest = kdeApps_15_04;
@@ -13585,7 +13585,7 @@ let
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
   plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 {
-    kf5 = kf59;
+    kf5 = kf510;
   });
   plasma5_latest = plasma53;
   plasma5_stable = plasma53;

From b75d164018ac36e2c2d2d41784f146f60ebe7965 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 14 May 2015 08:24:28 -0500
Subject: [PATCH 0869/1143] Upgrade to kde-applications-15.04.1

---
 pkgs/applications/kde-apps-15.04/manifest.nix | 2043 +++++++++++++++++
 pkgs/applications/kde-apps-15.04/manifest.sh  |    1 +
 2 files changed, 2044 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix
index 09d89ef70458..bdf5b3cfc560 100644
--- a/pkgs/applications/kde-apps-15.04/manifest.nix
+++ b/pkgs/applications/kde-apps-15.04/manifest.nix
@@ -2035,6 +2035,2040 @@
       name = "kjumpingcube-15.04.0.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "okular-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/0j337gxam8fflqmaq9ggjgdjqmz53ank-okular-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/okular-15.04.1.tar.xz";
+      sha256 = "0yg9ivscx8nrdb9gq6xq6fm3y8lksnkcjdi0908axmqr8gxnh5c5";
+      name = "okular-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktux-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/909abb7a2m5zlw96wycw77ry7na2y6fc-ktux-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktux-15.04.1.tar.xz";
+      sha256 = "07v559yw4dpryfi7x4c7305dac9i5pkaj0m5dxbgsvsyc5qmmv18";
+      name = "ktux-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcalc-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/gy0khp88rwah803y4r9q6jfghkjf857h-kcalc-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kcalc-15.04.1.tar.xz";
+      sha256 = "1w279713fipi82skai7f31q5yzn6yjm3bhd236igd9a24blzr2xa";
+      name = "kcalc-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kollision-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/sr1wh5xb0kj4yw5qy5qqf5mfrbwva980-kollision-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kollision-15.04.1.tar.xz";
+      sha256 = "0pq8pvqjynfmkafaxx9hl4dd8i0blq8vkzpnkhn3zkd450bwjdpc";
+      name = "kollision-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgamma-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/3nifa51gknij2kxwlhsi70qz5xmc36dg-kgamma-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kgamma-15.04.1.tar.xz";
+      sha256 = "1w0sb9yk3wj38jqhbr1g72jagy99v2ihrm81r4wp274i602h9s2s";
+      name = "kgamma-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapptemplate-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/illwb8qn9c9s67m5y4f5cx0d5f3l860k-kapptemplate-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kapptemplate-15.04.1.tar.xz";
+      sha256 = "09s0bk8kp338iy2bpq3gaa3sa52qk42zw4wxccgvxj9hjhh894nk";
+      name = "kapptemplate-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalgebra-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/0dz4823nkpmlvxby7ki3vb0ppfshwz45-kalgebra-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kalgebra-15.04.1.tar.xz";
+      sha256 = "17qxij5kdk0vymqfq1csmp071sscjc19pw9y39g59njk4bbdih3m";
+      name = "kalgebra-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ck0pb49q3kv6jzkmwliw1sdp8qbpzplr-oxygen-icons-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/oxygen-icons-15.04.1.tar.xz";
+      sha256 = "0asr2k1i0bm8pm9kj12c9s5bkwvz25pgsv167hb2cvfgm8ahyvlj";
+      name = "oxygen-icons-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/6w7jbq7m0kfjc37rnd6yf0ww3xdmb27x-kdesdk-kioslaves-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdesdk-kioslaves-15.04.1.tar.xz";
+      sha256 = "1pb258bhqikc9nmzs10y98gzd6na0sqyhgfzm1rq1hkmg4dkslwa";
+      name = "kdesdk-kioslaves-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "pairs-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ky762jidy4zxzwbllfxz46h7bq76v2df-pairs-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/pairs-15.04.1.tar.xz";
+      sha256 = "078j19w99v50zck64mrir0pr1r45k136lprdndxrpdmxq3zx36px";
+      name = "pairs-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "svgpart-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/qgdyrm00y38n3xidjc5hqyi1aid7hn0y-svgpart-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/svgpart-15.04.1.tar.xz";
+      sha256 = "0mwbbx490i1z038jxkl8pyjaisks2k18nn5ccs1d65k5p67pcf3b";
+      name = "svgpart-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "amor-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/qjyg81gbsdbdwc4vzxhfwvbc2r5jqbxc-amor-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/amor-15.04.1.tar.xz";
+      sha256 = "071wnfp1p9xd6asir4ssvb19jcfbwqg472znl5bw7n09qp5i7w9m";
+      name = "amor-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/zi9amimbp5ag5frcx0myg5ksc25whknc-kde-l10n-bs-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bs-15.04.1.tar.xz";
+      sha256 = "1il3l1fmavigjndy8pwb0m9jvz0wzm39p0pm10b12vv394623i5f";
+      name = "kde-l10n-bs-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/zs5dds7lhag23vwc2f83bd9wchi6k0zh-kde-l10n-he-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-he-15.04.1.tar.xz";
+      sha256 = "1jn8b5m4i9gxyfi2acjxjqcq0rzp9b70miji17vjc8q1a7241pmg";
+      name = "kde-l10n-he-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/8nlrz9m17ljb459zm6zq5nx8nnpwly16-kde-l10n-ug-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ug-15.04.1.tar.xz";
+      sha256 = "184xqway79p33fi8mc1xx6h0lply1r8xsj4qjjqnd30sg5hzn0lp";
+      name = "kde-l10n-ug-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/zgij63xalg6c9i3nm1bc6ap6zvspm8p2-kde-l10n-nb-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nb-15.04.1.tar.xz";
+      sha256 = "1zlarins81lj11ljr1k1ma27wy6jyl7q33p2xisjwqi4qw6jmhza";
+      name = "kde-l10n-nb-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xy0x7in8bkpn6z6ac2v6cx3rvzij2jma-kde-l10n-de-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-de-15.04.1.tar.xz";
+      sha256 = "0gki5x7nlpvhxqwg6gqajh5swql6vvi9c37lys7ng2hpqc5xy7pf";
+      name = "kde-l10n-de-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/pr9ckm8k6y78gqb5y33ny8zm6hgbm6iy-kde-l10n-it-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-it-15.04.1.tar.xz";
+      sha256 = "1grfxlcc896zgq74q6cqy6l878bkyhchr4n8jcjiqzl7xn3p2q5c";
+      name = "kde-l10n-it-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/rqbgin8gv0jy20hgl2j0pp56k93k4hp6-kde-l10n-sv-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sv-15.04.1.tar.xz";
+      sha256 = "1wzpisiqdcsw698j1bf22gzjqawwmmcpslx6yhmrn8462k5iq0d7";
+      name = "kde-l10n-sv-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/5vbrfwv9s2klrxw3k6vz4833qvldarp0-kde-l10n-ja-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ja-15.04.1.tar.xz";
+      sha256 = "0jsnx9sjs1wz2f8i9bbl2v59f56azggqbl610idj0xdjn7zhk311";
+      name = "kde-l10n-ja-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/j9mbwhpxw612xc9bilzhdgsayi9bqwjl-kde-l10n-lv-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lv-15.04.1.tar.xz";
+      sha256 = "1c6g0rkd209j2q9m2q5rcf8j24gnc1g11kq87cjyj88jvidc0jpl";
+      name = "kde-l10n-lv-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/wziwfgk9xh3k79xz9pvpfjvjavjalc37-kde-l10n-mr-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-mr-15.04.1.tar.xz";
+      sha256 = "02hd8p6fzralbhz622nzxyn13p1lqxzyi229vc8ni7qz9mqia02k";
+      name = "kde-l10n-mr-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vg6xw3206sf0nys7179l6a04ymiwqy3w-kde-l10n-nds-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nds-15.04.1.tar.xz";
+      sha256 = "10hija63jh38pqm9j9lln2n705sfm13zn2h3rv4jl0q7m75hdl0m";
+      name = "kde-l10n-nds-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/2fk00654fxijdpmzqpf5qwbbxdlfxs25-kde-l10n-zh_CN-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_CN-15.04.1.tar.xz";
+      sha256 = "16rsjrwfafvrgl48dnpbd2lnzja186zq7sq83dafg9hs636md6ff";
+      name = "kde-l10n-zh_CN-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/i30703ryicxz0zf6fk08mzpcr7wvyps8-kde-l10n-ca-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca-15.04.1.tar.xz";
+      sha256 = "1008mb8ygak03dg0xxwsb54px0qashh1nnrpj0wwfqvgfbqa19fm";
+      name = "kde-l10n-ca-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/mdcybgna88hx6jlmyj2m6ss32yw4i7z3-kde-l10n-nl-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nl-15.04.1.tar.xz";
+      sha256 = "1s6zrnbhnpqwpb1mgrnayqvzggb1wrmc4w166y8j9bvjc0jahlfp";
+      name = "kde-l10n-nl-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/k179rl7a4avlv20w4spxzl19mk567jv3-kde-l10n-sr-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sr-15.04.1.tar.xz";
+      sha256 = "1k6q4l7xllrs26xvrhfp8lbq0rgp49aq3r9y85crdmf5xy1zk4bc";
+      name = "kde-l10n-sr-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/8i9bjzsxfxh4n5w385k0figmm9cwfy65-kde-l10n-ro-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ro-15.04.1.tar.xz";
+      sha256 = "1svqhp23y5xmnmrba8vzamac6zf4lz02gfck9xi8kq5zhs1zky7w";
+      name = "kde-l10n-ro-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vd6ihrlxp8m0hf7x3b05sglmn9xggjy1-kde-l10n-hr-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hr-15.04.1.tar.xz";
+      sha256 = "00rn1947pw57cl4lwyx3hm7ic4w45lsh82m3sr3l8wa26qm6qz17";
+      name = "kde-l10n-hr-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/8rp1dba5nc9b2b2m4dvl51rd74xrnkdn-kde-l10n-pl-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pl-15.04.1.tar.xz";
+      sha256 = "09rs6abbm4bj0wy2s0y7b44lacraq1ypxvmil5cxj95apk6qy4sa";
+      name = "kde-l10n-pl-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/bnwiza33rhdlnc61bvfx521cy02d8scc-kde-l10n-cs-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-cs-15.04.1.tar.xz";
+      sha256 = "1xl397n7vdfcpzg5qfcdbmw92p6ail90s15vvbxq2c4didysgrcz";
+      name = "kde-l10n-cs-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/7mxx0v3fd90vi123hw0k9hinmzxh4z1z-kde-l10n-is-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-is-15.04.1.tar.xz";
+      sha256 = "0c03jsb4lbp5wn0inzv3z86as0din40ypjh5jwj6zparjgg7v017";
+      name = "kde-l10n-is-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/lwqhr1l80ki47ysz51ckiz05z9wxfphv-kde-l10n-hi-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hi-15.04.1.tar.xz";
+      sha256 = "0gwin6w51iskb9wss97mg3pvwbfca67jqisz3v6qljy770p8d16j";
+      name = "kde-l10n-hi-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/iqfv8rf2qlaif5k6km6i68qpdha2p8ib-kde-l10n-es-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-es-15.04.1.tar.xz";
+      sha256 = "00j195zzqmirq3d64sq86n11fhp4gzd8wq7bvr4byg76crv1wsqv";
+      name = "kde-l10n-es-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/zkjp2bbs8d6j6k3wgwij5q1zaiaxvzhi-kde-l10n-eo-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eo-15.04.1.tar.xz";
+      sha256 = "1kpd83bf72hjp8dir6cv75rb9wjnljdwxk4ff1mp2ph7rzhm8hxf";
+      name = "kde-l10n-eo-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/09hg9zfgwdgvdaxx985kk1xf9hky3r7h-kde-l10n-zh_TW-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_TW-15.04.1.tar.xz";
+      sha256 = "1k4f9031572mxkg5rk2i98angr9rqcbqkp3zrg7blfpndbqbhzzl";
+      name = "kde-l10n-zh_TW-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/5lzgd16vdwbziizylnx114dpaycm0xmy-kde-l10n-sk-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sk-15.04.1.tar.xz";
+      sha256 = "1j96parls7psj0nr0305wdpdjxdrh8bqgbs89mrbk8wgzj9agsh8";
+      name = "kde-l10n-sk-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/hf6x95pyziykm6j2kxlaavr4585l19x5-kde-l10n-ru-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ru-15.04.1.tar.xz";
+      sha256 = "1lqc7fvw4spca4va4id24ni19s4gzxzf5qrzfqgav4xf6hwndi3c";
+      name = "kde-l10n-ru-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/x29ma96kp1mf389k6kjpl65fwqbkkjzk-kde-l10n-ga-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ga-15.04.1.tar.xz";
+      sha256 = "1m1dihyak0z5h6932rmb09q3hhbyzkck0gwnp3gdqa84m1b8kmid";
+      name = "kde-l10n-ga-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/iacgwmkzrc75y7xf281zcfz7fha9c740-kde-l10n-kk-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-kk-15.04.1.tar.xz";
+      sha256 = "1lcan2x6f7v159zmix2h730pj21rlqmqxvizcd0jrwmnqxf9ww1k";
+      name = "kde-l10n-kk-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/lk6ncn5aa4p373igs7j8g6mwa4a2iqma-kde-l10n-pt-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt-15.04.1.tar.xz";
+      sha256 = "07pqq7yggq2cjsn60wygbzz37dprp30dhabqj6il6gahl9y5y1fj";
+      name = "kde-l10n-pt-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/adcsrsz6kj7605a7whakszmsjrb3r0nc-kde-l10n-pt_BR-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt_BR-15.04.1.tar.xz";
+      sha256 = "0c5z73pr7m4pq52pjk7q097755g2kswjzjcq5pwc94za0yj055l2";
+      name = "kde-l10n-pt_BR-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/i9kc413jrn1l9rywv7vsbhgsvz7lffis-kde-l10n-ko-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ko-15.04.1.tar.xz";
+      sha256 = "1i34awq71si561p6ggahk6phav9p7rlyc34lg38w7mlqb0d6bjqq";
+      name = "kde-l10n-ko-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/s9rqm9a1rvwx7zikmm5fwydsaggsgk25-kde-l10n-da-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-da-15.04.1.tar.xz";
+      sha256 = "0h5784ba12yh5szyilbw6l4alac4kvgq9bmzpmga032jpc0g9k0l";
+      name = "kde-l10n-da-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/4pxnpsmz3siicy40i3m1x4ji852ps53s-kde-l10n-et-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-et-15.04.1.tar.xz";
+      sha256 = "0x208lv7qrhflgz5qmpp64wqx4avb3mbjr625nqpk8c5w9swqify";
+      name = "kde-l10n-et-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/0bdylm7gbn4ddfw95mz3zwvpizjfflgz-kde-l10n-fa-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fa-15.04.1.tar.xz";
+      sha256 = "11lsciiys8dk6mzvd5fp4kypk2355ppdd20fkqd99vp2z3rknv9r";
+      name = "kde-l10n-fa-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/1pxdddwrqh1lwq69ybfc3bq4wqyp4wsp-kde-l10n-nn-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nn-15.04.1.tar.xz";
+      sha256 = "1vn9bcjba6wcym0cvfwhzyn7n4aa9jc3w7apahc72sqzq1irjapl";
+      name = "kde-l10n-nn-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/k8jamljw1l6zrpqwl4ai6103rcxlkxr6-kde-l10n-en_GB-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-en_GB-15.04.1.tar.xz";
+      sha256 = "10gypxkclg037crrv5ifyrj5yahjmfr8x7h41b2zrxy2mvibfpw8";
+      name = "kde-l10n-en_GB-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/cr32nv49a2k622v9g0x8c3wbq0ydv9g4-kde-l10n-gl-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-gl-15.04.1.tar.xz";
+      sha256 = "1wjw21vifqzr35rpmffavxljbw6h9ci7awllj447sgqyw2c59pls";
+      name = "kde-l10n-gl-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/kxabywd2fc6249jy9pwqkjmbigi11hca-kde-l10n-ar-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ar-15.04.1.tar.xz";
+      sha256 = "0ngff802m80bi28khp9m60j5j2fh8f3nghp81l8a27kmlzl0np9j";
+      name = "kde-l10n-ar-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/7xgibrqzv5gsvswx0k5y52pawd5fd14k-kde-l10n-eu-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eu-15.04.1.tar.xz";
+      sha256 = "0fpfahmlniyhsxlx7p1ln9ldy3zjxak8cqi24p2rv8xcm3238dlf";
+      name = "kde-l10n-eu-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/fk5q2f8nwj9cw94k036yf1fgn5kg4g1c-kde-l10n-tr-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-tr-15.04.1.tar.xz";
+      sha256 = "1r40gg4cz5s7g5c54a8c6mmx6v27lqx1sbygm5cb9xsqqp0il1yi";
+      name = "kde-l10n-tr-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca@valencia-15.04.1.tar.xz";
+      sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd";
+      name = "kde-l10n-ca_valencia-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/zqkgqclj5c9ssqnzycg6449740s6n1rm-kde-l10n-km-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-km-15.04.1.tar.xz";
+      sha256 = "0prmwyjjmw5mimbi5dkzcmgynazi5lvrjkinfl9z49l2dcqmwkks";
+      name = "kde-l10n-km-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/hicn3pxa99ihaj704v6f1l1kfmxdfm98-kde-l10n-pa-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pa-15.04.1.tar.xz";
+      sha256 = "1civainv5170xvn20vx8rmghkfdlc6554nncq22l55q2f78pgg29";
+      name = "kde-l10n-pa-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/m08cm6y7gnpyhdszbza3id8j08v1qvsn-kde-l10n-fi-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fi-15.04.1.tar.xz";
+      sha256 = "1q3b25h983y2jin4llml0s4wm5ja0rplsczr5zci99vyi1jv2i3w";
+      name = "kde-l10n-fi-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/c5ssvbyi0gdr7da99a3mg0snwwmqzi1c-kde-l10n-id-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-id-15.04.1.tar.xz";
+      sha256 = "0gs7l2i71hzwyn12gjrdqr5lm996vglrbqbvn0jmzyp6zjzha6ah";
+      name = "kde-l10n-id-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/hslbisaanz2z17mvspp4jbsx95pgwsgh-kde-l10n-lt-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lt-15.04.1.tar.xz";
+      sha256 = "02qmdg0gkcmcgj9gffawij8c64fjs7s70yysnlnp3wmb7vy4ppqh";
+      name = "kde-l10n-lt-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/3lzxjwp4rrgp3rn6f3x42ylfk1qf4g12-kde-l10n-wa-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-wa-15.04.1.tar.xz";
+      sha256 = "139v2k0jvm7xndwhgrs0x15l1plb49qpzbdny928gjymxq5x66ar";
+      name = "kde-l10n-wa-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/yzfn0nlwhlm1q6x04ydz4p4rdinwazpn-kde-l10n-fr-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fr-15.04.1.tar.xz";
+      sha256 = "1x36334bi1q4sii7j24xr39jxw6k22p4m1c2mz43s0ix0gzyx6n0";
+      name = "kde-l10n-fr-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/v3qlbc9qq7m6pa8m1iz6qw3wam7c8qh4-kde-l10n-bg-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bg-15.04.1.tar.xz";
+      sha256 = "1frd276wzvhwczdws589xy4bpg58yill263lfg8bjvg1v00pr6j8";
+      name = "kde-l10n-bg-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/sjnpw624x3hm8spj91lfy2aqilfn9vv4-kde-l10n-uk-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-uk-15.04.1.tar.xz";
+      sha256 = "041zhdfmdbca74cgc69dzspn670i9cv32mhb8319q85xp1jr3wbs";
+      name = "kde-l10n-uk-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/k5f977w8bgbi72wcf00p1wng4wr58y2q-kde-l10n-sl-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sl-15.04.1.tar.xz";
+      sha256 = "078r48vgbi72wrx5hnjbgkakp108v79lyb6jpllcn7a8sd71cm6s";
+      name = "kde-l10n-sl-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/rck5qqcnw6id22p4ak703wbpygwxl3gx-kde-l10n-hu-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hu-15.04.1.tar.xz";
+      sha256 = "1vbbv0lmim0368kc328x430s69fybsg3mh5wnadfrkmlzliigh3l";
+      name = "kde-l10n-hu-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ydwfc2skbipdis45li6vj1qahaxdqxxj-kde-l10n-el-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-el-15.04.1.tar.xz";
+      sha256 = "131064jjxqqi50ywljic71fdismqpqg9h1yjyv8wxs9rl1mb8s90";
+      name = "kde-l10n-el-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/l89gan31lfivzmmjq1wvqgk6jaqvi6bw-kde-l10n-ia-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ia-15.04.1.tar.xz";
+      sha256 = "092s5b2abb8amiqcvg95p84b91jncxcmbad3yhkxw2lkzllrl83y";
+      name = "kde-l10n-ia-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksystemlog-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/42gd0z1f41kc9jfk2sdqyx7lr5dzyh6l-ksystemlog-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ksystemlog-15.04.1.tar.xz";
+      sha256 = "0zf7vzlxvby6kf8ccydy4dxwwkmr3lhhpklgiywz6m26i4iapjdg";
+      name = "ksystemlog-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdeedu-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/8pcp0gamz0v2vfjgvjr2avgchwzrs128-libkdeedu-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkdeedu-15.04.1.tar.xz";
+      sha256 = "1y3zmhbbwl98cm8whkpafsrk4n9pn7ass6pyn9pnwz8g1lc853ig";
+      name = "libkdeedu-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcharselect-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/gwccqzp4a5glln0zpp179j932l9cdwbd-kcharselect-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kcharselect-15.04.1.tar.xz";
+      sha256 = "1v4j2jn05vynnzpk11r2vg79v8ih945vkv37xw4isvfcicd5bjjh";
+      name = "kcharselect-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krfb-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/k67yxmxak82q0bigh94har3zd57g8ijb-krfb-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/krfb-15.04.1.tar.xz";
+      sha256 = "0mscrcvbhmhm7a330rwxywxpk09h4255j0ah3f5lq08zwhrpzd9r";
+      name = "krfb-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "palapeli-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/zyqcyz9b4g57ww1cwz6hmhga1nwhmcjd-palapeli-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/palapeli-15.04.1.tar.xz";
+      sha256 = "17xxsmrksxvf4km7a1dbcx2fsbiiwkhszdr17gywlz6b1k2rpybj";
+      name = "palapeli-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/c7m3wis5dcxivjswlzcw8pp216pq813a-kwalletmanager-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kwalletmanager-15.04.1.tar.xz";
+      sha256 = "0j197d8cmmgv8mz1scgp9qdq87sx318nkb7jymc28cc6d49mrwgx";
+      name = "kwalletmanager-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgeography-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/bzaka1rvr5lr71h054w8zw10xlqpgd70-kgeography-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kgeography-15.04.1.tar.xz";
+      sha256 = "0g4wxd3qzsp99m4h5aga5cwky1xffwpys3lm29083agl8gvyrs0p";
+      name = "kgeography-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "blinken-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/wdnknychhn65zahmpka1x60n082mqjfg-blinken-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/blinken-15.04.1.tar.xz";
+      sha256 = "0vavcjbsc4lx0a715pwqshc5l03h3nlpk8lpbbswik47rs10k156";
+      name = "blinken-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "rocs-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/im5b97nl4p7f5f1pkzrhjbqbhx6p5ap7-rocs-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/rocs-15.04.1.tar.xz";
+      sha256 = "1cplxlv8a7vsa18j7m629h06v4a0z123mhmg8blzqwh0wwsj71r8";
+      name = "rocs-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.8.tar.xz" ".tar";
+    store = "/nix/store/mxcxsdllc81x1w8y4p40b1s5gkkbzsqm-kdepimlibs-4.14.8.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdepimlibs-4.14.8.tar.xz";
+      sha256 = "0522aby3gm99n18g7p59vi0rzz0ysj9rzljlci5j873mv7yff242";
+      name = "kdepimlibs-4.14.8.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knetwalk-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/kmp1kna6sixbxjdzcnn1agarx8xq9ps4-knetwalk-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/knetwalk-15.04.1.tar.xz";
+      sha256 = "1hq7cldh4n9kbfhc1bj3mra9dgafk6hkn5pazp2rfipmfmxj3w3b";
+      name = "knetwalk-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "marble-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/klfb6qwspc6raf7kw49s3y5xgdxn9l77-marble-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/marble-15.04.1.tar.xz";
+      sha256 = "0aqgh7s07ryhyz0a62pzj3a73ip26df1cw9g103x5iapia5lyp3p";
+      name = "marble-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolf-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xd8id5gbv47bg5jrk8qammqviv861s60-kolf-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kolf-15.04.1.tar.xz";
+      sha256 = "1r8zqlmwz2dr3pgh921z3j8pvcry7366qyr6kybkjhyjqr1rmhdh";
+      name = "kolf-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbounce-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vhp18ifxb0v5nnfna3z8qnkpdksc51bd-kbounce-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kbounce-15.04.1.tar.xz";
+      sha256 = "0qxmvkwcanm50w8jd2fcf0q557ywz198ifgsx8piyxmjg8j0hal6";
+      name = "kbounce-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/3ma0rszdvi8hsz0r5f27yafarzmbr1l0-audiocd-kio-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/audiocd-kio-15.04.1.tar.xz";
+      sha256 = "1gxr9ny09sqb80bhkd21wfl902j8kl5qlgvs9amasabgq7450rbq";
+      name = "audiocd-kio-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwordquiz-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/l1yn11z138jfwx11qz2hdvklsvray4ml-kwordquiz-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kwordquiz-15.04.1.tar.xz";
+      sha256 = "0xjk9ihlvs8v79mwqry91lzr5kqnj80wfg84gab8djz7gsixgp0y";
+      name = "kwordquiz-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmousetool-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/wwv9f44nhm3rqhw2x67yb9fvxsc31shf-kmousetool-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kmousetool-15.04.1.tar.xz";
+      sha256 = "1833yjmgky80w8l06k31j5fd607kada5pi85rcc1730i3g18mqys";
+      name = "kmousetool-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/zsx5r10khmay1jfph7202zd9k0kqk68f-kdesdk-strigi-analyzers-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdesdk-strigi-analyzers-15.04.1.tar.xz";
+      sha256 = "1yhaixb6dqpw02v1y0zqj6yl2i4lr1m69ns20bb2qaz44kbril7k";
+      name = "kdesdk-strigi-analyzers-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/6jdycwm8ads0midd532mh8g4rc3zis63-ksaneplugin-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ksaneplugin-15.04.1.tar.xz";
+      sha256 = "0wlirj6dqigdnz2xy5yab0cf6npzvx91zbyg9plfqig4h0m5vjrw";
+      name = "ksaneplugin-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccessible-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/f7ik0yppcn93na9m9dm7qxkfykm7n0im-kaccessible-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kaccessible-15.04.1.tar.xz";
+      sha256 = "01jnaz0n81vyy8wghy21h5ignx4sllv56g3dpck86cj16dh2ymiz";
+      name = "kaccessible-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ypf8qvq4gmys2llq8v7nzayi7nw782lj-kqtquickcharts-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kqtquickcharts-15.04.1.tar.xz";
+      sha256 = "0spg0hfhsngipbdbm8c6yxfw538jk5rdfs83rp2hk7zhhkqvphmj";
+      name = "kqtquickcharts-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbreakout-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/i08nk9biny2fqal1kkzs9lwpxxp2rwf5-kbreakout-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kbreakout-15.04.1.tar.xz";
+      sha256 = "0fg6z8b2p43c0p11ijbha2f6dycc4f0z487sg6y8jr6vqszqwm6q";
+      name = "kbreakout-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/r12i36mznnvlgwxm6x3vazwnvargpc60-ksnakeduel-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ksnakeduel-15.04.1.tar.xz";
+      sha256 = "00b0ssad8cvjbp30n5lif41ni1515r892xxfvmyl50ajn0s484g1";
+      name = "ksnakeduel-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kreversi-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/qqw2j0bsr3s5rn9s0a32ia15ciqa0ggj-kreversi-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kreversi-15.04.1.tar.xz";
+      sha256 = "0czkvks9i7i4nl64afml9g029ahp9xxqyfv2jqphhyrz7al36l81";
+      name = "kreversi-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdcraw-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xca9i6zvlnrnn6cqvab1dj91id7ns8bz-libkdcraw-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkdcraw-15.04.1.tar.xz";
+      sha256 = "115b8m4f588mxmq8f4chg10nbb3wry3zvxgmji7pac49aszvdgj0";
+      name = "libkdcraw-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "artikulate-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/b5ybam6zgslfklbmr1nvj8xxb2n0ay27-artikulate-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/artikulate-15.04.1.tar.xz";
+      sha256 = "1498gndm0w96s7v109f8fc9y4bkb6bl9c0jaw24i1wn97hiiwigf";
+      name = "artikulate-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkipi-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/czagm2ybdwy6z3672z5ck07pqjjkdh7z-libkipi-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkipi-15.04.1.tar.xz";
+      sha256 = "12rmhva1kcjvcb21rhb5r6kx5bhs3zp66zg05zp0r4r5kbcf7rir";
+      name = "libkipi-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiriki-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/4dv1qqm1cvl2lym8yppwgiqj3bxbas7k-kiriki-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kiriki-15.04.1.tar.xz";
+      sha256 = "0fqx790jz7pfajqjhpza2fz3vr7q8mxixx6nvv8shfsqxaqi1xf8";
+      name = "kiriki-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/4wd2nryy9gg0x5p1vm5fv3hxl48bxcw2-kremotecontrol-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kremotecontrol-15.04.1.tar.xz";
+      sha256 = "1nrnq46qa2m5rh4lj9sxrqb130jljfwafw6asz8gm32202xg4fqi";
+      name = "kremotecontrol-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kigo-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/s7my7ndzl4cf3nkxhp23krf8cc0rxpb6-kigo-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kigo-15.04.1.tar.xz";
+      sha256 = "0a2a39x1249vjgwc7sxvf1kxmkjd6nq97rhh7cp7j3ssa2gggspn";
+      name = "kigo-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "jovie-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/9dhsv2hxy8pwh8i6sp9dmirz3d7hlk77-jovie-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/jovie-15.04.1.tar.xz";
+      sha256 = "051ycpgifz9si8301167rr7h50qcnkhffk0wyr59iqxyyf69aqbf";
+      name = "jovie-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdf-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/m088jnlvz3b3fabza6hcy3dh57mbs3f5-kdf-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdf-15.04.1.tar.xz";
+      sha256 = "0by7dn3r22cx9slibc2jplbi6k498xiizidymaxkf6wa9f6m76yn";
+      name = "kdf-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapman-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/4lnw56hhsqbrgp60fwwcf62wdxb3k2aq-kapman-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kapman-15.04.1.tar.xz";
+      sha256 = "1pwbxc9pbhr2cbr4n48hsnja7fghr2af02aifvrsj6jgcxzryfgd";
+      name = "kapman-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kanagram-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/kgjhkp3h6gaz1pi62mmyg8z0xyb1h4lz-kanagram-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kanagram-15.04.1.tar.xz";
+      sha256 = "1i9z5hyqj326iim43mlrvvpl47b4244s1spk3xf8a3a929bwlf9l";
+      name = "kanagram-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/5bs3g1zqj5b13h4flvy9v4m620lcw7lf-ktp-send-file-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-send-file-15.04.1.tar.xz";
+      sha256 = "0dzyvsnnxi6n3hy3rwyng4pszx4ghcgry3cvw6d3jrzlg4y3afmz";
+      name = "ktp-send-file-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmines-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/rqnvyiybcn99da45q2bvl8dwpa4y764z-kmines-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kmines-15.04.1.tar.xz";
+      sha256 = "1g02fbyqz8nb0qlz49dqn5jay4kdafpdmjx127n0p8wmkw4lh261";
+      name = "kmines-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bovo-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/yrgnwbhl85qivg7hglzgaqqv0hwm91rv-bovo-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/bovo-15.04.1.tar.xz";
+      sha256 = "10y1px3vk9iv19m6m4jlh6bxky10vhyd1r0q7s50rhr44i3ibwml";
+      name = "bovo-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kruler-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vhls9fra4la0ymwa2s387mw5n119hf47-kruler-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kruler-15.04.1.tar.xz";
+      sha256 = "0vhwg4qqiv4gflvqspjibm7zh2zgaxql5xmaylpr90hyc1k3vykl";
+      name = "kruler-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/a7lgl9rd9bpmh8yqdibk0zym25mfc3gm-ktp-desktop-applets-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-desktop-applets-15.04.1.tar.xz";
+      sha256 = "19rzq0k2dklzrlpn1qkad1x0v72dk6szya8fsfgxcv1047cczrma";
+      name = "ktp-desktop-applets-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpat-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/r4n7jrlw47j1mvipzyfw9mx6cksk3rpy-kpat-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kpat-15.04.1.tar.xz";
+      sha256 = "1aa6m64slfg12zg02an8sbv51k5jnq9bs95y666bc1697yij8sag";
+      name = "kpat-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vnpm0h4amj9pxqbrgn8m7xjl04x2ybb7-libkcompactdisc-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkcompactdisc-15.04.1.tar.xz";
+      sha256 = "0lis8llzl684z12yzvrc74zckxxbi06fn1krqkiawhpafl0kc8qs";
+      name = "libkcompactdisc-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgpg-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/6ampb59zxfj4qm8a7fxs0kqchwcxv5kl-kgpg-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kgpg-15.04.1.tar.xz";
+      sha256 = "013z6ryq1khk1hwird678n4rfikgyl173j5chkqpgw7nrz93770c";
+      name = "kgpg-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/7ajx21aws82z92wiqc041jmbysna95cn-kdenetwork-filesharing-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-filesharing-15.04.1.tar.xz";
+      sha256 = "1f26z4zm0bzkbsanj9rw704s25iq0ahw3mi51sgj4ak8gb9r6ibb";
+      name = "kdenetwork-filesharing-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kubrick-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/clxa7535xdqii03b5rp3p8vs2xpc6263-kubrick-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kubrick-15.04.1.tar.xz";
+      sha256 = "0anysvrnyj5pafy7svgszqaj68ryvgbmc8s9xcaw7xpqxxjv2bvd";
+      name = "kubrick-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfourinline-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xk72vmcz1gl5w05wsv0f5qw182hy72vf-kfourinline-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kfourinline-15.04.1.tar.xz";
+      sha256 = "1qg8cg4w207f9ir9saraxyvrhz7y0hr8di9yjv3i32hhmi36v35a";
+      name = "kfourinline-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/b0381wzz8yr0g7a5f89cxq0ay0vvskq7-libkeduvocdocument-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkeduvocdocument-15.04.1.tar.xz";
+      sha256 = "0lky05kb4yqggfzwips4jagfsmi7lc5fwp1zv4mlgh0w68rbzq0f";
+      name = "libkeduvocdocument-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/7wjw21kqy746kxq8ciprhc2jn9sda1qw-mplayerthumbs-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/mplayerthumbs-15.04.1.tar.xz";
+      sha256 = "0a5w3cz6pdsj6vn1zzsjx61x52lqmfnblad0gjv29h7rzxx4p8vr";
+      name = "mplayerthumbs-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/9i6281xfgc9xs8r16kvj96r3f5sq4sx2-kdegraphics-thumbnailers-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-thumbnailers-15.04.1.tar.xz";
+      sha256 = "1lpr7k7mhlrl4f8psixkp64j5igv0kbmfyml618pydbdbkyzy7wb";
+      name = "kdegraphics-thumbnailers-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/gplbfp23pqx6kklb57j6p4pw2hnfy98h-kde-dev-scripts-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-dev-scripts-15.04.1.tar.xz";
+      sha256 = "0yg2xw7ni25i1dvnfd18p0vdpli66xx9dn351av22k313wa7dyw2";
+      name = "kde-dev-scripts-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblocks-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/9rkp8602jhay2myxc1wm1s3511ivf1ix-kblocks-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kblocks-15.04.1.tar.xz";
+      sha256 = "19dhccamka291p75brd03a3r5zll7yfzk9hd9dr52xr45lpbhqd9";
+      name = "kblocks-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klines-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/1hb2447kzfdymip921a3k08rdvls1b10-klines-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/klines-15.04.1.tar.xz";
+      sha256 = "1yb4qya06b3ld0xmnvqxzn6lgvxr8nyfwihgi4ldysxap6v629ra";
+      name = "klines-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/z1pwkj78q3vrjh6yvs5p8wdikl67skgm-kdenetwork-strigi-analyzers-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-strigi-analyzers-15.04.1.tar.xz";
+      sha256 = "03dc3h6r06dzl6z7nagmsahrzivylyiqlnwin9qjm1jw7wvcfdvk";
+      name = "kdenetwork-strigi-analyzers-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeartwork-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/3aj5jpa1s6hzqiwlws6vg00qkn7m49jd-kdeartwork-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdeartwork-15.04.1.tar.xz";
+      sha256 = "023d74d1k6lriy7hg1xigp2dv053dc6cnf74kxj4sgglg8qqnph3";
+      name = "kdeartwork-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/83s2nk00gahqlc1akhv6gv72w165ab4j-ktp-common-internals-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-common-internals-15.04.1.tar.xz";
+      sha256 = "1g7ms93b756iksjimf0vmrrv1cva0956yjyrxa6zx86z2gsqai0m";
+      name = "ktp-common-internals-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "granatier-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vs49yw5vjlplwgsskrwv1i6dva0x12x6-granatier-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/granatier-15.04.1.tar.xz";
+      sha256 = "09dazsxch26kh7pvakqzdcmb1vwx5dakq693v692payxgsrbd9zv";
+      name = "granatier-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kspaceduel-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/flf9jk3v67l044291iscpc7yxqynr8s0-kspaceduel-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kspaceduel-15.04.1.tar.xz";
+      sha256 = "1ypiyj7vz4g8dpzd2lygnlrv4gmzfjwbqflzkqq6gsx2a5v671v8";
+      name = "kspaceduel-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lskat-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/2rrzkyrqqmxphhcszdii2qrfag7y91bg-lskat-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/lskat-15.04.1.tar.xz";
+      sha256 = "1nyjhispwf7brg4a1a50br3k583jh734vqj8v8gwjq68q7sig1an";
+      name = "lskat-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcddb-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/s34in46wqxw0pyf0fgzmagbi9r18r1i5-libkcddb-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkcddb-15.04.1.tar.xz";
+      sha256 = "1fp8zq00nijwygap3571lpcyy3qn318djv0gj6vjyzfxlkijl745";
+      name = "libkcddb-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/yrpx93448287fy645dnvwkc21c5fw41y-kdegraphics-mobipocket-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-mobipocket-15.04.1.tar.xz";
+      sha256 = "1y4ci3l837l3pi308jzh1mvw9rxhyjdx8hgz29vca2gpwyp0v6zi";
+      name = "kdegraphics-mobipocket-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkface-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/7pmab8n861ng48b8483d2l71qy7prm75-libkface-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkface-15.04.1.tar.xz";
+      sha256 = "1iannhmn3gh7j3q8x9dm4jvkilrnpkvzhqz4rs4cksr1q49hh8ah";
+      name = "libkface-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbruch-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/n7n2q3a4r9par2kc13nixqidwl5z1qwg-kbruch-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kbruch-15.04.1.tar.xz";
+      sha256 = "0d747mv9mwp0kk6q2bx0h3bn1km99wcxljhsz62kd9g3myzga6sj";
+      name = "kbruch-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cantor-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/5dbbmdm1w5r7hsy2z999aj8b7amy5mz8-cantor-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/cantor-15.04.1.tar.xz";
+      sha256 = "0rlldfww4rzhxvsq3yl2a5ybcd4h4xihcy4924dbjzp15zgxjzyb";
+      name = "cantor-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnapshot-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xya1fmdi09yiq9xvvpqp5bks628n6yqz-ksnapshot-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ksnapshot-15.04.1.tar.xz";
+      sha256 = "0bmq7qvi5522qcj1ksjy9m7pf3yr6n8hf809isvbamvqk285vln6";
+      name = "ksnapshot-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kopete-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/qq5dm0qrnb40nk2lhdyhhwxwnm2w73ry-kopete-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kopete-15.04.1.tar.xz";
+      sha256 = "195vdbnk9azfhk7i3vq5zbw1c8f7wz3xdjm2n5g2sv3gnmgm598q";
+      name = "kopete-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kteatime-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/cgc2v9iffy7a48sn95rr9x05xwi6h1cy-kteatime-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kteatime-15.04.1.tar.xz";
+      sha256 = "0sxdnk9v1p5mcwp8wka60saiqdm4r9bfpyh40qksd89jkjzw7aj9";
+      name = "kteatime-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.8.tar.xz" ".tar";
+    store = "/nix/store/jwibw4jpjfxxhkv6kps17yqmaljsymi0-kdelibs-4.14.8.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdelibs-4.14.8.tar.xz";
+      sha256 = "1fwvqgxxwy9ka6wq4ysn5x6blqw8wqrfnh6hk6m65jdknflshpvh";
+      name = "kdelibs-4.14.8.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kajongg-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/r34lymfzw7s9j1j30llnkj9b0nn0pxr3-kajongg-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kajongg-15.04.1.tar.xz";
+      sha256 = "15yn5ixkwmwg1hvkdr6sl26zch5rdmjq0iqmc1kyrdipdhdp5mzm";
+      name = "kajongg-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "print-manager-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/7a9mkd04lsih0rq5dld1mnsx3cxrkr1z-print-manager-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/print-manager-15.04.1.tar.xz";
+      sha256 = "05dpx0cwlpy17x2knq98kf6s1bh72lfn8i5l5xzf4bxil9s2fir9";
+      name = "print-manager-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/lz0chc1pimbj5ddi5bkp2nlrlbvgi5l1-kde-baseapps-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-baseapps-15.04.1.tar.xz";
+      sha256 = "0970mw5ywjimrmhcfskwiwc048w1rvjffs3d2a9v74yvv64irkgv";
+      name = "kde-baseapps-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiten-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/f02ixhrvj27hwwsswk7p8n9hdwfrlyms-kiten-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kiten-15.04.1.tar.xz";
+      sha256 = "0l85ccy71ag6nn8fn7b3yr8pjikzivrq6dxka2342nfqidhfpzfh";
+      name = "kiten-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krdc-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/kcp6bc4c7vwnrvpjgvlwx0q3ss74f3ay-krdc-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/krdc-15.04.1.tar.xz";
+      sha256 = "1d1cjy9b5sx533j1aayw503b65gg7pc5wk3n9hy3x9f1a2yywv1i";
+      name = "krdc-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "superkaramba-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/akzfq1iqi1p5zyy4ha003jxq93hx41bk-superkaramba-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/superkaramba-15.04.1.tar.xz";
+      sha256 = "1ncvmmvsfs4jp67ij1vs87sjg59x960pqqxblq49m0l6vmp0l6j8";
+      name = "superkaramba-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "katomic-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xqifvkcnpvncp34cz72axncvfm4ar17r-katomic-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/katomic-15.04.1.tar.xz";
+      sha256 = "1lpsvi2hnf4f5ngdkcg56j73qwjzm8zahl2pm5l0r53i95kxlqyd";
+      name = "katomic-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "killbots-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/rzm4an2qh22q4d8gxn7hf2lc1h8apblj-killbots-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/killbots-15.04.1.tar.xz";
+      sha256 = "1wrdwjcpr75lwbrb6ijbwi8ghkgdlp3sv5sbbmws9p77xa13scyk";
+      name = "killbots-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkgeomap-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/2sprrk9f1bp0i1pyprzkbfx93p44qr3h-libkgeomap-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkgeomap-15.04.1.tar.xz";
+      sha256 = "1zj7wimigjlrg2sq3288wc1h5by155ngascwbbn1x9zy86akb5dj";
+      name = "libkgeomap-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konsole-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/6p788sim5alh13lbgfc4095nas0rav9m-konsole-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/konsole-15.04.1.tar.xz";
+      sha256 = "0fddv6ag23m5ks1cj8rrfbd2xcifxwijkypx6dhxk4pbgkhy0m8m";
+      name = "konsole-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kuser-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/0z7jv74ig27pxaf6fw9sq33r4xvanm4k-kuser-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kuser-15.04.1.tar.xz";
+      sha256 = "1gvpqazrij2ipdfhyfbsw1vgv4173j4r4qnbp2sd8kjibryqcm76";
+      name = "kuser-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/8krkra77y0vck4pki2r25zivig521cqk-ktp-kded-module-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-kded-module-15.04.1.tar.xz";
+      sha256 = "0hyyz9f8qjzcqj6g92a4g4a3xp7fgyfgznir65mx2kka6fq7532s";
+      name = "ktp-kded-module-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/lbvr1zi1lipmmdx5pkga2k06isy0kk5y-ktp-accounts-kcm-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-accounts-kcm-15.04.1.tar.xz";
+      sha256 = "0s2nny6l744fvf45yczzbcrx1win47b0xvxgf16s29q3y2l51y3s";
+      name = "ktp-accounts-kcm-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klettres-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xdqivsid3wvc73mxnwzn7ayva3002l3a-klettres-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/klettres-15.04.1.tar.xz";
+      sha256 = "1shlhdmzmis0szafk6kvjy0w25xr7p261zj1fi4gz5hr7262lirz";
+      name = "klettres-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ayi379ldyhmq5cn53nf89lmvwwfyp9gm-signon-kwallet-extension-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/signon-kwallet-extension-15.04.1.tar.xz";
+      sha256 = "0nk1gjz2bw6kssv09kwksj8p5qpzz90plpnd4nd19qnhgz0a0v7r";
+      name = "signon-kwallet-extension-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-runtime-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/wg7pzsw9s8lm35cxihc08fs9jd21jm13-kde-runtime-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-runtime-15.04.1.tar.xz";
+      sha256 = "178n0zfjzzfpr1shqxyixlb2swmkz2n17xhnmf04hql2l4yj3khp";
+      name = "kde-runtime-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/k0ph8jkjq43ym4851swr12csj53vdh6m-kaccounts-providers-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kaccounts-providers-15.04.1.tar.xz";
+      sha256 = "1bd9v89r6y90r8bkm9m46p8yzpbv1zyf4bg0c3scbaqkviqihi09";
+      name = "kaccounts-providers-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bomber-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/sczdf7d6q8qr4kjlyk1q4s573mr7g0fd-bomber-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/bomber-15.04.1.tar.xz";
+      sha256 = "0mzik0cfz6v0jd31z5q9hkfxsynrhiwm704ns4pgb8qsww41yzrf";
+      name = "bomber-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkexiv2-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/qc76hz1v7rawy1xb3d7dlf4yxw9d6clz-libkexiv2-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkexiv2-15.04.1.tar.xz";
+      sha256 = "0f3ljs8n2gc9frn3j0cjy60hp8wq0f66ry2qpmdaypdswr7vx04n";
+      name = "libkexiv2-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/lmzsbajhy53ay7swff47gsq3il629wfj-ktp-auth-handler-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-auth-handler-15.04.1.tar.xz";
+      sha256 = "1ixxvf5lvy0isv0gqc6sw2pfjqz139kcd0pncq4i89kwqnca8jkp";
+      name = "ktp-auth-handler-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.8.tar.xz" ".tar";
+    store = "/nix/store/xxnnkp49p5s0hc4sgsb0id14mnfsd6f5-kdepim-runtime-4.14.8.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdepim-runtime-4.14.8.tar.xz";
+      sha256 = "1c9lmacadkxdl8kaxn823a7r07w67hrzdypijvvz3ms7k5i84k0z";
+      name = "kdepim-runtime-4.14.8.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klickety-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/wffyflkf9im135fdalll1x68cm523rgm-klickety-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/klickety-15.04.1.tar.xz";
+      sha256 = "0igw7rm7ii30x3971gg5zjpzljlr1ajxbk5bjylizxbl960dx0kw";
+      name = "klickety-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/rmzhngxxfnvbr76mm85zgp4zlqbjid9z-libkomparediff2-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkomparediff2-15.04.1.tar.xz";
+      sha256 = "16fkixmpvxn7459v41418rs49n6knnf1lpfz1mjidaz6q7ii5y8p";
+      name = "libkomparediff2-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/c6yg7sc1xnla574r1bc122gp63y8wvyp-ktp-contact-list-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-list-15.04.1.tar.xz";
+      sha256 = "1vmcs0ww4hv7ckb9nddkpci57ha7j6wqrwiikq4rxcvq9a4z1g7x";
+      name = "ktp-contact-list-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/v7wjiq2vwpv0r1c6rqfxhjsdcvcr9ffd-ktp-contact-runner-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-runner-15.04.1.tar.xz";
+      sha256 = "19hin3qmcznxlp1lypka7h1nqj4n40hys6sxf6m74fx0myk6jia9";
+      name = "ktp-contact-runner-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/al6rmbszcmx8m2fk4i2ihxxp4wk2n06p-kcolorchooser-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kcolorchooser-15.04.1.tar.xz";
+      sha256 = "1q1ipvvd02kgrvz322m7gn6rwxdnpkkj4575yrn6vpxx616q1pf7";
+      name = "kcolorchooser-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfloppy-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/4zgqikwm771c85nkd20xw9lplpyqhycf-kfloppy-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kfloppy-15.04.1.tar.xz";
+      sha256 = "1rqccsiyfazsbfjs8mpjsqbbw9pd6fakdb076q0mj2syrlm7xr36";
+      name = "kfloppy-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/277d4282d2h3cqrjrrlh6w6z0f9sp12l-kde-wallpapers-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-wallpapers-15.04.1.tar.xz";
+      sha256 = "0nbv456714vr5mp125bdza3czgxzhbv2wglsmxj0sqc1k6fiadfi";
+      name = "kde-wallpapers-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksirk-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vzxblpcsa0jrzcwcp5a9pnax60dkjwav-ksirk-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ksirk-15.04.1.tar.xz";
+      sha256 = "1v56n78cxd9201r5pz3vn4mkpry2rihy138ar7kpqvcp7radipr6";
+      name = "ksirk-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmag-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ir7qgza1smfbnwdxf1aj60p1xqmgb44p-kmag-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kmag-15.04.1.tar.xz";
+      sha256 = "0xh66mpddlriivcqg931nd5bbqvrylq1gpccqbajahhr0jbp6lzf";
+      name = "kmag-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xli6mjyym1qql8id8fwjvx9yils6kihx-ktp-text-ui-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-text-ui-15.04.1.tar.xz";
+      sha256 = "00nbzyh2m9gg401krcnm5p38xj6xyp8n6v4lh779hdx63d755myw";
+      name = "ktp-text-ui-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okteta-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/gxnx1dmd8964wj7cz37c50i382sg2gbp-okteta-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/okteta-15.04.1.tar.xz";
+      sha256 = "17jvf6ca27xj1vv7yss2886imdaws2xpkibz13aicjvw23xhxhvj";
+      name = "okteta-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmix-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/0wvrlr0afl9j7mwn6qp59qb5662bnjv4-kmix-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kmix-15.04.1.tar.xz";
+      sha256 = "0gf1a63ycz8hmlzz7xm361hszzr4l7dibwam9pwg4wipankdipxh";
+      name = "kmix-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kget-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/0yx4x1f5rxhk7wg1fj9ck54z5b9wim8q-kget-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kget-15.04.1.tar.xz";
+      sha256 = "0qckya9r4gic6axq4fi5r5qv4wj31jahbyv1jlyi468wv16cxmnq";
+      name = "kget-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kate-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/0ky72glm45d5p7knpg00xzjp08shjc1b-kate-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kate-15.04.1.tar.xz";
+      sha256 = "0ykppas7fnnslj71y77y2p2qv4jnnv8gdmmfaz5plxkcdjk63a87";
+      name = "kate-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kamera-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/331lhb9vdk6jr5bcd9z9kdg0nsy74sha-kamera-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kamera-15.04.1.tar.xz";
+      sha256 = "1g1lq4g1gk9cw6l1pxaaxzqy4qrqr0f4idkg9bkqbhj20xrl51xd";
+      name = "kamera-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kstars-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/29wwk2c90zcifni2hra686nwqlxjqh4m-kstars-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kstars-15.04.1.tar.xz";
+      sha256 = "1r2sf1ifgkmg8f59jj1j41js538h2x9nr2j6bppd16bbp8gzs2na";
+      name = "kstars-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmouth-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vwkzr7jkym3x2lhilv4vp92pzsc7zj69-kmouth-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kmouth-15.04.1.tar.xz";
+      sha256 = "0qq45lmgxy5wn24wwi8d5p1vc8h25a70xzaw2gdhj1m2vq37sn5p";
+      name = "kmouth-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "poxml-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/nfm24h17jvwp3sbl9r4wyjqhm1ly853h-poxml-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/poxml-15.04.1.tar.xz";
+      sha256 = "0by57c11p2g82cbl4pmv281dnkdky2943bzcy4yb0qnhihpl99nh";
+      name = "poxml-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/zcadi1mwn8qb0s4j9y33cm46z07wlnlv-kdegraphics-strigi-analyzer-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-strigi-analyzer-15.04.1.tar.xz";
+      sha256 = "1xp7k0m2blm6nfzv6pf8vqc2wfdw1pp08dfgg9qvvl4ar80wi62v";
+      name = "kdegraphics-strigi-analyzer-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksudoku-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/iz57bv4hld01cxkdm6dv2i0n72ckv8g9-ksudoku-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ksudoku-15.04.1.tar.xz";
+      sha256 = "1x81q0bya702dcksn86pi8qzw13zb8x558nw3wv8q3z4cp7bzwba";
+      name = "ksudoku-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/33kal7ji8dw5a89n6m7wpfpf519kdwbp-kde-dev-utils-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-dev-utils-15.04.1.tar.xz";
+      sha256 = "01ivnsjvpbl1i55zgrcz01hzcn02mrvr14a0nz8bi5s5l53r88sy";
+      name = "kde-dev-utils-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kompare-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/if8mcxgb9bf6i7hmrvlgmwjvjq92p6k1-kompare-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kompare-15.04.1.tar.xz";
+      sha256 = "1h9xvd48kixrffr89kj3lr6nwbj4jvrw5nqz05jl7q6a4rd11p47";
+      name = "kompare-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kppp-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/k2vyy51405ds24y3mm1dz8y8yifwk60x-kppp-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kppp-15.04.1.tar.xz";
+      sha256 = "0d4mk303yw1f17sw517ni8g0lqr3wdl9r2whz2l3pznnd3hh447q";
+      name = "kppp-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dragon-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/nk9ya7riashh1gaw9jnqwypdalr5sq2l-dragon-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/dragon-15.04.1.tar.xz";
+      sha256 = "1kmp3klp86mmkgvdy973cpnqw9ghbvvs7iqbsqkg19gqg5p3qi6n";
+      name = "dragon-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdegames-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/kl3yj4xk86l67vl3lahdzq4x6gi8w8yv-libkdegames-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkdegames-15.04.1.tar.xz";
+      sha256 = "0jwvywzamfnjv9lfyxbvki9j1y8ksk6x54v4p16k7mkz7dx7qmd7";
+      name = "libkdegames-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/bfyd2yxzm5y2bc8mvchpa5scd297lx5h-kgoldrunner-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kgoldrunner-15.04.1.tar.xz";
+      sha256 = "19aiabdyyyfsc8vdgvh26sh9i2cg4lcvgfca296ch0wdlbs8xdd3";
+      name = "kgoldrunner-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebdev-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/l3hf3r3q9a0mas8i2br6ajlq1h1wnm9h-kdewebdev-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdewebdev-15.04.1.tar.xz";
+      sha256 = "00av449nc04mascih5ii17hbjxxpanr8gbdimjjhdp2z9dvgnb0h";
+      name = "kdewebdev-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knavalbattle-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/vkm47y3nws18va3cz13isi02g1wrkf6p-knavalbattle-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/knavalbattle-15.04.1.tar.xz";
+      sha256 = "0d94bmd2jvd6jzjxzdbc4rgq1k1a22md4azddqm6z1yc1n41qkyc";
+      name = "knavalbattle-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmahjongg-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/n5dxy147bwqxx9i49h2lia68846f1zwg-kmahjongg-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kmahjongg-15.04.1.tar.xz";
+      sha256 = "0zl0z3p07hxyiy5p894cf0rai0ad0i4sihxgj8n23cqs653wglb7";
+      name = "kmahjongg-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ark-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/shl563g5w7cn13zynzpbm94ri1ccy6lm-ark-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ark-15.04.1.tar.xz";
+      sha256 = "077xvn6symzzr9jb5cdfvzf1xbpliq2krnw1ab1c9a251x90zclw";
+      name = "ark-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "gwenview-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ccy2m84g722ihs95n2kindl14n93ir6n-gwenview-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/gwenview-15.04.1.tar.xz";
+      sha256 = "07vvcamksgvk8xgj872ql8a7ml7drw3pbv4z7zgrprzracniapwr";
+      name = "gwenview-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksquares-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/n63xlpj38d1ziy7fg5y5fa0smw12whpa-ksquares-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ksquares-15.04.1.tar.xz";
+      sha256 = "0i6rf5x6wsij05xgv9rzizax7j029am7xgwrzzjdk7anph1mx6i9";
+      name = "ksquares-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "umbrello-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/g91s71jw5mbiy8y2gdknkqnxyklm39wj-umbrello-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/umbrello-15.04.1.tar.xz";
+      sha256 = "1sp8f2bjgp5gv9834csa42531psx0sq43ldjgsgygrnbggzmv8nw";
+      name = "umbrello-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblackbox-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/w1s27mkqknc6q7ni39641vgviyqgnxk0-kblackbox-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kblackbox-15.04.1.tar.xz";
+      sha256 = "02b9kfqm64qz0jnyviag02rd0h36ajmfbnswwgin3i7zbvd5xph0";
+      name = "kblackbox-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolourpaint-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/xsvwhyp6j478pjbjslilb62s89ljdfrd-kolourpaint-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kolourpaint-15.04.1.tar.xz";
+      sha256 = "04vamlgbsmpkfw4g3hrm9mm6imnrk3gk994pqb35ajvz8089prwp";
+      name = "kolourpaint-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "step-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/gjcms2qdl726gv00644ljmsl6ddyywwl-step-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/step-15.04.1.tar.xz";
+      sha256 = "1sy42yxpp1qkpcj151xpi2576j59s0cznig3bj65klm5iamiar48";
+      name = "step-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcachegrind-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/3x1mlqph515m8nf31pdk8wxhhrcbj444-kcachegrind-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kcachegrind-15.04.1.tar.xz";
+      sha256 = "16fvs27gbpsras3q2qva9x9sc4r056rk2q5b0jijqpncha51wnr2";
+      name = "kcachegrind-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/x3hq5g8vcvm5a9npa7amn5w492rh9fhw-ffmpegthumbs-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ffmpegthumbs-15.04.1.tar.xz";
+      sha256 = "196hc96ifqq1m5jja8gkl83a23206l304kqh9rngqbqx2xqbis7g";
+      name = "ffmpegthumbs-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "parley-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/qj4bmbkiah1jrf0arh2r1ygd6ki0vi6q-parley-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/parley-15.04.1.tar.xz";
+      sha256 = "1mz2s4l3bzdpz3jd2rkamwvjiqx133sq7agmrg3ssmhl583bgyln";
+      name = "parley-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmplot-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/4s3kx66a51gj19imxp7y73q59dx3dsb1-kmplot-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kmplot-15.04.1.tar.xz";
+      sha256 = "1rz7l1lggpprmanyr6d1hpyjw6c3z1gdpcf475573y5gip1sylvj";
+      name = "kmplot-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kturtle-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/6irgf5syddcsvyn8jpfmzjmdccy9mp3j-kturtle-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kturtle-15.04.1.tar.xz";
+      sha256 = "0qkaspwdb60cqizf3ph9w245nqg7rarb7riwzdpf007kcpx16905";
+      name = "kturtle-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/2xabxjp756c62b9l4iaqjb2hn6jm57bn-kaccounts-integration-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kaccounts-integration-15.04.1.tar.xz";
+      sha256 = "0rm4i69b63vmcjcdvgc5bj3sygdjxkk5bx12vm70h2wx72zi7bmm";
+      name = "kaccounts-integration-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktouch-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/889f6956q1d0k0m9n1j9bx36y446zaqd-ktouch-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktouch-15.04.1.tar.xz";
+      sha256 = "040xb5bpc848g4m7lpgh2qp7zn3x88pi8lx49rvd7cwy9r0yypxg";
+      name = "ktouch-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "analitza-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ci7yardryphabk0561gfqv9w3bg2dld9-analitza-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/analitza-15.04.1.tar.xz";
+      sha256 = "0ndz76kdk0x63269324c516d7vyssni8q89im62hkcvsjv0y1wb5";
+      name = "analitza-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cervisia-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/6v595hx7jz5v0k6pvmxixva0pz9a86c2-cervisia-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/cervisia-15.04.1.tar.xz";
+      sha256 = "01j8ai5s5gqh5wb6c74yrpr6x8652zdmh25dchpafih5sm5y1s8l";
+      name = "cervisia-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "filelight-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/kxzx5vxg5cl6v99c2q0dx6svzq66lmq3-filelight-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/filelight-15.04.1.tar.xz";
+      sha256 = "1pi3j10h23s7ianr5dhf17skdspnxgqfv9hxzfi0pyy3z9yfhs9r";
+      name = "filelight-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktimer-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/bfgk2rpkifs0kmmg8a9cw2sbcw9x4acj-ktimer-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktimer-15.04.1.tar.xz";
+      sha256 = "0avscwyksa6rba9ppp6pcd332phd2zwsvpbprn0sbsias63mx7rb";
+      name = "ktimer-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "picmi-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/adzmd2pnn5lss9fm35x6hqvb6jfb3dc5-picmi-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/picmi-15.04.1.tar.xz";
+      sha256 = "06v2cxdlg8366r122gfs03y2zfhcml2bp0q79a357b4aj14xah76";
+      name = "picmi-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/g7mzrah5zhp760dw67z836yjb9ycscqb-dolphin-plugins-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/dolphin-plugins-15.04.1.tar.xz";
+      sha256 = "1zw626gzrc0sxbif1y2mnqm96s2yap3fnh3ij1cv81v43yy12jsk";
+      name = "dolphin-plugins-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/9awn6c5akngz6f7h9xbwvnxfjh7k4k6c-libkmahjongg-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libkmahjongg-15.04.1.tar.xz";
+      sha256 = "1lw9k7h2cli65738lp06wwn763aggqdaqm52gf4s25ia6sqa1vs2";
+      name = "libkmahjongg-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/wygvvlqqdcah3ilsr18n32jbidb3vjp2-kde-base-artwork-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-base-artwork-15.04.1.tar.xz";
+      sha256 = "1jxmg1s11kj1qiwlh5jji2bhcgn2d0sx6lljh65snwxg26liwz6v";
+      name = "kde-base-artwork-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kscd-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/k6bz5mzppxksahygjg51bfyr2lmb56vq-kscd-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kscd-15.04.1.tar.xz";
+      sha256 = "17spvnflbq2wq80awk6y895ls214n8h0ssk87r7qmr03pvzhnyaa";
+      name = "kscd-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sweeper-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/s35plhhx4ic5ghzqa9v3ivsvr1rynang-sweeper-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/sweeper-15.04.1.tar.xz";
+      sha256 = "0vzqpyhi5kn2p6waj2pn1myaz44v7dw2ll0hz8vp0rfh9qnwq70l";
+      name = "sweeper-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.19.tar.xz" ".tar";
+    store = "/nix/store/lxglid45py66valnl34y41z7ny1zyla3-kde-workspace-4.11.19.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-workspace-4.11.19.tar.xz";
+      sha256 = "1hn5q86p1wpv6y4wia0sxfn83iya00d6y70gdq3svmhj1bdjj50w";
+      name = "kde-workspace-4.11.19.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konquest-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/wags5sgprgy7cngppjj2n9b29625yp1r-konquest-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/konquest-15.04.1.tar.xz";
+      sha256 = "078503rf9r7rb161xi5j22d08imk2b1g4ma5xyaap8j7jr8qykak";
+      name = "konquest-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kig-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/pii50yzi2wkj384pvswiqcqf3m6w2b22-kig-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kig-15.04.1.tar.xz";
+      sha256 = "07dw82q68akjzc3v1igx1ah1j4b53ph4pgpkrxzh3468nrhkrxqc";
+      name = "kig-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-approver-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/0z3zii1zjnnjk34x0i94nc41i2cdi0gw-ktp-approver-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-approver-15.04.1.tar.xz";
+      sha256 = "158c93kmwffnsx78qr84qqjb34p7czynrqbz3iyj29s79kkx4ix0";
+      name = "ktp-approver-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalzium-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/f4jk61d6sgcx57k7ppjql6qml9q2pazn-kalzium-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kalzium-15.04.1.tar.xz";
+      sha256 = "1islh3c67hlar51hf2hx31c1pg8kkw6h7c6vl3mv442wl468ilvl";
+      name = "kalzium-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcron-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/q6dydf2sgx486rf4rfm3sfbbbsrcns89-kcron-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kcron-15.04.1.tar.xz";
+      sha256 = "0ppdydcasrigqmpldjgvrxmjffizf9gnqbxrjypwirhsay2z5clv";
+      name = "kcron-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktuberling-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/z7nqzkmyfc7fw4a2c4kwh8flvx9309pb-ktuberling-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktuberling-15.04.1.tar.xz";
+      sha256 = "1nm0g089c22nc06xi7446drsgllsxrsfd68r7mm5p38fdh1rmxll";
+      name = "ktuberling-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "juk-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/k9pq6074j197y1hz9hr3xdcla9pcqhic-juk-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/juk-15.04.1.tar.xz";
+      sha256 = "158mxy9c73g27i3plndik4zw8p527zgqq7rj1mrdlj2sic1jd6df";
+      name = "juk-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdiamond-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/266jwjlfnq0njn09f26xnif9bl3v12h8-kdiamond-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdiamond-15.04.1.tar.xz";
+      sha256 = "0kkprlaghidb0skmra1ja9vwncg0zsvawvnjrzb0fgi065iz6bc2";
+      name = "kdiamond-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/cw3cr2nrhmid0miwp6nfh7c3kqwf072k-ktp-filetransfer-handler-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/ktp-filetransfer-handler-15.04.1.tar.xz";
+      sha256 = "1dzkbgpv9fbkwxlzdch0axc722m5kq6viy33isihv2j0hcxvjjzy";
+      name = "ktp-filetransfer-handler-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-4.14.8.tar.xz" ".tar";
+    store = "/nix/store/2jiwn6rshw66kv3v058w34qv45qgkrna-kdepim-4.14.8.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdepim-4.14.8.tar.xz";
+      sha256 = "19z3pfmb8d6gsr9njyfyrjl4llzkk7q6fcl0ng0k0w1q4i4igd2j";
+      name = "kdepim-4.14.8.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/3hz1jgliry4xb27cbn4khkynvz42asfm-kdesdk-thumbnailers-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdesdk-thumbnailers-15.04.1.tar.xz";
+      sha256 = "104wyrapk77mi11a72p03liln0qh0mq84hbgklyf3rwxbdsmysz9";
+      name = "kdesdk-thumbnailers-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/c4kzdj7sq4557wcmhwf2cg566b04x617-kdeedu-data-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdeedu-data-15.04.1.tar.xz";
+      sha256 = "1fvvam4wilijvmlfklqwgvl47ffy7w7lhp61hjgn6chjhrk3wxd1";
+      name = "kdeedu-data-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksane-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/l09dwrlxm13fl8qnk7cpgs66537287cb-libksane-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/libksane-15.04.1.tar.xz";
+      sha256 = "1wlp09c2djprwwsbip0i1jx3d9cj16axbvbyn1hhc1hzaim3wnsc";
+      name = "libksane-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kshisen-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/2mb9v1738cif1qwwkfqyqgbs3lysg0ij-kshisen-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kshisen-15.04.1.tar.xz";
+      sha256 = "0vgh980plqrd0r8s4pp79xy39j7n6z2xjrj62z6bna65wywv8cim";
+      name = "kshisen-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ap7dpxkmh50bay925x93hhchdvga0zc0-kjumpingcube-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kjumpingcube-15.04.1.tar.xz";
+      sha256 = "0lsd14qpb1c6hs9ff9fwpmrbdn7khk6lwdar82l9dwvzd9zk9vpd";
+      name = "kjumpingcube-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/ncrdk952fj4sg748lqfdm9xf5wi5rm2d-zeroconf-ioslave-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/zeroconf-ioslave-15.04.1.tar.xz";
+      sha256 = "181q88i8ygqp2g4c78qr2flwbrnwphix0ksm2qrinrchbc7v7mxm";
+      name = "zeroconf-ioslave-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenlive-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/qcwij9xp4fv8s5zgizij3rmb220r7193-kdenlive-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kdenlive-15.04.1.tar.xz";
+      sha256 = "0v4qx1r5kkkiqvxzdvr2467dhx0ndylvwl1vd723lbdi9vk9gg4q";
+      name = "kdenlive-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khangman-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/g1f0f255pjr3wd2jh10q05xjkgm3340h-khangman-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/khangman-15.04.1.tar.xz";
+      sha256 = "1jnc5cjij32sbxcq2bvmzkdsj2f7w194lwkj48gdkkwfplbn4kwc";
+      name = "khangman-15.04.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lokalize-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/1j2l2qhfkxrgqbwiglg8mn60480sanfy-lokalize-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/lokalize-15.04.1.tar.xz";
+      sha256 = "0h46kf14i4gd17k2fad629b7yq66mcy2cp5w0ir0f071z2s9jvg3";
+      name = "lokalize-15.04.1.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar";
     store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz";
@@ -2413,6 +4447,15 @@
       name = "kde-l10n-ar-15.04.0.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca_valencia-15.04.0.tar.xz";
+      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
+      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar";
     store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz";
diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh
index 3ef8c11c3a14..2aa3cee8c85b 100755
--- a/pkgs/applications/kde-apps-15.04/manifest.sh
+++ b/pkgs/applications/kde-apps-15.04/manifest.sh
@@ -9,6 +9,7 @@ if [ $# -eq 0 ]; then
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../.. -A autonix.manifest) \
       "${KDE_MIRROR}/stable/applications/15.04.0/" \
+      "${KDE_MIRROR}/stable/applications/15.04.1/" \
       $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
 
 else

From 111fec1ba7ffc4ebf0c750038feda447c5aa0f3c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 14 May 2015 19:06:36 -0500
Subject: [PATCH 0870/1143] Add qca-qt5

---
 .../development/libraries/qca-qt5/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/qca-qt5/default.nix

diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
new file mode 100644
index 000000000000..37b0db4ef6ce
--- /dev/null
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }:
+
+let
+  rev = "088ff642fc2990871e3555e73c94c9287e7514a9";
+  shortrev = builtins.substring 0 7 rev;
+in
+stdenv.mkDerivation rec {
+  name = "qca-qt5-20150422-${shortrev}";
+  src = fetchgit {
+    url = "git://anongit.kde.org/qca.git";
+    branchName = "qt5";
+    inherit rev;
+    sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8";
+  };
+
+  buildInputs = [ openssl qt5.base ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Qt 5 Cryptographic Architecture";
+    homepage = http://delta.affinix.com/qca;
+    maintainers = with maintainers; [ ttuegel ];
+    license = with licenses; [ lgpl21Plus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3d6ff843d29..42bfd11b8f6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7516,6 +7516,8 @@ let
 
   qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
 
+  qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
+
   qimageblitz = callPackage ../development/libraries/qimageblitz {};
 
   qjson = callPackage ../development/libraries/qjson { };

From 046fc60314ad26f699f1e2a9d158a54a47fa7acf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 14 May 2015 19:06:43 -0500
Subject: [PATCH 0871/1143] Build ktp-auth-handler with qca-qt5

---
 pkgs/applications/kde-apps-15.04/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index bf31a935e7bc..ef54594a1428 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -121,6 +121,7 @@ let
         PythonLibrary = python;
         Qalculate = libqalculate;
         QCA2 = qca2;
+        Qca-qt5 = qca-qt5.override { inherit qt5; };
         QImageBlitz = qimageblitz;
         QJSON = qjson;
         Qt4 = qt4;

From 7be207ba68abb671856507f5c6a771af2c9fd2dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 14 May 2015 19:12:36 -0500
Subject: [PATCH 0872/1143] Build krfb with KF5

---
 pkgs/applications/kde-apps-15.04/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index ef54594a1428..1b92c5dd21d1 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -321,7 +321,7 @@ let
       krfb = super.krfb // {
         buildInputs =
           super.krfb.buildInputs
-          ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
+          ++ [pkgs.xlibs.libXtst kdeApps.ktp-common-internals];
       };
 
       kstars = super.kstars // {

From 9e1c84a08049f0f9f974bc7ee6038c0b53c20f55 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 14 May 2015 19:17:42 -0500
Subject: [PATCH 0873/1143] Build ktp-common-internals with libotr for
 ktp-text-ui

---
 pkgs/applications/kde-apps-15.04/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 1b92c5dd21d1..59723c9d8353 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -339,7 +339,8 @@ let
       ktp-common-internals = super.ktp-common-internals // {
         buildInputs =
           super.ktp-common-internals.buildInputs
-          ++ (with kf5; [ kdelibs4support kparts ]);
+          ++ (with kf5; [ kdelibs4support kparts ])
+          ++ [ pkgs.libotr ]; # needed for ktp-text-ui
       };
 
       libkdcraw = with pkgs; super.libkdcraw // {

From ab1c27d08660953855644e33a479300a39ae2183 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 14 May 2015 20:51:38 -0500
Subject: [PATCH 0874/1143] Build kstars with cfitsio and kparts

---
 pkgs/applications/kde-apps-15.04/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 59723c9d8353..8d1e5e322420 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -327,7 +327,8 @@ let
       kstars = super.kstars // {
         buildInputs =
           super.kstars.buildInputs
-          ++ (with kf5; [ kparts ]);
+          ++ (with kf5; [ kparts ])
+          ++ [ pkgs.cfitsio ];
       };
 
       ktp-accounts-kcm = super.ktp-accounts-kcm // {

From 87d40251ccaaba4b080b511b1f124555e97569f8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 15 May 2015 05:40:47 -0500
Subject: [PATCH 0875/1143] Build kmahjongg with KDE 4 libkmahjongg

---
 pkgs/applications/kde-apps-15.04/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 8d1e5e322420..9cf57a8923aa 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -34,7 +34,6 @@ let
       "Kexiv2" = "libkexiv2";
       "Kdcraw" = "libkdcraw";
       "Kipi" = "libkipi";
-      "LibKMahjongg" = "libkmahjongg";
       "LibKonq" = "kde-baseapps";
       "Marble" = "marble";
     };
@@ -106,6 +105,7 @@ let
         Ldap = openldap;
         LibAttica = attica;
         LibGcrypt = libgcrypt;
+        LibKMahjongg = kde4.libkmahjongg;
         LibSSH = libssh;
         LibSpectre = libspectre;
         LibVNCServer = libvncserver;

From baed394d926b0fce6f7178c666f5fd5ddce52461 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 15 May 2015 05:40:59 -0500
Subject: [PATCH 0876/1143] Build khangman with KIO

---
 pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 9cf57a8923aa..af7bf8ae738d 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -303,6 +303,12 @@ let
         buildInputs = super.kgpg.buildInputs ++ [boost];
       };
 
+      khangman = super.khangman // {
+        buildInputs =
+          super.khangman.buildInputs
+          ++ [ kf5.kio ];
+      };
+
       kmix = with pkgs; super.kmix // {
         nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
         cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];

From 5b6e66e1b6e1101cfa1182aac09974e3554e2c7f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 15 May 2015 05:41:11 -0500
Subject: [PATCH 0877/1143] Build lokalize with KDBusAddons

---
 pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index af7bf8ae738d..5f6d7c0bb6da 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -350,6 +350,12 @@ let
           ++ [ pkgs.libotr ]; # needed for ktp-text-ui
       };
 
+      lokalize = super.lokalize // {
+        buildInputs =
+          super.lokalize.buildInputs
+          ++ [ kf5.kdbusaddons ];
+      };
+
       libkdcraw = with pkgs; super.libkdcraw // {
         buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
         nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];

From 278df52729bebf4e0c8f91b06eb3545019bebe58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 13:47:27 +0200
Subject: [PATCH 0878/1143] r-xml2: fix build

---
 pkgs/development/r-modules/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index e0b19f465c98..02ae731bc544 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -950,6 +950,13 @@ let
   ];
 
   otherOverrides = old: new: {
+    xml2 = old.xml2.overrideDerivation (attrs: {
+      preConfigure = ''
+        export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2
+        export LIBXML_LIBDIR=${pkgs.libxml2}/lib
+      '';
+    });
+
     curl = old.curl.overrideDerivation (attrs: {
       preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl";
     });

From 949746f9f549e8cad253d1f99867068f4a8ce0e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 13:48:38 +0200
Subject: [PATCH 0879/1143] r-modules: disable broken builds

---
 pkgs/development/r-modules/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 02ae731bc544..11d7193edee7 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -947,6 +947,10 @@ let
     "WideLM" # depends on proprietary cudatoolkit
     "x_ent" # requires opencpu
     "zoib" # tarball is invalid on server
+    "timeSeq" # depends on missing edgeR
+    "survJamda" # depends on missing survcomp
+    "ssizeRNA" # depends on missing 'Biobase', 'edgeR', 'limma', 'qvalue'
+    "h5" # depends on missing h5 system library
   ];
 
   otherOverrides = old: new: {

From 691a65cb41f341ff19f6065c565df09ff1da7e02 Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Fri, 15 May 2015 13:04:11 +0100
Subject: [PATCH 0880/1143] Update SHA256 for hplip plugin

---
 pkgs/misc/drivers/hplip/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 41ed3e710427..7c4e6f45bb4d 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -23,7 +23,7 @@ let
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "0j8z8m3ygwahka7jv3hpzvfz187lh3kzzjhcy7grgaw2k01v5frm";
+    sha256 = "1pzxv9yway1x1m5grz6042p54ldh7jcgv4qrkjhlcb4vr9plwql9";
   };
 
 in

From 2bf516613d88dc16e9185bc0bb1f0e021fbd9442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 29 Apr 2015 22:02:13 +0200
Subject: [PATCH 0881/1143] Add section on fetching sources

---
 doc/coding-conventions.xml | 53 +++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 61d373738f90..e1853d47ce05 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -169,8 +169,8 @@ stdenv.mkDerivation { ...
 args: with args; <replaceable>...</replaceable>
 </programlisting>
 
-  or 
-  
+  or
+
 <programlisting>
 { stdenv, fetchurl, perl, ... }: <replaceable>...</replaceable>
 </programlisting>
@@ -598,6 +598,51 @@ evaluate correctly.</para>
 </section>
 
 </section>
-
-
+<section xml:id="sec-sources"><title>Fetching Sources</title>
+  <para>There are multiple ways to fetch a package source in nixpkgs. The
+    general guidline is that you should package sources with a high degree of
+    availability. Right now there is only one fetcher which has mirroring
+    support and that is <literal>fetchurl</literal>. Note that you should also
+    prefer protocols which have a corresponding proxy environment variable.
+  </para>
+  <para>You can find many source fetch helpers in <literal>pkgs/build-support/fetch*</literal>.
+  </para>
+  <para>In the file <literal>pkgs/top-level/all-packages.nix</literal> you can
+    find fetch helpers, these have names on the form
+    <literal>fetchFrom*</literal>. The intention of these are to provide
+    snapshot fetches but using the same api as some of the version controlled
+    fetchers from <literal>pkgs/build-support/</literal>. As an example going
+    from bad to good:
+    <itemizedlist>
+      <listitem><para>Uses <literal>git://</literal> which won't be proxied.
+        <programlisting>
+          src = fetchgit {
+            url = "git://github.com/NixOS/nix.git";
+            rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+            sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
+          }
+        </programlisting></para>
+      </listitem>
+      <listitem><para>This is ok, but an archive fetch will still be faster.
+        <programlisting>
+          src = fetchgit {
+            url = "https://github.com/NixOS/nix.git";
+            rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+            sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
+          }
+        </programlisting></para>
+      </listitem>
+      <listitem><para>Fetches a snapshot archive and you get the rev you want.
+        <programlisting>
+          src = fetchFromGitHub {
+            owner = "NixOS";
+            repo = "nix";
+            rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+            sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
+          }
+        </programlisting></para>
+      </listitem>
+    </itemizedlist>
+  </para>
+</section>
 </chapter>

From 46721655828a40c62df292c6b7c1443891bb519a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 15:18:43 +0200
Subject: [PATCH 0882/1143] Remove unused file pkgs/top-level/haskell-ng.nix.

---
 pkgs/top-level/haskell-ng.nix | 92 -----------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 pkgs/top-level/haskell-ng.nix

diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix
deleted file mode 100644
index 73c0abd4726d..000000000000
--- a/pkgs/top-level/haskell-ng.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ pkgs, callPackage, stdenv }:
-
-rec {
-
-  lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
-
-  compiler = {
-
-    ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };
-    ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({
-      gmp = pkgs.gmp4;
-    } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({
-      gmp = pkgs.gmp4;
-    } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-
-    ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; };
-    ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; };
-    ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc = compiler.ghc784;
-
-    ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
-      ghc = compiler.ghc7101;
-    };
-  };
-
-  packages = {
-
-    ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; };
-    ghc6123 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc6123;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
-    };
-    ghc704 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc704;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
-    };
-    ghc722 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc722;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
-    };
-    ghc742 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc742;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
-    };
-    ghc763 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc763;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
-    };
-    ghc784 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc784;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
-    };
-    ghc7101 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc7101;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
-    };
-    ghcHEAD = callPackage ../development/haskell-modules {
-      ghc = compiler.ghcHEAD;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
-    };
-    ghcjs = callPackage ../development/haskell-modules {
-      ghc = compiler.ghcjs;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
-    };
-
-  };
-}

From 1e0ab1d4ceae87f0859264f6c702b5ea52b4ebdf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 15:20:24 +0200
Subject: [PATCH 0883/1143] haskell-packages.nix: remove unused attribute
 'haskell.compiler.ghc'

All compilers in that attribute set are versioned.
---
 pkgs/top-level/haskell-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0051c2b3e21f..8e0ff1834c6e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -37,7 +37,6 @@ rec {
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
-    ghc = compiler.ghc784;
 
     ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
       ghc = compiler.ghc7101;

From 4b09501f23f128cf46f3eb57d615aa0c2c106125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 15 May 2015 13:23:49 +0000
Subject: [PATCH 0884/1143] Making go build for any arm.

---
 pkgs/development/compilers/go/1.4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 371496250056..473ff458ff87 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
   GOARCH = if stdenv.isDarwin then "amd64"
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.system == "armv5tel-linux" then "arm"
+           else if stdenv.isArm then "arm"
            else throw "Unsupported system";
   GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686

From 92312e17e81c69dd700680ea156fc59e88c5d3e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 15:25:53 +0200
Subject: [PATCH 0885/1143] Move definitions of 'uhc' and 'jhc' to
 'haskell.compiler' attribute set.

---
 pkgs/top-level/all-packages.nix     | 10 +---------
 pkgs/top-level/haskell-packages.nix | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0af285825a7c..2f2d5fb220aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3757,15 +3757,6 @@ let
     };
   };
 
-  jhc = callPackage ../development/compilers/jhc {
-    inherit (haskell.packages.ghc763) ghcWithPackages;
-  };
-
-  uhc = callPackage ../development/compilers/uhc/default.nix ({
-    stdenv = clangStdenv;
-    inherit (haskellPackages) ghcWithPackages;
-  });
-
   gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
     version = "4.7-2013q3-20130916";
     releaseType = "update";
@@ -14577,6 +14568,7 @@ let
   rssglx = rss-glx; #added 2015-03-25
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
+  inherit (haskell.compiler) jhc uhc;   # 2015-05-15
 
   opentsdb = callPackage ../tools/misc/opentsdb {};
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8e0ff1834c6e..6b37718afeae 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -41,6 +41,16 @@ rec {
     ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
       ghc = compiler.ghc7101;
     };
+
+    jhc = callPackage ../development/compilers/jhc {
+      inherit (packages.ghc763) ghcWithPackages;
+    };
+
+    uhc = callPackage ../development/compilers/uhc/default.nix ({
+      stdenv = pkgs.clangStdenv;
+      inherit (pkgs.haskellPackages) ghcWithPackages;
+    });
+
   };
 
   packages = {

From 57c278200a3a322f7ac355f222f16f2ee27521ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 15:27:49 +0200
Subject: [PATCH 0886/1143] all-packages.nix: strip trailing whitespace

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f2d5fb220aa..0c15f9ce0a41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9644,7 +9644,7 @@ let
 
   numactl = callPackage ../os-specific/linux/numactl { };
 
-  open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { 
+  open-vm-tools = callPackage ../applications/virtualization/open-vm-tools {
     inherit (xlibs) libXinerama libXi libXrender libXrandr libXtst;
     inherit (gnome) gtk gtkmm;
   };

From 92587ccc1f31af50aa79cdde4ad753eb33ce7e09 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 15 May 2015 16:40:36 +0200
Subject: [PATCH 0887/1143] pycharm: update 4.0.6 -> 4.5

---
 pkgs/applications/editors/idea/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 4a22b6e990a3..5ca5e7dd093f 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -273,25 +273,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "4.0.6";
-    build = "139.1659";
-    description = "PyCharm 4.0 Community Edition";
+    version = "4.5";
+    build = "141.1116";
+    description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "16lf2slssfgbds6zyp2rs0ssrg8aw5d2w7b755iqimiyfhyyv83s";
+      sha256 = "0igx62rijalppsd1nwrri1r4m1597n93ncglyb6b94m3fm32fca6";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "4.0.6";
-    build = "139.1659";
-    description = "PyCharm 4.0 Professional Edition";
+    version = "4.5";
+    build = "141.1116";
+    description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0wavw41nzqnx75y3k3l5kq09i5d9j8hb4r6a0y3nxzqvmdfza55r";
+      sha256 = "0zga8sxwrvjvyw9v1pvq40gasp485r1d627jj6jvwzcv78il50d9";
     };
   };
 

From fa2102b4638c49dae077d8572e7c74cb6001d9a6 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 16 May 2015 00:43:44 +0900
Subject: [PATCH 0888/1143] firefox-bin: update to version 38.0.1

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 2e5545d6a959..c5d82573a322 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "38.0";
+  version = "38.0.1";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "703e63e142bba42a1735acf9da88cd52e722ab02"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "93da442b9262e2191145cbf95813fae1358cd981"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "b489f1a3fbae4762e7dac947d26effa3ff0c3f60"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "fe6b38ceb279e042d238064154f6d4d8e2c6fb61"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "28bdaafca6b99f115dcdae34a0f6ce4eaeaf5507"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "726e734772bf68ff5e4b88ed789b10122fe302bc"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "ed0ab975dbf5a26c3704fdd24b47b7f358edeb3a"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "909af01cbe8eb2e2c3557a474bb0d77b03b40a6d"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "c869d42a757798d17d0b0398c6a75652e795ce4c"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "c4183741ea8383caa350c115288f32057306bc95"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "9f20f4dae0ede083f193c61935d2781c7cd29b76"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "0198b69cbf5864a1d4981e0a3e0373e7bad1b8a8"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "f2ab43ab4bd81c4dfc17657943e962a1b2ec01ab"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "f903da974577d99354ba7e2d753c8796af3cc037"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "ff88567de38d5a9195e3d31bdb3897c6db960315"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "7a4bc7296bad8fa1afad53ec9c56b933bf2f34d4"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "452515451a1a1e1640f46233d287d62213948dd1"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "715cffedcd576b8b124b67effaf72e9091bbd072"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "e8418ff4e04dd2058dd50fb2a926df4c975fd5a4"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e3e4037b8f19355b036af6c19ce9ba11a13411f1"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "edae503e6d7529ba3af7facda18cc25a9634c7d6"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b22a1784efb4ba741843360a8cb2da95e8eefa77"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "776b7edd9fdb3a02cbcd2c74f7fe237760483e37"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "19718f8e6e45ac480ea8ede27408063e3e966044"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "e74b5e40c76429cbfe84c282a8d7f3d7e39ed3b6"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "6cf56a28635a84e87a6d2735d812b5bd286f66b3"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "c062cbb2847c78990849ed34171b356ba2514a4a"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "443875f512bc1ff697d3a2848710afa0cf27149f"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "4c7ea9e5cf6c9cc790f8e738658155160062d82b"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "34ed2e0cdba5c9347c886d0f5f1dc595339001b3"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "161aa92acbd5175e0e05094a98ae4620f3e61e15"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "07fed553ab3d8942af865ef54ca45d3cb084671a"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "1d287b810ab6eb2c69861aa97279d95e5de9e00b"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "a11872f1243fb7f2afac871497f77e559c571198"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "d44d41473f9c89129316247e3b3782ac5e734a03"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "bf82fadea1008287e6b7b6c5cc3ce45297102493"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "f6f533c7c96e5b0551df12007511fb03b252d568"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "5d2c8f0729bf9dd7a33f3469e5eceb10d3b68e4c"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "f3bcdb0616e7dbb9d0c014819568c426643b01d6"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "65d0ecad9093142bc122479f71d4a8f865dab9ce"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "b8681a21ee8c59067abb8971d5dfc0c183ce9f3a"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "8b94b6866f865926142fadaa1c4a995d8a4939ab"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "a37a42035062385ed664521e6fcc64b6acc3e100"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f72bd458cf0f42894a1023b09e25ba491c666c8d"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "84eb150df148cc792398f020a06c368b0f3a5384"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "84bb82b946c227931383620f2bda7a4511c86772"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "878ac1426303882701ca99a0e54ce025d5275e84"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "a4187e25529dde37e4b6f5201035efef69810e7d"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "adb3ecd1082e944f6cfb6c224fb99868d6b204e7"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "1ebba7dde7424c0855f738fb37c71be6739ddd54"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "7247e16910263ab971fdf7957e6e075a41ce0072"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "40113a4ddf11d43ae9b382456810193c3e50204a"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "328ec405ff20ee4ac3dcdb242978f552fd471bb4"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "aeb6d54290b1c2e882e871520232f20e05c9ee49"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "b5b0d078d36ac681df735336406e3a5d5ef7347c"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cb02ced1e1e132247cba8505e1a3240bb71ac186"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "27eccc34804a058bd163f369715863486a9a578d"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "2429fbb2e011cee22024b4f2d34b6e28821ba874"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "3496749c75804f7d710edb8e3c67e7291608ca39"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "9401f038ff97bf8ed55e21e8871f33aa342268da"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "6068057c34ef0c53a70f01d29bdbccc708c57501"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "c18b0c916f7716012b7e7262351741c6c798c951"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "c32c8be17b6254bd48166062569e41bd8cf3a1ca"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "717da6c53be118f6373e8c68c2e82ef720503646"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "0e15abde00eb8e7807985deb74a2abb7c1f48ffa"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "b0f556019f0696a14b538925551b64e0d8e4f9cc"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "f07ed45bef78333cddbbe8490683867c81e4d497"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "e43a5d8034e641ffa8380cbbfec04e5e04ffe025"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7d1d7228eca1e24bbcd3f247f2cb0bcbeb7843"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "fceeca14bbad0baa0ab76c51f826701df4a35c54"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "2fdb907fc1a6d889a177eee661d246d485c0b2d7"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "11a516d9104ece3130f01c1d6a4a218409ac191b"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "290b25548e4a0f123598953e08b6ffc0ffa7f5a8"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "ea371c234e4eb6e3a4a1b92add169d7539df16a0"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "3fcaa32d2f4825b59ed7f08dee92c7ef9a5301e4"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "1118347a7bcb197bdfcdadfd96a33c315f716cd5"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "368318d6cc8393d0867fe9e0abc0109420a0ad7f"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "72c8eae63bb9298d3b54c9f93ff442a1ffa21b47"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "27255ec09da56566297af99f22d13de1f5807d0a"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "f557dc50e027f2f1b327977df9bf1b86640b035d"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "942f2c4eff380ea660deb2a3a26f0b0716d10e84"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "7e4085fc80eb4b10010f10ad7ea3b40278c60c26"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "870d720f3a56068f4c0ec3ed0393efeca5106c52"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fbafa4f4f18bf4fbfe42366a1bdcd06952d1886"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "010b18faf1f999f88a5a618ca03e05a2d1a55cee"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "0ff5b1500514c82a4199a3af511be1c66a6b17b7"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "ce4d095eda872b05045766e6cdd686a21501b78e"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "397c66d7d95eabf5ba8bf47b9700c5d52657f586"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "605cae22b8edb09bcee585c7a0ddf91bb7b8771c"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "f9bf891cfb82baaa27ecf4f6192f50d264a362ba"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "0901de7f7b50b652a640e069c811ebffb990af1a"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "7d054dfe69b4c6a2359f89ebd9936d887d432637"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "9e50b342cc1754f66f274002a04ca35e933bbe35"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "6396bfe04f896321e1bdb2a1b742ee2461e3840b"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "e0818ad23234a31355cd366fb5cecf7a157e437f"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "ca8dd6aa223dccfd65b0ef3f8d85775a38ae5f9f"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "b67d6167b13ba68731b32944a9ba4e2010e54c8c"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "c2421cd629de2cc317965e1d8e047a247dc3135d"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "8dac75acdfcd95bce9bbee2a90785aaf50d1e331"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "01318b4a164d73801d53a86b9147cc3c68090e44"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "702f772a54290f2cf73842caa1780cd054630113"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "7bf0508c975f5e14964b25d40570dd7488364169"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "d8241f3ed0d78643ae38986b2f0898f895a47ed9"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "2b499f42e831c8a949d1ac2955cb52bbe01fa516"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "b3a41ba02af12471183a07af0de203e8d1c8e679"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "d31af209483706603dfe2ac39490e8258fe1f376"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "7b97e5c6e5868e1400616bf59317e2aee54b4f9d"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "ff77fe8e75dc98d07f6fa943c2b87572e2fe821d"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "2a126616d400e1781b0d25da0b92f374f5c58764"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "f5a77f3da6dbce8f3069377c8107b6c21dc8ad33"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "213b239888c9bc9667db5b90d5327edb16533346"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "2ebe88b6e9457105abe21db5e501174c4ed6b9a3"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "dd64b8f13021007506cda02b620463a37a40cb44"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "765f498cd0a27a50148022cef1b0db0b7e272393"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "3be4f9cfab1885a891360e7e3d024c130d55b098"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "15c95ded6f5057cdaa8716c1f9a63867f7f698e9"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "2ccc54e8c8fe8fd130427d56b65f191224483d3d"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "90f8826a73042bb5019f4ef75be49beb40e47c1d"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "6d06a583ffd0520a4f8606e7dfed798363f96133"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "c91c4de37182f3c01738856e11f4ddfd867343b4"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "46c9b3f5c7c3b288e759894a4041b0854e35811b"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "0b11edafce5fca8af93f06e7d3461508456faa3c"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "43c0a898e13b5cdec73c20a8e47d7ed73340a4be"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "1a1ee21a5f935ec38b540a573e3261eb72d18737"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "9f024aa7cd88b43f1d41ca35b9602c4ce3ce0d66"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "51fb9526bc2f6ffbcca33a9db565041ec7541c17"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "4620b4ee8ac0d9f20dae06ab5039559c947e189e"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bcb56f263c9f8cf87dbfb667bcd6261b6cab3da9"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "b9e499a16b8dea07e05ab68e92b07aac09611a0e"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "69d8afea4beeea7b6f8e85d2c57834e36ec0a5da"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "15c35746a9ca5f9bba4048764ef01f38eed1d7b3"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "d068f8fc28ae96dc62a0131a5ef42f35028d8dc9"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "4127ddf36a954066deb09e967224163f4dc9e632"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "8e2f853eece4d7793db9757f32466f85d1f98029"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "85f0440039b77cbf6547fe5b7be0acaba613aee4"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0d0d661c3b6197516d3e3f990a49e327170fb8b0"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3f42e38f0a9436c6eea9cd6b84688f1c5046d9c3"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "56a9c8600f17106ee360994f2816e814f6dde054"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "e8de5922f28f494c3a6a8b1e53c270dd4f34cada"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "1fe39b3dd62180cf6b2b7a6771ac0f61b1538619"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "57739540e02371abe21f6022b3b8fa6103543279"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "56c5815007727024c6e479d81122a59836f848d8"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "f5dcf9023ca5aeeb60d04158f7efc1b6ccbd5313"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "142d95e936063a90b28d2c33e79ac4cb8052ed8b"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "489ef1bb93ca27673067d370a62f20cb227d2f55"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "50d819cbde16c384c9adb1d4d176400cbf3544ea"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "0f1f4fee615ce2ee49f5458b9953af176e13280c"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "fddac5b20e6231c9626bb966475d8a16d03efde9"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "832d040787c6cb599f956cb4124ed11c4730be74"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "a73ebbfab7e630de54b13165d428e4b2843f68a2"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "49ff3285d4b4a9efae2f434709d80fe87aa94375"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "1f77f4d495c94b6c94ecbd4bb40c56e985cae5c6"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "5c9075d55d62177e24b7a91ff25ee0d8173ca1a8"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "eac042c5080f6bbc43770e7d2b0910537a44bc1e"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "c261b8d480c1c23aaea1754857ab7e069a5ef812"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "3d83d21430a7f90ccbbe8ab4a16d0faa44efc22b"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c6a5b825196404024f4a11ea3c4f1d74b0cbe80b"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "90ff4a639dcd65ce821b9dd6545875ed5230513a"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "99f4418e230a987c12671b9fc3242b3ccc97e5ab"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "bda55fcf5719f3d43f422dd4a1e7935db598d8a0"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "dd1d269619f0377993178e9f7083301c39339513"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "c73e447f83ecb44acdd5637702b977b3d37a0593"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "c63c3509af06f4c9a19f6ac04149d2eacb201459"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "dfad91490135d6536af450b70ef96afb04413d76"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "43f60e6dd8e412aebcfab2a2c6ca1813933152f8"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "2d121c22f3a9aefb611a8ba8dee568c2c8e6e66a"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "f5841ceb3482d91dd2d805258fd9e326cba2e131"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "d16acad424a61e098b37b68aea98a2ac69efdd21"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "4c94cdc7a19fbe9adfb0aa091299efc973b37d60"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "91b5af1bd30c3821924968b03961e5295f15b0e6"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "96561c7bbb7cfbc3af8f1bbb75b054cc95649357"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "d7ea3b927eff3b229d2013d064fef8661cb088e0"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "53edf9df438d7e6b344a8e321ebfe769cd456bb6"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "9c132b7b651e3dd9c2c78ad4beada01784b2ef41"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3cacf5dfaf58467e27e4804da74a9f6da6f12de4"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "f649c726757ed1bca13d2a05dd57b7d3f56b5dc6"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e77b856a434ad6dd12594cef9362313e910b14d"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "545d3bdd564232788850cb04b1314a3191b14175"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "912fff124863aba8189cdb2f22a2c1cf96c5057a"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "72d9bf343fac24312faf42272553b37e7cb5df5e"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "c266d1ce84018e55f239c0cf692feab0b3d2bb58"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "28df7ec17c9008e59af3ba50225e2e6b53f9722a"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "2d254b3818afcc0510efba99fe469754076b8841"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "6428c38cd5c00c2a9c02e26b71945831c3c102d2"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "5477725a61b9479a90e76727eb9f69d19e282f83"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "e663608972b44aca2b08abcc2d92a3f8e8c92ed9"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "101da7d20a72980cdc5db7c4b2755edc3e0a5d66"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "9e6b94146534ec11d00ecd4f1e06680f0fd918b8"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "b5e195606434b4dd90818877e5aea05fa995f136"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "851276e8a86b27ad7b92e075e6e20a527284dd4e"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "48ed44ab60ca16fc39abce13a630d997dd5099c1"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "fb6b4ca689670a3d994e3c524490e46636a8cd59"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "6c4d9cdb9fb8aa0fb3ed8042306268600e3c385a"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "0795a804507837821fed591849169c13bf193302"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "3423b59b472eff5bdd0d16994a777c06de734b2b"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "5571d632e5dc7efea9fccae5035ed070542adc52"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c9724715fa1036e872b09b4bc453c9ff9344831a"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f99413c5716c4d45eee22cf1f547138b1ba3d044"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "76d5752e8bc131ece1a43a3376b99280545861bc"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b9ea600f884e50afc31d096697b54366186b1331"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "e72e62a49ebda9cadf032e2e90c14adb5a7db1c4"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "7c64d69d3510d06ccdf98fbf85f41d3b7f4b532f"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "c69f54bd537c9d16ce4ccf5169646c6f7dde98a5"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "abe0137bb0cb8536b6bdaf03246bfc97e7cba4bc"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "3c914e3f26a61568a220b8eed2742c70ee879fd5"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "b3aa2e0caa2b145df9b3c099bb5158eb6c21402d"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "bfc8733ee396bfa0dedfdffb5aa11bb4c8816be0"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "6de8e3bb0038676a906b75a9603b9f057251538a"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "125c53350f599e975b177db3e11ce367b2250fd8"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "4535f608f78f91014371b4b49ca5d73ba369e5be"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "860baa240c24453b55bb3c3273eee85821ab4a7f"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "2078e23dbeeeaad80ef55a07888a94958a8bce85"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "d3d6fbcfc622a303b932c6f9fed134d26fa3a32f"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "1e7e7608ad79337212d73fd72df189bcfbc08be5"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "aadd04915c3dd07b4fa257071382081531e910cb"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "ab57a27336d9b2b379dd9370781cbe38fb34f274"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "a96898e37be58096490ce26313760e9595eab0cb"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "fd83ef7ac7b6b44ca61737b85f4b2aa9e297566b"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "923e977c4a53e91ff0299271bfacf675d1c9f047"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6250c59ec325ce9f2a6520cc326a500fe8a61106"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "11647b846463af53eebc70e5000c1b2072bcb08e"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "c65084273a4684898d1bd265714bcd2a577939a0"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cbe33f717d3548913cc316adc4163824f63301dd"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "ddaa35f6f054184484856254927bb4b0c7009ec1"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "d8c0d5adbebac214be559354e6f83efc6c01c874"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "e2deaaea97169a50e50c7a3cd7963b7627fd0271"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "cee1c800c773dd784900e8e1d9efc7ae59764907"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "38efb3a002d3ffafd825b24d0aa5c55617f0a198"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "419ca07f1d5bb1d460ce22a7bf8488611b3efee3"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "4ccd1423a7840b9bc696dbe9f1edc1e1629e664e"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "9398c4714f01ce1a2420ad879fc710a84c19f666"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "79e8fff4b9390f3258a7ed78995759d0005e167e"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "c3b4d3496c08ec12f3dc96d2600b327f8d326377"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "d5ee06667437b1d2f56de89b5f5e5f2f007c4eb1"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "1c9a8326ca27152a4a8554c62d69784ad4f07ac6"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "f4002b8fa6734353d02e605bf870aa51d67940a8"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "39bf95af55156896df07a2a5f77909987095f567"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "99a70da03d31e8209e2818ef07d8d380c1521164"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "1346de9715783742fcafe60df6d1c37460c6db93"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "d2e0b04bbc4617e35a1d46f22801ecebdb6e873f"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "2ec4e8bd9cdaefe06c390a5e41b5a234a2b1d7e2"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "293dad19f7278909b216107c229e20a79bcfa1fd"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "15c2fe0d7c6a53ee5bc7d8284ff414dd6da6b883"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "09222ca13bc199c8c32fad00a638f335276ff44b"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "10a45fab960d898d65f0dc45a6d0e6368f6bde8e"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "e6ed3e2d6d8e272d6a82bd39a0986afe9f9d5b00"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0222d1158829d06f3fee3314296ebe9126e0d9ab"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "a0c5529c5439c4a4ac29578dd0df6801310b1279"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "95e9d1636243553b72c8d5a6a653f5cd12539ca0"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c525824667f8fe9225fafd1c1bbe6d84413d3e30"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "d29e93647a906856033607ef15e88307cf98fab7"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "5473877025c6a4e57c286a7dc8c7550b71d4e156"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "350847f8853219234edb68b9316cbcf486191f2a"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "7e4c444870d24d9b5ce283bbbf0e2ecdd5ed4d85"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6aa7416aeb84000778df3ff354f4efd2cd805d70"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "262b35a170b39750dc19579caa05df19c98cac94"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "e6a798072a9fb01e947e5d40e431d3e71256d3e3"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "6674ba9cad77bbc912f94084f8fd2403f0ce42fb"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d10a236c1e8bc425cd8077b87816fe0a28405274"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "d67449c5cfe939ab5531cf5a27e1da6e5b9335d7"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "f5e151299b3da7788e40dadf1c1d0fab6e409a00"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "6f6b79f283f11414ba2344e83cfb1f0197011c2e"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "a56600d80d772d4009c8feeca7dc6d63c344c199"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "40a7724e59e002446c0a9cfd35de948fc5311e54"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "d1e68650ec713a0d24e159fe967b73b26198d33c"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "abac7894c98a55bb3f7f2ca02a439575c241ea7c"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d45c305cb676c7456d8e8f4f803089d82077a8fa"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "473b7beca08bcbf8d443f6efbe3ac8752a6773c8"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "084dd83725e94a557e73d11f78633e1bf98e5d69"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "e173e4f47878070a98afde349d2fb93a6ae1c342"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "65b89daf623810a94bbaaaad301a2c3e9e6d4d5f"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "f108f862dafe32a047c08c6fe1135611728d3f4f"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "ba049d6eb3b455674caf424745607f49675a8ed6"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "006f094f2966358ec685b00033e640a94d809d53"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "95f6d91f882d9d0ab8ff5d4b7654a102d973543f"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "e2a70547561a1fed87e3308ebf857df6cc3a315e"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "c0d239c2220979dc0daa15ab1e9af510d7c09706"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "d23bdcacb5714b10f773381fb9c8e3d628d2e278"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "d9119536b4295fea892afd8ee1b46fd5eb881314"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "1c7eb6d62b050769634fb487c0161c5748b8e4a2"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "491269cc3bbd577d24cfe898b862cad008d2da41"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "9043341ce5c84064aa80f95545404f5415bea782"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "13cad5dea192e57b03a26c09254e6fb7cc4022d3"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "8b2f6551415637ff8c9d2de1e1643aa5cd721d48"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "b57d7e89e0cf548ab016867d468d5fa2e3b429aa"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "3246755855f5d869ddf5724cbd2fb6c237d3ad35"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "804ee921241432208c83bdf70986628c5fc1ce1d"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "c2bd411ddf33382afd091cda7f2f6c4cf3dfb5d4"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "89dfa9f319c1d6681deea122a3f23e8ea4bf6248"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "8b209580ff83965ebc27aa3f97eac1180fb82ffd"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "ff727fe52dac2468d430c5d8d734dca133693e9c"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "21844cd80358d5ac24bd9d9ea2a6daadd296e760"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "cbc4cb34957fde341affa780ea743fb30aa13aad"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "4e395325fd1550710197822495c8873a89ff014c"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "19f538b937a9f4a3ef2ee498c64de69b214b87d4"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "ebc164cd9cf4c3993270949a13c9cb1123379093"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "a942c265bedf537e59fcde8bff39c3addb4a2963"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "8967615af2f2efe359f0babe614d282569e44691"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "89f8a2bd49ff4793b2d69efb48aaa93b031dfa69"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "d2be6c9f62cc0615f9041470bae3b139b69ef55c"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "99afd0b77d350df671acbe403b9b19d975bcb91a"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b14f1b45617773a0e010d81ce83b493dd93dc03a"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "9a043691524087b9968aaac1b5d19a212ddffebb"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "f22f09a85bdd943c874a0b321ae1ec017200d0b4"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1cdbd8319688ccd0af636e71568d7f2244ca0d1a"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bf660208d072b92f4d961d63f6bfadf5d2848e97"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "fe1edc33462f5b31d76b7b39ef7de459b2260658"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "679eb537bd4007ef14b09dd705a0eaf5de6c29ff"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "cfa52529dcb953c5448d589845bf22343fc6339f"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a603ec800745b17d7ef31ee4008b2ccfc6515a51"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "09e02683fa6fc34ff152533026824205f976b866"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "94ed7980eb737171e6d9a428a99cc1cbcfa98daa"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "2a73ca16724778da05aca6284b50f8ce6b2855c9"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0c0fc357264ed7ef806729cf5f3a636829740c47"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "02a6ce278285830a1d9a2f092321d73755fc6b71"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0bcf7133711b812d55e4c4f824f6cd53b83ce3ef"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "e314ce94c7f7f72882e4b2671f8a52488e293adc"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "878d2fa1fb737963bb93296d4e0f2e67cd58cb04"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "e4643626b93bacd2f2dae152228287aa0d84acf3"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6e99ce189e18f7056720500cfa596c8caf8f5a17"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "cffab960763f296586e4bbbbc671409323844464"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "7455db46a81f99ba21d7a3ed0ae5a97246fae822"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "ba2a4ddaf8f8978d01f996b599f26801ce3c3a5b"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "8e5cf5885fe5e12e1cf28e7b77171ed23c4fd1c3"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "423e824526557309cb2ec007c41c57daf69e8b42"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "8205ce31e27a6595f2384a85f35f48610cd8b187"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "8766cf70ffd089e79d1eac1211bcc3255c86146d"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "f49ae94b77df1f038bae64f47f3ded0e4f10f349"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "dd07bb545505ce0251760d7960ddcfb235856b79"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "aa660969f12a316dd85f7e69678f583430e084aa"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "ea498b08ae2dceb0a103a7980ca086bc5ce94cb2"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "4e2d7c6098c3cc48cc7a3e5b1557b75e1a9c1958"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "e03a369d834c2a2a0a5bc9e539f2a007fa78641f"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8cc41734b718deb50654ccc24c20e5be0b767fd"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "358efd06a28a9ad43703335d190f4bea9b5ef95a"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e63d4ad88ad45e1e4ed43906c4525a24c1b1cd1b"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "ce0fb4901e621dea2330cf80df632d9424ea46b6"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "5910ddf0f1bee1ae3e2ce5c2882ce93732edf586"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "367816038ddfbd11b7ad6cc2bae41fe4d82b132b"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "6e6c46db9e45bbe20861fc8d6f971daaaa63d181"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "0d4859a54ae11c114cb449b150373465d92b795b"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "16d95125a4c51df9ebd587df16cb428f560cb8e9"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "6bab2ad51c7cf6e761c147d0a0f748573b1683a2"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "ba660dbe60c4e95ac82f536313989933e1edddb6"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "1e1e5dd54da8e3b94da831909149721dd2766267"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "1f32f890d4a1ba2a672d25a005ef5daa76040e33"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "49b36171729e3e0924d8398b62c22d5a02b36b8c"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "2336db0769fa921f2a50774791174565e6828978"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "2b40d9003eca218d235574d1ee7d6da73244d614"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "517d6269f4c2a98f4817be8a926b82c261a8d1f5"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "9d24460c7bcd1e8b36d900a130bb88ecda967678"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "e70d742aa94bb4678446a4b94edd915033a640fb"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3eb4e076fc42e9cbd97dd82af8eb77d3ea6bb068"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "bdbf6abd8e86f6811d032b302818f15f343e8883"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "b7e4cf9bf9db13f3e2d92bdb91ede3f243232a0a"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "411cfc0033ac8edeb30d9d371738864e9401200c"; }
   ];
 }

From 94362af1e8f310a0b118d8c9c3be6263d3a9cf44 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 15:12:04 -0400
Subject: [PATCH 0889/1143] libev: Fix compilation with clang

---
 pkgs/development/libraries/libev/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 90cab2cc6871..ce7d7b9e2759 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -7,6 +7,11 @@ stdenv.mkDerivation rec {
     url = "http://dist.schmorp.de/libev/${name}.tar.gz";
     sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48";
   };
+
+  # Version 4.19 is not valid C11 (which Clang default to)
+  # Check if this is still necessary on upgrade
+  NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null;
+
   meta = {
     description = "A high-performance event loop/event model with lots of features";
     maintainers = [ stdenv.lib.maintainers.raskin ];

From a634c110756b7ed97ea16ada8a9c70517cca8a95 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 15:14:32 -0400
Subject: [PATCH 0890/1143] ruby_1_8_7: Fix on Darwin

---
 pkgs/development/interpreters/ruby/ruby-1.8.7.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
index 3c2ea71ecf26..0ae1d1261eed 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
@@ -60,6 +60,9 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [ "--enable-shared" "--enable-pthread" ]
+    # Without this fails due to not finding X11/Xlib.h
+    # Not sure why this isn't required on Linux
+    ++ ops stdenv.isDarwin [ "--without-tcl" "--without-tk" ]
     ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby";
 
   installFlags = stdenv.lib.optionalString docSupport "install-doc";

From 7745dc5dcf47a67b07b649072e99a73840cd3b8c Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 16:35:35 -0400
Subject: [PATCH 0891/1143] nghttp2: fix configure script to correctly find
 jemalloc

---
 pkgs/development/libraries/nghttp2/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index e442cc96d2f7..bc8c599a901f 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -42,6 +42,12 @@ stdenv.mkDerivation rec {
     sha256 = "000d50yzyysbr9ldhvnbpzn35vplqm08dnmh55wc5zk273gy383f";
   };
 
+  # Configure script searches for a symbol which does not exist in jemalloc on Darwin
+  # Reported upstream in https://github.com/tatsuhiro-t/nghttp2/issues/233
+  postPatch = if (stdenv.isDarwin && optJemalloc != null) then ''
+    substituteInPlace configure --replace "malloc_stats_print" "je_malloc_stats_print"
+  '' else null;
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ]
     ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ];

From 3f6b56812cd5b301769c764ac79173884bdafefc Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 17:49:02 -0400
Subject: [PATCH 0892/1143] bwm_ng: clang fix

---
 pkgs/tools/networking/bwm-ng/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index 62dea1e6cd4f..6fa0c20b0acd 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -7,9 +7,12 @@ stdenv.mkDerivation rec {
     url = "http://www.gropp.org/bwm-ng/${name}.tar.gz";
     sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1";
   };
-  
+
   buildInputs = [ ncurses ];
 
+  # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline
+  NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=gnu89" else null;
+
   meta = with stdenv.lib; {
     description = "A small and simple console-based live network and disk io bandwidth monitor";
     homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng";

From 4c76dda4dd6d9e85504d24bde076c24ed678a2a0 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 18:03:45 -0400
Subject: [PATCH 0893/1143] curl 7.15: Disable on Darwin

Build is failing and this version of curl is not used for anything
useful on Darwin, so it's not worth fixing.
---
 pkgs/tools/networking/curl/7.15.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix
index 2b13437d95ca..4e533878ec18 100644
--- a/pkgs/tools/networking/curl/7.15.nix
+++ b/pkgs/tools/networking/curl/7.15.nix
@@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://curl.haxx.se/";
     description = "A command line tool for transferring files with URL syntax";
-    platforms = stdenv.lib.platforms.all;
+    platforms = with stdenv.lib.platforms; allBut darwin;
   };
 }

From e17dfe13e894b774b487b2794c076901b2c81eb2 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 18:08:43 -0400
Subject: [PATCH 0894/1143] bandwidth: clang fix

---
 pkgs/tools/misc/bandwidth/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 35b13448b59d..ff5e47336d3c 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ nasm ];
 
-  buildFlags = [ arch ];
+  buildFlags = [ arch ]
+    ++ stdenv.lib.optionals stdenv.cc.isClang [ "CC=clang" "LD=clang" ];
 
   installPhase = ''
     mkdir -p $out/bin

From 2f6e9000e88ae8a99c1e8dc30771e0ce10290ec1 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 18:43:46 -0400
Subject: [PATCH 0895/1143] ent: clang fix

---
 pkgs/tools/misc/ent/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index d6ad7f1d26b0..71b4ec338df3 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
+  buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null;
+
   installPhase = ''
     mkdir -p $out/bin
     cp ent $out/bin/

From 7145859662a73632b075177e4322a6c9fe391c0f Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 18:55:04 -0400
Subject: [PATCH 0896/1143] botan: clang fix

---
 pkgs/development/libraries/botan/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index c843a00b8362..5880ae772ceb 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ python bzip2 zlib gmp openssl boost ];
 
   configurePhase = ''
-    python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}
+    python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }
   '';
 
   enableParallelBuilding = true;

From 5d82c6712910fedc07574bbaa61d69cf52779b38 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Thu, 14 May 2015 20:54:06 -0400
Subject: [PATCH 0897/1143] libdvbpsi: enable on Darwin

---
 pkgs/development/libraries/libdvbpsi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index 6af8e7a415e2..f8b9e9ecef90 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0";
     homepage = http://www.videolan.org/developers/libdvbpsi.html ;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.lgpl21;
   };
 

From 8b580fb9d16798d57a462bbaccba6db06e61bb4f Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Fri, 15 May 2015 12:41:33 -0400
Subject: [PATCH 0898/1143] smartmontools: clean up meta, add darwin to
 meta.platforms

---
 pkgs/tools/system/smartmontools/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 87f19640f7ff..72c8f8d028eb 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
     sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in
   '';
 
-  meta = {
-    description = "Tools for monitoring the health of hard drivers";
-    homepage = "http://smartmontools.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+  meta = with stdenv.lib; {
+    description = "Tools for monitoring the health of hard drives";
+    homepage = http://smartmontools.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = [ maintainers.simons ];
   };
 }

From 91ba92096c26d2fbcb50fad83e11ad1044e9094f Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Fri, 15 May 2015 19:17:25 +0200
Subject: [PATCH 0899/1143] rustc: update to 1.0.0

---
 pkgs/development/compilers/rustc/1.0.0-beta.nix | 16 ----------------
 pkgs/development/compilers/rustc/1.0.0.nix      | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  3 +--
 3 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/compilers/rustc/1.0.0-beta.nix
 create mode 100644 pkgs/development/compilers/rustc/1.0.0.nix

diff --git a/pkgs/development/compilers/rustc/1.0.0-beta.nix b/pkgs/development/compilers/rustc/1.0.0-beta.nix
deleted file mode 100644
index 93359fba9f7a..000000000000
--- a/pkgs/development/compilers/rustc/1.0.0-beta.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, callPackage }:
-callPackage ./makeRustcDerivation.nix {
-  shortVersion = "1.0.0-beta.2";
-  isRelease = true;
-  srcSha = "0wcpp6fg7cc75bj5b6dcz5dhgps6xw09n75qiapmd12qxjzj17wn";
-  snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
-  snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
-  snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
-  snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa";
-  snapshotDate = "2015-03-27";
-  snapshotRev = "5520801";
-  patches = [
-    ./patches/beta.patch
-    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  configureFlags = [ "--release-channel=beta" ];
-}
diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix
new file mode 100644
index 000000000000..639414988af7
--- /dev/null
+++ b/pkgs/development/compilers/rustc/1.0.0.nix
@@ -0,0 +1,16 @@
+{ stdenv, callPackage }:
+callPackage ./makeRustcDerivation.nix {
+  shortVersion = "1.0.0";
+  isRelease = true;
+  srcSha = "1fjyk5xhg9dx85d1kkjmb1jai7awvdmzcjf2fdmi2pdjyzacn163";
+  snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
+  snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
+  snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
+  snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
+  snapshotDate = "2015-04-27";
+  snapshotRev = "857ef6e";
+  patches = [
+    ./patches/beta.patch
+    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+  configureFlags = [ "--release-channel=beta" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c15f9ce0a41..41da2c9dbaa2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4389,9 +4389,8 @@ let
     ocaml = ocaml_3_08_0;
   };
 
-  rustcBeta   = callPackage ../development/compilers/rustc/1.0.0-beta.nix {};
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
-  rustc = rustcBeta;
+  rustc = callPackage ../development/compilers/rustc/1.0.0.nix {};
 
   rustPlatform = rustStable;
 

From ef66f1536dcfd9a78757436807de98be31e6cb48 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Fri, 15 May 2015 10:28:06 -0700
Subject: [PATCH 0900/1143] man-db: dont use libpipeline on darwin, causes
 build failure

---
 pkgs/tools/misc/man-db/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 403068b1bf7d..ce5467ee284f 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "03ly0hbpgjnag576rgccanaisn7f6422q5qxrj64vyzslc2651y4";
   };
   
-  buildInputs = [ pkgconfig libpipeline db groff ];
+  buildInputs = [ pkgconfig ]
+             ++ stdenv.lib.optional (!stdenv.isDarwin) libpipeline
+             ++ [ db groff ];
   
   configureFlags = [
     "--disable-setuid"

From 9904d916b6da6d5e1698626b7c82a9cb22a46afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 May 2015 20:57:41 +0200
Subject: [PATCH 0901/1143] darkcoin: use fetchzip to get stable hash

---
 pkgs/applications/altcoins/darkcoin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/darkcoin.nix b/pkgs/applications/altcoins/darkcoin.nix
index 56d22d0b53b2..89ff12f8f742 100644
--- a/pkgs/applications/altcoins/darkcoin.nix
+++ b/pkgs/applications/altcoins/darkcoin.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig
+{ fetchzip, stdenv, pkgconfig
 , openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf
 , utillinux
 , withGui }:
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
   name = "darkcoin" + (toString (optional (!withGui) "d")) + "-" + version;
   version = "0.10.99.99";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz";
-    sha256 = "1a05a7l878klg4wqk9ykndkhyknrd7jp75v38k99qgk5fi8wa752";
+    sha256 = "0sigvimqwc1mvaq43a8c2aq7fjla2ncafrals08qfq3jd6in8b4f";
   };
 
   buildInputs = [ pkgconfig glib openssl db48 boost zlib miniupnpc ]

From dec924f5a3066851cda5a6dd27d9e0b33db8c8f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 21:22:54 +0200
Subject: [PATCH 0902/1143] hugs: fix build

---
 pkgs/development/compilers/hugs/default.nix | 60 ++++++++-------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix
index 14751799795a..f29df2c7c73c 100644
--- a/pkgs/development/compilers/hugs/default.nix
+++ b/pkgs/development/compilers/hugs/default.nix
@@ -1,9 +1,7 @@
-{ composableDerivation, fetchurl }:
+{ stdenv, fetchurl, bison }:
+
+stdenv.mkDerivation {
 
-let edf = composableDerivation.edf;
-    wwf = composableDerivation.wwf; in
-    
-composableDerivation.composableDerivation {} {
   name = "hugs98-200609";
 
   src = fetchurl {
@@ -11,43 +9,29 @@ composableDerivation.composableDerivation {} {
     sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6";
   };
 
-  #encode all character I/O using the byte encoding
-  #determined by the locale in effect at that time. To
-  #require that the UTF-8 encoding is always used, give
-  #the --enable-char-encoding=utf8 option.
-  #[default=autodetect]
-  postUnpack = ''
-    find -type f | xargs sed -i 's@/bin/cp@cp@';
-  '';
-  
-  configurePhase = "./configure --prefix=\$out --enable-char-encoding=utf8 $configureFlags";
+  buildInputs = [ bison ];
 
-  flags =
-       edf { name = "pathCanonicalization"; feat="path-canonicalization"; }
-    // edf { name="timer"; }   # enable evaluation timing (for benchmarking Hugs)
-    // edf { name="profiling"; }# enable heap profiler
-    // edf { name="stackDumps"; feat="stack-dummps"; } # enable stack dump on stack overflow
-    // edf { name="largeBanner"; feat="large-banner"; } # disable multiline startup banner
-    // edf { name="internal-prims"; } # experimental primitives to access Hugs's innards
-    // edf { name="debug"; } # include C debugging information (for debugging Hugs)
-    // edf { name="tag"; } # runtime tag checking (for debugging Hugs)
-    // edf { name="lint"; } # enable "lint" flags (for debugging Hugs)
-    // edf { name="only98"; } # build Hugs to understand Haskell 98 only
-    // edf { name="ffi"; }
-      #--with-nmake            produce a Makefile compatible with nmake
-      #--with-gui              build Hugs for Windows GUI (Borland C++ only)
-    // wwf { name="pthreads"; } #   build Hugs using POSIX threads C library
-    ;
+  postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +";
 
-  cfg = {
-    largeBannerSupport = true; # seems to be default
-    char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; };
-    utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; };
-  };
+  configureFlags = [
+    "--enable-char-encoding=utf8"       # require that the UTF-8 encoding is always used
+    "--disable-path-canonicalization"
+    "--disable-timer"                   # evaluation timing (for benchmarking Hugs)
+    "--disable-profiling"               # heap profiler
+    "--disable-stack-dumps"             # stack dump on stack overflow
+    "--enable-large-banner"             # multiline startup banner
+    "--disable-internal-prims"          # experimental primitives to access Hugs's innards
+    "--disable-debug"                   # include C debugging information (for debugging Hugs)
+    "--disable-tag"                     # runtime tag checking (for debugging Hugs)
+    "--disable-lint"                    # "lint" flags (for debugging Hugs)
+    "--disable-only98"                  # build Hugs to understand Haskell 98 only
+    "--enable-ffi"
+    "--enable-pthreads"                 # build Hugs using POSIX threads C library
+  ];
 
   meta = {
-    license = "as-is"; # gentoo is calling it this way..
-    description = "Haskell interpreter";
     homepage = http://www.haskell.org/hugs;
+    description = "Haskell interpreter";
+    license = "as-is"; # gentoo is calling it this way
   };
 }

From 1ceebca7af6ce8b4b4ad61658d28ed99d292aa01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 21:23:42 +0200
Subject: [PATCH 0903/1143] hugs is an interpreter, not a compiler

---
 pkgs/development/{compilers => interpreters}/hugs/default.nix | 0
 pkgs/top-level/all-packages.nix                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/{compilers => interpreters}/hugs/default.nix (100%)

diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix
similarity index 100%
rename from pkgs/development/compilers/hugs/default.nix
rename to pkgs/development/interpreters/hugs/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41da2c9dbaa2..f60e8905e58e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3840,7 +3840,7 @@ let
 
   ikarus = callPackage ../development/compilers/ikarus { };
 
-  hugs = callPackage ../development/compilers/hugs { };
+  hugs = callPackage ../development/interpreters/hugs { };
 
   path64 = callPackage ../development/compilers/path64 { };
 

From 9bc42f6d00fc65a3b3b1ce93b6884db1a2dcc4e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 21:26:10 +0200
Subject: [PATCH 0904/1143] hugs: set meta.platforms

---
 pkgs/development/interpreters/hugs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix
index f29df2c7c73c..b1c3df28d1f2 100644
--- a/pkgs/development/interpreters/hugs/default.nix
+++ b/pkgs/development/interpreters/hugs/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.haskell.org/hugs;
     description = "Haskell interpreter";
-    license = "as-is"; # gentoo is calling it this way
+    license = "as-is";                          # gentoo labels it this way
+    platforms = stdenv.lib.platforms.unix;      # arbitrary choice
   };
 }

From 69a6848b57889b9f51799bebc92aac76b58094db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 May 2015 21:38:50 +0200
Subject: [PATCH 0905/1143] rtmpdump: propagate build inputs according to *.pc

This fixes ffmpeg-full build.
---
 pkgs/tools/video/rtmpdump/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index de26cc41d744..29f2a1c448d9 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isDarwin "SYS=darwin"
     ++ optional stdenv.cc.isClang "CC=clang";
 
-  buildInputs = [ zlib ]
+  propagatedBuildInputs = [ zlib ]
     ++ optional gnutlsSupport gnutls
     ++ optional opensslSupport openssl;
 

From bc7a4fc18bba1926413fec5e49760c57514b482e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 May 2015 22:36:52 +0200
Subject: [PATCH 0906/1143] webkitgtk: minor updates (close #7828)

Builds fine, NEWS look good.
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 545026108876..e7dc0d4982c4 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.8.0";
+  version = "2.8.3";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "05b8mkr1mv1w5vi5vyczzirgf5nr6qavrdwbcaiv0dghylwx5yh5";
+    sha256 = "05igg61lflgwy83cmxgyzmvf2bkhplmp8710ssrlpmbfcz461pmk";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];

From 4ec3f8e42f9c765b58dd7e088f6c6943d319ad00 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 15 May 2015 22:44:51 +0200
Subject: [PATCH 0907/1143] intel-gpu-tools: apply patch to fix a compile error

see https://bugs.gentoo.org/show_bug.cgi?id=548318
---
 .../misc/intel-gpu-tools/compile-fix.patch    | 37 +++++++++++++++++++
 .../tools/misc/intel-gpu-tools/default.nix    |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch
new file mode 100644
index 000000000000..8285867d8eda
--- /dev/null
+++ b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch
@@ -0,0 +1,37 @@
+From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed, 18 Mar 2015 08:36:37 +0000
+Subject: lib/batch: Trivial compile fix for 32-bit builds
+
+intel_batchbuffer.c: In function 'fill_object':
+intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+  obj->relocs_ptr = (uint64_t)relocs;
+                    ^
+intel_batchbuffer.c: In function 'exec_blit':
+intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+  exec.buffers_ptr = (uint64_t)objs;
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
+index 666c323..c1c27a6 100644
+--- a/lib/intel_batchbuffer.c
++++ b/lib/intel_batchbuffer.c
+@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle,
+	memset(obj, 0, sizeof(*obj));
+	obj->handle = gem_handle;
+	obj->relocation_count = count;
+-	obj->relocs_ptr = (uint64_t)relocs;
++	obj->relocs_ptr = (uintptr_t)relocs;
+ }
+
+ static void exec_blit(int fd,
+@@ -557,7 +557,7 @@ static void exec_blit(int fd,
+ {
+	struct drm_i915_gem_execbuffer2 exec;
+
+-	exec.buffers_ptr = (uint64_t)objs;
++	exec.buffers_ptr = (uintptr_t)objs;
+	exec.buffer_count = count;
+	exec.batch_start_offset = 0;
+	exec.batch_len = batch_len * 4;
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 72a364e682a3..997f1bfc0120 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ];
 
+  patches = [ ./compile-fix.patch ];
+
   meta = with stdenv.lib; {
     homepage = https://01.org/linuxgraphics/;
     description = "Tools for development and testing of the Intel DRM driver";

From b7fe141f6bafbb783d2cced8118dd551a6de0e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 May 2015 22:59:26 +0200
Subject: [PATCH 0908/1143] Revert "remove cmake-2.8"

Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
---
 .../tools/build-managers/cmake/2.8.nix        | 73 ++++++++++++++
 .../build-managers/cmake/search-path.patch    | 97 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +
 3 files changed, 175 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/cmake/2.8.nix
 create mode 100644 pkgs/development/tools/build-managers/cmake/search-path.patch

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
new file mode 100644
index 000000000000..60a941a66375
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
+, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
+}:
+
+with stdenv.lib;
+
+assert wantPS -> (ps != null);
+
+let
+  os = stdenv.lib.optionalString;
+  majorVersion = "2.8";
+  minorVersion = "12.2";
+  version = "${majorVersion}.${minorVersion}";
+in
+
+stdenv.mkDerivation rec {
+  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
+
+  inherit majorVersion;
+
+  src = fetchurl {
+    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
+    sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
+  };
+
+  enableParallelBuilding = true;
+
+  patches =
+    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
+      name = "FindFreetype-2.5.patch";
+      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
+      sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
+    })] ++
+    # Don't search in non-Nix locations such as /usr, but do search in
+    # Nixpkgs' Glibc. 
+    optional (stdenv ? glibc) ./search-path.patch ++
+    optional (stdenv ? cross) (fetchurl {
+      name = "fix-darwin-cross-compile.patch";
+      url = "http://public.kitware.com/Bug/file_download.php?"
+          + "file_id=4981&type=bug";
+      sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
+    });
+
+  buildInputs = [ curl expat zlib bzip2 libarchive ]
+    ++ optional useNcurses ncurses
+    ++ optional useQt4 qt4;
+
+  propagatedBuildInputs = optional wantPS ps;
+
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+  
+  configureFlags =
+    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
+    + stdenv.lib.optionalString useQt4 " --qt-gui";
+
+  setupHook = ./setup-hook.sh;
+
+  dontUseCmakeConfigure = true;
+
+  preConfigure = optionalString (stdenv ? glibc)
+    ''
+      source $setupHook
+      fixCmakeFiles .
+      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
+    '';
+
+  meta = {
+    homepage = http://www.cmake.org/;
+    description = "Cross-Platform Makefile Generator";
+    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
new file mode 100644
index 000000000000..31c85d6f5220
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -0,0 +1,97 @@
+diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
+index fe8e003..378512c 100644
+--- a/Modules/Platform/Linux.cmake
++++ b/Modules/Platform/Linux.cmake
+@@ -36,13 +36,13 @@ else()
+   # checking the platform every time.  This option is advanced enough
+   # that only package maintainers should need to adjust it.  They are
+   # capable of providing a setting on the command line.
+-  if(EXISTS "/etc/debian_version")
+-    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-      "Install .so files without execute permission.")
+-  else()
++  # if(EXISTS "/etc/debian_version")
++  #   set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
++  #     "Install .so files without execute permission.")
++  # else()
+     set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+       "Install .so files without execute permission.")
+-  endif()
++  # endif()
+ endif()
+ 
+ # Match multiarch library directory names.
+@@ -52,6 +52,6 @@ include(Platform/UnixPaths)
+ 
+ # Debian has lib64 paths only for compatibility so they should not be
+ # searched.
+-if(EXISTS "/etc/debian_version")
+-  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-endif()
++# if(EXISTS "/etc/debian_version")
++#  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
++#endif()
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index ccb2663..39834e6 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
+-  /usr/local /usr /
+-
+-  # CMake install location
+-  "${_CMAKE_INSTALL_DIR}"
+-
+-  # Project install destination.
+-  "${CMAKE_INSTALL_PREFIX}"
+-  )
+-
+-# List common include file locations not under the common prefixes.
+-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-  # Windows API on Cygwin
+-  /usr/include/w32api
+-
+-  # X11
+-  /usr/X11R6/include /usr/include/X11
+-
+-  # Other
+-  /usr/pkg/include
+-  /opt/csw/include /opt/include
+-  /usr/openwin/include
+-  )
+-
+-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-  # Windows API on Cygwin
+-  /usr/lib/w32api
+-
+-  # X11
+-  /usr/X11R6/lib /usr/lib/X11
+-
+-  # Other
+-  /usr/pkg/lib
+-  /opt/csw/lib /opt/lib
+-  /usr/openwin/lib
+-  )
+-
+-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-  /usr/pkg/bin
++  "@glibc@"
+   )
+ 
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  /lib /usr/lib /usr/lib32 /usr/lib64
++  "@glibc@/lib"
+   )
+ 
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  "@glibc@/include"
+   )
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  "@glibc@/include"
+   )
+ 
+ # Enable use of lib64 search path variants by default.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f60e8905e58e..2f4725c27495 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5088,6 +5088,11 @@ let
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
+  cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
+    wantPS = stdenv.isDarwin;
+    ps     = if stdenv.isDarwin then darwin.ps else null;
+  };
+
   cmake = callPackage ../development/tools/build-managers/cmake {
     wantPS = stdenv.isDarwin;
     ps     = if stdenv.isDarwin then darwin.ps else null;

From 120852e542aa60de548b2db49811cc5484f72218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 May 2015 23:03:59 +0200
Subject: [PATCH 0909/1143] freerdpUnstable, cinepaint: fix by using older
 cmake

Close #7841.
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f4725c27495..907b97d8d85e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10484,6 +10484,7 @@ let
   cinepaint = callPackage ../applications/graphics/cinepaint {
     fltk = fltk13;
     libpng = libpng12;
+    cmake = cmake-2_8;
   };
 
   codeblocks = callPackage ../applications/editors/codeblocks { };
@@ -11006,7 +11007,9 @@ let
     ffmpeg = ffmpeg_1;
   };
 
-  freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { };
+  freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix {
+    cmake = cmake-2_8;
+  };
 
   freicoin = callPackage ../applications/misc/freicoin { };
 

From d417983216d1fdc54c675cd7a242445b432ce455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 May 2015 23:23:51 +0200
Subject: [PATCH 0910/1143] dmenu2: add version (dashed date)

/cc maintainer @cstrahan.
---
 pkgs/applications/misc/dmenu2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix
index 1637586eb477..54aec8606cd4 100644
--- a/pkgs/applications/misc/dmenu2/default.nix
+++ b/pkgs/applications/misc/dmenu2/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "dmenu2";
+  name = "dmenu2-0.3pre-2014-07-08";
 
   src = fetchhg {
     url = "https://bitbucket.org/melek/dmenu2";

From 1aef9fc4af566faaf6dcef7544b2b03eaa34cb04 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Fri, 15 May 2015 14:31:40 -0700
Subject: [PATCH 0911/1143] cmake: disable building with ncurses if building
 without ncurses

---
 pkgs/development/tools/build-managers/cmake/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 72ecb10b0990..45bdeece45e7 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -55,7 +55,9 @@ stdenv.mkDerivation rec {
       "--system-libs"
     ]
     ++ optional (jsoncpp == null) "--no-system-jsoncpp"
-    ++ optional useQt4 "--qt-gui";
+    ++ optional useQt4 "--qt-gui"
+    ++ ["--"]
+    ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
 
   setupHook = ./setup-hook.sh;
 

From 740d3b15172e2f88bbab972a82ae2bce6828fa84 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Fri, 15 May 2015 15:33:35 -0700
Subject: [PATCH 0912/1143] Remove isLinux assertion from libcap

Heimdal evaluates libcap's meta.platforms to determine if it should be pulled in or not,
and that fails if the stdenv.isLinux assertion fails.
---
 pkgs/os-specific/linux/libcap/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 1ffdaa36e965..8157270d67d7 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, attr, perl }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "libcap-${version}";
   version = "2.24";

From af0002d884fa95ea0e5d70f37cfe47cd749b5b4e Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Sat, 16 May 2015 00:54:20 +0200
Subject: [PATCH 0913/1143] rustc: build the stable channel

---
 pkgs/development/compilers/rustc/1.0.0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix
index 639414988af7..008e958f6d44 100644
--- a/pkgs/development/compilers/rustc/1.0.0.nix
+++ b/pkgs/development/compilers/rustc/1.0.0.nix
@@ -12,5 +12,5 @@ callPackage ./makeRustcDerivation.nix {
   patches = [
     ./patches/beta.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  configureFlags = [ "--release-channel=beta" ];
+  configureFlags = [ "--release-channel=stable" ];
 }

From e47fe46e031d2df000f2baee598b2553e5ca93f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 16 May 2015 00:56:35 +0200
Subject: [PATCH 0914/1143] wordnet: enable interp->result, unmark broken

---
 pkgs/applications/misc/wordnet/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index d46790e4d72b..c70436e68f99 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation {
 
   buildInputs = [tcl tk x11 makeWrapper];
 
+  patchPhase = ''
+    sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c
+  '';
+
   # Needs the path to `tclConfig.sh' and `tkConfig.sh'.
   configureFlags = "--with-tcl=" + tcl + "/lib " +
                    "--with-tk="  + tk  + "/lib";
@@ -37,6 +41,5 @@ stdenv.mkDerivation {
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-    broken = true;  # we'd need older tk/tcl
   };
 }

From 3913d03890aa56a2c16e3936ae7340aef48f7da1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 8 May 2015 16:40:45 -0700
Subject: [PATCH 0915/1143] ttylog: Add derivation

---
 pkgs/tools/misc/ttylog/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/misc/ttylog/default.nix

diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
new file mode 100644
index 000000000000..1c90bb842d62
--- /dev/null
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "ttylog-0.25";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ttylog/${name}.tar.gz";
+    sha256 = "0546mj5gcxi7idvfw82p8qw27lk7wsk6j4b6zw7nb6z2wi517l40";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://ttylog.sourceforg.net";
+    description = "a serial port logger which can be used to print everything to stdout that comes from a serial device";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 907b97d8d85e..24c28c46f35e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2989,6 +2989,8 @@ let
 
   ttysnoop = callPackage ../os-specific/linux/ttysnoop {};
 
+  ttylog = callPackage ../tools/misc/ttylog { };
+
   twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
 
   txt2man = callPackage ../tools/misc/txt2man { };

From 52587b9f819a2ad7f0621fa6a929a843d0b92048 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 15:39:18 -0700
Subject: [PATCH 0916/1143] tinc-pre: 2015-03-14 -> 2015-05-15

---
 pkgs/tools/networking/tinc/pre.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 7fc993338f77..2eb003bacb0c 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-1.1pre-2015-03-14";
+  name = "tinc-1.1pre-2015-05-15";
 
   src = fetchgit {
     url = "git://tinc-vpn.org/tinc";
-    rev = "6568cffd52d4803effaf52a9bb9c98d69cf7922a";
-    sha256 = "1nh0yjv6gf8p5in67kdq68xlai69f34ks0j610i8d8nw2mfm9x4a";
+    rev = "613c121cdceec0199dc4d056857be021ed1d21de";
+    sha256 = "1l99bvqmb35hwb63fcy9gbjxasxnrgqw3i9f14f26dq3sz2j035l";
   };
 
   buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ];

From d7af7fb504a7970d9ff6377274a084e7eaae8fc9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 15:42:20 -0700
Subject: [PATCH 0917/1143] firmware-linux-nonfree: 2015-03-20 -> 2015-05-13

---
 .../linux/firmware/firmware-linux-nonfree/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 6ac468774ad1..fa7af6a8c1b6 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-03-20";
+  version = "2015-05-13";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
-    rev = "f404336ba808cbd57547196e13367079a23b822c";
-    sha256 = "0avz5vxax2b3s4gafib47vih1lbq78agdmpjcjnnnykw2kschkwa";
+    rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c";
+    sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq";
   };
 
   preInstall = ''

From 21247699ad1bbd7195a78693c23361a6a7600d77 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 15:50:46 -0700
Subject: [PATCH 0918/1143] git: 2.4.0 -> 2.4.1

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 620d3264be88..60bfaa861996 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.4.0";
+  version = "2.4.1";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "095v8n0b0c314sfg5mrnxjx2d9mklbjcmajh92kmi6b5jkfkhd5k";
+    sha256 = "195d61f98jj53jq0w3kfphpyk51h7fylpahc558id79ccc4ii1bj";
   };
 
   patches = [

From da719f19a6f47e457f67a0681e1a2a0d86b09a01 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 15:56:29 -0700
Subject: [PATCH 0919/1143] inetutils: 1.9.2 -> 1.9.3

---
 pkgs/tools/networking/inetutils/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index a4bde029ca05..251462ecc27b 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,23 +1,17 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "inetutils-1.9.2";
+  name = "inetutils-1.9.3";
 
   src = fetchurl {
     url = "mirror://gnu/inetutils/${name}.tar.gz";
-    sha256 = "04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4";
+    sha256 = "06dshajjpyi9sxi7qfki9gnp5r3nxvyvf81r81gx0x2qkqzqcxlj";
   };
 
   buildInputs = [ ncurses /* for `talk' */ ];
 
   configureFlags = "--with-ncurses-include-dir=${ncurses}/include";
 
-  preConfigure = ''
-     # Fix for building on Glibc 2.16.  Won't be needed once the
-     # gnulib in inetutils is updated.
-     sed -i '/gets is a security hole/d' lib/stdio.in.h
-  '';
-
   # Test fails with "UNIX socket name too long", probably because our
   # $TMPDIR is too long.
   #doCheck = true;

From 0700e844e29e2a583d66a35971462b30b387fcfc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 15:56:44 -0700
Subject: [PATCH 0920/1143] firefox: 38.0 -> 38.0.1

---
 pkgs/applications/networking/browsers/firefox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 42786790c2b9..0fa1d2068f1e 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "38.0"; in
+let version = "38.0.1"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "3812a31287d3a8d9ebb1326e131a944fd27f0f2d";
+    sha1 = "20f52c37e099cb2b21f3a76c6e39fe698e1e79e8";
   };
 
   buildInputs =

From d87d7aa5037ed2f0df2a67b01fc2ed2bd236692e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:11:17 -0700
Subject: [PATCH 0921/1143] spl_git: 2015-04-08 -> 2015-04-24

---
 pkgs/os-specific/linux/spl/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
index 7559562965d2..0748da25f16e 100644
--- a/pkgs/os-specific/linux/spl/git.nix
+++ b/pkgs/os-specific/linux/spl/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-04-08";
+  version = "2015-04-24";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/spl.git;
-    rev = "cd69f020e4b0f9c416dd07a264e48c9488a7633f";
-    sha256 = "1fy5zlh8cs65s52vixkp00ihrlrhs2frd6vwxwjqmpzyb7fnh3m8";
+    rev = "62e2eb2329d99f7c39bcda47bc9ecb2887608fa5";
+    sha256 = "1i59sps2y0mgm9sj4a0h03xl0hlgiym4637j5j6zc5g125zzcnrd";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From a5979edc8aa701a11a897ab45eb0e2c9ac813af0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:11:32 -0700
Subject: [PATCH 0922/1143] zfs_git: 2015-04-08 -> 2015-05-13

---
 pkgs/os-specific/linux/zfs/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index a7d312c40414..130a02c86e8e 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,12 +1,12 @@
 { callPackage, stdenv, fetchgit, spl_git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-04-08";
+  version = "2015-05-13";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = "d07a16360c1ee219b8820f80d035e56a18c58b84";
-    sha256 = "0yyc0n960bzd4fmrg1mwp0xy1db7yn90g33ds44chh4g74mrfgdz";
+    rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c";
+    sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437";
   };
 
   patches = [ ./nix-build.patch ];

From 35c0e0583d737b190ad52574817011f53447294a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:12:23 -0700
Subject: [PATCH 0923/1143] kernel: 3.10.77 -> 3.10.78

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index a6ceb5b09547..6743d1d95503 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.77";
+  version = "3.10.78";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1vx2sg0pab3b3rflwhxrimwx18azqayys8zidzr6sv0x7ir9bc31";
+    sha256 = "01cshlm8x8k2bbkh77w2r39kc0a3csrcxiv412j5ik608glzgx36";
   };
 
   features.iwlwifi = true;

From 28c17395f5dbb61093b7b34394a7f11250310a0e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:12:32 -0700
Subject: [PATCH 0924/1143] kernel: 3.19.7 -> 3.19.8

---
 pkgs/os-specific/linux/kernel/linux-3.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix
index 03c0db556263..90c5f9e31d3f 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.19.7";
+  version = "3.19.8";
   extraMeta.branch = "3.19";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0xd38f7g5yfn0b6b2l4qr022f9hcr82ddbysjs4npbgk5ms7341k";
+    sha256 = "0yg2mlq0h9my6k1bg3b255w4qnyx609ngh1nhssx3gbzslwf0jyg";
   };
 
   features.iwlwifi = true;

From c360d741c9943bb82a7667bf28762b8d76cb6006 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:12:35 -0700
Subject: [PATCH 0925/1143] kernel: 3.2.68 -> 3.2.69

---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 54cf9bc9324a..2fc240f6196d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.2.68";
+  version = "3.2.69";
   extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0yz3k3qqr13r6fa2f8i83rryiawy4rrd7qk2zx6jxq6byfd31ba2";
+    sha256 = "0fs7aj3vn51dlx7yfgkx05qpki2msh6j2irwajd9bw0l26cbycd3";
   };
 
   # We don't provide these patches if grsecurity is enabled, because

From 90659e27355dc88a6bcb089fe59ae40c2c9647a8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:12:39 -0700
Subject: [PATCH 0926/1143] kernel: 4.0.2 -> 4.0.3

---
 pkgs/os-specific/linux/kernel/linux-4.0.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index a5dafd4c8066..b095db41bd5a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0.2";
+  version = "4.0.3";
   # Remember to update grsecurity!
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1jq4583wwqmwqkqlkck57fxw18xszng92b6ma3avf0djd11b2izz";
+    sha256 = "1djkbqrzi898qr2n0cd4m8casfj8pvgydc98l4ws3w8l9ikgwxw4";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 4e5facc4483b..0c5a09a0dabb 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.0.2";
-      revision  = "201505101122";
+    { kversion  = "4.0.3";
+      revision  = "201505141746";
       branch    = "test";
-      sha256    = "14fi31xwlgirbwk7f1xh8vanjxk8b473rz7z38savl4nx2wr5r24";
+      sha256    = "0w65d5nmfir8kxgsxrq09mijjp09k193hyqmskia6a17n29943p1";
     };
 
   grsec_fix_path =

From fcf15de248a5a88c25da0f0f18669bed89d5f1d8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:12:28 -0700
Subject: [PATCH 0927/1143] kernel: 3.14.41 -> 3.14.42

---
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 75ab538ddf5e..16e46bf65c09 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.41";
+  version = "3.14.42";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0qghsf648nvzsh2x44x3w0d8lciml8rj6dvglqvmq1zcg492k8i2";
+    sha256 = "02k09ndhragz1p2mrq489fa7cgs2c2f3lwr1x0h1n94zqpsmpyip";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0c5a09a0dabb..27162d500465 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.41";
-      revision  = "201505101121";
+    { kversion  = "3.14.42";
+      revision  = "201505141745";
       branch    = "stable";
-      sha256    = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g";
+      sha256    = "1565ggx42w0j038avz9d4pydf4j29rli2hz5wangf3vnjbhixh39";
     };
 
   grsecurity_unstable = grsecPatch

From 19d5b1e37a077c692d877f2eb05088f1c1c96c47 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:33:45 -0700
Subject: [PATCH 0928/1143] kernel-config: nfs changes

---
 .../linux/kernel/common-config.nix            | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5fdfdb3b6a13..a49a5c10c9cb 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -190,18 +190,26 @@ with stdenv.lib;
   OCFS2_DEBUG_MASKLOG? n
   BTRFS_FS_POSIX_ACL y
   UBIFS_FS_ADVANCED_COMPR? y
-  ${optionalString (versionAtLeast version "3.6") ''
-    NFS_SWAP y
-  ''}
-  ${optionalString (versionAtLeast version "3.11") ''
-    NFS_V4_1 y  # NFSv4.1 client support
-    NFS_V4_2 y
+  ${optionalString (versionAtLeast version "4.0") ''
+    NFSD_PNFS y
   ''}
   NFSD_V2_ACL y
   NFSD_V3 y
   NFSD_V3_ACL y
   NFSD_V4 y
+  ${optionalString (versionAtLeast version "3.11") ''
+    NFSD_V4_SECURITY_LABEL y
+  ''}
   NFS_FSCACHE y
+  ${optionalString (versionAtLeast version "3.6") ''
+    NFS_SWAP y
+  ''}
+  NFS_V3_ACL y
+  ${optionalString (versionAtLeast version "3.11") ''
+    NFS_V4_1 y  # NFSv4.1 client support
+    NFS_V4_2 y
+    NFS_V4_SECURITY_LABEL y
+  ''}
   CIFS_XATTR y
   CIFS_POSIX y
   CIFS_FSCACHE y

From 7aae0f3115b57d9dbbdf0cb05d3bbbd13abe0f9f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:36:54 -0700
Subject: [PATCH 0929/1143] kernel-config: mlx4-en enable vxlan offloading

---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a49a5c10c9cb..1a9b92972614 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -300,6 +300,9 @@ with stdenv.lib;
   LOGO n # not needed
   MEDIA_ATTACH y
   MEGARAID_NEWGEN y
+  ${optionalString (versionAtLeast version "3.15") ''
+    MLX4_EN_VXLAN y
+  ''}
   MODVERSIONS y
   MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
   MTRR_SANITIZER y

From bca69399a88c50a9220c9888f85663a449ebc5c9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 16:50:20 -0700
Subject: [PATCH 0930/1143] kernel-config: kvm changes

---
 .../linux/kernel/common-config.nix            | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 1a9b92972614..7eb68952f302 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -383,10 +383,27 @@ with stdenv.lib;
   '' else ''
     PARAVIRT_GUEST? y
   ''}
-  KVM_GUEST? y
+  KVM_APIC_ARCHITECTURE y
+  KVM_ASYNC_PF y
   ${optionalString (versionOlder version "3.7") ''
     KVM_CLOCK? y
   ''}
+  ${optionalString (versionAtLeast version "4.0") ''
+    KVM_COMPAT y
+  ''}
+  ${optionalString (versionAtLeast version "3.10") ''
+    KVM_DEVICE_ASSIGNMENT y
+  ''}
+  ${optionalString (versionAtLeast version "4.0") ''
+    KVM_GENERIC_DIRTYLOG_READ_PROTECT y
+  ''}
+  ${optionalString (!features.grsecurity or true) ''
+    KVM_GUEST y
+  ''}
+  KVM_MMIO y
+  ${optionalString (versionAtLeast version "3.13") ''
+    KVM_VFIO y
+  ''}
   XEN? y
   XEN_DOM0? y
   ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false))  ''

From 13a38440c6993438ec7847eb8f00ad66fb3fd946 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 17:38:09 -0700
Subject: [PATCH 0931/1143] kernel-config: Grsecurity fixes

---
 pkgs/os-specific/linux/kernel/common-config.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7eb68952f302..42bf534c5002 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -234,7 +234,9 @@ with stdenv.lib;
   # Security related features.
   STRICT_DEVMEM y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
-  DEVKMEM? n # Disable /dev/kmem
+  ${optionalString (!features.grsecurity or true) ''
+    DEVKMEM n # Disable /dev/kmem
+  ''}
   ${if versionOlder version "3.14" then ''
     CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
   '' else ''
@@ -378,11 +380,13 @@ with stdenv.lib;
 
   # Virtualisation.
   PARAVIRT? y
-  ${if versionAtLeast version "3.10" then ''
-    HYPERVISOR_GUEST? y
-  '' else ''
-    PARAVIRT_GUEST? y
-  ''}
+  ${optionalString (!features.grsecurity or true)
+    (if versionAtLeast version "3.10" then ''
+      HYPERVISOR_GUEST y
+    '' else ''
+      PARAVIRT_GUEST? y
+    '')
+  }
   KVM_APIC_ARCHITECTURE y
   KVM_ASYNC_PF y
   ${optionalString (versionOlder version "3.7") ''

From 484a7be8441857a28df37abfa12c8f62c0d3b8a6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 15 May 2015 17:45:37 -0700
Subject: [PATCH 0932/1143] grub2: 2015-04-24 -> 2015-05-14

---
 pkgs/tools/misc/grub/2.0x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 501c6820df23..e33290e9852a 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -20,7 +20,7 @@ let
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.02-git-2015-04-24";
+  version = "2.02-git-2015-05-14";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromSavannah {
     repo = "grub";
-    rev = "70b002de55abbfd6b2d2f2ea4408078d93c9e0de";
-    sha256 = "1bhm1yxjmckzn45v70lzmz0qpj5prhb4iyiyqqw8rvyykcixw5qk";
+    rev = "5370dcfdae66b60cff3507ad925300a679fe4117";
+    sha256 = "1v4a3shcgfxjifwddmn3d0lyg3db1d3k87x5nchy7cyiss55jx1s";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

From bbd342dcf4bc8af09067c0785f8efe0ebd4d1fe2 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sat, 16 May 2015 04:00:54 +0200
Subject: [PATCH 0933/1143] openal to openalSoft conversion

---
 .../networking/instant-messengers/qtox/default.nix          | 4 ++--
 pkgs/games/0ad/default.nix                                  | 4 ++--
 pkgs/games/dhewm3/default.nix                               | 4 ++--
 pkgs/games/warzone2100/default.nix                          | 4 ++--
 pkgs/top-level/all-packages.nix                             | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 9771f29c770f..874f68f0ec20 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv
+{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv
 , libsodium, libXScrnSaver }:
 
 let
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs =
     [
-      libtoxcore openalSoft opencv libsodium filteraudio
+      libtoxcore openal opencv libsodium filteraudio
       qt5.base qt5.tools libXScrnSaver
     ];
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index 9698818c5575..bbcc6f11d1dc 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchurl, python27
 , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng
 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
-, openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL
+, openal, mesa, xproto, libX11, libXcursor, nspr, SDL
 , gloox, nvidia-texture-tools
 , withEditor ? true, wxGTK ? null
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     zeroadData python27 pkgconfig spidermonkey_24 boost icu
     libxml2 libpng libjpeg zlib curl libogg libvorbis enet
-    miniupnpc openalSoft mesa xproto libX11 libXcursor nspr
+    miniupnpc openal mesa xproto libX11 libXcursor nspr
     SDL gloox nvidia-texture-tools
   ] ++ stdenv.lib.optional withEditor wxGTK;
 
diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix
index f0d885c1f882..e3efd84f0fba 100644
--- a/pkgs/games/dhewm3/default.nix
+++ b/pkgs/games/dhewm3/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis
-, openalSoft, curl }:
+, openal, curl }:
 
 stdenv.mkDerivation rec {
   hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     cd */neo
   '';
 
-  buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft
+  buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openal
     curl ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 248b58a4e1a5..bd94fbecb2ab 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng
-, libtheora, openalSoft, physfs, mesa, fribidi, fontconfig
+, libtheora, openal, physfs, mesa, fribidi, fontconfig
 , freetype, qt4, glew, libogg, libvorbis, zlib, libX11
 , libXrandr, zip, unzip, which
 , withVideos ? false
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz";
     sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa";
   };
-  buildInputs = [ bison flex gettext pkgconfig libpng libtheora openalSoft
+  buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal
                   physfs mesa fribidi fontconfig freetype qt4
                   glew libogg libvorbis zlib libX11 libXrandr zip
                   unzip
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 907b97d8d85e..8bf45ab821ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7335,9 +7335,9 @@ let
 
   oniguruma = callPackage ../development/libraries/oniguruma { };
 
-  openal = callPackage ../development/libraries/openal { };
-
-  # added because I hope that it has been easier to compile on x86 (for blender)
+  # openalSoft is 100% ABI compatible to openalLegacy and should be a default
+  openal = openalSoft;
+  openalLegacy = callPackage ../development/libraries/openal { };
   openalSoft = callPackage ../development/libraries/openal-soft { };
 
   openbabel = callPackage ../development/libraries/openbabel { };

From 82b74ae42547a5ade39f64f102ab2be941cfa9a8 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Fri, 15 May 2015 21:21:52 -0700
Subject: [PATCH 0934/1143] Conditionally link libnatspec with darwin.libiconv

This fixes zip-archive, which depended on darwin.libiconv via GHC and regular libiconv via
libnatspec.
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24c28c46f35e..df9de2bc0ee6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6699,7 +6699,11 @@ let
   libmsgpack = callPackage ../development/libraries/libmsgpack { };
   libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { };
 
-  libnatspec = callPackage ../development/libraries/libnatspec { };
+  libnatspec = callPackage ../development/libraries/libnatspec (
+    stdenv.lib.optionalAttrs stdenv.isDarwin {
+      inherit (darwin) libiconv;
+    }
+  );
 
   libndp = callPackage ../development/libraries/libndp { };
 

From c94442286358504cdc99c8d9dff299d73b31f82f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 16 May 2015 12:12:34 +0200
Subject: [PATCH 0935/1143] lean: fixed build

---
 pkgs/applications/science/logic/lean/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 4d391379e819..2d93fdd61968 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ];
   enableParallelBuilding = true;
 
-  preConfigure = "cd src";
+  preConfigure = ''
+    patchShebangs bin/leantags
+    cd src
+  '';
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
 

From bbc40015b65b53d337cd9d5915ad11c5ddab66f7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sat, 16 May 2015 12:22:33 +0200
Subject: [PATCH 0936/1143] gdl 3.16: fix sha

---
 pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
index 9cad72de8f99..335a8d4d497b 100644
--- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
-    sha256 = "4b903c28a8894a82b997a1732a443c8b1d6a510304b3c3b511023339ff5d01db";
+    sha256 = "107zwvs913jr5hb59a4a8hsk19yinsicr2ma4vm216nzyl2f3jrl";
   };
 
   buildInputs = [ pkgconfig libxml2 gtk3 intltool ];

From fc4452513768b46dc88b4a634799fe0c3ee7b6aa Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sat, 16 May 2015 12:23:49 +0200
Subject: [PATCH 0937/1143] gdl: add myself as maintainer

---
 pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
index 335a8d4d497b..8e0c35eda308 100644
--- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
@@ -18,6 +18,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Gnome docking library";
     homepage = https://developer.gnome.org/gdl/;
+    maintainers = [ maintainers.lethalman ];
     license = [ licenses.gpl2 ];
     platforms = platforms.linux;
   };

From 4f43b41240ed2d1c6ac7851e8201f9f6d7c3dc45 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 16 May 2015 12:50:04 +0200
Subject: [PATCH 0938/1143] rubberband: fix build

rubberband assumes double precision fftw
---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 365235ffa50e..b637f3c2dc27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7660,7 +7660,6 @@ let
   rocksdb = callPackage ../development/libraries/rocksdb { };
 
   rubberband = callPackage ../development/libraries/rubberband {
-    fftw = fftwSinglePrec;
     inherit (vamp) vampSDK;
   };
 

From 496371321b189fd0af072cacdaf0c7e363435369 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 16 May 2015 14:00:19 +0200
Subject: [PATCH 0939/1143] atomicparsely: fixed build

---
 pkgs/tools/video/atomicparsley/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 02381badcc86..9cabfe31a188 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with pkgs; [ unzip ];
   patches = [ ./casts.patch ];
-  setSourceRoot = "sourceRoot=${name}-source-${version}";
+  setSourceRoot = "sourceRoot=${product}-source-${version}";
   buildPhase = "bash build";
   installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
 

From 1e7709458df9385a62fbcfab9ea46ccb11360943 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 16 May 2015 15:04:19 +0200
Subject: [PATCH 0940/1143] freewheeling: fix build

---
 pkgs/applications/audio/freewheeling/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index a3f356e75c45..0e7f8ad9957c 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype
+{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype
 , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis
 , libsndfile, libogg
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig autoconf automake gnutls freetype SDL SDL_gfx SDL_ttf
+    pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf
     liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg
   ];
 

From dd545e0fa486a2a35b987b82826ad29e2f62553a Mon Sep 17 00:00:00 2001
From: Paulus Esterhazy <pesterhazy@gmail.com>
Date: Sat, 16 May 2015 19:26:07 +0200
Subject: [PATCH 0941/1143] Add Jekyll

---
 pkgs/applications/misc/jekyll/Gemfile      |   4 +
 pkgs/applications/misc/jekyll/Gemfile.lock |  72 ++++++
 pkgs/applications/misc/jekyll/default.nix  |  20 ++
 pkgs/applications/misc/jekyll/gemset.nix   | 282 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   2 +
 5 files changed, 380 insertions(+)
 create mode 100644 pkgs/applications/misc/jekyll/Gemfile
 create mode 100644 pkgs/applications/misc/jekyll/Gemfile.lock
 create mode 100644 pkgs/applications/misc/jekyll/default.nix
 create mode 100644 pkgs/applications/misc/jekyll/gemset.nix

diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile
new file mode 100644
index 000000000000..0788a359116d
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/Gemfile
@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem 'jekyll'
+gem 'rdiscount'
diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock
new file mode 100644
index 000000000000..76bddef5869e
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/Gemfile.lock
@@ -0,0 +1,72 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    blankslate (2.1.2.4)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.3)
+      fast-stemmer (~> 1.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1.1)
+    colorator (0.1)
+    execjs (2.5.2)
+    fast-stemmer (1.0.2)
+    ffi (1.9.8)
+    hitimes (1.2.2)
+    jekyll (2.5.3)
+      classifier-reborn (~> 2.0)
+      colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.2.1)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-watch (1.2.1)
+      listen (~> 2.7)
+    kramdown (1.7.0)
+    liquid (2.6.2)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    mercenary (0.3.5)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.11)
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdiscount (2.1.8)
+    redcarpet (3.2.3)
+    safe_yaml (1.0.4)
+    sass (3.4.13)
+    timers (4.0.1)
+      hitimes
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    yajl-ruby (1.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll
+  rdiscount
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
new file mode 100644
index 000000000000..9c0ef01e7404
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, bundlerEnv, ruby_2_1, curl }:
+
+bundlerEnv {
+  name = "jekyll-2.5.3";
+
+  ruby = ruby_2_1;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  buildInputs = [ curl ];
+
+  meta = with lib; {
+    description = "Simple, blog aware, static site generator";
+    homepage    =  http://jekyllrb.com/;
+    license     = with licenses; mit;
+    # maintainers = with maintainers; [ offline ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix
new file mode 100644
index 000000000000..0ceb095b4c82
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/gemset.nix
@@ -0,0 +1,282 @@
+{
+  "blankslate" = {
+    version = "2.1.2.4";
+    source = {
+      type = "gem";
+      sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";
+    };
+  };
+  "celluloid" = {
+    version = "0.16.0";
+    source = {
+      type = "gem";
+      sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3";
+    };
+    dependencies = [
+      "timers"
+    ];
+  };
+  "classifier-reborn" = {
+    version = "2.0.3";
+    source = {
+      type = "gem";
+      sha256 = "0vca8jl7nbgzyb7zlvnq9cqgabwjdl59jqlpfkwzv6znkri7cpby";
+    };
+    dependencies = [
+      "fast-stemmer"
+    ];
+  };
+  "coffee-script" = {
+    version = "2.4.1";
+    source = {
+      type = "gem";
+      sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
+    };
+    dependencies = [
+      "coffee-script-source"
+      "execjs"
+    ];
+  };
+  "coffee-script-source" = {
+    version = "1.9.1.1";
+    source = {
+      type = "gem";
+      sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5";
+    };
+  };
+  "colorator" = {
+    version = "0.1";
+    source = {
+      type = "gem";
+      sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs";
+    };
+  };
+  "execjs" = {
+    version = "2.5.2";
+    source = {
+      type = "gem";
+      sha256 = "0y2193yhcyz9f97m7g3wanvwzdjb08sllrj1g84sgn848j12vyl0";
+    };
+  };
+  "fast-stemmer" = {
+    version = "1.0.2";
+    source = {
+      type = "gem";
+      sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh";
+    };
+  };
+  "ffi" = {
+    version = "1.9.8";
+    source = {
+      type = "gem";
+      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
+    };
+  };
+  "hitimes" = {
+    version = "1.2.2";
+    source = {
+      type = "gem";
+      sha256 = "17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4";
+    };
+  };
+  "jekyll" = {
+    version = "2.5.3";
+    source = {
+      type = "gem";
+      sha256 = "1ad3d62yd5rxkvn3xls3xmr2wnk8fiickjy27g098hs842wmw22n";
+    };
+    dependencies = [
+      "classifier-reborn"
+      "colorator"
+      "jekyll-coffeescript"
+      "jekyll-gist"
+      "jekyll-paginate"
+      "jekyll-sass-converter"
+      "jekyll-watch"
+      "kramdown"
+      "liquid"
+      "mercenary"
+      "pygments.rb"
+      "redcarpet"
+      "safe_yaml"
+      "toml"
+    ];
+  };
+  "jekyll-coffeescript" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg";
+    };
+    dependencies = [
+      "coffee-script"
+    ];
+  };
+  "jekyll-gist" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "10hywgdwqafa21nwa5br54wvp4wsr3wnx64v8d81glj5cs17f9bv";
+    };
+  };
+  "jekyll-paginate" = {
+    version = "1.1.0";
+    source = {
+      type = "gem";
+      sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
+    };
+  };
+  "jekyll-sass-converter" = {
+    version = "1.3.0";
+    source = {
+      type = "gem";
+      sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1";
+    };
+    dependencies = [
+      "sass"
+    ];
+  };
+  "jekyll-watch" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0p9mc8m4bggsqlq567g1g67z5fvzlm7yyv4l8717l46nq0d52gja";
+    };
+    dependencies = [
+      "listen"
+    ];
+  };
+  "kramdown" = {
+    version = "1.7.0";
+    source = {
+      type = "gem";
+      sha256 = "070r81kz88zw28c8bs5p0p92ymn1nldci2fm1arkas0bnqrd3rna";
+    };
+  };
+  "liquid" = {
+    version = "2.6.2";
+    source = {
+      type = "gem";
+      sha256 = "1k7lx7szwnz7vv3hqpdb6bgw8p73sa1ss9m1m5h0jaqb9xkqnfzb";
+    };
+  };
+  "listen" = {
+    version = "2.10.0";
+    source = {
+      type = "gem";
+      sha256 = "131pgi5bsqln2kfkp72wpi0dfz5i124758xcl1h3c5gz75j0vg2i";
+    };
+    dependencies = [
+      "celluloid"
+      "rb-fsevent"
+      "rb-inotify"
+    ];
+  };
+  "mercenary" = {
+    version = "0.3.5";
+    source = {
+      type = "gem";
+      sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb";
+    };
+  };
+  "parslet" = {
+    version = "1.5.0";
+    source = {
+      type = "gem";
+      sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";
+    };
+    dependencies = [
+      "blankslate"
+    ];
+  };
+  "posix-spawn" = {
+    version = "0.3.11";
+    source = {
+      type = "gem";
+      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
+    };
+  };
+  "pygments.rb" = {
+    version = "0.6.3";
+    source = {
+      type = "gem";
+      sha256 = "160i761q2z8kandcikf2r5318glgi3pf6b45wa407wacjvz2966i";
+    };
+    dependencies = [
+      "posix-spawn"
+      "yajl-ruby"
+    ];
+  };
+  "rb-fsevent" = {
+    version = "0.9.4";
+    source = {
+      type = "gem";
+      sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7";
+    };
+  };
+  "rb-inotify" = {
+    version = "0.9.5";
+    source = {
+      type = "gem";
+      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
+    };
+    dependencies = [
+      "ffi"
+    ];
+  };
+  "rdiscount" = {
+    version = "2.1.8";
+    source = {
+      type = "gem";
+      sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v";
+    };
+  };
+  "redcarpet" = {
+    version = "3.2.3";
+    source = {
+      type = "gem";
+      sha256 = "0l6zr8wlqb648z202kzi7l9p89b6v4ivdhif5w803l1rrwyzvj0m";
+    };
+  };
+  "safe_yaml" = {
+    version = "1.0.4";
+    source = {
+      type = "gem";
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+    };
+  };
+  "sass" = {
+    version = "3.4.13";
+    source = {
+      type = "gem";
+      sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig";
+    };
+  };
+  "timers" = {
+    version = "4.0.1";
+    source = {
+      type = "gem";
+      sha256 = "03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l";
+    };
+    dependencies = [
+      "hitimes"
+    ];
+  };
+  "toml" = {
+    version = "0.1.2";
+    source = {
+      type = "gem";
+      sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";
+    };
+    dependencies = [
+      "parslet"
+    ];
+  };
+  "yajl-ruby" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b637f3c2dc27..461625eb7970 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1795,6 +1795,8 @@ let
 
   jdiskreport = callPackage ../tools/misc/jdiskreport { };
 
+  jekyll = callPackage ../applications/misc/jekyll { };
+
   jfsutils = callPackage ../tools/filesystems/jfsutils { };
 
   jhead = callPackage ../tools/graphics/jhead { };

From 3b4152f7e1183f5749b82a9247e76cb5f047e4bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 16 May 2015 19:58:29 +0200
Subject: [PATCH 0942/1143] gtkvnc: add libgpgerror as dependency

---
 pkgs/tools/admin/gtk-vnc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index c502cee5415a..9fc6d135625d 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -2,7 +2,7 @@
 , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
 , libffi, cyrus_sasl, intltool, perl, perlPackages, pulseaudio
 , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
-, pygobject3, libogg, enableGTK3 ? false }:
+, pygobject3, libogg, enableGTK3 ? false, libgpgerror }:
 
 stdenv.mkDerivation rec {
   name = "gtk-vnc-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python gnutls cairo libtool pkgconfig glib libffi libgcrypt
     intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV
-    gobjectIntrospection libogg
+    gobjectIntrospection libogg libgpgerror
   ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]);
 
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";

From 89a58c9e05cea87bb416563d1f6307e3e27818fb Mon Sep 17 00:00:00 2001
From: Paulus Esterhazy <pesterhazy@gmail.com>
Date: Sat, 16 May 2015 20:11:41 +0200
Subject: [PATCH 0943/1143] Add Jekyll maintainer

---
 lib/maintainers.nix                       | 1 +
 pkgs/applications/misc/jekyll/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d4fda831d594..a7e8b331e988 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -153,6 +153,7 @@
   paholg = "Paho Lurie-Gregg <paho@paholg.com>";
   pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
+  pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
   phausmann = "Philipp Hausmann <nix@314.ch>";
   philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 9c0ef01e7404..cc1d4e7c6592 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -14,7 +14,7 @@ bundlerEnv {
     description = "Simple, blog aware, static site generator";
     homepage    =  http://jekyllrb.com/;
     license     = with licenses; mit;
-    # maintainers = with maintainers; [ offline ];
+    maintainers = with maintainers; [ pesterhazy ];
     platforms   = platforms.unix;
   };
 }

From ea2c17571db0c5a9aaca8f58b041fe6309bef27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 16 May 2015 20:34:17 +0200
Subject: [PATCH 0944/1143] miniupnp{c,d}: bump

---
 pkgs/tools/networking/miniupnpc/default.nix | 6 ++++--
 pkgs/tools/networking/miniupnpd/default.nix | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 3cd35073be6e..22f833f9bdb6 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "miniupnpc-1.7";
+  name = "miniupnpc-1.9.20150430";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0dv3mz4yikngmlnrnmh747mlgbbpijryw03wcs8g4jwvprb29p8n";
+    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
+    name = "${name}.tar.gz";
   };
 
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
@@ -19,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://miniupnp.free.fr/;
     description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index ef3db0a4a21f..11262460e716 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,12 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.8.20140401";
+  name = "miniupnpd-1.9.20150430";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "1gfdbfqcw6ih830si51yzqbyymgcbwkiv9vk5dwnxs78b7xgyv88";
+    sha256 = "0ajqs3lf2cgq5fm1v79fa23sbb623i89sqnx7d9cnqbqq5py1k71";
+    name = "miniupnpd-1.9.20150430.tar.gz";
   };
 
   buildInputs = [ iptables libnfnetlink ];
@@ -27,5 +28,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://miniupnp.free.fr/;
     description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 4c67102a59e7476b450be37a366924f43388dfcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 16 May 2015 20:34:33 +0200
Subject: [PATCH 0945/1143] pythonPackages.greenlet: 0.4.5 -> 0.4.7

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36feab0056e6..4f641ede7272 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5773,12 +5773,12 @@ let
 
   greenlet = buildPythonPackage rec {
     name = "greenlet-${version}";
-    version = "0.4.5";
+    version = "0.4.7";
     disabled = isPyPy;  # builtin for pypy
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/g/greenlet/${name}.zip";
-      sha256 = "1gidivqcpn6i6k01bf3hgcn0m68h4b9srhpff9kgnk0c287z145r";
+      sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k";
     };
 
     meta = with stdenv.lib; {

From 3efefb5baa6b7645219dede69709ee6a36ea1604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 16 May 2015 20:56:53 +0200
Subject: [PATCH 0946/1143] greenlet: delete problematic test

---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f641ede7272..98b012ecd466 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5781,6 +5781,11 @@ let
       sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k";
     };
 
+    # see https://github.com/python-greenlet/greenlet/issues/85
+    preCheck = ''
+      rm tests/test_leaks.py
+    '';
+
     meta = with stdenv.lib; {
       homepage = http://pypi.python.org/pypi/greenlet;
       description = "Module for lightweight in-process concurrent programming";

From c59c20ca0f1163b868efa843a98cfcb55cfbbd56 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 May 2015 14:12:11 -0500
Subject: [PATCH 0947/1143] Update HPLIP to 3.15.4

---
 nixos/doc/manual/release-notes/rl-unstable.xml |  9 +++++++++
 pkgs/misc/drivers/hplip/default.nix            | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index c4691aa663f4..9563dcbb343b 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -61,6 +61,15 @@ was accordingly renamed to <literal>bomi</literal>
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    HPLIP (printer, scanner, and fax drivers for HP devices) has
+    been updated to version <literal>3.15.4</literal>. This release
+    adds support for the <literal>arm6l-linux</literal> and
+    <literal>arm7l-linux</literal> platforms.
+  </para>
+</listitem>
+
 
 </itemizedlist>
 </para>
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 7c4e6f45bb4d..bb790be7c268 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -6,11 +6,11 @@
 
 let
 
-  name = "hplip-3.15.2";
+  name = "hplip-3.15.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0z7n62vdbr0p0kls1m2sr3nhvkhx3rawcbzd0zdl0lnq8fkyq0jz";
+    sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3";
   };
 
   hplip_state =
@@ -21,9 +21,17 @@ let
         version = (builtins.parseDrvName name).version;
       };
 
+  hplip_arch =
+    {
+      "i686-linux" = "x86_32";
+      "x86_64-linux" = "x86_64";
+      "arm6l-linux" = "arm32";
+      "arm7l-linux" = "arm32";
+    }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}");
+
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "1pzxv9yway1x1m5grz6042p54ldh7jcgv4qrkjhlcb4vr9plwql9";
+    sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392";
   };
 
 in
@@ -135,7 +143,7 @@ stdenv.mkDerivation {
     license = if withPlugin
       then licenses.unfree
       else with licenses; [ mit bsd2 gpl2Plus ];
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
     maintainers = with maintainers; [ ttuegel jgeerds ];
   };
 }

From 4e2e36f3885a4dd19b180faeba2f00eb8a65a8e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 May 2015 17:42:22 +0200
Subject: [PATCH 0948/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/31bc649141e7724eb7528e7ae8bc9057a939ba22
 with hackage2nix revision 8e3ad6c8af82151574e87c1e9c9ec6cbb5841b3d

---
 .../haskell-modules/hackage-packages.nix      | 2266 ++++++++++-------
 1 file changed, 1322 insertions(+), 944 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2361129113d0..45a053f311c6 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1541,8 +1541,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.7.1.9";
-       sha256 = "1llfbfwxnyvc4k9zlf1fdkb9dr4abmv0x6zc0048h4vx7db50f8h";
+       version = "0.7.1.10";
+       sha256 = "142m20523jd65s53w2myqc24sj6mi3kff8ziqqja3q0whh79n79w";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -2174,6 +2174,7 @@ self: {
          HUnit old-time process QuickCheck regex-posix test-framework
          test-framework-hunit test-framework-quickcheck2 unix
        ];
+       jailbreak = true;
        preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
@@ -2200,6 +2201,7 @@ self: {
          filepath HUnit old-time process QuickCheck regex-posix
          test-framework test-framework-hunit test-framework-quickcheck2 unix
        ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
@@ -2316,6 +2318,7 @@ self: {
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
@@ -2333,6 +2336,7 @@ self: {
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Cairo backend for Charts";
        license = stdenv.lib.licenses.bsd3;
@@ -2689,8 +2693,8 @@ self: {
     ({ mkDerivation, async, base }:
      mkDerivation {
        pname = "Concurrential";
-       version = "0.4.0.0";
-       sha256 = "0wgiwpkv65czcc5fllzicgswq6rf0jl646w2n937yhvbdmxfcq6i";
+       version = "0.5.0.0";
+       sha256 = "1fcl1ckinzv9c0iyfvhh3sm649jn7q8yv2r9vz99l139dw25l5vb";
        buildDepends = [ async base ];
        jailbreak = true;
        homepage = "http://github.com/avieth/Concurrential";
@@ -3065,6 +3069,7 @@ self: {
          network network-uri optparse-applicative transformers
          transformers-base utf8-string xml-conduit xml-hamlet
        ];
+       jailbreak = true;
        homepage = "http://floss.scru.org/hDAV";
        description = "RFC 4918 WebDAV support";
        license = stdenv.lib.licenses.gpl3;
@@ -6056,8 +6061,8 @@ self: {
      }:
      mkDerivation {
        pname = "HDBC-odbc";
-       version = "2.4.0.0";
-       sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz";
+       version = "2.4.0.1";
+       sha256 = "1sdf5llz40q9cg0gi0rglnz6agamb7z4n5c6dhwwly902b6fxinv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring HDBC mtl time utf8-string ];
@@ -7146,27 +7151,6 @@ self: {
      }) {};
 
   "HStringTemplate" = callPackage
-    ({ mkDerivation, array, base, blaze-builder, bytestring, containers
-     , deepseq, directory, filepath, mtl, old-locale, old-time, parsec
-     , pretty, syb, template-haskell, text, time, utf8-string, void
-     }:
-     mkDerivation {
-       pname = "HStringTemplate";
-       version = "0.7.3";
-       revision = "2";
-       sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8";
-       editedCabalFile = "f3b42ea4e5c29507d6d186ccd34c83425d2e16a55ca3af95fd8bb1a71e3f54cb";
-       buildDepends = [
-         array base blaze-builder bytestring containers deepseq directory
-         filepath mtl old-locale old-time parsec pretty syb template-haskell
-         text time utf8-string void
-       ];
-       jailbreak = true;
-       description = "StringTemplate implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HStringTemplate_0_8_3" = callPackage
     ({ mkDerivation, array, base, blaze-builder, bytestring, containers
      , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
      , syb, template-haskell, text, time, void
@@ -8982,7 +8966,9 @@ self: {
      mkDerivation {
        pname = "JuicyPixels";
        version = "3.2.4";
+       revision = "1";
        sha256 = "113w66rd6h04x0zbkqh34x33pf15hmrn3l9yy8kirs55kbg266w0";
+       editedCabalFile = "0ea6de6b2defec5f1be0f98fc995b3a9654fbf8d3b34cd3fa77a0f2e3919dc2b";
        buildDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -10300,8 +10286,8 @@ self: {
      }:
      mkDerivation {
        pname = "MonadRandom";
-       version = "0.3.0.2";
-       sha256 = "18gajibgypy8hl0slh3lyjjwqqkayxrk7vwwk26nfdkq9yixxbvi";
+       version = "0.4";
+       sha256 = "14vgp2sml9jsras9l0488gy2siamcqf78y3vlr1my4lhhdx3ybyk";
        buildDepends = [
          base mtl random transformers transformers-compat
        ];
@@ -12251,23 +12237,6 @@ self: {
      }) {};
 
   "QuickCheck" = callPackage
-    ({ mkDerivation, base, random, template-haskell, test-framework
-     , tf-random, transformers
-     }:
-     mkDerivation {
-       pname = "QuickCheck";
-       version = "2.7.6";
-       sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40";
-       buildDepends = [
-         base random template-haskell tf-random transformers
-       ];
-       testDepends = [ base template-haskell test-framework ];
-       homepage = "https://github.com/nick8325/quickcheck";
-       description = "Automatic testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "QuickCheck_2_8_1" = callPackage
     ({ mkDerivation, base, containers, random, template-haskell
      , test-framework, tf-random, transformers
      }:
@@ -12279,7 +12248,6 @@ self: {
          base containers random template-haskell tf-random transformers
        ];
        testDepends = [ base containers template-haskell test-framework ];
-       jailbreak = true;
        homepage = "https://github.com/nick8325/quickcheck";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -13331,6 +13299,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) glib;  inherit (pkgs) mono;};
 
+  "Saturnin" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, directory, either
+     , exceptions, filepath, formatting, hlint, hspec, ini, mtl, network
+     , old-locale, process, regex-compat, spawn, stm, temporary, text
+     , time, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "Saturnin";
+       version = "0.1.0";
+       sha256 = "14ipl6mi1g874y66i3lvaqdisfl3agy5cj005ghpq81hv5wp770g";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring data-default directory either exceptions filepath
+         formatting ini mtl network old-locale process spawn stm temporary
+         text time unordered-containers yaml
+       ];
+       testDepends = [
+         base data-default either hlint hspec mtl process regex-compat
+       ];
+       description = "Saturnin CI / Job System";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "SciFlow" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, mtl, shelly
      , template-haskell, text, unordered-containers, yaml
@@ -14244,6 +14236,7 @@ self: {
          base containers deepseq fgl free hmatrix integration list-extras
          mtl numeric-tools parallel
        ];
+       jailbreak = true;
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16027,17 +16020,17 @@ self: {
 
   "Zora" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fgl
-     , graphviz, random, shelly, text
+     , graphviz, random, shelly, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "Zora";
-       version = "1.1.23";
-       sha256 = "0nfvqhrlz8wgvfiqnlfzgsbsk4q3yg7a7s4pyh4v4xw0xnj68vgl";
+       version = "1.2.0";
+       sha256 = "1yni2yq8ynq9jhnzabyx0ahmvmvcyblc0swxy0n7qdzlz5rxzm3i";
        buildDepends = [
          base bytestring containers directory fgl graphviz random shelly
          text
        ];
-       testDepends = [ base ];
+       testDepends = [ base containers random tasty tasty-hunit ];
        homepage = "http://github.com/bgwines/zora";
        description = "Graphing library wrapper + assorted useful functions";
        license = stdenv.lib.licenses.bsd3;
@@ -16733,6 +16726,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "acme-memorandom" = callPackage
+    ({ mkDerivation, base, MemoTrie, random }:
+     mkDerivation {
+       pname = "acme-memorandom";
+       version = "0.0.3";
+       sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi";
+       buildDepends = [ base MemoTrie random ];
+       homepage = "https://github.com/ion1/acme-memorandom";
+       description = "Memoized random number generation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "acme-microwave" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -16953,6 +16958,7 @@ self: {
        testDepends = [
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
+       jailbreak = true;
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16991,6 +16997,7 @@ self: {
        version = "0.3.0.3";
        sha256 = "1q433by9ygs7rrjj8z76hg94zyh2cp4qiwsv7q1mywr5scfccn32";
        buildDepends = [ base QuickCheck ];
+       jailbreak = true;
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17160,8 +17167,8 @@ self: {
      }:
      mkDerivation {
        pname = "adjunctions";
-       version = "4.2";
-       sha256 = "07r56r6kyd6wlcxxnsnnyv59pyc8s1gsy54kzwmk9yknks5rij9i";
+       version = "4.2.1";
+       sha256 = "0vzlz2q6863ywnhvax3m5xq99x6bz1h47z7z8hmnqdfg5pa4r9k5";
        buildDepends = [
          array base comonad containers contravariant distributive free mtl
          profunctors semigroupoids semigroups tagged transformers void
@@ -17425,19 +17432,21 @@ self: {
      }) {};
 
   "aeson-qq" = callPackage
-    ({ mkDerivation, aeson, base, ghc-prim, haskell-src-meta, hspec
-     , parsec, template-haskell, text, vector
+    ({ mkDerivation, aeson, attoparsec, base, ghc-prim
+     , haskell-src-meta, hspec, parsec, scientific, template-haskell
+     , text, vector
      }:
      mkDerivation {
        pname = "aeson-qq";
-       version = "0.7.4";
-       sha256 = "0wnc9pdjvd15gfkdxzf084393vwmxv2xaxdchzgal1qhwa1mak4v";
+       version = "0.8.0";
+       sha256 = "12vs3mh1a6j2r74xr11bpzb69i0k25dxplhvw15ph72kmhfbri7f";
        buildDepends = [
-         aeson base haskell-src-meta parsec template-haskell text vector
+         aeson attoparsec base haskell-src-meta parsec scientific
+         template-haskell text vector
        ];
        testDepends = [
-         aeson base ghc-prim haskell-src-meta hspec parsec template-haskell
-         text vector
+         aeson attoparsec base ghc-prim haskell-src-meta hspec parsec
+         scientific template-haskell text vector
        ];
        homepage = "http://github.com/zalora/aeson-qq";
        description = "JSON quasiquoter for Haskell";
@@ -17806,8 +17815,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.0.1";
-       sha256 = "0vhpv55wcljywh8rvv829c69wam0w505p6gf8bs5680spwc4z4y0";
+       version = "4.0.3";
+       sha256 = "1z5szc15qg7hqgz67b6m9is2dwkfcz50rw393nkpq7q2w6sjlf5m";
        buildDepends = [ array base containers mtl random vector ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
@@ -18028,6 +18037,7 @@ self: {
          adjunctions array base containers distributive mtl nats
          semigroupoids semigroups tagged transformers void
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/algebra/";
        description = "Constructive abstract algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -19166,8 +19176,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp-conduit";
-       version = "0.1.0.1";
-       sha256 = "167dkak5hg4q5b7i58mw6bl0mh38nyqbzyrhplmil9nins7cvqmv";
+       version = "0.2.0.0";
+       sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb";
        buildDepends = [
          amqp base conduit exceptions lifted-base monad-control mtl
          resourcet text transformers transformers-base
@@ -19615,6 +19625,7 @@ self: {
          test-framework-hunit transformers
        ];
        extraLibraries = [ openssl ];
+       jailbreak = true;
        homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
@@ -19665,6 +19676,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "api-opentheory-unicode" = callPackage
+    ({ mkDerivation, base, bytestring, directory, opentheory-unicode }:
+     mkDerivation {
+       pname = "api-opentheory-unicode";
+       version = "1.2";
+       sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88";
+       buildDepends = [ base bytestring opentheory-unicode ];
+       testDepends = [ base bytestring directory opentheory-unicode ];
+       description = "OpenTheory unicode character API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "api-tools" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base
      , base64-bytestring, bytestring, Cabal, case-insensitive
@@ -19787,6 +19810,7 @@ self: {
          apiary base blaze-builder blaze-html bytestring cookie time
          types-compat wai web-routing
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "Cookie support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -20117,6 +20141,7 @@ self: {
        testDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://www.github.com/ktvoelker/AParsec";
        description = "An applicative parser combinator library";
        license = stdenv.lib.licenses.gpl3;
@@ -20705,6 +20730,7 @@ self: {
        version = "0.1.1";
        sha256 = "1fs8jap2ndcj21qgpkzy9nbnabvp4ac0xm0vdwkjjdf7i4j5kaqr";
        buildDepends = [ base containers profunctors transformers ];
+       jailbreak = true;
        homepage = "https://github.com/fumieval/artery";
        description = "A simple, arrow-based reactive programming";
        license = stdenv.lib.licenses.bsd3;
@@ -21520,10 +21546,9 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, enumerator, text }:
      mkDerivation {
        pname = "attoparsec-enumerator";
-       version = "0.3.3";
-       sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w";
+       version = "0.3.4";
+       sha256 = "127mj0v6342mzxnc73qki3k197vhwsff8qkf92gm5idyxdisg5dy";
        buildDepends = [ attoparsec base bytestring enumerator text ];
-       jailbreak = true;
        homepage = "https://john-millikin.com/software/attoparsec-enumerator/";
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
@@ -23015,8 +23040,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, unix }:
      mkDerivation {
        pname = "base-compat";
-       version = "0.8.1.1";
-       sha256 = "0j1k7yxahprbajzvfxvdfzz3frx8s8karq1kv8v02yh0lsw7hjki";
+       version = "0.8.2";
+       sha256 = "02m93hzgxg4bcnp7xcc2fdh2hrsc2h6fwl8hix5nx9k864kwf41q";
        buildDepends = [ base unix ];
        testDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
@@ -23229,17 +23254,17 @@ self: {
      }) {};
 
   "basic-prelude" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hashable
-     , lifted-base, ReadArgs, safe, system-filepath, text, transformers
+    ({ mkDerivation, base, bytestring, containers, filepath, hashable
+     , lifted-base, ReadArgs, safe, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "basic-prelude";
-       version = "0.3.13";
-       sha256 = "0kfqh5jf9lfxmqhfi74i13cgkwchfkyall4glh2inna3ish4qz5l";
+       version = "0.4.0";
+       sha256 = "10zr3fb12fis33q74988fipljcjlcr1c94cf9kg0rfby2dc1z6v4";
        buildDepends = [
-         base bytestring containers hashable lifted-base ReadArgs safe
-         system-filepath text transformers unordered-containers vector
+         base bytestring containers filepath hashable lifted-base ReadArgs
+         safe text transformers unordered-containers vector
        ];
        homepage = "https://github.com/snoyberg/basic-prelude";
        description = "An enhanced core prelude; a common foundation for alternate preludes";
@@ -23808,12 +23833,12 @@ self: {
      }) {};
 
   "bifunctors" = callPackage
-    ({ mkDerivation, base, semigroupoids, semigroups, tagged }:
+    ({ mkDerivation, base, semigroups, tagged }:
      mkDerivation {
        pname = "bifunctors";
-       version = "4.2.1";
-       sha256 = "0zy4lz08r60h8lgrf67zqqrcslrnbmdi254ydv5mw69z57nnx3ng";
-       buildDepends = [ base semigroupoids semigroups tagged ];
+       version = "5";
+       sha256 = "13990xdgx0n23qgi18ghhmsywj5zkr0a5bim0g8a4nzi0cx95ps1";
+       buildDepends = [ base semigroups tagged ];
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -25174,8 +25199,8 @@ self: {
      }:
      mkDerivation {
        pname = "biophd";
-       version = "0.0.6";
-       sha256 = "1206pa9ah473rvpj6yr769fwmjc3axl036ny3yzf52lhy6bcggbb";
+       version = "0.0.7";
+       sha256 = "1n841kdny2ry8kmm3g87vvkpg6c4ia49hbb3qh1bnwd0nwq0x3mw";
        buildDepends = [
          base binary biocore bytestring old-locale parsec text time
        ];
@@ -25344,11 +25369,11 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-api-extra";
-       version = "0.9.0";
-       sha256 = "155fq7wfpij0rfc06ps1bq9mz8gm68nnlxh1170qq5rgqcc49f79";
+       version = "0.9.1";
+       sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4";
        buildDepends = [
          base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit
-         stm stm-chans stm-conduit text transformers
+         lens stm stm-chans stm-conduit text transformers
        ];
        testDepends = [
          base bitcoin-api bitcoin-tx bytestring conduit hspec http-client
@@ -25914,24 +25939,13 @@ self: {
        version = "0.1.0.0";
        sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw";
        buildDepends = [ base blaze-html text ];
+       jailbreak = true;
        homepage = "http://github.com/agrafix/blaze-bootstrap";
        description = "Blaze helper functions for bootstrap pages";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "blaze-builder" = callPackage
-    ({ mkDerivation, base, bytestring, text }:
-     mkDerivation {
-       pname = "blaze-builder";
-       version = "0.3.3.4";
-       sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5";
-       buildDepends = [ base bytestring text ];
-       homepage = "http://github.com/meiersi/blaze-builder";
-       description = "Efficient buffered output";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-builder_0_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, utf8-string
@@ -25963,8 +25977,8 @@ self: {
      }) {};
 
   "blaze-builder-enumerator" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, enumerator
-     , streaming-commons, transformers
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , bytestring-builder, enumerator, streaming-commons, transformers
      }:
      mkDerivation {
        pname = "blaze-builder-enumerator";
@@ -25973,8 +25987,8 @@ self: {
        sha256 = "15mz4dfnngll61b1xv3hfazvzjfd8g9ym0hps1qiks1hl4c2kxah";
        editedCabalFile = "28796d33301d22cfca6188f54699d9efd7721802bc5e9c88a394bec14c9c4fae";
        buildDepends = [
-         base blaze-builder bytestring enumerator streaming-commons
-         transformers
+         base blaze-builder bytestring bytestring-builder enumerator
+         streaming-commons transformers
        ];
        homepage = "https://github.com/meiersi/blaze-builder-enumerator";
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
@@ -26010,32 +26024,13 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "blaze-html" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
-     , containers, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-html";
-       version = "0.7.1.0";
-       sha256 = "0krvyik9hdizvyx3r499vah34b1jnnv4ivm9h1ij7rgh9xjw34ja";
-       buildDepends = [ base blaze-builder blaze-markup bytestring text ];
-       testDepends = [
-         base blaze-builder blaze-markup bytestring containers HUnit
-         QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       homepage = "http://jaspervdj.be/blaze";
-       description = "A blazingly fast HTML combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-html_0_8_0_2" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
      , containers, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
@@ -26050,7 +26045,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
-       jailbreak = true;
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -26139,31 +26133,13 @@ self: {
          base blaze-builder bytestring containers HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast markup combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "blaze-markup" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-markup";
-       version = "0.6.3.0";
-       sha256 = "1x057jlp89js6xbbyp4ky7xf5wq1ckl516b8bzp4y3knz50jshll";
-       buildDepends = [ base blaze-builder bytestring text ];
-       testDepends = [
-         base blaze-builder bytestring containers HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-       ];
-       homepage = "http://jaspervdj.be/blaze";
-       description = "A blazingly fast markup combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-markup_0_7_0_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text
@@ -26690,8 +26666,8 @@ self: {
      }:
      mkDerivation {
        pname = "bound";
-       version = "1.0.4";
-       sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky";
+       version = "1.0.5";
+       sha256 = "1vk2d8c0nvfk28a9l5d6vnxk48lha2xsp64bd7c1p3x8lygxj88f";
        buildDepends = [
          base bifunctors binary bytes cereal comonad hashable
          hashable-extras prelude-extras profunctors transformers
@@ -26786,14 +26762,11 @@ self: {
     ({ mkDerivation, array, base, mtl, unix }:
      mkDerivation {
        pname = "brainfuck";
-       version = "0.1";
-       revision = "1";
-       sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3";
-       editedCabalFile = "154e3b46053499fc41f606429c8c4f0500e7ec1e1cbf8c3e89af275e06e9d7fa";
+       version = "0.1.0.2";
+       sha256 = "18xp0vlmh2n37x6rhczxw115cnips7vm9f560qsr395crqk5dzz9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base mtl unix ];
-       jailbreak = true;
        description = "Brainfuck interpreter";
        license = "GPL";
      }) {};
@@ -26949,6 +26922,7 @@ self: {
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          QuickCheck test-framework test-framework-quickcheck2 text time
        ];
+       jailbreak = true;
        homepage = "http://github.com/mongodb-haskell/bson";
        description = "BSON documents are JSON-like objects with a standard binary encoding";
        license = "unknown";
@@ -28047,20 +28021,23 @@ self: {
      }) {};
 
   "cabal-debian" = callPackage
-    ({ mkDerivation, base, Cabal, containers, data-default, debian
-     , deepseq, Diff, directory, exceptions, filepath, hsemail, HUnit
-     , lens, memoize, mtl, network-uri, parsec, pretty, process, pureMD5
-     , regex-tdfa, set-extra, syb, text, unix, Unixutils, utf8-string
+    ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
+     , containers, data-default, debian, deepseq, Diff, directory
+     , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl
+     , network-uri, newtype-generics, optparse-applicative, parsec
+     , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix
+     , Unixutils, utf8-string
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.27.1";
-       sha256 = "0h9z6lqcx80zk19y080wr3djamvirjrn8in30h9hyb8j81l7hg5d";
+       version = "4.27.2";
+       sha256 = "1dmxs06x82pb0x4cyf5lhhgjf5mf0yx2yzl5r6g69awlkq5ylalz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base Cabal containers data-default debian deepseq Diff directory
-         exceptions filepath hsemail HUnit lens memoize mtl network-uri
+         ansi-wl-pprint base bifunctors Cabal containers data-default debian
+         deepseq Diff directory exceptions filepath hsemail HUnit lens
+         memoize mtl network-uri newtype-generics optparse-applicative
          parsec pretty process pureMD5 regex-tdfa set-extra syb text unix
          Unixutils utf8-string
        ];
@@ -28253,6 +28230,7 @@ self: {
          pretty process QuickCheck regex-posix stm test-framework
          test-framework-hunit test-framework-quickcheck2 time unix zlib
        ];
+       jailbreak = true;
        postInstall = ''
          mkdir $out/etc
          mv bash-completion $out/etc/bash_completion.d
@@ -28524,24 +28502,21 @@ self: {
      }) {};
 
   "cabal-src" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, classy-prelude-conduit
-     , conduit, conduit-extra, containers, directory, filepath
-     , http-client, http-client-tls, http-conduit, http-types, network
-     , process, resourcet, shelly, streaming-commons, system-fileio
-     , system-filepath, tar, temporary, text, transformers
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , containers, directory, filepath, http-conduit, http-types
+     , network, process, resourcet, shelly, system-fileio
+     , system-filepath, tar, text, transformers
      }:
      mkDerivation {
        pname = "cabal-src";
-       version = "0.2.5.1";
-       sha256 = "0ym5lsgah4aq37mg074ab82kdjxwmcp0qax3jnalk2hvcm531k9z";
+       version = "0.3.0";
+       sha256 = "1x8fb7hly9cxhfacwrai1zam6737dgfhjs9g85826f2cp4vp0g29";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring Cabal classy-prelude-conduit conduit conduit-extra
-         containers directory filepath http-client http-client-tls
+         base bytestring conduit conduit-extra containers directory filepath
          http-conduit http-types network process resourcet shelly
-         streaming-commons system-fileio system-filepath tar temporary text
-         transformers
+         system-fileio system-filepath tar text transformers
        ];
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
@@ -28597,7 +28572,6 @@ self: {
        version = "0.1.6";
        sha256 = "0rffvz3khxdfbl9rfk1q47xqv013dwmd4sy8cy7y833175j2zibi";
        buildDepends = [ base Cabal QuickCheck ];
-       jailbreak = true;
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
@@ -29084,6 +29058,7 @@ self: {
        isExecutable = true;
        buildDepends = [ base containers haskeline parsec ];
        testDepends = [ base containers parsec QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/sumitsahrawat/calculator";
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
        license = stdenv.lib.licenses.gpl2;
@@ -29571,13 +29546,12 @@ self: {
      }:
      mkDerivation {
        pname = "cases";
-       version = "0.1.2";
-       sha256 = "02m4dlp0l4jd53j1ziq9hkxsj61m74b886ch7vx74n6caz90qnph";
+       version = "0.1.2.1";
+       sha256 = "0p2dfnyj887bnp414psbmkin4ybmflvgr1q2npvcih2sxianywkd";
        buildDepends = [ attoparsec base-prelude loch-th text ];
        testDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
@@ -29640,8 +29614,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava";
-       version = "0.4.2.3";
-       sha256 = "13fhim3ylxhkr7wy5dss3m1k3cqlhrvknzbqsi1yclfkvp4wzc2f";
+       version = "0.4.2.4";
+       sha256 = "1vf42v4n55i39zk5dimzk9z0l0jzyp9w9vhgrvzmi0f7nhfbv08a";
        buildDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          text unordered-containers vector
@@ -29651,7 +29625,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/tibbe/cassava";
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
@@ -29670,6 +29643,7 @@ self: {
          containers mtl
        ];
        testDepends = [ base QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
@@ -30605,6 +30579,7 @@ self: {
          aeson base blaze-html bytestring containers data-default http-types
          mtl syb text uniplate wai wai-extra xss-sanitize
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
@@ -30870,16 +30845,15 @@ self: {
 
   "chunked-data" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
-     , mono-traversable, semigroups, system-filepath, text, transformers
-     , vector
+     , mono-traversable, semigroups, text, transformers, vector
      }:
      mkDerivation {
        pname = "chunked-data";
-       version = "0.1.0.1";
-       sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r";
+       version = "0.2.0";
+       sha256 = "0wmjpb0vq0nqvy317gmzxqh8yqq1bx0h2r90vqfpq3cv3z4g784s";
        buildDepends = [
          base blaze-builder bytestring containers mono-traversable
-         semigroups system-filepath text transformers vector
+         semigroups text transformers vector
        ];
        homepage = "https://github.com/fpco/chunked-data";
        description = "Typeclasses for dealing with various chunked data representations";
@@ -31511,20 +31485,20 @@ self: {
     ({ mkDerivation, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, dlist, enclosed-exceptions, exceptions
      , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl
-     , mutable-containers, primitive, QuickCheck, semigroups, stm
-     , system-filepath, text, time, time-locale-compat, transformers
-     , unordered-containers, vector, vector-instances
+     , mutable-containers, primitive, QuickCheck, semigroups, stm, text
+     , time, time-locale-compat, transformers, unordered-containers
+     , vector, vector-instances
      }:
      mkDerivation {
        pname = "classy-prelude";
-       version = "0.11.1.1";
-       sha256 = "1aincib2rpxbc7nyk8sbxhcdy0l4wr1005kn0h4bb4m3aa008f7a";
+       version = "0.12.0";
+       sha256 = "0g72084wnfqam0djpck76bb7dmphpjs1h32w361cqyvgxkyy1prw";
        buildDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
          mono-traversable mtl mutable-containers primitive semigroups stm
-         system-filepath text time time-locale-compat transformers
-         unordered-containers vector vector-instances
+         text time time-locale-compat transformers unordered-containers
+         vector vector-instances
        ];
        testDepends = [
          base containers hspec QuickCheck transformers unordered-containers
@@ -31537,15 +31511,15 @@ self: {
   "classy-prelude-conduit" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
-     , system-fileio, transformers, void
+     , transformers, void
      }:
      mkDerivation {
        pname = "classy-prelude-conduit";
-       version = "0.11.1";
-       sha256 = "0rjm8kzx34m1x3yndm9i2ybvw9lfddgaab1n51n8psml3yxckqic";
+       version = "0.12.0";
+       sha256 = "0sby5lbk16f7q3dd3qisv67m1bsgx9v99iwb95crbql3ghi99za1";
        buildDepends = [
          base bytestring classy-prelude conduit conduit-combinators
-         monad-control resourcet system-fileio transformers void
+         monad-control resourcet transformers void
        ];
        testDepends = [
          base bytestring conduit hspec QuickCheck transformers
@@ -31562,8 +31536,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-yesod";
-       version = "0.11.1";
-       sha256 = "1481cs7l0bf4jy9q2rg35aw0pfzdhnj7kc22ll2n7jb2wg1xvcv3";
+       version = "0.12.0";
+       sha256 = "00w932g8pcv76qd16fjr93vaipnr02p3m5j8zhyqy1w9frc6pnqx";
        buildDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
@@ -31594,37 +31568,40 @@ self: {
      }) {};
 
   "clckwrks" = callPackage
-    ({ mkDerivation, acid-state, aeson, attoparsec, base, blaze-html
-     , bytestring, cereal, containers, cryptopp, directory, filepath
-     , happstack-authenticate, happstack-hsp, happstack-server
-     , happstack-server-tls, hsp, hsx-jmacro, hsx2hs, ixset, jmacro, mtl
-     , network, network-uri, old-locale, openssl, process, random
-     , reform, reform-happstack, reform-hsp, safecopy, stm, tagsoup
-     , text, time, unordered-containers, utf8-string, uuid, vector
-     , web-plugins, web-routes, web-routes-happstack, web-routes-hsp
-     , web-routes-th, xss-sanitize
+    ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
+     , blaze-html, bytestring, cereal, containers, directory, filepath
+     , happstack-authenticate, happstack-hsp, happstack-jmacro
+     , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs
+     , ixset, jmacro, lens, mtl, network, network-uri, old-locale
+     , openssl, process, random, reform, reform-happstack, reform-hsp
+     , safecopy, stm, tagsoup, text, time, time-locale-compat
+     , unordered-containers, utf8-string, uuid, vector, web-plugins
+     , web-routes, web-routes-happstack, web-routes-hsp, web-routes-th
+     , xss-sanitize
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.22.4";
-       sha256 = "1srgvnsmd3lhhp797kwwq6a0sr31i0kdlgzmrqi0qs1wg54nwyw6";
+       version = "0.23.7";
+       sha256 = "0bs7gcbb3xsq4b444jybilfvpxqm9xdwn135fdn1wchbiykqnwba";
        buildDepends = [
-         acid-state aeson attoparsec base blaze-html bytestring cereal
-         containers directory filepath happstack-authenticate happstack-hsp
-         happstack-server happstack-server-tls hsp hsx-jmacro ixset jmacro
-         mtl network network-uri old-locale process random reform
+         acid-state aeson aeson-qq attoparsec base blaze-html bytestring
+         cereal containers directory filepath happstack-authenticate
+         happstack-hsp happstack-jmacro happstack-server
+         happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
+         network network-uri old-locale process random reform
          reform-happstack reform-hsp safecopy stm tagsoup text time
-         unordered-containers utf8-string uuid vector web-plugins web-routes
-         web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
+         time-locale-compat unordered-containers utf8-string uuid vector
+         web-plugins web-routes web-routes-happstack web-routes-hsp
+         web-routes-th xss-sanitize
        ];
        buildTools = [ hsx2hs ];
-       extraLibraries = [ cryptopp openssl ];
+       extraLibraries = [ openssl ];
        jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) cryptopp;  inherit (pkgs) openssl;};
+     }) { inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
     ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
@@ -31632,8 +31609,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-cli";
-       version = "0.2.13";
-       sha256 = "09ygkr4wqcwc07pf0alf9dncsv4dl40v97qnilis3wsdc05gflip";
+       version = "0.2.14";
+       sha256 = "1dwvrxz2sjk61bbima9m70qv6gf4h4jx9yysmwnwpinmmqixwdi3";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -31646,24 +31623,22 @@ self: {
      }) {};
 
   "clckwrks-dot-com" = callPackage
-    ({ mkDerivation, base, clckwrks, clckwrks-plugin-bugs
-     , clckwrks-plugin-media, clckwrks-plugin-page
-     , clckwrks-theme-clckwrks, containers, happstack-server, hsp
-     , hsx2hs, mtl, network, text, web-plugins
+    ({ mkDerivation, base, clckwrks, clckwrks-plugin-media
+     , clckwrks-plugin-page, clckwrks-theme-clckwrks, containers
+     , happstack-server, hsp, hsx2hs, mtl, network, text, web-plugins
      }:
      mkDerivation {
        pname = "clckwrks-dot-com";
-       version = "0.3.9";
-       sha256 = "0q1y6lh9215p0c45195k05m774bmxyzm6jsvyncw2qngl77gambh";
+       version = "0.3.11";
+       sha256 = "0f39ws919qy00090l002k3g8dkcldq7rwayf0wyxg8mfycrnb700";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base clckwrks clckwrks-plugin-bugs clckwrks-plugin-media
-         clckwrks-plugin-page clckwrks-theme-clckwrks containers
-         happstack-server hsp mtl network text web-plugins
+         base clckwrks clckwrks-plugin-media clckwrks-plugin-page
+         clckwrks-theme-clckwrks containers happstack-server hsp mtl network
+         text web-plugins
        ];
        buildTools = [ hsx2hs ];
-       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "clckwrks.com";
        license = stdenv.lib.licenses.bsd3;
@@ -31731,8 +31706,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-media";
-       version = "0.6.9";
-       sha256 = "0c72c7k1zpl6sqvb8fl5dr1in6nbr5ni3hj5mvfs54phw0b6qlqs";
+       version = "0.6.13";
+       sha256 = "0j6ijdq3n011h4d0gxxpjs35kwppp2kyjkg0bjcdw752ppk4y14w";
        buildDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
@@ -31740,7 +31715,6 @@ self: {
          web-routes-th
        ];
        buildTools = [ hsx2hs ];
-       jailbreak = true;
        homepage = "http://clckwrks.com/";
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -31752,22 +31726,21 @@ self: {
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
      , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
-     , text, time, utf8-string, uuid, web-plugins, web-routes
+     , text, time, time-locale-compat, uuid, web-plugins, web-routes
      , web-routes-happstack, web-routes-th
      }:
      mkDerivation {
        pname = "clckwrks-plugin-page";
-       version = "0.3.6";
-       sha256 = "1izz2mgznvwjy3689zw76rzyapq32kq0dvbs7147x6fx5rvsydz7";
+       version = "0.3.10";
+       sha256 = "0871fz0h3vqwsjrk7pz69nm8gi5ycxnfv1pip8nnf11wfqfcqlgb";
        buildDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
-         filepath happstack-hsp happstack-server hsp ixset mtl old-locale
-         random reform reform-happstack reform-hsp safecopy tagsoup
-         template-haskell text time utf8-string uuid web-plugins web-routes
-         web-routes-happstack web-routes-th
+         filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
+         old-locale random reform reform-happstack reform-hsp safecopy
+         tagsoup template-haskell text time time-locale-compat uuid
+         web-plugins web-routes web-routes-happstack web-routes-th
        ];
        buildTools = [ hsx2hs ];
-       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -31775,14 +31748,18 @@ self: {
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
-    ({ mkDerivation, base, clckwrks, hsp, hsx2hs, text }:
+    ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp
+     , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins
+     }:
      mkDerivation {
        pname = "clckwrks-theme-bootstrap";
-       version = "0.3.2";
-       sha256 = "0bj1lxrzlhv4l37xb4jbb8h55l3mb2abyapsmlavcj0cld7ba7i2";
-       buildDepends = [ base clckwrks hsp text ];
+       version = "0.4.0";
+       sha256 = "08sdklr7nikngkdcls9dwy0ij4nqrb1n6dnkm3cw73iaifsl6klz";
+       buildDepends = [
+         base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
+         mtl text web-plugins
+       ];
        buildTools = [ hsx2hs ];
-       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -31790,14 +31767,17 @@ self: {
      }) {};
 
   "clckwrks-theme-clckwrks" = callPackage
-    ({ mkDerivation, base, clckwrks, containers, hsp, hsx2hs, text }:
+    ({ mkDerivation, base, clckwrks, containers, happstack-authenticate
+     , hsp, hsx2hs, mtl, text, web-plugins
+     }:
      mkDerivation {
        pname = "clckwrks-theme-clckwrks";
-       version = "0.4.3";
-       sha256 = "0mxb48sirbhvm4vkwwgqxh7x3bahfk34x8i20zcirvh8y6xxp3pm";
-       buildDepends = [ base clckwrks containers hsp text ];
-       buildTools = [ hsx2hs ];
-       jailbreak = true;
+       version = "0.5.0";
+       sha256 = "06szqp7mcak7ra1pzxzmj8hzhm1lmdr7nwjkxk1h8bba5ipcjwhv";
+       buildDepends = [
+         base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
+         web-plugins
+       ];
        homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32633,8 +32613,8 @@ self: {
      }:
      mkDerivation {
        pname = "codex";
-       version = "0.2.1.4";
-       sha256 = "19w3s8f3yn6535lvcwzqkmydqxcdgx1khawax0n894r8lfz3zyj7";
+       version = "0.2.1.8";
+       sha256 = "0rswdfbrmmg9px0cwah56yy3dj3a4rfc4fsvzknd2vc9wbgi8ndf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -32878,6 +32858,7 @@ self: {
        version = "0.3.0.2";
        sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm";
        buildDepends = [ base lens linear profunctors ];
+       jailbreak = true;
        homepage = "https://github.com/fumieval/colors";
        description = "A type for colors";
        license = stdenv.lib.licenses.bsd3;
@@ -33116,8 +33097,8 @@ self: {
      }:
      mkDerivation {
        pname = "comonad";
-       version = "4.2.5";
-       sha256 = "07ilryqgvnkr4vmifg0dncgzmx87i2fbfbgrgc3jn1yz808s7wqf";
+       version = "4.2.6";
+       sha256 = "1dspysfyjk74di2wvv7xj8r92acqsynjl5gi3sh8m7hqb122m60i";
        buildDepends = [
          base containers contravariant distributive semigroups tagged
          transformers transformers-compat
@@ -33291,6 +33272,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
          unordered-containers vector
        ];
+       jailbreak = true;
        description = "Compositional Data Types on DAGs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33430,6 +33412,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "composition-extra" = callPackage
+    ({ mkDerivation, base, contravariant }:
+     mkDerivation {
+       pname = "composition-extra";
+       version = "0.0.0.2";
+       sha256 = "1vicnzxamxhvw824y5dyxf4b303h2jqxs3djc1y33l5ppik8w6fh";
+       buildDepends = [ base contravariant ];
+       description = "Combinators for unorthodox structure composition";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "compressed" = callPackage
     ({ mkDerivation, base, comonad, containers, fingertree, hashable
      , keys, pointed, reducers, semigroupoids, semigroups
@@ -33443,6 +33436,7 @@ self: {
          base comonad containers fingertree hashable keys pointed reducers
          semigroupoids semigroups unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/compressed/";
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
@@ -33552,6 +33546,7 @@ self: {
        buildDepends = [
          base bifunctors exceptions mtl semigroupoids transformers void
        ];
+       jailbreak = true;
        description = "Concurrent actions that may fail";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34007,25 +34002,25 @@ self: {
   "conduit-combinators" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
      , bytestring, chunked-data, conduit, conduit-extra, containers
-     , directory, hspec, monad-control, mono-traversable, mtl
+     , directory, filepath, hspec, monad-control, mono-traversable, mtl
      , mwc-random, primitive, QuickCheck, resourcet, safe, silently
-     , system-fileio, system-filepath, text, transformers
-     , transformers-base, unix, unix-compat, vector, void
+     , text, transformers, transformers-base, unix, unix-compat, vector
+     , void
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "0.3.1";
-       sha256 = "14cvd9vs31gbgggy3v6rsg7wckr08msw1s0fwqbyal73krm79f2r";
+       version = "1.0.0";
+       sha256 = "1ibbj3ipkys26np9d791ynpfzgrw3miclcj02bb0ipmvqngm90hv";
        buildDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit conduit-extra monad-control mono-traversable mwc-random
-         primitive resourcet system-fileio system-filepath text transformers
-         transformers-base unix unix-compat vector void
+         conduit conduit-extra filepath monad-control mono-traversable
+         mwc-random primitive resourcet text transformers transformers-base
+         unix unix-compat vector void
        ];
        testDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit containers directory hspec mono-traversable mtl mwc-random
-         QuickCheck safe silently system-filepath text transformers vector
+         conduit containers directory filepath hspec mono-traversable mtl
+         mwc-random QuickCheck safe silently text transformers vector
        ];
        homepage = "https://github.com/fpco/conduit-combinators";
        description = "Commonly used conduit functions, for both chunked and unchunked data";
@@ -34061,10 +34056,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-extra";
-       version = "1.1.7.3";
-       revision = "1";
-       sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l";
-       editedCabalFile = "d90996b02f7aeb417e54658bab2ecba414221de6cde817d2b18186d09e605091";
+       version = "1.1.8";
+       sha256 = "15ndbid0272izjd4mdhg0k5yaabwphav6m1amkndb7jjqls499zl";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -34181,14 +34174,14 @@ self: {
      }:
      mkDerivation {
        pname = "configifier";
-       version = "0.0.3";
-       sha256 = "0l86i7rjbqrppfyfc3ypkal3q0rv8ldxp39hii076dwk7kgvjy1z";
+       version = "0.0.4";
+       sha256 = "0wd32v9a0jmz9v732z2ph8spb2kh89zj48350kvvappfbqdfh09a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base bytestring case-insensitive containers either mtl
-         pretty-show regex-easy safe string-conversions text
-         unordered-containers vector yaml
+         base bytestring case-insensitive containers either mtl pretty-show
+         regex-easy safe string-conversions text unordered-containers vector
+         yaml
        ];
        testDepends = [
          aeson aeson-pretty base case-insensitive hspec hspec-discover mtl
@@ -36012,6 +36005,7 @@ self: {
          QuickCheck temporary test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/mhwombat/creatur";
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
@@ -36378,7 +36372,6 @@ self: {
          modular-arithmetic QuickCheck random random-shuffle text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/fosskers/crypto-classical";
        description = "An educational tool for studying classical cryptography schemes";
        license = stdenv.lib.licenses.bsd3;
@@ -37158,9 +37151,9 @@ self: {
      mkDerivation {
        pname = "curlhs";
        version = "0.1.5";
-       revision = "1";
+       revision = "2";
        sha256 = "0j0r238v3rlk9w7zby7lvh6drzy8d1hah6yzf4dz17hg27wb22ky";
-       editedCabalFile = "54dc0c9c8004df751cde41989c305af8e60e6112def522a07bdaf54fd28f27cd";
+       editedCabalFile = "0ed3a9937970ee46955e276b3e2fdeff9eff1c3165f3402ed11da009f8a8cd0f";
        buildDepends = [ base bytestring rtld time ];
        testDepends = [ base hspec ];
        homepage = "https://github.com/kkardzis/curlhs";
@@ -37262,6 +37255,7 @@ self: {
          base bytestring crypto-api DRBG HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://github.com/acw/curve25519";
        description = "Fast implementations of the curve25519 elliptic curve primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -38232,6 +38226,7 @@ self: {
        buildDepends = [
          base bifunctors ghc-prim semigroups split template-haskell
        ];
+       jailbreak = true;
        homepage = "https://github.com/maxpow4h/data-filepath";
        description = "A type safe file path data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -38315,7 +38310,6 @@ self: {
        ];
        description = "Combinators for building fast hashing functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-interval" = callPackage
@@ -38471,6 +38465,19 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "data-map-multikey" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "data-map-multikey";
+       version = "0.0.1.2";
+       sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf";
+       buildDepends = [ base containers ];
+       jailbreak = true;
+       homepage = "http://github.com/jhickner/data-map-multikey";
+       description = "Data.Map with multiple, unique keys";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "data-memocombinators" = callPackage
     ({ mkDerivation, array, base, data-inttrie }:
      mkDerivation {
@@ -38919,6 +38926,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "datadog" = callPackage
+    ({ mkDerivation, aeson, auto-update, base, buffer-builder
+     , bytestring, lens, lifted-base, monad-control, network, old-locale
+     , text, time, transformers-base
+     }:
+     mkDerivation {
+       pname = "datadog";
+       version = "0.1.0.0";
+       sha256 = "19f1lcd73rj2v23cpxjnhby80p3gzlvb92fizw884km26az8y684";
+       buildDepends = [
+         aeson auto-update base buffer-builder bytestring lens lifted-base
+         monad-control network old-locale text time transformers-base
+       ];
+       homepage = "https://github.com/iand675/datadog";
+       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dataenc" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -39636,6 +39661,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "decode-utf8" = callPackage
+    ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode
+     }:
+     mkDerivation {
+       pname = "decode-utf8";
+       version = "1.2";
+       sha256 = "10mj871j5gd4d8v8341lr5lr9avxxfph58sjhmd9kgywc10grqph";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ api-opentheory-unicode base opentheory-unicode ];
+       description = "Decode a UTF-8 byte stream on standard input";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "decoder-conduit" = callPackage
     ({ mkDerivation, base, binary, bytestring, conduit }:
      mkDerivation {
@@ -40567,6 +40606,7 @@ self: {
          lucid-svg mtl split transformers
        ];
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40589,6 +40629,7 @@ self: {
          optparse-applicative pango split statestack transformers unix
          vector
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40608,6 +40649,7 @@ self: {
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40623,8 +40665,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.3.0.1";
-       sha256 = "07y0kgss06pl4xjb2klj3397dadrgypync8vh3mkh8ss1zvfr1zf";
+       version = "1.3.0.2";
+       sha256 = "0zpga8x10xfbvicv26lwdcj5fcnsd5wifap7nsrw4dnvhmsmgsyc";
        buildDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -40635,6 +40677,7 @@ self: {
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40653,6 +40696,7 @@ self: {
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40694,6 +40738,7 @@ self: {
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
@@ -40735,6 +40780,7 @@ self: {
          diagrams-lib lens mtl NumInstances optparse-applicative split
          statestack static-canvas text
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40761,6 +40807,7 @@ self: {
          process semigroups system-filepath tagged text transformers
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -40821,6 +40868,7 @@ self: {
          filepath hashable lens monoid-extras mtl semigroups split
          statestack
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40857,6 +40905,7 @@ self: {
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
          optparse-applicative Rasterific split unix
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -40903,6 +40952,7 @@ self: {
          monoid-extras mtl old-time optparse-applicative process split text
          time
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41195,6 +41245,7 @@ self: {
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
@@ -41305,13 +41356,12 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-snap";
-       version = "0.6.1.2";
-       sha256 = "1rkapw7vgz0wfzm8g1lm8z9b7rzwzhsxsc4i7ilig23x16jw07hl";
+       version = "0.6.1.3";
+       sha256 = "11ah4rvi5fj9vjjzjw0m60s72qiizy1i4hnj44v88ajf2095aigh";
        buildDepends = [
          base bytestring containers digestive-functors directory filepath
          mtl snap-core text
        ];
-       jailbreak = true;
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Snap backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
@@ -41484,6 +41534,7 @@ self: {
        buildDepends = [
          base bytestring containers mtl network utf8-string
        ];
+       jailbreak = true;
        homepage = "http://dankna.com/software/";
        description = "Native implementation of the FastCGI protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -41701,6 +41752,7 @@ self: {
        buildDepends = [
          adjunctions base comonad distributive keys semigroupoids
        ];
+       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/discrete-space-map";
        description = "A discrete space map";
        license = stdenv.lib.licenses.bsd3;
@@ -42258,20 +42310,21 @@ self: {
      }) {};
 
   "diversity" = callPackage
-    ({ mkDerivation, base, containers, fasta, math-functions
-     , MonadRandom, optparse-applicative, parsec, pipes, random-shuffle
-     , scientific, split
+    ({ mkDerivation, base, containers, data-ordlist, fasta
+     , math-functions, MonadRandom, optparse-applicative, parsec, pipes
+     , random-shuffle, scientific, split
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.6.0.2";
-       sha256 = "17sx8pkwmdksqk2g7jiid335znx03h1crxnhhk66vainif5my5bg";
+       version = "0.6.2.1";
+       sha256 = "1x1a02452kwrmm566bvrq2gqi8g2y8nmx9szgdmdj5wki07d188l";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base containers fasta math-functions MonadRandom
+         base containers data-ordlist fasta math-functions MonadRandom
          optparse-applicative parsec pipes random-shuffle scientific split
        ];
+       jailbreak = true;
        homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Return the diversity at each position for all sequences in a fasta file";
        license = stdenv.lib.licenses.gpl2;
@@ -43384,6 +43437,7 @@ self: {
          base containers MemoTrie QuickCheck test-framework
          test-framework-quickcheck2 thyme vector vector-space
        ];
+       jailbreak = true;
        description = "(Fast) Dynamic Time Warping";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43812,8 +43866,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, time, unix }:
      mkDerivation {
        pname = "easy-file";
-       version = "0.2.0";
-       sha256 = "0v8skixq15rvyiyky1dcrfl9jrzkbi75vai8np11xy2kg7a8ym2a";
+       version = "0.2.1";
+       sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz";
        buildDepends = [ base directory filepath time unix ];
        homepage = "http://github.com/kazu-yamamoto/easy-file";
        description = "Cross-platform File handling";
@@ -44166,18 +44220,17 @@ self: {
      }) { inherit (pkgs) libedit;};
 
   "editor-open" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , directory, process, resourcet, temporary, transformers, unix
+    ({ mkDerivation, base, bytestring, directory, process, temporary
+     , unix
      }:
      mkDerivation {
        pname = "editor-open";
-       version = "0.3.0.0";
-       sha256 = "1yfwwd3z3w6yadqqv96n65795gsg418iid35cwgxyf9l1jgk79f1";
+       version = "0.4.0.2";
+       sha256 = "14vddpdwgjj5fi1g7ampqjsxpig87kiyddjw24kjjlxwava6nn16";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring conduit conduit-extra directory process resourcet
-         temporary transformers unix
+         base bytestring directory process temporary unix
        ];
        homepage = "https://github.com/pharpend/editor-open";
        description = "Open the user's $EDITOR for text input";
@@ -44420,6 +44473,7 @@ self: {
        sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07";
        buildDepends = [ base bytestring primitive vector ];
        testDepends = [ base primitive vector ];
+       jailbreak = true;
        homepage = "https://github.com/osidorkin/haskell-eigen";
        description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
@@ -44433,12 +44487,13 @@ self: {
      }:
      mkDerivation {
        pname = "either";
-       version = "4.3.3.2";
-       sha256 = "05j4mk1qlp72w70cahfw4nm506sl0wmkgffi2f5xazwjgkggw595";
+       version = "4.3.4";
+       sha256 = "03gc4kl7cgww7y2qyg4y35zb43mamxnm41y4fi156yjgy1x0n7w8";
        buildDepends = [
          base bifunctors exceptions free monad-control MonadRandom mtl
          profunctors semigroupoids semigroups transformers transformers-base
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/either/";
        description = "An either monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -44738,6 +44793,7 @@ self: {
          test-framework-quickcheck2 text transformers union-find
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://elm-lang.org";
        description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
@@ -44784,6 +44840,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "elm-init" = callPackage
+    ({ mkDerivation, base, bytestring, file-embed, json, system-fileio
+     , system-filepath
+     }:
+     mkDerivation {
+       pname = "elm-init";
+       version = "0.1.0.1";
+       sha256 = "0y3705aq1h8ip4zsvdvhn7gf3940h3k77nkxdmn84wq12sfx6fnq";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring file-embed json system-fileio system-filepath
+       ];
+       description = "Set up basic structure for an elm project";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "elm-make" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, blaze-html
      , blaze-markup, bytestring, containers, directory, elm-compiler
@@ -44924,6 +44997,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "elocrypt" = callPackage
+    ({ mkDerivation, base, MonadRandom, QuickCheck, random, tasty
+     , tasty-quickcheck, tasty-th
+     }:
+     mkDerivation {
+       pname = "elocrypt";
+       version = "0.3.1";
+       sha256 = "1hh1nf0zfijzrz6pp2gq7zh7rv3fwrybm5cfj59wfb0j0dikz8v4";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base MonadRandom random ];
+       testDepends = [
+         base MonadRandom QuickCheck random tasty tasty-quickcheck tasty-th
+       ];
+       homepage = "https://www.github.com/sgillespie/elocrypt";
+       description = "Generate easy-to-remember, hard-to-guess passwords";
+       license = "unknown";
+     }) {};
+
   "email" = callPackage
     ({ mkDerivation, array, base, bytestring, encoding, HaskellNet
      , hsemail, old-locale, old-time, parsec, process, time
@@ -45569,8 +45661,8 @@ self: {
     ({ mkDerivation, base, semigroupoids }:
      mkDerivation {
        pname = "eq";
-       version = "4.0.3";
-       sha256 = "1n2f20dh1rghv8c43dgdlpgamq61dy8dzh86v4p62a125pgawfn3";
+       version = "4.0.4";
+       sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4";
        buildDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/eq/";
        description = "Leibnizian equality";
@@ -45939,8 +46031,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.2";
-       sha256 = "1z49za7yid23ffymhycvbqypw3iabc2yn05p0klh7cd7frkj08j2";
+       version = "2.2.1";
+       sha256 = "0379lqhsj09p6l2hkn6vl6rwmr2jradn6vnann4czxfxpzkc85ir";
        buildDepends = [
          base conduit monad-logger persistent resourcet tagged text
          transformers unordered-containers
@@ -46238,8 +46330,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.3.0.0";
-       sha256 = "00ysjv6b4rkpy2zz3q2p9i50m3iil7q2frr3xznl4wpjiifhdpx3";
+       version = "0.4.1.0";
+       sha256 = "0g4qlkvl313mi4immx5i78bdbzg0ld57ld114l8jf42fwk3qd5zd";
        buildDepends = [
          aeson base bytestring network suspend text timers websockets
        ];
@@ -46250,16 +46342,17 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
-     , network, protobuf, random, sodium, text, time, uuid
+    ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal
+     , containers, network, protobuf, random, sodium, stm, text, time
+     , unordered-containers, uuid
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.7.1.0";
-       sha256 = "058r7csqf2lzcqskc9fv9lwr1h1glpirblyc51kn0qb16szigpwv";
+       version = "0.7.2.0";
+       sha256 = "0nwypn0yny60mjxa76dy1rn1hnsc0wvdsmv3kl1kahzsgcvh47r1";
        buildDepends = [
-         aeson async base bytestring cereal containers network protobuf
-         random sodium text time uuid
+         aeson async attoparsec base bytestring cereal containers network
+         protobuf random sodium stm text time unordered-containers uuid
        ];
        homepage = "http://github.com/YoEight/eventstore";
        description = "EventStore TCP Client";
@@ -46327,12 +46420,12 @@ self: {
      }) {};
 
   "exact-pi" = callPackage
-    ({ mkDerivation, base, groups }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "exact-pi";
-       version = "0.1.1.0";
-       sha256 = "1n62886wjnnmdi1bjvw51ka21v882m1yc0m87kzq7kx7knvh1xxx";
-       buildDepends = [ base groups ];
+       version = "0.2.0.0";
+       sha256 = "0az47bzrkhb5xmws1rpp080kvsq2pcxjgrm0wzjqqbcqiy5pi3f9";
+       buildDepends = [ base ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
@@ -46410,6 +46503,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exceptional" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "exceptional";
+       version = "0.1.4.1";
+       sha256 = "1i9srv7yv0hzs8hkpfsjm2idzw20y6wc7b8sscn2h5cp0cfpfrsh";
+       buildDepends = [ base ];
+       homepage = "https://github.com/pharpend/exceptional";
+       description = "Essentially the Maybe type with error messages";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "exceptions" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, test-framework
      , test-framework-quickcheck2, transformers, transformers-compat
@@ -46423,6 +46528,7 @@ self: {
          base mtl QuickCheck stm test-framework test-framework-quickcheck2
          transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/exceptions/";
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
@@ -46791,6 +46897,7 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/msakai/extended-reals/";
        description = "Extension of real numbers with positive/negative infinities";
        license = stdenv.lib.licenses.bsd3;
@@ -46835,8 +46942,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "1.9.1.0";
-       sha256 = "1xkddv9k7kqmz4v0pprkzhni8kc2wxkrfv1cqv1lvkjvp8js1zy6";
+       version = "1.9.2.2";
+       sha256 = "07mhvwxbqzn8bhhcgyc9b7bzbf1axbxsg3ps8b3zsz35r480irc3";
        buildDepends = [
          base transformers transformers-base type-aligned void
        ];
@@ -46844,7 +46951,7 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 void
        ];
-       homepage = "https://github.com/RobotGymnast/extensible-effects";
+       homepage = "https://github.com/suhailshergill/extensible-effects";
        description = "An Alternative to Monad Transformers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47195,17 +47302,18 @@ self: {
      }) {};
 
   "fasta" = callPackage
-    ({ mkDerivation, base, containers, foldl, lens, parsec, pipes
-     , pipes-group, pipes-text, split, text
+    ({ mkDerivation, base, bytestring, containers, foldl, lens, parsec
+     , pipes, pipes-bytestring, pipes-group, pipes-text, split, text
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.6.1.1";
-       sha256 = "1jwsf0mrr98wn5m4aavdqclv667kkgfqlgjn3dvrgnw8jrywzzd2";
+       version = "0.7.0.0";
+       sha256 = "04gbp9idml3ng48sqvwqyc70z91ds3a5lsimsqydwwfgc5mnxlx1";
        buildDepends = [
-         base containers foldl lens parsec pipes pipes-group pipes-text
-         split text
+         base bytestring containers foldl lens parsec pipes pipes-bytestring
+         pipes-group pipes-text split text
        ];
+       jailbreak = true;
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -47741,6 +47849,7 @@ self: {
          tasty tasty-golden tasty-quickcheck
        ];
        extraLibraries = [ gcc_s ];
+       jailbreak = true;
        homepage = "http://feldspar.github.com";
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
@@ -47786,6 +47895,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fen2s" = callPackage
+    ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode
+     }:
+     mkDerivation {
+       pname = "fen2s";
+       version = "1.2";
+       sha256 = "01111rxpdd9pqpjs54krx4z67k3abjglw9zbvn5j97z9zdj5qr81";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ api-opentheory-unicode base opentheory-unicode ];
+       testDepends = [ api-opentheory-unicode base opentheory-unicode ];
+       description = "Converting a chess position from FEN notation to text";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fences" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -48199,6 +48323,7 @@ self: {
        sha256 = "0a5hhgfxh91clkk6c9iipdd0y3wb9y6lx2hhraaaa73b8y83afx4";
        buildDepends = [ base ];
        testDepends = [ base QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/haskell/filepath#readme";
        description = "Library for manipulating FilePaths in a cross platform way";
        license = stdenv.lib.licenses.bsd3;
@@ -48728,8 +48853,8 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, bytestring, text }:
      mkDerivation {
        pname = "fixedwidth-hs";
-       version = "0.3.0.0";
-       sha256 = "0azqjz559vrz4l65ylvnlihlfvblycwnbb9w0rq7kpcfb4rj2iic";
+       version = "0.4.0.0";
+       sha256 = "1j15yx5shwrc60k64z45lyrdif3zg5hfqyvq4b9msn1g9shxldyz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ aeson attoparsec base bytestring text ];
@@ -49364,6 +49489,7 @@ self: {
          base bytestring deepseq directory doctest filepath mtl semigroups
        ];
        configureFlags = [ "-f-test-hlint" ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
@@ -49482,6 +49608,7 @@ self: {
        version = "0.4.0.0";
        sha256 = "0rmspkl8j1z2n8r6d3dcd573z73yzn6c9r49f57syfvalq0xrzdk";
        buildDepends = [ base containers data-default-class lens linear ];
+       jailbreak = true;
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49951,17 +50078,17 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, distributive, mtl
-     , prelude-extras, profunctors, semigroupoids, semigroups
-     , template-haskell, transformers
+    ({ mkDerivation, base, bifunctors, comonad, distributive
+     , exceptions, mtl, prelude-extras, profunctors, semigroupoids
+     , semigroups, template-haskell, transformers
      }:
      mkDerivation {
        pname = "free";
-       version = "4.11";
-       sha256 = "0k645n6ywy1as2lmw4gv2bmmr9y67pcnar0jhhf9kpaqvl5s2h5y";
+       version = "4.12.1";
+       sha256 = "0sr8phvrb4ny8j1wzq55rdn8q4br23q4pw2j276npr844825jr9p";
        buildDepends = [
-         base bifunctors comonad distributive mtl prelude-extras profunctors
-         semigroupoids semigroups template-haskell transformers
+         base bifunctors comonad distributive exceptions mtl prelude-extras
+         profunctors semigroupoids semigroups template-haskell transformers
        ];
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
@@ -50074,6 +50201,7 @@ self: {
          array base bytestring containers free-theorems haskell-src mtl
          old-locale old-time parsec pretty syb utf8-string xhtml
        ];
+       jailbreak = true;
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50247,6 +50375,7 @@ self: {
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/RaphaelJ/friday";
        description = "A functional image processing library for Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -52545,24 +52674,17 @@ self: {
      }) {};
 
   "ghcjs-websockets" = callPackage
-    ({ mkDerivation, base, base64-bytestring, binary, bytestring
-     , ghcjs-base, text
+    ({ mkDerivation, base, base64-bytestring, binary, bytestring, text
      }:
      mkDerivation {
        pname = "ghcjs-websockets";
-       version = "0.3.0.0";
-       revision = "1";
-       sha256 = "09ll2fyfbbflciq6mxhclgypn800qmm7l8dk9gcclphraf2x9jy3";
-       editedCabalFile = "cfc25baa01cf440b2f965ca3ee738467f8138adb74f759b9a225717ed183c66a";
-       buildDepends = [
-         base base64-bytestring binary bytestring ghcjs-base text
-       ];
-       jailbreak = true;
+       version = "0.3.0.3";
+       sha256 = "0fj2ya2irfhpgqz4n0cszs4s7p359k8aywdbmsw9q18w2z9gicz7";
+       buildDepends = [ base base64-bytestring binary bytestring text ];
        homepage = "http://github.com/mstksg/ghcjs-websockets";
        description = "GHCJS interface for the Javascript Websocket API";
        license = stdenv.lib.licenses.mit;
-       broken = true;
-     }) { ghcjs-base = null;};
+     }) {};
 
   "ghclive" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
@@ -52742,8 +52864,8 @@ self: {
      , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client
      , http-conduit, http-types, IfElse, json, lsof, MissingH
      , monad-control, monad-logger, mtl, network, network-info
-     , network-multicast, network-protocol-xmpp, network-uri, old-locale
-     , openssh, optparse-applicative, path-pieces, perl, persistent
+     , network-multicast, network-protocol-xmpp, network-uri, openssh
+     , optparse-applicative, path-pieces, perl, persistent
      , persistent-sqlite, persistent-template, process, QuickCheck
      , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
      , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
@@ -52754,8 +52876,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150508";
-       sha256 = "07p9ifk1h0i9gmg36vdrn6nkp0m46g4pkv1jkjm7ip5bgc76382c";
+       version = "5.20150508.1";
+       sha256 = "1l2rll066iwbfm2jhcp55wqsx73qksi2mjjj63wzvfng6iyk60ix";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -52765,7 +52887,7 @@ self: {
          edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
          hamlet hinotify hslogger http-client http-conduit http-types IfElse
          json MissingH monad-control monad-logger mtl network network-info
-         network-multicast network-protocol-xmpp network-uri old-locale
+         network-multicast network-protocol-xmpp network-uri
          optparse-applicative path-pieces persistent persistent-sqlite
          persistent-template process QuickCheck random regex-tdfa resourcet
          SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit
@@ -53185,6 +53307,7 @@ self: {
          random recaptcha safe SHA split syb tagsoup text time uri url
          utf8-string uuid xhtml xml xss-sanitize zlib
        ];
+       jailbreak = true;
        homepage = "http://gitit.net";
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
@@ -53408,8 +53531,8 @@ self: {
      }:
      mkDerivation {
        pname = "gl";
-       version = "0.7.6";
-       sha256 = "1wdhp5q84cv59ssygbgy8pd7gm76wkl2zvcbmi83wml1x9a7xmjd";
+       version = "0.7.7";
+       sha256 = "0lsz8gq3cmkh6s9hhxnr3m95ibra9y63230jyqhwk9wamid2x2pg";
        buildDepends = [
          base containers directory filepath fixed half hxt split
          transformers
@@ -54856,6 +54979,7 @@ self: {
          polyparse process temporary text transformers wl-pprint-text
        ];
        testDepends = [ base containers fgl filepath QuickCheck text ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -54900,6 +55024,7 @@ self: {
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/mhwombat/gray-extended";
        description = "Gray encoding schemes";
        license = stdenv.lib.licenses.bsd3;
@@ -54963,6 +55088,7 @@ self: {
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/mhwombat/grid";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
@@ -56214,10 +56340,10 @@ self: {
     ({ mkDerivation, base, directory, gtk3, process, split, text }:
      mkDerivation {
        pname = "hXmixer";
-       version = "0.2.5.0";
+       version = "0.3.0.0";
        revision = "2";
-       sha256 = "0nl6ylprxc1mz96713n222gy1b3pifkp3mb42v181w1iwms405y5";
-       editedCabalFile = "3d625ce1058f3df1e7384767fe12bc7a364a0c3ee075a6033bf8e91cfc5c8acc";
+       sha256 = "1n9wlg6inzvnyqkx61bpbgx744q25zpjhkihwbqv6569lgir1h4x";
+       editedCabalFile = "ba9345a3146b34d0101920f9efd6af7f435188dd7ae53b50d76cc0851f13014f";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base directory gtk3 process split text ];
@@ -56237,6 +56363,7 @@ self: {
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/mhwombat/haar";
        description = "Haar wavelet transforms";
        license = stdenv.lib.licenses.bsd3;
@@ -57060,24 +57187,6 @@ self: {
      }) {};
 
   "haddock-library" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.1.1";
-       sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m";
-       buildDepends = [ base bytestring deepseq ];
-       testDepends = [
-         base base-compat bytestring deepseq hspec QuickCheck
-       ];
-       jailbreak = true;
-       homepage = "http://www.haskell.org/haddock/";
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haddock-library_1_2_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
      , QuickCheck, transformers
      }:
@@ -57941,23 +58050,23 @@ self: {
 
   "hapistrano" = callPackage
     ({ mkDerivation, base, base-compat, directory, either, filepath
-     , hspec, mtl, old-locale, process, temporary, time, transformers
+     , hspec, mtl, old-locale, process, temporary, time
+     , time-locale-compat, transformers
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.2.0.1";
-       sha256 = "0k8715gaay1fjwgdsjk3h7vffj0bx217l1yn8wr6sfh4v7azg1f6";
+       version = "0.2.0.2";
+       sha256 = "1bw37wb7wwf6qagp5q0i9biy5cma6i0yvn7z051da3gnad89iil1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base base-compat either filepath mtl old-locale process time
-         transformers
+         time-locale-compat transformers
        ];
        testDepends = [
          base base-compat directory either filepath hspec mtl old-locale
-         process temporary time transformers
+         process temporary time time-locale-compat transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
@@ -58103,23 +58212,29 @@ self: {
      }) {};
 
   "happstack-authenticate" = callPackage
-    ({ mkDerivation, acid-state, aeson, authenticate, base, blaze-html
-     , bytestring, containers, fb, happstack-server, http-conduit
-     , http-types, ixset, mtl, pwstore-purehaskell, QuickCheck, reform
-     , reform-blaze, reform-happstack, safecopy, text, time
-     , unordered-containers, web-routes, web-routes-happstack
+    ({ mkDerivation, acid-state, aeson, authenticate, base
+     , base64-bytestring, boomerang, bytestring, containers
+     , data-default, filepath, happstack-hsp, happstack-jmacro
+     , happstack-server, hsp, hsx-jmacro, hsx2hs, http-conduit
+     , http-types, ixset-typed, jmacro, jwt, lens, mime-mail, mtl
+     , pwstore-purehaskell, random, safecopy, shakespeare, text, time
+     , unordered-containers, web-routes, web-routes-boomerang
+     , web-routes-happstack, web-routes-hsp, web-routes-th
      }:
      mkDerivation {
        pname = "happstack-authenticate";
-       version = "0.10.16";
-       sha256 = "15r725mmfln8hhk13ypg497xy4x88cxyd4gqmgfg6dpmrmgvdvgw";
+       version = "2.1.3";
+       sha256 = "19lil82sf441xji7qxvrzdj7vps56wsksgixazzak88azl9li6rj";
        buildDepends = [
-         acid-state aeson authenticate base blaze-html bytestring containers
-         fb happstack-server http-conduit http-types ixset mtl
-         pwstore-purehaskell QuickCheck reform reform-blaze reform-happstack
-         safecopy text time unordered-containers web-routes
-         web-routes-happstack
+         acid-state aeson authenticate base base64-bytestring boomerang
+         bytestring containers data-default filepath happstack-hsp
+         happstack-jmacro happstack-server hsp hsx-jmacro hsx2hs
+         http-conduit http-types ixset-typed jmacro jwt lens mime-mail mtl
+         pwstore-purehaskell random safecopy shakespeare text time
+         unordered-containers web-routes web-routes-boomerang
+         web-routes-happstack web-routes-hsp web-routes-th
        ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
@@ -58131,13 +58246,12 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-clientsession";
-       version = "7.2.7";
-       sha256 = "1zwdcnsdq9nb88wf0mc8vh4wkw5kl5r39mmhq098ny3wpvwnp7lx";
+       version = "7.3.0";
+       sha256 = "1dh6l52mfd6p9y39lr0qax1gs7rxpamy21iwxca7ylbhlqyxfa2g";
        buildDepends = [
          base bytestring cereal clientsession happstack-server monad-control
          mtl safecopy transformers-base
        ];
-       jailbreak = true;
        homepage = "http://happstack.com";
        description = "client-side session data";
        license = stdenv.lib.licenses.bsd3;
@@ -58369,8 +58483,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-hsp";
-       version = "7.3.4";
-       sha256 = "08msr1l0fan2xs1bmczv9cjbik984m2c7hpzqjkgh3mkwwgf1nqf";
+       version = "7.3.5";
+       sha256 = "0p8hidcdrqj7n4b9a5gbc0ic279wjmxvjacn6b8nzcnridq3mif6";
        buildDepends = [
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
@@ -58426,13 +58540,12 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-jmacro";
-       version = "7.0.9";
-       sha256 = "005naz3zxl01vpz8w4n66dbd8sj94gazpj16rxf3li7zh0pixpsg";
+       version = "7.0.10";
+       sha256 = "0kzp3dfy2qrd9bwq3lwnxvh1zibw7kib8w8rfqz36k0ywdwq8768";
        buildDepends = [
          base base64-bytestring bytestring cereal digest happstack-server
          jmacro text utf8-string wl-pprint-text
        ];
-       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -58496,10 +58609,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.4.3";
-       revision = "1";
-       sha256 = "0ij359i1lmxs1gpzl6spli94s0mpp6mbbhjcf4jrbxkpavdg8g73";
-       editedCabalFile = "3da7c2f6d5add9d58bc1013cdb0f64bb07aec1ebc88bac40372c4533ed932cf6";
+       version = "7.4.4";
+       sha256 = "1whyv6rb4b9x9m381fs8938n74dgq7hd9gpznwnlzh76ah2nanjf";
        buildDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -58521,8 +58632,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server-tls";
-       version = "7.1.5";
-       sha256 = "148xryarw10i2smqd136yfa9snfvlxrx62974zvavcn2jfimmcny";
+       version = "7.1.6";
+       sha256 = "00fmgws8hc0v1lsmxlj478xdbmlpgaz581m9hqw5nfjljg8mi74w";
        buildDepends = [
          base bytestring extensible-exceptions happstack-server hslogger
          HsOpenSSL network sendfile time unix
@@ -58992,10 +59103,8 @@ self: {
      }:
      mkDerivation {
        pname = "hashable-extras";
-       version = "0.2.0.1";
-       revision = "1";
-       sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s";
-       editedCabalFile = "0797bee08c6190172fa48ce7f2821160efcd26f9fcf2afce08ea64737c1aef7d";
+       version = "0.2.1";
+       sha256 = "02hzffyns0id9vhaqzax7ijprh1pfb8llrfi67hmji2wrh3nvmml";
        buildDepends = [
          base bifunctors bytestring generic-deriving hashable transformers
        ];
@@ -59971,6 +60080,7 @@ self: {
          base haskell-src-exts pretty syb template-haskell th-orphans
          uniplate
        ];
+       jailbreak = true;
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61067,8 +61177,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.7.3";
-       sha256 = "0a8wcncqz2k1lj2cad96rg9xi9116q0x209jfbpkcp8sbi3n3rb8";
+       version = "0.7.3.1";
+       sha256 = "1brd3k6v2irg6myp08gl859v5fmmdm2cgq3wqn367k388p3b58c4";
        buildDepends = [
          attoparsec base base-prelude either hasql-backend list-t mmorph
          monad-control mtl resource-pool template-haskell text transformers
@@ -61110,8 +61220,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-postgres";
-       version = "0.10.3";
-       sha256 = "12452z4li3b30zw1ar4x2r14q93vx06165g3rdj9s1wxjzsnsr4w";
+       version = "0.10.3.1";
+       sha256 = "0vdqmn7z9w530f2p5ajgfccr0prr2zcivzww0j574v3n9lbi7q1c";
        buildDepends = [
          aeson attoparsec base-prelude bytestring either free hashable
          hashtables hasql-backend list-t loch-th mmorph placeholders
@@ -61211,7 +61321,9 @@ self: {
      mkDerivation {
        pname = "haste-compiler";
        version = "0.4.4.4";
+       revision = "1";
        sha256 = "19raiciwll7pgc73h2h704yi9wcifcn7s2gxyjrndp6d7kf1ygyy";
+       editedCabalFile = "de636e39473869692b1fa1dd6047fc2987b6f63c1403a511aab6bd1dcaa98f6f";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -62198,7 +62310,6 @@ self: {
          network process text transformers
        ];
        testDepends = [ base containers mtl ];
-       jailbreak = true;
        homepage = "https://github.com/mvoidex/hdocs";
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
@@ -62458,16 +62569,15 @@ self: {
      mkDerivation {
        pname = "heist";
        version = "0.14.1";
-       revision = "2";
+       revision = "3";
        sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy";
-       editedCabalFile = "73ce4cfe9090a973644268118b4d765577c2e8ddeeb1ad245d335772f5369d34";
+       editedCabalFile = "eac3bf21f0c39ced491fbd542f7a96928c13e8e3672254eb970414168afbaddf";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist errors filepath hashable
          map-syntax MonadCatchIO-transformers mtl process random text time
          transformers unordered-containers vector xmlhtml
        ];
-       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
@@ -64213,6 +64323,7 @@ self: {
          postgresql-simple safe stm text time transformers
          unordered-containers utf8-string wai wai-lens webcrank-wai wreq
        ];
+       jailbreak = true;
        homepage = "https://github.com/purefn/hipbot";
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
@@ -66969,25 +67080,26 @@ self: {
      }) {};
 
   "hpqtypes" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , exceptions, HUnit, lifted-base, monad-control, mtl, postgresql
-     , QuickCheck, random, resource-pool, test-framework
-     , test-framework-hunit, text, time, transformers, transformers-base
-     , vector
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , data-default-class, exceptions, HUnit, lifted-base, monad-control
+     , mtl, postgresql, QuickCheck, random, resource-pool, scientific
+     , test-framework, test-framework-hunit, text, time, transformers
+     , transformers-base, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hpqtypes";
-       version = "1.4.0";
-       sha256 = "0sq4abqqqq71yw2rgpx5xmm7h8fhcj654vbkhb4wlgi1g5kj9kh1";
+       version = "1.4.1";
+       sha256 = "00ira3zsw9m5vm6pqdgf4v276b7y0crqiwlw3nw99f74xj5qds19";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring containers data-default-class exceptions HUnit
-         lifted-base monad-control mtl QuickCheck random resource-pool
-         test-framework test-framework-hunit text time transformers
-         transformers-base vector
+         aeson base bytestring containers data-default-class exceptions
+         HUnit lifted-base monad-control mtl QuickCheck random resource-pool
+         scientific test-framework test-framework-hunit text time
+         transformers transformers-base unordered-containers vector
        ];
        extraLibraries = [ postgresql ];
+       homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) postgresql;};
@@ -67444,8 +67556,8 @@ self: {
     ({ mkDerivation, base, haskell-src, hspec }:
      mkDerivation {
        pname = "hs-inspector";
-       version = "0.5.1.0";
-       sha256 = "189ch2hr39n73cgrrg94kx8rqnm4j0s2bsg5xij85bw96w8d44y5";
+       version = "0.5.2.0";
+       sha256 = "0w9ijl56v0gnx6arz0vvrg740kkhw0vqgkzdvmgf22z9vn99fny8";
        buildDepends = [ base haskell-src ];
        testDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
@@ -68199,8 +68311,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsc3-server";
-       version = "0.9.2";
-       sha256 = "1lq4y57d555jb0yi10n4j69h4whwsm5h2k6j4r7f9avds5ahh6s2";
+       version = "0.10.0";
+       sha256 = "00lw0mj76i2fqhx81d258mqdwqxy8313574i2i8vrjn0mn4bbg2p";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -68867,8 +68979,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslogger";
-       version = "1.2.8";
-       sha256 = "0i7cji7d23kv8m0vr32ws8zm4ah5vxzb1ykv833m7i6m2g1p4dfy";
+       version = "1.2.9";
+       sha256 = "0xml1xgkj4hjjxypnjiia7y330a0nh5fcnkwhmnrwsw7hckwqqmy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -69283,8 +69395,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-contrib";
-       version = "0.2.1";
-       sha256 = "0m7h0bl34qp8yc5pdlk9hn3a9drd11qy7qkqx3lqh2kzr7wbffj0";
+       version = "0.2.2";
+       sha256 = "1jdiv41kf73x8rygj7439wrgm345qlfbkshhdy8ikrqs1k43grw6";
        buildDepends = [ base hspec-core HUnit logging-facade ];
        testDepends = [
          base hspec hspec-core HUnit logging-facade QuickCheck
@@ -69783,7 +69895,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) qt5;};
+     }) { qt5 = null;};
 
   "hsqml-demo-morris" = callPackage
     ({ mkDerivation, base, containers, deepseq, directory, hsqml
@@ -70295,6 +70407,7 @@ self: {
          base base64-bytestring bytestring containers filepath hxt split
          zlib
        ];
+       jailbreak = true;
        description = "Import from the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70325,17 +70438,16 @@ self: {
 
   "html-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , containers, hspec, HUnit, resourcet, system-filepath
-     , tagstream-conduit, text, transformers, xml-conduit, xml-types
+     , containers, hspec, HUnit, resourcet, tagstream-conduit, text
+     , transformers, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "html-conduit";
-       version = "1.1.1.2";
-       sha256 = "116sg4wig2irqqaha257h99ajgqdq6i3jbksvqn1ywqzq96lcx34";
+       version = "1.2.0";
+       sha256 = "0jj02s71a9fk9mrk7bqms93y1m2zz96jg4rd7jn486ln1w49c43m";
        buildDepends = [
          base bytestring conduit conduit-extra containers resourcet
-         system-filepath tagstream-conduit text transformers xml-conduit
-         xml-types
+         tagstream-conduit text transformers xml-conduit xml-types
        ];
        testDepends = [
          base bytestring containers hspec HUnit xml-conduit
@@ -70915,6 +71027,7 @@ self: {
        buildDepends = [
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/achudnov/http-encodings";
        description = "A library for encoding and decoding bodies of HTTP messages";
        license = stdenv.lib.licenses.bsd3;
@@ -71067,8 +71180,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-reverse-proxy";
-       version = "0.4.1.2";
-       sha256 = "1gggn5l08g7mxbka0h7h8w687y3awbm19395fi6wvis76isyz8wy";
+       version = "0.4.1.3";
+       sha256 = "1j51a93j0m7waki875k29d7p8s08nk36xhlx8v4bmgpr4v7w92fh";
        buildDepends = [
          async base blaze-builder bytestring case-insensitive conduit
          conduit-extra containers data-default-class http-client http-types
@@ -71142,7 +71255,6 @@ self: {
          snap-core snap-server system-fileio system-filepath text
          transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://research.operationaldynamics.com/projects/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
@@ -72257,7 +72369,6 @@ self: {
        sha256 = "0aq4svvwcys06mv172zz4yp624f6mnjg94lycj4r66xhm8m3fv4i";
        buildDepends = [ base bytestring containers mtl pretty text ];
        testDepends = [ base Cabal containers mtl QuickCheck ];
-       jailbreak = true;
        homepage = "https://www.github.com/ktvoelker/hydrogen";
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
@@ -72529,6 +72640,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
@@ -73812,6 +73924,7 @@ self: {
          base beamable bytestring containers ghc-prim QuickCheck
          test-framework test-framework-quickcheck2
        ];
+       jailbreak = true;
        description = "type classes for incremental updates to data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74071,8 +74184,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "0.9.1.1";
-       sha256 = "0ijc97xj1fz8ahfg0dha5mmbvd5nsb38dlvyvrwq2gpr0j79138r";
+       version = "0.9.1.2";
+       sha256 = "1nn1vflzb4c8xvvnnxl3ph947nxy5ibyh8bzrp2ddwjb62xm2l00";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74084,7 +74197,6 @@ self: {
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
@@ -74260,6 +74372,7 @@ self: {
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/hvr/int-cast";
        description = "Checked conversions between integral types";
        license = stdenv.lib.licenses.bsd3;
@@ -75052,10 +75165,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "1.0";
-       revision = "1";
-       sha256 = "02ymy4zar7jl14pkhl6f4l42yzb1jv8apdsf86sv39sw9yygs305";
-       editedCabalFile = "1fbb89234408096eb458a63862ebd84dcb5b103b93d587548490e9a5dc2d6b31";
+       version = "1.1.0.1";
+       sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -75064,7 +75175,6 @@ self: {
          free haskell-lexer lens network old-locale split stm text time tls
          transformers vty x509 x509-store x509-system x509-validation
        ];
-       jailbreak = true;
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
        license = stdenv.lib.licenses.bsd3;
@@ -76403,21 +76513,18 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
-     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, base, hslogger, lens, template-haskell, text
+     , transformers
      }:
      mkDerivation {
        pname = "jsaddle";
        version = "0.2.0.4";
        sha256 = "154f75lhlqixrmwrvzcdvmvmila7cj8hzgch2020yamlwyi4gnk8";
-       buildDepends = [
-         base lens template-haskell text transformers webkitgtk3
-         webkitgtk3-javascriptcore
-       ];
+       buildDepends = [ base lens template-haskell text transformers ];
        testDepends = [
-         base glib gtk3 hslogger lens template-haskell text transformers
-         webkitgtk3 webkitgtk3-javascriptcore
+         base hslogger lens template-haskell text transformers
        ];
+       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -76527,6 +76634,7 @@ self: {
          hashable hflags lens mtl pretty process QuickCheck scientific
          smallcheck text uniplate unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
@@ -77122,10 +77230,8 @@ self: {
      }:
      mkDerivation {
        pname = "kan-extensions";
-       version = "4.2.1";
-       revision = "1";
-       sha256 = "0lymh1njw1zh9is6zk3bmr7jylna28632l4pylh6chlxpjvy4zwl";
-       editedCabalFile = "c0b1fdbd894c452f2658615bb14db240921b9ba5115f4f232d173ecbdae83ead";
+       version = "4.2.2";
+       sha256 = "0dqqlrzrhz8di5hp4kby3205inpj2r30bl75zyy24nq4hgans7g5";
        buildDepends = [
          adjunctions array base comonad containers contravariant
          distributive free mtl semigroupoids tagged transformers
@@ -77393,15 +77499,15 @@ self: {
      , conduit-extra, containers, data-default, directory, filepath
      , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy
      , http-types, HUnit, lifted-base, mtl, network, process, random
-     , regex-tdfa, stm, system-fileio, system-filepath, tar
-     , template-haskell, text, time, transformers, unix, unix-compat
-     , unordered-containers, vector, wai, wai-app-static, wai-extra
-     , warp, warp-tls, yaml, zlib
+     , regex-tdfa, stm, system-filepath, tar, template-haskell, text
+     , time, transformers, unix, unix-compat, unordered-containers
+     , vector, wai, wai-app-static, wai-extra, warp, warp-tls, yaml
+     , zlib
      }:
      mkDerivation {
        pname = "keter";
-       version = "1.3.10.1";
-       sha256 = "1bqy0g0255xqnlk9qn2ykwlszwdliqhcrdm4bjfac1d2lf27vs7r";
+       version = "1.4.0";
+       sha256 = "1psa0xs0j8s117ifhd2347kiiq0mvprp7kcb933l8977p10nqi9k";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77409,10 +77515,9 @@ self: {
          case-insensitive conduit conduit-extra containers data-default
          directory filepath fsnotify http-client http-conduit
          http-reverse-proxy http-types lifted-base mtl network process
-         random regex-tdfa stm system-fileio system-filepath tar
-         template-haskell text time transformers unix unix-compat
-         unordered-containers vector wai wai-app-static wai-extra warp
-         warp-tls yaml zlib
+         random regex-tdfa stm system-filepath tar template-haskell text
+         time transformers unix unix-compat unordered-containers vector wai
+         wai-app-static wai-extra warp warp-tls yaml zlib
        ];
        testDepends = [
          base bytestring conduit hspec HUnit transformers unix
@@ -77482,6 +77587,7 @@ self: {
          array base comonad containers free semigroupoids semigroups
          transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/keys/";
        description = "Keyed functors and containers";
        license = stdenv.lib.licenses.bsd3;
@@ -78123,6 +78229,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambda-options" = callPackage
+    ({ mkDerivation, base, containers, monad-loops, mtl }:
+     mkDerivation {
+       pname = "lambda-options";
+       version = "0.3.0.0";
+       sha256 = "1yma67b7d55lyq81afpw1wrqyjv84cxqbbrw3rr1qvdkx16b9pwa";
+       buildDepends = [ base containers monad-loops mtl ];
+       jailbreak = true;
+       homepage = "https://github.com/thomaseding/lambda-options";
+       description = "A modern command-line parser for Haskell";
+       license = "unknown";
+     }) {};
+
   "lambda-placeholders" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -78280,6 +78399,7 @@ self: {
          parsec pretty process QuickCheck regex-tdfa show split syb
          transformers utf8-string vector-space
        ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
@@ -78361,6 +78481,7 @@ self: {
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
        ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
@@ -78931,6 +79052,7 @@ self: {
        version = "0.2";
        sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf";
        buildDepends = [ base bifunctors parsers ];
+       jailbreak = true;
        description = "Something similar to Dijkstra's guarded command language";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -79188,7 +79310,6 @@ self: {
          array base containers monads-tf pretty transformers utf8-string
        ];
        buildTools = [ alex happy ];
-       jailbreak = true;
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
@@ -79942,8 +80063,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.9.1";
-       sha256 = "1ic8zvwl1cz9qppwqp713r7savvnqij0gclpdgxmnnh67l962170";
+       version = "4.10";
+       sha256 = "01vmb0kknzayv3ppqgrnhnrybxw192gb4hk1kchwiiam7vr6kngd";
        buildDepends = [
          array base bifunctors bytestring comonad containers contravariant
          distributive exceptions filepath free ghc-prim hashable
@@ -79970,8 +80091,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-action";
-       version = "0.1.0.1";
-       sha256 = "0ycasfbwkqc3v3frjq8kfm1nzj7g1vr25ywzf0irk05gfhxfpvig";
+       version = "0.2";
+       sha256 = "1paam0sk1p9cgnrg74qc08szipnb5pmp1vzq4pjaki7jrbh8fr74";
        buildDepends = [
          base comonad contravariant lens mtl profunctors semigroupoids
          semigroups transformers
@@ -80162,6 +80283,7 @@ self: {
          tasty tasty-quickcheck temporary transformers
        ];
        extraLibraries = [ leveldb ];
+       jailbreak = true;
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
@@ -80441,18 +80563,18 @@ self: {
 
   "libconfig" = callPackage
     ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config
-     , deepseq, doctest, doctest-prop, hashable, lens, profunctors, text
-     , text-binary, transformers, transformers-compat
+     , deepseq, doctest, doctest-prop, hashable, text, text-binary
+     , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "libconfig";
        version = "0.3.0.0";
        sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12";
        buildDepends = [
-         base binary cereal cereal-text deepseq hashable profunctors text
-         text-binary transformers transformers-compat
+         base binary cereal cereal-text deepseq hashable text text-binary
+         transformers transformers-compat
        ];
-       testDepends = [ base doctest doctest-prop lens ];
+       testDepends = [ base doctest doctest-prop ];
        buildTools = [ c2hs ];
        extraLibraries = [ config ];
        homepage = "https://github.com/peddie/libconfig-haskell";
@@ -80510,10 +80632,10 @@ self: {
     ({ mkDerivation, base, mtl, process }:
      mkDerivation {
        pname = "libgit";
-       version = "0.3.0";
-       sha256 = "0k2287d84s0p73md1mfcyg1qy1l5ncgrvmkaa7607d8zlk9b8ci6";
+       version = "0.3.1";
+       sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x";
        buildDepends = [ base mtl process ];
-       homepage = "http://github.com/vincenthz/hs-tls";
+       homepage = "https://github.com/vincenthz/hs-libgit";
        description = "Simple Git Wrapper";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81123,6 +81245,7 @@ self: {
        testDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/amosr/limp";
        description = "representation of Integer Linear Programs";
        license = stdenv.lib.licenses.mit;
@@ -81191,8 +81314,8 @@ self: {
      }:
      mkDerivation {
        pname = "linear";
-       version = "1.18.0.1";
-       sha256 = "06gbrmr7yv9s6la14g22lwqfjyfr0xrlmkrffizy4n01xknmkbig";
+       version = "1.18.1";
+       sha256 = "1msj1h4mzlxj255lv085f1im7w741x4kl1v5pav4bx6ga886sp3z";
        buildDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
@@ -81203,6 +81326,7 @@ self: {
          base binary bytestring directory doctest filepath HUnit lens
          simple-reflect test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -81676,6 +81800,7 @@ self: {
        version = "0.1.0.2";
        sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c";
        buildDepends = [ base QuickCheck ];
+       jailbreak = true;
        description = "Generators for random sequences of English-like nonsense text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81984,10 +82109,9 @@ self: {
     ({ mkDerivation, base, exceptions }:
      mkDerivation {
        pname = "listsafe";
-       version = "0.1.0.0";
-       sha256 = "0mkyhanay0zr318cc01wgp4qxwpqj1wzydqlq7c12hbfrjb1ah4b";
+       version = "0.1.0.1";
+       sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs";
        buildDepends = [ base exceptions ];
-       jailbreak = true;
        homepage = "https://github.com/ombocomp/listsafe";
        description = "Safe wrappers for partial list functions, supporting MonadThrow";
        license = stdenv.lib.licenses.asl20;
@@ -82621,6 +82745,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -83282,7 +83407,9 @@ self: {
      mkDerivation {
        pname = "lucid";
        version = "2.9.2";
+       revision = "1";
        sha256 = "0r3bzh9pmcqsac5id064jcscn9x2pyfhpazdzvz0666smf4b9jah";
+       editedCabalFile = "62ded561d5846fbcbe77e7f491c5fed2f4beddbf5cda336685f3d980df525218";
        buildDepends = [
          base blaze-builder bytestring containers hashable mtl text
          transformers unordered-containers
@@ -83617,10 +83744,8 @@ self: {
      }:
      mkDerivation {
        pname = "machines";
-       version = "0.4.1";
-       revision = "1";
-       sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb";
-       editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8";
+       version = "0.5.1";
+       sha256 = "1dyvyy0yv9qha1ff2nfrl304vmmbi4hd881jyj3xpqhgc3zz8ab2";
        buildDepends = [
          base comonad containers free mtl pointed profunctors semigroups
          transformers void
@@ -83638,13 +83763,13 @@ self: {
      }:
      mkDerivation {
        pname = "machines-directory";
-       version = "0.2.0.0";
-       sha256 = "1b1jv23ijhm51nggxrncjhz24k4pl4nvj6s9h3jabr0gsnsb8y2v";
+       version = "0.2.0.2";
+       sha256 = "1z17lj5hyldxf4n9dndnc2jzn0l6c2pk1sd7xyw7fikrf4ykg6ns";
        buildDepends = [
          base directory filepath machines machines-io transformers
        ];
        jailbreak = true;
-       homepage = "http://github.com/aloiscochard/machines-io";
+       homepage = "http://github.com/aloiscochard/machines-directory";
        description = "Directory (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83656,11 +83781,12 @@ self: {
      }:
      mkDerivation {
        pname = "machines-io";
-       version = "0.2.0.0";
-       sha256 = "0qjbfwyhscjmjbfj709kb9xr5p3yz4v21aq2g4dv1abqwgf85x03";
+       version = "0.2.0.2";
+       sha256 = "0v7jigl04nb3avqyyjs74fvcj7ialf4d8iw7ym4mzqam0sl74157";
        buildDepends = [
          base bytestring chunked-data machines transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/aloiscochard/machines-io";
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
@@ -83672,10 +83798,11 @@ self: {
      }:
      mkDerivation {
        pname = "machines-process";
-       version = "0.2.0.0";
-       sha256 = "028l6hijabrgnn5klm1bv35h2z2qmm1r49bj1bvvaffhn5fdpz7y";
+       version = "0.2.0.2";
+       sha256 = "1s3hdxk76jv9762lp42wgfq02dz5dn6a73yp986ghpn9hshkhqz2";
        buildDepends = [ base chunked-data machines machines-io process ];
-       homepage = "http://github.com/aloiscochard/machines-io";
+       jailbreak = true;
+       homepage = "http://github.com/aloiscochard/machines-process";
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83784,6 +83911,7 @@ self: {
        version = "0.3.0.0";
        sha256 = "0bk4a9kw2jxvvz81ppj6qh3kk8cbknnqmg6vvkd0kpn70rcx0hnv";
        buildDepends = [ base deepseq profunctors semigroups ];
+       jailbreak = true;
        homepage = "https://github.com/cutsea110/magma";
        description = "magma is an algebraic structure consisting a set together with an binary operation";
        license = stdenv.lib.licenses.bsd3;
@@ -83904,7 +84032,9 @@ self: {
      mkDerivation {
        pname = "mainland-pretty";
        version = "0.2.7.2";
+       revision = "1";
        sha256 = "0spn95apa05bx2akcl13kmg0vlyyakca3jx1960ja4z9dm9lwadd";
+       editedCabalFile = "e766e6766217250919472995c93de5f98496d1b03d73d498668400408f845ee6";
        buildDepends = [ base containers srcloc text ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
@@ -84443,8 +84573,8 @@ self: {
      }:
      mkDerivation {
        pname = "mangopay";
-       version = "1.11";
-       sha256 = "1ipw08z1p4kl9b682jl061g87df8kljxn4cdbfz6fx7g82ab58g3";
+       version = "1.11.1";
+       sha256 = "0yiy432i4pbq4wd2p52f060qb9wbqqfrw4fv6li0w3ls668pc6pc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -84463,7 +84593,6 @@ self: {
          template-haskell text time tls transformers transformers-base
          unordered-containers utf8-string vector wai warp x509-system
        ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
@@ -84529,20 +84658,20 @@ self: {
 
   "markdown" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , conduit, conduit-extra, containers, data-default, hspec
-     , system-fileio, system-filepath, text, transformers, xss-sanitize
+     , conduit, conduit-extra, containers, data-default, directory
+     , filepath, hspec, text, transformers, xss-sanitize
      }:
      mkDerivation {
        pname = "markdown";
-       version = "0.1.13.1";
-       sha256 = "0b10cvz5yryzrzfg2j0pikhfxcly7x4hfmjwnwycs4hy97h2rdnq";
+       version = "0.1.13.2";
+       sha256 = "15aiwjs006g8aajw88rgfvrpcwaxml9hnpz7jrhmdm2pqxfrkb8z";
        buildDepends = [
          attoparsec base blaze-html blaze-markup conduit conduit-extra
          containers data-default text transformers xss-sanitize
        ];
        testDepends = [
-         base blaze-html conduit conduit-extra containers hspec
-         system-fileio system-filepath text transformers
+         base blaze-html conduit conduit-extra containers directory filepath
+         hspec text transformers
        ];
        homepage = "https://github.com/snoyberg/markdown";
        description = "Convert Markdown to HTML, with XSS protection";
@@ -84674,15 +84803,16 @@ self: {
      }) {};
 
   "markup" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, hspec, lucid, mtl
-     , text, transformers, urlpath
+    ({ mkDerivation, base, blaze-html, blaze-markup, comonad, hspec
+     , lucid, mtl, text, transformers, urlpath
      }:
      mkDerivation {
        pname = "markup";
-       version = "0.0.7";
-       sha256 = "0rzq7gpwaq7x7q9qcjfyybviydcp0map3ikxbci3379g1hikfan4";
+       version = "1.1.0";
+       sha256 = "0p037nq20vdbrvn29n3xlaval98fs0lml3y5h0j9fy04x6zcdkz8";
        buildDepends = [
-         base blaze-html blaze-markup lucid mtl text transformers urlpath
+         base blaze-html blaze-markup comonad lucid mtl text transformers
+         urlpath
        ];
        testDepends = [ base hspec ];
        description = "Abstraction for markup languages";
@@ -85160,6 +85290,7 @@ self: {
        buildDepends = [
          base containers hakaru hmatrix mwc-random primitive statistics
        ];
+       jailbreak = true;
        description = "Combinators for MCMC sampling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85304,6 +85435,7 @@ self: {
          base bifunctors doctest hspec hspec-expectations-lens lens
          QuickCheck semigroups
        ];
+       jailbreak = true;
        description = "A silly container";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86605,13 +86737,14 @@ self: {
      }) {};
 
   "mockery" = callPackage
-    ({ mkDerivation, base, directory, hspec, temporary }:
+    ({ mkDerivation, base, directory, hspec, logging-facade, temporary
+     }:
      mkDerivation {
        pname = "mockery";
-       version = "0.1.0";
-       sha256 = "0jl2561jknvp86anccw6pwy8w95jnxm635jpsal47y90mdjf1qbl";
-       buildDepends = [ base directory temporary ];
-       testDepends = [ base directory hspec temporary ];
+       version = "0.2.0";
+       sha256 = "18a9zz964crhjb1xdzv38pwg458lxajhvjpqd08klb1w7kh57hlj";
+       buildDepends = [ base directory logging-facade temporary ];
+       testDepends = [ base directory hspec logging-facade temporary ];
        description = "Support functions for automated testing";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87317,6 +87450,7 @@ self: {
        version = "4.0.0.1";
        sha256 = "017cxiavxfw0f08sr0d6m3avla1lplmdj51rxpf1103ripq20r53";
        buildDepends = [ base semigroupoids ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/monad-products";
        description = "Monad products";
        license = stdenv.lib.licenses.bsd3;
@@ -87901,6 +88035,7 @@ self: {
        version = "0.4.0.0";
        sha256 = "0j8lc03zamxplyw5k8kv8qa78j5xkmf581rz4iw2v9qhbx66cfpx";
        buildDepends = [ base groups semigroupoids semigroups ];
+       jailbreak = true;
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87981,6 +88116,7 @@ self: {
        buildDepends = [
          base containers deepseq hashable lens newtype unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/bgamari/monoidal-containers";
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
@@ -88178,18 +88314,21 @@ self: {
      }) { morfeusz = null;};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, deepseq, happy
-     , lens-family-core, optparse-applicative, pipes, text, transformers
+    ({ mkDerivation, alex, array, base, binary, containers, deepseq
+     , happy, http-client, http-client-tls, lens-family-core, managed
+     , optparse-applicative, pipes, system-fileio, system-filepath, text
+     , text-format, transformers
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.1.2";
-       sha256 = "1rz15nmzagwngjd15kd25vnrpz3br23kmjzf558qp61bxlhflybc";
+       version = "1.2.0";
+       sha256 = "0mr2aaf4r15ysmymqixd592z5w56973qv8ww1d7vkyvj851gfm01";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base binary deepseq lens-family-core optparse-applicative
-         pipes text transformers
+         array base binary containers deepseq http-client http-client-tls
+         lens-family-core managed optparse-applicative pipes system-fileio
+         system-filepath text text-format transformers
        ];
        buildTools = [ alex happy ];
        jailbreak = true;
@@ -88204,8 +88343,8 @@ self: {
      }:
      mkDerivation {
        pname = "mosaico-lib";
-       version = "0.1.0.0";
-       sha256 = "0jk1x7jwcx8ackapz91v6apwvwjlhjx36j2pr9ayriyl3s00q0vq";
+       version = "0.1.1.0";
+       sha256 = "1qcr3l1a422fh5226443dc8p6hvrr9wbhri6mk2pcw7zyfd5xr0b";
        buildDepends = [
          base base-unicode-symbols colour diagrams-cairo diagrams-core
          diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm
@@ -88411,7 +88550,6 @@ self: {
        testDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "http://msgpack.org/";
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
@@ -90104,6 +90242,7 @@ self: {
          array base bytestring cereal HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text zlib
        ];
+       jailbreak = true;
        homepage = "https://github.com/acfoltzer/nbt";
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
        license = stdenv.lib.licenses.bsd3;
@@ -90166,11 +90305,10 @@ self: {
      }:
      mkDerivation {
        pname = "neat-interpolation";
-       version = "0.2.2";
-       sha256 = "0hjv33gpikfiwfhzna35bxiqh62d54776d3ahfb98dxfrjijl20c";
+       version = "0.2.2.1";
+       sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy";
        buildDepends = [ base base-prelude parsec template-haskell ];
        testDepends = [ base-prelude HTF ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
        license = stdenv.lib.licenses.mit;
@@ -90354,22 +90492,27 @@ self: {
 
   "nested-routes" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
-     , clay, composition, constraints, containers, hspec, http-media
-     , http-types, lucid, mtl, poly-arity, pred-trie, QuickCheck
-     , quickcheck-instances, regex-compat, semigroups, shakespeare, text
-     , transformers, wai, wai-extra, wai-util, witherable
+     , clay, composition, constraints, containers, hspec, hspec-wai
+     , http-media, http-types, lucid, mtl, poly-arity, pred-trie
+     , regex-compat, semigroups, shakespeare, text, transformers, wai
+     , wai-extra, wai-util, warp, witherable
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "1.0.0.1";
-       sha256 = "04j11mamfpmc0isnxpss6b8qf21mlfs3ndpb8xbdcbcs9hp0xrrq";
+       version = "2.2.0";
+       sha256 = "01daa0hhwgpp33sq1nlgnbkmn15ca8861qf6d7j5ypb9f48c6jr1";
        buildDepends = [
          aeson attoparsec base blaze-html bytestring clay composition
          constraints containers http-media http-types lucid mtl poly-arity
          pred-trie regex-compat semigroups shakespeare text transformers wai
          wai-extra wai-util witherable
        ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       testDepends = [
+         aeson attoparsec base blaze-html bytestring composition constraints
+         containers hspec hspec-wai http-media http-types lucid mtl
+         poly-arity pred-trie regex-compat semigroups shakespeare text
+         transformers wai wai-util warp witherable
+       ];
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90660,6 +90803,7 @@ self: {
          base containers deepseq parallel profunctors random semigroups time
          transformers
        ];
+       jailbreak = true;
        homepage = "http://hub.darcs.net/ertes/netwire";
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -90879,17 +91023,16 @@ self: {
   "network-conduit-tls" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , connection, cprng-aes, data-default, HUnit, monad-control, mtl
-     , network, streaming-commons, system-fileio, system-filepath, tls
-     , transformers
+     , network, streaming-commons, tls, transformers
      }:
      mkDerivation {
        pname = "network-conduit-tls";
-       version = "1.1.2";
-       sha256 = "0y3cqvakc676xdzc1hg9afv6aqzvj2pp4pci6cgs4bmm3kc3chfs";
+       version = "1.2.0";
+       sha256 = "16x334ly9lgrdp9prc9aqjraigqzlgsi9607alaj2pf2qbqa0ipg";
        buildDepends = [
          base bytestring conduit conduit-extra connection cprng-aes
-         data-default monad-control network streaming-commons system-fileio
-         system-filepath tls transformers
+         data-default monad-control network streaming-commons tls
+         transformers
        ];
        testDepends = [
          base bytestring conduit conduit-extra connection HUnit mtl
@@ -91496,8 +91639,8 @@ self: {
      }:
      mkDerivation {
        pname = "newsynth";
-       version = "0.2.0.1";
-       sha256 = "0xijyxfy62pv7ydfckhai7sdd7rdxlh0vw5wr7ic3z68vc0h6cai";
+       version = "0.3.0.1";
+       sha256 = "1c65s4nwxzlmix0549chhvm5wj4rvxq92y5kfzd9h11jc4hxl7xs";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers fixedprec random superdoc time ];
@@ -91563,11 +91706,10 @@ self: {
     ({ mkDerivation, base, hspec, HUnit }:
      mkDerivation {
        pname = "newtype-generics";
-       version = "0.4.0.1";
-       sha256 = "1xghpqmpwnjyk944m9nsfzk2jlyqwdvcr5zrmr66d4n650cf1m2b";
+       version = "0.4.1";
+       sha256 = "1qjzcmx5yj85cvdgglyg9f9ff7k9gvnyrb85n6bjzyh10q9n7vd5";
        buildDepends = [ base ];
        testDepends = [ base hspec HUnit ];
-       jailbreak = true;
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91879,6 +92021,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nofib-analyze" = callPackage
+    ({ mkDerivation, array, base, containers, regex-compat }:
+     mkDerivation {
+       pname = "nofib-analyze";
+       version = "7.10.1";
+       sha256 = "04n056gsxv61igdvdysqkxbsz1a5bvkzfnsbrz03ixjgaqg2whfl";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ array base containers regex-compat ];
+       homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib";
+       description = "Parse and compare nofib runs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "noise" = callPackage
     ({ mkDerivation, base, blaze-markup, blaze-svg, bytestring
      , containers, cryptohash, HTF, HUnit, network, parsec, QuickCheck
@@ -91974,6 +92130,7 @@ self: {
        version = "0.3.7";
        sha256 = "147dbq19n18ixfz6bhx9yi9ppr9j3wnc5dfz8kx5gwihy64b8l1b";
        buildDepends = [ base primitive vector ];
+       jailbreak = true;
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
      }) {};
@@ -92198,6 +92355,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nth-prime" = callPackage
+    ({ mkDerivation, base, opentheory-prime, opentheory-primitive }:
+     mkDerivation {
+       pname = "nth-prime";
+       version = "1.2";
+       sha256 = "0iq1658jfywni2yhk3aa1d4bnjjp8c9288bqfqxd8ayv87bvpirh";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base opentheory-prime opentheory-primitive ];
+       testDepends = [ base opentheory-prime opentheory-primitive ];
+       description = "Computing the nth prime";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "nthable" = callPackage
     ({ mkDerivation, base, type-level }:
      mkDerivation {
@@ -93021,7 +93192,9 @@ self: {
      mkDerivation {
        pname = "opaleye";
        version = "0.3.1.2";
+       revision = "2";
        sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9";
+       editedCabalFile = "e428ce92e9fc225610dc60c4248dabb125cdb3dd3bf2cda228672cb01d9c6075";
        buildDepends = [
          attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -93031,7 +93204,6 @@ self: {
        testDepends = [
          base postgresql-simple product-profunctors profunctors time
        ];
-       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
@@ -93160,6 +93332,7 @@ self: {
          packer vector
        ];
        extraLibraries = [ EGL GLESv2 ];
+       jailbreak = true;
        description = "OpenGL ES 2.0 and 3.0 with EGL 1.4";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93344,19 +93517,50 @@ self: {
      }) {};
 
   "opentheory" = callPackage
-    ({ mkDerivation, base, opentheory-primitive, QuickCheck, random }:
+    ({ mkDerivation, base, opentheory-primitive, QuickCheck }:
      mkDerivation {
        pname = "opentheory";
-       version = "1.76";
-       sha256 = "011xz72b0sn50pa62h3x9spr1y1prxyyyn3sc8nm1jg0r0rda99c";
-       isLibrary = true;
-       isExecutable = true;
-       buildDepends = [ base opentheory-primitive QuickCheck random ];
-       description = "The Haskell base";
+       version = "1.197";
+       sha256 = "0z21swy53yd7lwdwkqr5ypp9sz3whq04fl7rdyqln914c554hxw5";
+       buildDepends = [ base opentheory-primitive QuickCheck ];
+       testDepends = [ base opentheory-primitive QuickCheck ];
+       description = "The standard theory library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "opentheory-bits" = callPackage
+    ({ mkDerivation, base, opentheory, opentheory-primitive
+     , opentheory-probability, QuickCheck
+     }:
+     mkDerivation {
+       pname = "opentheory-bits";
+       version = "1.65";
+       sha256 = "0qinq1i4pip8dqq2h5x9xs6bgrv29yngg0xywl03bsymccqvsd8d";
+       buildDepends = [
+         base opentheory opentheory-primitive opentheory-probability
+         QuickCheck
+       ];
+       description = "Natural number to bit-list conversions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "opentheory-byte" = callPackage
+    ({ mkDerivation, base, opentheory, opentheory-bits
+     , opentheory-primitive, opentheory-probability, QuickCheck
+     }:
+     mkDerivation {
+       pname = "opentheory-byte";
+       version = "1.125";
+       sha256 = "1lbfd231cznz7sxg1bgkzcp389bg1lyzlnqyw9q1s1c5yxd6a026";
+       buildDepends = [
+         base opentheory opentheory-bits opentheory-primitive
+         opentheory-probability QuickCheck
+       ];
+       description = "Bytes";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "opentheory-char" = callPackage
     ({ mkDerivation, base, opentheory, opentheory-parser
      , opentheory-primitive, QuickCheck, random
@@ -93371,43 +93575,56 @@ self: {
          base opentheory opentheory-parser opentheory-primitive QuickCheck
          random
        ];
+       jailbreak = true;
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "opentheory-divides" = callPackage
+    ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck
+     }:
+     mkDerivation {
+       pname = "opentheory-divides";
+       version = "1.57";
+       sha256 = "0g9p7y7s6ggs6sslv3bcjb4b7l0hnkx2z2xm23pp19piangpi1m8";
+       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       testDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       description = "The divides relation on natural numbers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "opentheory-parser" = callPackage
     ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck
-     , random
      }:
      mkDerivation {
        pname = "opentheory-parser";
-       version = "1.117";
-       sha256 = "0wrqah4vq0shh9541lqjdciz6v79qrr5s7711zmpcap51gs9d9bl";
-       isLibrary = true;
-       isExecutable = true;
-       buildDepends = [
-         base opentheory opentheory-primitive QuickCheck random
-       ];
+       version = "1.157";
+       sha256 = "1ng772jinni54if2070rqqgvg67bijzvrpyb9y85nqs2r76mhhq2";
+       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       testDepends = [ base opentheory opentheory-primitive QuickCheck ];
        description = "Stream parsers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opentheory-prime" = callPackage
-    ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck
-     , random
+    ({ mkDerivation, base, opentheory, opentheory-divides
+     , opentheory-primitive, opentheory-stream, QuickCheck
      }:
      mkDerivation {
        pname = "opentheory-prime";
-       version = "1.23";
-       sha256 = "1mg0bhjcml8camgy7hqci4lpd5raw5yii1rsln160hwsalkaxj1c";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.81";
+       sha256 = "14br1cn9kifm1hm2ak1ydn8pvnr1pwhzgvy25xk41ysan613ix4g";
        buildDepends = [
-         base opentheory opentheory-primitive QuickCheck random
+         base opentheory opentheory-divides opentheory-primitive
+         opentheory-stream QuickCheck
        ];
-       description = "Prime numbers";
+       testDepends = [
+         base opentheory opentheory-divides opentheory-primitive
+         opentheory-stream QuickCheck
+       ];
+       description = "Prime natural numbers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -93416,16 +93633,60 @@ self: {
     ({ mkDerivation, base, QuickCheck, random }:
      mkDerivation {
        pname = "opentheory-primitive";
-       version = "1.2";
-       sha256 = "028z444528v1a35g5iac4fzqgwlxr23ii71sjb264h3v4i4i81d8";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.5";
+       sha256 = "065xbgdw7c7bfvsns722ri6dxirxlnhxid0vj4628syn64frdgsw";
        buildDepends = [ base QuickCheck random ];
+       testDepends = [ base QuickCheck random ];
        description = "Haskell primitives used by OpenTheory packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "opentheory-probability" = callPackage
+    ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck
+     }:
+     mkDerivation {
+       pname = "opentheory-probability";
+       version = "1.48";
+       sha256 = "05hzdm5f96a4zr16hi5gg6nj9qiglsx66p9f2jss5j5rnw6n4i88";
+       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       description = "Probability";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "opentheory-stream" = callPackage
+    ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck
+     }:
+     mkDerivation {
+       pname = "opentheory-stream";
+       version = "1.44";
+       sha256 = "0j7vz4y15mv643rcclxmf68a2hlkfrjjk1lwj25fmwsi92l08l3z";
+       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       description = "Infinite stream types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "opentheory-unicode" = callPackage
+    ({ mkDerivation, base, opentheory, opentheory-bits, opentheory-byte
+     , opentheory-parser, opentheory-primitive, opentheory-probability
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "opentheory-unicode";
+       version = "1.139";
+       sha256 = "0dmd0a1gfw4f1jifgb6vb3n69gsl23m0wsxz68lh5q1pb18byk8d";
+       buildDepends = [
+         base opentheory opentheory-bits opentheory-byte opentheory-parser
+         opentheory-primitive opentheory-probability QuickCheck
+       ];
+       testDepends = [
+         base opentheory opentheory-bits opentheory-byte opentheory-parser
+         opentheory-primitive opentheory-probability QuickCheck
+       ];
+       description = "Unicode characters";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "operational" = callPackage
     ({ mkDerivation, base, mtl, random }:
      mkDerivation {
@@ -93531,6 +93792,7 @@ self: {
          ad base distributive linear semigroupoids vector
        ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/bgamari/optimization";
        description = "Numerical optimization";
        license = stdenv.lib.licenses.bsd3;
@@ -93867,8 +94129,8 @@ self: {
      }:
      mkDerivation {
        pname = "os-release";
-       version = "0.2.0";
-       sha256 = "1y59n0gsp26xbgdfszc6gnwr75h1bmwc8rvsf9p02gwgvcylxhly";
+       version = "0.2.1";
+       sha256 = "0ij6i1yp2rmbkr9jhr8i969xajw3kbfx0yb44s51gm3mcjb3g4la";
        buildDepends = [ base containers parsec transformers ];
        testDepends = [
          base containers hlint hspec parsec process regex-compat temporary
@@ -93964,6 +94226,7 @@ self: {
          aeson base binary HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "https://github.com/operational-transformation/ot.hs";
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
@@ -94099,14 +94362,14 @@ self: {
      }) {};
 
   "packer" = callPackage
-    ({ mkDerivation, array, base, bytestring, mtl, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, base, bytestring, ghc-prim, tasty, tasty-hunit
+     , tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "packer";
-       version = "0.1.6";
-       sha256 = "02vswdsiinarg405lgzgghlqk4lhw9il8s9v2n1xdhszi510sz1w";
-       buildDepends = [ array base bytestring mtl ];
+       version = "0.1.8";
+       sha256 = "1r7q54a1c6yb0gjd8hvxq1jw2fmgbhf5anfw47nzibs1bywjjgbi";
+       buildDepends = [ base bytestring ghc-prim transformers ];
        testDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
        ];
@@ -94196,8 +94459,8 @@ self: {
      }:
      mkDerivation {
        pname = "pagerduty";
-       version = "0.0.3";
-       sha256 = "1jqg7k0vr78fv5cv0rn74v8p5jd4wvv6l5nc5xdwh46b7rjwcpj1";
+       version = "0.0.3.1";
+       sha256 = "1l68a5s4w3x2n1qqmd2g6q7925rpvyqf1b9gisq8nsxs1dknin2r";
        buildDepends = [
          aeson base bifunctors bytestring bytestring-conversion conduit
          data-default-class exceptions generics-sop http-client http-types
@@ -94277,10 +94540,11 @@ self: {
      , executable-path, extensible-exceptions, filepath, haddock-library
      , happy, highlighting-kate, hslua, HTTP, http-client
      , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network
-     , network-uri, old-time, pandoc-types, parsec, process, QuickCheck
-     , random, scientific, SHA, syb, tagsoup, temporary, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, texmath, text
-     , time, unordered-containers, vector, xml, yaml, zip-archive, zlib
+     , network-uri, old-locale, old-time, pandoc-types, parsec, process
+     , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , texmath, text, time, unordered-containers, vector, xml, yaml
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
@@ -94293,9 +94557,10 @@ self: {
          blaze-markup bytestring containers data-default deepseq-generics
          directory extensible-exceptions filepath haddock-library happy
          highlighting-kate hslua HTTP http-client http-client-tls http-types
-         JuicyPixels mtl network network-uri old-time pandoc-types parsec
-         process random scientific SHA syb tagsoup temporary texmath text
-         time unordered-containers vector xml yaml zip-archive zlib
+         JuicyPixels mtl network network-uri old-locale old-time
+         pandoc-types parsec process random scientific SHA syb tagsoup
+         temporary texmath text time unordered-containers vector xml yaml
+         zip-archive zlib
        ];
        testDepends = [
          ansi-terminal base bytestring containers Diff directory
@@ -94304,6 +94569,7 @@ self: {
          test-framework-quickcheck2 text zip-archive
        ];
        configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ];
+       jailbreak = true;
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Conversion between markup formats";
        license = "GPL";
@@ -94318,8 +94584,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.7.0.1";
-       sha256 = "09ihb3pxw6rk456a0kmgc51fvykz0f499fjd8idns5q1335l18q4";
+       version = "0.7.1";
+       sha256 = "1kyxr7ld6j60hq1pbrxvv4c7vsvq46fxpky272ywacayhqq1a2qg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -94360,6 +94626,20 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "pandoc-csv2table" = callPackage
+    ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
+     mkDerivation {
+       pname = "pandoc-csv2table";
+       version = "1.0.0";
+       sha256 = "0jr18sa5apvy8jckb5cxvsyr6c2drii6652ipwpd4xkdwrabwp5r";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base csv pandoc pandoc-types text ];
+       homepage = "https://github.com/baig/pandoc-csv2table-filter";
+       description = "Convert CSV to Pandoc Table Markdown";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pandoc-lens" = callPackage
     ({ mkDerivation, base, containers, lens, pandoc-types }:
      mkDerivation {
@@ -94367,6 +94647,7 @@ self: {
        version = "0.3.2";
        sha256 = "1n0h3cf2yb5rmlfd0bbxlj3r8bm4h8yffd76fqsbw3s5jm0df4wb";
        buildDepends = [ base containers lens pandoc-types ];
+       jailbreak = true;
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
@@ -94922,6 +95203,7 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        description = "TH parser generator for splitting bytestring into fixed-width fields";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95001,7 +95283,9 @@ self: {
      mkDerivation {
        pname = "partial-handler";
        version = "1.0.0.0";
+       revision = "1";
        sha256 = "1fmfiw38v77anh20xh5zzqxm2dcryyyismsagn09sc27jdgnnrzl";
+       editedCabalFile = "2e1042c8b036ba686e544bfdd1302fd9f66f377010fa05739e7fc000d97fa597";
        buildDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/partial-handler";
        description = "A composable exception handler";
@@ -95167,8 +95451,8 @@ self: {
      }:
      mkDerivation {
        pname = "path";
-       version = "0.1.0";
-       sha256 = "04yj79cw4l4zkfhmfjc382zjkmimhxm523fgq9ijn4dcj6v5z9yw";
+       version = "0.3.0";
+       sha256 = "1hxpylnbqn38biggrb18h9kva61hhpwsdsp76jbkn4kcbd3h48r4";
        buildDepends = [ base exceptions filepath template-haskell ];
        testDepends = [ base hspec HUnit mtl ];
        description = "Path";
@@ -96041,8 +96325,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.1.3";
-       sha256 = "1rw160icdny4jrbymbck2gah3ca21f49yp6zkkjq8sv5mn83dbxy";
+       version = "2.1.5";
+       sha256 = "10ln7x3i16a3mxi7j4489rbl50xi3zpjbr49y25hgk0zz7pngnkz";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
@@ -96130,8 +96414,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mongoDB";
-       version = "2.1.2.1";
-       sha256 = "130jd85h1fl5klfr369kg11w29aavl81d22w1is5dg38s0pzn76a";
+       version = "2.1.2.2";
+       sha256 = "1ppjywipfp48dsahc4mf8p9vx99937yh552kq7dhalnd1yfcbcik";
        buildDepends = [
          aeson attoparsec base bson bytestring cereal conduit containers
          monad-control mongoDB network path-pieces persistent resource-pool
@@ -96149,8 +96433,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql";
-       version = "2.1.3";
-       sha256 = "1k1sjzxz96z6pgk4012v8p4w6scgm4g2j5fs4sjgsj9azp3b7gwh";
+       version = "2.1.3.1";
+       sha256 = "1q1h3yrrpw9qzc7myfhwjxn5kxky5bxf918fyllpnprdagf98gd1";
        buildDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger mysql mysql-simple persistent resourcet
@@ -96191,8 +96475,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.1.5";
-       sha256 = "1l12kw2ylxgahy55h302dbbp59mrb3m7xwxvbcvmsnxfi7pcm2si";
+       version = "2.1.5.2";
+       sha256 = "0csmkyfjyqgi2nl8ihsnj0s4l7kyyddm0q9qpkwwm5gqjrjwk1wc";
        buildDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
@@ -96279,8 +96563,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.1.4.1";
-       sha256 = "0lwm1j7zz1zsfw70p7qwcsjlz0kmiliz2fdb2jgksxglw212nh2h";
+       version = "2.1.4.2";
+       sha256 = "0g0j8yhbr960lvph49x5knwvx86b7kxlihk8n0xvdqbaq04fgiqa";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -96303,8 +96587,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.1.3";
-       sha256 = "1b0li6hkir2rnya8ci1wcn77vxmg26i6blmxcvkdgc4jph23ca2p";
+       version = "2.1.3.1";
+       sha256 = "09qzl0wjf5h8xgs8imq9q25ik8xkn7jgpy9wpmwvsr5wichdfgk5";
        buildDepends = [
          aeson base bytestring containers ghc-prim monad-control
          monad-logger path-pieces persistent tagged template-haskell text
@@ -96591,6 +96875,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pgstream" = callPackage
+    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
+     , conduit, conduit-extra, deepseq, mtl, parallel, postgresql-binary
+     , postgresql-libpq, resource-pool, resourcet, scientific, stm
+     , stm-chans, stm-conduit, stringsearch, template-haskell, text
+     , time, transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "pgstream";
+       version = "0.1.0.3";
+       sha256 = "0zbasvi8392pa7ibd0q5072f1i7h0114v46rwhdfczsk1qzlnscg";
+       buildDepends = [
+         async attoparsec base blaze-builder bytestring conduit
+         conduit-extra deepseq mtl parallel postgresql-binary
+         postgresql-libpq resource-pool resourcet scientific stm stm-chans
+         stm-conduit stringsearch template-haskell text time transformers
+         uuid vector
+       ];
+       jailbreak = true;
+       description = "Elsen Accelerated Computing Engine";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "phantom-state" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -96931,7 +97238,9 @@ self: {
      mkDerivation {
        pname = "pipes";
        version = "4.1.5";
+       revision = "1";
        sha256 = "1c19am4dr6na9xpx4h7yngvbml0ghc1dbym8988hjhw84gq4lhfx";
+       editedCabalFile = "c23c260bff1178965d87e6fc9f7263877b5f2adc4c0e4c1bd59c55971fff9eb4";
        buildDepends = [ base mmorph mtl transformers ];
        testDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
@@ -96947,13 +97256,12 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-aeson";
-       version = "0.4.1.2";
-       sha256 = "0wacib0wf40bkm6rp2qcsrahc43g89l3icclbrshk8r54dhbazl7";
+       version = "0.4.1.3";
+       sha256 = "0c95fm4bj4y0dsar4r7n9irvhrcihylcp8k40khm2bqcad14pjjc";
        buildDepends = [
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -96965,8 +97273,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-attoparsec";
-       version = "0.5.1.1";
-       sha256 = "1ns8s3p6jh4iya71z3j81cqnrfnr4n92kblwgkjlapb23dykl2qz";
+       version = "0.5.1.2";
+       sha256 = "1qhhy86c89j6ial5y1j2lhgqx225qr33777jk8sxv021gkabsmlv";
        buildDepends = [
          attoparsec base bytestring pipes pipes-parse text transformers
        ];
@@ -96974,7 +97282,6 @@ self: {
          attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit
          text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-attoparsec";
        description = "Attoparsec and Pipes integration";
        license = stdenv.lib.licenses.bsd3;
@@ -97144,6 +97451,7 @@ self: {
          base bytestring cassava HUnit pipes pipes-bytestring test-framework
          test-framework-hunit vector
        ];
+       jailbreak = true;
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -97412,12 +97720,11 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-vector";
-       version = "0.6";
-       sha256 = "0a3q8cj05b6a6iy2gi8mp2qc6xvmwmiqvcd5i3v0kzvi3rv8fh86";
+       version = "0.6.1";
+       sha256 = "12a50i6fhvri76sr0h3fz9ds5yvnapdyx4n3rcxz2rk543mdvhsp";
        buildDepends = [
          base monad-primitive pipes primitive transformers vector
        ];
-       jailbreak = true;
        description = "Various proxies for streaming data into vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97797,12 +98104,19 @@ self: {
      }) {};
 
   "plugins-multistage" = callPackage
-    ({ mkDerivation, base, template-haskell, th-desugar }:
+    ({ mkDerivation, base, directory, ghc, process, QuickCheck, tasty
+     , tasty-quickcheck, tasty-th, template-haskell, th-desugar
+     }:
      mkDerivation {
        pname = "plugins-multistage";
-       version = "0.5.3";
-       sha256 = "1k07i4djm5givxwvh1a5h4nlhj8w71n7ajd15av534gnky0njzwc";
-       buildDepends = [ base template-haskell th-desugar ];
+       version = "0.6";
+       sha256 = "02wf1q3c65ki0hgmxsqd7x48p42hh33bx3vyjykkv69jiz1why7y";
+       buildDepends = [
+         base directory ghc process template-haskell th-desugar
+       ];
+       testDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th template-haskell
+       ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97921,17 +98235,17 @@ self: {
 
   "pointed" = callPackage
     ({ mkDerivation, base, comonad, containers, data-default-class
-     , kan-extensions, semigroupoids, semigroups, stm, tagged
-     , transformers, transformers-compat
+     , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged
+     , transformers, transformers-compat, unordered-containers
      }:
      mkDerivation {
        pname = "pointed";
-       version = "4.2";
-       sha256 = "1rwavs2vycb02d04ba8ziywsxbl6k4yqk6pnmzcx5zhnkcfqvmbm";
+       version = "4.2.0.1";
+       sha256 = "1ysif8x5vlllib3gpdd3i0kdlanlzaw1pm0sjx1qayv19m1ddph7";
        buildDepends = [
-         base comonad containers data-default-class kan-extensions
+         base comonad containers data-default-class hashable kan-extensions
          semigroupoids semigroups stm tagged transformers
-         transformers-compat
+         transformers-compat unordered-containers
        ];
        homepage = "http://github.com/ekmett/pointed/";
        description = "Pointed and copointed data";
@@ -98712,8 +99026,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-binary";
-       version = "0.5.2";
-       sha256 = "1fwh3r0f63wcwnw544jdirzsd0brslkqahn8d2iwr2jvpm5f0pqh";
+       version = "0.5.2.1";
+       sha256 = "02dzsh9d62pgrqsvjmdxyffr4cryk3sd2dg12jmygg94q5dfkm0m";
        buildDepends = [
          attoparsec base-prelude bytestring loch-th placeholders scientific
          text time transformers uuid
@@ -98722,7 +99036,6 @@ self: {
          base-prelude bytestring HTF postgresql-libpq QuickCheck
          quickcheck-instances scientific text time uuid
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
@@ -98787,6 +99100,7 @@ self: {
          old-locale postgresql-simple process text time transformers unix
          unordered-containers vector
        ];
+       jailbreak = true;
        description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98900,19 +99214,19 @@ self: {
      }) {};
 
   "postgresql-typed" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , cryptohash, haskell-src-meta, network, old-locale, parsec
-     , postgresql-binary, scientific, template-haskell, text, time
-     , utf8-string, uuid
+    ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
+     , containers, cryptohash, haskell-src-meta, network, old-locale
+     , parsec, postgresql-binary, scientific, template-haskell, text
+     , time, utf8-string, uuid
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.3.2";
-       sha256 = "0q1k5sj6q9c4mssf3z9m69fqyn9z8iz15v2b0rcc7c8x1za1kq2i";
+       version = "0.3.3";
+       sha256 = "1fj02d0v9bpdgmzp2xqmz72flhl6pyw7v03kqmwyjhkp9afd4dsh";
        buildDepends = [
-         array base binary bytestring containers cryptohash haskell-src-meta
-         network old-locale parsec postgresql-binary scientific
-         template-haskell text time utf8-string uuid
+         aeson array attoparsec base binary bytestring containers cryptohash
+         haskell-src-meta network old-locale parsec postgresql-binary
+         scientific template-haskell text time utf8-string uuid
        ];
        testDepends = [ base network time ];
        jailbreak = true;
@@ -99151,8 +99465,8 @@ self: {
      }:
      mkDerivation {
        pname = "pred-trie";
-       version = "0.1";
-       sha256 = "1dkmpdqxq919555hc8hx5qf070ginynbzb7lnmir1lnidvqi5b8i";
+       version = "0.2.0";
+       sha256 = "11d0673jhz8vb271wf0qsl8a480hzrghly07iqcmckybalr17ibs";
        buildDepends = [ base semigroups ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Predicative tries";
@@ -99415,6 +99729,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "presto-hdbc" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, convertible
+     , either, either-unwrap, errors, HDBC, HTTP, http-streams
+     , io-streams, lens, mtl, network-uri, safe, scientific, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "presto-hdbc";
+       version = "0.1.0.2";
+       sha256 = "1la8v44lw9hpfv24mh3pj9x92pkcf0v6j3w52dg765j54zz1v76y";
+       buildDepends = [
+         aeson aeson-pretty base bytestring convertible either either-unwrap
+         errors HDBC HTTP http-streams io-streams lens mtl network-uri safe
+         scientific text transformers
+       ];
+       jailbreak = true;
+       description = "An HDBC connector for Presto";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "prettify" = callPackage
     ({ mkDerivation, base, containers, semigroups }:
      mkDerivation {
@@ -99589,21 +99923,6 @@ self: {
      }) {};
 
   "primitive" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "primitive";
-       version = "0.5.4.0";
-       revision = "1";
-       sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10";
-       editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base ghc-prim ];
-       homepage = "https://github.com/haskell/primitive";
-       description = "Primitive memory-related operations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "primitive_0_6" = callPackage
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "primitive";
@@ -99879,9 +100198,9 @@ self: {
      mkDerivation {
        pname = "process-listlike";
        version = "1.0";
-       revision = "1";
+       revision = "3";
        sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r";
-       editedCabalFile = "72b239b889868394c365985197588cda0ec8aac03d4796a9e212b4044c966f16";
+       editedCabalFile = "75f8f07195965b0a2ca36725792b095896801d4e4133c7c67a72600bdbeb63b1";
        buildDepends = [ base bytestring deepseq ListLike process text ];
        jailbreak = true;
        homepage = "https://github.com/ddssff/process-listlike";
@@ -99937,8 +100256,8 @@ self: {
      }:
      mkDerivation {
        pname = "process-streaming";
-       version = "0.7.2.0";
-       sha256 = "1wlrinx5v0k26jdkmbb8k313p3nyjrn2r9nag3hryl1wfdkbr1bl";
+       version = "0.7.2.1";
+       sha256 = "118ig98xi2jdh966483d37wx5wa5mcm7qyfnrb1xszw2nqcivvvx";
        buildDepends = [
          base bifunctors bytestring conceit containers contravariant foldl
          free pipes pipes-bytestring pipes-concurrency pipes-parse
@@ -100055,9 +100374,9 @@ self: {
      mkDerivation {
        pname = "product-profunctors";
        version = "0.6.1";
-       revision = "1";
+       revision = "2";
        sha256 = "0phwjngndgsggw2f74k6q43cnnw5w4nvfrfrmkwyz6hgah2zv562";
-       editedCabalFile = "98cd3c6ac3f78d4097bd1b8c7c1782b85bd05497938ce86d70cb0eb27b09359c";
+       editedCabalFile = "ac8ac15500d9a5f4c678489d77c6abea03b24a704ceb235eecf9f49ef08da757";
        buildDepends = [ base contravariant profunctors template-haskell ];
        testDepends = [ base profunctors ];
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
@@ -100132,18 +100451,13 @@ self: {
      }) {};
 
   "profunctors" = callPackage
-    ({ mkDerivation, base, comonad, distributive, semigroupoids, tagged
-     , transformers
+    ({ mkDerivation, base, comonad, distributive, tagged, transformers
      }:
      mkDerivation {
        pname = "profunctors";
-       version = "4.4.1";
-       revision = "1";
-       sha256 = "1x5q4bc18cyxajv39xxbxzgpq75xzrhx450n8rc3p8gir92hx645";
-       editedCabalFile = "72f05aa59d302bcd53277bdff17e920bc0128e5787b2f8edf584c517cd084db7";
-       buildDepends = [
-         base comonad distributive semigroupoids tagged transformers
-       ];
+       version = "5.0.0.1";
+       sha256 = "0p9an9j387rhv6fzbvwaz91m9g5f69lhx2jr23riygprjfn8xs99";
+       buildDepends = [ base comonad distributive tagged transformers ];
        homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -100230,20 +100544,20 @@ self: {
 
   "project-template" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, conduit
-     , conduit-extra, containers, hspec, mtl, QuickCheck, resourcet
-     , system-fileio, system-filepath, text, transformers
+     , conduit-extra, containers, directory, filepath, hspec, mtl
+     , QuickCheck, resourcet, text, transformers
      }:
      mkDerivation {
        pname = "project-template";
-       version = "0.1.4.2";
-       sha256 = "10n23s6g7fv0l42hsb804z0qqcyxqw32kwzg1f0w3c6gka844akr";
+       version = "0.2.0";
+       sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf";
        buildDepends = [
          base base64-bytestring bytestring conduit conduit-extra containers
-         mtl resourcet system-fileio system-filepath text transformers
+         directory filepath mtl resourcet text transformers
        ];
        testDepends = [
          base base64-bytestring bytestring conduit containers hspec
-         QuickCheck resourcet system-filepath text transformers
+         QuickCheck resourcet text transformers
        ];
        homepage = "https://github.com/fpco/haskell-ide";
        description = "Specify Haskell project templates and generate files";
@@ -100344,20 +100658,20 @@ self: {
 
   "propellor" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , directory, filepath, hslogger, IfElse, MissingH
-     , MonadCatchIO-transformers, mtl, network, process, QuickCheck
-     , time, unix, unix-compat
+     , directory, exceptions, filepath, hslogger, IfElse, MissingH, mtl
+     , network, process, QuickCheck, time, transformers, unix
+     , unix-compat
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.3.0";
-       sha256 = "0k8yi4dh00985gb1k3l8saaf8h9q1jbw2mcr1svn7xdhnd16r1y1";
+       version = "2.4.0";
+       sha256 = "1l2zhj12jwsavljx0r6qmz44w7k5bwckwg2wcz38qd6km4wy3ppw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         ansi-terminal async base bytestring containers directory filepath
-         hslogger IfElse MissingH MonadCatchIO-transformers mtl network
-         process QuickCheck time unix unix-compat
+         ansi-terminal async base bytestring containers directory exceptions
+         filepath hslogger IfElse MissingH mtl network process QuickCheck
+         time transformers unix unix-compat
        ];
        homepage = "https://propellor.branchable.com/";
        description = "property-based host configuration management in haskell";
@@ -100575,8 +100889,8 @@ self: {
      }:
      mkDerivation {
        pname = "proton-haskell";
-       version = "0.4";
-       sha256 = "1drg50ffp9q5hqdn6h46i45y4crmb1d6j6238qdnmrdmbj1pk4zw";
+       version = "0.6";
+       sha256 = "0g73lspx5rk8d6axn229im7r8ch5d7afn8fb51haazaqmcw906qg";
        buildDepends = [ base containers directory filepath ];
        testDepends = [
          base containers directory filepath HUnit test-framework
@@ -102096,6 +102410,7 @@ self: {
        sha256 = "1v94dd9y38ayslii6bjg720dbrjg37wwm13v08g9clbazf122901";
        buildDepends = [ base bytestring lens process text ];
        testDepends = [ base bytestring lens process QuickCheck text ];
+       jailbreak = true;
        homepage = "https://www.github.com/massysett/rainbow";
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
@@ -102546,6 +102861,7 @@ self: {
          JuicyPixels lens linear mtl optparse-applicative Rasterific
          scientific svg-tree text transformers vector
        ];
+       jailbreak = true;
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102645,7 +102961,6 @@ self: {
        sha256 = "08f7cvipcdcn6s2rgf0n65g67fhkx36841dihzzsfalglfr9gn6m";
        buildDepends = [ base regex-applicative smaoin text-position ];
        testDepends = [ base QuickCheck regex-applicative smaoin ];
-       jailbreak = true;
        homepage = "http://rel4tion.org/projects/razom-text-util/";
        description = "Common text/parsing tools for Razom language packages";
        license = stdenv.lib.licenses.publicDomain;
@@ -103018,10 +103333,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "read-bounded";
-       version = "0.1.0.0";
-       sha256 = "1nvfkxjxn38rpplvg48sgx671fmfxj80dy2a77pjvm3c31q0hhqm";
+       version = "0.1.1.0";
+       sha256 = "19ynv5vxa5dnphv9kby0nfvq3wn6qpk7n5qv1x22ipkfxnxdw47k";
        buildDepends = [ base ];
        jailbreak = true;
+       homepage = "https://github.com/thomaseding/read-bounded";
        description = "Class for reading bounded values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103384,6 +103700,7 @@ self: {
          pointed semigroupoids semigroups text transformers
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/reducers/";
        description = "Semigroups, specialized containers and a general map/reduce framework";
        license = stdenv.lib.licenses.bsd3;
@@ -103476,6 +103793,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/RobotGymnast/refcount";
        description = "Container with element counts";
        license = stdenv.lib.licenses.mit;
@@ -103548,8 +103866,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "reflection";
-       version = "1.5.1.2";
-       sha256 = "09fs42gmhdgfag7k4gm19l63sz5b1sxw6s3hgszpcnnsbv1g9ad4";
+       version = "1.5.2.1";
+       sha256 = "1pynmkhdxq5vxbjs7rxiv3mg8avidxg4cnghanp75846s4s6ggg5";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
@@ -103618,6 +103936,7 @@ self: {
          semigroups text these time transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
+       jailbreak = true;
        description = "Glitch-free Functional Reactive Web Apps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103626,8 +103945,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, text }:
      mkDerivation {
        pname = "reform";
-       version = "0.2.6";
-       sha256 = "02izf5hhhwc27lza0w93n3n5sdg1f0h6njgz3vw4bv71114wfcj7";
+       version = "0.2.7";
+       sha256 = "0jjbcc88ffv6nqj0jbgb54bin0k5hh4w1i44xh3vdv00s7aj3abm";
        buildDepends = [ base containers mtl text ];
        homepage = "http://www.happstack.com/";
        description = "reform is an HTML form generation and validation library";
@@ -103638,8 +103957,8 @@ self: {
     ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }:
      mkDerivation {
        pname = "reform-blaze";
-       version = "0.2.3";
-       sha256 = "1bbmmvrprbig4ic1vq8jjhb4nxxkn0a4dxxaa62i02ms3wb1vsf5";
+       version = "0.2.4";
+       sha256 = "124hvgjhb2x6769qnwwjw30qmramh54pmggpqmj0dc8m473psfjy";
        buildDepends = [ base blaze-html blaze-markup reform text ];
        homepage = "http://www.happstack.com/";
        description = "Add support for using blaze-html with Reform";
@@ -103653,6 +103972,7 @@ self: {
        version = "0.0.4";
        sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg";
        buildDepends = [ base blaze-markup reform shakespeare text ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Add support for using Hamlet with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -103664,24 +103984,23 @@ self: {
      }:
      mkDerivation {
        pname = "reform-happstack";
-       version = "0.2.4";
-       sha256 = "0igyvf8a0dd8376khzsssr6bjp3m224rrynm1ws4slxq9h3dklqn";
+       version = "0.2.5";
+       sha256 = "12asmp1bklk33rpbhwhpbvmnkssjll92l47qxywibnpdf0zc6xsc";
        buildDepends = [
          base bytestring happstack-server mtl random reform text utf8-string
        ];
-       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Happstack support for reform";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "reform-hsp" = callPackage
-    ({ mkDerivation, base, hsp, reform, text }:
+    ({ mkDerivation, base, hsp, hsx2hs, reform, text }:
      mkDerivation {
        pname = "reform-hsp";
-       version = "0.2.5";
-       sha256 = "0fq4g2v22nsqby72sasr15hs02rl97n8j85v9lgirw1jk2mbsqar";
-       buildDepends = [ base hsp reform text ];
+       version = "0.2.6";
+       sha256 = "0aigsrax7s5ys0w2kd52jqi3453q81f4yp6c1s84a383yqndyq1j";
+       buildDepends = [ base hsp hsx2hs reform text ];
        homepage = "http://www.happstack.com/";
        description = "Add support for using HSP with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -104597,7 +104916,6 @@ self: {
        buildDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
-       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "High performance, regular, shape polymorphic parallel arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -104702,7 +105020,6 @@ self: {
          template-haskell vector
        ];
        extraLibraries = [ llvm ];
-       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Examples using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
@@ -104867,6 +105184,7 @@ self: {
          functor-monadic ListLike listsafe monad-loops mtl numericpeano
          parsec semigroupoids system-filepath text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/ombocomp/repl-toolkit";
        description = "Toolkit for quickly whipping up config files and command-line interfaces";
        license = stdenv.lib.licenses.asl20;
@@ -105559,6 +105877,7 @@ self: {
          base data-default-class exceptions hspec HUnit QuickCheck time
          transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/Soostone/retry";
        description = "Retry combinators for monadic actions that may fail";
        license = stdenv.lib.licenses.bsd3;
@@ -105964,6 +106283,7 @@ self: {
        testDepends = [
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       jailbreak = true;
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -105998,8 +106318,8 @@ self: {
      }:
      mkDerivation {
        pname = "robots-txt";
-       version = "0.4.1.2";
-       sha256 = "0lqws8c8qjw7gakyp5ridp1khjhvv0na44rakbh6nhycykvnnfkv";
+       version = "0.4.1.3";
+       sha256 = "051ibkbhqlpimajj8gl0m468rs6qhlgs15f5bcrhlngfs20jbfkq";
        buildDepends = [ attoparsec base bytestring old-locale time ];
        testDepends = [
          attoparsec base bytestring directory heredoc hspec QuickCheck
@@ -107126,7 +107446,7 @@ self: {
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
-     , QuickCheck, saltine, libsodium, tasty, tasty-quickcheck
+     , QuickCheck, saltine, sodium, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "saltine-quickcheck";
@@ -107138,12 +107458,12 @@ self: {
        testDepends = [
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
-       extraLibraries = [ libsodium ];
+       extraLibraries = [ sodium ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libsodium;};
+     }) { sodium = null;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
@@ -107791,6 +108111,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "schedule-planner" = callPackage
+    ({ mkDerivation, base, containers, happstack-lite, json, mtl
+     , options, transformers
+     }:
+     mkDerivation {
+       pname = "schedule-planner";
+       version = "0.1.0.2";
+       sha256 = "0xpn5jgdbzkwysnjlzmvnrvk55wsffx9zbxd6hi1av4nbqz2269r";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base containers happstack-lite json mtl options transformers
+       ];
+       description = "Find the ideal lesson layout";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "schedyield" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -107869,6 +108206,7 @@ self: {
          aeson base bytestring directory filepath process scholdoc
          scholdoc-types temporary text yaml
        ];
+       jailbreak = true;
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
@@ -108514,7 +108852,6 @@ self: {
          base primitive QuickCheck storable-complex test-framework
          test-framework-quickcheck2 vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/adamwalker/sdr";
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
@@ -108569,6 +108906,7 @@ self: {
          base ghc-prim profunctors semigroupoids tagged transformers
        ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/search/";
        description = "Infinite search in finite time with Hilbert's epsilon";
        license = stdenv.lib.licenses.bsd3;
@@ -108859,34 +109197,32 @@ self: {
      }) {};
 
   "semigroupoid-extras" = callPackage
-    ({ mkDerivation, base, semigroupoids }:
+    ({ mkDerivation, base, profunctors, semigroupoids }:
      mkDerivation {
        pname = "semigroupoid-extras";
-       version = "4.0";
-       sha256 = "07aa7z4nywcrp9msq83b1pcmryl25yxha89sn5vwlgq40cibcm3g";
-       buildDepends = [ base semigroupoids ];
+       version = "5";
+       sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh";
+       buildDepends = [ base profunctors semigroupoids ];
        homepage = "http://github.com/ekmett/semigroupoid-extras";
-       description = "This package has been absorbed into semigroupoids 4.0";
+       description = "Semigroupoids that depend on PolyKinds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoids" = callPackage
-    ({ mkDerivation, base, comonad, containers, contravariant
-     , distributive, doctest, Glob, semigroups, transformers
-     , transformers-compat
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad
+     , containers, contravariant, directory, distributive, doctest
+     , filepath, semigroups, tagged, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "semigroupoids";
-       version = "4.3";
-       revision = "1";
-       sha256 = "1qn0rffc1zskk6f34pxrp96iarxgp36l2404rs6sz9khl1hh58sf";
-       editedCabalFile = "564644e3fb93fa01f5c45772256a980baa07275a763f1015859816942ab210b3";
+       version = "5.0.0.1";
+       sha256 = "0njand5df3ri7pr0jd12z7dfvcfw6xdm7z5ap0b4xcpy47ndcw8l";
        buildDepends = [
-         base comonad containers contravariant distributive semigroups
-         transformers transformers-compat
+         base base-orphans bifunctors comonad containers contravariant
+         distributive semigroups tagged transformers transformers-compat
        ];
-       testDepends = [ base doctest Glob ];
+       testDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
@@ -109218,8 +109554,8 @@ self: {
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
        pname = "sequence";
-       version = "0.9.6";
-       sha256 = "0qn224369bwmdcq3z1j8rpcw4mcvgyh1sp427dx0yncp9d0srqcs";
+       version = "0.9.7";
+       sha256 = "1q2v51dxi21jbq7ll7g1x85pxxz7bywgsqrwfrgzf0p96da05ps7";
        buildDepends = [ base containers transformers ];
        homepage = "https://github.com/atzeus/sequence";
        description = "A type class for sequences and various sequence data structures";
@@ -110124,22 +110460,21 @@ self: {
   "shakespeare" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
-     , process, system-fileio, system-filepath, template-haskell, text
-     , time, transformers
+     , process, template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "shakespeare";
-       version = "2.0.4.1";
-       sha256 = "0z3aw13kjknrb0r15jffvc4b2aj89r1zl83ighs2cv318dd89qzi";
+       version = "2.0.5";
+       sha256 = "0jdmmrglzqzpj4cfiyab3kfr0vlz1rfc893nrq94b1rg4vwh1zzh";
        buildDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim parsec process system-fileio system-filepath
-         template-haskell text time transformers
+         exceptions ghc-prim parsec process template-haskell text time
+         transformers
        ];
        testDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim hspec HUnit parsec process system-fileio
-         system-filepath template-haskell text time transformers
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
        ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
@@ -110255,6 +110590,7 @@ self: {
          base bytestring hsc2hs QuickCheck test-framework
          test-framework-quickcheck2 unix
        ];
+       jailbreak = true;
        description = "A circular buffer built on shared memory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111790,6 +112126,7 @@ self: {
        testDepends = [
          base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/slave-thread";
        description = "A principal solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
@@ -112220,10 +112557,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap";
-       version = "0.14.0.2";
-       revision = "2";
-       sha256 = "1yv1snkibsqd7cdxyqi7c8gvnv1hzzhw5jlk19kps526n5xvay7r";
-       editedCabalFile = "27e804d1f6070f0899ad3770dfded3db1b6ce44309b28c33f11701edcfe6428a";
+       version = "0.14.0.3";
+       sha256 = "0v493iicmk4pg97bv4rr0kvrxvsvhizc9wylxbrqrn3q979bahas";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112414,7 +112749,9 @@ self: {
      mkDerivation {
        pname = "snap-extras";
        version = "0.11";
+       revision = "1";
        sha256 = "1s6qdl149x22six61kgm7xnqfyys8z7zh0waajmzip1q4ivxqnij";
+       editedCabalFile = "b0332fedd9b65e483e28c08dc1e76473dc4ab7cee457c69195069aca91d24c46";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112428,7 +112765,6 @@ self: {
          base bytestring containers QuickCheck snap-core tasty tasty-hunit
          tasty-quickcheck
        ];
-       jailbreak = true;
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112993,7 +113329,9 @@ self: {
      mkDerivation {
        pname = "snaplet-postgresql-simple";
        version = "0.6.0.2";
+       revision = "1";
        sha256 = "0xx69x9mkv6xyd7arnip12zzyq7hdcqbypgypalgsj6vcjb8i4mp";
+       editedCabalFile = "35658dea054cbb2db7cb63fbe81a4a7c546f80645a056f357baf29e94096d21b";
        buildDepends = [
          base bytestring clientsession configurator errors lens
          MonadCatchIO-transformers mtl postgresql-simple
@@ -113670,6 +114008,7 @@ self: {
          base containers grid MonadRandom QuickCheck random test-framework
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/mhwombat/som";
        description = "Self-Organising Maps";
        license = stdenv.lib.licenses.bsd3;
@@ -115111,6 +115450,7 @@ self: {
          base profunctors tagged template-haskell transformers
        ];
        testDepends = [ base template-haskell ];
+       jailbreak = true;
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
@@ -115243,8 +115583,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-install";
-       version = "0.1.0.3";
-       sha256 = "1m9y6xvh1gzivvx9n69m1qdawmbshb05xm7dw3d5wpbrrc9axg4m";
+       version = "0.1.1.1";
+       sha256 = "0xdqd1q1xy0qax4c2dn1qa0qphvq01xy3wzdp7rr2xnd23ikmbs6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -115257,21 +115597,43 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-metadata" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal
+     , conduit, containers, cryptohash, directory, filepath, http-client
+     , http-client-tls, pretty, resourcet, stackage-install
+     , stackage-update, tar, text, transformers, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "stackage-metadata";
+       version = "0.3.0.0";
+       sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base base16-bytestring bytestring Cabal conduit containers
+         cryptohash directory filepath http-client http-client-tls pretty
+         resourcet stackage-install stackage-update tar text transformers
+         yaml zlib
+       ];
+       homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool";
+       description = "Grab current metadata for all packages";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-sandbox" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit-combinators
-     , conduit-extra, filepath, optparse-applicative, process
-     , stackage-cli, system-fileio, system-filepath, text
+     , conduit-extra, directory, filepath, optparse-applicative, process
+     , stackage-cli, text
      }:
      mkDerivation {
        pname = "stackage-sandbox";
-       version = "0.1.1";
-       sha256 = "1xdf1izk8a610g5jzmq3fhx5myld1lfmzd9hfjlqyvwjc76w36g5";
+       version = "0.1.3";
+       sha256 = "0nkar4nax7h7hp5lmwi98inzy5pyg9sr819rhf78c27vjdmimrjr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          attoparsec base bytestring conduit-combinators conduit-extra
-         filepath optparse-applicative process stackage-cli system-fileio
-         system-filepath text
+         directory filepath optparse-applicative process stackage-cli text
        ];
        homepage = "https://www.stackage.org/package/stackage-sandbox";
        description = "Work with shared stackage sandboxes";
@@ -115280,22 +115642,21 @@ self: {
 
   "stackage-setup" = callPackage
     ({ mkDerivation, aeson, base, bytestring, classy-prelude-conduit
-     , cryptohash, cryptohash-conduit, filepath, http-client-tls
-     , http-conduit, http-types, optparse-applicative, process
-     , stackage-cli, system-fileio, system-filepath, text
-     , unordered-containers, yaml
+     , cryptohash, cryptohash-conduit, directory, filepath
+     , http-client-tls, http-conduit, http-types, optparse-applicative
+     , process, stackage-cli, text, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "stackage-setup";
-       version = "0.0.1";
-       sha256 = "1db527g3wk154rr1vsi6fv2lvh4cyfgab02ghvmmshgrjj3iypkw";
+       version = "0.0.2";
+       sha256 = "1101sb822v42zjjgabn4s80qyvn6nvzkfagaxpzjm6dp5svl3biv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bytestring classy-prelude-conduit cryptohash
-         cryptohash-conduit filepath http-client-tls http-conduit http-types
-         optparse-applicative process stackage-cli system-fileio
-         system-filepath text unordered-containers yaml
+         cryptohash-conduit directory filepath http-client-tls http-conduit
+         http-types optparse-applicative process stackage-cli text
+         unordered-containers yaml
        ];
        homepage = "https://www.stackage.org/package/stackage-setup";
        description = "An executable for downloading a Haskell setup";
@@ -115304,15 +115665,16 @@ self: {
 
   "stackage-types" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
-     , hashable, semigroups, text, time, unordered-containers, vector
+     , hashable, safe, semigroups, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "stackage-types";
-       version = "1.0.1";
-       sha256 = "0dgxkpx97ndmc9m46ql5chsg42f3ibzzqj0brh89xc5dvd5gdhhd";
+       version = "1.0.1.1";
+       sha256 = "0zffk8rc611nm5zl53fynz8ly4mzrqx9cjyfwrw07j9mdwi21dsz";
        buildDepends = [
-         aeson base Cabal containers exceptions hashable semigroups text
-         time unordered-containers vector
+         aeson base Cabal containers exceptions hashable safe semigroups
+         text time unordered-containers vector
        ];
        homepage = "https://github.com/fpco/stackage-types";
        description = "Shared data types between various Stackage packages";
@@ -115323,8 +115685,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
        pname = "stackage-update";
-       version = "0.1.1.3";
-       sha256 = "01f9809scpkix54w0yfw4yjf1aak4y612bq7mjn1j573s10xa2iy";
+       version = "0.1.2";
+       sha256 = "1lw30fvscnb3n29lavw16am41adrvby1v2vbh7yykbr80pkb3hvj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath process ];
@@ -115447,6 +115809,7 @@ self: {
        sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1";
        buildDepends = [ base mtl ];
        testDepends = [ base checkers mtl QuickCheck ];
+       jailbreak = true;
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115561,6 +115924,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "14zglnvlra4p85zc4vkgwrpfjf7mrz9dw4ppi369vsfwnw2sgwkq";
        buildDepends = [ base double-conversion free mtl text ];
+       jailbreak = true;
        homepage = "https://github.com/jeffreyrosenbluth/static-canvas";
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
@@ -116001,6 +116365,7 @@ self: {
          base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude
          placeholders primitive QuickCheck transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
@@ -116456,8 +116821,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-commons";
-       version = "0.1.12";
-       sha256 = "1scqajmi3zp1088kc8nfzmzm8831idc4m0d5sck5mhav9xcmx7sy";
+       version = "0.1.12.1";
+       sha256 = "1msg18bvz1cxfh745m3jgxf65x7jncqwwpfi538x24qsn788vgfm";
        buildDepends = [
          array base blaze-builder bytestring directory network process
          random stm text transformers unix zlib
@@ -116509,6 +116874,7 @@ self: {
        buildDepends = [
          adjunctions base comonad distributive semigroupoids semigroups
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/streams/issues";
        description = "Various Haskell 2010 stream comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -116908,7 +117274,6 @@ self: {
          base geniplate language-haskell-extract mtl pretty QuickCheck safe
          testing-feat
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/danr/structural-induction";
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.gpl3;
@@ -117375,6 +117740,7 @@ self: {
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
        ];
+       jailbreak = true;
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118224,15 +118590,15 @@ self: {
      }:
      mkDerivation {
        pname = "system-fileio";
-       version = "0.3.16.2";
-       sha256 = "17mk1crlgrh9c9lfng6a2fdk49m2mbkkdlq5iysl1rzwkn12mmkd";
+       version = "0.3.16.3";
+       sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
        buildDepends = [ base bytestring system-filepath text time unix ];
        testDepends = [
          base bytestring chell system-filepath temporary text time
          transformers unix
        ];
        homepage = "https://github.com/fpco/haskell-filesystem";
-       description = "Consistent filesystem interaction across GHC versions";
+       description = "Consistent filesystem interaction across GHC versions (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -118242,14 +118608,14 @@ self: {
      }:
      mkDerivation {
        pname = "system-filepath";
-       version = "0.4.13.3";
-       sha256 = "1j6fk1d3qrc2dn4kzwar9z3malrhx2mc6jjvlq9wiqyyx5gs3yyj";
+       version = "0.4.13.4";
+       sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l";
        buildDepends = [ base bytestring deepseq text ];
        testDepends = [
          base bytestring chell chell-quickcheck QuickCheck text
        ];
        homepage = "https://github.com/fpco/haskell-filesystem";
-       description = "High-level, byte-based file and directory path manipulations";
+       description = "High-level, byte-based file and directory path manipulations (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -118514,6 +118880,7 @@ self: {
          base containers directory doctest filepath lens transformers
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/tables/";
        description = "In-memory storage with multiple keys using lenses and traversals";
        license = stdenv.lib.licenses.bsd3;
@@ -118658,16 +119025,12 @@ self: {
      }) {};
 
   "tagged-binary" = callPackage
-    ({ mkDerivation, base, binary, bytestring, data-default, pureMD5
-     , spoon
-     }:
+    ({ mkDerivation, base, binary, bytestring, pureMD5 }:
      mkDerivation {
        pname = "tagged-binary";
-       version = "0.1.2.0";
-       sha256 = "1ci2dgqix1r9x4k77igv367r3z1qphd906cg1mxfw92mq61m7f0w";
-       buildDepends = [
-         base binary bytestring data-default pureMD5 spoon
-       ];
+       version = "0.2.0.0";
+       sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm";
+       buildDepends = [ base binary bytestring pureMD5 ];
        description = "Provides tools for serializing data tagged with type information";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118736,6 +119099,7 @@ self: {
          base comonad contravariant distributive exceptions mtl reflection
          semigroupoids tagged
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/tagged-transformer";
        description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -119318,10 +119682,9 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-program";
-       version = "1.0.2";
-       sha256 = "0ii7jcmvmbw03r1ghm2bq9bmbs7w0jqgfc7qx34n45ymjy7ipc55";
+       version = "1.0.3";
+       sha256 = "18q6b8z5hh1jybr9i72ark95hwz8kg6zbh40ghgwsf6n3ijyfn8n";
        buildDepends = [ base deepseq directory filepath process tasty ];
-       jailbreak = true;
        homepage = "https://github.com/jstolarek/tasty-program";
        description = "Use tasty framework to test whether a program executes correctly";
        license = stdenv.lib.licenses.bsd3;
@@ -119367,8 +119730,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-silver";
-       version = "3.1.5";
-       sha256 = "09mgk5pklmwxhr6r3lfmcdd09fzwn00x1vbyy93gh7wbpcpfa8dv";
+       version = "3.1.7";
+       sha256 = "1mplisyhps9n3kw2w3fjanc14cr6vbyr4xdydq76za9dmx07kd3l";
        buildDepends = [
          ansi-terminal async base bytestring containers deepseq directory
          filepath mtl optparse-applicative process process-extras regex-tdfa
@@ -119379,7 +119742,7 @@ self: {
          transformers
        ];
        homepage = "https://github.com/phile314/tasty-silver";
-       description = "Golden tests support for tasty. Fork of tasty-golden.";
+       description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -119584,19 +119947,21 @@ self: {
      }) {};
 
   "tellbot" = callPackage
-    ({ mkDerivation, base, bifunctors, containers, errors, http-conduit
-     , mtl, network, regex-posix, split, time, transformers
+    ({ mkDerivation, base, bifunctors, bytestring, containers, errors
+     , http-conduit, mtl, network, regex-posix, split, tagsoup, text
+     , time, transformers
      }:
      mkDerivation {
        pname = "tellbot";
-       version = "0.5.1.2";
-       sha256 = "1w5byb09gv61qagqb2l16y93zlwvv1wfjlvc4xm6mi91xviyihkc";
+       version = "0.5.1.4";
+       sha256 = "0mm7yyyxs3dvqsrs1xd4mq7byfn55rwri26k9xq3l4k9v7sxbgx8";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bifunctors containers errors http-conduit mtl network
-         regex-posix split time transformers
+         base bifunctors bytestring containers errors http-conduit mtl
+         network regex-posix split tagsoup text time transformers
        ];
+       jailbreak = true;
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -120364,6 +120729,7 @@ self: {
        sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka";
        buildDepends = [ base mtl QuickCheck state-plus template-haskell ];
        testDepends = [ base executable-path mtl process QuickCheck ];
+       jailbreak = true;
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120424,6 +120790,7 @@ self: {
        version = "2.1.3.0";
        sha256 = "1rq5d64d7j3gpgbfxmfr4xmzizjy0ricw5ghrakv8gzvxmi2bn4p";
        buildDepends = [ base containers HUnit mtl QuickCheck random ];
+       jailbreak = true;
        homepage = "https://github.com/jgoerzen/testpack";
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
@@ -120540,8 +120907,8 @@ self: {
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.0.4";
-       sha256 = "004p1c74crs8wmjafwsmw3mmycspq1j8fpm1lvfpq6acha7bnpc6";
+       version = "1.2.0.6";
+       sha256 = "0wvgynm76pb69wzlpys6l8j8ac4j43gas1anqbsg5ldlfvl85zfq";
        buildDepends = [
          array base bytestring deepseq ghc-prim integer-gmp
        ];
@@ -120812,21 +121179,24 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp
-     , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text
+    ({ mkDerivation, array, base, base-compat, base-orphans, bytestring
+     , bytestring-builder, ghc-prim, hspec, integer-gmp, nats
+     , QuickCheck, quickcheck-instances, semigroups, tagged
+     , template-haskell, text, transformers, transformers-compat, void
      }:
      mkDerivation {
        pname = "text-show";
-       version = "0.7.0.1";
-       sha256 = "1qmvnni69dkxdjay387qxnvy1j4cffnw5igdgqbaqvrm0cgkkg4a";
+       version = "0.8.1.1";
+       sha256 = "130nqg0fgvnzi5zl0c0cwxjm2jppjmxm9z04g0rv498cl783ag45";
        buildDepends = [
-         array base bytestring ghc-prim integer-gmp semigroups
-         template-haskell text
+         array base base-compat bytestring bytestring-builder ghc-prim
+         integer-gmp nats semigroups tagged template-haskell text
+         transformers void
        ];
        testDepends = [
-         array base bytestring ghc-prim QuickCheck quickcheck-instances
-         tasty tasty-hunit tasty-quickcheck text
+         array base base-compat base-orphans bytestring bytestring-builder
+         ghc-prim hspec nats QuickCheck quickcheck-instances tagged text
+         transformers transformers-compat void
        ];
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
@@ -120859,6 +121229,7 @@ self: {
          text-show time transformers transformers-compat unix
          unordered-containers utf8-string vector xhtml
        ];
+       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
@@ -121251,6 +121622,7 @@ self: {
          base bytestring containers directory doctest filepath QuickCheck
          template-haskell text vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/bennofs/th-lift-instances/";
        description = "Lift instances for template-haskell for common data types";
        license = stdenv.lib.licenses.bsd3;
@@ -121263,8 +121635,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-orphans";
-       version = "0.11.1";
-       sha256 = "111ckvvicr953aqnnkn7rn089dprz57h95cg95rs7f1zz318h2xy";
+       version = "0.12.0";
+       sha256 = "0dgbk8w81k8d5a9y4nq7h2rz6rvz3vhc0bs0vff7c0iiaglgajvp";
        buildDepends = [
          base mtl nats template-haskell th-lift th-reify-many
        ];
@@ -121644,25 +122016,22 @@ self: {
      }) {};
 
   "threepenny-gui" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec-enumerator, base
-     , bytestring, containers, data-default, deepseq, filepath, hashable
-     , MonadCatchIO-transformers, network-uri, safe, snap-core
-     , snap-server, stm, template-haskell, text, time, transformers
-     , unordered-containers, utf8-string, vault, vector, websockets
-     , websockets-snap
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , data-default, deepseq, filepath, hashable, network-uri, safe
+     , snap-core, snap-server, stm, template-haskell, text, transformers
+     , unordered-containers, vault, vector, websockets, websockets-snap
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.6.0.1";
-       sha256 = "1pivjwz9i3phi6ja4b47mwbh3gscql4z14vxw5s6imhy3pzbr99r";
+       version = "0.6.0.2";
+       sha256 = "0ghcf6p7i39ss63snmk6hn20cw4hyi3agr05rdh7n60fyf9afs4c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson async attoparsec-enumerator base bytestring containers
-         data-default deepseq filepath hashable MonadCatchIO-transformers
-         network-uri safe snap-core snap-server stm template-haskell text
-         time transformers unordered-containers utf8-string vault vector
-         websockets websockets-snap
+         aeson async base bytestring containers data-default deepseq
+         filepath hashable network-uri safe snap-core snap-server stm
+         template-haskell text transformers unordered-containers vault
+         vector websockets websockets-snap
        ];
        homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
@@ -121852,8 +122221,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.4.30";
-       sha256 = "1awc2xgq4vn8nnfij3cnklcayh9d4khwpldm75jbghqi75921jni";
+       version = "0.4.32";
+       sha256 = "1vb3ziin58gxf8jpjgv1c04bqa0vhkmib4h3v2s1k66gdkj1sxk2";
        buildDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
@@ -122795,6 +123164,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tokenify" = callPackage
+    ({ mkDerivation, base, containers, text }:
+     mkDerivation {
+       pname = "tokenify";
+       version = "0.1.0.0";
+       revision = "2";
+       sha256 = "0a75bk0ykmgpwh60whawqw6d2p195w5m140l5shq1v949l1d5m7x";
+       editedCabalFile = "32816d10d3cc2d7c15a68a3001a7e080682d3d611b3dabb7cc6b07bffed20f2f";
+       buildDepends = [ base containers text ];
+       jailbreak = true;
+       homepage = "https://github.com/AKST/tokenify";
+       description = "A regex based LR tokenizer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tokenize" = callPackage
     ({ mkDerivation, base, split, text }:
      mkDerivation {
@@ -123985,8 +124369,8 @@ self: {
     ({ mkDerivation, base, eventloop }:
      mkDerivation {
        pname = "twentefp-eventloop-trees";
-       version = "0.1.0.1";
-       sha256 = "1zbpxmi5n9ckmpxk8k3xlgjk0p9gw4ffa5yzd50x7ns1l8af8s5m";
+       version = "0.1.1.0";
+       sha256 = "1zn3bz2119jcyangs7mi2s9wcjkqgk54vwg6rfcbfg37m1v1ixy4";
        buildDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
@@ -124145,6 +124529,7 @@ self: {
          aeson base bytestring Cabal http-client http-client-tls network-uri
          text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/markandrus/twilio-haskell";
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -125276,7 +125661,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uhc-util" = callPackage
@@ -126190,14 +126574,11 @@ self: {
     ({ mkDerivation, array, base, mtl, unix }:
      mkDerivation {
        pname = "unlambda";
-       version = "0.1.3";
-       revision = "1";
-       sha256 = "0clcpkhg23a7ma72rjjpl2w8jpg2mdn4rgm3vf0vqr7lbyma1h89";
-       editedCabalFile = "fa5648fb982ec7670fcd4ace6fa9f01d26b0c81641f4e3d1e31edbd49dd6bbe4";
+       version = "0.1.4.1";
+       sha256 = "01v0cl540gwc8j3x6q9gc7bvdcm9f843qbbk15llw9ik2dfm5987";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base mtl unix ];
-       jailbreak = true;
        description = "Unlambda interpreter";
        license = "GPL";
      }) {};
@@ -126714,16 +127095,17 @@ self: {
      }) {};
 
   "urlpath" = callPackage
-    ({ mkDerivation, base, hspec, mtl, QuickCheck, quickcheck-instances
-     , text, transformers
+    ({ mkDerivation, base, hspec, monoid-subclasses, mtl, QuickCheck
+     , quickcheck-instances, text, transformers
      }:
      mkDerivation {
        pname = "urlpath";
-       version = "0.2";
-       sha256 = "0rbw76m9d1gr0zc7wppzdad5nnwdrg2g5v54lc7hxk5wk53pran1";
-       buildDepends = [ base mtl transformers ];
+       version = "2.1.0";
+       sha256 = "1q8zj228ln9xmr3r0ggv6pi074l8ixchn81mw8664jikf2pjcqq9";
+       buildDepends = [ base monoid-subclasses mtl transformers ];
        testDepends = [
-         base hspec mtl QuickCheck quickcheck-instances text transformers
+         base hspec monoid-subclasses mtl QuickCheck quickcheck-instances
+         text transformers
        ];
        description = "Painfully simple URL writing combinators";
        license = stdenv.lib.licenses.mit;
@@ -126959,25 +127341,12 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base utf8-string ];
+       jailbreak = true;
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "utf8-string" = callPackage
-    ({ mkDerivation, base, bytestring }:
-     mkDerivation {
-       pname = "utf8-string";
-       version = "0.3.8";
-       revision = "2";
-       sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0";
-       editedCabalFile = "0555d720026fff65342bdc500391ffd300858b6f2c6db441d4dd1eafbcb599ff";
-       buildDepends = [ base bytestring ];
-       homepage = "http://github.com/glguy/utf8-string/";
-       description = "Support for reading and writing UTF8 Strings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "utf8-string_1" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "utf8-string";
@@ -127069,12 +127438,8 @@ self: {
      }:
      mkDerivation {
        pname = "uu-options";
-       version = "0.1.0.2";
-       revision = "1";
-       sha256 = "0cbf0ckq8z7lqziip7znfwa4vmqfsgmg7phrc3r68z2hpinw73zy";
-       editedCabalFile = "25f112bb1de34b05c01588e982a1ce61225ede0e18d569c5dea91518589e0149";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.0";
+       sha256 = "11gixk6lxsakcdxir9jla5nk71phmlzd9hxp8wq23n550xw91ij6";
        buildDepends = [
          base lenses mtl template-haskell transformers uu-interleaved
          uu-parsinglib
@@ -127863,6 +128228,7 @@ self: {
          base QuickCheck random template-haskell test-framework
          test-framework-quickcheck2 transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -128717,6 +129083,7 @@ self: {
          array base bytestring containers data-default directory filepath
          mtl QuickCheck random regex-base stm text time unix vector vty
        ];
+       jailbreak = true;
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
@@ -128787,23 +129154,22 @@ self: {
      , blaze-markup, byteable, bytestring, containers, cryptohash
      , cryptohash-conduit, directory, file-embed, filepath, hspec
      , http-date, http-types, mime-types, network, old-locale
-     , optparse-applicative, system-fileio, system-filepath
-     , template-haskell, text, time, transformers, unix-compat
-     , unordered-containers, wai, wai-extra, warp, zlib
+     , optparse-applicative, template-haskell, text, time, transformers
+     , unix-compat, unordered-containers, wai, wai-extra, warp, zlib
      }:
      mkDerivation {
        pname = "wai-app-static";
-       version = "3.0.1.1";
-       sha256 = "1zji4zisclycpyg28shwk96zmhmlvwiwz057dd4wf3w35sdklx7y";
+       version = "3.1.0";
+       sha256 = "0zajsav11v5r6c5k2ls1cfc6bz1zalasxpl03hvh5fww5f1vn9iq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base base64-bytestring blaze-builder blaze-html blaze-markup
          byteable bytestring containers cryptohash cryptohash-conduit
          directory file-embed filepath http-date http-types mime-types
-         old-locale optparse-applicative system-fileio system-filepath
-         template-haskell text time transformers unix-compat
-         unordered-containers wai wai-extra warp zlib
+         old-locale optparse-applicative template-haskell text time
+         transformers unix-compat unordered-containers wai wai-extra warp
+         zlib
        ];
        testDepends = [
          base bytestring hspec http-date http-types mime-types network
@@ -129245,23 +129611,22 @@ self: {
      , blaze-builder, bytestring, case-insensitive, clientsession
      , containers, cookie, gitrev, http-client, http-client-tls
      , http-reverse-proxy, http-types, optparse-applicative, resourcet
-     , template-haskell, text, time, transformers, unix-compat, wai
-     , wai-app-static, warp
+     , template-haskell, text, time, transformers, unix-compat, vault
+     , wai, wai-app-static, warp
      }:
      mkDerivation {
        pname = "wai-middleware-crowd";
-       version = "0.1.0.0";
-       sha256 = "15wgnbsw47jqncz2zl9clsa6nbaya019sapmgj3d9yl1rqdzkaqy";
+       version = "0.1.1.1";
+       sha256 = "1lkdjfp7aq61hzh9y13bqk9qgfr6s3m7n13ar73gjv5k2g97fizj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          authenticate base base64-bytestring binary blaze-builder bytestring
          case-insensitive clientsession containers cookie gitrev http-client
          http-client-tls http-reverse-proxy http-types optparse-applicative
-         resourcet template-haskell text time transformers unix-compat wai
-         wai-app-static warp
+         resourcet template-haskell text time transformers unix-compat vault
+         wai wai-app-static warp
        ];
-       jailbreak = true;
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -129428,21 +129793,21 @@ self: {
      }) {};
 
   "wai-middleware-throttle" = callPackage
-    ({ mkDerivation, base, bytestring, containers, haddock, hlint
-     , hspec, http-types, HUnit, network, process, regex-compat, stm
-     , token-bucket, transformers, wai, wai-extra
+    ({ mkDerivation, base, bytestring, containers, hlint, hspec
+     , http-types, HUnit, network, stm, token-bucket, transformers, wai
+     , wai-extra
      }:
      mkDerivation {
        pname = "wai-middleware-throttle";
-       version = "0.2.0.0";
-       sha256 = "1dnpx3byb1q8g41kj55qgw6vrjm4rv4sa6qbd12pafwabcgx4l74";
+       version = "0.2.0.1";
+       sha256 = "08qxdcbn1lg9rd2rcp10iri1maamn5cily9mbg1r65h8ivdmrdan";
        buildDepends = [
          base containers http-types network stm token-bucket transformers
          wai
        ];
        testDepends = [
-         base bytestring haddock hlint hspec http-types HUnit process
-         regex-compat stm transformers wai wai-extra
+         base bytestring hlint hspec http-types HUnit stm transformers wai
+         wai-extra
        ];
        description = "WAI Middleware for Request Throttling";
        license = stdenv.lib.licenses.bsd3;
@@ -130139,18 +130504,18 @@ self: {
      }) {};
 
   "web-routes" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, ghc-prim
-     , http-types, HUnit, mtl, parsec, QuickCheck, split, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, base, blaze-builder, bytestring, exceptions
+     , ghc-prim, http-types, HUnit, mtl, parsec, QuickCheck, split
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
      , test-framework-th, text, utf8-string
      }:
      mkDerivation {
        pname = "web-routes";
-       version = "0.27.8";
-       sha256 = "1nz7nny333miap44yrdzn711g4xgr2c9nd0ivm0q02692684craq";
+       version = "0.27.9";
+       sha256 = "1azccgcnksz4c4pm1nayvjiq3m192zz21cnc0fm89hdixvqck346";
        buildDepends = [
-         base blaze-builder bytestring ghc-prim http-types mtl parsec split
-         text utf8-string
+         base blaze-builder bytestring exceptions ghc-prim http-types mtl
+         parsec split text utf8-string
        ];
        testDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -130164,8 +130529,8 @@ self: {
     ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }:
      mkDerivation {
        pname = "web-routes-boomerang";
-       version = "0.28.3";
-       sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn";
+       version = "0.28.4";
+       sha256 = "0ailw4s0c1f054q58dwylq1g1f043vw4ywk0spg5d3sk9asy8bxh";
        buildDepends = [ base boomerang mtl parsec text web-routes ];
        description = "Library for maintaining correctness and composability of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
@@ -130190,8 +130555,8 @@ self: {
     ({ mkDerivation, base, hsp, text, web-routes }:
      mkDerivation {
        pname = "web-routes-hsp";
-       version = "0.24.5";
-       sha256 = "1vnsdsipm764maqn43774vw5hn64vvaaih8gg9130fkvp6jj39nk";
+       version = "0.24.6";
+       sha256 = "048dxx5cjdm7v0340p9x3s73a6y7fldykzkwkpb12bb926bir3fl";
        buildDepends = [ base hsp text web-routes ];
        description = "Adds XMLGenerator instance for RouteT monad";
        license = stdenv.lib.licenses.bsd3;
@@ -130242,8 +130607,8 @@ self: {
      }:
      mkDerivation {
        pname = "web-routes-th";
-       version = "0.22.2";
-       sha256 = "1dk768m0bb4y3i1q9sxj2fbn6farlyyy52fxmk0ipbnbdq7if71f";
+       version = "0.22.3";
+       sha256 = "0ccv1mzisd0fnhbl776i0fhavjazm0l3b4ycnbdzgs1kh4w8gzfp";
        buildDepends = [
          base parsec split template-haskell text web-routes
        ];
@@ -130549,7 +130914,9 @@ self: {
      mkDerivation {
        pname = "webpage";
        version = "0.0.3.1";
+       revision = "1";
        sha256 = "1s9q44wvkc60g1117c3c4klf9pc92x7rpgvb7pwyhbbkvshmnirj";
+       editedCabalFile = "1829b0f7db8745498bee16ed1d70917aa781fd14ab8f8032b51472cfc3cd6787";
        buildDepends = [
          base blaze-html data-default hastache lucid text
        ];
@@ -130955,15 +131322,16 @@ self: {
      }) {};
 
   "witherable" = callPackage
-    ({ mkDerivation, base, containers, hashable, transformers
-     , unordered-containers, vector
+    ({ mkDerivation, base, base-orphans, containers, hashable
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "witherable";
-       version = "0.1.2.3";
-       sha256 = "1281npwsmj9vzw3l5bb8pzywgm5dk4y723zsq5dk0b0ri58m3hcz";
+       version = "0.1.3";
+       sha256 = "0n0l169xh23925blgzy2i90gz8lsa0176dp49bl6cncq362bqcn8";
        buildDepends = [
-         base containers hashable transformers unordered-containers vector
+         base base-orphans containers hashable transformers
+         unordered-containers vector
        ];
        homepage = "https://github.com/fumieval/witherable";
        description = "Generalization of filter and catMaybes";
@@ -131018,6 +131386,7 @@ self: {
        version = "0.2.5";
        sha256 = "02r453wx1kv50lw0hx4nvzzv5wjfsy16gyjqphc25aq45rl5hr8g";
        buildDepends = [ base lens linear parsec parsec-numbers ];
+       jailbreak = true;
        homepage = "http://github.com/bgamari/wkt";
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
        license = stdenv.lib.licenses.bsd3;
@@ -131064,6 +131433,7 @@ self: {
          base containers nats semigroupoids semigroups text utf8-string
        ];
        testDepends = [ base HUnit test-framework test-framework-hunit ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/wl-pprint-extras/";
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -132342,6 +132712,7 @@ self: {
          base containers HUnit old-time smallcheck tasty tasty-hunit
          tasty-smallcheck time
        ];
+       jailbreak = true;
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
@@ -132419,16 +132790,16 @@ self: {
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
-     , system-filepath, text, transformers, xml-types
+     , text, transformers, xml-types
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.2.6";
-       sha256 = "1ybl0maakz4arqbblipafwggh0m2n8ljyp91iiihb4674kynrciz";
+       version = "1.3.0";
+       sha256 = "0kcwfr02gnldal4dq2am9kc36j76cjx0japi5r5wms2c1az95r1l";
        buildDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
-         resourcet system-filepath text transformers xml-types
+         resourcet text transformers xml-types
        ];
        testDepends = [
          base blaze-markup bytestring conduit containers hspec HUnit
@@ -132520,8 +132891,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-hamlet";
-       version = "0.4.0.10";
-       sha256 = "0bvgd3xbc25d2zdmpzq1rxhr7rkglf0zpc8wy75j2yqv6ymylb6v";
+       version = "0.4.0.11";
+       sha256 = "128ypil2c86zpkivrla031hn4rmhbpisy4zj0xmff473hz9qln9x";
        buildDepends = [
          base containers parsec shakespeare template-haskell text
          xml-conduit
@@ -132554,15 +132925,16 @@ self: {
      mkDerivation {
        pname = "xml-html-conduit-lens";
        version = "0.3.2.1";
-       revision = "1";
+       revision = "2";
        sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12";
-       editedCabalFile = "b525d68eb964e306dc6fab3f9ba89e2325d91af53469ad32ec1d49e5f9a80647";
+       editedCabalFile = "6c3305bb07c0fd40c933640ebe9e6114a798115cfb2f3cb976e40f1ece955132";
        buildDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
        testDepends = [
          base doctest hspec hspec-expectations-lens lens xml-conduit
        ];
+       jailbreak = true;
        homepage = "https://github.com/supki/xml-html-conduit-lens#readme";
        description = "Optics for xml-conduit and html-conduit";
        license = stdenv.lib.licenses.bsd3;
@@ -132575,7 +132947,9 @@ self: {
      mkDerivation {
        pname = "xml-lens";
        version = "0.1.6.3";
+       revision = "1";
        sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd";
+       editedCabalFile = "1a0768a259fb0aeaaecc092c6a9777c4d498d2695b0385a0e620e47f362773b9";
        buildDepends = [
          base case-insensitive containers lens text xml-conduit
        ];
@@ -132911,6 +133285,7 @@ self: {
          base containers directory extensible-exceptions filepath mtl
          process unix utf8-string X11
        ];
+       jailbreak = true;
        postInstall = ''
          shopt -s globstar
          mkdir -p $out/share/man/man1
@@ -133586,6 +133961,7 @@ self: {
          base bytestring bytestring-lexing containers lens yaml-light
        ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        description = "Lens interface to yaml-light";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134218,15 +134594,15 @@ self: {
      , fsnotify, ghc, ghc-paths, http-client, http-conduit
      , http-reverse-proxy, http-types, lifted-base, network
      , optparse-applicative, parsec, process, project-template
-     , resourcet, shakespeare, split, streaming-commons, system-fileio
-     , system-filepath, tar, template-haskell, text, time, transformers
-     , transformers-compat, unix-compat, unordered-containers, wai
-     , wai-extra, warp, warp-tls, yaml, zlib
+     , resourcet, shakespeare, split, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls
+     , yaml, zlib
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.7.2";
-       sha256 = "15l69vxfzhjql83ikvb6ca980ikj17346bq9b4888cv87yxnizgh";
+       version = "1.4.8";
+       sha256 = "14q0m62wh35im7j12v8rmd0qwxdyvxk88gbsd19p26q03xf832da";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -134235,10 +134611,9 @@ self: {
          file-embed filepath fsnotify ghc ghc-paths http-client http-conduit
          http-reverse-proxy http-types lifted-base network
          optparse-applicative parsec process project-template resourcet
-         shakespeare split streaming-commons system-fileio system-filepath
-         tar template-haskell text time transformers transformers-compat
-         unix-compat unordered-containers wai wai-extra warp warp-tls yaml
-         zlib
+         shakespeare split streaming-commons tar template-haskell text time
+         transformers transformers-compat unix-compat unordered-containers
+         wai wai-extra warp warp-tls yaml zlib
        ];
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
@@ -134338,6 +134713,7 @@ self: {
          base classy-prelude containers monad-control persistent random stm
          uuid yesod-core yesod-form yesod-persistent
        ];
+       jailbreak = true;
        homepage = "https://github.com/league/yesod-crud";
        description = "Generic administrative CRUD operations as a Yesod subsite";
        license = stdenv.lib.licenses.bsd3;
@@ -134451,19 +134827,18 @@ self: {
 
   "yesod-fay" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
-     , fay, fay-dom, monad-loops, process, pureMD5, shakespeare
-     , system-fileio, system-filepath, template-haskell, text
-     , transformers, utf8-string, yesod-core, yesod-form, yesod-static
+     , fay, fay-dom, filepath, monad-loops, process, pureMD5
+     , shakespeare, template-haskell, text, transformers, utf8-string
+     , yesod-core, yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "yesod-fay";
-       version = "0.7.1";
-       sha256 = "0g17n7aqr1zhlh21dkl13rhac34nq8f77mj85kll6vgcs8nfidhl";
+       version = "0.8.0";
+       sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf";
        buildDepends = [
-         aeson base bytestring data-default directory fay fay-dom
-         monad-loops process pureMD5 shakespeare system-fileio
-         system-filepath template-haskell text transformers utf8-string
-         yesod-core yesod-form yesod-static
+         aeson base bytestring data-default directory fay fay-dom filepath
+         monad-loops process pureMD5 shakespeare template-haskell text
+         transformers utf8-string yesod-core yesod-form yesod-static
        ];
        homepage = "https://github.com/fpco/yesod-fay";
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
@@ -134530,16 +134905,15 @@ self: {
 
   "yesod-gitrepo" = callPackage
     ({ mkDerivation, base, directory, enclosed-exceptions, http-types
-     , lifted-base, process, system-filepath, temporary, text, wai
-     , yesod-core
+     , lifted-base, process, temporary, text, wai, yesod-core
      }:
      mkDerivation {
        pname = "yesod-gitrepo";
-       version = "0.1.1.0";
-       sha256 = "1bf4rhf6i4cciyllkh6zil29i7yi5ph0nkpcqmhbihk4i7xm05zj";
+       version = "0.2.1.0";
+       sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf";
        buildDepends = [
          base directory enclosed-exceptions http-types lifted-base process
-         system-filepath temporary text wai yesod-core
+         temporary text wai yesod-core
        ];
        homepage = "https://github.com/snoyberg/yesod-gitrepo";
        description = "Host content provided by a Git repo";
@@ -135004,30 +135378,31 @@ self: {
      , containers, cryptohash, cryptohash-conduit, css-text
      , data-default, directory, file-embed, filepath, hashable, hjsmin
      , hspec, http-types, HUnit, mime-types, old-time, process
-     , resourcet, system-fileio, system-filepath, template-haskell, text
-     , transformers, unix-compat, unordered-containers, wai
-     , wai-app-static, wai-extra, yesod-core, yesod-test
+     , resourcet, template-haskell, text, transformers, unix-compat
+     , unordered-containers, wai, wai-app-static, wai-extra, yesod-core
+     , yesod-test
      }:
      mkDerivation {
        pname = "yesod-static";
-       version = "1.4.0.4";
-       sha256 = "1z01m3rvar6djxqcc2hyi53yfcpqwpi45wffpjnfp8hsr1x0zaqk";
+       version = "1.5.0";
+       revision = "1";
+       sha256 = "1i95c43hlks1wclhwal9yr1pasmz78ddi7wzjhg9k5w21hrkcp92";
+       editedCabalFile = "d01c0a6fcb4ae005dea0c4898fd1ad452cde5e1989c90e62309c481cd0ff36c3";
        buildDepends = [
          async attoparsec base base64-bytestring blaze-builder byteable
          bytestring conduit conduit-extra containers cryptohash
          cryptohash-conduit css-text data-default directory file-embed
          filepath hashable hjsmin http-types mime-types old-time process
-         resourcet system-fileio system-filepath template-haskell text
-         transformers unix-compat unordered-containers wai wai-app-static
-         yesod-core
+         resourcet template-haskell text transformers unix-compat
+         unordered-containers wai wai-app-static yesod-core
        ];
        testDepends = [
          async base base64-bytestring byteable bytestring conduit
          conduit-extra containers cryptohash cryptohash-conduit data-default
          directory file-embed filepath hjsmin hspec http-types HUnit
-         mime-types old-time process resourcet system-fileio system-filepath
-         template-haskell text transformers unix-compat unordered-containers
-         wai wai-app-static wai-extra yesod-core yesod-test
+         mime-types old-time process resourcet template-haskell text
+         transformers unix-compat unordered-containers wai wai-app-static
+         wai-extra yesod-core yesod-test
        ];
        homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
@@ -135057,6 +135432,7 @@ self: {
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/wuzzeb/yesod-static-generators";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
@@ -136090,6 +136466,7 @@ self: {
        sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls";
        buildDepends = [ base lens profunctors semigroupoids ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/zippers/";
        description = "Traversal based zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -136107,7 +136484,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "zlib" = callPackage
+  "zlib_0_5_4_2" = callPackage
     ({ mkDerivation, base, bytestring, zlib }:
      mkDerivation {
        pname = "zlib";
@@ -136119,7 +136496,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) zlib;};
 
-  "zlib_0_6_1_0" = callPackage
+  "zlib" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck, zlib
      }:
@@ -136186,9 +136563,10 @@ self: {
     ({ mkDerivation, base, bytestring, profunctors, zlib }:
      mkDerivation {
        pname = "zlib-lens";
-       version = "0.1.1.2";
-       sha256 = "13zfh0639881nfxibl501f1b3ci9pjvhvdid2l5sf2na8kmpzr61";
+       version = "0.1.2";
+       sha256 = "1vm12sm9ypik5qnnizmwx56fmpjghldzb06kn020hwlabz8c4j8n";
        buildDepends = [ base bytestring profunctors zlib ];
+       jailbreak = true;
        homepage = "http://lens.github.io/";
        description = "Lenses for zlib";
        license = stdenv.lib.licenses.bsd3;

From 111de3eb62ab4bc248413bb8bd6780612f482a4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 13:37:56 +0200
Subject: [PATCH 0949/1143] haskell-configuration-ghc-7.10.x: remove obsolete
 "version bump" hacks

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index b5c0f42fc780..ea362254b2fb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -320,8 +320,4 @@ self: super: {
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 
-  # Ugly hack that triggers a rebuild to fix the broken package on Hydra.
-  cabal-lenses = appendConfigureFlag super.cabal-lenses "-fignore-me-1";
-  text = appendConfigureFlag super.text "-fignore-me-1";
-
 }

From 0fa44a5633ead1849b8dee08a7944787ecc8279a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 May 2015 14:00:01 +0200
Subject: [PATCH 0950/1143] Haskell packages brainfuck and unlambda have been
 fixed upstream.

---
 .../brainfuck-fix-ghc710.patch                | 19 -------------
 .../configuration-ghc-7.10.x.nix              |  4 ---
 .../haskell-modules/unlambda-fix-ghc710.patch | 28 -------------------
 3 files changed, 51 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch
 delete mode 100644 pkgs/development/haskell-modules/unlambda-fix-ghc710.patch

diff --git a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch b/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch
deleted file mode 100644
index ae3397fa573a..000000000000
--- a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru3 brainfuck-0.1-old/Language/Brainfuck.hs brainfuck-0.1/Language/Brainfuck.hs
---- brainfuck-0.1-old/Language/Brainfuck.hs	2015-04-17 21:17:34.568721144 +0300
-+++ brainfuck-0.1/Language/Brainfuck.hs	2015-04-17 21:19:17.065872395 +0300
-@@ -19,6 +19,8 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA -}
- 
-+{-# LANGUAGE FlexibleContexts #-}
-+
- module Language.Brainfuck where
- 
- import Data.Array.IO
-@@ -287,4 +289,4 @@
- 
- halt = if debug
-          then putStrLn "Machine Halted.\n"
--         else putStrLn "\n"
-\ No newline at end of file
-+         else putStrLn "\n"
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index ea362254b2fb..ef663ba2ca84 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -181,10 +181,6 @@ self: super: {
             in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
                                           self.webkitgtk3-javascriptcore ];
 
-  # FIXME: remove with the next Hackage update
-  brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch;
-  unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch;
-
   # https://github.com/BNFC/bnfc/issues/137
   BNFC = markBrokenVersion "2.7.1" super.BNFC;
   cubical = dontDistribute super.cubical;
diff --git a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch b/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch
deleted file mode 100644
index 51c453557aa8..000000000000
--- a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru3 unlambda-0.1.3-old/Language/Unlambda.hs unlambda-0.1.3/Language/Unlambda.hs
---- unlambda-0.1.3-old/Language/Unlambda.hs	2015-04-17 21:16:32.415751612 +0300
-+++ unlambda-0.1.3/Language/Unlambda.hs	2015-04-17 21:25:38.210123501 +0300
-@@ -29,6 +29,7 @@
- import Prelude hiding(catch)
- #endif
- import Control.Exception (catch, IOException)
-+import Control.Monad (liftM, ap)
- 
- ------------------------------------------------------------------------
- -- Abstract syntax
-@@ -85,6 +86,16 @@
- 
- type Cont a = (Maybe Char, Int) -> a -> IO Exp
- 
-+instance Functor Eval where
-+
-+  fmap = liftM
-+
-+instance Applicative Eval where
-+
-+  pure = return
-+
-+  (<*>) = ap
-+
- instance Monad Eval where
- 
-   (Eval cp1) >>= f = Eval $ \dat1 cont2 ->

From 1191c95e13277507ac8ba89971a1abbb6caadfee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 May 2015 20:37:57 +0200
Subject: [PATCH 0951/1143] haskell-influxdb: don't jailbreak this build; the
 Cabal file is too complex

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7adeb92ab156..513cc4de4d80 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -403,7 +403,7 @@ self: super: {
   http-client-openssl = dontCheck super.http-client-openssl;
   http-client-tls = dontCheck super.http-client-tls;
   ihaskell = dontCheck super.ihaskell;
-  influxdb = dontCheck super.influxdb;
+  influxdb = dontCheck (dontJailbreak super.influxdb);
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;

From b4f6ddb925ff57e05c74bef6a678389c5570b287 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 11:06:02 +0200
Subject: [PATCH 0952/1143] haskell-bitcoin-api: don't run the test suite,
 because it requires network access

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 513cc4de4d80..5b9a6fe366f4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -296,6 +296,7 @@ self: super: {
   # These packages try to access the network.
   amqp = dontCheck super.amqp;
   amqp-conduit = dontCheck super.amqp-conduit;
+  bitcoin-api = dontCheck super.bitcoin-api;
   concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
   dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw

From eb32c97162992eedf9d6b633c14c895b418df621 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 13:31:31 +0200
Subject: [PATCH 0953/1143] HStringTemplate: remove obsolete overrides

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 --
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index ef663ba2ca84..f938222afdaf 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -41,8 +41,6 @@ self: super: {
   # Cabal_1_22_1_1 requires filepath >=1 && <1.4
   cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });
 
-  HStringTemplate = self.HStringTemplate_0_8_3;
-
   # We have Cabal 1.22.x.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 361d404412ea..660fc5d9a4eb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -58,9 +58,6 @@ self: super: {
     patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +";
   });                           # warning: "Module ‘Control.Monad.Error’ is deprecated"
 
-  # Depends on time == 0.1.5, which we don't have.
-  HStringTemplate_0_8_3 = dontDistribute super.HStringTemplate_0_8_3;
-
   # This is part of bytestring in our compiler.
   bytestring-builder = dontHaddock super.bytestring-builder;
 

From 932e4dbf1e00e8c2ae82dacb2cfc4873bff2b6a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 13:32:33 +0200
Subject: [PATCH 0954/1143] haddock-library: remove obsolete overrides

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index f938222afdaf..53512826a5bd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -103,10 +103,6 @@ self: super: {
   # Test suite fails in "/tokens_bytestring_unicode.g.bin".
   alex = dontCheck super.alex;
 
-  # https://github.com/haskell/haddock/issues/378
-  haddock-library_1_2_0 = dontCheck super.haddock-library_1_2_0;
-  haddock-library = self.haddock-library_1_2_0;
-
   # Upstream was notified about the over-specified constraint on 'base'
   # but refused to do anything about it because he "doesn't want to
   # support a moving target". Go figure.

From 2f00cb53084517d78dc74bbb06a62a30b4c47499 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 13:57:58 +0200
Subject: [PATCH 0955/1143] haskell-digest: remove obsolete override

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5b9a6fe366f4..c05dbb5c06f6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -11,7 +11,6 @@ self: super: {
   cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; });
 
   # Break infinite recursions.
-  digest = super.digest.override { inherit (pkgs) zlib; };
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
   hspec-expectations = dontCheck super.hspec-expectations;

From 1d3ef2fef83aa9cd1a64967893611d01c78f2e06 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 13:58:16 +0200
Subject: [PATCH 0956/1143] haskell: simplify overrides for QuickCheck and zlib

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c05dbb5c06f6..0bba17bbe380 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -157,9 +157,6 @@ self: super: {
     patchPhase = "sed -i -e 's|attoparsec.*,|attoparsec,|' darcs.cabal";
   });
 
-  # Needs the latest version of QuickCheck to compile.
-  cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; };
-
   # https://github.com/massysett/rainbox/issues/1
   rainbox = dontCheck super.rainbox;
 
@@ -762,10 +759,7 @@ self: super: {
            in appendPatch pkg ./mueval-nix.patch;
 
   # Test suite won't compile against tasty-hunit 0.9.x.
-  zlib_0_6_1_0 = dontCheck super.zlib_0_6_1_0;
-
-  # Jailbreaking breaks the build.
-  QuickCheck_2_8_1 = dontJailbreak super.QuickCheck_2_8_1;
+  zlib = dontCheck super.zlib;
 
   # Override the obsolete version from Hackage with our more up-to-date copy.
   cabal2nix = pkgs.cabal2nix;

From 10e338263d7af587f65fdf4b9f68da4795d20820 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 19:39:45 +0200
Subject: [PATCH 0957/1143] haskell-MissingH: disable test suite to avoid
 depending on broken testpack

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0bba17bbe380..d0a2301ce96e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -798,4 +798,8 @@ self: super: {
   # GNUTLS 3.4 causes linker errors: http://hydra.cryp.to/build/839563/nixlog/2/raw
   gnutls = super.gnutls.override { gnutls = pkgs.gnutls33; };
 
+  # Won't compile with recent versions of QuickCheck.
+  testpack = markBroken super.testpack;
+  MissingH = dontCheck super.MissingH;
+
 }

From bfb416cfe151ced5f94c8ac79388a3724cb2c97c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 22:11:22 +0200
Subject: [PATCH 0958/1143] haskell-utf8-prelude: mark deprecated package as
 broken

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d0a2301ce96e..cde94a0867c9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -802,4 +802,7 @@ self: super: {
   testpack = markBroken super.testpack;
   MissingH = dontCheck super.MissingH;
 
+  # Obsolete for GHC versions after GHC 6.10.x.
+  utf8-prelude = markBroken super.utf8-prelude;
+
 }

From 0a87fd8890e6311b292e73c17805f8c6df8509c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 May 2015 00:12:57 +0200
Subject: [PATCH 0959/1143] cabal-install: override zlib with an older version
 to fix the build

This change resolves https://github.com/peti/nixpkgs/pull/3.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cde94a0867c9..705da4df4661 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -8,7 +8,7 @@ self: super: {
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
   Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0;
-  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; });
+  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; });
 
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;

From c3add19437d1add9e313819eeb47f4854e7bef93 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 May 2015 00:30:07 +0200
Subject: [PATCH 0960/1143] darcs: pass old zlib version 0.5.x to fix the build

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 705da4df4661..76675ef87554 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -151,11 +151,11 @@ self: super: {
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
 
-  # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
-  darcs = overrideCabal super.darcs (drv: {
+  # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
+  darcs = (overrideCabal super.darcs (drv: {
     doCheck = false;            # The test suite won't even start.
-    patchPhase = "sed -i -e 's|attoparsec.*,|attoparsec,|' darcs.cabal";
-  });
+    patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' darcs.cabal";
+  })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });
 
   # https://github.com/massysett/rainbox/issues/1
   rainbox = dontCheck super.rainbox;

From 1d7f9b28d314ffd82a24dbcf74dd4199a4e5bbc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 May 2015 00:40:56 +0200
Subject: [PATCH 0961/1143] haskell-cheapskate is broken by latest blaze-html

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 76675ef87554..0788900a7147 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -805,4 +805,8 @@ self: super: {
   # Obsolete for GHC versions after GHC 6.10.x.
   utf8-prelude = markBroken super.utf8-prelude;
 
+  # https://github.com/jgm/cheapskate/issues/11
+  cheapskate = markBrokenVersion "0.1.0.3" super.cheapskate;
+  lit = dontDistribute super.lit;
+
 }

From 8b13b29898d8b678a30f80e25de3502ae3b3bc53 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 May 2015 14:34:19 +0200
Subject: [PATCH 0962/1143] pandoc: jailbreak to fix build with recent versions
 of zlib and QuickCheck

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0788900a7147..e22e3f31f162 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -678,8 +678,11 @@ self: super: {
   # https://github.com/junjihashimoto/test-sandbox-compose/issues/2
   test-sandbox-compose = dontCheck super.test-sandbox-compose;
 
-  # https://github.com/jgm/pandoc/issues/2045
-  pandoc = dontCheck super.pandoc;
+  # https://github.com/jgm/pandoc/issues/2156
+  pandoc = overrideCabal (dontJailbreak super.pandoc) (drv: {
+    doCheck = false;    # https://github.com/jgm/pandoc/issues/2036
+    patchPhase = "sed -i -e 's|zlib .*,|zlib,|' -e 's|QuickCheck .*,|QuickCheck,|' pandoc.cabal";
+  });
 
   # Broken by GLUT update.
   Monadius = markBroken super.Monadius;

From 8145d6abb9d82fbc2fe50f5f52ab91d29b6788f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 May 2015 14:44:15 +0200
Subject: [PATCH 0963/1143] haskell-bitcoin-api-extra: test suite requires
 network access

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e22e3f31f162..a71fa7fe92ee 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -293,6 +293,7 @@ self: super: {
   amqp = dontCheck super.amqp;
   amqp-conduit = dontCheck super.amqp-conduit;
   bitcoin-api = dontCheck super.bitcoin-api;
+  bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
   concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
   dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw

From a35ef4e3df5210acd4ecb74308d4a8185328c357 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sat, 16 May 2015 20:23:25 -0400
Subject: [PATCH 0964/1143] ffmpeg: update branches ffmpeg_0_10: 0.10.15 ->
 0.10.16 ffmpeg_2_2: 2.2.13 -> 2.2.15 ffmpeg_2_6: 2.6.1 -> 2.6.2 ffmpeg-full:
 2.6.1 -> 2.6.2

---
 pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/0.10.nix         | 4 ++--
 pkgs/development/libraries/ffmpeg/2.2.nix          | 4 ++--
 pkgs/development/libraries/ffmpeg/2.6.nix          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index e674ef0b97bd..137340663402 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-${version}";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4";
+    sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8";
   };
 
   patchPhase = ''patchShebangs .'';
diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index bad142f6f96a..b008151d6cb7 100644
--- a/pkgs/development/libraries/ffmpeg/0.10.nix
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.15";
+  version = "${branch}.16";
   branch = "0.10";
-  sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb";
+  sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77";
 })
diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix
index e382fe7154de..fbbb75cb8320 100644
--- a/pkgs/development/libraries/ffmpeg/2.2.nix
+++ b/pkgs/development/libraries/ffmpeg/2.2.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.13";
+  version = "${branch}.15";
   branch = "2.2";
-  sha256 = "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0";
+  sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4";
 })
diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix
index 9e097ddfebb6..0974af75ccd5 100644
--- a/pkgs/development/libraries/ffmpeg/2.6.nix
+++ b/pkgs/development/libraries/ffmpeg/2.6.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.1";
+  version = "${branch}.2";
   branch = "2.6";
-  sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4";
+  sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8";
 })

From c9d50c01282adb0c9e5d7dc38c8fe91ebb3b5943 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Sat, 16 May 2015 17:27:02 -0700
Subject: [PATCH 0965/1143] Revert "man-db: dont use libpipeline on darwin,
 causes build failure"

This reverts commit ef66f1536dcfd9a78757436807de98be31e6cb48.
---
 pkgs/tools/misc/man-db/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index ce5467ee284f..403068b1bf7d 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "03ly0hbpgjnag576rgccanaisn7f6422q5qxrj64vyzslc2651y4";
   };
   
-  buildInputs = [ pkgconfig ]
-             ++ stdenv.lib.optional (!stdenv.isDarwin) libpipeline
-             ++ [ db groff ];
+  buildInputs = [ pkgconfig libpipeline db groff ];
   
   configureFlags = [
     "--disable-setuid"

From d90dd6d17bc5a116ef9875b6900305c2bd367887 Mon Sep 17 00:00:00 2001
From: C0DEHERO <codehero@nerdpol.ch>
Date: Sat, 16 May 2015 22:48:43 -0400
Subject: [PATCH 0966/1143] irrlicht: update rev 3843 (1.8) -> rev 5104 (1.8);
 fixed awkward naming; use svn release branch

---
 .../libraries/irrlicht/default.nix            | 22 +++------
 .../libraries/irrlicht/irrlicht3843.nix       | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 53 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/irrlicht/irrlicht3843.nix

diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index a682b3a6b829..8acd872fcb39 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -2,21 +2,16 @@
 
 
 stdenv.mkDerivation rec {
-  # Version 3843 is required for supertuxkart
-  name = "irrlicht-1.8-svn-3843";
+  name = "irrlicht-${version}-svn-${revision}";
+  version = "1.8";
+  revision = "5104"; # newest revision as of 05-16-15
 
   src = fetchsvn {
-    url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
-    rev = 3843;
-    sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
+    url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev)
+    rev = "${revision}";
+    sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq";
   };
 
-  patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
-
-  postPatch = ''
-    sed -i /stdcall-alias/d source/Irrlicht/Makefile
-  '';
-
   preConfigure = ''
     cd source/Irrlicht
   '';
@@ -30,11 +25,6 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  postInstall = ''
-    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
-    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
-  '';
-
   buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
 
   meta = {
diff --git a/pkgs/development/libraries/irrlicht/irrlicht3843.nix b/pkgs/development/libraries/irrlicht/irrlicht3843.nix
new file mode 100644
index 000000000000..a682b3a6b829
--- /dev/null
+++ b/pkgs/development/libraries/irrlicht/irrlicht3843.nix
@@ -0,0 +1,45 @@
+{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }:
+
+
+stdenv.mkDerivation rec {
+  # Version 3843 is required for supertuxkart
+  name = "irrlicht-1.8-svn-3843";
+
+  src = fetchsvn {
+    url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
+    rev = 3843;
+    sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
+  };
+
+  patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
+
+  postPatch = ''
+    sed -i /stdcall-alias/d source/Irrlicht/Makefile
+  '';
+
+  preConfigure = ''
+    cd source/Irrlicht
+  '';
+
+  buildPhase = ''
+    make sharedlib NDEBUG=1
+  '';
+
+  preInstall = ''
+    sed -i s,/usr/local/lib,$out/lib, Makefile
+    mkdir -p $out/lib
+  '';
+
+  postInstall = ''
+    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
+    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
+  '';
+
+  buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
+
+  meta = {
+    homepage = http://irrlicht.sourceforge.net/;
+    license = stdenv.lib.licenses.zlib;
+    description = "Open source high performance realtime 3D engine written in C++";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00737083a7b3..046398c6de75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6212,7 +6212,8 @@ let
 
   intltool = callPackage ../development/tools/misc/intltool { };
 
-  irrlicht3843 = callPackage ../development/libraries/irrlicht { };
+  irrlicht = callPackage ../development/libraries/irrlicht { };
+  irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };
 
   isocodes = callPackage ../development/libraries/iso-codes { };
 

From 3b913df2175fd98036f8e58bbee56712951215df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 May 2015 10:26:33 +0200
Subject: [PATCH 0967/1143] gnome3_16.gexiv2: maintenance update and fix hash

/cc @lethalman.
---
 pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
index 7d2c8cf0eb39..1508338f6cae 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
@@ -5,24 +5,24 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gexiv2-${version}";
-  version = "${majorVersion}.0";
+  version = "${majorVersion}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
-    sha256 = "2fd21f0ed5125e51d02226e7f41be751cfa8ae411a8ed1a651e16b06d79047b2";
+    sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988";
   };
-  
+
   preConfigure = ''
     patchShebangs .
   '';
-  
+
   buildInputs = [ pkgconfig glib libtool m4 ];
   propagatedBuildInputs = [ exiv2 ];
-  
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/gexiv2;
     description = "GObject wrapper around the Exiv2 photo metadata library";
     platforms = platforms.linux;
     maintainers = [ maintainers.lethalman ];
   };
-}
\ No newline at end of file
+}

From ec1a281f0a52fc8095b328eb74b57b9aae9c6a9d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 17 May 2015 03:02:44 -0700
Subject: [PATCH 0968/1143] kernel-config: Fix for i686

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 42bf534c5002..4f3813f6ed87 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -396,7 +396,7 @@ with stdenv.lib;
     KVM_COMPAT y
   ''}
   ${optionalString (versionAtLeast version "3.10") ''
-    KVM_DEVICE_ASSIGNMENT y
+    KVM_DEVICE_ASSIGNMENT? y
   ''}
   ${optionalString (versionAtLeast version "4.0") ''
     KVM_GENERIC_DIRTYLOG_READ_PROTECT y

From 699adbf6f9a0b8ca69247ed2873a233b17a38927 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Sun, 17 May 2015 12:31:57 +0200
Subject: [PATCH 0969/1143] storebackup 3.4 -> 3.5

---
 pkgs/tools/backup/store-backup/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index c986adeafdcc..ba8df4771487 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -12,17 +12,19 @@
 let dummyMount = writeScriptBin "mount" "#!/bin/sh";
 in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
 
-  name = "store-backup-3.4";
+  version = "3.5";
+
+  name = "store-backup-${version}";
 
   enableParallelBuilding = true;
 
   buildInputs = [ perl makeWrapper ];
 
   src = fetchurl {
-    url = http://download.savannah.gnu.org/releases/storebackup/storeBackup-3.4.tar.bz2;
-    sha256 = "101k3nhyfjj8y8hg0v0xqxsr4vlcfkmlczgbihvlv722fb7n5gi3";
+    url = "http://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2";
+    sha256 = "0y4gzssc93x6y93mjsxm5b5cdh68d7ffa43jf6np7s7c99xxxz78";
   };
 
   installPhase = ''

From 796291568072a339f3dfeca86e76bdaa216a78fa Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 17 May 2015 06:43:26 -0400
Subject: [PATCH 0970/1143] ats2: bump

---
 pkgs/development/compilers/ats2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 8345a353f3f9..08cae4d3e420 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "ats2-${version}";
-  version = "0.1.11";
+  version = "0.1.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "1dy2f7lxfwcmrk753midr75cy8xs6pqnmqmj9xj0ch479q4pkpsv";
+    sha256 = "1jiki88mzhki74xh5ffw3pali5zs74pa0nylcb8n4ypfvdpqvlhb";
   };
 
   buildInputs = [ gmp ];

From 59cf968fb3547b7071c446a4fc85b7737eaa5f7b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 May 2015 13:30:38 +0200
Subject: [PATCH 0971/1143] haskell-blaze-builder: fix build with GHC 7.6.3

---
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 8be816b0c9b6..0970108eef7f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -85,4 +85,7 @@ self: super: {
     patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
   );
 
+  # blaze-builder requires an additional build input on older compilers.
+  blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;
+
 }

From bb750e2b1bd23d5cedff1accae4c6e05701f1b6e Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Wed, 13 May 2015 19:53:00 +0200
Subject: [PATCH 0972/1143] enable padsp again

---
 pkgs/servers/pulseaudio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 1161d73c28f3..8dee9a801e36 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
     (mkEnable false                   "samplerate"                 null)         # Deprecated
     (mkWith   true                    "database"                   databaseName)
     (mkEnable hasOss                  "oss-output"                 null)
-    (mkEnable hasOss                  "oss-wrapper"                null)
+    (mkEnable true                    "oss-wrapper"                null)         # Does not use OSS
     (mkEnable (optCoreaudio != null)  "coreaudio-output"           null)
     (mkEnable (optAlsaLib != null)    "alsa"                       null)
     (mkEnable (optEsound != null)     "esound"                     null)

From f9f55b4147054ab98d5426fac8ea8b36b9d1d923 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 May 2015 22:42:29 +0200
Subject: [PATCH 0973/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/21baf54727572b87f13bbed9cf10c3f07bc2ce55
 with hackage2nix revision b0eec6a5853fb52a28ae3ded058c3f7d0c510e2a

---
 .../haskell-modules/hackage-packages.nix      | 265 ++++++++++--------
 1 file changed, 155 insertions(+), 110 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 45a053f311c6..09156dbb459b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -26338,12 +26338,15 @@ self: {
      mkDerivation {
        pname = "bloomfilter";
        version = "2.0.0.0";
+       revision = "1";
        sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f";
+       editedCabalFile = "2e5d001d62c85fd1647aef4112ae5830181c099d588e03719a14048511ca702e";
        buildDepends = [ array base bytestring deepseq ];
        testDepends = [
          base bytestring QuickCheck random test-framework
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/bos/bloomfilter";
        description = "Pure and impure Bloom Filter implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -30133,8 +30136,8 @@ self: {
      }:
      mkDerivation {
        pname = "cf";
-       version = "0.2";
-       sha256 = "0lc7q5nm4c1rjsbvw1b794kxspxqfm124351jkpzi7a9l2gvqcka";
+       version = "0.3";
+       sha256 = "06r289lb3aq9wh2xggpg7pbxf60wkz1fmdy7ibyawa1sxpprrs07";
        buildDepends = [ base ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -44841,17 +44844,18 @@ self: {
      }) {};
 
   "elm-init" = callPackage
-    ({ mkDerivation, base, bytestring, file-embed, json, system-fileio
-     , system-filepath
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , directory, file-embed, filepath, text
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "0.1.0.1";
-       sha256 = "0y3705aq1h8ip4zsvdvhn7gf3940h3k77nkxdmn84wq12sfx6fnq";
+       version = "0.1.1.1";
+       sha256 = "1qb61m0jd4c63x8av5v3iaxw1k4isi2yzrqjw0xznkf8m07hz4vb";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring file-embed json system-fileio system-filepath
+         aeson aeson-pretty base bytestring containers directory file-embed
+         filepath text
        ];
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
@@ -46348,8 +46352,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.7.2.0";
-       sha256 = "0nwypn0yny60mjxa76dy1rn1hnsc0wvdsmv3kl1kahzsgcvh47r1";
+       version = "0.7.2.1";
+       sha256 = "0zhasybpvmi3f0kb2pipb03jnv4d710gcr6mphszgkj5179wvad2";
        buildDepends = [
          aeson async attoparsec base bytestring cereal containers network
          protobuf random sodium stm text time unordered-containers uuid
@@ -46507,8 +46511,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exceptional";
-       version = "0.1.4.1";
-       sha256 = "1i9srv7yv0hzs8hkpfsjm2idzw20y6wc7b8sscn2h5cp0cfpfrsh";
+       version = "0.1.4.2";
+       sha256 = "0macyynwj779wy1abzrl87g8zmpwa98x5vc5yqc0wnr06glmma2b";
        buildDepends = [ base ];
        homepage = "https://github.com/pharpend/exceptional";
        description = "Essentially the Maybe type with error messages";
@@ -50678,8 +50682,8 @@ self: {
      }:
      mkDerivation {
        pname = "full-text-search";
-       version = "0.2.1.1";
-       sha256 = "1rz4gimbk32677158321xs36pkc5ywjhm2sisw8hrwa3zlfjkrfc";
+       version = "0.2.1.3";
+       sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base containers text vector ];
@@ -58223,8 +58227,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-authenticate";
-       version = "2.1.3";
-       sha256 = "19lil82sf441xji7qxvrzdj7vps56wsksgixazzak88azl9li6rj";
+       version = "2.1.4";
+       sha256 = "075bncl5mz7hi674gyhd9mrnf3xb8zn5frcy39dj5m7jrsrdy91z";
        buildDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default filepath happstack-hsp
@@ -59809,27 +59813,27 @@ self: {
   "haskell-neo4j-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , data-default, hashable, HTTP, http-conduit, http-types, HUnit
-     , lifted-base, mtl, QuickCheck, resourcet, scientific
+     , lifted-base, mtl, network-uri, QuickCheck, resourcet, scientific
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , test-framework-th, text, transformers, transformers-base
      , transformers-compat, unordered-containers, vector
      }:
      mkDerivation {
        pname = "haskell-neo4j-client";
-       version = "0.3.0.15";
-       sha256 = "1gxnwz7xzf4l0d4hwi8ij95910d38l89i9x3sw051zwn4fzns1cv";
+       version = "0.3.1.1";
+       sha256 = "1l5dpaa97h6qxlhq0rzk24p3l943zf3c948jvng4ajl3gmhniy1w";
        buildDepends = [
          aeson base bytestring containers data-default hashable HTTP
-         http-conduit http-types lifted-base mtl resourcet scientific text
-         transformers transformers-base transformers-compat
+         http-conduit http-types lifted-base mtl network-uri resourcet
+         scientific text transformers transformers-base transformers-compat
          unordered-containers vector
        ];
        testDepends = [
          aeson base bytestring Cabal data-default hashable HTTP http-conduit
-         http-types HUnit lifted-base mtl QuickCheck resourcet scientific
-         test-framework test-framework-hunit test-framework-quickcheck2
-         test-framework-th text transformers transformers-base
-         transformers-compat unordered-containers vector
+         http-types HUnit lifted-base mtl network-uri QuickCheck resourcet
+         scientific test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         transformers-base transformers-compat unordered-containers vector
        ];
        jailbreak = true;
        homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
@@ -60080,7 +60084,6 @@ self: {
          base haskell-src-exts pretty syb template-haskell th-orphans
          uniplate
        ];
-       jailbreak = true;
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64309,18 +64312,18 @@ self: {
   "hipbot" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, blaze-builder, bytestring
      , either, exceptions, http-client, http-client-tls, http-types, jwt
-     , lens, mtl, network-uri, postgresql-simple, safe, stm, text, time
-     , transformers, unordered-containers, utf8-string, wai, wai-lens
-     , webcrank-wai, wreq
+     , lens, mtl, network-uri, postgresql-simple, resource-pool, safe
+     , stm, text, time, transformers, unordered-containers, utf8-string
+     , wai, wai-lens, webcrank-wai, wreq
      }:
      mkDerivation {
        pname = "hipbot";
-       version = "0.2.1";
-       sha256 = "12rixjkgxg43nwi93sr04vv8c9cw3v6rsyfpyklcpibcjg0yn6yn";
+       version = "0.3.0.2";
+       sha256 = "04czq0ix78amd217cf5yj8yvkr4hpsaa38rdmjish40b63crnba3";
        buildDepends = [
          aeson base bifunctors blaze-builder bytestring either exceptions
          http-client http-client-tls http-types jwt lens mtl network-uri
-         postgresql-simple safe stm text time transformers
+         postgresql-simple resource-pool safe stm text time transformers
          unordered-containers utf8-string wai wai-lens webcrank-wai wreq
        ];
        jailbreak = true;
@@ -69614,8 +69617,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "0.3.2.6";
-       sha256 = "12kmkixr7azd33r5fx3z4siw0xdkda4sfxwi75vlm5w9w07ackpn";
+       version = "0.3.2.7";
+       sha256 = "0d1mmk4w82bxyi682fdmgxk5zm6ni3yhpvkps4m3i04x6gf2xyaj";
        buildDepends = [
          base bytestring containers digestive-functors HandsomeSoup hspec
          hspec-core hxt lens mtl snap snap-core text transformers
@@ -76620,8 +76623,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "1.0";
-       sha256 = "0vny84qr14i2q7hkvmngbryn6r9hxsmk6c5dw6f93s8cn0ymgsk8";
+       version = "1.0.1";
+       sha256 = "0p06zv61giwbnwcdcg8fq7mmw3islcj807df4xhaxggr8r3dwywv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -76804,8 +76807,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.1.2.0";
-       sha256 = "1arn4ik9fyicb875ac0y7dp9ahipvip8fq2mr95vvmhym921ca64";
+       version = "0.1.3.0";
+       sha256 = "10wb9nv9ijqjn4w6mp306k58s2pqzc91529rgw29h72ww6q70ylq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77506,8 +77509,8 @@ self: {
      }:
      mkDerivation {
        pname = "keter";
-       version = "1.4.0";
-       sha256 = "1psa0xs0j8s117ifhd2347kiiq0mvprp7kcb933l8977p10nqi9k";
+       version = "1.4.0.1";
+       sha256 = "0bzd0f8i88bdwz2aqvx3q2mfidm0947wwrnxrdii778mjr8c1nyb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78230,12 +78233,12 @@ self: {
      }) {};
 
   "lambda-options" = callPackage
-    ({ mkDerivation, base, containers, monad-loops, mtl }:
+    ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "lambda-options";
-       version = "0.3.0.0";
-       sha256 = "1yma67b7d55lyq81afpw1wrqyjv84cxqbbrw3rr1qvdkx16b9pwa";
-       buildDepends = [ base containers monad-loops mtl ];
+       version = "0.5.1.0";
+       sha256 = "0h4s46z734l8b7ivx8h1kh2nhbqsz6zswxs1dqfhqrbcyf4vi2fl";
+       buildDepends = [ base containers mtl ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/lambda-options";
        description = "A modern command-line parser for Haskell";
@@ -87922,8 +87925,8 @@ self: {
      }:
      mkDerivation {
        pname = "mongoDB";
-       version = "2.0.4";
-       sha256 = "1gcv2vzmg6vllvpl8pzfkwmf4rqwldz4p0l4gl78hixbbilx0pgy";
+       version = "2.0.5";
+       sha256 = "09ysw5sp7x8pyfsjj1qgfq3wm8l0cpxkv9g9x117iss04bfk0p3h";
        buildDepends = [
          array base binary bson bytestring containers cryptohash hashtables
          lifted-base monad-control mtl network parsec random random-shuffle
@@ -94449,6 +94452,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pager" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , directory, process, resourcet, safe, terminfo, text, transformers
+     , unix
+     }:
+     mkDerivation {
+       pname = "pager";
+       version = "0.1.1.0";
+       sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring conduit conduit-extra directory process resourcet
+         safe terminfo text transformers unix
+       ];
+       homepage = "https://github.com/pharpend/pager";
+       description = "Open up a pager, like 'less' or 'more'";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "pagerduty" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring
      , bytestring-conversion, conduit, data-default-class, exceptions
@@ -94631,7 +94654,9 @@ self: {
      mkDerivation {
        pname = "pandoc-csv2table";
        version = "1.0.0";
+       revision = "1";
        sha256 = "0jr18sa5apvy8jckb5cxvsyr6c2drii6652ipwpd4xkdwrabwp5r";
+       editedCabalFile = "49799682e063ffa396f94dd2f91e9b252f0224544d2e7a9d1dc5b41a909efd3d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base csv pandoc pandoc-types text ];
@@ -94914,8 +94939,8 @@ self: {
      }:
      mkDerivation {
        pname = "parconc-examples";
-       version = "0.3.4";
-       sha256 = "1i8kkjak3byzypaiqi7iavhswmvs98cvcrakdxpd8cm52gj6xk2d";
+       version = "0.3.5";
+       sha256 = "05id69rb2cdzs1jf7zgv0gxgvbwm6x83s6ihdh9w1wnnpa7ykpap";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -96475,8 +96500,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.1.5.2";
-       sha256 = "0csmkyfjyqgi2nl8ihsnj0s4l7kyyddm0q9qpkwwm5gqjrjwk1wc";
+       version = "2.1.5.3";
+       sha256 = "1ir23x7b2hagpiiva45fmcyfdmi2cw7m0qf2zqdp22lpa41vlyvl";
        buildDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
@@ -100455,8 +100480,8 @@ self: {
      }:
      mkDerivation {
        pname = "profunctors";
-       version = "5.0.0.1";
-       sha256 = "0p9an9j387rhv6fzbvwaz91m9g5f69lhx2jr23riygprjfn8xs99";
+       version = "5.0.1";
+       sha256 = "1n6lk1r10j5ssb88ia13zll1k2gsakvf314m51sz3nzmdcgx03ll";
        buildDepends = [ base comonad distributive tagged transformers ];
        homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
@@ -109554,8 +109579,8 @@ self: {
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
        pname = "sequence";
-       version = "0.9.7";
-       sha256 = "1q2v51dxi21jbq7ll7g1x85pxxz7bywgsqrwfrgzf0p96da05ps7";
+       version = "0.9.8";
+       sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh";
        buildDepends = [ base containers transformers ];
        homepage = "https://github.com/atzeus/sequence";
        description = "A type class for sequences and various sequence data structures";
@@ -115438,6 +115463,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stack" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "stack";
+       version = "0.0.0";
+       sha256 = "0829d2yb32gfnn22idhwzpyc2gy3d7lyj19kh20fbq73fp7k9kmb";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base ];
+       description = "The Haskell Tool Stack";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stack-prism" = callPackage
     ({ mkDerivation, base, profunctors, tagged, template-haskell
      , transformers
@@ -121204,32 +121242,31 @@ self: {
      }) {};
 
   "text-show-instances" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , haskeline, hoopl, hpc, old-locale, old-time, pretty
-     , quickcheck-instances, random, semigroups, tagged, tasty
-     , tasty-hunit, tasty-quickcheck, template-haskell, terminfo, text
-     , text-show, time, transformers, transformers-compat, unix
-     , unordered-containers, utf8-string, vector, xhtml
+    ({ mkDerivation, base, base-compat, binary, bytestring, containers
+     , directory, haskeline, hoopl, hpc, hspec, old-locale, old-time
+     , pretty, QuickCheck, quickcheck-instances, random, semigroups
+     , tagged, template-haskell, terminfo, text, text-show, time
+     , transformers, transformers-compat, unix, unordered-containers
+     , utf8-string, vector, xhtml
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "0.3.0.1";
-       sha256 = "1a6ybgx5jivacy7b0bja5f7an1xq9mjmr2x348knaf84v2wqws9p";
+       version = "0.4";
+       sha256 = "1zk3q11dsr8n15r6r9dhqwyh6irqv6s2q7mkgzlgzw1narvllil2";
        buildDepends = [
-         base binary bytestring containers directory haskeline hoopl hpc
-         old-locale old-time pretty random semigroups tagged
+         base base-compat binary bytestring containers directory haskeline
+         hoopl hpc old-locale old-time pretty random semigroups tagged
          template-haskell terminfo text text-show time transformers
          transformers-compat unix unordered-containers utf8-string vector
          xhtml
        ];
        testDepends = [
-         base binary bytestring containers directory haskeline hoopl hpc
-         old-locale old-time pretty quickcheck-instances random semigroups
-         tagged tasty tasty-hunit tasty-quickcheck template-haskell terminfo
-         text-show time transformers transformers-compat unix
+         base base-compat binary bytestring containers directory haskeline
+         hoopl hpc hspec old-locale old-time pretty QuickCheck
+         quickcheck-instances random semigroups tagged template-haskell
+         terminfo text-show time transformers transformers-compat unix
          unordered-containers utf8-string vector xhtml
        ];
-       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
@@ -121630,6 +121667,22 @@ self: {
      }) {};
 
   "th-orphans" = callPackage
+    ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift
+     , th-reify-many
+     }:
+     mkDerivation {
+       pname = "th-orphans";
+       version = "0.11.1";
+       sha256 = "111ckvvicr953aqnnkn7rn089dprz57h95cg95rs7f1zz318h2xy";
+       buildDepends = [
+         base mtl nats template-haskell th-lift th-reify-many
+       ];
+       testDepends = [ base hspec template-haskell ];
+       description = "Orphan instances for TH datatypes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "th-orphans_0_12_0" = callPackage
     ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift
      , th-reify-many
      }:
@@ -123168,14 +123221,11 @@ self: {
     ({ mkDerivation, base, containers, text }:
      mkDerivation {
        pname = "tokenify";
-       version = "0.1.0.0";
-       revision = "2";
-       sha256 = "0a75bk0ykmgpwh60whawqw6d2p195w5m140l5shq1v949l1d5m7x";
-       editedCabalFile = "32816d10d3cc2d7c15a68a3001a7e080682d3d611b3dabb7cc6b07bffed20f2f";
+       version = "0.1.2.0";
+       sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch";
        buildDepends = [ base containers text ];
-       jailbreak = true;
        homepage = "https://github.com/AKST/tokenify";
-       description = "A regex based LR tokenizer";
+       description = "A regex lexer";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -126760,17 +126810,17 @@ self: {
      }) {};
 
   "up" = callPackage
-    ({ mkDerivation, base, directory, filepath, mtl, parsec, split
-     , transformers
+    ({ mkDerivation, base, directory, filepath, lambda-options, mtl
+     , split
      }:
      mkDerivation {
        pname = "up";
-       version = "1.0.0.2";
-       sha256 = "10dd90walys2q30b80c6z76v4lixp6cjbxq7gc43mqb67p0qnk67";
+       version = "1.0.0.3";
+       sha256 = "1w37jmnmx2vrdwbdcnhb29bvy4857pzcx4gdavmcp598lsfj34vy";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base directory filepath mtl parsec split transformers
+         base directory filepath lambda-options mtl split
        ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/up";
@@ -134590,8 +134640,8 @@ self: {
   "yesod-bin" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
-     , containers, data-default-class, directory, file-embed, filepath
-     , fsnotify, ghc, ghc-paths, http-client, http-conduit
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit
      , http-reverse-proxy, http-types, lifted-base, network
      , optparse-applicative, parsec, process, project-template
      , resourcet, shakespeare, split, streaming-commons, tar
@@ -134601,15 +134651,15 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.8";
-       sha256 = "14q0m62wh35im7j12v8rmd0qwxdyvxk88gbsd19p26q03xf832da";
+       version = "1.4.9.1";
+       sha256 = "0ja7ayl1vmbjrlxngfvamfbw0cnqappdv0fqm6kdfhd8phpp9x94";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          async attoparsec base base64-bytestring blaze-builder bytestring
-         Cabal conduit conduit-extra containers data-default-class directory
-         file-embed filepath fsnotify ghc ghc-paths http-client http-conduit
-         http-reverse-proxy http-types lifted-base network
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify ghc ghc-paths http-client
+         http-conduit http-reverse-proxy http-types lifted-base network
          optparse-applicative parsec process project-template resourcet
          shakespeare split streaming-commons tar template-haskell text time
          transformers transformers-compat unix-compat unordered-containers
@@ -135670,38 +135720,35 @@ self: {
      }) {};
 
   "yi" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, Cabal
-     , cautious-file, containers, data-default, directory, dlist
-     , dynamic-state, dyre, exceptions, filepath, glib, gtk, hashable
-     , hint, HUnit, lens, mtl, old-locale, oo-prototypes, pango, parsec
-     , pointedlist, process, QuickCheck, random, regex-base, regex-tdfa
-     , safe, semigroups, split, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, time, transformers-base, unix
-     , unix-compat, unordered-containers, utf8-string, vty, word-trie
-     , xdg-basedir, yi-language, yi-rope
+    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
+     , data-default, directory, dlist, dynamic-state, dyre, exceptions
+     , filepath, glib, gtk, hashable, HUnit, lens, mtl, old-locale
+     , oo-prototypes, pango, parsec, pointedlist, process, QuickCheck
+     , regex-base, regex-tdfa, safe, semigroups, split, tasty
+     , tasty-hunit, tasty-quickcheck, template-haskell, text, time
+     , transformers-base, unix, unix-compat, unordered-containers, vty
+     , word-trie, xdg-basedir, yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.11.2";
-       sha256 = "0kqrdbfpihyds8mdai6j4dzzd8wbcchji0gdgpfb4w5kwhhh9dvz";
+       version = "0.12.0";
+       sha256 = "167x1zmkhrh7s4wjvvpp0pydgif1yl05by8j6wimi79wwvnkiyi7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base binary bytestring Cabal cautious-file containers
-         data-default directory dlist dynamic-state dyre exceptions filepath
-         glib gtk hashable hint lens mtl old-locale oo-prototypes pango
-         parsec pointedlist process QuickCheck random regex-base regex-tdfa
-         safe semigroups split template-haskell text time transformers-base
-         unix unix-compat unordered-containers utf8-string vty word-trie
-         xdg-basedir yi-language yi-rope
+         array base binary bytestring Cabal containers data-default
+         directory dlist dynamic-state dyre exceptions filepath glib gtk
+         hashable lens mtl old-locale oo-prototypes pango parsec pointedlist
+         process regex-base regex-tdfa safe semigroups split
+         template-haskell text time transformers-base unix unix-compat
+         unordered-containers vty word-trie xdg-basedir yi-language yi-rope
        ];
        testDepends = [
          base directory filepath HUnit lens QuickCheck semigroups tasty
          tasty-hunit tasty-quickcheck text yi-language yi-rope
        ];
        configureFlags = [ "-fpango" "-fvty" ];
-       jailbreak = true;
-       homepage = "http://haskell.org/haskellwiki/Yi";
+       homepage = "https://yi-editor.github.io";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136502,10 +136549,8 @@ self: {
      }:
      mkDerivation {
        pname = "zlib";
-       version = "0.6.1.0";
-       revision = "1";
-       sha256 = "1yc4zfysbj28px064bfwz9n3b3i57c1dsfvkzgfxxmgj1mq65q7n";
-       editedCabalFile = "4efd1cd219decf6e6a97795a52344922c36aace77dc4b6834502c218d48b9f13";
+       version = "0.6.1.1";
+       sha256 = "0dd79dxf56d8f6ad9if3j87s9gg7yd17ckypjxwplrbkahlb9xf5";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck

From 1c678fdcf3c84e2410901ecb46127a1d355fd4ff Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sun, 17 May 2015 15:12:27 +0200
Subject: [PATCH 0974/1143] scipy: 0.14.0 -> 0.15.1

Fixes #7870
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36feab0056e6..848f303915f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11085,11 +11085,11 @@ let
 
 
   scipy = buildPythonPackage rec {
-    name = "scipy-0.14.0";
+    name = "scipy-0.15.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz";
-      md5 = "d7c7f4ccf8b07b08d6fe49d5cd51f85d";
+      sha256 = "16i5iksaas3m0hgbxrxpgsyri4a9ncbwbiazlhx5d6lynz1wn4m2";
     };
 
     buildInputs = [ pkgs.gfortran ];

From 8c1dfabdce9cf00c1565e784bb3d55daa5c6284e Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Wed, 22 Apr 2015 19:19:27 +0200
Subject: [PATCH 0975/1143] rpy2: initial

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 98b012ecd466..b9d64a176737 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10955,6 +10955,22 @@ let
 
   });
 
+  rpy2 = buildPythonPackage rec {
+    name = "rpy2-2.5.6";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/r/rpy2/${name}.tar.gz";
+      md5 = "a36e758b633ce6aec6a5f450bfee980f";
+    };
+    buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ];
+    propagatedBuildInputs = [ self.singledispatch ];
+    meta = {
+      homepage = http://rpy.sourceforge.net/rpy2;
+      description = "Python interface to R";
+      license = stdenv.lib.licenses.gpl2Plus;
+      maintainers = [ stdenv.lib.maintainers.joelmo ];
+    };
+  };
+
   rpyc = buildPythonPackage rec {
     name = "rpyc-${version}";
     version = "3.3.0";

From 3a966376bf610083da36ba312eb8cdae46de6af5 Mon Sep 17 00:00:00 2001
From: C0DEHERO <codehero@nerdpol.ch>
Date: Sat, 16 May 2015 23:36:38 -0400
Subject: [PATCH 0976/1143] voxelands: added 1504.01

---
 pkgs/games/voxelands/default.nix | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  4 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/games/voxelands/default.nix

diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
new file mode 100644
index 000000000000..09c28f34c3a7
--- /dev/null
+++ b/pkgs/games/voxelands/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite
+, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "voxelands-${version}";
+  version = "1504.01";
+
+  src = fetchurl {
+      url = "http://voxelands.com/downloads/${name}-src.tar.bz2";
+      sha256 = "17jv2pz0mbkkf7jw3jcpix8hb46b382hc7vki42n9rrdynydq5zp";
+  };
+
+  cmakeFlags = [
+    "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
+    "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG"
+    "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG"
+  ];
+
+  buildInputs = [
+    cmake irrlicht libpng bzip2 libjpeg sqlite
+    libXxf86vm mesa openal libvorbis x11 pkgconfig
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://voxelands.com/;
+    description = "Infinite-world block sandbox game based on Minetest";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3efdf8365676..6d700ff5bfe2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13273,6 +13273,10 @@ let
 
   vessel = callPackage_i686 ../games/vessel { };
 
+  voxelands = callPackage ../games/voxelands {
+    libpng = libpng12;
+  };
+
   warmux = callPackage ../games/warmux { };
 
   warsow = callPackage ../games/warsow {

From e505663051c37e15b1d979465b2a5250cee219e5 Mon Sep 17 00:00:00 2001
From: C0DEHERO <codehero@nerdpol.ch>
Date: Sat, 16 May 2015 22:02:43 -0400
Subject: [PATCH 0977/1143] supertuxkart: update 0.8.1 -> 0.9

---
 lib/maintainers.nix                   |  1 +
 pkgs/games/super-tux-kart/default.nix | 38 +++++++++++++++------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6906abd2c78c..f13e05708c4a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -43,6 +43,7 @@
   bosu = "Boris Sukholitko <boriss@gmail.com>";
   bramd = "Bram Duvigneau <bram@bramd.nl>";
   bstrik = "Berno Strik <dutchman55@gmx.com>";
+  c0dehero = "CodeHero <codehero@nerdpol.ch>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
   campadrenalin = "Philip Horger <campadrenalin@gmail.com>";
   cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>";
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index f3574d137d39..29e923108e18 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,30 +1,34 @@
-{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa
+{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa
 , libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
-, fribidi, autoconf, automake, libtool, bluez }:
+, fribidi, autoconf, automake, libtool, bluez, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
   name = "supertuxkart-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2";
-    sha256 = "1mpqmi62a2kl6n58mw11fj0dr5xiwmjkqnfmd2z7ghdhc6p02lrk";
-  };
-
+  version = "0.9";
+  srcs = [
+    (fetchgit {
+      url = "https://github.com/supertuxkart/stk-code";
+      rev = "28a525f6d4aba2667c41a549b027149fcceda97e";
+      sha256 = "0b5izr7j3clm6pcxanwwaas06f17wi454s6hwmgv1mg48aay2v97";
+      name = "stk-code";
+    })
+    (fetchsvn {
+      url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
+      rev = "16293";
+      sha256 = "07jdkli28xr3rcxvixyy5bwi26n5i7dkhd9q0j4wifgs4pymm8r5";
+      name = "stk-assets";
+    })
+  ];
+  
   buildInputs = [
     plib SDL openal freealut mesa libvorbis libogg gettext
-    libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez
+    libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg
   ];
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    echo Building internal Irrlicht
-    cd lib/irrlicht/source/Irrlicht/
-    cp "${mesa}"/include/GL/{gl,glx,wgl}ext.h .
-    NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
-    cd -
-  '';
+  sourceRoot = "stk-code";
 
   meta = {
     description = "A Free 3D kart racing game";
@@ -35,6 +39,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://supertuxkart.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ];
   };
 }

From b549ce1ddd4516118eb802a25a539fdf99b0e69a Mon Sep 17 00:00:00 2001
From: C0DEHERO <codehero@nerdpol.ch>
Date: Sat, 16 May 2015 22:58:37 -0400
Subject: [PATCH 0978/1143] minetest: update 0.4.4 -> 0.4.12

---
 pkgs/games/minetest/default.nix | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 6c53bc3fdb3c..ac0b72d17e5b 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2,
-  libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }:
+{ stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
+, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite }:
 
 let
-  version = "0.4.4";
+  version = "0.4.12";
   sources = {
     src = fetchgit {
-      url = "https://github.com/celeron55/minetest.git";
-      rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8";
-      sha256 = "033gajwxgs8dqxb8684waaav28s0qd6cd4rlzfldwgdbkwam9cb1";
+      url = "https://github.com/minetest/minetest.git";
+      rev = "7993a403f2c17a215e4895ba1848aaf69bb61980";
+      sha256 = "04v6fd9r9by8g47xbjzkhkgac5zpik01idngbbx2in4fxrg3ac7c";
     };
     data = fetchgit {
-      url = "https://github.com/celeron55/minetest_game.git";
-      rev = "3928eccf74af0288d12ffb14f8222fae479bc06b";
-      sha256 = "1gw2267bnqwfpnm7iq014y1vkb1v3nhpg1dmg9vgm9z5yja2blif";
+      url = "https://github.com/minetest/minetest_game.git";
+      rev = "03c00a831d5c2fd37096449bee49557879068af1";
+      sha256 = "1qqhlfz296rmi3mmlvq1rwv7hq5w964w1scry095xaih7y11ycmk";
     };
   };
 in stdenv.mkDerivation {
@@ -21,12 +21,12 @@ in stdenv.mkDerivation {
   src = sources.src;
 
   cmakeFlags = [
-    "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht"
+    "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
   ];
 
   buildInputs = [
-    cmake irrlicht3843 libpng bzip2 libjpeg
-    libXxf86vm mesa openal libvorbis x11
+    cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp
+    libXxf86vm mesa openal libvorbis x11 sqlite
   ];
 
   postInstall = ''
@@ -34,9 +34,11 @@ in stdenv.mkDerivation {
     cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
   '';
 
-  meta = {
-    homepage = "http://minetest.net/";
+  meta = with stdenv.lib; {
+    homepage = http://minetest.net/;
     description = "Infinite-world block sandbox game";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
   };
 }

From 393219d00052dc47494d81a9619e25f1152314e5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 17 May 2015 19:33:18 +0200
Subject: [PATCH 0979/1143] hplip: stop installing corrupted tools

None of the installed tools like hp-align or hp-toolbox could
work, because they tried to import wrapped Python scripts (i.e.
shell code) as Python modules. Fix this by:

- Substituting `dbus` for the defective `pythonDBus`.

- No longer blindly wrapping all python files, but replacing
  the original symlinks in $out/bin with wrapper scripts.
  These wrappers then `exec` the unmodified Python scripts in
  $out/share/hplip directly, instead of the .<name>-wrapped
  copy that wrapPythonProgramsIn creates. The latter are simply
  removed.

Sure, it's a bit ugly. It's also 2015 and I couldn't use my
printer :-/
---
 pkgs/misc/drivers/hplip/default.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index bb790be7c268..7e5759235c66 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, automake, pkgconfig
 , cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
-, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
-, withPlugin ? false, substituteAll
+, polkit, qtSupport ? true, qt4, pyqt4, net_snmp
+, withPlugin ? false, substituteAll, makeWrapper
 }:
 
 let
@@ -74,7 +74,19 @@ stdenv.mkDerivation {
 
   postInstall =
     ''
-    wrapPythonPrograms
+      # Wrap the user-facing Python scripts in /bin without turning the ones
+      # in /share into shell scripts (they need to be importable).
+      # Complicated by the fact that /bin contains just symlinks to /share.
+      for bin in $out/bin/*; do
+        py=`readlink -m $bin`
+        rm $bin
+        cp $py $bin
+        wrapPythonProgramsIn $bin "$out $pythonPath"
+        sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin
+      done
+
+      # Remove originals. Knows a little too much about wrapPythonProgramsIn.
+      rm -f $out/bin/.*-wrapped
     ''
     + (stdenv.lib.optionalString withPlugin
     (let hplip_arch =
@@ -130,8 +142,8 @@ stdenv.mkDerivation {
     ] ++ stdenv.lib.optional qtSupport qt4;
 
   pythonPath = with pythonPackages; [
+      dbus
       pillow
-      pythonDBus
       pygobject
       recursivePthLoader
       reportlab
@@ -144,6 +156,6 @@ stdenv.mkDerivation {
       then licenses.unfree
       else with licenses; [ mit bsd2 gpl2Plus ];
     platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
-    maintainers = with maintainers; [ ttuegel jgeerds ];
+    maintainers = with maintainers; [ ttuegel jgeerds nckx ];
   };
 }

From 5583067fd8cef883aa75200fb4160e0909f3c8f8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 17 May 2015 14:15:39 -0500
Subject: [PATCH 0980/1143] emacsWithPackages: install support files

The wrapper needs to link the desktop file, icons, info and man pages
into place so they will appear when emacsWithPackages is installed.
---
 pkgs/build-support/emacs/wrapper.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index 678ba4502112..4020a1aca337 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -66,6 +66,12 @@ stdenv.mkDerivation {
       makeWrapper "$prog" $out/bin/$(basename "$prog") \
         --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:"
     done
+
+    mkdir -p $out/share
+    # Link icons and desktop files into place
+    for dir in applications icons info man; do
+      ln -s $emacs/share/$dir $out/share/$dir
+    done
   '';
   inherit (emacs) meta;
 }

From 9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 17 May 2015 15:12:14 -0500
Subject: [PATCH 0981/1143] Build free part of Clementine on Hydra

Clementine consists of a large free part (the main application) and a
small part with unfree dependencies (the Spotify blob). Add a top-level
attribute for the free Clementine for users who don't want unfree
software, and so that the bulk of Clementine will be in the binary cache.
---
 pkgs/applications/audio/clementine/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index cc13868e9d4e..5ebe1b3b7b8b 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -46,8 +46,8 @@ let
     usbmuxd
   ];
 
-  unwrapped = stdenv.mkDerivation {
-    name = "clementine-unwrapped-${version}";
+  free = stdenv.mkDerivation {
+    name = "clementine-free-${version}";
     inherit patches src buildInputs;
     enableParallelBuilding = true;
     meta = with stdenv.lib; {
@@ -91,7 +91,7 @@ with stdenv.lib;
 
 runCommand "clementine-${version}"
 {
-  inherit blob unwrapped;
+  inherit blob free;
   buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks
   dontPatchELF = true;
   dontStrip = true;
@@ -109,7 +109,7 @@ runCommand "clementine-${version}"
 }
 ''
   mkdir -p $out/bin
-  makeWrapper "$unwrapped/bin/${exeName}" "$out/bin/${exeName}" \
+  makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \
       ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
 ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d700ff5bfe2..cb0322b7b66b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1014,6 +1014,8 @@ let
     gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ];
   };
 
+  clementineFree = clementine.free;
+
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
   cmst = callPackage ../tools/networking/cmst { };

From e8efbcd3d3c2645e51b0efda71169fe656a600c8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 17 May 2015 15:36:13 -0500
Subject: [PATCH 0982/1143] clementine: install desktop files and icons

---
 pkgs/applications/audio/clementine/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 5ebe1b3b7b8b..c9b16b65267d 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -112,4 +112,9 @@ runCommand "clementine-${version}"
   makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \
       ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+
+  mkdir -p $out/share
+  for dir in applications icons kde4; do
+      ln -s "$free/share/$dir" "$out/share/$dir"
+  done
 ''

From f3162d6d4faf8dbc77fc5d58597e5331726c7654 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 17 May 2015 22:47:36 +0200
Subject: [PATCH 0983/1143] Add c0dehero as a maintainer of minetest and
 voxelands

---
 pkgs/games/minetest/default.nix  | 2 +-
 pkgs/games/voxelands/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index ac0b72d17e5b..79d75011ff0e 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -39,6 +39,6 @@ in stdenv.mkDerivation {
     description = "Infinite-world block sandbox game";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ jgeerds c0dehero ];
   };
 }
diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index 09c28f34c3a7..b6bd54f779df 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "Infinite-world block sandbox game based on Minetest";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ jgeerds c0dehero ];
   };
 }

From c714842d9f2f16853b685de9f94408de86d559b2 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Sun, 17 May 2015 14:30:57 -0700
Subject: [PATCH 0984/1143] patch GHC 7.8.4 on darwin to fix template haskell +
 hpc

---
 pkgs/development/compilers/ghc/7.8.4.nix       |  7 +++++--
 pkgs/development/compilers/ghc/hpc-7.8.4.patch | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/ghc/hpc-7.8.4.patch

diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix
index 5497b35ec1db..4323341dc4a4 100644
--- a/pkgs/development/compilers/ghc/7.8.4.nix
+++ b/pkgs/development/compilers/ghc/7.8.4.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   version = "7.8.4";
   name = "ghc-${version}";
 
@@ -45,4 +45,7 @@ stdenv.mkDerivation rec {
     inherit (ghc.meta) license platforms;
   };
 
-}
+} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+  # https://ghc.haskell.org/trac/ghc/ticket/9762
+  patches = [ ./hpc-7.8.4.patch ];
+})
diff --git a/pkgs/development/compilers/ghc/hpc-7.8.4.patch b/pkgs/development/compilers/ghc/hpc-7.8.4.patch
new file mode 100644
index 000000000000..212989200bc5
--- /dev/null
+++ b/pkgs/development/compilers/ghc/hpc-7.8.4.patch
@@ -0,0 +1,13 @@
+diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
+index 991fc57..0aad221 100644
+--- a/compiler/cmm/CLabel.hs
++++ b/compiler/cmm/CLabel.hs
+@@ -877,7 +877,7 @@ labelDynamic dflags this_pkg this_mod lbl =
+ 
+    PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m)
+ 
+-   HpcTicksLabel m        -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m)
++   HpcTicksLabel m        -> not (gopt Opt_Static dflags) && this_mod /= m
+ 
+    -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves.
+    _                 -> False

From 330836a82b92d8e9e7943d5fe8f8587cd6b0f9ed Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Sun, 17 May 2015 14:34:22 -0700
Subject: [PATCH 0985/1143] fix lua.pc library name

---
 pkgs/development/interpreters/lua-5/5.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 313db1038b85..ac94480b8e1a 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     Description: An Extensible Extension Language
     Version: ${version}
     Requires:
-    Libs: -L$out/lib -llua -lm
+    Libs: -L$out/lib -llua.${version} -lm
     Cflags: -I$out/include
     EOF
   '';

From ff7dd3e3b1cebea9d89f10ceff491edf1b2dc8a1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 17 May 2015 23:39:32 +0200
Subject: [PATCH 0986/1143] hplip: do wrap Python scripts in $out/lib

---
 pkgs/misc/drivers/hplip/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 7e5759235c66..8558d1f7deee 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -87,6 +87,8 @@ stdenv.mkDerivation {
 
       # Remove originals. Knows a little too much about wrapPythonProgramsIn.
       rm -f $out/bin/.*-wrapped
+
+      wrapPythonPrograms $out/lib "$out $pythonPath"
     ''
     + (stdenv.lib.optionalString withPlugin
     (let hplip_arch =

From c7ed090e21542078e3ad14db5d4a4ed8a925c6f7 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Sun, 17 May 2015 15:03:46 -0700
Subject: [PATCH 0987/1143] Revert "fix lua.pc library name"

This reverts commit 330836a82b92d8e9e7943d5fe8f8587cd6b0f9ed.
---
 pkgs/development/interpreters/lua-5/5.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index ac94480b8e1a..313db1038b85 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     Description: An Extensible Extension Language
     Version: ${version}
     Requires:
-    Libs: -L$out/lib -llua.${version} -lm
+    Libs: -L$out/lib -llua -lm
     Cflags: -I$out/include
     EOF
   '';

From 9474fefe287cbd4abe6b42377670c76a1e6e7f89 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 17 May 2015 17:13:19 -0500
Subject: [PATCH 0988/1143] firefoxWrapper: unquote shell glob

---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 5ebd26078412..91737031be2a 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
         --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
         --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
-        --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}*")"
+        --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)"
 
     ${ lib.optionalString libtrick
     ''

From 6803ddbf60584d10a184a3bf34d74ab491dcd82c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 17 May 2015 17:13:34 -0500
Subject: [PATCH 0989/1143] firefoxWrapper: install icon to hicolor theme

---
 .../networking/browsers/firefox/wrapper.nix          | 12 +++++++++---
 pkgs/top-level/all-packages.nix                      |  6 ++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 91737031be2a..a2134afdcf78 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   desktopItem = makeDesktopItem {
     name = browserName;
     exec = browserName + " %U";
-    icon = browserName;
+    inherit icon;
     comment = "";
     desktopName = desktopName;
     genericName = "Web Browser";
@@ -58,8 +58,14 @@ stdenv.mkDerivation {
     ''
     }
 
-    mkdir -p $out/share/icons
-    ln -s $out/lib/${browserName}${nameSuffix}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png
+    if [ -e "${browser}/share/icons" ]; then
+        mkdir -p "$out/share"
+        ln "${browser}/share/icons" "$out/share/icons"
+    else
+        mkdir -p "$out/share/icons/hicolor/128x128/apps"
+        ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \
+            "$out/share/icons/hicolor/128x128/apps/${browserName}.png"
+    fi
 
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications/* $out/share/applications
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb0322b7b66b..5d77bd150245 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11563,9 +11563,7 @@ let
   };
 
   midoriWrapper = wrapFirefox
-    { browser = midori; browserName = "midori"; desktopName = "Midori";
-      icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png";
-    };
+    { browser = midori; browserName = "midori"; desktopName = "Midori"; };
 
   mikmod = callPackage ../applications/audio/mikmod { };
 
@@ -12629,7 +12627,7 @@ let
 
   wrapFirefox =
     { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
-    , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }:
+    , icon ? browserName }:
     let
       cfg = stdenv.lib.attrByPath [ browserName ] {} config;
       enableAdobeFlash = cfg.enableAdobeFlash or false;

From 734bc9f2e52fe5e38c4df748d45a69fb6ed9fcef Mon Sep 17 00:00:00 2001
From: Mikkel Christiansen <mikkel@rheosystems.com>
Date: Wed, 13 May 2015 14:15:06 +0200
Subject: [PATCH 0990/1143] Add MongoDB tools and build dependencies.

---
 lib/maintainers.nix                       |   1 +
 pkgs/tools/misc/mongodb-tools/default.nix |  39 ++++++++
 pkgs/top-level/all-packages.nix           |   2 +
 pkgs/top-level/go-packages.nix            | 115 +++++++++++++++++++++-
 4 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/misc/mongodb-tools/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d4fda831d594..f13a00e4898f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -133,6 +133,7 @@
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
+  mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   MP2E = "Cray Elliott <MP2E@archlinux.us>";
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
new file mode 100644
index 000000000000..81e05a8790e5
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -0,0 +1,39 @@
+{ lib, goPackages, fetchurl, callPackage }:
+
+with goPackages;
+
+buildGoPackage rec {
+  version = "r3.1.2";
+  name = "mongodb-tools";
+  goPackagePath = "github.com/mongodb/mongo-tools";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/mongodb/mongo-tools/archive/${version}.tar.gz";
+    sha256 = "1dag8ar95jlfk6rm99y4p3dymcy2s2qnwd9jwqhw9fxr110mgf5s";
+  };
+
+  buildInputs = [ gopass go-flags crypto mgo openssl spacelog
+    oglematchers goconvey tomb ];
+
+  subPackages = [ "bsondump/main" "mongostat/main" "mongofiles/main"
+    "mongoexport/main" "mongoimport/main" "mongorestore/main"
+    "mongodump/main" "mongotop/main" "mongooplog/main" ];
+
+  buildPhase = ''
+    for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
+      echo Building $i
+      go build -o go/bin/$i go/src/${goPackagePath}/$i/main/$i.go
+    done
+  '';
+
+  dontInstallSrc = true;
+
+  meta = with lib; {
+    description = "Tools for MongoDB";
+    homepage = https://github.com/mongodb/mongo-tools;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mschristiansen ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 069e230dd144..f8a64a16d652 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -873,6 +873,8 @@ let
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
+  mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
+
   mstflint = callPackage ../tools/misc/mstflint { };
 
   mcelog = callPackage ../os-specific/linux/mcelog { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 035c152b6b18..278360f1ce12 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -151,6 +151,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  assertions = buildGoPackage rec {
+    version = "1.5.0";
+    name = "assertions-${version}";
+    goPackagePath = "github.com/smartystreets/assertions";
+    src = fetchurl {
+      name = "${name}.tar.gz";
+      url = "https://github.com/smartystreets/assertions/archive/${version}.tar.gz";
+      sha256 = "1s4b0v49yv7jmy4izn7grfqykjrg7zg79dg5hsqr3x40d5n7mk02";
+    };
+    buildInputs = [ oglematchers ];
+    propagatedBuildInputs = [ goconvey ];
+    # subPackages = [];
+    doCheck = false;
+  };
+
   aws-sdk-go = buildGoPackage rec {
     rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503";
     name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}";
@@ -356,6 +371,18 @@ let self = _self // overrides; _self = with self; {
     subPackages = [ "./" ];  # don't try to build test fixtures
   };
 
+  gls = buildGoPackage rec {
+    rev = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
+    name = "gls-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/jtolds/gls";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "jtolds";
+      repo = "gls";
+      sha256 = "1gvgkx7llklz6plapb95fcql7d34i6j7anlvksqhdirpja465jnm";
+    };
+  };
+
   goamz = buildGoPackage rec {
     rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7";
     name = "goamz-${rev}";
@@ -480,6 +507,19 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ net ];
   };
 
+  gopass = buildGoPackage rec {
+    rev = "2c70fa70727c953c51695f800f25d6b44abb368e";
+    name = "gopass-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/howeyc/gopass";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "howeyc";
+      repo = "gopass";
+      sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8";
+    };
+    buildInputs = [ crypto ];
+  };
+
   gosnappy = buildGoPackage rec {
     rev = "ce8acff4829e0c2458a67ead32390ac0a381c862";
     name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}";
@@ -576,6 +616,18 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ pkgs.etcd ];
   };
 
+  go-flags = buildGoPackage rec {
+    rev = "5e118789801496c93ba210d34ef1f2ce5a9173bd";
+    name = "go-flags-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/jessevdk/go-flags";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "jessevdk";
+      repo = "go-flags";
+      sha256 = "1davr5h936fhc8zy7digp5yqxr216d1mshksr7iiad5xb3r8r9ja";
+    };
+  };
+
   go-fuse = buildGoPackage rec {
     rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58";
     name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}";
@@ -943,6 +995,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  flagfile = buildGoPackage rec {
+    rev = "871ce569c29360f95d7596f90aa54d5ecef75738";
+    name = "flagfile-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/spacemonkeygo/flagfile";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "spacemonkeygo";
+      repo = "flagfile";
+      sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc";
+    };
+  };
+
   iochan = buildGoPackage rec {
     rev = "b584a329b193e206025682ae6c10cdbe03b0cd77";
     name = "iochan-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1050,14 +1114,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   mgo = buildGoPackage rec {
-    rev = "2";
+    rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
     name = "mgo-${rev}";
-    goPackagePath = "launchpad.net/mgo";
-    src = fetchbzr {
+    goPackagePath = "gopkg.in/mgo.v2";
+    src = fetchFromGitHub {
       inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";
+      owner = "go-mgo";
+      repo = "mgo";
+      sha256 ="0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
     };
+
+    buildInputs = [ pkgs.cyrus_sasl ];
   };
 
   mousetrap = buildGoPackage rec {
@@ -1162,6 +1229,19 @@ let self = _self // overrides; _self = with self; {
     doCheck = false; # check this again
   };
 
+  openssl = buildGoPackage rec {
+    rev = "84b5df477423634115e53fb171a66007cece19f5";
+    name = "openssl-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/spacemonkeygo/openssl";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "spacemonkeygo";
+      repo = "openssl";
+      sha256 = "1l0cyazxp8bwmi151djyr6pknj9jv8n53lgfhgj6l0zj32p5kh1v";
+    };
+    buildInputs = [ spacelog pkgconfig pkgs.openssl ];
+  };
+
   osext = buildGoPackage rec {
     rev = "10";
     name = "osext-${rev}";
@@ -1357,6 +1437,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  spacelog = buildGoPackage rec {
+    rev = "ae95ccc1eb0c8ce2496c43177430efd61930f7e4";
+    name = "spacelog-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/spacemonkeygo/spacelog";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "spacemonkeygo";
+      repo = "spacelog";
+      sha256 = "1i1awivsix0ch0vg6rwvx0536ziyw6phcx45b1rmrclp6b6dyacy";
+    };
+    buildInputs = [ flagfile ];
+  };
+
   stathat = buildGoPackage rec {
     rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77";
     name = "stathat-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1411,6 +1504,18 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ pty ];
   };
 
+  tomb = buildGoPackage rec {
+    rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
+    name = "tomb-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "gopkg.in/tomb.v2";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "go-tomb";
+      repo = "tomb";
+      sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
+    };
+  };
+
   toml = buildGoPackage rec {
     rev = "f87ce853111478914f0bcffa34d43a93643e6eda";
     name = "toml-${stdenv.lib.strings.substring 0 7 rev}";

From b679ccdca52b81c81ae147667493ccabc6faa7b7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 01:36:24 -0700
Subject: [PATCH 0991/1143] kernel: 3.10.78 -> 3.10.79

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 6743d1d95503..b270f0852f64 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.78";
+  version = "3.10.79";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "01cshlm8x8k2bbkh77w2r39kc0a3csrcxiv412j5ik608glzgx36";
+    sha256 = "0m30c9v4pvim72ha8ya8w6y691a8zkcrhxhj43kh668q1yqpqvkp";
   };
 
   features.iwlwifi = true;

From 4a7a3cd8a530eeda2f1e8fbcc4f54803d6807fc0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 01:36:43 -0700
Subject: [PATCH 0992/1143] kernel: 4.0.3 -> 4.0.4

---
 pkgs/os-specific/linux/kernel/linux-4.0.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index b095db41bd5a..9c7fb2c3bd8d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0.3";
+  version = "4.0.4";
   # Remember to update grsecurity!
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1djkbqrzi898qr2n0cd4m8casfj8pvgydc98l4ws3w8l9ikgwxw4";
+    sha256 = "1j5l87z6gd05cqzg680id0x1nk38kd6sjffd2lifl0fz5k6iqr9h";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 27162d500465..8fd7cd8c4171 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.0.3";
-      revision  = "201505141746";
+    { kversion  = "4.0.4";
+      revision  = "201505171737";
       branch    = "test";
-      sha256    = "0w65d5nmfir8kxgsxrq09mijjp09k193hyqmskia6a17n29943p1";
+      sha256    = "140c3qbv64q658vw9d4912rv0mjch217zkyz1qi9xn6bn1z5kvl5";
     };
 
   grsec_fix_path =

From 9265918feab59e55438d0fe0d7738626e70a935c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 01:36:34 -0700
Subject: [PATCH 0993/1143] kernel: 3.14.42 -> 3.14.43

---
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 16e46bf65c09..52fa5eba109e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.42";
+  version = "3.14.43";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "02k09ndhragz1p2mrq489fa7cgs2c2f3lwr1x0h1n94zqpsmpyip";
+    sha256 = "1m5gdzff46xm24p5x5ajxka99g0maf1y50nj59mbjccbqx3s7kvf";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 8fd7cd8c4171..8e24763b1690 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.42";
-      revision  = "201505141745";
+    { kversion  = "3.14.43";
+      revision  = "201505171736";
       branch    = "stable";
-      sha256    = "1565ggx42w0j038avz9d4pydf4j29rli2hz5wangf3vnjbhixh39";
+      sha256    = "1c3wjccinm8aqnqn6dr0rlmff2p4dwc4m383cs8bi9lfj5s1fyzn";
     };
 
   grsecurity_unstable = grsecPatch

From 8e36da20e7316f48cda169405116ed69ae632f99 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Mon, 18 May 2015 10:49:25 +0200
Subject: [PATCH 0994/1143] Update syncthing to 0.11.5

---
 pkgs/applications/networking/syncthing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 84d0d4ba2391..54e4e64cdcf3 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.1";
+  version = "0.11.5";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "518add39e2239fc8575cdf5cafc3562f006df7201fbd272077ed3bbbbfd816d4";
+    sha256 = "3a68cdecaec8d00b0fbf6348fb9b8adc628910e9572a89d9a413d6e7b79e7a06";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 7bc00dbdafe35f3bc4131db9bfdf9a6ccb8967de Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Mon, 18 May 2015 11:18:48 +0200
Subject: [PATCH 0995/1143] numpy: 1.8.2 -> 1.9.2

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 98b012ecd466..429ff01cf336 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7728,11 +7728,11 @@ let
   };
 
   numpy = buildPythonPackage ( rec {
-    name = "numpy-1.8.2";
+    name = "numpy-1.9.2";
 
     src = pkgs.fetchurl {
       url = "mirror://sourceforge/numpy/${name}.tar.gz";
-      sha256 = "1gcxlk3mf43pzpxvbw8kcfg173g4105j9szsfc1kxwablail6myf";
+      sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij";
     };
 
     disabled = isPyPy;  # WIP

From 0e2472ac86ba17cdb8b8f937d985dc191100f86e Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Mon, 18 May 2015 11:25:36 +0200
Subject: [PATCH 0996/1143] matplotlib: 1.4.2 -> 1.4.3

---
 pkgs/development/python-modules/matplotlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index d22c8cf32313..15716f204228 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -10,11 +10,11 @@ assert enableGhostscript -> ghostscript != null;
 assert enableGtk2 -> pygtk != null;
 
 buildPythonPackage rec {
-  name = "matplotlib-1.4.2";
+  name = "matplotlib-1.4.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/matplotlib/${name}.tar.gz";
-    sha256 = "0m6v9nwdldlwk22gcd339zg6mny5m301fxgks7z8sb8m9wawg8qp";
+    sha256 = "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av";
   };
   
   XDG_RUNTIME_DIR = "/tmp";

From 25f95555990b2681a269b066c47bf790e3bcbf3f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 18 May 2015 10:48:05 +0200
Subject: [PATCH 0997/1143] Drop GNOME 3.12

---
 .../services/x11/desktop-managers/gnome3.nix  |   5 +-
 nixos/tests/gnome3_16.nix                     |  34 --
 pkgs/applications/video/byzanz/default.nix    |   4 +-
 .../gnome-3/3.12/apps/bijiben/default.nix     |  40 ---
 .../gnome-3/3.12/apps/evolution/default.nix   |  50 ---
 .../gnome-3/3.12/apps/file-roller/default.nix |  33 --
 .../gnome-3/3.12/apps/gedit/default.nix       |  39 ---
 .../gnome-3/3.12/apps/glade/default.nix       |  36 ---
 .../gnome-3/3.12/apps/gnome-boxes/default.nix |  46 ---
 .../3.12/apps/gnome-clocks/default.nix        |  40 ---
 .../3.12/apps/gnome-documents/default.nix     |  56 ----
 .../gnome-3/3.12/apps/gnome-music/default.nix |  44 ---
 .../3.12/apps/gnome-photos/default.nix        |  47 ---
 .../3.12/apps/nautilus-sendto/default.nix     |  22 --
 .../gnome-3/3.12/apps/polari/default.nix      |  35 --
 .../gnome-3/3.12/apps/pomodoro/default.nix    |  49 ---
 .../gnome-3/3.12/apps/seahorse/default.nix    |  40 ---
 .../gnome-3/3.12/core/baobab/default.nix      |  40 ---
 .../gnome-3/3.12/core/caribou/default.nix     |  27 --
 .../gnome-3/3.12/core/dconf/default.nix       |  28 --
 .../gnome-3/3.12/core/empathy/default.nix     |  54 ----
 .../gnome-3/3.12/core/eog/default.nix         |  29 --
 .../gnome-3/3.12/core/epiphany/default.nix    |  53 ----
 .../core/epiphany/libxml_missing_dep.patch    |  10 -
 .../gnome-3/3.12/core/evince/default.nix      |  68 ----
 .../core/evolution-data-server/default.nix    |  34 --
 .../gnome-3/3.12/core/folks/default.nix       |  40 ---
 .../gnome-3/3.12/core/gconf/default.nix       |  32 --
 .../gnome-3/3.12/core/gcr/default.nix         |  28 --
 .../gnome-3/3.12/core/gdm/default.nix         |  41 ---
 .../gnome-3/3.12/core/gdm/propagate_env.patch |  13 -
 .../gnome-3/3.12/core/gdm/sessions_dir.patch  |  17 -
 .../gnome-3/3.12/core/gdm/xserver_path.patch  |  15 -
 .../3.12/core/geocode-glib/default.nix        |  20 --
 .../gnome-3/3.12/core/gjs/default.nix         |  21 --
 .../3.12/core/gnome-backgrounds/default.nix   |  16 -
 .../3.12/core/gnome-bluetooth/default.nix     |  22 --
 .../3.12/core/gnome-calculator/default.nix    |  36 ---
 .../3.12/core/gnome-common/default.nix        |  17 -
 .../gnome-contacts/configure_dbus_glib.patch  |  10 -
 .../3.12/core/gnome-contacts/default.nix      |  51 ---
 .../core/gnome-control-center/default.nix     |  60 ----
 .../search_providers_dir.patch                |  17 -
 .../vpn_plugins_path.patch                    |  19 --
 .../3.12/core/gnome-desktop/default.nix       |  27 --
 .../3.12/core/gnome-dictionary/default.nix    |  38 ---
 .../3.12/core/gnome-disk-utility/default.nix  |  41 ---
 .../3.12/core/gnome-font-viewer/default.nix   |  37 ---
 .../gnome-icon-theme-symbolic/default.nix     |  28 --
 .../3.12/core/gnome-icon-theme/default.nix    |  18 --
 .../3.12/core/gnome-keyring/default.nix       |  38 ---
 .../gnome-3/3.12/core/gnome-menus/default.nix |  24 --
 .../core/gnome-online-accounts/default.nix    |  22 --
 .../3.12/core/gnome-online-miners/default.nix |  35 --
 .../3.12/core/gnome-screenshot/default.nix    |  37 ---
 .../3.12/core/gnome-session/default.nix       |  30 --
 .../core/gnome-settings-daemon/default.nix    |  35 --
 .../core/gnome-shell-extensions/default.nix   |  26 --
 .../gnome-3/3.12/core/gnome-shell/default.nix |  55 ----
 .../3.12/core/gnome-system-log/default.nix    |  37 ---
 .../core/gnome-system-monitor/default.nix     |  39 ---
 .../3.12/core/gnome-terminal/default.nix      |  34 --
 .../core/gnome-themes-standard/default.nix    |  15 -
 .../3.12/core/gnome-user-docs/default.nix     |  20 --
 .../3.12/core/gnome-user-share/default.nix    |  51 ---
 .../3.12/core/grilo-plugins/default.nix       |  27 --
 .../gnome-3/3.12/core/grilo/default.nix       |  31 --
 .../gsettings-desktop-schemas/default.nix     |  21 --
 .../3.12/core/gtksourceview/default.nix       |  28 --
 .../core/gtksourceview/nix_share_path.patch   |  11 -
 .../gnome-3/3.12/core/gucharmap/default.nix   |  38 ---
 .../gnome-3/3.12/core/libcroco/default.nix    |  18 --
 .../gnome-3/3.12/core/libgdata/default.nix    |  25 --
 .../gnome-3/3.12/core/libgee/default.nix      |  25 --
 .../core/libgee/fix_introspection_paths.patch |  13 -
 .../3.12/core/libgnome-keyring/default.nix    |  26 --
 .../gnome-3/3.12/core/libgnomekbd/default.nix |  24 --
 .../gnome-3/3.12/core/libgweather/default.nix |  21 --
 .../gnome-3/3.12/core/libgxps/default.nix     |  20 --
 .../gnome-3/3.12/core/libpeas/default.nix     |  29 --
 .../gnome-3/3.12/core/libzapojit/default.nix  |  16 -
 .../gnome-3/3.12/core/mutter/default.nix      |  33 --
 .../gnome-3/3.12/core/nautilus/default.nix    |  29 --
 .../3.12/core/nautilus/extension_dir.patch    |  24 --
 .../gnome-3/3.12/core/rest/default.nix        |  18 --
 .../gnome-3/3.12/core/sushi/default.nix       |  38 ---
 .../3.12/core/totem-pl-parser/default.nix     |  20 --
 .../gnome-3/3.12/core/totem/default.nix       |  47 ---
 .../gnome-3/3.12/core/tracker/default.nix     |  55 ----
 .../gnome-3/3.12/core/vino/default.nix        |  33 --
 .../gnome-3/3.12/core/vte/default.nix         |  43 ---
 .../3.12/core/vte/expose_select_text.patch    | 227 -------------
 .../gnome-3/3.12/core/yelp-tools/default.nix  |  22 --
 .../gnome-3/3.12/core/yelp-xsl/default.nix    |  23 --
 .../gnome-3/3.12/core/yelp/default.nix        |  36 ---
 .../gnome-3/3.12/core/zenity/default.nix      |  23 --
 pkgs/desktops/gnome-3/3.12/default.nix        | 299 ------------------
 .../gnome-3/3.12/desktop/rarian/default.nix   |  16 -
 .../gnome-3/3.12/devtools/anjuta/default.nix  |  28 --
 .../gnome-3/3.12/devtools/gdl/default.nix     |  24 --
 .../gnome-3/3.12/misc/geary/default.nix       |  49 ---
 .../3.12/misc/geary/disable_valadoc.patch     |  24 --
 .../gnome-3/3.12/misc/gexiv2/default.nix      |  25 --
 .../gnome-3/3.12/misc/gfbgraph/default.nix    |  23 --
 .../gnome-3/3.12/misc/gitg/default.nix        |  45 ---
 .../3.12/misc/gnome-tweak-tool/default.nix    |  45 ---
 .../gnome-tweak-tool/find_gsettings.patch     |  22 --
 .../gnome-3/3.12/misc/goffice/0.8.nix         |  37 ---
 .../gnome-3/3.12/misc/goffice/default.nix     |  36 ---
 .../gnome-3/3.12/misc/goffice/pcre_info.patch |  13 -
 .../gnome-3/3.12/misc/gpaste/default.nix      |  43 ---
 .../gnome-3/3.12/misc/gtkhtml/default.nix     |  17 -
 .../gnome-3/3.12/misc/libgda/default.nix      |  30 --
 .../3.12/misc/libgit2-glib/default.nix        |  21 --
 .../gnome-3/3.12/misc/libmediaart/default.nix |  19 --
 .../core/gnome-control-center/default.nix     |   6 +-
 .../gnome-3/3.16/core/gnome-shell/default.nix |   7 +-
 pkgs/desktops/gnome-3/3.16/default.nix        |  18 +-
 pkgs/development/libraries/clutter/1.18.nix   |  52 ---
 pkgs/development/libraries/cogl/1.18.nix      |  57 ----
 pkgs/development/libraries/gtk+/3.16.nix      |  69 ----
 pkgs/development/libraries/gtk+/3.x.nix       |  16 +-
 pkgs/development/libraries/gtkmm/3.16.nix     |  42 ---
 pkgs/development/libraries/gtkmm/3.x.nix      |   4 +-
 pkgs/top-level/all-packages.nix               |  21 +-
 125 files changed, 23 insertions(+), 4254 deletions(-)
 delete mode 100644 nixos/tests/gnome3_16.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/eog/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/evince/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/folks/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/rest/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/totem/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vino/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vte/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix
 delete mode 100644 pkgs/development/libraries/clutter/1.18.nix
 delete mode 100644 pkgs/development/libraries/cogl/1.18.nix
 delete mode 100644 pkgs/development/libraries/gtk+/3.16.nix
 delete mode 100644 pkgs/development/libraries/gtkmm/3.16.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index d53f119c9558..cf6d2cab3492 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -45,7 +45,7 @@ in {
 
     environment.gnome3.packageSet = mkOption {
       default = null;
-      example = literalExample "pkgs.gnome3_12";
+      example = literalExample "pkgs.gnome3_16";
       description = "Which GNOME 3 package set to use.";
       apply = p: if p == null then pkgs.gnome3 else p;
     };
@@ -109,9 +109,6 @@ in {
           # Override default mimeapps
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
 
-          # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility.
-          export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
-
           # Let nautilus find extensions
           export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
 
diff --git a/nixos/tests/gnome3_16.nix b/nixos/tests/gnome3_16.nix
deleted file mode 100644
index 23a66aba50c5..000000000000
--- a/nixos/tests/gnome3_16.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-import ./make-test.nix {
-  name = "gnome3";
-
-  machine =
-    { config, pkgs, ... }:
-
-    { imports = [ ./common/user-account.nix ];
-
-      services.xserver.enable = true;
-
-      services.xserver.displayManager.auto.enable = true;
-      services.xserver.displayManager.auto.user = "alice";
-      services.xserver.desktopManager.gnome3.enable = true;
-
-      environment.gnome3.packageSet = pkgs.gnome3_16;
-
-      virtualisation.memorySize = 512;
-    };
-
-  testScript =
-    ''
-      $machine->waitForX;
-      $machine->sleep(15);
-
-      # Check that logging in has given the user ownership of devices.
-      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-
-      $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
-      $machine->waitForWindow(qr/Terminal/);
-      $machine->sleep(20);
-      $machine->screenshot("screen");
-    '';
-
-}
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index 69b0ffbe1314..79b9ab92ad9a 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }:
+{ stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }:
 
 stdenv.mkDerivation rec {
   version = "0.2.3.alpha";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh --prefix=$out
   '';
 
-  buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
 
   meta = with stdenv.lib; {
     description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser";
diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
deleted file mode 100644
index c4f6741c070a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils
-, clutter_gtk, libuuid, webkitgtk, zeitgeist
-, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "bijiben-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/bijiben/3.12/${name}.tar.xz";
-    sha256 = "f319ef2a5b69ff9368e7488a28453da0f10eaa39a0f8e5d74623d0c07c824708";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig glib intltool itstool libxml2
-                  clutter_gtk libuuid webkitgtk gnome3.tracker
-                  gnome3.gnome_online_accounts zeitgeist desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/bijiben" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Bijiben;
-    description = "Note editor designed to remain simple to use";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
deleted file mode 100644
index f0356352098e..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight, sqlite
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
-, makeWrapper, itstool, shared_mime_info, libical, db, gcr
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
-
-stdenv.mkDerivation rec {
-  name = "evolution-3.12.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz";
-    sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu
-                  gnome3.evolution_data_server libsecret libical gcr
-                  webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
-                  libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  nss nspr libnotify procps highlight gnome3.libgweather
-                  gnome3.gsettings_desktop_schemas makeWrapper sqlite ];
-
-  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Evolution;
-    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
deleted file mode 100644
index deff8494866b..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  name = "file-roller-${version}";
-
-  majVersion = "3.12";
-  version = "${majVersion}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
-    sha256 = "0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf";
-  };
-
-  # TODO: support nautilus
-  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
-
-  buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
-                  hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-                  attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/file-roller" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/FileRoller;
-    description = "Archive manager for the GNOME desktop environment";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
deleted file mode 100644
index c65a28c34467..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, intltool, fetchurl, enchant, isocodes
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libsoup, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "gedit-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz";
-    sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup
-                  gnome3.libpeas gnome3.gtksourceview libxml2
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gedit" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gedit;
-    description = "Official text editor of the GNOME desktop environment";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
deleted file mode 100644
index 4783804f200a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, python
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libxml2, docbook_xsl
-, gnome3, librsvg, gdk_pixbuf, libxslt }:
-
-stdenv.mkDerivation rec {
-  name = "glade-3.16.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
-    sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
-                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/glade" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Glade;
-    description = "User interface designer for GTK+ applications";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
deleted file mode 100644
index 7d33933656a3..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
-, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
-, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio
-}:
-
-# TODO: ovirt (optional)
-
-stdenv.mkDerivation rec {
-  name = "gnome-boxes-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-boxes/3.12/${name}.tar.xz";
-    sha256 = "0kzdh8kk9isaskbfyj7r7nybgdyhj7i4idkgahdsl9xs9sj2pmc8";
-  };
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  buildInputs = [
-    makeWrapper pkgconfig intltool itstool libvirt-glib glib
-    gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
-    libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-    librsvg hicolor_icon_theme desktop_file_utils
-  ];
-
-  preFixup = ''
-    for prog in "$out/bin/"*; do
-        wrapProgram "$prog" \
-            --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-            --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Simple GNOME 3 application to access remote or virtual systems";
-    homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
deleted file mode 100644
index 47bcbf692ad6..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, libgweather, libnotify
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libcanberra_gtk3, libtool
-, gnome3, librsvg, gdk_pixbuf, geoclue2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-clocks-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-clocks/3.12/${name}.tar.xz";
-    sha256 = "3fc0ce2b7b2540d6c2d791ff63ab1670f189a339c804fcf24c9010a478314604";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
-                  libgweather libnotify libtool
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-clocks" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Clocks;
-    description = "Clock application designed for GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
deleted file mode 100644
index 642e0044a757..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, intltool, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libxslt, webkitgtk
-, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json_glib
-, gmp, desktop_file_utils }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-documents-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-documents/3.12/${name}.tar.xz";
-    sha256 = "6d0df1d90781d56992ed5d5c2591833e89e3aa756ccab63f82dd935185ce5a53";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
-                  docbook_xsl desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg evince
-                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
-                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
-                  gnome3.gnome_desktop gnome3.libzapojit json_glib
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  enableParallelBuilding = true;
-
-  preFixup =
-    let
-      libPath = stdenv.lib.makeLibraryPath
-        [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ];
-    in
-    ''
-    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
-
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-        --prefix LD_LIBRARY_PATH ":" "${libPath}" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-        --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Documents;
-    description = "Document manager application designed to work with GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
deleted file mode 100644
index ebcd4c0d01ed..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
-, python3, libxml2, python3Packages, libnotify
-, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
-, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-music-3.12.2.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz";
-    sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 cairo
-                  gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
-                  python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-music" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Music;
-    description = "Music player and management application for the GNOME desktop environment";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
deleted file mode 100644
index 4d080039a880..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, exempi, libxml2
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, gegl, babl, lcms2
-, desktop_file_utils, gmp
-, gnome3, librsvg, gdk_pixbuf, libexif }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-photos-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-photos/3.12/${name}.tar.xz";
-    sha256 = "077cc6c2ae28680457fba435a22184e25f3a60a6fbe1901a75e42f6f6136538f";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi
-                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
-                  gnome3.gnome_online_accounts gnome3.gnome_desktop
-                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  preFixup = ''
-    substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication"
-
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Photos;
-    description = "Photos is an application to access, organize and share your photos with GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
deleted file mode 100644
index 5a85e00e4e45..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
-, gobjectIntrospection, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-sendto-${version}";
-
-  version = "3.8.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
-    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
-  };
-
-  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
-
-  meta = with stdenv.lib; {
-    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
deleted file mode 100644
index 6289fd4a6db5..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib
-, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup
-, gdk_pixbuf, librsvg }:
-
-stdenv.mkDerivation rec {
-  name = "polari-3.12.2";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz";
-    sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995";
-  };
-
-  buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3
-                  telepathy_glib gnome3.gjs telepathy_logger libsoup
-                  gdk_pixbuf librsvg
-                  gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  propagatedUserEnvPkgs = [ telepathy_idle ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/polari" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "Internet Relay Chat (IRC) client designed for GNOME 3";
-    homepage = https://wiki.gnome.org/Apps/Polari;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
deleted file mode 100644
index 152acb26b1bc..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, hicolor_icon_theme
-}:
-
-stdenv.mkDerivation rec {
-  rev = "0.10.3";
-  name = "gnome-shell-pomodoro-${rev}-61df3fa";
-
-  src = fetchFromGitHub {
-      owner = "codito";
-      repo = "gnome-shell-pomodoro";
-      rev = "${rev}";
-      sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship";
-  };
-
-  configureScript = ''./autogen.sh'';
-
-  buildInputs = [
-    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gnome3_12.gsettings_desktop_schemas gnome3_12.gnome_desktop
-    gnome3_12.gnome_common gnome3_12.gnome_shell hicolor_icon_theme gtk3
-  ];
-
-  preBuild = ''
-    sed -i \
-        -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
-        -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3_12.gnome_desktop}\1|' \
-        vapi/Makefile
-  '';
-
-  preFixup = ''
-    wrapProgram $out/bin/gnome-pomodoro \
-        --prefix XDG_DATA_DIRS : \
-        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/codito/gnome-shell-pomodoro;
-    description =
-      "Personal information management application that provides integrated " + 
-      "mail, calendaring and address book functionality";
-    maintainers = with maintainers; [ DamienCassou ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
deleted file mode 100644
index 02365d6b3d5a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, vala
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, gnupg, libsoup
-, gnome3, librsvg, gdk_pixbuf, gpgme
-, libsecret, avahi, p11_kit }:
-
-stdenv.mkDerivation rec {
-  name = "seahorse-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/seahorse/3.12/${name}.tar.xz";
-    sha256 = "5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
-                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme
-                  libsecret avahi libsoup p11_kit vala gnome3.gcr
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/seahorse" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Seahorse;
-    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
deleted file mode 100644
index 4d6c91787a37..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "baobab-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/baobab/3.12/${name}.tar.xz";
-    sha256 = "494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/baobab" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Baobab;
-    description = "Graphical application to analyse disk usage in any Gnome environment";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
deleted file mode 100644
index 3a6c3f0dd357..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
-, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }:
-
-
-stdenv.mkDerivation rec {
-  name = "caribou-0.4.13";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz";
-    sha256 = "953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782";
-  };
-
-  buildInputs = with gnome3;
-    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3
-      libxml2 libXtst gtk2 intltool libxslt ];
-
-  propagatedBuildInputs = [ gnome3.libgee libxklavier ];
-
-  preBuild = ''
-    patchShebangs .
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
deleted file mode 100644
index a1d98449bee9..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "dconf-${version}";
-  version = "0.20.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz";
-    sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9";
-  };
-
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
-                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/dconf-editor" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-
-    rm $out/lib/gio/modules/giomodule.cache
-    rm $out/share/icons/hicolor/icon-theme.cache
-    rm $out/share/icons/HighContrast/icon-theme.cache
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
deleted file mode 100644
index a10450d93328..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
-, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
-, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
-, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
-, telepathy_logger, libnotify, clutter, libsoup, gnutls
-, evolution_data_server
-, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee  }:
-
-# TODO: enable more features
-
-stdenv.mkDerivation rec {
-  name = "empathy-3.12.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz";
-    sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
-                            gnome_online_accounts shared_mime_info ];
-  propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
-                            telepathy_mission_control ];
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
-                  libxml2 libxslt icu file makeWrapper
-                  telepathy_glib clutter_gtk clutter-gst cogl
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
-                  libnotify clutter libsoup gnutls libgee p11_kit
-                  libcanberra_gtk3 telepathy_farstream farstream
-                  gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas file libtool librsvg ];
-
-  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
-                         "-I${dbus_libs}/include/dbus-1.0"
-                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Empathy;
-    description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
-    maintainers = with maintainers; [ lethalman ];
-    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
deleted file mode 100644
index de30f0dbbe14..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
-, shared_mime_info, makeWrapper, librsvg, libexif }:
-
-
-stdenv.mkDerivation rec {
-  name = "eog-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/eog/3.12/${name}.tar.xz";
-    sha256 = "0ca8be7f20c98e9b104b2c1fa53df293e5403e6d517de845ae0f3b72777453fd";
-  };
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
-      gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/eog" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
-    platforms = platforms.linux;
-    description = "GNOME image viewer";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
deleted file mode 100644
index d159965c5443..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
-, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
-, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }:
-
-stdenv.mkDerivation rec {
-  name = "epiphany-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz";
-    sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93";
-  };
-
-  # Tests need an X display
-  configureFlags = [ "--disable-static --disable-tests" ];
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  nativeBuildInputs = [ pkgconfig file ];
-
-  configureScript = "./autogen.sh";
-
-  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
-                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
-                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  patches = [ ./libxml_missing_dep.patch ];
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Epiphany;
-    description = "WebKit based web browser for GNOME";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
deleted file mode 100644
index c4dc85cd97e6..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2014-05-19 13:28:28.493988695 +0200
-+++ configure.ac	2014-05-19 13:28:54.837159748 +0200
-@@ -115,6 +115,7 @@
- 
- PKG_CHECK_MODULES(WEB_EXTENSION, [
-                   $WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED
-+		  libxml-2.0 >= $LIBXML_REQUIRED
-                   libsecret-1 >= $LIBSECRET_REQUIRED
-                   ])
- AC_SUBST(WEB_EXTENSION_CFLAGS)
diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
deleted file mode 100644
index d1ad071d426a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
-, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
-, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
-, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
-, gobjectIntrospection
-}:
-
-stdenv.mkDerivation rec {
-  name = "evince-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz";
-    sha256 = "30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d";
-  };
-
-  buildInputs = [
-    pkgconfig intltool perl perlXMLParser libxml2
-    glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
-    itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
-    poppler ghostscriptX djvulibre libspectre
-    makeWrapper libsecret librsvg
-  ];
-
-  configureFlags = [
-    "--disable-nautilus" # Do not use nautilus
-    "--enable-introspection"
-  ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  preConfigure = with stdenv.lib;
-    optionalString doCheck ''
-      for file in test/*.py; do
-        echo "patching $file"
-        sed '1s,/usr,${python},' -i "$file"
-      done
-    '' + optionalString (recentListSize != null) ''
-      sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
-      sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
-    '';
-
-  preFixup = ''
-    # Tell Glib/GIO about the MIME info directory, which is used
-    # by `g_file_info_get_content_type ()'.
-    wrapProgram "$out/bin/evince" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  doCheck = false; # would need pythonPackages.dogTail, which is missing
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/projects/evince/;
-    description = "GNOME's document viewer";
-
-    longDescription = ''
-      Evince is a document viewer for multiple document formats.  It
-      currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
-      of Evince is to replace the multiple document viewers that exist
-      on the GNOME Desktop with a single simple application.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.vcunat ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
deleted file mode 100644
index a92cf684a761..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python, sqlite
-, intltool, libsoup, libxml2, libsecret, icu
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
-
-
-stdenv.mkDerivation rec {
-  name = "evolution-data-server-3.12.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz";
-    sha256 = "d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811";
-  };
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
-      gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper icu sqlite ]
-    ++ stdenv.lib.optional valaSupport vala;
-
-  # uoa irrelevant for now
-  configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
-                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
-
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
deleted file mode 100644
index 7e3af8405a4b..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
-, telepathy_glib, evolution_data_server, libsecret, db }:
-
-# TODO: enable more folks backends
-
-stdenv.mkDerivation rec {
-  name = "folks-0.9.8";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz";
-    sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj";
-  };
-
-  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
-  # dbus_daemon needed for tests
-  buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
-                  vala libsecret libxml2 libsoup nspr nss intltool db ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = "--disable-fatal-warnings";
-
-  NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
-                        "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
-
-  enableParallelBuilding = true;
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Folks";
-
-    homepage = https://wiki.gnome.org/Projects/Folks;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
deleted file mode 100644
index a4cb3e8c1464..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
-, intltool, polkit, orbit, withGtk ? false }:
-
-assert withGtk -> (gnome3 != null);
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.2";
-  versionMinor = "6";
-  moduleName   = "GConf";
-
-  origName = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  name = "gconf-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
-    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
-  };
-
-  buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
-  propagatedBuildInputs = [ glib dbus_glib  ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  # ToDo: ldap reported as not found but afterwards reported as supported
-
-  meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gconf/;
-    description = "A system for storing application preferences";
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
deleted file mode 100644
index 6dd69a64fd71..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
-, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt, vala }:
-
-stdenv.mkDerivation rec {
-  name = "gcr-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gcr/3.12/${name}.tar.xz";
-    sha256 = "456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c";
-  };
-
-  buildInputs = [
-    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt
-    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
-  ];
-
-  #doCheck = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gcr-viewer" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
deleted file mode 100644
index a939a8d4fd9f..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/3.12/${name}.tar.xz";
-    sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4";
-  };
-
-  # Only needed to make it build
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
-  '';
-
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  preBuild = ''
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
-  '';
-
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./propagate_env.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
deleted file mode 100644
index b3e356a65c3e..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/daemon/gdm-launch-environment.c	2014-11-24 15:43:55.532879804 +0100
-+++ a/daemon/gdm-launch-environment.c	2014-11-28 18:22:42.636313967 +0100
-@@ -220,8 +220,8 @@ 
-                 "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
-                 "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
-                 "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
--                "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH",
--                NULL
-+                "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH",
-+                "XDG_CONFIG_DIRS", NULL
-         };
-         char *system_data_dirs;
-         int i;
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731d..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
deleted file mode 100644
index 412daee9f270..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
deleted file mode 100644
index 6a461e3bde6e..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
-
-
-stdenv.mkDerivation rec {
-  name = "geocode-glib-3.12.2";
-
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/3.12/${name}.tar.xz";
-    sha256 = "5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e";
-  };
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig glib libsoup json_glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
deleted file mode 100644
index c1e5486d3a71..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
-
-
-stdenv.mkDerivation rec {
-  name = "gjs-1.40.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gjs/1.40/${name}.tar.xz";
-    sha256 = "2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793";
-  };
-
-  buildInputs = with gnome3;
-    [ gobjectIntrospection pkgconfig glib pango ];
-
-  propagatedBuildInputs = [ spidermonkey_24 ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
deleted file mode 100644
index 46db008787f6..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-backgrounds-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz";
-    sha256 = "ac4d3e0fffc5991865ca748e728a1ab87f167400105250ce2195b03502427180";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
deleted file mode 100644
index fae47476898d..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
-, udev, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-bluetooth-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0rsw27yj6887axk7s2vwpsr0pmic0wdskl7sx8rk4kns7b0ifs88";
-  };
-
-  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
-                               gsettings_desktop_schemas itstool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
-    description = "Application that let you manage Bluetooth in the GNOME destkop";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
deleted file mode 100644
index 19d0c9c10e89..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-calculator-3.12.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz";
-    sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxml2 gnome3.gtksourceview
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-calculator" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
-    description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
deleted file mode 100644
index b534d6922b76..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, which, autoconf, automake }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-common-3.12.0";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/gnome-common/3.12/${name}.tar.xz";
-    sha256 = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8";
-  };
-
-  patches = [(fetchurl {
-    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
-    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
-  })];
-
-  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
deleted file mode 100644
index 926762defbde..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2014-04-08 10:25:49.497620879 +0200
-+++ configure.ac	2014-04-08 10:26:36.639440950 +0200
-@@ -43,6 +43,7 @@
- 	     folks-telepathy
- 	     folks-eds
- 	     libnotify
-+	     dbus-glib-1
- 	     telepathy-glib >= 0.17.5
- 	     libebook-1.2 >= 3.5.3
- 	     libedataserver-1.2 >= 3.5.3
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
deleted file mode 100644
index 5b4ca5c34182..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, intltool, fetchurl, evolution_data_server, db
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
-, bash, makeWrapper, itstool, folks, libnotify, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala, dbus_glib, automake114x, autoconf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-contacts-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-contacts/3.12/${name}.tar.xz";
-    sha256 = "fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
-
-  # force build from vala
-  preBuild = ''
-   touch src/*.vala
-  '';
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
-                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
-                  folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
-                  libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  vala automake114x autoconf db ];
-
-  preFixup = ''
-    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  patches = [ ./configure_dbus_glib.patch ];
-
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Contacts;
-    description = "Contacts is GNOME's integrated address book";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
deleted file mode 100644
index 4a394b3b8975..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig
-, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, krb5, networkmanagerapplet, networkmanager
-, libwacom, samba, shared_mime_info, tzdata, icu, libtool
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
-
-# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
-# TODO: bluetooth, wacom, smbclient, printers
-
-stdenv.mkDerivation rec {
-  name = "gnome-control-center-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-control-center/3.12/${name}.tar.xz";
-    sha256 = "5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
-
-  enableParallelBuilding = true;
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
-      libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
-      gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
-      accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
-      gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk
-      hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino
-      networkmanager modemmanager makeWrapper  ];
-
-  preBuild = ''
-    substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-
-    # hack to make test-endianess happy
-    mkdir -p $out/share/locale
-    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
-  '';
-
-  preFixup = with gnome3; ''
-    wrapProgram $out/bin/gnome-control-center \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    for i in $out/share/applications/*; do
-      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
-    done
-  '';
-
-  patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ];
-
-  meta = with stdenv.lib; {
-    description = "Single sign-on framework for GNOME";
-    maintainers = with maintainers; [ lethalman ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
deleted file mode 100644
index 7f5ad970f34e..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c
-index d08e230..3bff4ad 100644
---- a/panels/search/cc-search-panel.c
-+++ b/panels/search/cc-search-panel.c
-@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self)
- {
-   GFile *providers_location;
- 
--  providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers");
-+  const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR");
-+  if (search_providers_dir == NULL) {
-+    search_providers_dir = DATADIR "/gnome-shell/search-providers";
-+  }
-+  providers_location = g_file_new_for_path (search_providers_dir);
-   g_file_enumerate_children_async (providers_location,
-                                    "standard::type,standard::name,standard::content-type",
-                                    G_FILE_QUERY_INFO_NONE,
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
deleted file mode 100644
index e25105a303f4..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
-index 7dc23c2..fcb1384 100644
---- a/panels/network/connection-editor/vpn-helpers.c
-+++ b/panels/network/connection-editor/vpn-helpers.c
-@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
- 		if (!so_path)
- 			goto next;
- 
--		/* Remove any path and extension components, then reconstruct path
--		 * to the SO in LIBDIR
--		 */
--		so_name = g_path_get_basename (so_path);
--		g_free (so_path);
--		so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
--		g_free (so_name);
--
- 		module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
- 		if (!module) {
- 			g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
deleted file mode 100644
index e8d4efc1c806..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
-, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
-, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-
-  majorVersion = "3.12";
-  minorVersion = "2";
-  name = "gnome-desktop-${majorVersion}.${minorVersion}";
-
-  # this should probably be setuphook for glib
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
-    sha256 = "b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d";
-  };
-
-  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland
-                  gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
deleted file mode 100644
index 6f68916b781e..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-dictionary-3.10.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz";
-    sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-dictionary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Dictionary;
-    description = "Dictionary is the GNOME application to look up definitions";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
deleted file mode 100644
index a68624ba0e10..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
-, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-disk-utility-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz";
-    sha256 = "5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxslt libtool libsecret libpwquality cracklib
-                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
-                  gdk_pixbuf gnome3.gnome_icon_theme
-                  librsvg udisks2 gnome3.gnome_settings_daemon
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-disks" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
-    description = "A udisks graphical front-end";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
deleted file mode 100644
index a74c5722ba2a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool
-, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-font-viewer-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/3.12/${name}.tar.xz";
-    sha256 = "fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-font-viewer" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Program that can preview fonts and create thumbnails for fonts";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
deleted file mode 100644
index 066951c63a68..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-icon-theme-symbolic-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/${name}.tar.xz";
-    sha256 = "851a4c9d8e8cb0000c9e5e78259ab8b8e67c5334e4250ebcc8dfdaa33520068b";
-  };
-
-  configureFlags = "--enable-icon-mapping";
-
-  # Avoid postinstall make hooks
-  installPhase = ''
-    make install-exec-am install-data-local install-pkgconfigDATA
-    make -C src install
-  '';
-
-  buildInputs = [ pkgconfig iconnamingutils gtk ];
-
-  propagatedBuildInputs = [ gnome3.gnome_icon_theme ];
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_icon_theme ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
deleted file mode 100644
index 34a3b67af7e4..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-icon-theme-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz";
-    sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
-
-  propagatedBuildInputs = [ hicolor_icon_theme ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
deleted file mode 100644
index 59667fe3323d..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
-, docbook_xsl_ns, docbook_xsl, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-keyring-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/3.12/${name}.tar.xz";
-    sha256 = "3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c";
-  };
-
-  buildInputs = with gnome3; [
-    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
-    pango gcr gdk_pixbuf atk p11_kit makeWrapper
-  ];
-
-  propagatedBuildInputs = [ glib libtasn1 libxslt ];
-
-  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
-
-  configureFlags = [
-    "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
-    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
-    "--with-pkcs11-modules=$$out/lib/pkcs11/"
-  ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-keyring" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    wrapProgram "$out/bin/gnome-keyring-daemon" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
deleted file mode 100644
index 37d2ea1c0863..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-menus-${version}";
-  version = "3.10.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
-    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  preBuild = "patchShebangs ./scripts";
-
-  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
-
-  meta = {
-    homepage = "http://www.gnome.org";
-    description = "Gnome menu specification";
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
deleted file mode 100644
index e113a854a8b9..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib
-, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl
-}:
-
-stdenv.mkDerivation rec {
-  name = "gnome-online-accounts-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-accounts/3.12/${name}.tar.xz";
-    sha256 = "cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
deleted file mode 100644
index 394a3ee447cd..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json_glib, gmp, openssl, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-online-miners-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-miners/3.12/${name}.tar.xz";
-    sha256 = "734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
-                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
-                  gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
-                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/libexec/*; do
-      wrapProgram "$f" \
-        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
-    description = "A set of crawlers that go through your online content and index them locally in Tracker";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
deleted file mode 100644
index 349df0b103c9..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-screenshot-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz";
-    sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-screenshot" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
-    description = "Utility used in the GNOME desktop environment for taking screenshots";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
deleted file mode 100644
index bebd0b4b77c4..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
-
-
-stdenv.mkDerivation rec {
-  name = "gnome-session-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/3.12/${name}.tar.xz";
-    sha256 = "fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3";
-  };
-
-  configureFlags = "--enable-systemd";
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon xorg.xtrans
-      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-session" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
deleted file mode 100644
index 81b49e6bc643..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
-, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-settings-daemon-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-settings-daemon/3.12/${name}.tar.xz";
-    sha256 = "e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f";
-  };
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas
-      libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio
-      libcanberra_gtk3 upower colord libgweather xkeyboard_config
-      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
-      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PATH : "${glib}/bin" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
deleted file mode 100644
index 8503af44613c..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, intltool, fetchurl, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool
-, gnome3, file }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell-extensions/3.12/${name}.tar.xz";
-    sha256 = "30ba6e4792062e5a5cdd18e4a12230e68bfed1ded7de433ad241dd75e7ae2fc6";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
-                  makeWrapper file ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
-    description = "Modify and extend GNOME Shell functionality and behavior";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
deleted file mode 100644
index 578081ccf89d..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
-, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
-, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, hicolor_icon_theme, sqlite
-, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
-
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
-
-stdenv.mkDerivation rec {
-  name = "gnome-shell-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell/3.12/${name}.tar.xz";
-    sha256 = "3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71";
-  };
-
-  buildInputs = with gnome3;
-    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg
-      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
-      libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
-      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
-      hicolor_icon_theme gnome_icon_theme gnome_icon_theme_symbolic sqlite
-      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
-
-  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
-
-  preBuild = ''
-    patchShebangs src/data-to-c.pl
-    substituteInPlace data/Makefile --replace " install-keysDATA" ""
-  '';
-
-  preFixup = with gnome3; ''
-    wrapProgram "$out/bin/gnome-shell" \
-      --prefix PATH : "${unzip}/bin" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
-      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-    echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
-  '';
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
deleted file mode 100644
index 9abeda537447..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-log-3.9.90";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
-    sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-log" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
-    description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
deleted file mode 100644
index 622df1c5db21..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-monitor-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz";
-    sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [  ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
-                  gtkmm3 libgtop makeWrapper
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-monitor" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
-    description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
deleted file mode 100644
index 057ef191a6f4..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, libuuid
-, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.12";
-  versionMinor = "2";
-
-  name = "gnome-terminal-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
-    sha256 = "ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd";
-  };
-
-  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-                  gnome3.dconf itstool makeWrapper gnome3.nautilus ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
-
-  # FIXME: enable for gnome3
-  configureFlags = [ "--disable-search-provider" "--disable-migration" ];
-
-  preFixup = ''
-    for f in "$out/libexec/gnome-terminal-server"; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
deleted file mode 100644
index 5128a1951411..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-themes-standard-3.12.0";
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-themes-standard/3.12/${name}.tar.xz";
-    sha256 = "a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217";
-  };
-  
-  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
deleted file mode 100644
index 2a237b15c21c..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-user-docs-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz";
-    sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd";
-  };
-
-  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-help/3.12;
-    description = "User and system administration help for the Gnome desktop";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.cc-by-30;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
deleted file mode 100644
index fde47a66340b..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
-, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
-, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-user-share-3.10.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz";
-    sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  preConfigure = ''
-    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
-  '';
-
-  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
-                     "--with-modules-path=${apacheHttpd_2_2}/modules"
-                     "--disable-bluetooth"
-                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  nautilus libnotify libcanberra_gtk3 ];
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/$name
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
-    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-user-share" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
-    description = "Service that exports the contents of the Public folder in your home directory on the local network";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
deleted file mode 100644
index 9076d5c58390..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
-, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
-, gmime, json_glib, avahi, tracker, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "grilo-plugins-0.2.13";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
-    sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
-  };
-
-  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
-
-  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
-                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
-                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
-                  avahi gnome3.libmediaart tracker intltool itstool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "A collection of plugins for the Grilo framework";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
deleted file mode 100644
index 9c0e3f9a0bc9..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup }:
-
-stdenv.mkDerivation rec {
-  name = "grilo-0.2.11";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
-    sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6";
-  };
-
-  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
-
-  preConfigure = ''
-    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
-       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
-    done
-  '';
-
-  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
-                  gnome3.totem-pl-parser gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
deleted file mode 100644
index 917bcd99c95f..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
-  # just for passthru
-, gtk3, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.12";
-  versionMinor = "2";
-  moduleName   = "gsettings-desktop-schemas";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1";
-  };
-
-  buildInputs = [ glib gobjectIntrospection ];
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
deleted file mode 100644
index 5779b6d04802..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2Python, perl, intltool, gettext }:
-
-stdenv.mkDerivation rec {
-  name = "gtksourceview-${version}";
-  version = "3.12.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz";
-    sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk";
-  };
-
-  propagatedBuildInputs = [ gtk3 ];
-
-  buildInputs = [ pkgconfig atk cairo glib pango
-                  libxml2Python perl intltool gettext ];
-
-  preBuild = ''
-    substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
-  ''; 
-
-  patches = [ ./nix_share_path.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch
deleted file mode 100644
index c87350167c25..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gtksourceview/gtksourceview-utils.c	2014-07-13 16:13:57.418687726 +0200
-+++ b/gtksourceview/gtksourceview-utils.c	2014-07-13 16:14:20.550847767 +0200
-@@ -68,6 +68,8 @@
- 							 basename,
- 							 NULL));
- 
-+        g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
-+
- 	g_ptr_array_add (dirs, NULL);
- 
- 	return (gchar**) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
deleted file mode 100644
index 590f8706fff5..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3
-, glib, desktop_file_utils, bash
-, makeWrapper, gnome3, file, itstool, libxml2 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic 
-
-stdenv.mkDerivation rec {
-  name = "gucharmap-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gucharmap/3.12/${name}.tar.xz";
-    sha256 = "5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 intltool itstool glib
-                  gnome3.yelp_tools libxml2 file desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gucharmap" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gucharmap;
-    description = "GNOME Character Map, based on the Unicode Character Database";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
deleted file mode 100644
index 1875c1491f96..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
-
-stdenv.mkDerivation rec {
-  name = "libcroco-0.6.8";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
-    sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
-  };
-
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
-
-  buildInputs = [ pkgconfig libxml2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
deleted file mode 100644
index 9a1a45e0d1ac..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib
-, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "libgdata-0.14.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz";
-    sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
-
-  buildInputs = with gnome3;
-    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
-      liboauth gcr gnome_online_accounts p11_kit openssl ];
-      
-  meta = with stdenv.lib; {
-    description = "GData API library";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
deleted file mode 100644
index b21c274ce516..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
-let
-  ver_maj = "0.14";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "libgee-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd";
-  };
-
-  doCheck = true;
-
-  patches = [ ./fix_introspection_paths.patch ];
-
-  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
deleted file mode 100644
index 67003f451645..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
-+++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
-@@ -12085,8 +12085,8 @@
-        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
--       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
-+       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
deleted file mode 100644
index c6c9323c010a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "libgnome-keyring-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
-    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
-  };
-
-  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = {
-    description = "Framework for managing passwords and other secrets";
-    homepage = http://live.gnome.org/GnomeKeyring;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
-    inherit (glib.meta) platforms maintainers;
-
-    longDescription = ''
-      gnome-keyring is a program that keeps password and other secrets for
-      users. The library libgnome-keyring is used by applications to integrate
-      with the gnome-keyring system.
-    '';
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
deleted file mode 100644
index 1156474e5a7c..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "libgnomekbd-3.6.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
-    sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
-  };
-
-  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
-
-  preFixup = ''
-    wrapProgram $out/bin/gkbd-keyboard-display \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Keyboard management library";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
deleted file mode 100644
index 8246a2183b7a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata }:
-
-stdenv.mkDerivation rec {
-  name = "libgweather-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgweather/3.12/${name}.tar.xz";
-    sha256 = "54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
-  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
deleted file mode 100644
index 72d307f4f1a7..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
-, openssl, bzip2, acl, attr
-}:
-
-stdenv.mkDerivation rec {
-  name = "libgxps-0.2.2";
-
-  src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
-    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
-  };
-
-  buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
-
-  configureFlags = "--without-liblcms2";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
deleted file mode 100644
index 547a52ccf9ab..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool
-, glib, gtk3, gobjectIntrospection, python, pygobject3
-}:
-
-stdenv.mkDerivation rec {
-  name = "libpeas-${version}";
-  version = "1.10.0";
-
-  buildInputs =  [
-   intltool pkgconfig
-   glib gtk3 gobjectIntrospection python pygobject3
-  ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libpeas/1.10/${name}.tar.xz";
-    sha256 = "4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47";
-  };
-
-  preFixup = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
-  '';
-
-  meta = {
-    description = "A GObject-based plugins engine";
-    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
deleted file mode 100644
index 5a8117528b68..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
-
-stdenv.mkDerivation rec {
-  name = "libzapojit-0.0.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
-    sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
-  };
-
-  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
deleted file mode 100644
index aa1af1ebd556..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
-, libtool, makeWrapper }:
-
-
-stdenv.mkDerivation rec {
-  name = "mutter-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/mutter/3.12/${name}.tar.xz";
-    sha256 = "e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173";
-  };
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
-      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
-      libcanberra_gtk3 zenity libtool makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/mutter" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
deleted file mode 100644
index dceb7c817bda..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
-, gtk, gnome3, libunique, intltool, gobjectIntrospection
-, libnotify, makeWrapper, exempi, librsvg, tracker }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus/3.12/${name}.tar.xz";
-    sha256 = "969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1";
-  };
-
-  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
-                  gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/nautilus" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  patches = [ ./extension_dir.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
deleted file mode 100644
index 317b82579924..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
-index 6273a76..4adcc8a 100644
---- a/libnautilus-private/nautilus-module.c
-+++ b/libnautilus-private/nautilus-module.c
-@@ -242,11 +242,17 @@ void
- nautilus_module_setup (void)
- {
- 	static gboolean initialized = FALSE;
-+	const gchar* extensiondir = NULL;
- 
- 	if (!initialized) {
- 		initialized = TRUE;
--		
--		load_module_dir (NAUTILUS_EXTENSIONDIR);
-+	
-+		extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
-+		if (extensiondir == NULL) {
-+			extensiondir = NAUTILUS_EXTENSIONDIR;
-+		}
-+	
-+		load_module_dir (extensiondir);
- 
- 		eel_debug_call_at_shutdown (free_module_objects);
- 	}
diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
deleted file mode 100644
index 9e19d4f90058..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "rest-0.7.91";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
-    sha256 = "838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a";
-  };
-
-  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
-
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
deleted file mode 100644
index 2830d5bac27e..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
-, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
-, gdk_pixbuf, librsvg, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  name = "sushi-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz";
-    sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff";
-  };
-
-  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib
-                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg
-                  gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram $out/libexec/sushi-start \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
-    description = "A quick previewer for Nautilus";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
deleted file mode 100644
index f1b3bfe53c13..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }:
-
-stdenv.mkDerivation rec {
-  name = "totem-pl-parser-3.10.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
-    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
-  };
-
-  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Simple GObject-based library to parse and save a host of playlist formats";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
deleted file mode 100644
index 9c2db40f89d3..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, gst_all_1
-, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2, dbus_glib
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "totem-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz";
-    sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn";
-  };
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
-                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gnome3.libpeas pygobject3 shared_mime_info dbus_glib
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/totem" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Movie player for the GNOME desktop based on GStreamer";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
deleted file mode 100644
index d14b088f5304..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, upower
-, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection
-, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf
-, gnome3, librsvg, gdk_pixbuf, file, libnotify
-, evolution_data_server, gst_all_1, poppler, libtool
-, icu, taglib, libjpeg, libtiff, giflib, libcue
-, libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
-
-stdenv.mkDerivation rec {
-  name = "tracker-1.0.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz";
-    sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/"
-    sed -i -e 's,glib/poppler.h,poppler.h,' src/tracker-extract/tracker-extract-pdf.c
-  '';
-  
-  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
-                  bzip2 gnome3.totem-pl-parser gobjectIntrospection
-                  automake114x autoconf libtool
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
-                  upower libnotify evolution_data_server gnome3.libgee
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
-                  poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/Tracker;
-    description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
deleted file mode 100644
index 1692b2c9c96f..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, hicolor_icon_theme, gnome3
-, libnotify, file, telepathy_glib, dbus_glib }:
-
-stdenv.mkDerivation rec {
-  name = "vino-${versionMajor}.${versionMinor}";
-  versionMajor = "3.12";
-  versionMinor = "0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
-    sha256 = "86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
-                  hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-                  dbus_glib telepathy_glib file makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/vino-server" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
-    description = "GNOME desktop sharing server";
-    maintainers = with maintainers; [ lethalman iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
deleted file mode 100644
index d3245e232edd..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection
-, selectTextPatch ? false }:
-
-stdenv.mkDerivation rec {
-  versionMajor = "0.36";
-  versionMinor = "3";
-  moduleName   = "vte";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
-  };
-
-  patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch;
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
-
-  configureFlags = [ "--enable-introspection" ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK+";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK+, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
deleted file mode 100644
index 0a9b82a85982..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-Only in vte-0.38.0.new: expose_select_text.patch
-diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c
---- vte-0.38.0/src/vteaccess.c	2014-08-13 08:00:38.000000000 -0400
-+++ vte-0.38.0.new/src/vteaccess.c	2014-09-21 17:05:23.934641193 -0400
-@@ -1427,7 +1427,7 @@
- 	*start_offset = offset_from_xy (priv, start_x, start_y);
- 	_vte_terminal_get_end_selection (terminal, &end_x, &end_y);
- 	*end_offset = offset_from_xy (priv, end_x, end_y);
--	return _vte_terminal_get_selection (terminal);
-+	return vte_terminal_get_selection (terminal);
- }
- 
- static gboolean
-diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
---- vte-0.38.0/src/vte.c	2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vte.c	2014-09-21 17:03:04.671656749 -0400
-@@ -122,7 +122,6 @@
- 						 gpointer data,
- 						 GArray *attributes,
- 						 gboolean include_trailing_spaces);
--static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
- static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
- static void vte_terminal_stop_processing (VteTerminal *terminal);
- 
-@@ -3267,9 +3266,10 @@
- 	_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
- 	terminal->pvt->pty_input_source = 0;
- }
--static void
--_vte_terminal_connect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_connect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_channel == NULL) {
- 		return;
- 	}
-@@ -3321,9 +3321,10 @@
- 	}
- }
- 
--static void
--_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_disconnect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_input_source != 0) {
- 		_vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
- 		g_source_remove(terminal->pvt->pty_input_source);
-@@ -6154,6 +6155,28 @@
- 	}
- }
- 
-+/**
-+ * vte_terminal_set_cursor_position:
-+ * @terminal: a #VteTerminal
-+ * @column: the new cursor column
-+ * @row: the new cursor row
-+ *
-+ * Set the location of the cursor.
-+ */
-+void
-+vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				 long column, long row)
-+{
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	terminal->pvt->screen->cursor_current.col = column;
-+	terminal->pvt->screen->cursor_current.row = row;
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	_vte_check_cursor_blink(terminal);
-+	vte_terminal_queue_cursor_moved(terminal);
-+}
-+
- static GtkClipboard *
- vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
- {
-@@ -6319,7 +6342,7 @@
-         vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
- 
- 	/* Temporarily stop caring about input from the child. */
--	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- }
- 
- static gboolean
-@@ -6336,7 +6359,7 @@
- 		terminal->pvt->selecting = FALSE;
- 
- 		/* Reconnect to input from the child if we paused it. */
--		_vte_terminal_connect_pty_read(terminal);
-+		vte_terminal_connect_pty_read(terminal);
- 
- 		return TRUE;
- 	}
-@@ -6834,6 +6857,50 @@
- 	vte_terminal_deselect_all (terminal);
- }
- 
-+/**
-+ * vte_terminal_get_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ *
-+ * Checks whether or not block selection is enabled.
-+ *
-+ * Returns: %TRUE if block selection is enabled, %FALSE if not
-+ */
-+gboolean
-+vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
-+	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-+	return terminal->pvt->selection_block_mode;
-+}
-+
-+/**
-+ * vte_terminal_set_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ * @block_mode: whether block selection is enabled
-+ *
-+ * Sets whether or not block selection is enabled.
-+ */
-+void
-+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+	terminal->pvt->selection_block_mode = block_mode;
-+}
-+
-+/**
-+ * vte_terminal_select_text:
-+ * @terminal: a #VteTerminal
-+ * @start_col: the starting column for the selection
-+ * @start_row: the starting row for the selection
-+ * @end_col: the end column for the selection
-+ * @end_row: the end row for the selection
-+ *
-+ * Sets the current selection region.
-+ */
-+void
-+vte_terminal_select_text(VteTerminal *terminal,
-+			 long start_col, long start_row,
-+			 long end_col, long end_row) {
-+	_vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
-+}
-+
- /* Autoscroll a bit. */
- static gboolean
- vte_terminal_autoscroll(VteTerminal *terminal)
-@@ -8476,7 +8543,7 @@
- #endif
- 		kill(terminal->pvt->pty_pid, SIGHUP);
- 	}
--	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- 	_vte_terminal_disconnect_pty_write(terminal);
- 	if (terminal->pvt->pty_channel != NULL) {
- 		g_io_channel_unref (terminal->pvt->pty_channel);
-@@ -12533,7 +12600,7 @@
-         g_object_freeze_notify(object);
- 
-         if (pvt->pty != NULL) {
--                _vte_terminal_disconnect_pty_read(terminal);
-+                vte_terminal_disconnect_pty_read(terminal);
-                 _vte_terminal_disconnect_pty_write(terminal);
- 
-                 if (terminal->pvt->pty_channel != NULL) {
-@@ -12588,7 +12655,7 @@
-         _vte_terminal_setup_utf8 (terminal);
- 
-         /* Open channels to listen for input on. */
--        _vte_terminal_connect_pty_read (terminal);
-+        vte_terminal_connect_pty_read (terminal);
- 
-         g_object_notify(object, "pty");
- 
-@@ -12623,7 +12690,7 @@
- }
- 
- char *
--_vte_terminal_get_selection(VteTerminal *terminal)
-+vte_terminal_get_selection(VteTerminal *terminal)
- {
- 	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
- 
-Only in vte-0.38.0.new/src: .vte.c.swp
-diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h
---- vte-0.38.0/src/vteint.h	2014-05-16 13:51:26.000000000 -0400
-+++ vte-0.38.0.new/src/vteint.h	2014-09-21 17:05:44.934589281 -0400
-@@ -25,7 +25,6 @@
- G_BEGIN_DECLS
- 
- void _vte_terminal_accessible_ref(VteTerminal *terminal);
--char* _vte_terminal_get_selection(VteTerminal *terminal);
- void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
---- vte-0.38.0/src/vteterminal.h	2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vteterminal.h	2014-09-21 17:03:39.094903032 -0400
-@@ -170,6 +170,18 @@
- 
- void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
- void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
-+                                           gboolean block_mode) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_select_text(VteTerminal *terminal,
-+                              long start_col, long start_row,
-+                              long end_col, long end_row) _VTE_GNUC_NONNULL(1);
-+char *
-+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+
-+/* pause and unpause output */
-+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
-+void vte_terminal_connect_pty_read(VteTerminal *vte);
- 
- /* Set the terminal's size. */
- void vte_terminal_set_size(VteTerminal *terminal,
-@@ -276,6 +288,8 @@
- void vte_terminal_get_cursor_position(VteTerminal *terminal,
- 				      glong *column,
-                                       glong *row) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				      long column, long row) _VTE_GNUC_NONNULL(1);
- 
- /* Add a matching expression, returning the tag the widget assigns to that
-  * expression. */
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
deleted file mode 100644
index ba83380f86d5..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-tools-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/3.12/${name}.tar.xz";
-    sha256 = "7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172";
-  };
-
-  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
-    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
-    maintainers = with maintainers; [ iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
deleted file mode 100644
index e99118230738..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, bash
-, itstool, libxml2, libxslt }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-xsl-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/3.12/${name}.tar.xz";
-    sha256 = "dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "Yelp's universal stylesheets for Mallard and DocBook";
-    maintainers = with maintainers; [ lethalman ];
-    license = [licenses.gpl2 licenses.lgpl2];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
deleted file mode 100644
index 2e7715d1efc0..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
-, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp/3.12/${name}.tar.xz";
-    sha256 = "0k2a1fggidmh98x2fv8zki2lbx7wx7p4b25iq11p6q8j9fwr2ff8";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard  ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
-                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
-                  librsvg gdk_pixbuf gnome3.gnome_icon_theme
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas sqlite ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/yelp" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "The help viewer in Gnome";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
deleted file mode 100644
index ca20bbc785de..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.12";
-  versionMinor = "1";
-
-  name = "zenity-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
-    sha256 = "a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11";
-  };
-
-  buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
deleted file mode 100644
index 670ceb105af3..000000000000
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ /dev/null
@@ -1,299 +0,0 @@
-{ callPackage, pkgs }:
-
-rec {
-  corePackages = with gnome3; [
-    pkgs.desktop_file_utils pkgs.ibus
-    pkgs.shared_mime_info # for update-mime-database
-    gtk3 # for gtk-update-icon-cache
-    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
-    gnome-menus gnome_settings_daemon gnome_shell
-    gnome_themes_standard defaultIconTheme
-  ];
-
-  optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
-    gucharmap nautilus totem vino yelp gnome-bluetooth
-    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-shell-extensions gnome-system-log gnome-system-monitor
-    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
-    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto
-  ];
-
-  inherit (pkgs) glib gtk2 gtk3 gnome2;
-  gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; };
-
-  # DO NOT UPGRADE CLUTTER, IT BREAKS GNOME 3.12
-  clutter = pkgs.clutter_1_18;
-  clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; };
-  clutter-gst = pkgs.clutter-gst.override { inherit clutter; };
-  cogl = pkgs.cogl_1_18;
-
-  gtk = gtk3; # just to be sure
-  libcanberra = pkgs.libcanberra_gtk3; # just to be sure
-  inherit (pkgs.gnome2) ORBit2;
-  orbit = ORBit2;
-  inherit (pkgs) libsoup;
-
-  version = "3.12";
-
-# Simplify the nixos module and gnome packages
-  defaultIconTheme = gnome_icon_theme_symbolic;
-
-#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
-
-  baobab = callPackage ./core/baobab { };
-
-  caribou = callPackage ./core/caribou { };
-
-  dconf = callPackage ./core/dconf { };
-
-  empathy = callPackage ./core/empathy {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  epiphany = callPackage ./core/epiphany {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
-
-  evolution_data_server = callPackage ./core/evolution-data-server { };
-
-  gconf = callPackage ./core/gconf { };
-
-  geocode_glib = callPackage ./core/geocode-glib { };
-
-  gcr = callPackage ./core/gcr { }; # ToDo: tests fail
-
-  gdm = callPackage ./core/gdm { };
-
-  gjs = callPackage ./core/gjs { };
-
-  glib_networking = pkgs.glib_networking.override {
-    inherit gsettings_desktop_schemas;
-  };
-
-  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
-
-  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
-
-  gnome-contacts = callPackage ./core/gnome-contacts { };
-
-  gnome_control_center = callPackage ./core/gnome-control-center { };
-
-  gnome-calculator = callPackage ./core/gnome-calculator { };
-
-  gnome_common = callPackage ./core/gnome-common { };
-
-  gnome_desktop = callPackage ./core/gnome-desktop { };
-
-  gnome-dictionary = callPackage ./core/gnome-dictionary { };
-
-  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
-
-  gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
-
-  gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
-
-  gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { };
-
-  gnome-menus = callPackage ./core/gnome-menus { };
-
-  gnome_keyring = callPackage ./core/gnome-keyring { };
-
-  libgnome_keyring = callPackage ./core/libgnome-keyring { };
-
-  libgnomekbd = callPackage ./core/libgnomekbd { };
-
-  folks = callPackage ./core/folks { };
-
-  gnome_online_accounts = callPackage ./core/gnome-online-accounts {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  gnome-online-miners = callPackage ./core/gnome-online-miners { };
-
-  gnome_session = callPackage ./core/gnome-session { };
-
-  gnome_shell = callPackage ./core/gnome-shell { };
-
-  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
-
-  gnome-screenshot = callPackage ./core/gnome-screenshot { };
-
-  gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
-
-  gnome-system-log = callPackage ./core/gnome-system-log { };
-
-  gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
-
-  gnome_terminal = callPackage ./core/gnome-terminal { };
-
-  gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
-
-  gnome-user-docs = callPackage ./core/gnome-user-docs { };
-
-  gnome-user-share = callPackage ./core/gnome-user-share { };
-
-  grilo = callPackage ./core/grilo { };
-
-  grilo-plugins = callPackage ./core/grilo-plugins { };
-
-  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
-
-  gtksourceview = callPackage ./core/gtksourceview { };
-
-  gucharmap = callPackage ./core/gucharmap { };
-
-  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
-
-  eog = callPackage ./core/eog { };
-
-  libcroco = callPackage ./core/libcroco {};
-
-  libgee = callPackage ./core/libgee { };
-
-  libgdata = callPackage ./core/libgdata { };
-
-  libgxps = callPackage ./core/libgxps { };
-
-  libpeas = callPackage ./core/libpeas {};
-
-  libgweather = callPackage ./core/libgweather { };
-
-  libzapojit = callPackage ./core/libzapojit { };
-
-  mutter = callPackage ./core/mutter { };
-
-  nautilus = callPackage ./core/nautilus { };
-
-  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
-    inherit gnome3;
-  };
-
-  networkmanager_pptp = pkgs.networkmanager_pptp.override {
-    inherit gnome3;
-  };
-
-  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
-    inherit gnome3;
-  };
-
-  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
-    inherit gnome3;
-  };
-
-  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
-    inherit gnome3;
-  };
-
-  networkmanagerapplet = pkgs.networkmanagerapplet.override {
-    inherit gnome3 gsettings_desktop_schemas glib_networking;
-  };
-
-  rest = callPackage ./core/rest { };
-
-  sushi = callPackage ./core/sushi {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  totem = callPackage ./core/totem { };
-
-  totem-pl-parser = callPackage ./core/totem-pl-parser { };
-
-  tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
-
-  vte = callPackage ./core/vte { };
-
-  vino = callPackage ./core/vino { };
-
-  yelp = callPackage ./core/yelp {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  yelp_xsl = callPackage ./core/yelp-xsl { };
-
-  yelp_tools = callPackage ./core/yelp-tools { };
-
-  zenity = callPackage ./core/zenity { };
-
-
-#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
-
-  bijiben = callPackage ./apps/bijiben {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  evolution = callPackage ./apps/evolution {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  file-roller = callPackage ./apps/file-roller { };
-
-  gedit = callPackage ./apps/gedit { };
-
-  glade = callPackage ./apps/glade { };
-
-  gnome-boxes = callPackage ./apps/gnome-boxes {
-    gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
-    spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
-  };
-
-  gnome-clocks = callPackage ./apps/gnome-clocks { };
-
-  gnome-documents = callPackage ./apps/gnome-documents {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  gnome-music = callPackage ./apps/gnome-music { };
-
-  gnome-photos = callPackage ./apps/gnome-photos { };
-
-  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
-
-  # scrollkeeper replacement
-  rarian = callPackage ./desktop/rarian { };
-
-  seahorse = callPackage ./apps/seahorse { };
-
-  polari = callPackage ./apps/polari { };
-
-  pomodoro = callPackage ./apps/pomodoro { };
-
-#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
-
-  anjuta = callPackage ./devtools/anjuta { };
-
-  gdl = callPackage ./devtools/gdl { };
-
-#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
-
-  geary = callPackage ./misc/geary {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  gfbgraph = callPackage ./misc/gfbgraph { };
-
-  goffice = callPackage ./misc/goffice { };
-
-  gitg = callPackage ./misc/gitg {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  libgda = callPackage ./misc/libgda { };
-
-  libgit2-glib = callPackage ./misc/libgit2-glib {
-    libgit2 = pkgs.libgit2.override { libssh2 = null; };
-  };
-
-  libmediaart = callPackage ./misc/libmediaart { };
-
-  gexiv2 = callPackage ./misc/gexiv2 { };
-
-  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
-
-  gpaste = callPackage ./misc/gpaste { };
-
-  gtkhtml = callPackage ./misc/gtkhtml { };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
deleted file mode 100644
index a1b38b21869a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
-
-stdenv.mkDerivation rec {
-  name = "rarian-0.8.1";
-  src = fetchurl {
-    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
-    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
-  };
-
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
-  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix
deleted file mode 100644
index 79bfd8952578..000000000000
--- a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
-  itstool, python }:
-
-let
-  major = "3.13";
-  minor = "1";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "anjuta-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
-    sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
-    gnome3.libgda gnome3.gtksourceview intltool itstool python ];
-
-  meta = with stdenv.lib; {
-    description = "Software development studio";
-    homepage = http://anjuta.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix
deleted file mode 100644
index 1dae33cd4e91..000000000000
--- a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }:
-
-let
-  major = "3.12";
-  minor = "0";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "gdl-${version}";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
-    sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d";
-  };
-
-  buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
-
-  meta = with stdenv.lib; {
-    description = "Gnome docking library";
-    homepage = https://developer.gnome.org/gdl/;
-    license = [ licenses.gpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
deleted file mode 100644
index 4df287c7b8b5..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
-, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
-, libnotify, libcanberra, libsecret, gmime
-, libpthreadstubs, hicolor_icon_theme, sqlite
-, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
-
-stdenv.mkDerivation rec {
-  name = "geary-0.6.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz";
-    sha256 = "0ap40mpj89sx82kcxlhl9gipq34ks2b70yhiv9s8zc5wg0nm7rpg";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
-                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
-                  libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme
-                  gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
-
-  preConfigure = ''
-    substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/${name}/
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/bin/geary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  patches = [ ./disable_valadoc.patch ];
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Geary;
-    description = "Mail client for GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
deleted file mode 100644
index e65c0dea7472..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/CMakeLists.txt.orig	2014-05-23 14:41:20.809160364 +0200
-+++ src/CMakeLists.txt	2014-05-23 14:41:29.240261581 +0200
-@@ -696,21 +696,6 @@
-         ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
- )
- 
--# Valadoc
--#################################################
--foreach(pkg ${ENGINE_PACKAGES})
--    list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
--endforeach(pkg ${ENGINE_PACKAGES})
--
--include(FindValadoc)
--add_custom_target(
--    valadoc
--    WORKING_DIRECTORY
--        ${CMAKE_SOURCE_DIR}/src
--    COMMAND
--        ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
--)
--
- ## Make clean: remove copied files
- ##################################################
- set_property(
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix
deleted file mode 100644
index 86942c13f34f..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }:
-
-
-stdenv.mkDerivation rec {
-  name = "gexiv2-${version}";
-  version = "0.7.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz";
-    sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn";
-  };
-  
-  preConfigure = ''
-    patchShebangs .
-  '';
-  
-  buildInputs = [ pkgconfig glib libtool m4 ];
-  propagatedBuildInputs = [ exiv2 ];
-  
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/gexiv2;
-    description = "GObject wrapper around the Exiv2 photo metadata library";
-    platforms = platforms.linux;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
deleted file mode 100644
index d36534f0d32f..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, gnome3, libsoup, json_glib }:
-
-stdenv.mkDerivation rec {
-  name = "gfbgraph-0.2.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
-    sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4";
-  };
-
-  buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
-  propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "GLib/GObject wrapper for the Facebook Graph API";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
deleted file mode 100644
index 37e1975fd57b..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
-, json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection
-, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic 
-
-stdenv.mkDerivation rec {
-  name = "gitg-3.13.91";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz";
-    sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37";
-  };
-
-  preCheck = ''
-    substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
-  '';
-  doCheck = true;
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  propagatedUserEnvPkgs = [ shared_mime_info
-                            gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
-                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
-                  gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gitg" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    rm $out/share/gitg/icons/hicolor/icon-theme.cache
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
-    description = "GNOME GUI client to view git repositories";
-    maintainers = with maintainers; [ iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
deleted file mode 100644
index 26e9144349f2..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, intltool, fetchurl, python, pygobject3, atk
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup
-, bash, makeWrapper, itstool, libxml2, python3Packages
-, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-tweak-tool-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz";
-    sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  makeFlags = [ "DESTDIR=/" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  python pygobject3 libnotify gnome3.gnome_shell
-                  libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-tweak-tool" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
-  '';
-
-  patches = [ ./find_gsettings.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
-    description = "A tool to customize advanced GNOME 3 options";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch
deleted file mode 100644
index 3e68c04cb3ab..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
-index a00fe19..dce74b2 100644
---- a/gtweak/gsettings.py
-+++ b/gtweak/gsettings.py
-@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
- 
- class _GSettingsSchema:
-     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
--        if not schema_dir:
--            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-         if not schema_filename:
-             schema_filename = schema_name + ".gschema.xml"
-+        if not schema_dir:
-+            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-+            for xdg_dir in GLib.get_system_data_dirs():
-+                dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
-+                if os.path.exists(os.path.join(dir, schema_filename)):
-+                    schema_dir = dir
-+                    break
- 
-         schema_path = os.path.join(schema_dir, schema_filename)
-         if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix
deleted file mode 100644
index 02520a9f121a..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
-, pango, libgsf, libxml2, libart, intltool, gettext
-, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
-
-stdenv.mkDerivation rec {
-  name = "goffice-0.8.17";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
-    sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
-  };
-
-  # fix linking error: undefined reference to pcre_info
-  patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
-
-  buildInputs = [
-    pkgconfig libglade bzip2 libart intltool gettext
-    gconf libgnomeui pcre
-  ];
-
-  propagatedBuildInputs = [
-    # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
-    glib libgsf libxml2 gtk libglade libart cairo pango
-  ];
-
-  postInstall =
-    ''
-      # Get GnuCash to build.  Might be unnecessary if we upgrade pkgconfig.
-      substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
-    '';
-
-  doCheck = true;
-
-  meta = gnome3.goffice.meta // {
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
deleted file mode 100644
index f116f5b53cd8..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
-, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
-
-stdenv.mkDerivation rec {
-  name = "goffice-0.10.18";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "4743a148d4452743f3484ed28285a6889adb4af2a61b72448e0ddfe7d5142c64";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
-    glib gtk3 libxml2 cairo pango libgsf
-  ];
-
-  buildInputs = [ libxslt librsvg ];
-
-  enableParallelBuilding = true;
-  doCheck = true;
-
-  meta = {
-    description = "A Glib/GTK+ set of document centric objects and utilities";
-
-    longDescription = ''
-      There are common operations for document centric applications that are
-      conceptually simple, but complex to implement fully: plugins, load/save
-      documents, undo/redo.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.gnu;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch
deleted file mode 100644
index cd4ef3c9fed7..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
-index bc4aae4..3adb696 100644
---- a/goffice/utils/regutf8.c
-+++ b/goffice/utils/regutf8.c
-@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
- 		default: return GO_REG_BADPAT;
- 		}
- 	} else {
--		gor->re_nsub = pcre_info (r, NULL, NULL);
-+		gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
- 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
- 		return 0;
- 	}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
deleted file mode 100644
index f87431653c93..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
-, pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  version = "3.12.3.1";
-  name = "gpaste-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "05afbhn3gw015cf2z3045lvlnj4cz06p6libkglb2wqsfb7azbl0";
-  };
-
-  buildInputs = [ intltool autoreconfHook pkgconfig vala glib
-                  gtk3 gnome3.gnome_control_center dbus.libs
-                  clutter pango appdata-tools makeWrapper ];
-
-  preConfigure = "intltoolize -f";
-
-  configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
-                     "--with-dbusservicesdir=$(out)/share/dbus-1/services" ];
-
-  enableParallelBuilding = true;
-
-  preFixup = 
-    let
-      libPath = stdenv.lib.makeLibraryPath
-        [ glib gtk3 clutter pango ];
-    in
-    ''
-      for i in $out/libexec/gpaste/*; do
-        wrapProgram $i \
-          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
-      done
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/Keruspe/GPaste;
-    description = "Clipboard management system with GNOME3 integration";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix
deleted file mode 100644
index 5e27b474cbd7..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, intltool
-, gnome3, enchant, isocodes }:
-
-stdenv.mkDerivation rec {
-  name = "gtkhtml-4.6.6";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz";
-    sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd";
-  };
-
-  buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme
-                  gnome3.gsettings_desktop_schemas ];
-
-  propagatedBuildInputs = [ enchant isocodes ];
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix
deleted file mode 100644
index 3944644a4536..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }:
-
-let
-  major = "5.2";
-  minor = "2";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "libgda-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz";
-    sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4";
-  };
-
-  configureFlags = [
-    "--enable-gi-system-install=no"
-  ];
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ];
-
-  meta = with stdenv.lib; {
-    description = "Database access library";
-    homepage = http://www.gnome-db.org/;
-    license = [ licenses.lgpl2 licenses.gpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
deleted file mode 100644
index 94776c90cf99..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
-, gtk_doc, gobjectIntrospection, libgit2, glib }:
-
-stdenv.mkDerivation rec {
-  name = "libgit2-glib-${version}";
-  version = "0.0.20";
-
-  src = fetchurl {
-    url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
-    sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x";
-  };
-
-  configureScript = "sh ./autogen.sh";
-
-  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
-                  gtk_doc gobjectIntrospection libgit2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix
deleted file mode 100644
index 4985bfa902c3..000000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "libmediaart-0.4.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz";
-    sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c";
-  };
-
-  buildInputs = [ pkgconfig glib gdk_pixbuf ];
-
-  meta = with stdenv.lib; {
-    description = "Library tasked with managing, extracting and handling media art caches";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index f442bd889736..c425f41e8e1f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig
+, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, krb5, networkmanagerapplet, networkmanager
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
       gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
       accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
-      gdk_pixbuf gnome3.adwaita-icon-theme librsvg clutter clutter_gtk
-      hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.vino udev
+      gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
+      gnome3.vino udev libcanberra_gtk3
       networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
 
   preBuild = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
index f7e3efd1dd90..f99c0c2b5a46 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
 , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
 , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, hicolor_icon_theme, sqlite, libgweather
+, sqlite, libgweather, libcanberra_gtk3
 , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
 
@@ -23,8 +23,9 @@ stdenv.mkDerivation rec {
       libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
       clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
       libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
-      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
-      hicolor_icon_theme adwaita-icon-theme sqlite gnome3.gnome-bluetooth
+      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
+      libcanberra_gtk3 gnome_control_center
+      defaultIconTheme sqlite gnome3.gnome-bluetooth
       libgweather # not declared at build time, but typelib is needed at runtime
       gnome3.gnome-clocks # schemas needed
       at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 933e89dcd647..6ec1ee011f53 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -19,10 +19,8 @@ rec {
     nautilus-sendto dconf-editor
   ];
 
-  inherit (pkgs) libsoup glib gtk2;
+  inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
-  gtk3 = pkgs.gtk3_16;
-  gtkmm3 = pkgs.gtkmm3_16;
   orbit = ORBit2;
   gnome3 = self // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_22;
@@ -34,20 +32,6 @@ rec {
   vala = pkgs.vala_0_26;
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
 
-  # Due to gtk 3.12 -> 3.16 transition
-  libcanberra_gtk3 = pkgs.libcanberra_gtk3.override { inherit gtk; }; 
-  libcanberra = libcanberra_gtk3;
-  ibus = pkgs.ibus.override { inherit gnome3; };
-  colord-gtk = pkgs.colord-gtk.override { inherit gtk3; };
-  webkitgtk24x = pkgs.webkitgtk24x.override { inherit gtk3; };
-  webkitgtk = pkgs.webkitgtk.override { inherit gtk3; };
-  libwnck3 = pkgs.libwnck3.override { inherit gtk3; };
-  gtkspell3 = pkgs.gtkspell3.override { inherit gtk3; };
-  librsvg = pkgs.librsvg.override { inherit gtk3; };
-  iconnamingutils = pkgs.iconnamingutils.override { inherit librsvg; };
-  libchamplain = pkgs.libchamplain.override { inherit gtk3 clutter_gtk; };
-  djvulibre = pkgs.djvulibre.override { inherit librsvg; };
-
   version = "3.16";
 
 # Simplify the nixos module and gnome packages
diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix
deleted file mode 100644
index 7a9d114ce8e3..000000000000
--- a/pkgs/development/libraries/clutter/1.18.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
-gobjectIntrospection 
-}:
-
-let
-  ver_maj = "1.18";
-  ver_min = "2";
-in
-stdenv.mkDerivation rec {
-  name = "clutter-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs =
-    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
-    ];
-
-  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
-
-  #doCheck = true; # no tests possible without a display
-
-  meta = {
-    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
-
-    longDescription =
-      '' Clutter is free software library for creating fast, compelling,
-         portable, and dynamic graphical user interfaces.  It is a core part
-         of MeeGo, and is supported by the open source community.  Its
-         development is sponsored by Intel.
-
-         Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
-         on mobile and embedded platforms), but wraps an easy to use,
-         efficient, flexible API around GL's complexity.
-
-         Clutter enforces no particular user interface style, but provides a
-         rich, generic foundation for higher-level toolkits tailored to
-         specific needs.
-      '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-    homepage = http://www.clutter-project.org/;
-
-    maintainers = with stdenv.lib.maintainers; [ urkud ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}
diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix
deleted file mode 100644
index f6927770d860..000000000000
--- a/pkgs/development/libraries/cogl/1.18.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
-, pangoSupport ? true, pango, cairo, gobjectIntrospection
-, gstreamerSupport ? true, gst_all_1 }:
-
-let
-  ver_maj = "1.18";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "cogl-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
-    sha256 = "0phg76jpkn0j948axavzr15gyrqipzmzzr66nlp3dfksgszixnd4";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = [
-    "--enable-introspection"
-    "--enable-gles1"
-    "--enable-gles2"
-    "--enable-kms-egl-platform"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
-
-  propagatedBuildInputs = with xorg; [
-      glib gdk_pixbuf gobjectIntrospection
-      mesa_noglu libXrandr libXfixes libXcomposite libXdamage
-    ]
-    ++ libintlOrEmpty
-    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
-                                               gst_all_1.gst-plugins-base ];
-
-  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
-
-  COGL_PANGO_DEP_CFLAGS
-    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
-      "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
-  #doCheck = true; # all tests fail (no idea why)
-
-  meta = with stdenv.lib; {
-    description = "A small open source library for using 3D graphics hardware for rendering";
-    maintainers = with maintainers; [ lovek323 ];
-
-    longDescription = ''
-      Cogl is a small open source library for using 3D graphics hardware for
-      rendering. The API departs from the flat state machine style of OpenGL
-      and is designed to make it easy to write orthogonal components that can
-      render without stepping on each other's toes.
-    '';
-
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}
diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix
deleted file mode 100644
index 84bea07602fd..000000000000
--- a/pkgs/development/libraries/gtk+/3.16.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl
-, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
-, xlibs, x11, wayland, libxkbcommon, epoxy
-, xineramaSupport ? stdenv.isLinux
-, cupsSupport ? stdenv.isLinux, cups ? null
-}:
-
-assert xineramaSupport -> xlibs.libXinerama != null;
-assert cupsSupport -> cups != null;
-
-let
-  ver_maj = "3.16";
-  ver_min = "2";
-  version = "${ver_maj}.${ver_min}";
-in
-stdenv.mkDerivation rec {
-  name = "gtk+3-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0";
-  };
-
-  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
-
-  buildInputs = [ libxkbcommon epoxy ];
-  propagatedBuildInputs = with xlibs; with stdenv.lib;
-    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
-    ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
-    ++ optional stdenv.isDarwin x11
-    ++ optional xineramaSupport libXinerama
-    ++ optional cupsSupport cups;
-
-  # demos fail to install, no idea where's the problem
-  preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
-
-  enableParallelBuilding = true;
-
-  postInstall = "rm -rf $out/share/gtk-doc";
-
-  passthru = {
-    gtkExeEnvPostBuild = ''
-      rm $out/lib/gtk-3.0/3.0.0/immodules.cache
-      $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache
-    ''; # workaround for bug of nix-mode for Emacs */ '';
-  };
-
-  meta = {
-    description = "A multi-platform toolkit for creating graphical user interfaces";
-
-    longDescription = ''
-      GTK+ is a highly usable, feature rich toolkit for creating
-      graphical user interfaces which boasts cross platform
-      compatibility and an easy to use API.  GTK+ it is written in C,
-      but has bindings to many other popular programming languages
-      such as C++, Python and C# among others.  GTK+ is licensed
-      under the GNU LGPL 2.1 allowing development of both free and
-      proprietary software with GTK+ without any license fees or
-      royalties.
-    '';
-
-    homepage = http://www.gtk.org/;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 35b40a507a83..84bea07602fd 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl
 , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
-, xlibs, x11, wayland, libxkbcommon
+, xlibs, x11, wayland, libxkbcommon, epoxy
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? stdenv.isLinux, cups ? null
 }:
@@ -9,7 +9,7 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 let
-  ver_maj = "3.12";
+  ver_maj = "3.16";
   ver_min = "2";
   version = "${ver_maj}.${ver_min}";
 in
@@ -18,17 +18,15 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1";
+    sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0";
   };
 
-  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
 
-  buildInputs = [ libxkbcommon ];
+  buildInputs = [ libxkbcommon epoxy ];
   propagatedBuildInputs = with xlibs; with stdenv.lib;
-    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ]
-    ++ optionals stdenv.isLinux [ wayland ]
+    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
+    ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
     ++ optional stdenv.isDarwin x11
     ++ optional xineramaSupport libXinerama
     ++ optional cupsSupport cups;
@@ -65,7 +63,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat];
+    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix
deleted file mode 100644
index bc3274688555..000000000000
--- a/pkgs/development/libraries/gtkmm/3.16.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
-
-let
-  ver_maj = "3.16";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "gtkmm-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
-
-  enableParallelBuilding = true;
-  doCheck = true;
-
-  meta = {
-    description = "C++ interface to the GTK+ graphical user interface library";
-
-    longDescription = ''
-      gtkmm is the official C++ interface for the popular GUI library
-      GTK+.  Highlights include typesafe callbacks, and a
-      comprehensive set of widgets that are easily extensible via
-      inheritance.  You can create user interfaces either in code or
-      with the Glade User Interface designer, using libglademm.
-      There's extensive documentation, including API reference and a
-      tutorial.
-    '';
-
-    homepage = http://gtkmm.org/;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index e158c64f73a4..bc3274688555 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
 
 let
-  ver_maj = "3.12";
+  ver_maj = "3.16";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1";
+    sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c052849fb36..5b38bef1fc24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5691,10 +5691,6 @@ let
 
   clutter = callPackage ../development/libraries/clutter { };
 
-  clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix {
-    cogl = cogl_1_18;
-  };
-
   clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix {
     cogl = cogl_1_20;
   };
@@ -5713,8 +5709,6 @@ let
 
   cogl = callPackage ../development/libraries/cogl { };
 
-  cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
-
   cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { };
 
   coin3d = callPackage ../development/libraries/coin3d { };
@@ -6185,9 +6179,7 @@ let
     cupsSupport = config.gtk2.cups or stdenv.isLinux;
   };
 
-  gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
-
-  gtk3_16 = callPackage ../development/libraries/gtk+/3.16.nix {
+  gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
     gettext = gettextWithExpat gettext_0_19;
   };
 
@@ -6195,9 +6187,6 @@ let
 
   gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
   gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
-  gtkmm3_16 = callPackage ../development/libraries/gtkmm/3.16.nix {
-    gtk3 = gtk3_16;
-  };
 
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
     gtksharp = gtk-sharp;
@@ -12329,7 +12318,7 @@ let
 
   termite = callPackage ../applications/misc/termite {
     gtk = gtk3;
-    vte = gnome3_16.vte-select-text;
+    vte = gnome3.vte-select-text;
    };
 
   tesseract = callPackage ../applications/graphics/tesseract { };
@@ -13362,16 +13351,12 @@ let
     inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
-  gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 {
-    callPackage = pkgs.newScope pkgs.gnome3_12;
-  });
-
   gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 {
     callPackage = pkgs.newScope pkgs.gnome3_16;
     self = pkgs.gnome3_16;
   });
 
-  gnome3 = gnome3_12;
+  gnome3 = gnome3_16;
 
   gnome = recurseIntoAttrs gnome2;
 

From 81c115ba99a4efa51bf5777a2741aba4693fd53a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 18 May 2015 12:31:29 +0200
Subject: [PATCH 0998/1143] termite: update and use vte 0.40

---
 pkgs/applications/misc/termite/default.nix    |  4 +-
 .../gnome-3/3.16/core/vte/default.nix         |  2 +-
 ....patch => expose_select_text.0.40.0.patch} | 63 +++++++++----------
 3 files changed, 34 insertions(+), 35 deletions(-)
 rename pkgs/desktops/gnome-3/3.16/core/vte/{expose_select_text.0.38.0.patch => expose_select_text.0.40.0.patch} (82%)

diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 7c1fe5fc5cbd..ba3d3db3267d 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "termite-${version}";
-  version = "9";
+  version = "10";
 
   src = fetchgit {
     url = "https://github.com/thestinger/termite";
     rev = "refs/tags/v${version}";
-    sha256 = "0bnzfjk5yl5i96v5jnlvrz0d1jcp5lal6ppl7y8wx13166i6sdnh";
+    sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2";
   };
 
   makeFlags = "VERSION=v${version}";
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
index 822522249062..89a1405f62b7 100644
--- a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal";
   };
 
-  patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.38.0.patch;
+  patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch;
 
   buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib 
                   gnome3.gtk3 ncurses vala libxml2 ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
similarity index 82%
rename from pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch
rename to pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
index 0a9b82a85982..c18f1b76b410 100644
--- a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
@@ -1,8 +1,8 @@
-Only in vte-0.38.0.new: expose_select_text.patch
-diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c
---- vte-0.38.0/src/vteaccess.c	2014-08-13 08:00:38.000000000 -0400
-+++ vte-0.38.0.new/src/vteaccess.c	2014-09-21 17:05:23.934641193 -0400
-@@ -1427,7 +1427,7 @@
+Only in vte-0.40.0.new: .git
+diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c
+--- vte-0.40.0/src/vteaccess.c	2015-03-16 06:34:37.000000000 -0400
++++ vte-0.40.0.new/src/vteaccess.c	2015-04-10 00:08:53.146853382 -0400
+@@ -1444,7 +1444,7 @@
  	*start_offset = offset_from_xy (priv, start_x, start_y);
  	_vte_terminal_get_end_selection (terminal, &end_x, &end_y);
  	*end_offset = offset_from_xy (priv, end_x, end_y);
@@ -11,10 +11,10 @@ diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c
  }
  
  static gboolean
-diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
---- vte-0.38.0/src/vte.c	2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vte.c	2014-09-21 17:03:04.671656749 -0400
-@@ -122,7 +122,6 @@
+diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c
+--- vte-0.40.0/src/vte.c	2015-03-18 12:38:09.000000000 -0400
++++ vte-0.40.0.new/src/vte.c	2015-04-10 00:08:53.150186722 -0400
+@@ -123,7 +123,6 @@
  						 gpointer data,
  						 GArray *attributes,
  						 gboolean include_trailing_spaces);
@@ -22,7 +22,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
  static void vte_terminal_stop_processing (VteTerminal *terminal);
  
-@@ -3267,9 +3266,10 @@
+@@ -3344,9 +3343,10 @@
  	_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
  	terminal->pvt->pty_input_source = 0;
  }
@@ -35,7 +35,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  	if (terminal->pvt->pty_channel == NULL) {
  		return;
  	}
-@@ -3321,9 +3321,10 @@
+@@ -3398,9 +3398,10 @@
  	}
  }
  
@@ -48,7 +48,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  	if (terminal->pvt->pty_input_source != 0) {
  		_vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
  		g_source_remove(terminal->pvt->pty_input_source);
-@@ -6154,6 +6155,28 @@
+@@ -6302,6 +6303,28 @@
  	}
  }
  
@@ -67,8 +67,8 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
 +	g_return_if_fail(VTE_IS_TERMINAL(terminal));
 +
 +	_vte_invalidate_cursor_once(terminal, FALSE);
-+	terminal->pvt->screen->cursor_current.col = column;
-+	terminal->pvt->screen->cursor_current.row = row;
++	terminal->pvt->cursor.col = column;
++	terminal->pvt->cursor.row = row;
 +	_vte_invalidate_cursor_once(terminal, FALSE);
 +	_vte_check_cursor_blink(terminal);
 +	vte_terminal_queue_cursor_moved(terminal);
@@ -77,7 +77,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  static GtkClipboard *
  vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
  {
-@@ -6319,7 +6342,7 @@
+@@ -6465,7 +6488,7 @@
          vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
  
  	/* Temporarily stop caring about input from the child. */
@@ -86,7 +86,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  }
  
  static gboolean
-@@ -6336,7 +6359,7 @@
+@@ -6482,7 +6505,7 @@
  		terminal->pvt->selecting = FALSE;
  
  		/* Reconnect to input from the child if we paused it. */
@@ -95,7 +95,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  
  		return TRUE;
  	}
-@@ -6834,6 +6857,50 @@
+@@ -6982,6 +7005,50 @@
  	vte_terminal_deselect_all (terminal);
  }
  
@@ -146,7 +146,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  /* Autoscroll a bit. */
  static gboolean
  vte_terminal_autoscroll(VteTerminal *terminal)
-@@ -8476,7 +8543,7 @@
+@@ -8631,7 +8698,7 @@
  #endif
  		kill(terminal->pvt->pty_pid, SIGHUP);
  	}
@@ -155,7 +155,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  	_vte_terminal_disconnect_pty_write(terminal);
  	if (terminal->pvt->pty_channel != NULL) {
  		g_io_channel_unref (terminal->pvt->pty_channel);
-@@ -12533,7 +12600,7 @@
+@@ -12188,7 +12255,7 @@
          g_object_freeze_notify(object);
  
          if (pvt->pty != NULL) {
@@ -164,7 +164,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
                  _vte_terminal_disconnect_pty_write(terminal);
  
                  if (terminal->pvt->pty_channel != NULL) {
-@@ -12588,7 +12655,7 @@
+@@ -12243,7 +12310,7 @@
          _vte_terminal_setup_utf8 (terminal);
  
          /* Open channels to listen for input on. */
@@ -173,7 +173,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  
          g_object_notify(object, "pty");
  
-@@ -12623,7 +12690,7 @@
+@@ -12276,7 +12343,7 @@
  }
  
  char *
@@ -182,10 +182,9 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
  {
  	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
  
-Only in vte-0.38.0.new/src: .vte.c.swp
-diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h
---- vte-0.38.0/src/vteint.h	2014-05-16 13:51:26.000000000 -0400
-+++ vte-0.38.0.new/src/vteint.h	2014-09-21 17:05:44.934589281 -0400
+diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h
+--- vte-0.40.0/src/vteint.h	2014-05-28 08:22:48.000000000 -0400
++++ vte-0.40.0.new/src/vteint.h	2015-04-10 00:08:53.153520062 -0400
 @@ -25,7 +25,6 @@
  G_BEGIN_DECLS
  
@@ -194,10 +193,10 @@ diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h
  void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
  void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
  void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
---- vte-0.38.0/src/vteterminal.h	2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vteterminal.h	2014-09-21 17:03:39.094903032 -0400
-@@ -170,6 +170,18 @@
+diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h
+--- vte-0.40.0/src/vteterminal.h	2015-03-18 12:38:09.000000000 -0400
++++ vte-0.40.0.new/src/vteterminal.h	2015-04-10 00:08:53.150186722 -0400
+@@ -169,6 +169,18 @@
  
  void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
  void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
@@ -214,9 +213,9 @@ diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
 +void vte_terminal_disconnect_pty_read(VteTerminal *vte);
 +void vte_terminal_connect_pty_read(VteTerminal *vte);
  
- /* Set the terminal's size. */
- void vte_terminal_set_size(VteTerminal *terminal,
-@@ -276,6 +288,8 @@
+ /* By-word selection */
+ void vte_terminal_set_word_char_exceptions(VteTerminal *terminal,
+@@ -280,6 +292,8 @@
  void vte_terminal_get_cursor_position(VteTerminal *terminal,
  				      glong *column,
                                        glong *row) _VTE_GNUC_NONNULL(1);

From a43bd6bbcd1f189b034bb9431ae4b813d3cad95c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 18 May 2015 12:46:22 +0200
Subject: [PATCH 0999/1143] go: add disabled flag for packages

---
 pkgs/development/go-modules/generic/default.nix | 5 +++++
 pkgs/top-level/go-packages.nix                  | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 271e0ed66336..7bdb8c3805cd 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -2,6 +2,9 @@
 
 { name, buildInputs ? []
 
+# Disabled flag
+, disabled ? false
+
 # Go import path of the package
 , goPackagePath
 
@@ -15,6 +18,8 @@
 
 , meta ? {}, ... } @ args':
 
+if disabled then throw "${name} not supported for go ${go.meta.branch}" else
+
 let
   args = lib.filterAttrs (name: _: name != "extraSrcs") args';
 in
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 278360f1ce12..3b7e8f3cc967 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3,7 +3,10 @@
 { overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb
 , fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr, pkgs }:
 
-let self = _self // overrides; _self = with self; {
+let
+  isGo13 = go.meta.branch == "1.3";
+  isGo14 = go.meta.branch == "1.4";
+  self = _self // overrides; _self = with self; {
 
   inherit go buildGoPackage;
 
@@ -14,6 +17,7 @@ let self = _self // overrides; _self = with self; {
     name = "go-crypto-${rev}";
     goPackagePath = "golang.org/x/crypto";
     goPackageAliases = [ "code.google.com/p/go.crypto" ];
+    disabled = isGo13;
 
     src = fetchFromGitHub {
       inherit rev;

From 1a3de464170dc38784fb2c5620003f89bcd0ce9c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 18 May 2015 12:47:24 +0200
Subject: [PATCH 1000/1143] go: also remove disabled from the derivation

---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 7bdb8c3805cd..2ff1438006f9 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -25,7 +25,7 @@ let
 in
 
 go.stdenv.mkDerivation (
-  (builtins.removeAttrs args [ "goPackageAliases" ]) // {
+  (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
 
   name = "go${go.meta.branch}-${name}";
   buildInputs = [ go ] ++ buildInputs ++ (lib.optional (!dontRenameImports) govers) ;

From d511369fcc0c524457ff01379afda96b3fe0f360 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 18 May 2015 12:55:02 +0200
Subject: [PATCH 1001/1143] go: document disabled flag

---
 doc/language-support.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 5942fe01e2ed..da709b34a94b 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -674,6 +674,7 @@ net = buildGoPackage rec {
   goPackageAliases = [ "code.google.com/p/go.net" ]; <co xml:id='ex-buildGoPackage-3' />
   propagatedBuildInputs = [ goPackages.text ]; <co xml:id='ex-buildGoPackage-4' />
   buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-5' />
+  disabled = isGo13;<co xml:id='ex-buildGoPackage-6' />
 };
 </programlisting>
 </example>
@@ -731,6 +732,18 @@ the following arguments are of special significance to the function:
     </para>
   </callout>
 
+  <callout arearefs='ex-buildGoPackage-6'>
+    <para>
+      If <varname>disabled</varname> is <literal>true</literal>,
+      nix will refuse to build this package.
+    </para>
+    <para>
+      In this example the package will not be built for go 1.3. The <literal>isGo13</literal>
+      is an utility function that returns <literal>true</literal> if go used to build the
+      package has version 1.3.x.
+    </para>
+  </callout>
+
 </calloutlist>
 
 </para>

From 99b14de505df21a5b5cc6636ca679f7ac179d8ba Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 18 May 2015 13:05:26 +0200
Subject: [PATCH 1002/1143] Fix evaluation of goffice 0.8 across gnome updates

---
 pkgs/desktops/gnome-3/3.16/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix        | 8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 6ec1ee011f53..6243b2dd6d40 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -279,6 +279,12 @@ rec {
 
   goffice = callPackage ./misc/goffice { };
 
+  goffice_0_8 = callPackage ./misc/goffice/0.8.nix { 
+    inherit (pkgs.gnome2) libglade libgnomeui;
+    gconf = pkgs.gnome2.GConf;
+    libart = pkgs.gnome2.libart_lgpl;
+  };
+
   gitg = callPackage ./misc/gitg { 
     webkitgtk = webkitgtk24x;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b38bef1fc24..5b89bdfa81b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11068,15 +11068,9 @@ let
     gconf = gnome2.GConf;
     guile = guile_1_8;
     slibGuile = slibGuile.override { scheme = guile_1_8; };
-    goffice = goffice_0_8;
+    goffice = gnome3.goffice_0_8;
   };
 
-  goffice_0_8 = callPackage ../desktops/gnome-3/3.12/misc/goffice/0.8.nix {
-    inherit (gnome2) libglade libgnomeui;
-    gconf = gnome2.GConf;
-    libart = gnome2.libart_lgpl;
-  }; # latest version: gnome3.goffice
-
   idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };

From 6af3e25bb9f1e3e9cbce2f67680573341781d27c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 18 May 2015 13:08:48 +0200
Subject: [PATCH 1003/1143] Add goffice_0_8 back to toplevel

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b89bdfa81b0..17870460aa6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11068,9 +11068,11 @@ let
     gconf = gnome2.GConf;
     guile = guile_1_8;
     slibGuile = slibGuile.override { scheme = guile_1_8; };
-    goffice = gnome3.goffice_0_8;
+    goffice = goffice_0_8;
   };
 
+  goffice_0_8 = gnome3.goffice_0_8;
+
   idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };

From 73e164f575d5589f6c6c863e4e40d48ceabe49b4 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 18 May 2015 12:27:42 +0200
Subject: [PATCH 1004/1143] pkgs charybdis: change platforms to linux only

---
 pkgs/servers/irc/charybdis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index ab0ba4fd9343..a38a25c8a5cb 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage    = https://github.com/atheme/charybdis;
     license     = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.lassulus ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms   = stdenv.lib.platforms.linux;
   };
 
 

From 12f0b619675d591bfef01e253cdb826eee509378 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 18 May 2015 13:15:50 +0200
Subject: [PATCH 1005/1143] hipchat: update 2.2.1287 -> 2.2.1373

---
 .../networking/instant-messengers/hipchat/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index b9f9667ad3b6..f82ffa5ecd38 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -5,7 +5,7 @@
 
 let
 
-  version = "2.2.1287";
+  version = "2.2.1373";
 
   rpath = stdenv.lib.makeSearchPath "lib" [
     stdenv.glibc
@@ -47,12 +47,12 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
-        sha256 = "170izy3v18rgriz84h4gyf9354jvjrsbkgg53czq9l0scyz8x55b";
+        sha256 = "0mxjzigncp8sh5w2rpr7kvkiahagm3adss1zv6rqk8hc1awrnd8n";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
-        sha256 = "150q7pxg5vs14is5qf36yfsf7r70g49q9xr1d1rknmc5m4qa5rc5";
+        sha256 = "1f4cjbazgifxpyr6589frs417h4wpxbykf46w5qiw0m2wiqpqff5";
       }
     else
       throw "HipChat is not supported on ${stdenv.system}";
@@ -92,10 +92,11 @@ stdenv.mkDerivation {
     mv opt/HipChat/bin/linuxbrowserlaunch $out/libexec/hipchat/bin/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Desktop client for HipChat services";
     homepage = http://www.hipchat.com;
-    license = stdenv.lib.licenses.unfree;
+    license = licenses.unfree;
     platforms = [ "i686-linux" "x86_64-linux" ];
+    maintainers = with maintainers; [ jgeerds ];
   };
 }

From 22c8244605cd500d344142569b7d000aabdb8b10 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Sat, 16 May 2015 22:20:33 +0200
Subject: [PATCH 1006/1143] zeal: update to 0.1.1 (close #7858)

---
 pkgs/data/documentation/zeal/default.nix | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 6b8399a8b3f4..7bc1b9fa1fdd 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,38 +1,26 @@
 { stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive }:
 
 stdenv.mkDerivation rec {
-  version = "20141123";
+  version = "0.1.1";
   name = "zeal-${version}";
 
   src = fetchFromGitHub {
     owner = "zealdocs";
     repo = "zeal";
-    rev = "76405f8387d6a82697faab9630c78f31417d8450";
-    sha256 = "1057py3j2flzxyiks031s0mwm9h82v033iqn5cq8sycmrb3ihj2s";
+    rev = "v${version}";
+    sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii";
   };
 
-  buildInputs = [ pkgconfig qt5.base qt5.webkit libarchive ];
+  buildInputs = [ pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ];
 
-  patchPhase = ''
-    substituteInPlace src/main.cpp \
-      --replace /usr/share/pixmaps/zeal $out/share/pixmaps/zeal
-  '';
-
-  buildPhase = ''
-    qmake PREFIX=$out
-    make
+  configurePhase = ''
+    qmake PREFIX=/
   '';
 
   installPhase = ''
     make INSTALL_ROOT=$out install
   '';
 
-  preFixup = ''
-    mv $out/usr/bin $out/bin
-    mv $out/usr/share $out/share
-    rmdir $out/usr
-  '';
-
   enableParallelBuilding = true;
 
   meta = {

From 5b7837c0d37622b6ad1888c669039c7dfd5c6229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 May 2015 13:42:49 +0200
Subject: [PATCH 1007/1143] libjpeg-turbo: make Hydra only build it on Linux

I don't know what's wrong with darwin.
Anyway, it's unused on darwin by default.
---
 pkgs/development/libraries/libjpeg-turbo/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 6a650de85646..c9de127c9056 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
     homepage = http://libjpeg-turbo.virtualgl.org/;
     description = "A faster (using SIMD) libjpeg implementation";
     license = licenses.ijg; # and some parts under other BSD-style licenses
-    platforms = platforms.all;
     maintainers = [ maintainers.vcunat ];
+    # upstream supports darwin (and others), but it doesn't build currently
+    platforms = platforms.all;
+    hydraPlatforms = platforms.linux;
   };
 }
 

From 27aba150070b4c7e0843ead95196af77d7eb974f Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Mon, 18 May 2015 06:43:26 +0000
Subject: [PATCH 1008/1143] freetds-stable.tgz has gone

---
 pkgs/development/libraries/freetds/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 3980c5b61b31..11d10e73cdd7 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -3,12 +3,12 @@
 
 assert odbcSupport -> unixODBC != null;
 
-stdenv.mkDerivation {
-  name = "freetds-0.91";
+stdenv.mkDerivation rec {
+  name = "freetds-0.91.112";
 
   src = fetchurl {
-    url = ftp://ftp.astron.com/pub/freetds/stable/freetds-stable.tgz;
-    sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba";
+    url = "ftp://ftp.astron.com/pub/freetds/stable/${name}.tar.gz";
+    sha256 = "be4f04ee57328c32e7e7cd7e2e1483e535071cec6101e46b9dd15b857c5078ed";
   };
 
   buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ];

From 04622fe3baceba49042a0b5e2c89d309e93d8928 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 18 May 2015 08:52:50 -0500
Subject: [PATCH 1009/1143] firefoxWrapper: fix typo

Accidentally tried to hardlink a directory! Should have been `ln -s` all
along. Affects non-Firefox browsers that use firefoxWrapper.
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index a2134afdcf78..409f7d29ba2f 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
 
     if [ -e "${browser}/share/icons" ]; then
         mkdir -p "$out/share"
-        ln "${browser}/share/icons" "$out/share/icons"
+        ln -s "${browser}/share/icons" "$out/share/icons"
     else
         mkdir -p "$out/share/icons/hicolor/128x128/apps"
         ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \

From 132570bacee4cbefbbae8ede0ca8a7f684b4d2a8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 18 May 2015 16:06:33 +0200
Subject: [PATCH 1010/1143] Add colm, a language for program analysis and
 transformation

---
 pkgs/development/compilers/colm/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/compilers/colm/default.nix

diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
new file mode 100644
index 000000000000..ebfee6c4188e
--- /dev/null
+++ b/pkgs/development/compilers/colm/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, makeWrapper, gcc }:
+
+stdenv.mkDerivation rec {
+  name = "colm-${version}";
+  version = "0.12.0";
+
+  src = fetchurl {
+    url = "http://www.colm.net/files/colm/${name}.tar.gz";
+    sha256 = "0kbfipxv3nvggd1a2nahk3jg22iifp2l7lkm55i5r7qkpms5sm3v";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  doCheck = true;
+  checkPhase = ''sh ./test/runtests.sh'';
+
+  postInstall = ''
+    wrapProgram $out/bin/colm \
+      --prefix PATH ":" ${gcc}/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A programming language for the analysis and transformation of computer languages";
+    homepage = http://www.colm.net/open-source/colm;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17870460aa6b..d8845c94c3ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3413,6 +3413,8 @@ let
 
   bigloo = callPackage ../development/compilers/bigloo { };
 
+  colm = callPackage ../development/compilers/colm { };
+
   fetchegg = callPackage ../build-support/fetchegg { };
 
   eggDerivation = callPackage ../development/compilers/chicken/eggDerivation.nix { };

From c45a4b4a921819fbc8ae30a16530c105b3727cef Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 16:58:21 +0300
Subject: [PATCH 1011/1143] urxvt-tabbedex: update

---
 .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index db388cea5fbb..ba68a46cf0c7 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://github.com/mina86/urxvt-tabbedex";
-    rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42";
-    sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e";
+    rev = "b0a02018b1cbaaba2a0c8ea7af9368db0adf3363";
+    sha256 = "f0025f2741d424736620147d9fc39faac68193cb9f74bde0fb6e02a6f1ae61c3";
   };
 
   installPhase = ''

From e919cf0be2b8c4c2033edbbafba3ac8732656947 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 16:58:37 +0300
Subject: [PATCH 1012/1143] pidgin-otr: update homepage

---
 .../instant-messengers/pidgin-plugins/otr/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index c290975152cd..7b80ec85661a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libotr pidgin intltool ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.cypherpunks.ca/otr;
+    homepage = https://otr.cypherpunks.ca/;
     description = "Plugin for Pidgin 2.x which implements OTR Messaging";
     license = licenses.gpl2;
     platforms = platforms.linux;

From 19b4eb82089dfc1b54132e996b3034a72e847223 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 16:59:02 +0300
Subject: [PATCH 1013/1143] bomi: update, add youtube-dl support

---
 pkgs/applications/video/bomi/default.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 83fb7546a3bc..be0517b6376b 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper
 , libX11, libxcb, qt5, mesa
 , ffmpeg
 , libchardet
@@ -15,12 +15,16 @@
 , portaudioSupport ? false, portaudio ? null
 , pulseSupport ? true, pulseaudio ? null
 , cddaSupport ? false, libcdda ? null
+, youtubeSupport ? true, youtube-dl ? null
 }:
 
+with stdenv.lib;
+
 assert jackSupport -> jack != null;
 assert portaudioSupport -> portaudio != null;
 assert pulseSupport -> pulseaudio != null;
 assert cddaSupport -> libcdda != null;
+assert youtubeSupport -> youtube-dl != null;
 
 let
   waf = fetchurl {
@@ -32,18 +36,18 @@ in
 
 stdenv.mkDerivation rec {
   name = "bomi-${version}";
-  version = "0.9.5";
+  version = "0.9.10";
 
   src = fetchFromGitHub {
     owner = "xylosper";
     repo = "bomi";
     rev = "v${version}";
-    sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll";
+    sha256 = "1c7497gks7yxzfy6jx77vn9zs2pdq7y6l9w61miwnkdm91093n17";
   };
 
   buildInputs = with stdenv.lib;
                 [ libX11 libxcb mesa
-                  qt5.base qt5.quick1 qt5.x11extras
+                  qt5.base qt5.x11extras qt5.declarative qt5.quickcontrols
                   ffmpeg
                   libchardet
                   mpg123
@@ -65,13 +69,17 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     patchShebangs configure
-    # src/mpv/waf build-mpv; do
   '';
 
   preBuild = ''
-    patchShebangs build-mpv
     install -m755 ${waf} src/mpv/waf
-    sed -i '1 s,.*,#!${python3.interpreter},' src/mpv/waf
+    patchShebangs src/mpv/waf
+    patchShebangs build-mpv
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/bomi \
+      ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
   '';
 
   configureFlags = with stdenv.lib;
@@ -82,7 +90,7 @@ stdenv.mkDerivation rec {
                    ++ optional cddaSupport "--enable-cdda"
                    ;
 
-  nativeBuildInputs = [ pkgconfig perl which ];
+  nativeBuildInputs = [ pkgconfig perl python which qt5.tools makeWrapper ];
 
   enableParallelBuilding = true;
 

From f79effa2ebc65fd4ba468fffab4db3401d6eda09 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 16:59:44 +0300
Subject: [PATCH 1014/1143] haskell-graphviz: fix for GHC 7.10

---
 .../haskell-modules/configuration-ghc-7.10.x.nix      |  5 +++--
 .../haskell-modules/graphviz-fix-ghc710.patch         | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/graphviz-fix-ghc710.patch

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 53512826a5bd..e5717ba899f8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -241,8 +241,6 @@ self: super: {
   hbb = dontDistribute super.hbb;
   hsdev = dontDistribute super.hsdev;
 
-  # http://hub.darcs.net/ivanm/graphviz/issue/5
-  graphviz = markBroken super.graphviz;
   Graphalyze = dontDistribute super.Graphalyze;
   HLearn-approximation = dontDistribute super.HLearn-approximation;
   HLearn-classification = dontDistribute super.HLearn-classification;
@@ -288,6 +286,9 @@ self: super: {
   # https://github.com/ocharles/tasty-rerun/issues/5
   tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
 
+  # http://hub.darcs.net/ivanm/graphviz/issue/5
+  graphviz = appendPatch super.graphviz ./graphviz-fix-ghc710.patch;
+
   # Broken with GHC 7.10.x.
   aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
   annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3;
diff --git a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch
new file mode 100644
index 000000000000..e72bb793da73
--- /dev/null
+++ b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch
@@ -0,0 +1,11 @@
+diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs
+--- graphviz.old/Data/GraphViz/Algorithms.hs	2015-05-18 15:21:38.379771357 +0300
++++ graphviz/Data/GraphViz/Algorithms.hs	2015-05-18 15:01:01.940122684 +0300
+@@ -38,6 +38,7 @@
+ import Data.GraphViz.Types.Canonical
+ import Data.GraphViz.Types.Internal.Common
+ 
++import           Prelude                   hiding (traverse)
+ import           Control.Arrow             (first, second, (***))
+ import           Control.Monad             (unless)
+ import           Control.Monad.Trans.State

From c244457121a1bf50bc00428d598de07a7299551c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:01:06 +0300
Subject: [PATCH 1015/1143] double-conversion: update

---
 pkgs/development/libraries/double-conversion/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 6eedf6fc23be..7de7cb4d102d 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.1";
+  version = "1.1.5";
   name = "double-conversion-${version}";
 
   src = fetchFromGitHub {
-    owner = "floitsch";
+    owner = "google";
     repo = "double-conversion";
     rev = "v${version}";
-    sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b";
+    sha256 = "1a264wpnvxmnq5pdlnp417ld1ybrng83lnbg38bv4ahz7a29ap4z";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Binary-decimal and decimal-binary routines for IEEE doubles";
-    homepage = https://github.com/floitsch/double-conversion;
+    homepage = https://github.com/google/double-conversion;
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];

From 2120cdec76010f42c5df8de18df4ff26b3502c68 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:01:19 +0300
Subject: [PATCH 1016/1143] folly: update

---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 0110511c3356..79584a99f630 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,14 +2,14 @@
 , google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "0.32.0";
+  version = "0.38.0";
   name = "folly-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "0yviih6b220bv6d1rg4lx1hqprqapnzfv4rv64cwjxbmz49ckmzh";
+    sha256 = "0b273iwizy08r8lap367q79lai4l4aib2bvd827lkkdax5jpqf6b";
   };
 
   buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ];

From 9867951a50700ec7e4a215c17b98742aff8aae08 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:01:31 +0300
Subject: [PATCH 1017/1143] ijs: update

---
 pkgs/development/libraries/ijs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index 5350630dac40..fbba11c10c93 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, autoreconfHook }:
 
-let version = "9.15";
+let version = "9.16";
 in
 stdenv.mkDerivation {
   name = "ijs-${version}";
 
   src = fetchurl {
     url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2";
-    sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6";
+    sha256 = "0vdqbjkickb0109lk6397bb2zjmg1s46dac5p5j4gfxa4pwl8b9y";
   };
 
   prePatch = "cd ijs";

From 809991152869e90f954c7a8b84819bbebbdfd8a2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:02:36 +0300
Subject: [PATCH 1018/1143] libaacs: fix building

---
 pkgs/development/libraries/libaacs/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 717dae8fb256..631c7c778ae2 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, yacc, flex }:
+{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
 
 # library that allows libbluray to play AACS protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@@ -7,7 +7,6 @@
 # http://vlc-bluray.whoknowsmy.name/
 # https://wiki.archlinux.org/index.php/BluRay
 
-
 let baseName = "libaacs";
     version  = "0.8.0";
 in
@@ -20,13 +19,13 @@ stdenv.mkDerivation {
     sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y";
   };
 
-  buildInputs = [ libgcrypt ];
+  buildInputs = [ libgcrypt libgpgerror ];
 
   nativeBuildInputs = [ yacc flex ];
 
   meta = with stdenv.lib; {
     homepage = http://www.videolan.org/developers/libbluray.html;
-    description = "Library to access Blu-Ray disks for video playback";
+    description = "Library to access AACS protected Blu-Ray disks";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];
   };

From 49363242731858b8366545bdf30216e54ea53d6d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:04:19 +0300
Subject: [PATCH 1019/1143] libbdplus: add package

---
 .../libraries/libbdplus/default.nix           | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/libbdplus/default.nix

diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
new file mode 100644
index 000000000000..8cc2e8069320
--- /dev/null
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
+
+# library that allows libbluray to play BDplus protected bluray disks
+# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
+
+# Info on how to use / obtain aacs keys:
+# http://vlc-bluray.whoknowsmy.name/
+# https://wiki.archlinux.org/index.php/BluRay
+
+
+let baseName = "libbdplus";
+    version  = "0.1.2";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+    sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
+  };
+
+  buildInputs = [ libgcrypt libgpgerror ];
+
+  nativeBuildInputs = [ ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.videolan.org/developers/libbdplus.html;
+    description = "Library to access BD+ protected Blu-Ray disks";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8845c94c3ec..932a942a5df7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6422,6 +6422,8 @@ let
 
   libbluedevil = callPackage ../development/libraries/libbluedevil { };
 
+  libbdplus = callPackage ../development/libraries/libbdplus { };
+
   libbluray = callPackage ../development/libraries/libbluray { };
 
   libbs2b = callPackage ../development/libraries/audio/libbs2b { };

From a5fc6f702e0ed5fca2b171ea3c5dcb6f9da8dfb4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:04:50 +0300
Subject: [PATCH 1020/1143] libbluray: update, fix building, AACS and Java

---
 .../libbluray/BDJ-JARFILE-path.patch          | 23 +++++-----
 .../libraries/libbluray/default.nix           | 45 ++++++++++---------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
index 64f0e74084fc..2680b1c6de5c 100644
--- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
+++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
@@ -1,8 +1,7 @@
-diff --git a/configure.ac b/configure.ac
-index 3609d88..48c6bc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,6 +227,7 @@ if [[ $use_bdjava = "yes" ]]; then
+diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac
+--- libbluray-0.8.0/configure.ac	2015-04-10 09:48:23.000000000 +0300
++++ libbluray-0.8.0-new/configure.ac	2015-05-18 14:22:01.002075482 +0300
+@@ -231,6 +231,7 @@
    AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
    AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
    AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
@@ -10,16 +9,14 @@ index 3609d88..48c6bc6 100644
  fi
  AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
  
-diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
-index c622801..f4aab9b 100644
---- a/src/libbluray/bdj/bdj.c
-+++ b/src/libbluray/bdj/bdj.c
-@@ -210,7 +210,7 @@ static const char *_find_libbluray_jar(void)
+diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c
+--- libbluray-0.8.0/src/libbluray/bdj/bdj.c	2015-04-06 19:25:09.000000000 +0300
++++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c	2015-05-18 14:22:59.241312808 +0300
+@@ -228,6 +228,7 @@
  #ifdef _WIN32
          "" BDJ_JARFILE,
  #else
--        "/usr/share/java/" BDJ_JARFILE,
 +        JARDIR "/" BDJ_JARFILE,
+         "/usr/share/java/" BDJ_JARFILE,
+         "/usr/share/libbluray/lib/" BDJ_JARFILE,
  #endif
-     };
- 
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 170c4e461882..de0fa1a56d3c 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, fontconfig
-, withAACS ? false, libaacs ? null, jdk ? null, ant ? null
+{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook
+, withJava ? true, jdk ? null, ant ? null
+, withAACS ? false, libaacs ? null
+, withBDplus ? false, libbdplus ? null
 , withMetadata ? true, libxml2 ? null
 , withFonts ? true, freetype ? null
-# Need to run autoreconf hook after BDJ jarfile patch
-, autoreconfHook ? null
 }:
 
-assert withAACS -> jdk != null && ant != null && libaacs != null && autoreconfHook != null;
+with stdenv.lib;
+
+assert withJava -> jdk != null && ant != null;
+assert withAACS -> libaacs != null;
+assert withBDplus -> libbdplus != null;
 assert withMetadata -> libxml2 != null;
 assert withFonts -> freetype != null;
 
@@ -15,41 +19,40 @@ assert withFonts -> freetype != null;
 
 stdenv.mkDerivation rec {
   baseName = "libbluray";
-  version  = "0.7.0";
+  version  = "0.8.0";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
-    sha256 = "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp";
+    sha256 = "027xbdbsjyp1spfiva2331pzixrzw6vm97xlvgz16hzm5a5j103v";
   };
 
-  nativeBuildInputs = with stdenv.lib;
-                      [pkgconfig]
-                      ++ optional withAACS ant
+  nativeBuildInputs = [ pkgconfig autoreconfHook ]
+                      ++ optionals withJava [ ant ]
                       ;
 
-  buildInputs =  with stdenv.lib;
-                 [fontconfig]
-              ++ optionals withAACS [ jdk autoreconfHook ]
-              ++ optional withMetadata libxml2
-              ++ optional withFonts freetype
-              ;
+  buildInputs = [ fontconfig ]
+                ++ optional withJava jdk
+                ++ optional withMetadata libxml2
+                ++ optional withFonts freetype
+                ;
 
   propagatedBuildInputs = stdenv.lib.optional withAACS libaacs;
 
-  preConfigure = stdenv.lib.optionalString withAACS ''
-    export JDK_HOME=${jdk.home}
-    export LIBS="$LIBS -L${libaacs} -laacs"
+  preConfigure = ''
+    ${optionalString withJava ''export JDK_HOME="${jdk.home}"''}
+    ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''}
+    ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''}
   '';
 
   configureFlags =  with stdenv.lib;
-                    optional withAACS "--enable-bdjava"
+                    optional (! withJava) "--disable-bdjava"
                  ++ optional (! withMetadata) "--without-libxml2"
                  ++ optional (! withFonts) "--without-freetype"
                  ;
 
   # Fix search path for BDJ jarfile
-  patches = stdenv.lib.optional withAACS ./BDJ-JARFILE-path.patch;
+  patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch;
 
   meta = with stdenv.lib; {
     homepage = http://www.videolan.org/developers/libbluray.html;

From f1b51945bc81c3c5837df9065c8b6fec7c0bcdbf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:05:19 +0300
Subject: [PATCH 1021/1143] ti-rpc: update package

---
 pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++--
 pkgs/development/libraries/ti-rpc/default.nix             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 544ab215345a..4dd1ca46e956 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip, blas, liblapack, gfortran }:
 
 stdenv.mkDerivation rec {
-  version = "3.12.1";
+  version = "3.12.3";
   name = "ipopt-${version}";
 
   src = fetchurl {
     url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
-    sha256 = "0x0wcc21d2bfs3zq8nvhva1nv7xi86wjbyixvvxvcrg2kqjlybdy";
+    sha256 = "0h8qx3hq2m21qrg4v3n26v2qbhl6saxrpa7rbhnmkkcfj5s942yr";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 55438e2c201f..b135e49f52bb 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, kerberos }:
+{ fetchurl, stdenv, krb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-0.2.5";
+  name = "libtirpc-0.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "1nq2w227j9nh8qsz7b3c1pha00k5yvzf2c3pfmlcb1l65iydxyb2";
+    sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna";
   };
 
-  buildInputs = [ kerberos ];
+  propagatedBuildInputs = [ krb5 ];
 
   # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
   preConfigure = ''

From 925a21aa2a2911204f945739a784ea6b6401865b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:06:42 +0300
Subject: [PATCH 1022/1143] rpcbind: update package

---
 pkgs/servers/rpcbind/default.nix  |  5 +++--
 pkgs/servers/rpcbind/sunrpc.patch | 30 ++++++++++++++++--------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 854a2ab94b76..6eb8a57cab4f 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, pkgconfig, libtirpc
 , useSystemd ? true, systemd }:
 
-let version = "0.2.2";
+let version = "0.2.3";
 in stdenv.mkDerivation rec {
   name = "rpcbind-${version}";
   
   src = fetchurl {
     url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
-    sha256 = "0acgl1c07ymnks692b90aq5ldj4h0km7n03kz26wxq6vjv3winqk";
+    sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
   };
 
   patches = [ ./sunrpc.patch ];
@@ -23,6 +23,7 @@ in stdenv.mkDerivation rec {
     description = "ONC RPC portmapper";
     license = licenses.bsd3;
     platforms = platforms.unix;
+    homepage = http://sourceforge.net/projects/rpcbind/;
     maintainers = with maintainers; [ abbradar ];
     longDescription = ''
       Universal addresses to RPC program number mapper.
diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/servers/rpcbind/sunrpc.patch
index af9b3b716798..450d33aa1c40 100644
--- a/pkgs/servers/rpcbind/sunrpc.patch
+++ b/pkgs/servers/rpcbind/sunrpc.patch
@@ -3,9 +3,10 @@ http://projects.archlinux.org/svntogit/packages.git/tree/trunk/rpcbind-sunrpc.pa
 Lookup "sunrpc" instead of "rpcbind" in /etc/services, since the former is the
 official IANA name.
 
---- rpcbind-0.1.7/src/rpcbind.c.orig	2008-11-19 14:17:34.000000000 +0100
-+++ rpcbind-0.1.7/src/rpcbind.c	2010-01-07 13:03:37.416632894 +0100
-@@ -114,7 +114,7 @@
+diff -ru3 rpcbind-0.2.3/src/rpcbind.c rpcbind-0.2.3.new/src/rpcbind.c
+--- rpcbind-0.2.3/src/rpcbind.c	2015-04-27 17:07:43.000000000 +0300
++++ rpcbind-0.2.3.new/src/rpcbind.c	2015-05-18 16:29:24.938380694 +0300
+@@ -132,7 +132,7 @@
  char *udp_uaddr;	/* Universal UDP address */
  char *tcp_uaddr;	/* Universal TCP address */
  #endif
@@ -14,14 +15,15 @@ official IANA name.
  static char superuser[] = "superuser";
  
  int main __P((int, char *[]));
---- rpcbind-0.1.7/src/rpcinfo.c~	2010-01-08 16:14:24.592156602 +0000
-+++ rpcbind-0.1.7/src/rpcinfo.c	2010-01-08 16:14:31.578838609 +0000
-@@ -633,7 +633,7 @@
- 	{
- 	  memset (&hints, 0, sizeof hints);
- 	  hints.ai_family = AF_INET;
--	  if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 &&
-+	  if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 &&
-               (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0)
- 	    {
- 	      fprintf (stderr, "rpcinfo: %s: %s\n",
+diff -ru3 rpcbind-0.2.3/src/rpcinfo.c rpcbind-0.2.3.new/src/rpcinfo.c
+--- rpcbind-0.2.3/src/rpcinfo.c	2015-04-27 17:07:43.000000000 +0300
++++ rpcbind-0.2.3.new/src/rpcinfo.c	2015-05-18 16:30:14.197025336 +0300
+@@ -1842,7 +1842,7 @@
+ 
+   /* Get the address of the rpcbind */
+   memset (&hints, 0, sizeof hints);
+-  if ((getaddrinfo (host, "rpcbind", &hints, &res) != 0) &&
++  if ((getaddrinfo (host, "sunrpc", &hints, &res) != 0) &&
+       (getaddrinfo (host, "portmapper",&hints, &res) != 0))
+     {
+       rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;

From ab7d2f7f39b2214815f72e75601016942eddfb9d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:07:03 +0300
Subject: [PATCH 1023/1143] network-manager-l2tp: add homepage

---
 pkgs/tools/networking/network-manager/l2tp.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix
index a104f321c12d..f415b4f3bedd 100644
--- a/pkgs/tools/networking/network-manager/l2tp.nix
+++ b/pkgs/tools/networking/network-manager/l2tp.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "L2TP plugin for NetworkManager";
     inherit (networkmanager.meta) platforms;
+    homepage = https://github.com/seriyps/NetworkManager-l2tp;
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
   };

From e2f0e08b021e422abf4be955c0c9a9550246b974 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 May 2015 17:07:25 +0300
Subject: [PATCH 1024/1143] bomi: build with PulseAudio support by default

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 932a942a5df7..e0789bf6e3e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10471,7 +10471,7 @@ let
 
   bomi = callPackage ../applications/video/bomi {
     stdenv = overrideCC stdenv gcc49;
-    pulseSupport = config.pulseaudio or false;
+    pulseSupport = config.pulseaudio or true;
   };
 
   cmus = callPackage ../applications/audio/cmus { };

From a14966e8271aa0a2b958ff9723524157dfc3ccd2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 May 2015 14:39:19 +0200
Subject: [PATCH 1025/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/eb2884c12cce16ac2ef55e5fd9576213b68b0597
 with hackage2nix revision bf850da9044b16efb9ef06a05c645fa981513444

---
 .../haskell-modules/hackage-packages.nix      | 556 +++++++++---------
 1 file changed, 290 insertions(+), 266 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 09156dbb459b..328e0fcb966e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -13307,8 +13307,8 @@ self: {
      }:
      mkDerivation {
        pname = "Saturnin";
-       version = "0.1.0";
-       sha256 = "14ipl6mi1g874y66i3lvaqdisfl3agy5cj005ghpq81hv5wp770g";
+       version = "0.1.0.1";
+       sha256 = "19vbaj2zd083lw4jvgi9sdkhyk0hfgb88i9sksg6i1j569ypjk78";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -18009,15 +18009,18 @@ self: {
      }) {};
 
   "alfred" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hexpat, HTTP, network-uri
-     , text, xmlgen
+    ({ mkDerivation, aeson, base, bytestring, hexpat, http-conduit
+     , http-types, network-uri, text, xmlgen
      }:
      mkDerivation {
        pname = "alfred";
-       version = "0.4";
-       sha256 = "1zmjllvcpj42cp01n1p2f2kzzx2ik4fql2vwbzlkaay9v9pskjk0";
+       version = "0.5";
+       revision = "1";
+       sha256 = "1c6ak56g29wkas66x7yhg1zk039mp2mvlp7njixchhh2c4kx9fvn";
+       editedCabalFile = "06e4b9ba672fc3d29452df70d2e9f9018ada5e8b62aa5890b9a70d9d937d6581";
        buildDepends = [
-         aeson base bytestring hexpat HTTP network-uri text xmlgen
+         aeson base bytestring hexpat http-conduit http-types network-uri
+         text xmlgen
        ];
        description = "utility library for Alfred version 2";
        license = stdenv.lib.licenses.bsd3;
@@ -19336,18 +19339,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "annotated-wl-pprint_0_5_3" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "annotated-wl-pprint";
-       version = "0.5.3";
-       sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis";
-       buildDepends = [ base ];
-       homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
-       description = "The Wadler/Leijen Pretty Printer, with annotation support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "annotated-wl-pprint" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -21848,8 +21839,8 @@ self: {
      }:
      mkDerivation {
        pname = "auto";
-       version = "0.4.2.2";
-       sha256 = "1n2kknp7b8agkvn3nk6w6cabzh3n89jakzx8pi46ig2ghcxz90wf";
+       version = "0.4.2.3";
+       sha256 = "1vzsmmim3h3r0ikzci9zb32rm42gr0x2m1lmm11my5jcf88gwck7";
        buildDepends = [
          base base-orphans bytestring cereal containers deepseq MonadRandom
          profunctors random semigroups transformers
@@ -26009,27 +26000,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "blaze-html_0_7_0_3" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
-     , containers, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-html";
-       version = "0.7.0.3";
-       sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx";
-       buildDepends = [ base blaze-builder blaze-markup bytestring text ];
-       testDepends = [
-         base blaze-builder blaze-markup bytestring containers HUnit
-         QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       jailbreak = true;
-       homepage = "http://jaspervdj.be/blaze";
-       description = "A blazingly fast HTML combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "blaze-html" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
      , containers, HUnit, QuickCheck, test-framework
@@ -26119,26 +26089,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "blaze-markup_0_6_2_0" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-markup";
-       version = "0.6.2.0";
-       sha256 = "034aqkvxw0g6ry4d82bkvxky7w6yx4q6bp1wn4ydj9rqw8yh6m08";
-       buildDepends = [ base blaze-builder bytestring text ];
-       testDepends = [
-         base blaze-builder bytestring containers HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-       ];
-       jailbreak = true;
-       homepage = "http://jaspervdj.be/blaze";
-       description = "A blazingly fast markup combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "blaze-markup" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
      , QuickCheck, test-framework, test-framework-hunit
@@ -31350,8 +31300,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5.5";
-       sha256 = "1s5r7sjkxri02zxsjnkdxd03sk2j77l5r819sjw1wi6930p2fwa4";
+       version = "0.5.6";
+       sha256 = "0x538nxibz4hiyij1s9ljrgjvsmizha4nacszil1530qh7ss34n9";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -31376,8 +31326,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.4";
-       sha256 = "08is6gr5z2i478lmah6liqinbp8r72zjqfcbfmrxa4vjr3ajrpw7";
+       version = "0.5.5";
+       sha256 = "0k6k45fhkwrr3azqhp278abf4kr7is67zsqyabf71hdyp68242dx";
        buildDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -33288,14 +33238,13 @@ self: {
      }:
      mkDerivation {
        pname = "compdata-param";
-       version = "0.8.0.2";
-       sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs";
+       version = "0.9";
+       sha256 = "1b7kdg4g1mqpzy10wdxm90mbjfwmfpprkbb52ba9qbcg7scap4i4";
        buildDepends = [ base compdata mtl template-haskell transformers ];
        testDepends = [
          base compdata containers HUnit mtl template-haskell test-framework
          test-framework-hunit transformers
        ];
-       jailbreak = true;
        description = "Parametric Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37277,6 +37226,7 @@ self: {
        ];
        description = "Library for drawing curve based images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "custom-prelude" = callPackage
@@ -42596,6 +42546,7 @@ self: {
        homepage = "https://github.com/factisresearch/dockercook";
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docopt" = callPackage
@@ -42604,8 +42555,8 @@ self: {
      }:
      mkDerivation {
        pname = "docopt";
-       version = "0.7.0.1";
-       sha256 = "1i8san365h3g1jhkwh4dyphczdfyd1558744hj4sv5q9lnq86l4q";
+       version = "0.7.0.2";
+       sha256 = "0c62lz0xmrd3ycnpmw254jbc5s999nb0xzrrkbv3cj3n9zzcyzak";
        buildDepends = [ base containers parsec template-haskell th-lift ];
        testDepends = [
          aeson ansi-terminal base bytestring containers parsec split
@@ -44223,17 +44174,18 @@ self: {
      }) { inherit (pkgs) libedit;};
 
   "editor-open" = callPackage
-    ({ mkDerivation, base, bytestring, directory, process, temporary
-     , unix
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , directory, process, resourcet, temporary, transformers, unix
      }:
      mkDerivation {
        pname = "editor-open";
-       version = "0.4.0.2";
-       sha256 = "14vddpdwgjj5fi1g7ampqjsxpig87kiyddjw24kjjlxwava6nn16";
+       version = "0.5.0.0";
+       sha256 = "184i45vzf4xv5whp5q688fmrgxwyrhkqg88hw56yx34blcxywzcr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring directory process temporary unix
+         base bytestring conduit conduit-extra directory process resourcet
+         temporary transformers unix
        ];
        homepage = "https://github.com/pharpend/editor-open";
        description = "Open the user's $EDITOR for text input";
@@ -45008,7 +44960,9 @@ self: {
      mkDerivation {
        pname = "elocrypt";
        version = "0.3.1";
+       revision = "1";
        sha256 = "1hh1nf0zfijzrz6pp2gq7zh7rv3fwrybm5cfj59wfb0j0dikz8v4";
+       editedCabalFile = "d5781bd7efe030d5ee31448a6df16a3a6c3e4e72e4cabb73a42ad243240f7f6a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base MonadRandom random ];
@@ -45018,6 +44972,7 @@ self: {
        homepage = "https://www.github.com/sgillespie/elocrypt";
        description = "Generate easy-to-remember, hard-to-guess passwords";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email" = callPackage
@@ -45086,7 +45041,9 @@ self: {
      mkDerivation {
        pname = "email-validate";
        version = "2.1.2";
+       revision = "1";
        sha256 = "13r67kk5rjl54mwk4shap1rf8jdp1hsd6wpg4hgkf10vzk5vara5";
+       editedCabalFile = "0add2fe9264e4307cb7d464ddaf54c8147396f36740228d124224f5a27689582";
        buildDepends = [ attoparsec base bytestring ghc-prim ];
        testDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -46334,8 +46291,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.4.1.0";
-       sha256 = "0g4qlkvl313mi4immx5i78bdbzg0ld57ld114l8jf42fwk3qd5zd";
+       version = "0.4.1.1";
+       sha256 = "0d870kzcb08pc0ngrdkfibi0yq4zs5vcgg8acqpa8gdjaiksm8jg";
        buildDepends = [
          aeson base bytestring network suspend text timers websockets
        ];
@@ -46511,8 +46468,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exceptional";
-       version = "0.1.4.2";
-       sha256 = "0macyynwj779wy1abzrl87g8zmpwa98x5vc5yqc0wnr06glmma2b";
+       version = "0.1.4.3";
+       sha256 = "0rhcqnpw97b9sy87nq7dqwiw8vl91h8yyix68d9sz10s9bi1xnlv";
        buildDepends = [ base ];
        homepage = "https://github.com/pharpend/exceptional";
        description = "Essentially the Maybe type with error messages";
@@ -48276,8 +48233,8 @@ self: {
      }:
      mkDerivation {
        pname = "filediff";
-       version = "1.0.0.1";
-       sha256 = "1341xriaylrvclbz8c5pc1dppbz4kqq1hmbrga0dlpb6vr83amv2";
+       version = "1.0.0.4";
+       sha256 = "0vzknflpbhxririabjq6wpwb9lvj0829smj94icjyrx3s9i968k6";
        buildDepends = [
          base bytestring data-default data-memocombinators directory either
          mtl rainbow tasty tasty-hunit text threads time transformers Zora
@@ -50811,10 +50768,9 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "functor-monadic";
-       version = "0.1.0.2";
-       sha256 = "03jipdzark9dhwlym7ky887zzl3cdsc18wwwmg5szl1wgg30li1n";
+       version = "0.1.0.3";
+       sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg";
        buildDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/ombocomp/FunctorMonadic/";
        description = "Monad-style combinators for functors";
        license = stdenv.lib.licenses.asl20;
@@ -51454,7 +51410,9 @@ self: {
      mkDerivation {
        pname = "generic-aeson";
        version = "0.2.0.5";
+       revision = "1";
        sha256 = "109jxrny3r1wsf2kr23vvgdid4rmq5lpqjlfbk4n7yxb9bvdbhy5";
+       editedCabalFile = "9b825c5d437c1a3a47dfb27781100229b7c535982ad42721414083cab309e461";
        buildDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -52427,8 +52385,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-prof-flamegraph";
-       version = "0.1.0.0";
-       sha256 = "1hrikiv6a8l7pq9j7zjb98zl1qlb8gdggfkcw49zmk7zay0bd1c2";
+       version = "0.1.0.1";
+       sha256 = "1k34mh63rsgx71kxhn3brscq2k20pih78axwkr0q9dg7icyg05wi";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base ];
@@ -54806,10 +54764,10 @@ self: {
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
        pname = "graph-wrapper";
-       version = "0.2.4.3";
-       sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg";
+       version = "0.2.4.4";
+       sha256 = "0ks4mj1f3ky8h8p9kc1djslbzs2vvlh9frab8jl09x63b15f8xzd";
        buildDepends = [ array base containers ];
-       homepage = "http://www.github.com/batterseapower/graph-wrapper";
+       homepage = "https://github.com/soenkehahn/graph-wrapper";
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57080,6 +57038,7 @@ self: {
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hactor" = callPackage
@@ -58242,6 +58201,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -59185,6 +59145,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hashids" = callPackage
+    ({ mkDerivation, base, bytestring, containers, split }:
+     mkDerivation {
+       pname = "hashids";
+       version = "1.0.2";
+       sha256 = "07qrsabhb825jhdbc4ka35ss7ci07avgvi8jsr69r17bnp87wnma";
+       buildDepends = [ base bytestring containers split ];
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashmap" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable }:
      mkDerivation {
@@ -61780,26 +61751,26 @@ self: {
 
   "hbro" = callPackage
     ({ mkDerivation, aeson, base, bytestring, classy-prelude, cond
-     , containers, data-default-class, dyre, errors, fast-logger, glib
-     , gtk3, lens, lifted-async, lifted-base, monad-control
-     , monad-logger, mtl, network-uri, optparse-applicative, pango
-     , parsec, process, resourcet, safe, semigroups, stm-chans
-     , system-fileio, text, time, transformers, transformers-base, unix
-     , webkitgtk3, zeromq4-haskell
+     , containers, data-default-class, directory, dyre, errors
+     , exceptions, fast-logger, filepath, glib, gtk3, lens, lifted-async
+     , lifted-base, monad-control, monad-logger, mtl, network-uri
+     , optparse-applicative, pango, parsec, process, resourcet, safe
+     , semigroups, stm-chans, text, time, transformers
+     , transformers-base, unix, webkitgtk3, zeromq4-haskell
      }:
      mkDerivation {
        pname = "hbro";
-       version = "1.3.0.0";
-       sha256 = "114g9dz9f7s59s9d8hb38qffmdif617nhbs2z9vsdqmylgirirmz";
+       version = "1.4.0.0";
+       sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bytestring classy-prelude cond containers
-         data-default-class dyre errors fast-logger glib gtk3 lens
-         lifted-async lifted-base monad-control monad-logger mtl network-uri
-         optparse-applicative pango parsec process resourcet safe semigroups
-         stm-chans system-fileio text time transformers transformers-base
-         unix webkitgtk3 zeromq4-haskell
+         data-default-class directory dyre errors exceptions fast-logger
+         filepath glib gtk3 lens lifted-async lifted-base monad-control
+         monad-logger mtl network-uri optparse-applicative pango parsec
+         process resourcet safe semigroups stm-chans text time transformers
+         transformers-base unix webkitgtk3 zeromq4-haskell
        ];
        homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
@@ -61808,20 +61779,18 @@ self: {
 
   "hbro-contrib" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
-     , classy-prelude, containers, glib, gtk3, hbro, lens, monad-control
-     , mtl, network-uri, pango, parsec, process, resourcet, safe
-     , system-fileio, text, time, transformers-base, unix, webkitgtk3
+     , classy-prelude, containers, directory, glib, gtk3, hbro, lens
+     , monad-control, mtl, network-uri, pango, parsec, process
+     , resourcet, safe, text, time, transformers-base, unix, webkitgtk3
      }:
      mkDerivation {
        pname = "hbro-contrib";
-       version = "1.3.0.0";
-       revision = "1";
-       sha256 = "09q7n5x61gsrjcv7ixh36daq3hj4sip5iph5ll7pfwpqd9mhxq95";
-       editedCabalFile = "1df0341291f1e2820b8b0833b4951a555a96df54b3ef7cee754d32a6e53c69f0";
+       version = "1.4.0.0";
+       sha256 = "0v7qxg1phac5m06raspaq6782iid7rnvkinkji0fs0yjigbblps2";
        buildDepends = [
-         aeson aeson-pretty base bytestring classy-prelude containers glib
-         gtk3 hbro lens monad-control mtl network-uri pango parsec process
-         resourcet safe system-fileio text time transformers-base unix
+         aeson aeson-pretty base bytestring classy-prelude containers
+         directory glib gtk3 hbro lens monad-control mtl network-uri pango
+         parsec process resourcet safe text time transformers-base unix
          webkitgtk3
        ];
        homepage = "https://github.com/k0ral/hbro-contrib";
@@ -62572,9 +62541,9 @@ self: {
      mkDerivation {
        pname = "heist";
        version = "0.14.1";
-       revision = "3";
+       revision = "4";
        sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy";
-       editedCabalFile = "eac3bf21f0c39ced491fbd542f7a96928c13e8e3672254eb970414168afbaddf";
+       editedCabalFile = "d61d5b4f4b360c12b46179000fe761037a23182489362188c929476a42248876";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist errors filepath hashable
@@ -67330,15 +67299,14 @@ self: {
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1.3";
-       sha256 = "1gzbdpsighs8jj92gi1xsrhpb7zh5mc86wiv4fszmgfrwaq1w8ab";
+       version = "0.3.1.4";
+       sha256 = "0pymwdpdl1xwjcgpblsrfyyib4sz2avxwidgxzr2bac91lhf3fpm";
        buildDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
        ];
        testDepends = [ aeson attoparsec base QuickCheck text vector ];
        extraLibraries = [ ruby ];
-       jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ruby;};
@@ -72788,6 +72756,7 @@ self: {
        ];
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iCalendar" = callPackage
@@ -73074,12 +73043,12 @@ self: {
      , network, optparse-applicative, parsers, pretty, process, safe
      , split, text, time, transformers, transformers-compat, trifecta
      , uniplate, unix, unordered-containers, utf8-string, vector
-     , vector-binary-instances, xml, zlib
+     , vector-binary-instances, xml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.9.17.1";
-       sha256 = "16a3z7jq1pmqnb411aqn9qmirwyzpx3bqb0hrawc1404kbq7gdx7";
+       version = "0.9.18";
+       sha256 = "09bskx00lxzf7fdw66sbi55bqr7z1d92cabf9askjf2ych07k26s";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -73089,7 +73058,7 @@ self: {
          haskeline lens libffi mtl network optparse-applicative parsers
          pretty process safe split text time transformers
          transformers-compat trifecta uniplate unix unordered-containers
-         utf8-string vector vector-binary-instances xml zlib
+         utf8-string vector vector-binary-instances xml zip-archive zlib
        ];
        buildTools = [ happy ];
        extraLibraries = [ boehmgc gmp ];
@@ -75178,6 +75147,7 @@ self: {
          free haskell-lexer lens network old-locale split stm text time tls
          transformers vty x509 x509-store x509-system x509-validation
        ];
+       jailbreak = true;
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
        license = stdenv.lib.licenses.bsd3;
@@ -75237,6 +75207,7 @@ self: {
        buildDepends = [ base QuickCheck ];
        description = "Real numbers and intervals with relatively efficient exact arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iron-mq" = callPackage
@@ -76245,8 +76216,8 @@ self: {
      }:
      mkDerivation {
        pname = "jmacro";
-       version = "0.6.11";
-       sha256 = "1b45graag0nmadaf1ssaps4g9p7xx7d2h7dy84nzmdhrpvdlw4xs";
+       version = "0.6.12";
+       sha256 = "08n00mmfixr6s3pgh6mccq1sk7932md8b36wdds3zb1p5icrrdpr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -76266,8 +76237,8 @@ self: {
      }:
      mkDerivation {
        pname = "jmacro-rpc";
-       version = "0.3";
-       sha256 = "1fkcky2f51764xcbbwnxpxyhk2mmnp364hf8njfcjsijanv938zw";
+       version = "0.3.2";
+       sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3";
        buildDepends = [
          aeson attoparsec base blaze-html bytestring containers
          contravariant jmacro mtl scientific split text unordered-containers
@@ -76698,6 +76669,7 @@ self: {
        homepage = "http://github.com/snoyberg/json-enumerator";
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-extra" = callPackage
@@ -77579,18 +77551,17 @@ self: {
      }) {};
 
   "keys" = callPackage
-    ({ mkDerivation, array, base, comonad, containers, free
-     , semigroupoids, semigroups, transformers
+    ({ mkDerivation, array, base, comonad, containers, free, hashable
+     , semigroupoids, semigroups, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "keys";
-       version = "3.10.1";
-       sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n";
+       version = "3.10.2";
+       sha256 = "1xmyhsqpz4rvm2i8f8xgd1wpj8qlps0lvbif1li73lzg13jiwps2";
        buildDepends = [
-         array base comonad containers free semigroupoids semigroups
-         transformers
+         array base comonad containers free hashable semigroupoids
+         semigroups transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/keys/";
        description = "Keyed functors and containers";
        license = stdenv.lib.licenses.bsd3;
@@ -79524,12 +79495,17 @@ self: {
      }) {};
 
   "lattices" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, deepseq, hashable
+     , unordered-containers
+     }:
      mkDerivation {
        pname = "lattices";
-       version = "1.2.1.1";
-       sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6";
-       buildDepends = [ base containers ];
+       version = "1.3";
+       sha256 = "1jp63rh1girf9ka0lfi219wlisni8dsckf67h6413ihdxdh2mp3l";
+       buildDepends = [
+         base containers deepseq hashable unordered-containers
+       ];
+       homepage = "http://github.com/phadej/lattices/";
        description = "Fine-grained library for constructing and manipulating lattices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79839,12 +79815,14 @@ self: {
      }) {};
 
   "leapseconds-announced" = callPackage
-    ({ mkDerivation, base, time }:
+    ({ mkDerivation, base, QuickCheck, time }:
      mkDerivation {
        pname = "leapseconds-announced";
-       version = "2015";
-       sha256 = "14k57jw0n9nqrc9rrqsjiafk3li7z8azf9cm72gm3yrms72ph3m8";
+       version = "2015.0.0.1";
+       sha256 = "0k8khjfq1cr8wb2wgwwk7yv6461h7z6wf6qn21qd9zq9i22bpyhm";
        buildDepends = [ base time ];
+       testDepends = [ base QuickCheck time ];
+       homepage = "https://github.com/bjornbm/leapseconds-announced";
        description = "Leap seconds announced at library release time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80016,43 +79994,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lens_4_7_0_1" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, comonad
-     , containers, contravariant, deepseq, directory, distributive
-     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
-     , hashable, hlint, HUnit, mtl, nats, parallel, primitive
-     , profunctors, QuickCheck, reflection, semigroupoids, semigroups
-     , simple-reflect, split, tagged, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, text, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.7.0.1";
-       revision = "3";
-       sha256 = "1j9d7g4sj38zq2r8vhy05b2kbxx1sg2k0b3yx05lbxlb79wcm1j1";
-       editedCabalFile = "6ac87d4c8600c9497c965d54b1e97f10d0073bed3c45381b78d1ba4b81da57c8";
-       buildDepends = [
-         array base bifunctors bytestring comonad containers contravariant
-         distributive exceptions filepath free ghc-prim hashable mtl
-         parallel primitive profunctors reflection semigroupoids semigroups
-         split tagged template-haskell text transformers transformers-compat
-         unordered-containers vector void
-       ];
-       testDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving hlint HUnit mtl nats parallel QuickCheck
-         semigroups simple-reflect split test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       jailbreak = true;
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "lens" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, comonad
      , containers, contravariant, deepseq, directory, distributive
@@ -80066,8 +80007,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.10";
-       sha256 = "01vmb0kknzayv3ppqgrnhnrybxw192gb4hk1kchwiiam7vr6kngd";
+       version = "4.11";
+       sha256 = "1699jbsdgffnhzpy6c2k6ld13crqibm7vc3x2gx95gwzx5hlccxm";
        buildDepends = [
          array base bifunctors bytestring comonad containers contravariant
          distributive exceptions filepath free ghc-prim hashable
@@ -80290,6 +80231,7 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -81096,8 +81038,8 @@ self: {
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.7.0";
-       sha256 = "1i9wm7pz8mh0gjyp7jhf3as82yi1axskv1mp5596gq7pszgglyd6";
+       version = "0.7.0.1";
+       sha256 = "0skfpgqlxni3bdn7pdg2732xkijmwsz655962wrbmflh987ms8y3";
        buildDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
@@ -82877,8 +82819,8 @@ self: {
      }:
      mkDerivation {
        pname = "logic-TPTP";
-       version = "0.4.2.0";
-       sha256 = "1pqs0hr05b4jsnf73fqfgqng3h63dlswlx18142fbkv1bhphg8al";
+       version = "0.4.3.0";
+       sha256 = "0hjznn92ippwgrsmklj02w2pf6dfylyiw1kifa4svjqwa9mx4hpv";
        buildDepends = [
          ansi-wl-pprint array base containers mtl pointed QuickCheck syb
          transformers transformers-compat
@@ -85441,6 +85383,7 @@ self: {
        jailbreak = true;
        description = "A silly container";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mega-sdist" = callPackage
@@ -86835,6 +86778,7 @@ self: {
        homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "A new Prelude featuring first class modules";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modular-prelude-classy" = callPackage
@@ -89672,6 +89616,7 @@ self: {
        ];
        description = "Monadic interface for mwc-random";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "myTestlll" = callPackage
@@ -89818,16 +89763,15 @@ self: {
      }) {};
 
   "mysql-simple-typed" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, mysql, mysql-simple
-     , template-haskell, typedquery, utf8-string
+    ({ mkDerivation, base, mysql, mysql-simple, template-haskell
+     , typedquery, utf8-string
      }:
      mkDerivation {
        pname = "mysql-simple-typed";
-       version = "0.1.1.1";
-       sha256 = "0cizs7c51884j05409nc8ldzlsbjcwpwc1ral1p1g1c98y1mpkcc";
+       version = "0.1.1.2";
+       sha256 = "19wnvmrb523n8xl5cp9kypcqcrs0xs8pwdk771y1bdin5ds9j095";
        buildDepends = [
-         base haskell-src-meta mysql mysql-simple template-haskell
-         typedquery utf8-string
+         base mysql mysql-simple template-haskell typedquery utf8-string
        ];
        homepage = "https://github.com/tolysz/mysql-simple-typed";
        description = "Typed extension to mysql simple";
@@ -91063,12 +91007,12 @@ self: {
      }) {};
 
   "network-data" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, pretty, prettyclass }:
+    ({ mkDerivation, base, bytestring, cereal, pretty }:
      mkDerivation {
        pname = "network-data";
-       version = "0.5.2";
-       sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s";
-       buildDepends = [ base bytestring cereal pretty prettyclass ];
+       version = "0.5.3";
+       sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz";
+       buildDepends = [ base bytestring cereal pretty ];
        description = "Library for network data structures and their serialization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93207,6 +93151,7 @@ self: {
        testDepends = [
          base postgresql-simple product-profunctors profunctors time
        ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
@@ -96921,6 +96866,7 @@ self: {
        jailbreak = true;
        description = "Elsen Accelerated Computing Engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phantom-state" = callPackage
@@ -98134,8 +98080,8 @@ self: {
      }:
      mkDerivation {
        pname = "plugins-multistage";
-       version = "0.6";
-       sha256 = "02wf1q3c65ki0hgmxsqd7x48p42hh33bx3vyjykkv69jiz1why7y";
+       version = "0.6.1";
+       sha256 = "0kwibjp9r9gwkmi8i79cc217jhnqljcgdkvpsk7hclmaa7ir3caq";
        buildDepends = [
          base directory ghc process template-haskell th-desugar
        ];
@@ -98144,6 +98090,7 @@ self: {
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plumbers" = callPackage
@@ -98265,8 +98212,8 @@ self: {
      }:
      mkDerivation {
        pname = "pointed";
-       version = "4.2.0.1";
-       sha256 = "1ysif8x5vlllib3gpdd3i0kdlanlzaw1pm0sjx1qayv19m1ddph7";
+       version = "4.2.0.2";
+       sha256 = "0ynswx6ybl7b6vbrm2bd2zj2sbvsclhdi440lpv1aix5smd8m2jb";
        buildDepends = [
          base comonad containers data-default-class hashable kan-extensions
          semigroupoids semigroups stm tagged transformers
@@ -98961,17 +98908,18 @@ self: {
      }) {};
 
   "posix-pty" = callPackage
-    ({ mkDerivation, base, bytestring, unix }:
+    ({ mkDerivation, base, bytestring, process, unix, util }:
      mkDerivation {
        pname = "posix-pty";
-       version = "0.1.1";
-       sha256 = "0ndr47bfm07b00kfy2p48jm7fjrd76bxbw3l7wm5yc0d0jyi65cd";
-       buildDepends = [ base bytestring unix ];
+       version = "0.2.0.1";
+       sha256 = "1f0jyhfl41fvnjc290lm7x4dik2bhymcfxzf0il1iza5rpcjabxa";
+       buildDepends = [ base bytestring process unix ];
+       extraLibraries = [ util ];
        homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) { util = null;};
 
   "posix-realtime" = callPackage
     ({ mkDerivation, base, unix }:
@@ -99220,18 +99168,17 @@ self: {
      }) {};
 
   "postgresql-simple-typed" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, postgresql-libpq
-     , postgresql-simple, template-haskell, typedquery, utf8-string
+    ({ mkDerivation, base, postgresql-libpq, postgresql-simple
+     , template-haskell, transformers, typedquery, utf8-string
      }:
      mkDerivation {
        pname = "postgresql-simple-typed";
-       version = "0.1.0.0";
-       sha256 = "1n9fkg1qcrycb7gvx4pln4xq3hpbczic4p2zv0f9hq7ljb5h3f1a";
+       version = "0.1.0.1";
+       sha256 = "0rgy0sx4fwcsr8ln14vhrp23hc1b67c07gw0hj5csrsjn40s0c2c";
        buildDepends = [
-         base haskell-src-meta postgresql-libpq postgresql-simple
-         template-haskell typedquery utf8-string
+         base postgresql-libpq postgresql-simple template-haskell
+         transformers typedquery utf8-string
        ];
-       jailbreak = true;
        homepage = "https://github.com/tolysz/postgresql-simple-typed";
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
@@ -99263,24 +99210,25 @@ self: {
 
   "postgrest" = callPackage
     ({ mkDerivation, aeson, base, base64-string, bcrypt, blaze-builder
-     , bytestring, case-insensitive, containers, convertible, hasql
-     , hasql-backend, hasql-postgres, hlint, hspec, hspec-wai
-     , hspec-wai-json, HTTP, http-media, http-types, MissingH, mtl
-     , network, network-uri, optparse-applicative, packdeps, process
-     , QuickCheck, Ranged-sets, regex-base, regex-tdfa, regex-tdfa-text
-     , resource-pool, scientific, split, string-conversions
-     , stringsearch, text, time, transformers, unordered-containers
-     , vector, wai, wai-cors, wai-extra, wai-middleware-static, warp
+     , bytestring, case-insensitive, cassava, containers, convertible
+     , hasql, hasql-backend, hasql-postgres, heredoc, hlint, hspec
+     , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, MissingH
+     , mtl, network, network-uri, optparse-applicative, packdeps
+     , process, QuickCheck, Ranged-sets, regex-base, regex-tdfa
+     , regex-tdfa-text, resource-pool, scientific, split
+     , string-conversions, stringsearch, text, time, transformers
+     , unordered-containers, vector, wai, wai-cors, wai-extra
+     , wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.2.7.0";
-       sha256 = "1mr7wka4kxxmpnhw9p49a4vh68iavrh74shc712z17gmr9yahvcx";
+       version = "0.2.8.0";
+       sha256 = "1hmscdlg89r65q0i43ll22kb6iy9ryx6gmfxk795h8wsrk2f18sw";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
-         case-insensitive containers convertible hasql hasql-backend
+         case-insensitive cassava containers convertible hasql hasql-backend
          hasql-postgres HTTP http-types MissingH mtl network network-uri
          optparse-applicative Ranged-sets regex-base regex-tdfa
          regex-tdfa-text resource-pool scientific split string-conversions
@@ -99289,14 +99237,16 @@ self: {
        ];
        testDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
-         case-insensitive containers convertible hasql hasql-backend
-         hasql-postgres hlint hspec hspec-wai hspec-wai-json HTTP http-media
-         http-types MissingH mtl network network-uri optparse-applicative
-         packdeps process QuickCheck Ranged-sets regex-base regex-tdfa
-         regex-tdfa-text resource-pool scientific split string-conversions
-         stringsearch text time transformers unordered-containers vector wai
-         wai-cors wai-extra wai-middleware-static warp
+         case-insensitive cassava containers convertible hasql hasql-backend
+         hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP
+         http-media http-types MissingH mtl network network-uri
+         optparse-applicative packdeps process QuickCheck Ranged-sets
+         regex-base regex-tdfa regex-tdfa-text resource-pool scientific
+         split string-conversions stringsearch text time transformers
+         unordered-containers vector wai wai-cors wai-extra
+         wai-middleware-static warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
@@ -100017,6 +99967,7 @@ self: {
        ];
        description = "A Perl printf like formatter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "printxosd" = callPackage
@@ -100404,6 +100355,7 @@ self: {
        editedCabalFile = "ac8ac15500d9a5f4c678489d77c6abea03b24a704ceb235eecf9f49ef08da757";
        buildDepends = [ base contravariant profunctors template-haskell ];
        testDepends = [ base profunctors ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -100480,8 +100432,8 @@ self: {
      }:
      mkDerivation {
        pname = "profunctors";
-       version = "5.0.1";
-       sha256 = "1n6lk1r10j5ssb88ia13zll1k2gsakvf314m51sz3nzmdcgx03ll";
+       version = "5.1";
+       sha256 = "0jw563wi9j4l5521jc5lr1apx2msh987r0pbpn3zqhb8c8gqgrgw";
        buildDepends = [ base comonad distributive tagged transformers ];
        homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
@@ -100801,8 +100753,8 @@ self: {
      }:
      mkDerivation {
        pname = "protobuf";
-       version = "0.2.0.4";
-       sha256 = "0gg678cb1psgdsjzv9x7mhcjmywj8bgzmp9pd850d3p9zyiw9l2j";
+       version = "0.2.1.0";
+       sha256 = "0i8hjrj6jycqmq7i1wl0kr9s17g4qfyc0gfwcbhbv70yxwf499di";
        buildDepends = [
          base bytestring cereal data-binary-ieee754 deepseq mtl text
          unordered-containers
@@ -101820,16 +101772,16 @@ self: {
 
   "quandl-api" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , http-conduit, http-types, old-locale, syb, text, time
+     , http-conduit, http-types, syb, text, time, time-locale-compat
      , unordered-containers
      }:
      mkDerivation {
        pname = "quandl-api";
-       version = "0.2.0.0";
-       sha256 = "1h6gh9wssb8dw9r5f7caanxq542d0jw9shvp7wx0i1k47f54kb3k";
+       version = "0.2.1.0";
+       sha256 = "01mjwg7myal3hc98s7v582ycabv7qx2j6lcsyvhxbmhzs1wl8sqf";
        buildDepends = [
-         aeson base blaze-builder bytestring http-conduit http-types
-         old-locale syb text time unordered-containers
+         aeson base blaze-builder bytestring http-conduit http-types syb
+         text time time-locale-compat unordered-containers
        ];
        homepage = "https://github.com/pvdbrand/quandl-api";
        description = "Quandl.com API library";
@@ -102213,6 +102165,7 @@ self: {
        homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickset" = callPackage
@@ -103476,13 +103429,12 @@ self: {
      }:
      mkDerivation {
        pname = "record";
-       version = "0.3.1.1";
-       sha256 = "08rmxy2hy19jz614ml5qfwhmdnhfs0qllgk65p0p7bb4v65cg5s9";
+       version = "0.3.1.2";
+       sha256 = "02kpi21l2kwysk8qgxgl10ngqnmc0mx50qxf9jq0fmi8rv3fm9xp";
        buildDepends = [
          attoparsec base base-prelude template-haskell text transformers
        ];
        testDepends = [ base base-prelude directory doctest filepath ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record";
        description = "First class records implemented with quasi-quotation";
        license = stdenv.lib.licenses.mit;
@@ -105196,20 +105148,19 @@ self: {
 
   "repl-toolkit" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
-     , exceptions, functor-monadic, ListLike, listsafe, monad-loops, mtl
-     , numericpeano, parsec, semigroupoids, system-filepath, text
+     , exceptions, filepath, functor-monadic, ListLike, listsafe
+     , monad-loops, mtl, numericpeano, parsec, semigroupoids, text
      , transformers
      }:
      mkDerivation {
        pname = "repl-toolkit";
-       version = "0.4.0.0";
-       sha256 = "1r4gyj3jjm9sv597zlksckg5cl9r2k633hz5avzczf92b0j4ikr3";
+       version = "0.5.0.0";
+       sha256 = "0m0jh734zfmxc2bfilb1ka12y3nhsm94hxcg0q6wwf6bxkl564vq";
        buildDepends = [
-         aeson base bytestring data-default directory exceptions
+         aeson base bytestring data-default directory exceptions filepath
          functor-monadic ListLike listsafe monad-loops mtl numericpeano
-         parsec semigroupoids system-filepath text transformers
+         parsec semigroupoids text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/ombocomp/repl-toolkit";
        description = "Toolkit for quickly whipping up config files and command-line interfaces";
        license = stdenv.lib.licenses.asl20;
@@ -105510,10 +105461,8 @@ self: {
      }:
      mkDerivation {
        pname = "resourcet";
-       version = "1.1.4.1";
-       revision = "1";
-       sha256 = "1qw9bjr22g8a1fr84cmwjqpqs7cfc8iagix4s618snrg1r1gp6p2";
-       editedCabalFile = "28106769e7204b32cfdfb46603990697cfef6f1a9e720d47ec76873edfb06ad7";
+       version = "1.1.5";
+       sha256 = "063v7xfhwqgf1yvdiidg4anx38nfvgcwb0sqim5rcbqhz0fmkypy";
        buildDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat
@@ -105787,6 +105736,7 @@ self: {
        jailbreak = true;
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resumable-exceptions" = callPackage
@@ -106275,6 +106225,64 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rivet" = callPackage
+    ({ mkDerivation, base, rivet-core, rivet-simple-deploy }:
+     mkDerivation {
+       pname = "rivet";
+       version = "0.1.0.0";
+       sha256 = "1hiwgn0xyl42y9cmmc25464y42w7grf68xv8cvjznwzv0v1v63cg";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base rivet-core rivet-simple-deploy ];
+       homepage = "https://github.com/dbp/rivet";
+       description = "A project management tool for Haskell applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "rivet-core" = callPackage
+    ({ mkDerivation, base, configurator, directory, directory-tree
+     , filepath, postgresql-simple, process, shake, template-haskell
+     , text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "rivet-core";
+       version = "0.1.0.1";
+       sha256 = "102zgb1ryfl341h8r9hxm9zbmg8jq67bkn57hxhnfsjxv7952x21";
+       buildDepends = [
+         base configurator directory directory-tree filepath
+         postgresql-simple process shake template-haskell text time
+         unordered-containers
+       ];
+       homepage = "https://github.com/dbp/rivet";
+       description = "Core library for project management tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "rivet-migration" = callPackage
+    ({ mkDerivation, base, postgresql-simple, text }:
+     mkDerivation {
+       pname = "rivet-migration";
+       version = "0.1.0.0";
+       sha256 = "1ki6jk2shxh9r4kzpn1bsa1a7jc8vvpgigv4gg87sialr2k0f4zr";
+       buildDepends = [ base postgresql-simple text ];
+       jailbreak = true;
+       homepage = "https://github.com/dbp/rivet";
+       description = "Postgresql migration support for project management tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "rivet-simple-deploy" = callPackage
+    ({ mkDerivation, base, configurator, mtl, rivet-core, text }:
+     mkDerivation {
+       pname = "rivet-simple-deploy";
+       version = "0.1.0.0";
+       sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf";
+       buildDepends = [ base configurator mtl rivet-core text ];
+       homepage = "https://github.com/dbp/rivet";
+       description = "Basic deployment support for project management tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rmonad" = callPackage
     ({ mkDerivation, base, containers, HUnit, suitable, test-framework
      , test-framework-hunit, transformers
@@ -109832,6 +109840,7 @@ self: {
        jailbreak = true;
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pool" = callPackage
@@ -111512,8 +111521,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-sendfile";
-       version = "0.2.18";
-       sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49";
+       version = "0.2.19";
+       sha256 = "1qg97j4rm1wksdni29vrrra3rgff04afaadb58q8g1yy2w4lh5a5";
        buildDepends = [ base bytestring network unix ];
        testDepends = [
          base bytestring conduit conduit-extra directory hspec HUnit network
@@ -112388,6 +112397,7 @@ self: {
        homepage = "https://github.com/leepike/SmartCheck";
        description = "A smarter QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smartconstructor" = callPackage
@@ -115413,6 +115423,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stable-heap" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "stable-heap";
+       version = "0.1.0.0";
+       sha256 = "14wx42lmk2vd6v356q5cbd78y9xdnmkwcn6ddpnkyzq331hk23s1";
+       buildDepends = [ base ];
+       homepage = "http://hub.darcs.net/jmcarthur/stable-heap";
+       description = "Purely functional stable heaps (fair priority queues)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stable-maps" = callPackage
     ({ mkDerivation, base, containers, ghc-prim }:
      mkDerivation {
@@ -115665,8 +115687,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-sandbox";
-       version = "0.1.3";
-       sha256 = "0nkar4nax7h7hp5lmwi98inzy5pyg9sr819rhf78c27vjdmimrjr";
+       version = "0.1.4";
+       sha256 = "0y6m2ph1pgzlncirngbid7igdwkiv7yxcj27cgm0xpq8ii4lsq4x";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -118605,6 +118627,7 @@ self: {
        homepage = "https://github.com/d12frosted/CanonicalPath";
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-command" = callPackage
@@ -120627,8 +120650,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-framework-th-prime";
-       version = "0.0.7";
-       sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p";
+       version = "0.0.8";
+       sha256 = "0gb7bpdxzsd8fnh4ck4p1ks7nxrk7fsw97x90d4zjds5hnw3hchr";
        buildDepends = [
          base cpphs haskell-src-exts template-haskell test-framework
        ];
@@ -120672,8 +120695,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-sandbox";
-       version = "0.1.4";
-       sha256 = "1x7vsi1brrdj71gwszc75qz159y8i4xln9dpcnxf70xjlswjmiqj";
+       version = "0.1.5";
+       sha256 = "1cknqblzf2wqq46casmfq00lx4zh3y9g07bqsbchxbq4xmd000js";
        buildDepends = [
          base bytestring cereal containers data-default directory filepath
          lifted-base monad-control monad-loops mtl network process random
@@ -130064,6 +130087,7 @@ self: {
        ];
        description = "A simple cache for serving static files in a WAI middleware";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-static-pages" = callPackage
@@ -130325,6 +130349,7 @@ self: {
        jailbreak = true;
        description = "Opinionated filesystem watcher";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watchit" = callPackage
@@ -130722,8 +130747,8 @@ self: {
      }:
      mkDerivation {
        pname = "webcrank";
-       version = "0.2.0.1";
-       sha256 = "0l6mc3gyflb0lqmcs5x0nc3r5szyf4ig6y268f7crp74h05mvnlr";
+       version = "0.2.1";
+       sha256 = "0px4dy4crivkga0h2ca9j6fxlzwyl8qm8xzd2xyllqm2gzvcc3l7";
        buildDepends = [
          attoparsec base blaze-builder bytestring case-insensitive either
          exceptions http-date http-media http-types lens mtl semigroups text
@@ -132458,12 +132483,11 @@ self: {
      }:
      mkDerivation {
        pname = "xdot";
-       version = "0.2.4.6";
-       sha256 = "123vygzkqlycc298zh3321y7w85xnynbavzqms6cb8zgzya42wrs";
+       version = "0.2.4.7";
+       sha256 = "1izf892748g7f1h4m49d52zkbzfv164r4zyqss5lsbh3brh15v3g";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base cairo graphviz gtk mtl polyparse text ];
-       jailbreak = true;
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134005,13 +134029,12 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-light-lens";
-       version = "0.3.1.9";
-       sha256 = "0gxwa792g2nbgm2j6gl478qq5vgr06z6zzbbxranvh5fq7pq6al5";
+       version = "0.3.1.10";
+       sha256 = "1hpjzml8bw5n4lv82x3j6h8dzkz53mbhhsc7dhp79hwn75nq3aiz";
        buildDepends = [
          base bytestring bytestring-lexing containers lens yaml-light
        ];
        testDepends = [ base doctest ];
-       jailbreak = true;
        description = "Lens interface to yaml-light";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135347,6 +135370,7 @@ self: {
        homepage = "https://github.com/docmunch/yesod-routes-typescript";
        description = "generate TypeScript routes for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-rst" = callPackage

From 807146cf751976103724a612ed369eb86cf7a3c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Feb 2015 13:22:13 +0100
Subject: [PATCH 1026/1143] haskell-ng: make overrideScope respect the default
 lookup scope

Build environments created by overrideScope lost the ability to find
packages outside of the Haskell package set without help. This patch
remedies this issue.

Fixes https://github.com/NixOS/nixpkgs/issues/6192.
---
 pkgs/development/haskell-modules/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index e4e077def96f..6bfe92e43385 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -42,11 +42,11 @@ let
       });
 
       callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
-        overrideScope = f: callPackageWithScope (fix (extend scope.__unfix__ f)) drv args;
+        overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args;
       };
 
-      defaultScope = pkgs // pkgs.xlibs // pkgs.gnome // self;
-      callPackage = drv: args: callPackageWithScope defaultScope drv args;
+      mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope;
+      callPackage = drv: args: callPackageWithScope (mkScope self) drv args;
 
     in
       import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {

From b9152b89c2a89e36468d0c4e0de7ed0177d8376e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 10:55:29 +0200
Subject: [PATCH 1027/1143] haskell-ng: reduce memory requirements of
 overrideScope by improved sharing

With this patch applied, "nix-env -qaP -A haskellngPackages" succeeds fine
without running out of memory. Thanks to @bennofs for catching this in
https://github.com/peti/nixpkgs/commit/bbb422af92305137a12e898c406a3b11371c264c#commitcomment-11235596.
---
 pkgs/development/haskell-modules/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 6bfe92e43385..62d74b0ac7d4 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -46,7 +46,8 @@ let
       };
 
       mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope;
-      callPackage = drv: args: callPackageWithScope (mkScope self) drv args;
+      defaultScope = mkScope self;
+      callPackage = drv: args: callPackageWithScope defaultScope drv args;
 
     in
       import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {

From c959a59f47c49a4a76bb9c39516397e7874cd412 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 11:46:40 +0200
Subject: [PATCH 1028/1143] haskell-snap: jailbreak to fix build with current
 attoparsec and lens libraries

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a71fa7fe92ee..703fda23f369 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -813,4 +813,9 @@ self: super: {
   cheapskate = markBrokenVersion "0.1.0.3" super.cheapskate;
   lit = dontDistribute super.lit;
 
+  # https://github.com/snapframework/snap/issues/148
+  snap = overrideCabal super.snap (drv: {
+    patchPhase = "sed -i -e 's|attoparsec.*>=.*,|attoparsec,|' -e 's|lens.*>=.*|lens|' snap.cabal";
+  });
+
 }

From a14ebb03d9cee3e08d754ad93b868c0157691508 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 12:25:22 +0200
Subject: [PATCH 1029/1143] haskell-gitlib: mark build as broken

https://github.com/jwiegley/gitlib/issues/46
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 703fda23f369..c9075ac313d6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -818,4 +818,9 @@ self: super: {
     patchPhase = "sed -i -e 's|attoparsec.*>=.*,|attoparsec,|' -e 's|lens.*>=.*|lens|' snap.cabal";
   });
 
+  # https://github.com/jwiegley/gitlib/issues/46
+  gitlib = markBroken super.gitlib;
+  gitlib-sample = dontDistribute super.gitlib-sample;
+  gitlib-test = dontDistribute super.gitlib-test;
+
 }

From b2d483f14625263b16af51d7bae744d75c5e7c0c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 12:29:10 +0200
Subject: [PATCH 1030/1143] haskell-Saturnin: test suite has undeclared
 build-time dependencies

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c9075ac313d6..8a443cce5137 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -823,4 +823,7 @@ self: super: {
   gitlib-sample = dontDistribute super.gitlib-sample;
   gitlib-test = dontDistribute super.gitlib-test;
 
+  # https://github.com/yaccz/saturnin/issues/3
+  Saturnin = dontCheck super.Saturnin;
+
 }

From 3cdd27cbe69d8fec2766ccb413fbf0944983310b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 12:32:02 +0200
Subject: [PATCH 1031/1143] haskell-binary: version 0.7.4.0 can't compile its
 test suite

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8a443cce5137..1f2bbdb6f71c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -826,4 +826,7 @@ self: super: {
   # https://github.com/yaccz/saturnin/issues/3
   Saturnin = dontCheck super.Saturnin;
 
+  # https://github.com/kolmodin/binary/issues/74
+  binary_0_7_4_0 = dontCheck super.binary_0_7_4_0;
+
 }

From 7268605e00f4af6e02becf6f951eac2f76a49cbc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 12:40:55 +0200
Subject: [PATCH 1032/1143] idris: remove outdated overrides

The Idris build is broken for several reasons, I'm afraid, and has been broken
since a while. It' seems unnecessary to carry these non-functioning overrides
around.
---
 .../haskell-modules/configuration-ghc-7.8.x.nix        | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 660fc5d9a4eb..b7430c455b1c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -48,16 +48,6 @@ self: super: {
   # haddock-api 2.16 requires ghc>=7.10
   haddock-api = super.haddock-api_2_15_0_2;
 
-  # Idris needs special version of some libraries
-  idris = let super1 = super; in overrideCabal (super.idris.overrideScope (self: super: {
-    annotated-wl-pprint = self.annotated-wl-pprint_0_5_3;
-    blaze-html = self.blaze-html_0_7_0_3;
-    blaze-markup = self.blaze-markup_0_6_2_0;
-    lens = self.lens_4_7_0_1;
-  })) (drv: {
-    patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +";
-  });                           # warning: "Module ‘Control.Monad.Error’ is deprecated"
-
   # This is part of bytestring in our compiler.
   bytestring-builder = dontHaddock super.bytestring-builder;
 

From 2dc73b0e88894a08fc76e1f70ad6eef74eada34f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 14:07:48 +0200
Subject: [PATCH 1033/1143] Drop obsolete overrides for old versions of
 annotated-wl-pprint and lens.

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index e5717ba899f8..e50567efc290 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -291,7 +291,6 @@ self: super: {
 
   # Broken with GHC 7.10.x.
   aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
-  annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3;
   c2hs_0_20_1 = markBroken super.c2hs_0_20_1;
   Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
   cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
@@ -299,7 +298,6 @@ self: super: {
   control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
   equivalence_0_2_5 = markBroken super.equivalence_0_2_5;
   haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
-  lens_4_7_0_1 = markBroken super.lens_4_7_0_1;
   optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
   QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;

From 54db9d427db1be8868db9ec9f5c4ee8ec10651df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 15:22:11 +0200
Subject: [PATCH 1034/1143] ghc-6.x: mark broken because of
 https://github.com/NixOS/nixpkgs/issues/7810

6.10.4 and 6.12.3 are broken because they need 6.10.2-binary for bootstrapping.
---
 pkgs/development/compilers/ghc/6.10.2-binary.nix | 10 ++++++++--
 pkgs/development/compilers/ghc/6.10.4.nix        |  1 +
 pkgs/development/compilers/ghc/6.12.3.nix        |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 1e755ab6c0cc..3a649c2420a9 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -97,6 +97,12 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
-  meta.license = stdenv.lib.licenses.bsd3;
-  meta.platforms = ["x86_64-linux" "i686-linux"];
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ["x86_64-linux" "i686-linux"];
+    broken = true;              # https://github.com/NixOS/nixpkgs/issues/7810
+  };
+
 }
diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
index d8157673fbc3..0df0ef27ca04 100644
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     description = "The Glasgow Haskell Compiler";
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
     inherit (ghc.meta) license;
+    broken = true;              # https://github.com/NixOS/nixpkgs/issues/7810
   };
 }
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index f6beaf3a0067..499f1db79bac 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
     inherit (ghc.meta) license;
+    broken = true;              # https://github.com/NixOS/nixpkgs/issues/7810
   };
 }

From a65fd950c35f5f8261548632576fe7605b663c12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 15:40:11 +0200
Subject: [PATCH 1035/1143] haskell-harp: mark as broken

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index e50567efc290..bfd2e89fa8e7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -309,4 +309,8 @@ self: super: {
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 
+  # Upstream has no issue tracker.
+  harp = markBrokenVersion "0.4" super.harp;
+  happstack-authenticate = dontDistribute super.happstack-authenticate;
+
 }

From 61224338fffafe4a36a70f0d0c94d18a2d996874 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 15:54:41 +0200
Subject: [PATCH 1036/1143] cabal2nix: update to version 20150518

---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index d933b97d1c11..73b115083745 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -7,11 +7,11 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150505";
+  version = "20150518";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "db53ac3a644eebda581c9f036ccd55a19ff3c629";
-    sha256 = "1bimja9qsq865dmpjpy5wxxz43rc8wk9yva58l7hydmm87a4ch8y";
+    rev = "bf850da9044b16efb9ef06a05c645fa981513444";
+    sha256 = "0kwiwakff1iaglf7mfvz096smqi73pgcfd975dvp5w1cd8yazd73";
     deepClone = true;
   };
   isExecutable = true;

From 92398e92ffd44efba0f18ed6bb3a0c1dd7911abb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 14 May 2015 19:27:07 -0700
Subject: [PATCH 1037/1143] goPackages: Standardize source of built ins

---
 pkgs/top-level/go-packages.nix | 46 ++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3b7e8f3cc967..44da3e7e8367 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -14,7 +14,7 @@ let
 
   crypto = buildGoPackage rec {
     rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02";
-    name = "go-crypto-${rev}";
+    name = "crypto-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "golang.org/x/crypto";
     goPackageAliases = [ "code.google.com/p/go.crypto" ];
     disabled = isGo13;
@@ -29,8 +29,9 @@ let
 
   glog = buildGoPackage rec {
     rev = "44145f04b68cf362d9c4df2182967c2275eaefed";
-    name = "glog-${rev}";
+    name = "glog-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/golang/glog";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "golang";
@@ -40,18 +41,20 @@ let
   };
 
   image = buildGoPackage rec {
-    rev = "490b1ad139b3";
-    name = "go.image-${rev}";
-    goPackagePath = "code.google.com/p/go.image";
-    src = fetchhg {
+    rev = "d8e202c6ce59fad0017414839b6648851d10767e";
+    name = "image-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "golang.org/x/image";
+
+    src = fetchFromGitHub {
       inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "02m6ifwby2fi88njarbbb6dimwg0pd2b6llkgyadh4b9wzp2vy4r";
+      owner = "golang";
+      repo = "image";
+      sha256 = "0cxymm28rgbzsk76d19wm8fwp40dkwxhzmmdjnbkw5541272339l";
     };
   };
 
   net = buildGoPackage rec {
-    rev = "e0403b4e005737430c05a57aac078479844f919c";
+    rev = "d1d694760b7a3a9fa32e4d1c49e08b2d672221d8";
     name = "net-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "golang.org/x/net";
     goPackageAliases = [ "code.google.com/p/go.net" ];
@@ -60,7 +63,7 @@ let
       inherit rev;
       owner = "golang";
       repo = "net";
-      sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp";
+      sha256 = "1fk62vjxsyca8hmlpca9rkgy8wqg9zw920d56ib442sjn9ys3zic";
     };
 
     propagatedBuildInputs = [ text ];
@@ -87,8 +90,8 @@ let
 
 
   protobuf = buildGoPackage rec {
-    rev = "efd7476481382c195beb33acd8ec2f1527167fb4";
-    name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}";
+    rev = "39e27fc0f226450c58e11eda145b542bc5dff3fe";
+    name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/golang/protobuf";
     goPackageAliases = [ "code.google.com/p/goprotobuf" ];
 
@@ -96,10 +99,8 @@ let
       inherit rev;
       owner = "golang";
       repo = "protobuf";
-      sha256 = "1wc3m4jpsdmmqdcf2isc9913mmwfyv791c0rd26kpjjwynh5dhdm";
+      sha256 = "12l036ix0dc8hg35xrqmdcr3bpwncrdkgqkhp3s90w6a3qpva3gs";
     };
-
-    subPackages = [ "proto" "protoc-gen-go" ];
   };
 
   text = buildGoPackage rec {
@@ -117,15 +118,16 @@ let
 
 
   tools = buildGoPackage rec {
-    rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8";
-    name = "go.tools-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "code.google.com/p/go.tools";
-    src = fetchhg {
+    rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9";
+    name = "tools-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "golang.org/x/tools";
+
+    src = fetchFromGitHub {
       inherit rev;
-      url = "http://code.google.com/p/go.tools";
-      sha256 = "1vgz4kxy0p56qh6pfbs2c68156hakgx4cmrci9jbg7lnrdaz4y56";
+      owner = "golang";
+      repo = "tools";
+      sha256 = "0vq0l3pjhgsp97v6ndlr3jcs029r5zilwai30snwfq74s580sriq";
     };
-    subPackages = [ "go/vcs" ];
   };
 
   ## THIRD PARTY

From e7d4e7ebce32742923ac4d0cdb2d6a25f53e1a7d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 09:59:46 -0700
Subject: [PATCH 1038/1143] go1.4: Decouple tools

---
 pkgs/development/compilers/go/1.4.nix         | 40 +++------
 .../compilers/go/remove-tools.patch           | 81 +++++++++++++++++++
 2 files changed, 94 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/compilers/go/remove-tools.patch

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 473ff458ff87..1feaf68930ac 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,26 +1,19 @@
-{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }:
+{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security, goPackages }:
 
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";
   loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
   loaderArm = "${glibc}/lib/ld-linux.so.3";
-  srcs = {
-    golang = fetchurl {
-      url = https://github.com/golang/go/archive/go1.4.2.tar.gz;
-      sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac";
-    };
-    tools = fetchgit {
-      url = https://github.com/golang/tools.git;
-      rev = "c836fe615a448dbf9ff5448c1aa657479a0d0aeb";
-      sha256 = "0q9jnhmgmm3xzjss7ndsi6nyykmmb1y984n98118c2sipi183xp5";
-    };
-  };
 in
 
-stdenv.mkDerivation {
-  name = "go-1.4.2";
+stdenv.mkDerivation rec {
+  name = "go-${version}";
+  version = "1.4.2";
 
-  src = srcs.golang;
+  src = fetchurl {
+    url = "https://github.com/golang/go/archive/go${version}.tar.gz";
+    sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac";
+  };
 
   # perl is used for testing go vet
   buildInputs = [ bison bash makeWrapper perl ]
@@ -41,9 +34,6 @@ stdenv.mkDerivation {
       mv * go
     fi
 
-    mkdir -p $out/share/go/src/golang.org/x
-    cp -r --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/golang.org/x/tools
-
     cd go
     patchShebangs ./ # replace /bin/bash
 
@@ -68,7 +58,10 @@ stdenv.mkDerivation {
     sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
   '';
 
-  patches = [ ./cacert-1.4.patch ];
+  patches = [
+    ./cacert-1.4.patch
+    ./remove-tools.patch
+  ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";
   GOARCH = if stdenv.isDarwin then "amd64"
@@ -91,13 +84,6 @@ stdenv.mkDerivation {
     export PATH="$GOBIN:$PATH"
     cd ./src
     ./all.bash
-    cd -
-
-    # Build extra tooling
-    # TODO: Fix godoc tests
-    TOOL_ROOT=golang.org/x/tools/cmd
-    go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc
-    go test -v    $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc
   '';
 
   setupHook = ./setup-hook.sh;
@@ -107,7 +93,7 @@ stdenv.mkDerivation {
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ cstrahan ];
+    maintainers = with stdenv.lib.maintainers; [ cstrahan wkennington ];
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/compilers/go/remove-tools.patch b/pkgs/development/compilers/go/remove-tools.patch
new file mode 100644
index 000000000000..807ab8e089c1
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-tools.patch
@@ -0,0 +1,81 @@
+diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go
+index 3b511b1..a46ebd8 100644
+--- a/misc/makerelease/makerelease.go
++++ b/misc/makerelease/makerelease.go
+@@ -65,9 +65,6 @@ const (
+ // These must be the command that cmd/go knows to install to $GOROOT/bin
+ // or $GOROOT/pkg/tool.
+ var toolPaths = []string{
+-	"golang.org/x/tools/cmd/cover",
+-	"golang.org/x/tools/cmd/godoc",
+-	"golang.org/x/tools/cmd/vet",
+ }
+ 
+ var preBuildCleanFiles = []string{
+diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
+index b6c61b4..2006bc2 100644
+--- a/src/cmd/dist/build.c
++++ b/src/cmd/dist/build.c
+@@ -210,7 +210,9 @@ init(void)
+ 	workdir = xworkdir();
+ 	xatexit(rmworkdir);
+ 
+-	bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch);
++	xgetenv(&b, "GOTOOLDIR");
++	if (b.len == 0)
++		bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch);
+ 	tooldir = btake(&b);
+ 
+ 	bfree(&b);
+diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
+index b71feb7..8468ea8 100644
+--- a/src/cmd/go/pkg.go
++++ b/src/cmd/go/pkg.go
+@@ -401,9 +401,9 @@ var goTools = map[string]targetDir{
+ 	"cmd/pack":                             toTool,
+ 	"cmd/pprof":                            toTool,
+ 	"cmd/yacc":                             toTool,
+-	"golang.org/x/tools/cmd/cover":         toTool,
+-	"golang.org/x/tools/cmd/godoc":         toBin,
+-	"golang.org/x/tools/cmd/vet":           toTool,
++	"nixos.org/x/tools/cmd/cover":          toTool,
++	"nixos.org/x/tools/cmd/godoc":          toBin,
++	"nixos.org/x/tools/cmd/vet":            toTool,
+ 	"code.google.com/p/go.tools/cmd/cover": stalePath,
+ 	"code.google.com/p/go.tools/cmd/godoc": stalePath,
+ 	"code.google.com/p/go.tools/cmd/vet":   stalePath,
+diff --git a/src/go/build/build.go b/src/go/build/build.go
+index 311ecb0..f151d8f 100644
+--- a/src/go/build/build.go
++++ b/src/go/build/build.go
+@@ -1367,7 +1367,7 @@ func init() {
+ }
+ 
+ // ToolDir is the directory containing build tools.
+-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
++var ToolDir = runtime.GOTOOLDIR()
+ 
+ // IsLocalImport reports whether the import path is
+ // a local import path, like ".", "..", "./foo", or "../foo".
+diff --git a/src/runtime/extern.go b/src/runtime/extern.go
+index 6cc5df8..9a9a964 100644
+--- a/src/runtime/extern.go
++++ b/src/runtime/extern.go
+@@ -152,6 +152,17 @@ func GOROOT() string {
+ 	return defaultGoroot
+ }
+ 
++// GOTOOLDIR returns the root of the Go tree.
++// It uses the GOTOOLDIR environment variable, if set,
++// or else the root used during the Go build.
++func GOTOOLDIR() string {
++	s := gogetenv("GOTOOLDIR")
++	if s != "" {
++		return s
++	}
++	return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
++}
++
+ // Version returns the Go tree's version string.
+ // It is either the commit hash and date at the time of the build or,
+ // when possible, a release tag like "go1.3".

From 2f897aad70a0902a92f83e8ad4d281ba264143dc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 10:11:19 -0700
Subject: [PATCH 1039/1143] buildGoPackage: Allow excluding of specific modules

---
 pkgs/development/go-modules/generic/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 2ff1438006f9..1c40c3f87956 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -71,13 +71,15 @@ go.stdenv.mkDerivation (
     else
         (cd go/src
         find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do
-            local OUT;
+            [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue
+            local OUT
             if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then
                 if ! echo "$OUT" | grep -q 'no buildable Go source files'; then
                     echo "$OUT" >&2
                     exit 1
                 fi
             fi
+            echo "$OUT" >&2
         done)
     fi
 

From e89f90cd33f1efb7e5d52b74ffc24449968a41b1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 10:11:52 -0700
Subject: [PATCH 1040/1143] buildGoPackage: Only create  if needed

---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 1c40c3f87956..2b4d59ca7fb5 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -106,7 +106,7 @@ go.stdenv.mkDerivation (
   installPhase = args.installPhase or ''
     runHook preInstall
 
-    mkdir $out
+    mkdir -p $out
 
     if [ -z "$dontInstallSrc" ]; then
         local dir

From 6eecaddcedc75dd127f10b72cdba0c7f9b8d8c80 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 10:12:30 -0700
Subject: [PATCH 1041/1143] goPackages.tools: Make the build work with the go
 decoupling

---
 pkgs/top-level/go-packages.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 44da3e7e8367..7fd57bb74efc 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -122,12 +122,26 @@ let
     name = "tools-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "golang.org/x/tools";
 
+    preConfigure = ''
+      # Make the builtin tools available here
+      mkdir -p $out/bin
+      eval $(go env | grep GOTOOLDIR)
+      find $GOTOOLDIR -type f | while read x; do
+        ln -sv "$x" "$out/bin"
+      done
+      export GOTOOLDIR=$out/bin
+    '';
+
+    excludedPackages = "testdata";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "golang";
       repo = "tools";
       sha256 = "0vq0l3pjhgsp97v6ndlr3jcs029r5zilwai30snwfq74s580sriq";
     };
+
+    buildInputs = [ net ];
   };
 
   ## THIRD PARTY

From 023aaf8f6dcec62bf498d1e9a08d80ebc7d96835 Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Mon, 18 May 2015 17:50:50 +0200
Subject: [PATCH 1042/1143] add package: uni-vga

---
 pkgs/data/fonts/uni-vga/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/data/fonts/uni-vga/default.nix

diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix
new file mode 100644
index 000000000000..63f74bb41b4a
--- /dev/null
+++ b/pkgs/data/fonts/uni-vga/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation {
+  name = "uni-vga";
+
+  src = fetchurl {
+    url = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz;
+    sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6";
+  };
+
+  buildInputs = [ mkfontdir mkfontscale ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts
+    cp *.bdf $out/share/fonts
+    cd $out/share/fonts
+    mkfontdir
+    mkfontscale
+  '';
+
+  meta = {
+    description = "Unicode VGA font";
+    maintainers = [stdenv.lib.maintainers.ftrvxmtrx];
+    homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0789bf6e3e8..4c429a3b238d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10211,6 +10211,8 @@ let
 
   ucsFonts = callPackage ../data/fonts/ucs-fonts { };
 
+  uni-vga = callPackage ../data/fonts/uni-vga { };
+
   unifont = callPackage ../data/fonts/unifont { };
 
   vistafonts = callPackage ../data/fonts/vista-fonts { };

From 8dbd385e1cc6f486b8913235ed92e952ae96c16a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 18 May 2015 14:32:29 -0400
Subject: [PATCH 1043/1143] kernel config: Fix grsecurity-specific config

Refs 13a38440c6993438ec7847eb8f00ad66fb3fd946
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4f3813f6ed87..25b707614ed0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -234,7 +234,7 @@ with stdenv.lib;
   # Security related features.
   STRICT_DEVMEM y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
-  ${optionalString (!features.grsecurity or true) ''
+  ${optionalString (!(features.grsecurity or false)) ''
     DEVKMEM n # Disable /dev/kmem
   ''}
   ${if versionOlder version "3.14" then ''
@@ -380,7 +380,7 @@ with stdenv.lib;
 
   # Virtualisation.
   PARAVIRT? y
-  ${optionalString (!features.grsecurity or true)
+  ${optionalString (!(features.grsecurity or false))
     (if versionAtLeast version "3.10" then ''
       HYPERVISOR_GUEST y
     '' else ''

From 8e48f0928425c53dd8ded131bd3732eddb79715c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 19:40:01 +0200
Subject: [PATCH 1044/1143] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/6ccfe7a3207e9e88547bc33fb4728f9a7313414b
 with hackage2nix revision d339b0fe58a504a61db589362b73992a5912304e

---
 .../haskell-modules/hackage-packages.nix      | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 328e0fcb966e..074145a93545 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -22244,7 +22244,9 @@ self: {
      mkDerivation {
        pname = "aws-kinesis-client";
        version = "0.4.0.2";
+       revision = "1";
        sha256 = "1vygs2qdnwjw8pygbsncc22cq9294hmlbzi2fysi3agva2qxzmwx";
+       editedCabalFile = "4bd055f19f3ced5d6f52eec169220d7c5159cfa521128a3118aedecc9c3ad2f3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -22255,6 +22257,7 @@ self: {
          monad-control mtl nats optparse-applicative random resourcet stm
          stm-chans stm-queue-extras text transformers unordered-containers
        ];
+       jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -59150,8 +59153,12 @@ self: {
      mkDerivation {
        pname = "hashids";
        version = "1.0.2";
+       revision = "3";
        sha256 = "07qrsabhb825jhdbc4ka35ss7ci07avgvi8jsr69r17bnp87wnma";
+       editedCabalFile = "58394f52df9a7e4427962fe1e59eb21cb751b3af58f997453f2b2f34cb9271dc";
        buildDepends = [ base bytestring containers split ];
+       homepage = "http://hashids.org/";
+       description = "Hashids generates short, unique, non-sequential ids from numbers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -126956,15 +126963,15 @@ self: {
      }) {};
 
   "uri-bytestring" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit, lens
-     , QuickCheck, quickcheck-instances, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , derive, HUnit, lens, QuickCheck, quickcheck-instances, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1";
-       sha256 = "16fvijiaqnrlw8hhv96cnp0qh5sq3bhixihw0k73i6j7wp1wp9i1";
-       buildDepends = [ attoparsec base bytestring ];
+       version = "0.1.1";
+       sha256 = "19nqdv61bsp470m94vq9cdpcyw1q9rwfplmpj09dd5pkmp7f6m8s";
+       buildDepends = [ attoparsec base blaze-builder bytestring ];
        testDepends = [
          attoparsec base bytestring derive HUnit lens QuickCheck
          quickcheck-instances tasty tasty-hunit tasty-quickcheck
@@ -132059,7 +132066,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxAsteroids" = callPackage

From 72f54f51e3ef91445cc2a313bb168529b4a89d13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 18:15:55 +0200
Subject: [PATCH 1045/1143] haskell-graphviz: the test suite build is broken by
 QuickCheck 2.8

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index bfd2e89fa8e7..c47d29e54bf0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -287,7 +287,7 @@ self: super: {
   tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
 
   # http://hub.darcs.net/ivanm/graphviz/issue/5
-  graphviz = appendPatch super.graphviz ./graphviz-fix-ghc710.patch;
+  graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./graphviz-fix-ghc710.patch));
 
   # Broken with GHC 7.10.x.
   aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;

From 0197da662d8c5d849d6cb83d2f94193e4b409b69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 18:16:38 +0200
Subject: [PATCH 1046/1143] haskell: enable builds that used to fail because
 they depend on graphviz

---
 .../configuration-ghc-7.10.x.nix              | 61 +++++++++----------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index c47d29e54bf0..1d7eee6d3a44 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -241,39 +241,6 @@ self: super: {
   hbb = dontDistribute super.hbb;
   hsdev = dontDistribute super.hsdev;
 
-  Graphalyze = dontDistribute super.Graphalyze;
-  HLearn-approximation = dontDistribute super.HLearn-approximation;
-  HLearn-classification = dontDistribute super.HLearn-classification;
-  HLearn-distributions = dontDistribute super.HLearn-distributions;
-  SourceGraph = dontDistribute super.SourceGraph;
-  Zora = dontDistribute super.Zora;
-  ampersand = dontDistribute super.ampersand;
-  caffegraph = dontDistribute super.caffegraph;
-  dot2graphml = dontDistribute super.dot2graphml;
-  dvda = dontDistribute super.dvda;
-  erd = dontDistribute super.erd;
-  filediff = dontDistribute super.filediff;
-  fsmActions = dontDistribute super.fsmActions;
-  gbu = dontDistribute super.gbu;
-  geni-gui = dontDistribute super.geni-gui;
-  ghc-vis = dontDistribute super.ghc-vis;
-  grammar-combinators = dontDistribute super.grammar-combinators;
-  llvm-analysis = dontDistribute super.llvm-analysis;
-  llvm-base-types = dontDistribute super.llvm-base-types;
-  llvm-data-interop = dontDistribute super.llvm-data-interop;
-  llvm-tools = dontDistribute super.llvm-tools;
-  marxup = dontDistribute super.marxup;
-  mathgenealogy = dontDistribute super.mathgenealogy;
-  optimusprime = dontDistribute super.optimusprime;
-  phybin = dontDistribute super.phybin;
-  prolog-graph = dontDistribute super.prolog-graph;
-  prolog-graph-lib = dontDistribute super.prolog-graph-lib;
-  teams = dontDistribute super.teams;
-  vacuum-graphviz = dontDistribute super.vacuum-graphviz;
-  vampire = dontDistribute super.vampire;
-  visual-graphrewrite = dontDistribute super.visual-graphrewrite;
-  xdot = dontDistribute super.xdot;
-
   # https://github.com/lymar/hastache/issues/47
   hastache = dontCheck super.hastache;
 
@@ -313,4 +280,32 @@ self: super: {
   harp = markBrokenVersion "0.4" super.harp;
   happstack-authenticate = dontDistribute super.happstack-authenticate;
 
+  # Upstream has no issue tracker.
+  llvm-base-types = markBroken super.llvm-base-types;
+  llvm-analysis = dontDistribute super.llvm-analysis;
+  llvm-data-interop = dontDistribute super.llvm-data-interop;
+  llvm-tools = dontDistribute super.llvm-tools;
+
+  # Upstream has no issue tracker.
+  MaybeT = markBroken super.MaybeT;
+  grammar-combinators = dontDistribute super.grammar-combinators;
+
+  # Required to fix version 0.91.0.0.
+  wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts");
+
+  # Upstream has no issue tracker.
+  Graphalyze = markBroken super.Graphalyze;
+  gbu = dontDistribute super.gbu;
+  SourceGraph = dontDistribute super.SourceGraph;
+
+  # Upstream has no issue tracker.
+  markBroken = super.protocol-buffers;
+  caffegraph = dontDistribute super.caffegraph;
+
+  # Deprecated: https://github.com/mikeizbicki/ConstraintKinds/issues/8
+  ConstraintKinds = markBroken super.ConstraintKinds;
+  HLearn-approximation = dontDistribute super.HLearn-approximation;
+  HLearn-distributions = dontDistribute super.HLearn-distributions;
+  HLearn-classification = dontDistribute super.HLearn-classification;
+
 }

From c0e2c4809e49dc3954b7994b1052d626cb9ef0c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 May 2015 19:26:56 +0200
Subject: [PATCH 1047/1143] cabal-install: fix build for GHC 7.0.x and 7.2.x

---
 pkgs/development/haskell-modules/configuration-common.nix    | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 1 -
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1f2bbdb6f71c..a7b72fa7f9a0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -9,6 +9,7 @@ self: super: {
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
   Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0;
   cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; });
+  cabal-install_1_18_1_0 = dontCheck (super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
 
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 4686c813b3c5..6e1754c5f3bf 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -48,7 +48,6 @@ self: super: {
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
-  cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; };
   cabal-install = self.cabal-install_1_18_1_0;
 
   # Needs Cabal >= 1.18.x.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 46a4b0d02e64..4a8d4242bdc9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -45,7 +45,6 @@ self: super: {
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
-  cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; };
   cabal-install = self.cabal-install_1_18_1_0;
 
   # https://github.com/tibbe/hashable/issues/85

From ef9cfd3dda9ba1f33cab84e915644cb6e52a9b8b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 10 May 2015 21:33:00 +0200
Subject: [PATCH 1048/1143] wine: enable 64bit build for wineStaging

---
 pkgs/misc/emulators/wine/base.nix       | 28 ++++++++++++-------------
 pkgs/misc/emulators/wine/builder-wow.sh |  1 +
 pkgs/misc/emulators/wine/default.nix    | 21 ++++++++++++-------
 pkgs/misc/emulators/wine/staging.nix    | 19 ++++++++++-------
 pkgs/misc/emulators/wine/util.nix       |  9 ++++++++
 pkgs/misc/emulators/wine/versions.nix   |  4 ++++
 pkgs/top-level/all-packages.nix         |  8 +------
 7 files changed, 54 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/misc/emulators/wine/util.nix

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index ce39740f1133..bf63340d35d0 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -6,30 +6,29 @@
 assert stdenv.isLinux;
 assert stdenv.cc.cc.isGNU or false;
 
+with import ./util.nix { inherit lib; };
+
 stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   builder = buildScript;
-}) // {
+}) // rec {
   inherit name src configureFlags;
 
-  buildInputs = lib.concatLists (map (pkgs: (with pkgs; [
-    pkgconfig alsaLib ncurses libpng libjpeg lcms2 fontforge libxml2 libxslt
-    openssl gnutls cups makeWrapper flex bison mesa mesa_noglu.osmesa
+  buildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [
+    pkgconfig alsaLib lcms2 fontforge libxml2 libxslt makeWrapper flex bison
+  ]);
+
+  nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
+    freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
   ]) ++ (with pkgs.xlibs; [
     xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
-  ])) pkgArches);
+  ]));
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
   # them to the RPATH so that the user doesn't have to set them in
   # LD_LIBRARY_PATH.
-  NIX_LDFLAGS = map (path: "-rpath ${path}/lib") ([
-    stdenv.cc.cc
-  ] ++ (lib.concatLists (map (pkgs:
-        (with pkgs; [
-    freetype fontconfig mesa mesa_noglu.osmesa libdrm
-    libpng libjpeg openssl gnutls cups ncurses
-  ]) ++ (with pkgs.xlibs; [
-    libXinerama libXrender libXrandr libXcursor libXcomposite
-  ])) pkgArches)));
+  NIX_LDFLAGS = map
+    (path: "-rpath ${path}/lib")
+    ([ stdenv.cc.cc ] ++ nativeBuildInputs);
 
   # Don't shrink the ELF RPATHs in order to keep the extra RPATH
   # elements specified above.
@@ -51,6 +50,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   
   enableParallelBuilding = true;
 
+  passthru = { inherit pkgArches; };
   meta = {
     inherit version platforms;
     homepage = "http://www.winehq.org/";
diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh
index 9f946f3b71fd..c7d9ed55a3f7 100644
--- a/pkgs/misc/emulators/wine/builder-wow.sh
+++ b/pkgs/misc/emulators/wine/builder-wow.sh
@@ -3,6 +3,7 @@
 source $stdenv/setup
 
 unpackPhase
+cd $TMP/$sourceRoot
 patchPhase
 
 configureScript=$TMP/$sourceRoot/configure
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 962aee9fb5d9..8b7e438a115f 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -1,15 +1,22 @@
 ## Configuration:
 # Control you default wine config in nixpkgs-config:
 # wine = {
-#   release = "stable"; # "stable", "unstable"
+#   release = "stable"; # "stable", "unstable", "staging"
 #   build = "wineWow"; # "wine32", "wine64", "wineWow"
 # };
 # Make additional configurations on demand:
-# wine.overrideConfig { build = "wine32"; };
-{ lib, system, callPackage,
+# wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
+{ lib, pkgs, system, callPackage,
   wineRelease ? "stable",
-  wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32") }:
+  wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
+  libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
 
-lib.getAttr wineBuild (callPackage ./packages.nix {
-  inherit wineRelease;
-})
+if wineRelease == "staging" then
+  callPackage ./staging.nix {
+    inherit libtxc_dxtn_Name;
+    wine = lib.getAttr wineBuild (callPackage ./packages.nix { wineRelease = "unstable"; });
+  }
+else
+  lib.getAttr wineBuild (callPackage ./packages.nix {
+    inherit wineRelease;
+  })
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index a6ff309b08e3..beea0bb3c125 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchFromGitHub, wine, perl, autoconf, utillinux
-, pulseaudio, libtxc_dxtn }:
+{ stdenv, callPackage, lib, fetchFromGitHub, wine, libtxc_dxtn_Name }:
 
-let version = "1.7.42";
+with callPackage ./util.nix {};
+
+let v = (import ./versions.nix).staging;
+    inherit (v) version;
     patch = fetchFromGitHub {
+      inherit (v) sha256;
       owner = "wine-compholio";
       repo = "wine-staging";
       rev = "v${version}";
-      sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17";
     };
-
+    build-inputs = pkgNames: extra:
+      (mkBuildInputs wine.pkgArches pkgNames) ++ extra;
 in assert (builtins.parseDrvName wine.name).version == version;
 
 stdenv.lib.overrideDerivation wine (self: {
-  nativeBuildInputs = [ pulseaudio libtxc_dxtn ] ++ self.nativeBuildInputs;
-  buildInputs = [ perl utillinux autoconf ] ++ self.buildInputs;
+  nativeBuildInputs = build-inputs [ "pulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; 
+  buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
 
   name = "${self.name}-staging";
 
@@ -23,7 +26,7 @@ stdenv.lib.overrideDerivation wine (self: {
     chmod +w patches
     cd patches
     patchShebangs gitapply.sh
-    ./patchinstall.sh DESTDIR=.. --all
+    ./patchinstall.sh DESTDIR="$TMP/$sourceRoot" --all
     cd ..
   '';
 })
diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/misc/emulators/wine/util.nix
new file mode 100644
index 000000000000..b90a68e72df5
--- /dev/null
+++ b/pkgs/misc/emulators/wine/util.nix
@@ -0,0 +1,9 @@
+{ lib }:
+rec {
+  toPackages = pkgNames: pkgs:
+    map (pn: lib.getAttr pn pkgs) pkgNames;
+  toBuildInputs = pkgArches: archPkgs:
+    lib.concatLists (map archPkgs pkgArches);  
+  mkBuildInputs = pkgArches: pkgNames:
+    toBuildInputs pkgArches (toPackages pkgNames);
+}
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index e599f04f8575..9ac87ab2e3ba 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -22,4 +22,8 @@
     #monoVersion = "0.0.8";
     #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
   };
+  staging = {
+    version = "1.7.42";
+    sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c429a3b238d..40a77f8a623d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14461,18 +14461,12 @@ let
   };
   wineStable = wine.override { wineRelease = "stable"; };
   wineUnstable = wine.override { wineRelease = "unstable"; };
+  wineStaging = wine.override { wineRelease = "staging"; };
 
   winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
     inherit (gnome2) zenity;
   };
 
-  ### FIXME integrate wineStaging into 64bit
-  wineStaging = callPackage_i686 ../misc/emulators/wine/staging.nix {
-    wine = pkgsi686Linux.wineUnstable;
-    # Patent issues
-    libtxc_dxtn = pkgsi686Linux.libtxc_dxtn_s2tc;
-  };
-
   wmutils-core = callPackage ../tools/X11/wmutils-core { };
 
   wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };

From b4c2351806e09cdbff29a1b98b8f2434601c08f6 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 18 May 2015 19:39:37 +0200
Subject: [PATCH 1049/1143] wine: unstable 1.7.42 -> 1.7.43

---
 pkgs/misc/emulators/wine/versions.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 9ac87ab2e3ba..6bebe11d49d1 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -1,7 +1,7 @@
 {
   unstable = {
-    wineVersion = "1.7.42";
-    wineSha256  = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss";
+    wineVersion = "1.7.43";
+    wineSha256  = "08kqj02m8xc1ppzhs5y83zzykjnz0qliq495rx1n90ybzyd9pm2k";
     geckoVersion = "2.36";
     geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
     gecko64Version = "2.36";
@@ -23,7 +23,7 @@
     #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
   };
   staging = {
-    version = "1.7.42";
-    sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17";
+    version = "1.7.43";
+    sha256 = "01b7npa8hc2nrv4hm16r9ikic4wd34nbz1lvfhy0ali2jbcsaqqb";
   };
 }

From 2f53355ff67ea26455d4fcedf9f63de5714001a9 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 18 May 2015 20:29:46 +0200
Subject: [PATCH 1050/1143] winetricks: 20150316 -> 20150416

---
 pkgs/misc/emulators/wine/versions.nix   | 4 ++++
 pkgs/misc/emulators/wine/winetricks.nix | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 6bebe11d49d1..84a3ff8f86d6 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -26,4 +26,8 @@
     version = "1.7.43";
     sha256 = "01b7npa8hc2nrv4hm16r9ikic4wd34nbz1lvfhy0ali2jbcsaqqb";
   };
+  winetricks = {
+    version = "20150416";
+    sha256 = "0467cn5hqry6fscjskpvxw0y00lr059jmldv1csicbav4l0dxx8k";
+  };
 }
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index 34a2a6efbbba..39aaa098cfef 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, wine, perl, which, coreutils, zenity, curl
 , cabextract, unzip, p7zip, gnused, gnugrep, bash } :
 
-let version = "20150316";
+let v = (import ./versions.nix).winetricks;
 in stdenv.mkDerivation rec {
-  name = "winetricks-${version}";
+  name = "winetricks-${v.version}";
 
   src = fetchFromGitHub {
     owner = "Winetricks";
     repo = "winetricks";
-    rev = version;
-    sha256 = "00c55jpca6l3v3p02xc0gy5l4xb17gf90282hq5h85nh72kqsbrh";
+    rev = v.version;
+    sha256 = v.sha256;
   };
 
   buildInputs = [ perl which ];

From 9119103656063726e35815ec773b35516cad7b65 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Mon, 18 May 2015 15:09:24 -0400
Subject: [PATCH 1051/1143] command-line-tools: Update url

---
 pkgs/os-specific/darwin/command-line-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix
index 9bbf5882e5dd..2d1eb7b6b3ca 100644
--- a/pkgs/os-specific/darwin/command-line-tools/default.nix
+++ b/pkgs/os-specific/darwin/command-line-tools/default.nix
@@ -7,7 +7,7 @@ let
     src = fetchurl {
       # Magic url found in:
       # https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog
-      url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/yiervn212jfs091cp9hwmb7gjq7ky91crs/${name}.pkg";
+      url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/${name}.pkg";
       inherit sha256;
     };
 

From 7639474c72ad4de310e0b86db088901021f25736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 18 May 2015 21:06:35 +0200
Subject: [PATCH 1052/1143] firmware-linux-nonfree.src: use http:// to enable
 better availability for proxied users

---
 .../linux/firmware/firmware-linux-nonfree/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index fa7af6a8c1b6..8ab80ee1e4d0 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2015-05-13";
 
   src = fetchgit {
-    url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
+    url = "http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
     rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c";
     sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq";
   };

From fd588f939cf456f3932619b4a8587731669cc0a7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 13:04:16 -0700
Subject: [PATCH 1053/1143] cryptsetup: Use openssl instead of libgcrypt

When libgcrypt added support for libcap, it started dropping
capabilities of the cryptsetup process. This meant that cryptsetup was
unable to communicate with device mapper. This patch fixes that issue by
removing the dependency on libgcrypt and instead uses openssl for the
implementation of low-level cryptographic functions.

Fixes #7859.
---
 pkgs/os-specific/linux/cryptsetup/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 50ea3f6a0675..4e3ede284b45 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt
+{ stdenv, fetchurl, devicemapper, openssl, libuuid, pkgconfig, popt
 , enablePython ? false, python ? null
 }:
 
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "0878vwblazms1dac2ds7vyz8pgi1aac8870ccnl2s0v2sv428g62";
   };
 
-  configureFlags = [ "--enable-cryptsetup-reencrypt" ]
+  configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ]
                 ++ stdenv.lib.optional enablePython "--enable-python";
 
-  buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ]
+  buildInputs = [ devicemapper openssl libuuid pkgconfig popt ]
              ++ stdenv.lib.optional enablePython python;
 
   meta = {

From d60058af4b5a88ed41ad428645583b720b72ab19 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Mon, 18 May 2015 13:11:52 -0700
Subject: [PATCH 1054/1143] lua: update patch for 5.2 on darwin

---
 .../interpreters/lua-5/5.2.darwin.patch          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.darwin.patch b/pkgs/development/interpreters/lua-5/5.2.darwin.patch
index ffc3ff34be70..b314bd2abac3 100644
--- a/pkgs/development/interpreters/lua-5/5.2.darwin.patch
+++ b/pkgs/development/interpreters/lua-5/5.2.darwin.patch
@@ -1,27 +1,27 @@
 diff --git a/Makefile b/Makefile
-index 209a132..9387b09 100644
+index d2c7db4..dc107b3 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -43,5 +43,5 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  # What to install.
  TO_BIN= lua luac
  TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
 -TO_LIB= liblua.a
 +TO_LIB= liblua.${version}.dylib
  TO_MAN= lua.1 luac.1
-
+ 
  # Lua version and release.
-@@ -64,3 +64,5 @@ install: dummy
+@@ -63,6 +63,8 @@ install: dummy
  	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
  	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
  	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
 +	ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${majorVersion}.dylib
 +	ln -s -f liblua.${majorVersion}.dylib $(INSTALL_LIB)/liblua.dylib
-
- ranlib:
- 	cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
+ 
+ uninstall:
+ 	cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
 diff --git a/src/Makefile b/src/Makefile
-index fea895b..d9146d0 100644
+index 7b4b2b7..25001e5 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -28,7 +28,7 @@ MYOBJS=

From 02e46cacc6b051a31b8f18df2ac7bd3658ac6c85 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Wed, 13 May 2015 17:03:59 -0500
Subject: [PATCH 1055/1143] keychain: fixup shebang, use upstream builder,
 install manpage

fixup shebang - build was not running fixupPhase, and shebang was pointing to
/bin/sh. On a system where /bin/sh links to dash, this results in errors:

    /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 59: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: shopt: not found
    /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 686: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: Syntax error: "(" unexpected (expecting ")")

use upstream builder - the include Makefile uses perl to generate a manpage and
insert the same text into the keychain script for '--help' output, which was
otherwise missing:

    $ keychain --help

     * keychain 2.8.0 ~ http://www.funtoo.org

    [snip]

    INSERT_POD_OUTPUT_HERE

install manpage - self explanatory
---
 pkgs/tools/misc/keychain/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 1ed6be071a59..0892061a50d0 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
-, procps, gnugrep, gawk, findutils, gnused }:
+, perl, procps, gnugrep, gawk, findutils, gnused }:
 
 stdenv.mkDerivation rec {
   name = "keychain-${version}";
@@ -12,15 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp";
   };
 
-  phases = [ "unpackPhase" "patchPhase" "buildPhase" ];
+  buildInputs = [ makeWrapper perl ];
 
-  buildInputs = [ makeWrapper ];
-
-  patchPhase = "sed -i -e 's,version=.*,version=\"${version}\",g' keychain.sh";
-
-  buildPhase = ''
-    mkdir -p $out/bin
-    cp keychain.sh $out/bin/keychain
+  installPhase = ''
+    mkdir -p $out/{bin,share/man/man1}
+    cp keychain $out/bin/keychain
+    cp keychain.1 $out/share/man/man1
     wrapProgram $out/bin/keychain \
       --prefix PATH ":" "${coreutils}/bin" \
       --prefix PATH ":" "${openssh}/bin" \

From 3ac31fe04135fe8aa2cbe23a19066c8a1ec37b8c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 18 May 2015 22:40:39 +0200
Subject: [PATCH 1056/1143] calibre: fix build by using qt53

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 3d0bac560c08..fc013e9125fc 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite
+, imagemagick, libjpeg, fontconfig, podofo, qt53, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
-      fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils
+      fontconfig podofo qt53 pil chmlib icu sqlite libusb1 libmtp xdg_utils
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
       pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw

From db4993600c063a7bfc40f11c43e5431abbb2ca21 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 18 May 2015 02:57:41 +0200
Subject: [PATCH 1057/1143] dropbox: 3.4.4 -> 3.4.6

---
 pkgs/applications/networking/dropbox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 97573fb1e7b0..8a58450c5ea4 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -27,9 +27,9 @@ let
     else throw "Dropbox client for: ${stdenv.system} not supported!";
 
   # NOTE: When updating, please also update in current stable, as older versions stop working  
-  version = "3.4.4";
-  sha256 = if stdenv.system == "x86_64-linux" then "05ncbxwkimq7cl3bad759qvda7zjdh07f5wh6aw12g472l4yqq98"
-    else if stdenv.system == "i686-linux" then "18089bh6i64yw75pswgn2vkcl1kf7ipxxncmssw3qhb6791qfhbk"
+  version = "3.4.6";
+  sha256 = if stdenv.system == "x86_64-linux" then "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky"
+    else if stdenv.system == "i686-linux" then "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2"
     else throw "Dropbox client for: ${stdenv.system} not supported!";
 
   # relative location where the dropbox libraries are stored

From feec95b437e904f409c99f4e83c6d6a20b63e252 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 18 May 2015 15:34:15 -0500
Subject: [PATCH 1058/1143] dropbox: move updateable attributes to the top

---
 .../networking/dropbox/default.nix            | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 8a58450c5ea4..060c5ee88b35 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -18,19 +18,25 @@
 # them with our own.
 
 let
-  arch = if stdenv.system == "x86_64-linux" then "x86_64"
-    else if stdenv.system == "i686-linux" then "x86"
-    else throw "Dropbox client for: ${stdenv.system} not supported!";
-
-  interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
-    else if stdenv.system == "i686-linux" then "ld-linux.so.2"
-    else throw "Dropbox client for: ${stdenv.system} not supported!";
-
-  # NOTE: When updating, please also update in current stable, as older versions stop working  
+  # NOTE: When updating, please also update in current stable, as older versions stop working
   version = "3.4.6";
-  sha256 = if stdenv.system == "x86_64-linux" then "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky"
-    else if stdenv.system == "i686-linux" then "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2"
-    else throw "Dropbox client for: ${stdenv.system} not supported!";
+  sha256 =
+    {
+      "x86_64-linux" = "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky";
+      "i686-linux" = "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2";
+    }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+  arch =
+    {
+      "x86_64-linux" = "x86_64";
+      "i686-linux" = "x86";
+    }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+  interpreter =
+    {
+      "x86_64-linux" = "ld-linux-x86-64.so.2";
+      "i686-linux" = "ld-linux.so.2";
+    }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   # relative location where the dropbox libraries are stored
   appdir = "opt/dropbox";

From 6d52aa7e59d6d6195b9de86ff154b82bba0e774e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 18 May 2015 15:36:49 -0500
Subject: [PATCH 1059/1143] dropbox: install icons

---
 pkgs/applications/networking/dropbox/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 060c5ee88b35..14360f9ff0bb 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -115,6 +115,9 @@ in stdenv.mkDerivation {
     mkdir -p "$out/bin"
     makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
       --prefix LD_LIBRARY_PATH : "${ldpath}"
+
+    mkdir -p "$out/share/icons"
+    ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor"
   '';
 
   meta = {

From 3c94a9da90c9c7f4ed3f344d53fa00dc95b2cb21 Mon Sep 17 00:00:00 2001
From: C0DEHERO <codehero@nerdpol.ch>
Date: Mon, 18 May 2015 19:10:03 -0400
Subject: [PATCH 1060/1143] obs-studio: update 0.9.1 -> 0.10.0

---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 87e3047ed19f..54d13d117685 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz";
-    sha256 = "198ymfdrg58i3by58fs68df835rkpnpagnvyzlilmn9ypvpa8h81";
+    sha256 = "1xms48gl20pr9g8bv8ygykh6m99c3wjphsavr4hb1d5263r9f4in";
   };
 
   buildInputs = [ cmake

From 01d4651a019370980e8f1b2f65afdda1fe4c279c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 19 May 2015 01:15:22 +0200
Subject: [PATCH 1061/1143] rustc: Fix snapshot info

It was wrong and it was causing a build failure.
---
 pkgs/development/compilers/rustc/1.0.0.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix
index 008e958f6d44..bd02397986be 100644
--- a/pkgs/development/compilers/rustc/1.0.0.nix
+++ b/pkgs/development/compilers/rustc/1.0.0.nix
@@ -3,12 +3,12 @@ callPackage ./makeRustcDerivation.nix {
   shortVersion = "1.0.0";
   isRelease = true;
   srcSha = "1fjyk5xhg9dx85d1kkjmb1jai7awvdmzcjf2fdmi2pdjyzacn163";
-  snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
-  snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
-  snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
-  snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
-  snapshotDate = "2015-04-27";
-  snapshotRev = "857ef6e";
+  snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
+  snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
+  snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
+  snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa";
+  snapshotDate = "2015-03-27";
+  snapshotRev = "5520801";
   patches = [
     ./patches/beta.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

From 85c48934bcba36a7531db1c657781ff2d64967d5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 19 May 2015 02:37:47 +0200
Subject: [PATCH 1062/1143] racerRust: 2015-05-04 -> 2015-05-18

Fixes build failure with rustc 1.0.0.
---
 pkgs/development/tools/rust/racer/default.nix | 10 +++----
 .../development/tools/rust/racer/pr-232.patch | 26 -------------------
 2 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/development/tools/rust/racer/pr-232.patch

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 5169cd1567ca..61fe2238a779 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -4,16 +4,14 @@ with rustPlatform;
 
 buildRustPackage rec {
   #TODO add emacs support
-  name = "racer-git-2015-05-04";
+  name = "racer-git-2015-05-18";
   src = fetchgit {
     url = https://github.com/phildawes/racer;
-    rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c";
-    sha256 = "0ldf05d19ghxk3fslxrc87j18zg8bam2y0ygdy456h37y2p1d1ck";
+    rev = "c2d31ed49baa11f06ffc0c7bc8f95dd00037d035";
+    sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7";
   };
 
-  patches = [ ./pr-232.patch ];
-
-  depsSha256 = "0rinyh365znx39aygxyyxmi496pw0alblf2dl7l8fbmz63nkhfv2";
+  depsSha256 = "1wmpd2cjmk59382dq59hmb0xa6fxbnmmaz4nfs96qf613r5ylvra";
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/rust/racer/pr-232.patch b/pkgs/development/tools/rust/racer/pr-232.patch
deleted file mode 100644
index 354307d71e4f..000000000000
--- a/pkgs/development/tools/rust/racer/pr-232.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3f354d69881424c7c902408d22f9138412a872b4 Mon Sep 17 00:00:00 2001
-From: Ricardo Martins <ricardo@scarybox.net>
-Date: Sat, 9 May 2015 17:12:55 +0100
-Subject: [PATCH] Use `Vec::extend` instead of binary operation `+`.
-
----
- src/racer/nameres.rs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/racer/nameres.rs b/src/racer/nameres.rs
-index 60636c6..ad1e01c 100644
---- a/src/racer/nameres.rs
-+++ b/src/racer/nameres.rs
-@@ -620,9 +620,9 @@ pub fn search_scope(start: usize, point: usize, src: &str,
-         }
- 
-         // There's a good chance of a match. Run the matchers
--        out = out + &*run_matchers_on_blob(src, start+blobstart, start+blobend,
--                                      searchstr,
--                                      filepath, search_type, local, namespace);
-+        out.extend(run_matchers_on_blob(src, start+blobstart, start+blobend,
-+                                        searchstr,
-+                                        filepath, search_type, local, namespace));
-         if let ExactMatch = search_type {
-             if !out.is_empty() {
-                 return out.into_iter();

From 49d9476608144f9657632b27ac99a9a64d5892ed Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Tue, 19 May 2015 14:19:15 +1200
Subject: [PATCH 1063/1143] Update to tor 0.2.6.7

---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 603dd05fc659..3e7d5e0e920c 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl, zlib, torsocks }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.5.12";
+  name = "tor-0.2.6.7";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "0j9byw3i2b7ji88vsqwmsxxg2nlxwkk45k5qbc1y7hdlzvzxl3sm";
+    sha256 = "0v4yp29cxzb4zjpbqg97vs8q3qnhmk05wn9xilmb5l9faj5fhawc";
   };
 
   # Note: torsocks is specified as a dependency, as the distributed

From c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 15:27:33 -0700
Subject: [PATCH 1064/1143] buildGoPackage: Take into account
 propagatedBuildInputs during rename

---
 pkgs/development/go-modules/generic/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 2b4d59ca7fb5..34cf65b844d2 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -54,8 +54,9 @@ go.stdenv.mkDerivation (
 
   renameImports = args.renameImports or (
     let
-      inputsWithAliases = lib.filter (x: x ? goPackageAliases) buildInputs;
-      rename = to: from: "echo Renaming '${from}' to '${to}'; govers -m ${from} ${to}";
+      inputsWithAliases = lib.filter (x: x ? goPackageAliases)
+        (buildInputs ++ (args.propagatedBuildInputs or [ ]));
+      rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}";
       renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases;
     in lib.concatMapStringsSep "\n" renames inputsWithAliases);
 

From 1dbd67ee820159c3829f04b2aba66451c43109e9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 15:27:52 -0700
Subject: [PATCH 1065/1143] buildGoPackage: Don't print blank lines

---
 pkgs/development/go-modules/generic/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 34cf65b844d2..5860176ecad3 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -80,7 +80,9 @@ go.stdenv.mkDerivation (
                     exit 1
                 fi
             fi
-            echo "$OUT" >&2
+            if [ -n "$OUT" ]; then
+              echo "$OUT" >&2
+            fi
         done)
     fi
 

From 414b3f2909a0a912cb7fb4a5890b7cd31867d8f1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 15:38:27 -0700
Subject: [PATCH 1066/1143] consul: Move into the go-packages framework

---
 .../go-modules/generic/default.nix            |   4 +-
 pkgs/servers/consul/default.nix               |  63 ---
 pkgs/servers/consul/ui.nix                    |  39 ++
 pkgs/top-level/all-packages.nix               |   6 +-
 pkgs/top-level/go-packages.nix                | 367 +++++++++++++++---
 5 files changed, 359 insertions(+), 120 deletions(-)
 delete mode 100644 pkgs/servers/consul/default.nix
 create mode 100644 pkgs/servers/consul/ui.nix

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 5860176ecad3..17341238deaf 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,6 +1,6 @@
 { go, govers, lib }:
 
-{ name, buildInputs ? []
+{ name, buildInputs ? [], passthru ? {}
 
 # Disabled flag
 , disabled ? false
@@ -126,7 +126,7 @@ go.stdenv.mkDerivation (
     runHook postInstall
   '';
 
-  passthru = lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
+  passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
 
   meta = meta // {
     # add an extra maintainer to every package
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
deleted file mode 100644
index b299981bee2a..000000000000
--- a/pkgs/servers/consul/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub , ruby , nodejs
-, bundlerEnv }:
-
-let
-  version = "0.5.0";
-  # `sass` et al
-  gems = bundlerEnv {
-    name = "consul-deps";
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
-  };
-in
-
-with lib;
-stdenv.mkDerivation {
-  name = "consul-${version}";
-
-  src = import ./deps.nix {
-    inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
-  };
-
-  buildInputs = [ go ruby gems nodejs ];
-
-  buildPhase = ''
-    # Build consul binary
-    export GOPATH=$src
-    go build -v -o consul github.com/hashicorp/consul
-
-    # Build ui static files
-    ({
-      cp -r src/github.com/hashicorp/consul/ui .
-      cd ui
-      chmod -R u+w .
-      make dist
-    })
-  '';
-
-  outputs = [ "out" "ui" ];
-
-  installPhase = ''
-    # Fix references to go-deps in the binary
-    hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g')
-    xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c)))
-    sed -i "s,$hash,$xs,g" consul
-
-    # Install consul binary
-    mkdir -p $out/bin
-    cp consul $out/bin
-
-    # Install ui static files
-    mkdir -p $ui
-    mv ui/dist/* $ui
-  '';
-
-  meta = with lib; {
-    homepage    = http://www.consul.io/;
-    description = "A tool for service discovery, monitoring and configuration";
-    maintainers = with maintainers; [ cstrahan wkennington ];
-    license     = licenses.mpl20 ;
-    platforms   = platforms.unix;
-  };
-}
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
new file mode 100644
index 000000000000..eb7093ec615d
--- /dev/null
+++ b/pkgs/servers/consul/ui.nix
@@ -0,0 +1,39 @@
+{ stdenv, goPackages, ruby , nodejs, bundlerEnv }:
+
+let
+  # `sass` et al
+  gems = bundlerEnv {
+    name = "consul-ui-deps";
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+in
+
+stdenv.mkDerivation {
+  name = "consul-ui-${goPackages.consul.rev}";
+
+  src = goPackages.consul.src;
+
+  buildInputs = [ ruby gems nodejs ];
+
+  buildPhase = ''
+    # Build ui static files
+    cd ui
+    make dist
+  '';
+
+  installPhase = ''
+    # Install ui static files
+    mkdir -p $out
+    mv dist/* $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = http://www.consul.io/;
+    description = "A tool for service discovery, monitoring and configuration";
+    maintainers = with maintainers; [ cstrahan wkennington ];
+    license     = licenses.mpl20 ;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40a77f8a623d..bc2b7ee5b313 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -758,11 +758,9 @@ let
 
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
-  consul = callPackage ../servers/consul {
-   # inherit ruby;
-  };
+  consul = goPackages.consul;
 
-  consul_ui = consul.ui;
+  consul-ui = callPackage ../servers/consul/ui.nix { };
 
   consul-alerts = callPackage ../servers/consul/alerts.nix { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 7fd57bb74efc..ae84dd691177 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -57,7 +57,10 @@ let
     rev = "d1d694760b7a3a9fa32e4d1c49e08b2d672221d8";
     name = "net-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "golang.org/x/net";
-    goPackageAliases = [ "code.google.com/p/go.net" ];
+    goPackageAliases = [
+      "code.google.com/p/go.net"
+      "github.com/hashicorp/go.net"
+    ];
 
     src = fetchFromGitHub {
       inherit rev;
@@ -214,6 +217,19 @@ let
     };
   };
 
+  bolt = buildGoPackage rec {
+    rev = "957d850b5158a4eebf915476058e720f43459584";
+    name = "bolt-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/boltdb/bolt";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "boltdb";
+      repo = "bolt";
+      sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf";
+    };
+  };
+
   bufio = buildGoPackage rec {
     rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66";
     name = "bufio-${stdenv.lib.strings.substring 0 7 rev}";
@@ -241,6 +257,7 @@ let
     rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf";
     name = "circbuf-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/armon/circbuf";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "armon";
@@ -250,15 +267,18 @@ let
   };
 
   cli = buildGoPackage rec {
-    rev = "8262fe3f76f0da53b5674eb35c8c6436430794c3";
+    rev = "6cc8bc522243675a2882b81662b0b0d2e04b99c9";
     name = "cli-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/mitchellh/cli";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "mitchellh";
       repo = "cli";
-      sha256 = "0pqkxh1q49kkxihggrfjs8174d927g4c5qqx00ggw8sqqsgrw6vn";
+      sha256 = "05w9ypliva9lyn3h4rahznj04mh0fws7vaqlwhxfs5nnd5g03dma";
     };
+
+    propagatedBuildInputs = [ crypto ];
   };
 
   cobra = buildGoPackage rec {
@@ -275,14 +295,15 @@ let
   };
 
   columnize = buildGoPackage rec {
-    rev = "785d943a7b6886e0bb2f139a60487b823dd8d9de";
+    rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a";
     name = "columnize-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/ryanuber/columnize";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "ryanuber";
       repo = "columnize";
-      sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f";
+      sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9";
     };
   };
 
@@ -300,6 +321,44 @@ let
     subPackages = [ "./" ];
   };
 
+  consul = buildGoPackage rec {
+    rev = "v0.5.1";
+    name = "consul-${rev}";
+    goPackagePath = "github.com/hashicorp/consul";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "consul";
+      sha256 = "0glmvw52mgf3gwqr0f8v19ip5i6csiimv25jh30ilkig29k7027k";
+    };
+
+    buildInputs = [
+      circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint
+      ugorji.go go-multierror go-syslog golang-lru hcl logutils memberlist
+      net-rpc-msgpackrpc raft raft-boltdb raft-mdb scada-client serf yamux
+      muxado dns cli mapstructure columnize crypto
+    ];
+
+    # Keep consul.ui for backward compatability
+    passthru.ui = pkgs.consul-ui;
+  };
+
+  consul-migrate = buildGoPackage rec {
+    rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c";
+    name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/consul-migrate";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "consul-migrate";
+      sha256 = "0kjziwhz1ifj4wpy5viba6z17sfgjjibdhnn73ffp7q5q8abg8w3";
+    };
+
+    buildInputs = [ raft raft-boltdb raft-mdb ];
+  };
+
   dbus = buildGoPackage rec {
     rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133";
     name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
@@ -317,14 +376,15 @@ let
   };
 
   dns = buildGoPackage rec {
-    rev = "fd694e564b3ceaf34a8bbe9ef18f65c64df8ed03";
+    rev = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1";
     name = "dns-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/miekg/dns";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "miekg";
       repo = "dns";
-      sha256 = "1g15l00jypjac0fd2j39lifw1j3md49vk6fq35mv8kc8ighhvxaq";
+      sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq";
     };
   };
 
@@ -403,6 +463,20 @@ let
     };
   };
 
+  ugorji.go = buildGoPackage rec {
+    rev = "821cda7e48749cacf7cad2c6ed01e96457ca7e9d";
+    name = "ugorji-go-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/ugorji/go";
+    goPackageAliases = [ "github.com/hashicorp/go-msgpack" ];
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "ugorji";
+      repo = "go";
+      sha256 = "1ay1l6gijxjgc7j0093drp5mjm93fmrp7r20qbqz4k05l43mqb3j";
+    };
+  };
+
   goamz = buildGoPackage rec {
     rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7";
     name = "goamz-${rev}";
@@ -455,6 +529,19 @@ let
     doCheck = false; # please check again
   };
 
+  gomdb = buildGoPackage rec {
+    rev = "151f2e08ef45cb0e57d694b2562f351955dff572";
+    name = "gomdb-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/armon/gomdb";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "armon";
+      repo = "gomdb";
+      sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61";
+    };
+  };
+
   govers = buildGoPackage rec {
     rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
     name = "govers-${stdenv.lib.strings.substring 0 7 rev}";
@@ -468,6 +555,19 @@ let
     };
   };
 
+  golang-lru = buildGoPackage rec {
+    rev = "995efda3e073b6946b175ed93901d729ad47466a";
+    name = "golang-lru-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/golang-lru";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "golang-lru";
+      sha256 = "0ilnzg9qq2pfa8qb9yd25s5afi0fvsm78kqzqy39kgg8zsx70xyj";
+    };
+  };
+
   golang_protobuf_extensions = buildGoPackage rec {
     rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
     name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}";
@@ -611,15 +711,16 @@ let
     };
   };
 
-  go-codec = buildGoPackage rec {
-    rev = "71c2886f5a673a35f909803f38ece5810165097b";
-    name = "go-codec-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/ugorji/go";
+  go-checkpoint = buildGoPackage rec {
+    rev = "88326f6851319068e7b34981032128c0b1a6524d";
+    name = "go-checkpoint-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/go-checkpoint";
+
     src = fetchFromGitHub {
       inherit rev;
-      owner = "ugorji";
-      repo = "go";
-      sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";
+      owner = "hashicorp";
+      repo = "go-checkpoint";
+      sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
     };
   };
 
@@ -725,22 +826,6 @@ let
     buildInputs = [ go-systemd osext ];
   };
 
-  gucumber = buildGoPackage rec {
-    rev = "fba94dc5a9077fa81eb85199fa9dfdaa8af82ab5";
-    name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/lsegal/gucumber";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "lsegal";
-      repo = "gucumber";
-      sha256 = "028wczwpicwmggk3221pz8ffzh30l47x8217gvdzcqq6h9iiaczr";
-    };
-
-    buildInputs = [ testify ];
-    propagatedBuildInputs = [ ansicolor ];
-  };
-
   rcrowley.go-metrics = buildGoPackage rec {
     rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
     name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
@@ -770,15 +855,16 @@ let
     buildInputs = [ prometheus.client_golang ];
   };
 
-  go-msgpack = buildGoPackage rec {
-    rev = "75092644046c5e38257395b86ed26c702dc95b92";
-    name = "go-msgpack-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/ugorji/go-msgpack";
+  go-multierror = buildGoPackage rec {
+    rev = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e";
+    name = "go-multierror-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/go-multierror";
+
     src = fetchFromGitHub {
       inherit rev;
-      owner = "ugorji";
-      repo = "go-msgpack";
-      sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98";
+      owner = "hashicorp";
+      repo = "go-multierror";
+      sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz";
     };
   };
 
@@ -871,14 +957,15 @@ let
   };
 
   go-syslog = buildGoPackage rec {
-    rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c";
+    rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
     name = "go-syslog-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/hashicorp/go-syslog";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "hashicorp";
       repo = "go-syslog";
-      sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81";
+      sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3";
     };
   };
 
@@ -952,6 +1039,37 @@ let
     propagatedBuildInputs = [ http2 glog net protobuf oauth2 ];
   };
 
+  gucumber = buildGoPackage rec {
+    rev = "fba94dc5a9077fa81eb85199fa9dfdaa8af82ab5";
+    name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/lsegal/gucumber";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "lsegal";
+      repo = "gucumber";
+      sha256 = "028wczwpicwmggk3221pz8ffzh30l47x8217gvdzcqq6h9iiaczr";
+    };
+
+    buildInputs = [ testify ];
+    propagatedBuildInputs = [ ansicolor ];
+  };
+
+  hcl = buildGoPackage rec {
+    rev  = "513e04c400ee2e81e97f5e011c08fb42c6f69b84";
+    name = "hcl-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/hcl";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "hashicorp";
+      repo   = "hcl";
+      sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c";
+    };
+
+    buildInputs = [ go-multierror ];
+  };
+
   hologram = buildGoPackage rec {
     rev  = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c";
     name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1068,55 +1186,59 @@ let
   };
 
   logutils = buildGoPackage rec {
-    rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8";
+    rev = "367a65d59043b4f846d179341d138f01f988c186";
     name = "logutils-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/hashicorp/logutils";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "hashicorp";
       repo = "logutils";
-      sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz";
+      sha256 = "0rjag8c6fn3f51nysrq62r46ma6gzyvijxba47q7cdfjq35mydb8";
     };
   };
 
   mapstructure = buildGoPackage rec {
-    rev = "6fb2c832bcac61d01212ab1d172f7a14a8585b07";
+    rev = "f7d28d5aeab42b9b95d2e6d6b956f73a290077fc";
     name = "mapstructure-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/mitchellh/mapstructure";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "mitchellh";
       repo = "mapstructure";
-      sha256 = "0mx855lwhv0rk461wmbnbzbpkhmq5p2ipmrm5bhzimagrr1w17hw";
+      sha256 = "1l9bxx0lrxdb75bxgy3jq2f6sgin2xd5ll70z5797vi96mlz8ydb";
     };
   };
 
   mdns = buildGoPackage rec {
-    rev = "70462deb060d44247356ee238ebafd7699ddcffe";
+    rev = "2b439d37011456df8ff83a70ffd1cd6046410113";
     name = "mdns-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/armon/mdns";
+    goPackagePath = "github.com/hashicorp/mdns";
+
     src = fetchFromGitHub {
       inherit rev;
-      owner = "armon";
+      owner = "hashicorp";
       repo = "mdns";
-      sha256 = "0xkm3d0hsixdm1yrkx9c39723kfjkb3wvrzrmx3np9ylcwn6h5p5";
+      sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96";
     };
 
-    propagatedBuildInputs = [ dns net ];
+    propagatedBuildInputs = [ net dns ];
   };
 
   memberlist = buildGoPackage rec {
-    rev = "17d39b695094be943bfb98442a80b082e6b9ac47";
+    rev = "6025015f2dc659ca2c735112d37e753bda6e329d";
     name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/hashicorp/memberlist";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "hashicorp";
       repo = "memberlist";
-      sha256 = "0nvgjnwmfqhv2wvr77d2q5mq1bfw4xbpil6wgyj4fyrmhsfzrv3g";
+      sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7";
     };
 
-    propagatedBuildInputs = [ go-codec armon.go-metrics ];
+    propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
   };
 
   mesos-stats = buildGoPackage rec {
@@ -1171,6 +1293,19 @@ let
     };
   };
 
+  muxado = buildGoPackage rec {
+    rev = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848";
+    name = "muxado-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/inconshreveable/muxado";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "inconshreveable";
+      repo = "muxado";
+      sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs";
+    };
+  };
+
   mysql = buildGoPackage rec {
     rev = "0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b";
     name = "mysql-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1184,6 +1319,21 @@ let
     };
   };
 
+  net-rpc-msgpackrpc = buildGoPackage rec {
+    rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2";
+    name = "net-rpc-msgpackrpc-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/net-rpc-msgpackrpc";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "net-rpc-msgpackrpc";
+      sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969";
+    };
+
+    propagatedBuildInputs = [ ugorji.go ];
+  };
+
   ntp = buildGoPackage rec {
     rev = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     name = "ntp-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1396,6 +1546,51 @@ let
     };
   };
 
+  raft = buildGoPackage rec {
+    rev = "a8065f298505708bf60f518c09178149f3c06f21";
+    name = "raft-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/raft";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "hashicorp";
+      repo   = "raft";
+      sha256 = "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn";
+    };
+
+    propagatedBuildInputs = [ armon.go-metrics ugorji.go ];
+  };
+
+  raft-boltdb = buildGoPackage rec {
+    rev = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee";
+    name = "raft-boltdb-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/raft-boltdb";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "hashicorp";
+      repo   = "raft-boltdb";
+      sha256 = "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia";
+    };
+
+    propagatedBuildInputs = [ bolt ugorji.go raft ];
+  };
+
+  raft-mdb = buildGoPackage rec {
+    rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0";
+    name = "raft-mdb-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/raft-mdb";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "hashicorp";
+      repo   = "raft-mdb";
+      sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i";
+    };
+
+    propagatedBuildInputs = [ gomdb ugorji.go raft ];
+  };
+
   raw = buildGoPackage rec {
     rev = "724aedf6e1a5d8971aafec384b6bde3d5608fba4";
     name = "raw-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1420,6 +1615,39 @@ let
     };
   };
 
+  scada-client = buildGoPackage rec {
+    rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae";
+    name = "scada-client-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/scada-client";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "hashicorp";
+      repo   = "scada-client";
+      sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b";
+    };
+
+    buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ];
+  };
+
+  serf = buildGoPackage rec {
+    rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
+    name = "serf-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/serf";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "hashicorp";
+      repo   = "serf";
+      sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
+    };
+
+    buildInputs = [
+      circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist
+      cli mapstructure columnize
+    ];
+  };
+
   sets = buildGoPackage rec {
     rev = "6c54cb57ea406ff6354256a4847e37298194478f";
     name = "sets-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1561,6 +1789,30 @@ let
     buildInputs = [ pkgconfig libusb ];
   };
 
+  vault = buildGoPackage rec {
+    rev = "v0.1.2";
+    name = "vault-${rev}";
+    goPackagePath = "github.com/hashicorp/vault";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "vault";
+      sha256 = "0q6wlw0s9dig11mzcfg25fh2wz7g70zxkqm7c5f58fncxdby2nqj";
+    };
+
+    extraSrcs = [
+      { inherit (consul) src goPackagePath; }
+    ];
+
+    buildInputs = [
+      armon.go-metrics go-radix mysql go-querystring aws-sdk-go errwrap
+      go-multierror go-syslog golang-lru hcl logutils pq cli copystructure
+      go-homedir mapstructure reflectwalk columnize go-zookeeper asn1-ber ldap
+      go-ini crypto net oauth2
+    ];
+  };
+
   vulcand = buildGoPackage rec {
     rev = "v0.8.0-beta.3";
     name = "vulcand-${rev}";
@@ -1599,4 +1851,17 @@ let
     };
   };
 
+  yamux = buildGoPackage rec {
+    rev = "b2e55852ddaf823a85c67f798080eb7d08acd71d";
+    name = "yamux-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/yamux";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "yamux";
+      sha256 = "0mr87my5m8lgc0byjcddlclxg34d07cpi9p78ps3rhzq7p37g533";
+    };
+  };
+
 }; in self

From f0d324c23aaef6475eb6746e55b878696246cd9c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 15:55:55 -0700
Subject: [PATCH 1067/1143] consul-template: Move to go-packages

---
 pkgs/servers/consul/template.nix | 34 --------------------------------
 pkgs/top-level/all-packages.nix  |  2 +-
 pkgs/top-level/go-packages.nix   | 21 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/servers/consul/template.nix

diff --git a/pkgs/servers/consul/template.nix b/pkgs/servers/consul/template.nix
deleted file mode 100644
index 59ca524b51e3..000000000000
--- a/pkgs/servers/consul/template.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  name = "consul-template-${version}";
-  version = "0.7.0";
-
-  src = import ./deps.nix {
-    inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
-  };
-
-  buildInputs = [ go ];
-
-  buildPhase = ''
-    GOPATH=$src go build -v -o consul-template github.com/hashicorp/consul-template
-  '';
-
-  installPhase = ''
-    # Fix references to go-deps in the binary
-    hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g')
-    xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c)))
-    sed -i "s,$hash,$xs,g" consul-template
-
-    mkdir -p $out/bin
-    cp consul-template $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Generic template rendering and notifications with Consul";
-    homepage = https://github.com/hashicorp/consul-template;
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ puffnfresh wkennington ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc2b7ee5b313..d892f4443a01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -764,7 +764,7 @@ let
 
   consul-alerts = callPackage ../servers/consul/alerts.nix { };
 
-  consul-template = callPackage ../servers/consul/template.nix { };
+  consul-template = goPackages.consul-template;
 
   corosync = callPackage ../servers/corosync { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ae84dd691177..e68ded9a3064 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -359,6 +359,27 @@ let
     buildInputs = [ raft raft-boltdb raft-mdb ];
   };
 
+  consul-template = buildGoPackage rec {
+    rev = "v0.9.0";
+    name = "consul-template-${rev}";
+    goPackagePath = "github.com/hashicorp/consul-template";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "consul-template";
+      sha256 = "1k64rjskzn7cxn7rxab978847jq8gr4zj4cnzgznhn44nzasgymj";
+    };
+
+    # We just want the consul api not all of consul and vault
+    extraSrcs = [
+      { inherit (consul) src goPackagePath; }
+      { inherit (vault) src goPackagePath; }
+    ];
+
+    buildInputs = [ go-multierror go-syslog hcl logutils mapstructure ];
+  };
+
   dbus = buildGoPackage rec {
     rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133";
     name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";

From d0e45e274be2ec002c60c878d82d1fe378883ccf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 16:11:19 -0700
Subject: [PATCH 1068/1143] fetchFromBitbucket: Add

---
 pkgs/top-level/all-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d892f4443a01..d9137617b07d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -375,6 +375,12 @@ let
     inherit sha256;
   };
 
+  fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
+    inherit name;
+    url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz";
+    inherit sha256;
+  };
+
   # gitorious example
   fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name;

From a6d5a2e442bd67cdf285e6ec1f41b656c9877ab6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 18:18:37 -0700
Subject: [PATCH 1069/1143] consul-alerts: Make go-package

---
 pkgs/servers/consul/alerts.nix  |  27 ---
 pkgs/servers/consul/deps.nix    | 315 -------------------------
 pkgs/top-level/all-packages.nix |   2 +-
 pkgs/top-level/go-packages.nix  | 394 ++++++++++++++++++++++++++++++--
 4 files changed, 373 insertions(+), 365 deletions(-)
 delete mode 100644 pkgs/servers/consul/alerts.nix
 delete mode 100644 pkgs/servers/consul/deps.nix

diff --git a/pkgs/servers/consul/alerts.nix b/pkgs/servers/consul/alerts.nix
deleted file mode 100644
index b3dbb21d5bbb..000000000000
--- a/pkgs/servers/consul/alerts.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  name = "consul-alerts-${version}";
-  version = "0.2.0";
-
-  src = fetchFromGitHub {
-    owner = "AcalephStorage";
-    repo = "consul-alerts";
-    rev = "v${version}";
-    sha256 = "02rgz68g3i408biq2aqilpqraqirzmba9mh7avdga5bljp427jgn";
-  };
-
-  goPackagePath = "github.com/AcalephStorage/consul-alerts";
-  dontInstallSrc = true;
-  subPackages = [ "./" ];
-
-  meta = with lib; {
-    description = "A simple daemon to send notifications based on Consul health checks";
-    homepage = https://github.com/AcalephStorage/consul-alerts;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix
deleted file mode 100644
index ad41dbb70a59..000000000000
--- a/pkgs/servers/consul/deps.nix
+++ /dev/null
@@ -1,315 +0,0 @@
-{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
-
-let
-  goDeps = [
-    {
-      root = "github.com/armon/circbuf";
-      src = fetchFromGitHub {
-        owner = "armon";
-        repo = "circbuf";
-        rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf";
-        sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s";
-      };
-    }
-    {
-      root = "github.com/armon/consul-api";
-      src = fetchFromGitHub {
-        owner = "armon";
-        repo = "consul-api";
-        rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c";
-        sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d";
-      };
-    }
-    {
-      root = "github.com/armon/go-metrics";
-      src = fetchFromGitHub {
-        owner = "armon";
-        repo = "go-metrics";
-        rev = "88b7658f24511c4b885942b26e9ea7a61ee37ebc";
-        sha256 = "18f7nr6khirdmcsy5mic1yggwc189wfiqvms8i7yfcvfns5nq9cc";
-      };
-    }
-    {
-      root = "github.com/armon/go-radix";
-      src = fetchFromGitHub {
-        owner = "armon";
-        repo = "go-radix";
-        rev = "e39d623f12e8e41c7b5529e9a9dd67a1e2261f80";
-        sha256 = "10vhgr35dfbsm90q8aqp82vhdf4izqrx8bzzgn0h3vrx94c2pnq1";
-      };
-    }
-    {
-      root = "github.com/armon/gomdb";
-      src = fetchFromGitHub {
-        owner = "armon";
-        repo = "gomdb";
-        rev = "151f2e08ef45cb0e57d694b2562f351955dff572";
-        sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61";
-      };
-    }
-    {
-      root = "github.com/golang/protobuf";
-      src = fetchFromGitHub {
-        owner = "golang";
-        repo = "protobuf";
-        rev = "c22ae3cf020a21ebb7ae566dccbe90fc8ea4f9ea";
-        sha256 = "1ab605jw0cprq0kbp0b5iyjw805wk08r3p9mvcyland7v4gfqys2";
-      };
-    }
-    {
-      root = "github.com/hashicorp/consul";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "consul";
-        rev = "a022dfcb32246274adc8fb383882353c056d1da3";
-        sha256 = "1al6bc62c8qygq4yhr8rq9jkx51ijv11816kipphylw73kyyrzg5";
-      };
-    }
-    {
-      root = "github.com/hashicorp/go-multierror";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-multierror";
-        rev = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e";
-        sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz";
-      };
-    }
-    {
-      root = "github.com/hashicorp/consul-template";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "consul-template";
-        rev = "v0.7.0";
-        sha256 = "0xaym2mi8j3hw1waplhqfypnxv32fi81xxx3clfzk0a6bjmaihfx";
-      };
-    }
-    {
-      root = "github.com/hashicorp/go-checkpoint";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-checkpoint";
-        rev = "88326f6851319068e7b34981032128c0b1a6524d";
-        sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
-      };
-    }
-    {
-      root = "github.com/hashicorp/go-msgpack";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-msgpack";
-        rev = "71c2886f5a673a35f909803f38ece5810165097b";
-        sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";
-      };
-    }
-    {
-      root = "github.com/hashicorp/go-syslog";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-syslog";
-        rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
-        sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3";
-      };
-    }
-    {
-      root = "github.com/hashicorp/golang-lru";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "golang-lru";
-        rev = "f09f965649501e2ac1b0c310c632a7bebdbdc1d4";
-        sha256 = "0yjnmk2d2x0kqvkg1sdfkl3jr408yl76rpyqzkkbpkvdcjrz554c";
-      };
-    }
-    {
-      root = "github.com/hashicorp/hcl";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "hcl";
-        rev = "513e04c400ee2e81e97f5e011c08fb42c6f69b84";
-        sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c";
-      };
-    }
-    {
-      root = "github.com/hashicorp/logutils";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "logutils";
-        rev = "23b0af5510a2d1442103ef83ffcf53eb82f3debc";
-        sha256 = "018bfknmc2qdk0br1ri6dgd45sx308j3qd77sxnzxsyaivw1mm0d";
-      };
-    }
-    {
-      root = "github.com/hashicorp/memberlist";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "memberlist";
-        rev = "3d05e25e06bbb9e2b0e0afbd0b1c7dcebdd29cab";
-        sha256 = "1pjknjfvbs692y6laizgd4fmd4pqn039vvnmnag7q362mrpf5aj4";
-      };
-    }
-    {
-      root = "github.com/hashicorp/net-rpc-msgpackrpc";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "net-rpc-msgpackrpc";
-        rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2";
-        sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969";
-      };
-    }
-    {
-      root = "github.com/hashicorp/raft";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "raft";
-        rev = "a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab";
-        sha256 = "02kr7919m6iv7l26wnihalfi4lydz886j6x75a53vgchdcsbv7ai";
-      };
-    }
-    {
-      root = "github.com/hashicorp/raft-mdb";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "raft-mdb";
-        rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0";
-        sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i";
-      };
-    }
-    {
-      root = "github.com/hashicorp/scada-client";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "scada-client";
-        rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae";
-        sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b";
-      };
-    }
-    {
-      root = "github.com/hashicorp/serf";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "serf";
-        rev = "f1fd5030d6a55d3edc6916d2ba58e933c21314de";
-        sha256 = "0w84iw255aray7acasacwn8njm36aqbxiyalnjqwfsn0pwfjla0b";
-      };
-    }
-    {
-      root = "github.com/hashicorp/terraform";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "terraform";
-        rev = "v0.3.7";
-        sha256 = "04cs6sjwysg95l5cfsmnpnx3d126bv86qbkg91gj8h98knk5bs6z";
-      };
-    }
-    {
-      root = "github.com/hashicorp/yamux";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "yamux";
-        rev = "b4f943b3f25da97dec8e26bee1c3269019de070d";
-        sha256 = "18ivpiix006f0g085a11gra8z0n6bq344rrgc5rphn7nmnghqchz";
-      };
-    }
-    {
-      root = "github.com/inconshreveable/muxado";
-      src = fetchFromGitHub {
-        owner = "inconshreveable";
-        repo = "muxado";
-        rev = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848";
-        sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs";
-      };
-    }
-    {
-      root = "github.com/matttproud/golang_protobuf_extensions";
-      src = fetchFromGitHub {
-        owner = "matttproud";
-        repo = "golang_protobuf_extensions";
-        rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c";
-        sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936";
-      };
-    }
-    {
-      root = "github.com/miekg/dns";
-      src = fetchFromGitHub {
-        owner = "miekg";
-        repo = "dns";
-        rev = "6427527bba3ea8fdf2b56fba43d20d1e3e76336d";
-        sha256 = "1zszpn44kak4cs5lmy9i7sslizqngldgb0ixn0la9x9gxf16h9zn";
-      };
-    }
-    {
-      root = "github.com/mitchellh/cli";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "cli";
-        rev = "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0";
-        sha256 = "1fwf7wmlhri19bl2yyjd4zlgndgwwqrdry45clpszzjsr8b5wfgm";
-      };
-    }
-    {
-      root = "github.com/mitchellh/mapstructure";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "mapstructure";
-        rev = "442e588f213303bec7936deba67901f8fc8f18b1";
-        sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd";
-      };
-    }
-    {
-      root = "github.com/prometheus/client_golang";
-      src = fetchFromGitHub {
-        owner = "prometheus";
-        repo = "client_golang";
-        rev = "0.2.0";
-        sha256 = "0iq2hlmdazwmpjq2k9gvpv2zprzxzmyzsc89c2kalrwl52ksg250";
-      };
-    }
-    {
-      root = "github.com/prometheus/client_model";
-      src = fetchFromGitHub {
-        owner = "prometheus";
-        repo = "client_model";
-        rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
-        sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
-      };
-    }
-    {
-      root = "github.com/prometheus/procfs";
-      src = fetchFromGitHub {
-        owner = "prometheus";
-        repo = "procfs";
-        rev = "6c34ef819e19b4e16f410100ace4aa006f0e3bf8";
-        sha256 = "1n48jhx50bhnjznxds4nmz04digbbbbjq3hkvvl29js1grylda0i";
-      };
-    }
-    {
-      root = "github.com/ryanuber/columnize";
-      src = fetchFromGitHub {
-        owner = "ryanuber";
-        repo = "columnize";
-        rev = "v2.0.1";
-        sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f";
-      };
-    }
-    {
-      root = "github.com/ugorji/go";
-      src = fetchFromGitHub {
-        owner = "ugorji";
-        repo = "go";
-        rev = "c8676e5e9db1226325ca0ed7771633fb0109878b";
-        sha256 = "18r1iajmc9a461kx0pz3lpv91lzlfg93cjw0k0j7ffk6901m0084";
-      };
-    }
-  ];
-
-in
-
-stdenv.mkDerivation rec {
-  name = "go-deps";
-
-  buildCommand =
-    lib.concatStrings
-      (map (dep: ''
-              mkdir -p $out/src/`dirname ${dep.root}`
-              ln -s ${dep.src} $out/src/${dep.root}
-            '') goDeps);
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9137617b07d..201f6d59ac59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -768,7 +768,7 @@ let
 
   consul-ui = callPackage ../servers/consul/ui.nix { };
 
-  consul-alerts = callPackage ../servers/consul/alerts.nix { };
+  consul-alerts = goPackages.consul-alerts;
 
   consul-template = goPackages.consul-template;
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index e68ded9a3064..557d6cc344fe 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1,7 +1,7 @@
 /* This file defines the composition for Go packages. */
 
 { overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb
-, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr, pkgs }:
+, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchFromBitbucket, fetchbzr, pkgs }:
 
 let
   isGo13 = go.meta.branch == "1.3";
@@ -149,6 +149,19 @@ let
 
   ## THIRD PARTY
 
+  airbrake-go = buildGoPackage rec {
+    rev = "5b5e269e1bc398d43f67e43dafff3414a59cd5a2";
+    name = "airbrake-go-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/tobi/airbrake-go";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "tobi";
+      repo   = "airbrake-go";
+      sha256 = "1bps4y3vpphpj63mshjg2aplh579cvqac0hz7qzvac0d1fqcgkdz";
+    };
+  };
+
   ansicolor = buildGoPackage rec {
     rev = "8368d3b31cf6f2c2464c7a91675342c9a0ac6658";
     name = "ansicolor-${stdenv.lib.strings.substring 0 7 rev}";
@@ -242,6 +255,21 @@ let
     };
   };
 
+  bugsnag-go = buildGoPackage rec {
+    rev = "v1.0.3";
+    name = "bugsnag-go-${rev}";
+    goPackagePath = "github.com/bugsnag/bugsnag-go";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "bugsnag";
+      repo   = "bugsnag-go";
+      sha256 = "1ymi5hrvd2nyfwfd12xll43gn00ii3bjb5ma9dfhaaxv2asi3ajx";
+    };
+
+    propagatedBuildInputs = [ panicwrap revel ];
+  };
+
   check-v1 = buildGoPackage rec {
     rev = "871360013c92e1c715c2de6d06b54899468a8a2d";
     name = "check-v1-${stdenv.lib.strings.substring 0 7 rev}";
@@ -321,6 +349,19 @@ let
     subPackages = [ "./" ];
   };
 
+  config = buildGoPackage rec {
+    rev = "0f78529c8c7e3e9a25f15876532ecbc07c7d99e6";
+    name = "config-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/robfig/config";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "robfig";
+      repo = "config";
+      sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
+    };
+  };
+
   consul = buildGoPackage rec {
     rev = "v0.5.1";
     name = "consul-${rev}";
@@ -344,6 +385,36 @@ let
     passthru.ui = pkgs.consul-ui;
   };
 
+  consul-alerts = buildGoPackage rec {
+    rev = "7dff28aa4c8c883a65106f8ec22796e1a589edab";
+    name = "consul-alerts-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/AcalephStorage/consul-alerts";
+
+    renameImports = ''
+      # Remove all references to included dependency store
+      rm -rf go/src/${goPackagePath}/Godeps
+      govers -d -m github.com/AcalephStorage/consul-alerts/Godeps/_workspace/src/ ""
+
+      # Fix references to consul-api
+      govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api
+      sed -i 's,consulapi,api,g' go/src/${goPackagePath}/consul/client.go
+    '';
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "AcalephStorage";
+      repo = "consul-alerts";
+      sha256 = "1vwybkvjgyilxk3l6avzivd31l8gnk8d0v7bl10qll0cd068fabq";
+    };
+
+    # We just want the consul api not all of consul
+    extraSrcs = [
+      { inherit (consul) src goPackagePath; }
+    ];
+
+    buildInputs = [ logrus consul-skipper docopt-go hipchat-go influxdb gopherduty ];
+  };
+
   consul-migrate = buildGoPackage rec {
     rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c";
     name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}";
@@ -359,6 +430,31 @@ let
     buildInputs = [ raft raft-boltdb raft-mdb ];
   };
 
+  consul-skipper = buildGoPackage rec {
+    rev = "729b4fdcc7f572f7c083673595f939256b80b76f";
+    name = "consul-skipper-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/darkcrux/consul-skipper";
+
+    renameImports = ''
+      govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api
+      sed -i 's,consulapi,api,g' go/src/${goPackagePath}/skipper.go
+    '';
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "darkcrux";
+      repo = "consul-skipper";
+      sha256 = "0shqvihbmq1w5ddnkn62qd4k6gs5zalq6k4alacjz92bwf6d2x6x";
+    };
+
+    # We just want the consul api not all of consul
+    extraSrcs = [
+      { inherit (consul) src goPackagePath; }
+    ];
+
+    buildInputs = [ logrus ];
+  };
+
   consul-template = buildGoPackage rec {
     rev = "v0.9.0";
     name = "consul-template-${rev}";
@@ -409,6 +505,19 @@ let
     };
   };
 
+  docopt-go = buildGoPackage rec {
+    rev = "854c423c810880e30b9fecdabb12d54f4a92f9bb";
+    name = "docopt-go-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/docopt/docopt-go";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "docopt";
+      repo = "docopt-go";
+      sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1";
+    };
+  };
+
   ed25519 = buildGoPackage rec {
     rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c";
     name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}";
@@ -420,15 +529,16 @@ let
     };
   };
 
-  fsnotify = buildGoPackage rec {
-    rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2";
-    name = "fsnotify-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/howeyc/fsnotify";
+  fsnotify.v1 = buildGoPackage rec {
+    rev = "v1.2.0";
+    name = "fsnotify.v1-${rev}";
+    goPackagePath = "gopkg.in/fsnotify.v1";
+
     src = fetchFromGitHub {
       inherit rev;
-      owner = "howeyc";
+      owner = "go-fsnotify";
       repo = "fsnotify";
-      sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn";
+      sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2";
     };
   };
 
@@ -537,6 +647,19 @@ let
     };
   };
 
+  gocolorize = buildGoPackage rec {
+    rev = "v1.0.0";
+    name = "gocolorize-${rev}";
+    goPackagePath = "github.com/agtorre/gocolorize";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "agtorre";
+      repo = "gocolorize";
+      sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p";
+    };
+  };
+
   goconvey = buildGoPackage rec {
     version = "1.5.0";
     name = "goconvey-${version}";
@@ -617,6 +740,19 @@ let
     propagatedBuildInputs = [ ginkgo gomega gosnappy ];
   };
 
+  gollectd = buildGoPackage rec {
+    rev = "cf6dec97343244b5d8a5485463675d42f574aa2d";
+    name = "gollectd-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/kimor79/gollectd";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "kimor79";
+      repo = "gollectd";
+      sha256 = "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa";
+    };
+  };
+
   gomega = buildGoPackage rec {
     rev = "8adf9e1730c55cdc590de7d49766cb2acc88d8f2";
     name = "gomega-${stdenv.lib.strings.substring 0 7 rev}";
@@ -629,6 +765,19 @@ let
     };
   };
 
+  gomemcache = buildGoPackage rec {
+    rev = "72a68649ba712ee7c4b5b4a943a626bcd7d90eb8";
+    name = "gomemcache-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/bradfitz/gomemcache";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "bradfitz";
+      repo = "gomemcache";
+      sha256 = "1r8fpzwhakq8fsppc33n4iivq1pz47xhs0h6bv4x5qiip5mswwvg";
+    };
+  };
+
   google-api-go-client = buildGoPackage rec {
     rev = "34c5554e6406f7f715ede3616b39034247545ce0";
     name = "google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}";
@@ -661,6 +810,19 @@ let
     buildInputs = [ crypto ];
   };
 
+  gopherduty = buildGoPackage rec {
+    rev = "f4906ce7e59b33a50bfbcba93e2cf58778c11fb9";
+    name = "gopherduty-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/darkcrux/gopherduty";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "darkcrux";
+      repo = "gopherduty";
+      sha256 = "11w1yqc16fxj5q1y5ha5m99j18fg4p9lyqi542x2xbrmjqqialcf";
+    };
+  };
+
   gosnappy = buildGoPackage rec {
     rev = "ce8acff4829e0c2458a67ead32390ac0a381c862";
     name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}";
@@ -732,6 +894,35 @@ let
     };
   };
 
+  pmylund.go-cache = buildGoPackage rec {
+    rev = "93d85800f2fa6bd0a739e7bd612bfa3bc008b72d";
+    name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/pmylund/go-cache";
+    goPackageAliases = [
+      "github.com/robfig/go-cache"
+    ];
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "pmylund";
+      repo = "go-cache";
+      sha256 = "08wfwm7nk381lv6a95p0hfgqwaksn0vhzz1xxdncjdw6w71isyy7";
+    };
+  };
+
+  robfig.go-cache = buildGoPackage rec {
+    rev = "9fc39e0dbf62c034ec4e45e6120fc69433a3ec51";
+    name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/robfig/go-cache";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "robfig";
+      repo = "go-cache";
+      sha256 = "032nh3y43bpzpcm7bdkxfh55aydvzc2jzhigvy5gd9f648m4j9ha";
+    };
+  };
+
   go-checkpoint = buildGoPackage rec {
     rev = "88326f6851319068e7b34981032128c0b1a6524d";
     name = "go-checkpoint-${stdenv.lib.strings.substring 0 7 rev}";
@@ -858,7 +1049,7 @@ let
       sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f";
     };
 
-    buildInputs = [ influxdb-go stathat ];
+    buildInputs = [ influxdb stathat ];
   };
 
   armon.go-metrics = buildGoPackage rec {
@@ -1091,6 +1282,21 @@ let
     buildInputs = [ go-multierror ];
   };
 
+  hipchat-go = buildGoPackage rec {
+    rev = "1dd13e154219c15e2611fe46adbb6bf65db419b7";
+    name = "hipchat-go-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/tbruyelle/hipchat-go";
+
+    excludedPackages = "examples";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "tbruyelle";
+      repo = "hipchat-go";
+      sha256 = "060wg5yjlh28v03mvm80kwgxyny6cyj7zjpcdg032b8b1sz9z81s";
+    };
+  };
+
   hologram = buildGoPackage rec {
     rev  = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c";
     name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1131,16 +1337,22 @@ let
     };
   };
 
-  influxdb-go = buildGoPackage rec {
-    rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7";
-    name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/influxdb/influxdb-go";
+  influxdb = buildGoPackage rec {
+    rev = "d80ef2286d476d9e306548305e47c3ba967f5bc2";
+    name = "influxdb-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/influxdb/influxdb";
+    goPackageAliases = [
+      "github.com/influxdb/influxdb-go"
+    ];
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "influxdb";
-      repo = "influxdb-go";
-      sha256 = "16in1xhx94pir06aw166inn0hzpb7836xbws16laabs1p2np7bld";
+      repo = "influxdb";
+      sha256 = "0p3s0pbn5x294qg2r0qgysb5wmspsvjxhccxh2hs6hc24dl6y93b";
     };
+
+    buildInputs = [ bolt crypto statik liner toml pat gollectd ];
   };
 
   eckardt.influxdb-go = buildGoPackage rec {
@@ -1192,6 +1404,19 @@ let
     subPackages = [ "./" ];
   };
 
+  liner = buildGoPackage rec {
+    rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
+    name = "liner-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/peterh/liner";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "peterh";
+      repo   = "liner";
+      sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
+    };
+  };
+
   log4go = buildGoPackage rec {
     rev = "48";
     name = "log4go-${rev}";
@@ -1206,6 +1431,23 @@ let
     subPackages = [ "./" ]; # don't build examples
   };
 
+  logrus = buildGoPackage rec {
+    rev = "v0.7.3";
+    name = "logrus-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/Sirupsen/logrus";
+
+    excludedPackages = "examples";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "Sirupsen";
+      repo = "logrus";
+      sha256 = "1sxksbarllmqb8wz5b2wbwr6q2i32vqasf7bpz4djywy3ig7jwk8";
+    };
+
+    propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];
+  };
+
   logutils = buildGoPackage rec {
     rev = "367a65d59043b4f846d179341d138f01f988c186";
     name = "logutils-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1434,16 +1676,62 @@ let
   };
 
   osext = buildGoPackage rec {
-    rev = "10";
-    name = "osext-${rev}";
-    goPackagePath = "bitbucket.org/kardianos/osext";
-    src = fetchhg {
+    rev = "8fef92e41e22a70e700a96b29f066cda30ea24ef";
+    name = "osext-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/kardianos/osext";
+    goPackageAliases = [
+      "github.com/bugsnag/osext"
+    ];
+
+    src = fetchFromGitHub {
       inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "1sj9r5pm28l9sqx6354fwp032n53znx9k8495k3dfnyqjrkvlw6n";
+      owner = "kardianos";
+      repo = "osext";
+      sha256 = "1md9c0qlmfhwcwgqg92vfykcy95snci4n815plb15mgj5cf8dm7d";
     };
   };
 
+  pat = buildGoPackage rec {
+    rev = "b8a35001b773c267eb260a691f4e5499a3531600";
+    name = "pat-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/bmizerany/pat";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "bmizerany";
+      repo = "pat";
+      sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz";
+    };
+  };
+
+  pathtree = buildGoPackage rec {
+    rev = "41257a1839e945fce74afd070e02bab2ea2c776a";
+    name = "pathtree-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/robfig/pathtree";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "robfig";
+      repo = "pathtree";
+      sha256 = "087hvskjx1zw815h1617i135vwsn5288v579mz6yral91wbn0kvi";
+    };
+  };
+
+  panicwrap = buildGoPackage rec {
+    rev = "e5f9854865b9778a45169fc249e99e338d4d6f27";
+    name = "panicwrap-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/bugsnag/panicwrap";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "bugsnag";
+      repo = "panicwrap";
+      sha256 = "01afviklmgm25i82c0z9xkjgbrh0j1fm9a1adqfd2jqv0cm41k9d";
+    };
+
+    propagatedBuildInputs = [ osext ];
+  };
+
   perks = buildGoPackage rec {
     rev = "aac9e2eab5a334037057336897fd10b0289a5ae8";
     name = "perks-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1624,6 +1912,51 @@ let
     };
   };
 
+  raven-go = buildGoPackage rec {
+    rev = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7";
+    name = "raven-go-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/getsentry/raven-go";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "getsentry";
+      repo   = "raven-go";
+      sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh";
+    };
+  };
+
+  redigo = buildGoPackage rec {
+    rev = "535138d7bcd717d6531c701ef5933d98b1866257";
+    name = "redigo-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/garyburd/redigo";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "garyburd";
+      repo   = "redigo";
+      sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v";
+    };
+  };
+
+  revel = buildGoPackage rec {
+    rev = "v0.12.0";
+    name = "revel-${rev}";
+    goPackagePath = "github.com/revel/revel";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "revel";
+      repo   = "revel";
+      sha256 = "1g88fw5lqh3a9qmx182s64zk3h1s1mx8bljyghissmd9z505pbzf";
+    };
+
+    # Using robfig's old go-cache due to compilation errors.
+    # Try to switch to pmylund.go-cache after v0.12.0
+    propagatedBuildInputs = [
+      gocolorize config net pathtree fsnotify.v1 robfig.go-cache redigo gomemcache
+    ];
+  };
+
   rgbterm = buildGoPackage rec {
     rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283";
     name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1731,6 +2064,21 @@ let
     };
   };
 
+  statik = buildGoPackage rec {
+    rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465";
+    name = "statik-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/rakyll/statik";
+
+    excludedPackages = "example";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "rakyll";
+      repo = "statik";
+      sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp";
+    };
+  };
+
   termbox-go = buildGoPackage rec {
     rev = "9aecf65084a5754f12d27508fa2e6ed56851953b";
     name = "termbox-go-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1786,14 +2134,15 @@ let
   };
 
   toml = buildGoPackage rec {
-    rev = "f87ce853111478914f0bcffa34d43a93643e6eda";
+    rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
     name = "toml-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/BurntSushi/toml";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "BurntSushi";
       repo = "toml";
-      sha256 = "0g8203y9ycf34j2q3ymxb8nh4habgwdrjn9vdgrginllx73yq565";
+      sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
     };
   };
 
@@ -1822,6 +2171,7 @@ let
       sha256 = "0q6wlw0s9dig11mzcfg25fh2wz7g70zxkqm7c5f58fncxdby2nqj";
     };
 
+    # We just want the consul api not all of consul
     extraSrcs = [
       { inherit (consul) src goPackagePath; }
     ];

From b10472fae90ee2acfb5de8c6734bf75e86f23547 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 18 May 2015 18:45:57 -0700
Subject: [PATCH 1070/1143] goPackages: Add dependencies for vault

---
 pkgs/top-level/go-packages.nix | 143 ++++++++++++++++++++++++++++++---
 1 file changed, 130 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 557d6cc344fe..8359fc541414 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -88,7 +88,7 @@ let
       { inherit (gcloud-golang) src goPackagePath; }
     ];
 
-    buildInputs = [ net ];
+    propagatedBuildInputs = [ net ];
   };
 
 
@@ -176,14 +176,15 @@ let
   };
 
   asn1-ber = buildGoPackage rec {
-    rev = "ec51d5ed21377b4023ca7b1e70ae4cb296ee6047";
+    rev = "295c7b21db5d9525ad959e3382610f3aff029663";
     name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/nmcclain/asn1-ber";
+    goPackagePath = "github.com/vanackere/asn1-ber";
+
     src = fetchFromGitHub {
       inherit rev;
-      owner  = "nmcclain";
+      owner  = "vanackere";
       repo   = "asn1-ber";
-      sha256 = "0a2d38k7zpcnf148zlxq2rm7s1s1hzybb3w5ygxilipz0m7qkdsb";
+      sha256 = "1zamvcbk2xk3vznvckgqmdag32nlv7ip0fr1cc0z9ggai22ddh8n";
     };
   };
 
@@ -206,6 +207,9 @@ let
     rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503";
     name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/awslabs/aws-sdk-go";
+    goPackageAliases = [
+      "github.com/hashicorp/aws-sdk-go"
+    ];
 
     src = fetchFromGitHub {
       inherit rev;
@@ -217,6 +221,21 @@ let
     buildInputs = [ go-ini gucumber testify ];
   };
 
+  hashicorp.aws-sdk-go = buildGoPackage rec {
+    rev = "e6ea0192eee4640f32ec73c0cbb71f63e4f2b65a";
+    name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/aws-sdk-go";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "hashicorp";
+      repo   = "aws-sdk-go";
+      sha256 = "1qrc2jl38marbarnl31sag7s0h18j2wx1cxkcqin5m1pqg62p4cn";
+    };
+
+    buildInputs = [ go-ini net sandblast ];
+  };
+
   binarydist = buildGoPackage rec {
     rev = "9955b0ab8708602d411341e55fffd7e0700f86bd";
     name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}";
@@ -335,6 +354,21 @@ let
     };
   };
 
+  copystructure = buildGoPackage rec {
+    rev = "6fc66267e9da7d155a9d3bd489e00dad02666dc6";
+    name = "copystructure-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/mitchellh/copystructure";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "mitchellh";
+      repo = "copystructure";
+      sha256 = "193s5vhw68d8npjyf5yvc5j24crazvy7d5dk316hl7590qrmbxrd";
+    };
+
+    buildInputs = [ reflectwalk ];
+  };
+
   confd = buildGoPackage rec {
     rev = "v0.9.0";
     name = "confd-${rev}";
@@ -529,6 +563,19 @@ let
     };
   };
 
+  errwrap = buildGoPackage rec {
+    rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
+    name = "errwrap-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/errwrap";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "errwrap";
+      sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
+    };
+  };
+
   fsnotify.v1 = buildGoPackage rec {
     rev = "v1.2.0";
     name = "fsnotify.v1-${rev}";
@@ -1064,7 +1111,7 @@ let
       sha256 = "0ia9i96nac7vnmf5qb98rs74npf3vg55kdsvmql8cwgfpmqqcfdh";
     };
 
-    buildInputs = [ prometheus.client_golang ];
+    propagatedBuildInputs = [ prometheus.client_golang ];
   };
 
   go-multierror = buildGoPackage rec {
@@ -1222,6 +1269,19 @@ let
     };
   };
 
+  go-zookeeper = buildGoPackage rec {
+    rev = "d0e0d8e11f318e000a8cc434616d69e329edc374";
+    name = "go-zookeeper-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/samuel/go-zookeeper";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "samuel";
+      repo = "go-zookeeper";
+      sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d";
+    };
+  };
+
   grafana = buildGoPackage rec {
     version = "2.0.0-beta1";
     name = "grafana-v${version}";
@@ -1307,7 +1367,7 @@ let
       repo   = "hologram";
       sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4";
     };
-    buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ];
+    buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir nmcclain.ldap g2s gox ];
   };
 
   http2 = buildGoPackage rec {
@@ -1390,18 +1450,34 @@ let
     };
   };
 
-  ldap = buildGoPackage rec {
+  nmcclain.ldap = buildGoPackage rec {
     rev = "469fe5a802d61523b40dbb29bb8012a6b99b06b5";
     name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/nmcclain/ldap";
+
     src = fetchFromGitHub {
       inherit rev;
       owner  = "nmcclain";
       repo   = "ldap";
       sha256 = "0xq5dc03ym0wlg9mvf4gbrmj74l4c8bgkls8fd7c98a128qw2srk";
     };
+
+    propagatedBuildInputs = [ asn1-ber ];
+  };
+
+  vanackere.ldap = buildGoPackage rec {
+    rev = "e29b797d1abde6567ccb4ab56236e033cabf845a";
+    name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/vanackere/ldap";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "vanackere";
+      repo   = "ldap";
+      sha256 = "069n242wszl04z0cyrwfzpdf64ziw5c3ps4czrsdsx7h4msmvr1x";
+    };
+
     propagatedBuildInputs = [ asn1-ber ];
-    subPackages = [ "./" ];
   };
 
   liner = buildGoPackage rec {
@@ -1770,6 +1846,19 @@ let
     doCheck = false; # bad import path in tests
   };
 
+  pq = buildGoPackage rec {
+    rev = "93e9980741c9e593411b94e07d5bad8cfb4809db";
+    name = "pq-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/lib/pq";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "lib";
+      repo = "pq";
+      sha256 = "1q0zlizsk3xn7jn0skbvbhcxsfhq7z3dva96cm72n2r5vs5ld783";
+    };
+  };
+
   pretty = buildGoPackage rec {
     rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f";
     name = "pretty-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1938,6 +2027,19 @@ let
     };
   };
 
+  reflectwalk = buildGoPackage rec {
+    rev = "242be0c275dedfba00a616563e6db75ab8f279ec";
+    name = "reflectwalk-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/mitchellh/reflectwalk";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "mitchellh";
+      repo   = "reflectwalk";
+      sha256 = "0xjyjs7ci7yaslk0rcgdw99ys2kq0p14cx6c90pmdzl0m9pcc9v4";
+    };
+  };
+
   revel = buildGoPackage rec {
     rev = "v0.12.0";
     name = "revel-${rev}";
@@ -1969,6 +2071,21 @@ let
     };
   };
 
+  sandblast = buildGoPackage rec {
+    rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555";
+    name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/aarzilli/sandblast";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "aarzilli";
+      repo   = "sandblast";
+      sha256 = "1pj0bic3x89v44nr8ycqxwnafkiz3cr5kya4wfdfj5ldbs5xnq9l";
+    };
+
+    buildInputs = [ net text ];
+  };
+
   scada-client = buildGoPackage rec {
     rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae";
     name = "scada-client-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2177,10 +2294,10 @@ let
     ];
 
     buildInputs = [
-      armon.go-metrics go-radix mysql go-querystring aws-sdk-go errwrap
-      go-multierror go-syslog golang-lru hcl logutils pq cli copystructure
-      go-homedir mapstructure reflectwalk columnize go-zookeeper asn1-ber ldap
-      go-ini crypto net oauth2
+      armon.go-metrics go-radix mysql go-querystring hashicorp.aws-sdk-go
+      errwrap go-multierror go-syslog golang-lru hcl logutils pq cli
+      copystructure go-homedir mapstructure reflectwalk columnize go-zookeeper
+      asn1-ber vanackere.ldap go-ini crypto net oauth2 osext go-github
     ];
   };
 

From 609002cc94325b165991e566c904d8f27584d2f2 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Tue, 19 May 2015 14:52:52 +1200
Subject: [PATCH 1071/1143] Update tor-browser to 4.5.1

---
 pkgs/tools/security/tor/torbrowser.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 67d8b1105681..4ab0cabbcd31 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.5";
+  version = "4.5.1";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "15scfjzpbih7pzpqh4jd7jmc9g93sx2myfs6ykr70f5hbc7qhwmg" else
-      "0lrvhka3z9bh0snplsnxshs8i9iww187ipfn7f96hp5rxgl30p49";
+      "0nbjw04xbzb5d4q0j05nq9p8vdpzqxzhbywjxdgpc5mc73jyv8mr" else
+      "0fkzgdyxi7gl3kyfp0jmbky61a1b2yg9747h75bgkkndnqxnmkqw";
   };
 
   patchPhase = ''

From 76c34a9590585702c0bc75cf7f60499b6a682825 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 19 May 2015 10:43:06 +0200
Subject: [PATCH 1072/1143] prometheus/pushgateway: fix after
 golang_protobuf_extensions update

---
 pkgs/servers/monitoring/prometheus/pushgateway/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
index db66e963208e..c16cb7a9408e 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
@@ -37,6 +37,9 @@ buildGoPackage rec {
   (
     cd "go/src/$goPackagePath"
     go-bindata ./resources/
+    ${govers}/bin/govers -d -m github.com/matttproud/golang_protobuf_extensions/ext github.com/matttproud/golang_protobuf_extensions/pbutil
+    substituteInPlace handler/push.go \
+      --replace ext.ReadDelimited pbutil.ReadDelimited
   )
   '';
 

From 557c1401afee15975a4b7f896a7a98171570d259 Mon Sep 17 00:00:00 2001
From: Paulus Esterhazy <pesterhazy@gmail.com>
Date: Tue, 21 Apr 2015 12:25:09 +0200
Subject: [PATCH 1073/1143] Add unfree Oracle instant client and SQLPlus CLI
 utility.

---
 .../oracle-instantclient/default.nix          | 67 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/libraries/oracle-instantclient/default.nix

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
new file mode 100644
index 000000000000..ebb3aaeee582
--- /dev/null
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio }:
+
+let requireSource = version: part: hash: (requireFile rec {
+  name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm";
+  message = ''
+    This Nix expression requires that ${name} already
+    be part of the store. Download the file
+    manually at
+
+    http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
+
+    and add it to the Nix store with the following command:
+
+    nix-prefetch-url file://${name} ${hash} --type sha256
+'';
+  url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html";
+  sha256 = hash;
+}); in stdenv.mkDerivation rec {
+  version = "12.1.0.2.0-1";
+  name = "oracle-instantclient-${version}";
+
+  srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed");
+  srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296");
+  srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam");
+
+  buildInputs = [ glibc patchelf rpmextract ];
+
+  buildCommand = ''
+    mkdir -p "${name}"
+    cd "${name}"
+    ${rpmextract}/bin/rpmextract "${srcBase}"
+    ${rpmextract}/bin/rpmextract "${srcDevel}"
+    ${rpmextract}/bin/rpmextract "${srcSqlplus}"
+
+    mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"}
+    mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/"
+    mv "usr/include/oracle/12.1/client64/"* "$out/include/"
+    mv "usr/lib/oracle/12.1/client64/lib/"* "$out/lib/"
+    mv "usr/lib/oracle/12.1/client64/bin/"* "$out/bin/"
+    ln -s "$out/bin/sqlplus" "$out/bin/sqlplus64"
+
+    for lib in $out/lib/lib*.so; do
+      test -f $lib || continue
+      chmod +x $lib
+      patchelf --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
+               $lib
+    done
+
+    for exe in $out/bin/sqlplus; do
+      patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+               --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
+               $exe
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Oracle instant client libraries and sqlplus CLI.";
+    longDescription = ''
+      Oracle instant client provides access to Oracle databases (OCI,
+      OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus
+      command line SQL client.
+    '';
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pesterhazy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 201f6d59ac59..35d76ceb36ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -623,6 +623,8 @@ let
 
   pass = callPackage ../tools/security/pass { };
 
+  oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
+
   setfile = callPackage ../os-specific/darwin/setfile { };
 
   install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };

From 68bf202b6570e2b01e5c2b90449bb6559bbdda99 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 19 May 2015 13:26:23 +0200
Subject: [PATCH 1074/1143] easytag: use gnome defaultIconTheme

---
 pkgs/applications/audio/easytag/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix             | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index 2d738f55c286..cb1def12dfd0 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
 , libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas
-, makeWrapper, gnome_icon_theme, dconf
+, makeWrapper, gnome3
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram $out/bin/easytag \
       --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
-      --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
   '';
 
   NIX_LDFLAGS = "-lid3tag -lz";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
-    itstool libxml2 gsettings_desktop_schemas gnome_icon_theme dconf
+    itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35d76ceb36ab..60b175e93fc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11615,9 +11615,7 @@ let
     inherit (xlibs) libX11 xproto;
   };
 
-  easytag = callPackage ../applications/audio/easytag {
-    inherit (gnome3) gnome_icon_theme dconf;
-  };
+  easytag = callPackage ../applications/audio/easytag { };
 
   mp3gain = callPackage ../applications/audio/mp3gain { };
 

From 2274382be9fe6a79299e2637ec50db172619cabc Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 19 May 2015 13:37:44 +0200
Subject: [PATCH 1075/1143] gpodder: use gnome defaultIconTheme

---
 pkgs/applications/audio/gpodder/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index e8c14a9c763d..853cdff4a515 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,5 +1,5 @@
 { pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool,
-  ipodSupport ? true, libgpod, gnome3, hicolor_icon_theme }:
+  ipodSupport ? true, libgpod, gnome3 }:
 
 with pkgs.lib;
 
@@ -16,8 +16,7 @@ in buildPythonPackage rec {
 
   buildInputs = [
     coverage feedparser minimock sqlite3 mygpoclient intltool
-    gnome3.gnome_themes_standard gnome3.gnome_icon_theme
-    gnome3.gnome_icon_theme_symbolic hicolor_icon_theme
+    gnome3.gnome_themes_standard gnome3.defaultIconTheme
     gnome3.gsettings_desktop_schemas
   ];
 

From 1b6401fd2e5de0b89dd181d0602e67036ec72c37 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 19 May 2015 14:40:04 +0200
Subject: [PATCH 1076/1143] More usage of gnome3.defaultIconTheme

---
 pkgs/applications/audio/pavucontrol/default.nix               | 2 +-
 pkgs/applications/graphics/shotwell/default.nix               | 3 +--
 pkgs/applications/misc/finalterm/default.nix                  | 2 +-
 .../networking/instant-messengers/ekiga/default.nix           | 3 +--
 pkgs/applications/networking/newsreaders/liferea/default.nix  | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 8e4c31302e26..7e392679c712 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
-                  gnome3.gnome_icon_theme ];
+                  gnome3.defaultIconTheme ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 629126503c92..d438bb77b859 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -51,8 +51,7 @@ in stdenv.mkDerivation rec {
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2
                   libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
                   makeWrapper gnome_doc_utils
-                  gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-                  hicolor_icon_theme ];
+                  gnome3.defaultIconTheme ];
 
   meta = with stdenv.lib; {
     description = "Popular photo organizer for the GNOME desktop";
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index e4b0675aa945..bdd1a9e8e28e 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     wrapProgram "$out/bin/finalterm" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index cae9fe294f34..7ce47d53d141 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
                   perl perlXMLParser evolution_data_server gnome_doc_utils avahi
                   libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite
-                  gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic
-                  hicolor_icon_theme gnome3.gnome_icon_theme boost
+                  gnome3.libsoup glib gnome3.defaultIconTheme boost
                   autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
                   nss zlib libsecret libXrandr randrproto which libxslt libtasn1
                   gmp nettle makeWrapper ];
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 904f69049798..26078c8e5830 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas
     gnome3.libpeas gnome3.dconf
     gst-plugins-base gst-plugins-good gst-plugins-bad
-    gnome3.libgnome_keyring
+    gnome3.libgnome_keyring gnome3.defaultIconTheme
     libnotify
     makeWrapper
   ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
         --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 

From 9adde87feae51574d0317cb6a9e0e60a40388466 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 19 May 2015 14:44:27 +0200
Subject: [PATCH 1077/1143] More usage of gnome3.defaultIconTheme

---
 pkgs/applications/video/pitivi/default.nix     | 2 +-
 pkgs/development/tools/misc/d-feet/default.nix | 2 +-
 pkgs/misc/emulators/cdemu/analyzer.nix         | 3 ++-
 pkgs/misc/emulators/cdemu/gui.nix              | 3 ++-
 pkgs/tools/audio/gvolicon/default.nix          | 4 ++--
 pkgs/tools/audio/pasystray/default.nix         | 9 ++++++---
 pkgs/tools/networking/gupnp-tools/default.nix  | 7 ++++---
 pkgs/top-level/all-packages.nix                | 4 +---
 8 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 5b77ec916b08..743df2647f1a 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop
-    hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
+    gnome3.defaultIconTheme
     gnome3.gsettings_desktop_schemas libnotify
   ] ++ (with gst; [
     gstreamer gst-python gst-editing-services
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index 5afe5525d0e2..df26db519dcd 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libxml2 itstool intltool glib gtk3 pep8 python
-    gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
+    gnome3.defaultIconTheme
     makeWrapper pygobject3 libwnck3
   ];
 
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index 6126108b642d..c9651fd06145 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -5,7 +5,8 @@ let pkg = import ./base.nix {
   pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v";
 };
 in callPackage pkg {
-  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ];
+  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
+                  gnome3.defaultIconTheme gdk_pixbuf librsvg ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/image-analyzer \
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index b3d7f6d23ec7..226031a2eb75 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -5,7 +5,8 @@ let pkg = import ./base.nix {
   pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk";
 };
 in callPackage pkg {
-  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ];
+  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
+                  gnome3.defaultIconTheme gdk_pixbuf librsvg ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/gcdemu \
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 6bcddfa72f1b..d885a6ac902e 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, hicolor_icon_theme, gdk_pixbuf, librsvg }:
+{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation {
   name = "gvolicon";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ];
-  propagatedBuildInputs = [ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gdk_pixbuf librsvg ];
+  propagatedBuildInputs = [ gnome3.defaultIconTheme gdk_pixbuf librsvg ];
   installPhase = ''
     make install PREFIX=$out
     wrapProgram "$out/bin/gvolicon" \
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 42a2c9c3a12c..0a378dbe36b8 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}:
+{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig
+, avahi, gtk3, libnotify, pulseaudio, x11}:
 
 stdenv.mkDerivation rec {
   name = "pasystray-0.4.0";
@@ -8,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w";
   };
 
-  buildInputs = [ unzip autoconf automake makeWrapper pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ];
+  buildInputs = [ unzip autoconf automake makeWrapper pkgconfig 
+                  gnome3.defaultIconTheme
+                  avahi gtk3 libnotify pulseaudio x11 ];
 
   preConfigure = ''
     aclocal
@@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/pasystray" \
-      --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index 54f3e860e0c7..d0f2ef546691 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
   };
 
-  buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper];
+  buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av 
+                 gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper];
 
   postInstall = ''
-    wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
-    wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
+    wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
+    wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
   '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60b175e93fc8..10143e76d5d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2208,9 +2208,7 @@ let
 
   pa_applet = callPackage ../tools/audio/pa-applet { };
 
-  pasystray = callPackage ../tools/audio/pasystray {
-    inherit (gnome3) gnome_icon_theme;
-  };
+  pasystray = callPackage ../tools/audio/pasystray { };
 
   pnmixer = callPackage ../tools/audio/pnmixer { };
 

From 22f957dad28ba7df6a32c56f8189662c67106acc Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 19 May 2015 14:45:00 +0200
Subject: [PATCH 1078/1143] Drop gnome_icon_theme* from gnome3

---
 pkgs/desktops/gnome-3/3.16/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 6243b2dd6d40..15f4a210e04a 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -37,10 +37,6 @@ rec {
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
 
-# Backward compatibility, must be removed in favor of defaultIconTheme
-  gnome_icon_theme = adwaita-icon-theme;
-  gnome_icon_theme_symbolic = adwaita-icon-theme;
-
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
   adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };

From 10f49c84dd23339ac8b7707db3e27d4c5c915338 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 19 May 2015 14:46:45 +0200
Subject: [PATCH 1079/1143] Remove last reference to gnome3.gnome_icon_theme

---
 pkgs/applications/office/gnumeric/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index e82ce2d7b9ed..14e130ba1ffc 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
-, goffice, makeWrapper, gtk3, gnome_icon_theme, gnome3
+, gnome3, makeWrapper, gtk3
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # ToDo: optional libgda, python, introspection?
   buildInputs = [
     pkgconfig intltool perl perlXMLParser
-    goffice gtk3 makeWrapper
+    gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme
   ];
 
   preFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10143e76d5d9..d582114946cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11114,9 +11114,7 @@ let
     inherit (gnome) GConf;
   };
 
-  gnumeric = callPackage ../applications/office/gnumeric {
-    inherit (gnome3) goffice gnome_icon_theme;
-  };
+  gnumeric = callPackage ../applications/office/gnumeric { };
 
   gnunet = callPackage ../applications/networking/p2p/gnunet { };
 

From 8f648b2d14db39b73d31d23d4fcbc54eb6f9d0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 19 May 2015 15:25:52 +0200
Subject: [PATCH 1080/1143] rbtools: 0.7.1 -> 0.7.2

---
 pkgs/development/python-modules/rbtools/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index 889f3df52aef..b63750815513 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -1,13 +1,17 @@
 { stdenv, fetchurl, pythonPackages, python }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "rbtools-0.7.1";
+  name = "rbtools-0.7.2";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.1.tar.gz";
-    sha256 = "0axi4jf19ia2jwrs3b0xni7v317v03wj35richi111cm3pw6p2gb";
+    url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz";
+    sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i";
   };
 
   propagatedBuildInputs = [ python.modules.sqlite3 pythonPackages.six ];
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
+  };
 }

From cae7278fae3e9988d42b98e46c98702fea8e61df Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 19 May 2015 14:25:28 +0000
Subject: [PATCH 1081/1143] titaniumsdk: upgrade 3.5.0 to 3.5.1

---
 pkgs/development/mobile/titaniumenv/default.nix      |  4 ++--
 .../mobile/titaniumenv/examples/default.nix          |  2 +-
 .../mobile/titaniumenv/titaniumsdk-3.5.nix           | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 14ef4c20047e..cc3f607c0c32 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.0.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.1.GA"}:
 
 let
   # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
@@ -33,7 +33,7 @@ rec {
       else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix
       else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix
       else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix
-      else if tiVersion == "3.5.0.GA" then ./titaniumsdk-3.5.nix
+      else if tiVersion == "3.5.1.GA" then ./titaniumsdk-3.5.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 487f93052f2f..13345f5dedd6 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -2,7 +2,7 @@
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
 , xcodeVersion ? "6.1.1"
 , xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "3.5.0.GA"
+, tiVersion ? "3.5.1.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.1", iosWwdrCertificate ? null
 , allowUnfree ? false
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
index 8a868321e136..f9c5ce8812f3 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
 
 stdenv.mkDerivation {
-  name = "mobilesdk-3.5.0.GA";
+  name = "mobilesdk-3.5.1.GA";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-linux.zip;
-    sha1 = "c9850d5db29d8fb0c26b114e8c34bb2c91958eed";
+    url = http://builds.appcelerator.com/mobile/3.5.1/mobilesdk-3.5.1.GA-linux.zip;
+    sha1 = "2fd8c50081af9d03b65ffaf824e2e417832efd92";
   }
   else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-osx.zip;
-    sha1 = "a5ce74f13da09215b7efa81d626c6e6e83d6dc3b";
+    url = http://builds.appcelerator.com/mobile/3.5.1/mobilesdk-3.5.1.GA-osx.zip;
+    sha1 = "f000e66980c2c3a40b6a6fd40a0bd0554fcb0424";
   }
   else throw "Platform: ${stdenv.system} not supported!";
   
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     
     # Rename ugly version number
     cd mobilesdk/*
-    cd 3.5.0.GA
+    cd 3.5.1.GA
     
     # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
     # Yes, I know it's nasty :-)

From 3e35ea305f69fab6e139772340b71f8e5f8ddc1d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 May 2015 16:10:07 +0300
Subject: [PATCH 1082/1143] postgresql-backup: cleanup

---
 nixos/modules/services/backup/postgresql-backup.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index c4127543f10d..4a5ebebc682e 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -3,9 +3,9 @@
 with lib;
 
 let
-  inherit (pkgs) postgresql gzip;
+  inherit (pkgs) gzip;
 
-  location = config.services.postgresqlBackup.location ;
+  location = config.services.postgresqlBackup.location;
 
   postgresqlBackupCron = db:
     ''

From e697219d3d5eae7718eceb5e30bda6765a5b170d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 19 May 2015 18:22:12 +0200
Subject: [PATCH 1083/1143] openjdk8: work around gnupatch latest feature of
 not following symlinks, even when --follow-symlinks is specified.

---
 .../compilers/openjdk/fix-java-home-jdk8.patch    | 15 +++++++++++++++
 pkgs/development/compilers/openjdk/openjdk8.nix   | 11 ++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch

diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch
new file mode 100644
index 000000000000..6189412c999c
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch
@@ -0,0 +1,15 @@
+--- a/hotspot/src/os/linux/vm/os_linux.cpp  2015-02-04 21:14:39.000000000 +0100
++++ b/hotspot/src/os/linux/vm/os_linux.cpp  2015-05-19 16:17:29.960107613 +0200
+@@ -2304,10 +2304,8 @@
+   assert(ret, "cannot locate libjvm");
+   char *rp = NULL;
+   if (ret && dli_fname[0] != '\0') {
+-    rp = realpath(dli_fname, buf);
++    snprintf(buf, buflen, "%s", dli_fname);
+   }
+-  if (rp == NULL)
+-    return;
+
+   if (Arguments::created_by_gamma_launcher()) {
+     // Support for the gamma launcher.  Typical value for buf is
+
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index 44e934741635..b26baef88590 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -50,11 +50,16 @@ let
   '';
   prePatch = ''
     # despite --with-override-jdk the build still searchs here
-    ln -s "../jdk-${repover}" "jdk";
-    ln -s "../hotspot-${repover}" "hotspot";
+    # GNU Patch bug, follow symlinks only follow the last symlink..
+    mv "../jdk-${repover}" "jdk";
+    mv "../hotspot-${repover}" "hotspot";
+  '';
+  postPatch = ''
+    mv jdk "../jdk-${repover}";
+    mv hotspot "../hotspot-${repover}";
   '';
   patches = [
-    ./fix-java-home.patch
+    ./fix-java-home-jdk8.patch
     ./read-truststore-from-env-jdk8.patch
     ./currency-date-range-jdk8.patch
   ];

From b84f3e85d9921c7ebc9e9526cafcd84077d396ad Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 19 May 2015 08:11:42 -0500
Subject: [PATCH 1084/1143] Fix QGtkStyle for Qt 5 versions

---
 pkgs/development/libraries/qt-5/5.3/default.nix | 4 +++-
 pkgs/development/libraries/qt-5/5.4/qtbase.nix  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 55de4265d3ee..907cec49020c 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -119,6 +119,7 @@ stdenv.mkDerivation rec {
     -xcb
     -qpa xcb
     -${optionalString (cups == null) "no-"}cups
+    -${optionalString (!gtkStyle) "no-"}gtkstyle
 
     -no-eglfs
     -no-directfb
@@ -155,7 +156,8 @@ stdenv.mkDerivation rec {
   ++ optionals mesaSupported [ mesa mesa_glu ]
   ++ optional (cups != null) cups
   ++ optional (mysql != null) mysql.lib
-  ++ optional (postgresql != null) postgresql;
+  ++ optional (postgresql != null) postgresql
+  ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   buildInputs = [ gdb bison flex gperf ruby ];
 
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 746889f279d7..9e11dcdde868 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -115,6 +115,7 @@ stdenv.mkDerivation {
     -xcb
     -qpa xcb
     -${optionalString (cups == null) "no-"}cups
+    -${optionalString (!gtkStyle) "no-"}gtkstyle
 
     -no-eglfs
     -no-directfb
@@ -150,7 +151,8 @@ stdenv.mkDerivation {
   ++ optionals mesaSupported [ mesa mesa_glu ]
   ++ optional (cups != null) cups
   ++ optional (mysql != null) mysql.lib
-  ++ optional (postgresql != null) postgresql;
+  ++ optional (postgresql != null) postgresql
+  ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   buildInputs = [ gdb bison flex gperf ruby ];
 

From 24be3cfcff6d1014e03a902b020675edc1d66d44 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Tue, 19 May 2015 00:42:09 -0700
Subject: [PATCH 1085/1143] ghc: add Darwin patch for #10322

---
 pkgs/development/compilers/ghc/7.10.1.nix     |  3 +
 .../compilers/ghc/osx-dylib-resolver.patch    | 60 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/osx-dylib-resolver.patch

diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix
index 4eb4a501e4e3..34c2e3b36b0c 100644
--- a/pkgs/development/compilers/ghc/7.10.1.nix
+++ b/pkgs/development/compilers/ghc/7.10.1.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation rec {
       url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984";
       sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w";
     })
+    # Fix TH + indirect symbol resolution on OSX (or any system using gold linker)
+    # https://phabricator.haskell.org/D852
+    ./osx-dylib-resolver.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/compilers/ghc/osx-dylib-resolver.patch b/pkgs/development/compilers/ghc/osx-dylib-resolver.patch
new file mode 100644
index 000000000000..50236026031e
--- /dev/null
+++ b/pkgs/development/compilers/ghc/osx-dylib-resolver.patch
@@ -0,0 +1,60 @@
+diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs
+--- a/compiler/ghci/Linker.hs
++++ b/compiler/ghci/Linker.hs
+@@ -119,9 +119,9 @@
+         -- that is really important
+         pkgs_loaded :: ![PackageKey],
+ 
+-        -- we need to remember the name of the last temporary DLL/.so
+-        -- so we can link it
+-        last_temp_so :: !(Maybe (FilePath, String)) }
++        -- we need to remember the name of previous temporary DLL/.so
++        -- libraries so we can link them (see #10322)
++        temp_sos :: ![(FilePath, String)] }
+ 
+ 
+ emptyPLS :: DynFlags -> PersistentLinkerState
+@@ -131,7 +131,7 @@
+                         pkgs_loaded = init_pkgs,
+                         bcos_loaded = [],
+                         objs_loaded = [],
+-                        last_temp_so = Nothing }
++                        temp_sos = [] }
+ 
+   -- Packages that don't need loading, because the compiler
+   -- shares them with the interpreted program.
+@@ -841,19 +841,19 @@
+         dflags2 = dflags1 {
+                       -- We don't want the original ldInputs in
+                       -- (they're already linked in), but we do want
+-                      -- to link against the previous dynLoadObjs
+-                      -- library if there was one, so that the linker
++                      -- to link against previous dynLoadObjs
++                      -- libraries if there were any, so that the linker
+                       -- can resolve dependencies when it loads this
+                       -- library.
+                       ldInputs =
+-                        case last_temp_so pls of
+-                          Nothing -> []
+-                          Just (lp, l)  ->
++                        concatMap
++                            (\(lp, l) ->
+                                  [ Option ("-L" ++ lp)
+                                  , Option ("-Wl,-rpath")
+                                  , Option ("-Wl," ++ lp)
+                                  , Option ("-l" ++  l)
+-                                 ],
++                                 ])
++                            (temp_sos pls),
+                       -- Even if we're e.g. profiling, we still want
+                       -- the vanilla dynamic libraries, so we set the
+                       -- ways / build tag to be just WayDyn.
+@@ -868,7 +868,7 @@
+     consIORef (filesToNotIntermediateClean dflags) soFile
+     m <- loadDLL soFile
+     case m of
+-        Nothing -> return pls { last_temp_so = Just (libPath, libName) }
++        Nothing -> return pls { temp_sos = (libPath, libName) : temp_sos pls }
+         Just err -> panic ("Loading temp shared object failed: " ++ err)
+ 
+ rmDupLinkables :: [Linkable]    -- Already loaded

From e2cc63424f39b7166554fc388e6e1f8732b422b6 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 19 May 2015 03:30:48 +0200
Subject: [PATCH 1086/1143] rustRegistry: 2015-05-13 -> 2015-05-19

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index a408ae9e36ca..0de95d59c8e4 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-05-13";
-  rev = "8d879d4e998db3c1fad106503638d318e10fdba6";
+  version = "2015-05-19";
+  rev = "6280837d21e5a241d961daf968f5379e6e2e392f";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "1100vcgxy3ddl1ih3ljd3nig4a2k44ajhawsql1lmcj9783aykav";
+      sha256 = "1y5zhpd9l0zsknjnhk1ris45y5jka6d6fklzwwhss39h48vymf91";
   };
 
 in

From de322b48b7006cf72d6adc37a833f2e045950536 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 19 May 2015 17:30:19 +0200
Subject: [PATCH 1087/1143] cargo: Fix src hash

It seems that when you pass `leaveDotGit = true` to `fetchgit`, sometimes
the output can still change (i.e. it's not completely deterministic).

This could be due to changes in the upstream git repository...
---
 pkgs/development/tools/build-managers/cargo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index f7dd77a12a71..3ac6e1c3e94c 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -11,7 +11,7 @@ buildRustPackage rec {
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo.git";
     rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c";
-    sha256 = "1hvsxjv9s30qylcq2vb2nqqn8fix4sk0ah718f8c0flrcqbwa58z";
+    sha256 = "0sppd3x2cacmbnypcjip44amnh66lrrbwwzsbz8rqf3nq2ah496x";
     leaveDotGit = true;
   };
 

From 9b752fd0e15df7a4f3d4f94f16883088614a70b7 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 19 May 2015 18:21:11 +0200
Subject: [PATCH 1088/1143] buildRustPackage: Don't hardcode registry index
 hash

Instead, discover it automatically when building the package.

This makes `buildRustPackage` more future-proof with respect to changes
in how `cargo` generates the hash.

Also, it fixes broken builds in i686 because apparently, cargo generates
a different registry index hash in this architecture (compared to
x86-64).
---
 pkgs/build-support/rust/default.nix           | 32 ++++++++++++-------
 pkgs/build-support/rust/fetch-cargo-deps      |  7 ++--
 .../tools/build-managers/cargo/default.nix    |  2 +-
 pkgs/development/tools/rust/racer/default.nix |  2 +-
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index ddf2fce3cae5..87115e392daf 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -11,14 +11,6 @@ let
     sha256 = depsSha256;
   };
 
-  # The following is the directory name cargo creates when the registry index
-  # URL is file:///dev/null
-  #
-  # It's OK to use /dev/null as the URL because by the time we do this, cargo
-  # won't attempt to update the registry anymore, so the URL is more or less
-  # irrelevant
-  registryIndexDirName = "-ba82b75dd6681d6f";
-
 in stdenv.mkDerivation (args // {
   inherit cargoDeps rustRegistry;
 
@@ -34,18 +26,34 @@ in stdenv.mkDerivation (args // {
     cp -r "$cargoDeps" deps
     chmod +w deps -R
 
+    # It's OK to use /dev/null as the URL because by the time we do this, cargo
+    # won't attempt to update the registry anymore, so the URL is more or less
+    # irrelevant
+
     cat <<EOF > deps/config
     [registry]
     index = "file:///dev/null"
     EOF
 
-    echo "Using rust registry from $rustRegistry"
-
-    ln -s "$rustRegistry" "deps/registry/index/${registryIndexDirName}"
-
     export CARGO_HOME="$(realpath deps)"
 
+    # Let's find out which $indexHash cargo uses for file:///dev/null
+    (cd $sourceRoot && cargo fetch &>/dev/null)
+    cd deps
+    indexHash="$(basename $(echo registry/index/*))"
+
+    echo "Using indexHash '$indexHash'"
+
+    rm -rf -- "registry/cache/$indexHash" \
+              "registry/index/$indexHash"
+
+    mv registry/cache/HASH "registry/cache/$indexHash"
+
+    echo "Using rust registry from $rustRegistry"
+    ln -s "$rustRegistry" "registry/index/$indexHash"
+
     # Retrieved the Cargo.lock file which we saved during the fetch
+    cd ..
     mv deps/Cargo.lock $sourceRoot/
 
     (
diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index c7799fb1b1f6..69eb404e6445 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -104,12 +104,9 @@ substituteInPlace Cargo.lock \
 set -u
 mv Cargo.lock $out/
 
-# The following is the $indexHash cargo uses for the registry index when
-# its URL is file:///dev/null, which is the registry index URL we use to make
-# sure our output is deterministic.
 
-registryIndexDirName="-ba82b75dd6681d6f"
-mv $out/registry/cache/* $out/registry/cache/$registryIndexDirName
+# Let's replace $indexHash with something more deterministic
+mv $out/registry/cache/* $out/registry/cache/HASH
 
 # The registry index changes all the time, so it's not deterministic
 # We'll symlink it before running 'cargo build'
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 3ac6e1c3e94c..e7a45f1c3484 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -15,7 +15,7 @@ buildRustPackage rec {
     leaveDotGit = true;
   };
 
-  depsSha256 = "0s9f00kg7q9dxd8g98k3z4qv404p9ra73l1bzxs6qzk54qhg44dp";
+  depsSha256 = "1b0mpdxmp7inkg59n2phjwzpz5gx22wqg9rfd1s01a5ylara37jw";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 61fe2238a779..0b614f4edc61 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -11,7 +11,7 @@ buildRustPackage rec {
     sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7";
   };
 
-  depsSha256 = "1wmpd2cjmk59382dq59hmb0xa6fxbnmmaz4nfs96qf613r5ylvra";
+  depsSha256 = "0s951apqcr96lvc1jamk6qw3631gwnlnfgcx55vlznfm7shnmywn";
 
   buildInputs = [ makeWrapper ];
 

From 2817e74d3743f9a5b85bd8f88eca7baa2a588246 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 19 May 2015 18:38:51 +0200
Subject: [PATCH 1089/1143] cargo: Add myself to maintainers

---
 pkgs/development/tools/build-managers/cargo/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
index 84158e65a4d8..94b9ca1f6655 100644
--- a/pkgs/development/tools/build-managers/cargo/common.nix
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -26,6 +26,7 @@
   meta = with stdenv.lib; {
     homepage = http://crates.io;
     description = "Downloads your Rust project's dependencies and builds your project";
+    maintainers = with maintainers; [ wizeman ];
     license = [ licenses.mit licenses.asl20 ];
     platforms = platforms.linux;
   };

From 0cb3c2d684e614b487ec9aae2c7690d995713848 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 19 May 2015 19:20:13 +0200
Subject: [PATCH 1090/1143] grsecurity: Update stable and test patches

stable: 3.1-3.14.43-201505171736 -> 3.1-3.14.43-201505181929
test:   3.1-4.0.4-201505171737   -> 3.1-4.0.4-201505182014
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 8e24763b1690..4eda63423ed3 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.43";
-      revision  = "201505171736";
+      revision  = "201505181929";
       branch    = "stable";
-      sha256    = "1c3wjccinm8aqnqn6dr0rlmff2p4dwc4m383cs8bi9lfj5s1fyzn";
+      sha256    = "1ay5qkji09xibaqxnsrcxnnys4n5blxfa2jw9k6f5vzpfdv3mvqm";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "4.0.4";
-      revision  = "201505171737";
+      revision  = "201505182014";
       branch    = "test";
-      sha256    = "140c3qbv64q658vw9d4912rv0mjch217zkyz1qi9xn6bn1z5kvl5";
+      sha256    = "1l1s00zbyzr53p46yj6yh75dbayg9kigv5r6g9mr5irfs5p8s2ay";
     };
 
   grsec_fix_path =

From 10e001ab5b8e8d8c4390334b62a874df93280f8d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 19 May 2015 19:39:09 +0200
Subject: [PATCH 1091/1143] ocrad: update from 0.24 to 0.25

---
 pkgs/applications/graphics/ocrad/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix
index b4becafdb0b4..3ec25b503ebf 100644
--- a/pkgs/applications/graphics/ocrad/default.nix
+++ b/pkgs/applications/graphics/ocrad/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, lzip, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "ocrad-0.24";
+  name = "ocrad-0.25";
 
   src = fetchurl {
     url = "mirror://gnu/ocrad/${name}.tar.lz";
-    sha256 = "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv";
+    sha256 = "1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477";
   };
 
   buildInputs = [ lzip texinfo ];
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Optical character recognition (OCR) program & library";
-
     longDescription =
       '' GNU Ocrad is an OCR (Optical Character Recognition) program based on
          a feature extraction method.  It reads images in pbm (bitmap), pgm
@@ -29,7 +28,6 @@ stdenv.mkDerivation rec {
       '';
 
     license = licenses.gpl3Plus;
-
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.gnu;  # arbitrary choice
   };

From 2c8872f19186c45f18e4f8a0f254c28b309d3b62 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 19 May 2015 19:50:14 +0200
Subject: [PATCH 1092/1143] gtk-doc: update from 1.21 to 1.23

---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index e1f7f19dd56f..58c8214bd462 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtk-doc-${version}";
-  version = "1.21";
+  version = "1.23";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz";
-    sha256 = "0gpfh25qxsic7n25pfl74mjp38hdm3pr4islhlaxv3p05q0lv4sx";
+    sha256 = "1i0q0zaj3f2xg478nxyfhaivkhi6mj0dn0s6qzshzhb625qj6p0b";
   };
 
   # maybe there is a better way to pass the needed dtd and xsl files

From 7761b0454dfdded85437da9a164956d56cb46822 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 19 May 2015 20:04:26 +0200
Subject: [PATCH 1093/1143] rddtool: update from 1.4.9 to 1.5.3

---
 pkgs/tools/misc/rrdtool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 53c1b0de24e2..1688c2d329f3 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff }:
 
 stdenv.mkDerivation rec {
-  name = "rrdtool-1.4.9";
+  name = "rrdtool-1.5.3";
   src = fetchurl {
     url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
-    sha256 = "1k1506v86nijd9vdljib93z4hrwj786kqnx37lqqbbqasvh2ca1y";
+    sha256 = "17qjqq7k50xfahza1gkcfchzss2jjmgr422dzs4kx13lrzsv5rvr";
   };
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ];
   

From b28d29ba0b83eedf5b245ea979fe857a3c3c1d1b Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 19 May 2015 21:08:16 +0300
Subject: [PATCH 1094/1143] fix missing argument

---
 pkgs/tools/audio/pasystray/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 0a378dbe36b8..bbe99eaccbe4 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig
-, avahi, gtk3, libnotify, pulseaudio, x11}:
+, gnome3, avahi, gtk3, libnotify, pulseaudio, x11}:
 
 stdenv.mkDerivation rec {
   name = "pasystray-0.4.0";

From d811c6cf41f45e15262b22fa3de04aa10c3e7b3e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 19 May 2015 20:30:49 +0200
Subject: [PATCH 1095/1143] skydns: fixed typo

---
 pkgs/servers/dns/skydns/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix
index 6536ad972b74..ba311918c71e 100644
--- a/pkgs/servers/dns/skydns/default.nix
+++ b/pkgs/servers/dns/skydns/default.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
     sha256 = "1bnc9r22kwvmn1bgz7zaidkjqm7pmw99bn5n87r76vcrd7n2a9pd";
   };
 
-  buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb-go go-systemd go-log dns stathat osext etcd ];
+  buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ];
   dontInstallSrc = true;
 
   subPackages = [ "." ];

From 2286e2ef8f75cdbbc2c126b4569510d9e8c25a7d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 19 May 2015 21:46:12 +0200
Subject: [PATCH 1096/1143] http-parser: update from 2.3 to 2.5.0

closes #7709
---
 pkgs/development/libraries/http-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 9d5b11501fc1..e7247332059f 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }:
 
 let
-  version = "2.3";
+  version = "2.5.0";
 in stdenv.mkDerivation {
   name = "http-parser-${version}";
 
   src = fetchurl {
     url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";
-    sha256 = "1qnm466wp8zncr8na4xj2wndfzzfiahafhsaigj8cv35nx56pziv";
+    sha256 = "108lh05pl4i5w7hmkw07k9wklk5pbh705pw1qyz5zvp6yicbmd73";
   };
 
   patches = [ ./build-shared.patch ];

From 65f1e8e048db75be3e97048fecb99ed39b0ce2e5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 19 May 2015 22:06:12 +0200
Subject: [PATCH 1097/1143] ploticus: update from 2.41 to 2.42

---
 pkgs/tools/graphics/ploticus/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix
index 92dce64dcfd4..2619387df8b8 100644
--- a/pkgs/tools/graphics/ploticus/default.nix
+++ b/pkgs/tools/graphics/ploticus/default.nix
@@ -1,29 +1,28 @@
 {stdenv, fetchurl, zlib, libX11, libpng}:
 
 stdenv.mkDerivation {
-  name = "ploticus-2.41";
+  name = "ploticus-2.42";
 
   builder = ./builder.sh;
   src = fetchurl {
     url = mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz;
-    sha256 = "ecccb6afcf0008d5b31da2e9e74c448564101eb7b9bbde758a3dca1f2dc8c580";
+    sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c";
   };
 
-  buildInputs = [zlib libX11 libpng];
+  buildInputs = [ zlib libX11 libpng ];
 
-  patches = [./ploticus-install.patch];
+  patches = [ ./ploticus-install.patch ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A non-interactive software package for producing plots and charts";
-
     longDescription = ''Ploticus is a free, GPL'd, non-interactive
       software package for producing plots, charts, and graphics from
       data.  Ploticus is good for automated or just-in-time graph
       generation, handles date and time data nicely, and has basic
       statistical capabilities.  It allows significant user control
       over colors, styles, options and details.'';
-
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ pSub ];
     homepage = http://ploticus.sourceforge.net/;
   };
 }

From 69d1f7630cb01c63095d123ba000f657af3f0dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 19 May 2015 22:43:36 +0200
Subject: [PATCH 1098/1143] openjdk8: 40b25 -> 40b27

---
 .../development/compilers/openjdk/openjdk8.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index b26baef88590..95248dac76af 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -1,41 +1,41 @@
 { stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl, liberation_ttf, fontconfig } :
 let
   update = "40";
-  build = "25";
+  build = "27";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u40";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "05s5j0rq45n8piymv9c1n0hxr4bk3j8lz6fw2wbp0m8kam6zzpza";
+             sha256 = "0ra05jngvvy2g1da5b9anrp86m812g2wlkxpijc82kxv6c3h6g28";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "0p1z38szm63cf5f83697awbqwpf7b8q1ymrqc0v6r9hb5yf0p22r";
+             sha256 = "0r9zdq13kgqqm8rgr36qf03h23psxcwzvdqffsncd4jvbfap3n5f";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "0sl0ima3zlbd1ai7qrg4msy5ibg64qpwdrv7z4l8cpalwby26y6p";
+             sha256 = "07v3z38v5fdsx3g28c4pkdq76cdmnc4qflf1wb3lz46lhy230hkd";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "1ahvhap8av519813yf20v3hbvg82j9bq3gnqlayng1qggfivsb5s";
+             sha256 = "0y20468f2yi14lijbd732f2mlgrn718pyfji3279l2rm4ad7r7pl";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "0n86fcy1z4z22jcgfnn9agzfi949709hn2x6s8wyhwwa055rjd1a";
+             sha256 = "1sgfxmkq6z3vj9yq9kszr42b1ijvsknlss353jpcmyr1lljhyvfg";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "0hp19hq0dw3j8zz4mxd6bjk9zqlyr56fhwzgjwmm56b6pwkcmsn7";
+             sha256 = "08p3657d0871pz0g5fg157az9q38r5h2zs49dm7512sc9qrn5c06";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "037za0hjiwvzvbzsckfxnrrbak1vbd52pmrnd855vxkik08jxp8c";
+             sha256 = "1f1vlrvlvnjbyh8d168smizvmkcm076zc496sxk6njqamby16ip2";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2";
+             sha256 = "1llf3l4483kd8m1a77n7y9fgvm6fa63nim3qhp5z4gnw68ldbhra";
           };
   openjdk8 = stdenv.mkDerivation {
   name = "openjdk-8u${update}b${build}";

From 7c9d5eeee528ae64cba72b64bc63867749c5750f Mon Sep 17 00:00:00 2001
From: Daniel Pfile <daniel@pfile.net>
Date: Tue, 19 May 2015 16:27:25 -0500
Subject: [PATCH 1099/1143] Upgrade Ansible to 1.9.1

---
 pkgs/tools/system/ansible/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix
index 284f6cbb3d28..374528872e8e 100644
--- a/pkgs/tools/system/ansible/default.nix
+++ b/pkgs/tools/system/ansible/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pythonPackages, python }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "1.8.4";
+  version = "1.9.1";
   name = "ansible-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz";
-    sha256 = "1hcy4f6l9c23aa05yi4mr0zbqp0c6v5zq4c3dim076yfmfrh8z6k";
+    sha256 = "a6f975d565723765a4d490ff40cede96833a745f38908def4950a0075f1973f5";
   };
 
   prePatch = ''

From e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 20 May 2015 01:55:05 +0200
Subject: [PATCH 1100/1143] openjdk8: readd symlinks and remove useless
 makeflags

---
 pkgs/development/compilers/openjdk/openjdk8.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index 95248dac76af..63d42e6e3d64 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -50,13 +50,16 @@ let
   '';
   prePatch = ''
     # despite --with-override-jdk the build still searchs here
-    # GNU Patch bug, follow symlinks only follow the last symlink..
+    # GNU Patch bug, --follow-symlinks only follow the last dir part symlink
     mv "../jdk-${repover}" "jdk";
     mv "../hotspot-${repover}" "hotspot";
   '';
   postPatch = ''
     mv jdk "../jdk-${repover}";
     mv hotspot "../hotspot-${repover}";
+    # Patching is over, lets re-add the links
+    ln -s "../jdk-${repover}" "jdk"
+    ln -s "../hotspot-${repover}" "hotspot"
   '';
   patches = [
     ./fix-java-home-jdk8.patch
@@ -83,7 +86,7 @@ let
     "--with-milestone=fcs"
   ];
   NIX_LDFLAGS= "-lfontconfig";
-  buildFlags = "DEBUG_BINARIES=true all";
+  buildFlags = "all";
   installPhase = ''
     mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
 

From bd7eb18c1cff59b41af1c30598481bb8e201482d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 20 May 2015 01:56:48 +0200
Subject: [PATCH 1101/1143] idea.clion: 1.0.1 -> 1.0.2

---
 pkgs/applications/editors/idea/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 5ca5e7dd093f..c09d1447621b 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -225,13 +225,13 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "1.0.1";
-    build = "141.870";
+    version = "1.0.2";
+    build = "141.871";
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
-      sha256 = "17hdna6w7y9n3vqncqifw7jvys3rydgg0mz97nzax817fl4kjf1r";
+      sha256 = "1b9lsgl71pbcr5br0vkr2gn09b98dl9ykdxlqwzqpwnv7ckqcb69";
     };
   };
 

From 3705c62266dd0cbb10d9e7896af1bcc52b8f1791 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 20 May 2015 09:33:30 +0900
Subject: [PATCH 1102/1143] thunderbird-bin: update to version 31.7.0

---
 .../mailreaders/thunderbird-bin/sources.nix   | 222 +++++++++---------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 991f8cbd53bd..8dce20f60dab 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,117 +4,117 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "31.6.0";
+  version = "31.7.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "4c0c50d5c315f438d09b8bf2ba821c7148552076"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "d0361df60873c787ebcb487acb65e9e4e7bf6c97"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "84e0ab9f62afbf1c673383a6c6c0d07ce369b360"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "b590ca477b00dd2080a887ee4451d06d59da5e6c"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "06812c96cbd62c07180062fca293171cf4177d77"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "1cf6501aa77adfa41ad48316f471201f2c2e1976"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "322654ebdf12a9d60738e0a5f30dfde77e095951"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "00fa9855d81a59f7340d69ef25389503b3374c5b"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "efd6f1afc8787295071f1577e043fe8ed4824604"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0163078b1edc17b3df86d9d80d2dcf1b14e289c5"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "1051e4faa171ea762dd0d4c79d1f7b6d59fa1343"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "cad5ff8a920a90e79c1e343022aba0d95347a9a6"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "1801969f47164e9e40fe611b2b11c664541ea619"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "8427fdbf5149c7e0a96e6037f3b7690cc43684f1"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "8ae6c4b5e97b1a129c178c17ddb787b8a499bbbf"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "422d73aa8d853afd219c4be983e9d0b0c165d3a7"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "ee6239de012bb2d581c42e4271736b3565932d2d"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "3e24c6d239e5d55ffefdecab5c280668d36f3c14"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "474f1b4ce9b6cf635c60ab32dc99268f30bd906b"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "7327c84c0b447cbeb00a57790334dbd4df02441a"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "a1cced1eb8d290f8f7668839af68a42b47172fda"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "c7a41b26bee1bcf1a1012ab122036983c42223ed"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "73309ee5d0304762b24b040fea3be934b0193b76"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "79466a14532bac1c5db7de4f1aacd97538b12ccd"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "1886939dd4fa0bd720f209a9280bdd48f2805144"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "18090d7adbb45350d47d796ee0d4a52da68629b4"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "6d5b993c8c5f9a311e128520a2eb1115a1004d72"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "04afb8826d04dc6511a77377d78f9dcdd67bb73f"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "c49c2175842d40698128da293305317c5d986561"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "65e6d24657a47d69cec4820fc699b948ef7235df"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "4a066d35ab922587ed1000b770becbaeafb91d39"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "fad64bc6cdf1bbc03ef0e6fd4fac96e0ddd26578"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "ac90f02584bedfe3b958020c37d3677b2312b203"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "7152187af874799ca22dffca1d85afc0346a5f7c"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "797c494042986578e79290a827056ee56ad32526"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "5fec8fc94b8296c5189be29fdc0f43f074c88722"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "2f90216459e8bd24fe775bc84f3d3371c64c705e"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "07176c2825be793521e11dde8a73ead970c58385"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7f95afef9fc01667b0e2ee33e2620069662b4b"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ff9a84cb2ca4e222a6d75b5591e5337b3b5e3b3b"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "a392c2287a3907b5b79c443c67dfb4d8e6624ebf"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "766035560552bb26b1d9a6c98357acab515153e3"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "5f9dcab41f522ca84833cf5dc566ee9679efcc01"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "46ced4f5c67f560b15341db70dc04d1a19e176cc"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "66f1b772f981ce5bbd3c7c2a73d260d2243887a9"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "2c087b2ba065f06aa4e4e491d92864ef679f14c2"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "b157e04413ee246304f30b0dc68eeed3e00d5cf3"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "72e77175705052c6102405897edc1c5887f94c58"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "f515c41dda71a69974b67d70ca1980987ab895ba"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "9b560bc16985e8610d11c1aa1df6a8b29a650528"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "24b0e2555617b1b0e7dcb601b3f7a8c54bf64524"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "a1cf5c244fd98a024b2987b72b95671a90c7e0f9"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "20a07254d51cc94be8153426e472d8c7b077a014"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "3e5c41c5239da37ee52070c043b5de2f16859055"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "bbbc669ead8c716725ad162247dbb35f6b6d3376"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "30c73fff969d9d94e6a24b27fa5b03285104ed38"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "d8ede481d0f04237b1a36356880d76a5439e6796"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "d5c70452102f0c1f513a45b3b05339b171e7e149"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "00bad56fb3a4bcc4032b204471a66dc64a9976e9"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "cd15137766f9bdb693743401d14e69c4c990aeab"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "eb51ca9c4d5d22ff178c45c99ba35270d9f006d1"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "ec7bdce8ecba50aa4c6f0495ec4737b032e85688"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "ce2a6f518fe69b6cf87ba6a2d5ff7e32f676e516"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "614808276829835d81f6a330154c3dbf617109e2"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "95da07c69121bf0e22b480f3e4df9db3e7676a8b"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "02dee38474393cf86c78aacfb2c546bfd2130e0a"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "cd8b7dc6eda97de0ec1c8a5dde36f4afd60b720a"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "748030706822a80156e5ffcfbaed413b3905280a"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "eafd2b7fa376f58fd5320a8e67bd76c9eb17819e"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "f04672081b0281dec909fd110f1c1dc8f340cc40"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "c51c6a23f5e99181cd2aa6e324165a523c7e7c41"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "29adc20bbdb3b1de7b0c1a325ded1159f7627478"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "b94fc235c3644455ca19238aed9e2e4cff4ce7d2"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "78bd45bf21196cc4bb400d10d19151931e390681"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "0b921d11a43968bc12a31be48baa962fb084be3d"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "b975d958fdb152c942cf68ed6dbde8df6b6cfe09"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "5384bc8f899d1ba75c96b11276dd98cb5049896a"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "dbd5db203127f01b1ec46259f9b668aa2dec8d63"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "eb6590aecd509ee02b02fd6d39aec32a77616b59"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "750f9d25164f2aae4d5bb3147738cb604c131b94"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "5dc246fc1c661d5a965da6eed7d0b57dacbcc643"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "ca3d7a76564552cab92cf1c3f2098bbb740e6315"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "ceb0264ab40dc437c2a44fa03c2f9a3ff18b667c"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "d2200d241c26059136169850a5ad4f702c273301"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "678bae69497e2ab6c4d895192b5093a0d120ddc1"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "9ca3af62babeeda8a46609ffd265ff0cc059349a"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "46376507d77af110a63de24a7a136c43b2d6cb1b"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "d43e51c5e504bfa1a0f7370e1cea3bda247b81e0"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "e97bc9017953f91f4fc9a158dca36ae1217a8a97"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "f80a0473ff265295f3eaa8ed8b8fe99a0a71b049"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "449cf3770e4eaa4289bac9abbf7f655bbdcdf8ca"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "ef1092cdef4dd2d4ebf62b29654da4ad08c7a6e0"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "0d856fdb66ca1208a08eef5073744f66de7c94f5"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "346888cbc1428897df1b50651a263ae5cc449475"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "3252ea6a0706813d4c536cab9251ec707a46fe47"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "ea55159965bc8b5fb5c692efc1a30ac3ddd74a48"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "5191f311d6324e1fbc98763e80316bb7584999ba"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "4c8387f5db87776ae6ba322fa81983f7bab14690"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e1fa5437760c8964aa312ed296454c0736009479"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "1e277512366a60745cfdc409530943e42bb62b11"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "8907cb5f77b0dafd6c2c69d63b6f9b72ab58d7d1"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "b101b37f7fe86686db1813786cbf2ee994bf33c3"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "ab0e84cd69808d12efa28f5062372ba8983b8c42"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "bce4718c183c9fc62f38025f7f9329999ba1f8a4"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "7a05e5dd98215dab96746166fe46c96592e8768a"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "c2c54c1831199ac8b5ba0bbebb564e9dc2ff2563"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3c2a7f6096eb16a00451d1ec71f6ff382910bf43"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "e3d43d6aa007419d057da99d06fdd200faf8d9c5"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "97bc53d2216eb24ad6c0496fed4698da4e481c38"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "3e5fcc5058646ee326f4b6b1ef885999222ab0b8"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "8d5dd6af05d9a285097db7f96372464e2c48a7fe"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "07866e3716bc3bd370e4aa4711ee2882be8380b9"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "f9c353e03792ade2c3df9842bad6707c50b59395"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "ecbfaa883c2dda597213ca739e92c30ec9c2eac1"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "ac1abca375cfbc2e45b7eb0f66b9cef73924ae4e"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "5f296643c42890a200416678a6ed8240ee219d9f"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "4b59b171b67641097da95fd76113efe1019fd2aa"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "13d5124fd8925de174f83a8075fb711aa14438b7"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "833c826ee2be3c8664060d4ad24c508b5c122a5e"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b29fb50d9eb83e98802655236a6c1ccb56bf6be3"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "5985c09eab409db0c62e525e9cd3d7469b82f0e1"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "2e4e3efe1d89b8cf329a64894807b69555e505e2"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "1a81aabe1ded11bde92349e8b9f5ae499aaebdfa"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "406212f107939a627f2166d8fc6a72a0dcff56a4"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "6cc272e25d45e54c6008da968884de039eba9db9"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "6f7e54ff4fe7d8bfa477475aaad371fc8b2f85d4"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "8f944829ef98bfdb46eadfd10fafe75a353c1a4a"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "f22e4293a3462effa0a928be3ae1ddbd8273450f"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "c115ea9356b457b25526c8469ebcf7a8e1c6241a"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "04ac40b3e10f96e17db70c9541040970cbe2e480"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "b0ccb81db2b8cb505ade10a0fc1eaf4322f7de0d"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "410da87c432e3d4e4ddfbe4912bc00c8fcfb8dfd"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "b91bea9a1813f1772a85873fb712c9857234864f"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f6a08558fb3b6ebd79fdf9b359286b7ba58f2a9c"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "b433601ffdf83cc2a90224f683f627f562d8e3e3"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "68624fead16c459f87cbdeefd75326bcabccd805"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "14c4a6abb6269dea926efccfdae41d2eeab9031a"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "ffd800950b8a768d4e7ec4c8666fc2e7a390a080"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "61889cee58be7c5da0f3424faae5192f07d31651"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "360335d5c3a1eccaba29095f88d9b50dc04fbc6d"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "ba1e1dbcb1c0c87ba1c916b1053cf876e42d76bf"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "c40a2e0c70d3c3af5e0c34045864a7279f95b2fa"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "45c6270bb1350799df089620cdae4919833d5a54"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ee8cacf035658fda1605f3a2968c56fa03cd73d4"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "45329cd3222d74cefaa0e96e18b71b6ddc844e77"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "47c1ec1e67829a86111a76f6ea6cb40c9f178066"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "1f2e1edbb49f141c1ac63f20e47bc4bcbe0361f4"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "cf70711b4fb6130b31d3286ad1b2a102d5cb8fc5"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "938ee57e657b3b2f0a228bc1dc7a9bc2eebee1cc"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "5c807541fa4e232b6b5119cbc482a79dd9e4f54e"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6f2ef03c505f4936f6263b643bbfd6e0befd54f4"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "7246ed88b0c3f504ca0043f3f20c5cc86eea8ac6"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "130f7ae3c0127d00e24946e9ec2558161fd3fcf1"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "aed0e1e7e699c6df4538663dc6a0556a106cb35f"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "69fca12c63c023f689463de709db731073a3c812"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "45ab4866e3f6989e4a08920564292622abea7f97"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "2898eed89af21c6a4122937bf596b97828cb9271"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "a3fb3b8564fcbe8cad29d430665d3f369d765369"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "143d8dcbccd3ad219330d7389e93597cb98d20f8"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fdc0095646678c2885e374e277ab50c4a4ffe53"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "4c135cfaa8644fab4558d53eb7f5f0ae53ed3704"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "a4faeb5aa6dc7f6a16d436a56ef9f954c80271fd"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "f3e60e515fa20c4092ecf4df64970bc750c849e5"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2d6ea4a41a33db4e2aeb67d7bcd38f32f427f757"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "cd97780c5f70dca5e9c2a61e9af11f38f79b014b"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "da2ae751b6b0dd2caf5c54fcd30560a57c6746cb"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "f6f3b56e8b134e93e30ecfcf706e9ddbb9b181cc"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "a922a569b293005e5efc797bf51e0c33e87cea7f"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "2643526d774e44fc41b0b7b6872ba683b01a9c77"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "e91689f635060087f8c8c9806ac1607a59e26776"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "dafca3f2c34ae417b5bd3065026af4a075c9bee7"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "6a1d03062d599ea35af8479dea3e6cfc45840ba1"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "9b92baecd3906b35499513723685cd791e1aab9e"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "116c8b02f8be6c739595cc88888a19e225ed865d"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "85f44f77cc27deb9cf95487a9a3673918f102bd9"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "0bd82afbe4c27318ce8882eff62e53fda13d3590"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "07cd4e46a5811096759c565bb533adf1ee9cb0d9"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "ece8a8b69aef74f9c22db1660a14ae5205aa7ff7"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "1f1e30f5aef29bf96d0e2b8609acb03d1b6ec0aa"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "5a0ffeb38b183b835966568c1b3fc719c0908fea"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9bbb5e61eecf09d059cfb17bd75fd0e64c455d78"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "e1115c4451ede51833387ef8c592ce7342d508d3"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "65dcef7d9bfcdbd35a09ff6a9e436261b79e4d90"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "cd64fb45459e699e0c8c2269a52bb0512e592db0"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "ea2650cb700a42dc96fb56ad1860061e87626bc9"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "976a52d128e8d912363fadb7e14adec0a7c9d973"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "323b876b6c11c4881c280cdb64d2867076970abf"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "952d5b82b0d3d47d5494f2d9667fc2a5b88408df"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5ce1feb2446c6dba96c3b3a0e9afd6a00655b738"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "83115d2fdc8494451b79cc67d581c77b64c27af4"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "a26678482d8c425f3291116e99e0196952d0cb09"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "327391e44d43d58b4d3fee97904a336f5c52648e"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "8b67f03c053f89af7d50331eec056402cfbd5bf4"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "15ec5c6fa7e6aa843910bc6c6479bf308393b52f"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "09127b5202cf63c7b9715813061ca79bc27c2f37"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "8b409350741edcd33b3eeaf7928a133eb1c2a399"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "733d049ffd66d5007ef68c761f2d84ab579bd400"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "dc5460e82bdf613e9d778687d11533dc97b77ffb"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "b4b9b10b53c48adf224507faf77a04c19c750d58"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "81aeb1d95fd2b220c17f388ba882127fc6d290de"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "a621f04b7e5accf05f946ce775391667579679e6"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "f9086f1ce56d84e3b732f22d086fcce43d2373a7"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "1b2b11fd04b7d1979f88268db37510ef231c158b"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f06ad4d533c7144695fbe2eb3ba700bb1d5151b7"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "92d4cd9bbc5f24045295bda6c75420708d593aac"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "53e661b5c485fae7c27770d2a2701d6d21e481c9"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "e4614597ef42eaa6ede065b4c3b9f11de491dd5b"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e3c8af45ab65e7977a350ae617cd55afa685e8d0"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "17b3d419fe769a02a360b96042c78c497063b9e8"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "cbc34ab650bfc95926b98e63c474f1997a1256fa"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "ba63efda6864a6984d492cda30d4fca6157e26a8"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "9b8cb45aab578b3dbfeace90f44dad26eda6e798"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "36a9867155fa0e6924ed62d7dbc350a2425178e1"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "abbc155c34c5d404b3143ccc63a1bb5c99c3d395"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "850ac8190adef8d227166b9b4478ea8c88c90287"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "afba1f0043ba96a89bc8ab23fe6b6e19af4f826b"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "acda86b5c48b751eb06719754921e7604a1c222e"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a88745a4a8f85d5d2861e40ba8d72b0af73bb055"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c03e6e4fae7fec1ae0b30e5cb600a4cf28151cc7"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c5788c6672b230681cfb3ee2fe97763ef81d34b1"; }
   ];
 }

From 8cbb97e6f3f6dcf2cf30cae48b9597930f28ffe9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 20:12:17 -0700
Subject: [PATCH 1103/1143] buildGoPackage: Don't include private directories
 in the search

---
 pkgs/development/go-modules/generic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 17341238deaf..353956e48630 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -72,6 +72,7 @@ go.stdenv.mkDerivation (
     else
         (cd go/src
         find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do
+            echo "$d" | grep -q "/_" && continue
             [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue
             local OUT
             if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then

From bbfac173ba694cc5655998c24cb424651f7dc3cc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 20:13:47 -0700
Subject: [PATCH 1104/1143] go-packages: Fix more packaging

---
 pkgs/top-level/go-packages.nix | 93 ++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 37 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8359fc541414..7f0e3e3958e7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -179,6 +179,9 @@ let
     rev = "295c7b21db5d9525ad959e3382610f3aff029663";
     name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/vanackere/asn1-ber";
+    goPackageAliases = [
+      "github.com/nmcclain/asn1-ber"
+    ];
 
     src = fetchFromGitHub {
       inherit rev;
@@ -511,18 +514,17 @@ let
   };
 
   dbus = buildGoPackage rec {
-    rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133";
+    rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea";
     name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/godbus/dbus";
-    preBuild = ''
-      cd "go/src/$goPackagePath"
-      rm -r _examples
-    '';
+
+    excludedPackages = "examples";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "godbus";
       repo = "dbus";
-      sha256 = "0k80wzdx8091y3012nd4giwgc08n1pj6lcr9i44dsapcjnb80jkn";
+      sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf";
     };
   };
 
@@ -947,6 +949,7 @@ let
     goPackagePath = "github.com/pmylund/go-cache";
     goPackageAliases = [
       "github.com/robfig/go-cache"
+      "github.com/influxdb/go-cache"
     ];
 
     src = fetchFromGitHub {
@@ -983,6 +986,19 @@ let
     };
   };
 
+  go-colortext = buildGoPackage rec {
+    rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57";
+    name = "go-colortext-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/daviddengcn/go-colortext";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "daviddengcn";
+      repo = "go-colortext";
+      sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x";
+    };
+  };
+
   go-etcd = buildGoPackage rec {
     rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8";
     name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1076,13 +1092,15 @@ let
     rev = "70d039bee4b0e389e5be560491d8291708506f59";
     name = "go-log-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/coreos/go-log";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "coreos";
       repo = "go-log";
       sha256 = "1s95xmmhcgw4ascf4zr8c4ij2n4s3mr881nxcpmc61g0gb722b13";
     };
-    buildInputs = [ go-systemd osext ];
+
+    propagatedBuildInputs = [ osext go-systemd ];
   };
 
   rcrowley.go-metrics = buildGoPackage rec {
@@ -1229,16 +1247,19 @@ let
   };
 
   go-systemd = buildGoPackage rec {
-    rev = "2d21675230a81a503f4363f4aa3490af06d52bb8";
+    rev = "2688e91251d9d8e404e86dd8f096e23b2f086958";
     name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/coreos/go-systemd";
+
+    excludedPackages = "examples";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "coreos";
       repo = "go-systemd";
-      sha256 = "07g5c8khlcjnr86gniw3zr7l8jwrb9fhrj18zm5n6ccj24nidwam";
+      sha256 = "0c1k3y5msc1xplhx0ksa7g08yqjaavns8s5zrfg4ig8az30gwlpa";
     };
-    subPackages = [ "activation" "daemon" "dbus" "journal" "login1" ];
+
     buildInputs = [ dbus ];
   };
 
@@ -1361,13 +1382,14 @@ let
     rev  = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c";
     name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/AdRoll/hologram";
+
     src = fetchFromGitHub {
       inherit rev;
       owner  = "copumpkin";
       repo   = "hologram";
       sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4";
     };
-    buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir nmcclain.ldap g2s gox ];
+    buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir vanackere.ldap g2s gox ];
   };
 
   http2 = buildGoPackage rec {
@@ -1412,7 +1434,7 @@ let
       sha256 = "0p3s0pbn5x294qg2r0qgysb5wmspsvjxhccxh2hs6hc24dl6y93b";
     };
 
-    buildInputs = [ bolt crypto statik liner toml pat gollectd ];
+    propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd ];
   };
 
   eckardt.influxdb-go = buildGoPackage rec {
@@ -1450,25 +1472,13 @@ let
     };
   };
 
-  nmcclain.ldap = buildGoPackage rec {
-    rev = "469fe5a802d61523b40dbb29bb8012a6b99b06b5";
-    name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/nmcclain/ldap";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "nmcclain";
-      repo   = "ldap";
-      sha256 = "0xq5dc03ym0wlg9mvf4gbrmj74l4c8bgkls8fd7c98a128qw2srk";
-    };
-
-    propagatedBuildInputs = [ asn1-ber ];
-  };
-
   vanackere.ldap = buildGoPackage rec {
     rev = "e29b797d1abde6567ccb4ab56236e033cabf845a";
     name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/vanackere/ldap";
+    goPackageAliases = [
+      "github.com/nmcclain/ldap"
+    ];
 
     src = fetchFromGitHub {
       inherit rev;
@@ -1494,17 +1504,24 @@ let
   };
 
   log4go = buildGoPackage rec {
-    rev = "48";
-    name = "log4go-${rev}";
-    goPackagePath = "code.google.com/p/log4go";
+    rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8";
+    name = "log4go-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/ccpaging/log4go";
+    goPackageAliases = [
+      "github.com/alecthomas/log4go"
+      "code.google.com/p/log4go"
+    ];
 
-    src = fetchhg {
+    excludedPackages = "examples";
+
+    src = fetchFromGitHub {
       inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p";
+      owner = "ccpaging";
+      repo = "log4go";
+      sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2";
     };
 
-    subPackages = [ "./" ]; # don't build examples
+    propagatedBuildInputs = [ go-colortext ];
   };
 
   logrus = buildGoPackage rec {
@@ -1621,14 +1638,15 @@ let
   };
 
   msgpack = buildGoPackage rec {
-    rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205";
+    rev = "9dbd4ac30c0b67927f0fb5557fb8341047bd35f7";
     name = "msgpack-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/vmihailenco/msgpack";
+    goPackagePath = "gopkg.in/vmihailenco/msgpack.v2";
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "vmihailenco";
       repo = "msgpack";
-      sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0";
+      sha256 = "0nq9yb85hi3c35kwyl38ywv95vd8n7aywmj78wwylglld22nfmw2";
     };
   };
 
@@ -1757,6 +1775,7 @@ let
     goPackagePath = "github.com/kardianos/osext";
     goPackageAliases = [
       "github.com/bugsnag/osext"
+      "bitbucket.org/kardianos/osext"
     ];
 
     src = fetchFromGitHub {

From b835d4badefd230612cc066296ae3e3f6a36e6fa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 21:34:51 -0700
Subject: [PATCH 1105/1143] libunwind: Fix lzma propagation

---
 pkgs/development/libraries/libunwind/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index b08c169993eb..91895114ea0c 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/lib"
     touch "$out/lib/libunwind-generic.so"
   '';
+
+  postInstall = ''
+    find $out -name \*.la | while read file; do
+      sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file
+    done
+  '';
   
   meta = with stdenv.lib; {
     homepage = http://www.nongnu.org/libunwind;

From 9687d304fd0b2c08ff92b8bb8a393dec51bb77a9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 21:43:48 -0700
Subject: [PATCH 1106/1143] wiredtiger: 2.5.2 -> 2.6.0

---
 .../libraries/wiredtiger/default.nix          | 50 +++++++++++++++----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 395a40401531..da4dc9d6bbc3 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -1,34 +1,64 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool
-, bzip2, snappy, zlib, db
+
+# Optional Dependencies
+, lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null
+, gperftools ? null, leveldb ? null
 }:
 
+with stdenv.lib;
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optLz4 = shouldUsePkg lz4;
+  optSnappy = shouldUsePkg snappy;
+  optZlib = shouldUsePkg zlib;
+  optBzip2 = shouldUsePkg bzip2;
+  optDb = shouldUsePkg db;
+  optGperftools = shouldUsePkg gperftools;
+  optLeveldb = shouldUsePkg leveldb;
+in
 stdenv.mkDerivation rec {
   name = "wiredtiger-${version}";
-  version = "2.5.2";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     repo = "wiredtiger";
     owner = "wiredtiger";
     rev = version;
-    sha256 = "1rk26gfs4zpz88mkbdkhz65q4admpgf46x5zsnghl0ndirmnvq3p";
+    sha256 = "0i2r03bpq9xzp5pw7c67kjac5j7mssiawd9id8lqjdbr6c6772cv";
   };
 
   nativeBuildInputs = [ automake autoconf libtool ];
-  buildInputs = [ bzip2 snappy zlib db ];
+  buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ];
 
   configureFlags = [
-    "--with-berkeleydb=${db}"
-    "--enable-bzip2"
-    "--enable-leveldb"
-    "--enable-snappy"
-    "--enable-zlib"
+    (mkWith   false                   "attach"     null)
+    (mkWith   true                    "builtins"   "")
+    (mkEnable (optBzip2 != null)      "bzip2"      null)
+    (mkEnable false                   "diagnostic" null)
+    (mkEnable false                   "java"       null)
+    (mkEnable (optLeveldb != null)    "leveldb"    null)
+    (mkEnable false                   "python"     null)
+    (mkEnable (optSnappy != null)     "snappy"     null)
+    (mkEnable (optLz4 != null)        "lz4"        null)
+    (mkEnable (optGperftools != null) "tcmalloc"   null)
+    (mkEnable (optZlib != null)       "zlib"       null)
+    (mkWith   (optDb != null)         "berkeleydb" optDb)
+    (mkWith   false                   "helium"     null)
   ];
 
   preConfigure = ''
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://wiredtiger.com/;
     description = "";
     license = licenses.gpl2;

From b76d6c1699253c8ea5ac8b5dcd4903ddd77e6276 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 21:43:59 -0700
Subject: [PATCH 1107/1143] mongodb: 3.0.2 -> 3.0.3

---
 pkgs/servers/nosql/mongodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index ef08dd3747fd..257d3c63e52c 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 
-let version = "3.0.2";
+let version = "3.0.3";
     system-libraries = [
       "pcre"
       "wiredtiger"
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "16c3cr7l8ddziavmxrg2aq9bp1knnscy57xx5zsvz6yv7hh24181";
+    sha256 = "01q8fas8afch50h4kjdrdrcrb1qx243wafz6zdsbc2waq60mlxjp";
   };
 
   nativeBuildInputs = [ scons ];

From 3cb3247ae0bb9d5f6947fc6a30ce1bb108cdc818 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 22:01:08 -0700
Subject: [PATCH 1108/1143] mongodb: Support 32 bit platforms

---
 pkgs/servers/nosql/mongodb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 257d3c63e52c..a465d1c4a592 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -17,14 +17,14 @@ let version = "3.0.3";
     ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
     buildInputs = [
       sasl boost gperftools pcre snappy
-      zlib libyamlcpp sasl openssl libpcap wiredtiger
-    ];
+      zlib libyamlcpp sasl openssl libpcap
+    ] ++ optional stdenv.is64bit wiredtiger;
 
     other-args = concatStringsSep " " ([
       "--c++11=on"
       "--ssl"
       #"--rocksdb" # Don't have this packaged yet
-      "--wiredtiger=on"
+      "--wiredtiger=${if stdenv.is64bit then "on" else "off"}"
       "--js-engine=v8-3.25"
       "--use-sasl-client"
       "--variant-dir=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld

From cf94a678f33ce3f051e75f22369dcf02489df005 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 22:21:28 -0700
Subject: [PATCH 1109/1143] consul-alerts: Fix

---
 pkgs/top-level/go-packages.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 7f0e3e3958e7..5d8b76fddcf0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -435,6 +435,7 @@ let
       # Fix references to consul-api
       govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api
       sed -i 's,consulapi,api,g' go/src/${goPackagePath}/consul/client.go
+      sed -i 's,consulapi,api,g' go/src/${consul-skipper.goPackagePath}/skipper.go
     '';
 
     src = fetchFromGitHub {
@@ -447,9 +448,11 @@ let
     # We just want the consul api not all of consul
     extraSrcs = [
       { inherit (consul) src goPackagePath; }
+      { inherit (influxdb8) src goPackagePath; }
+      { inherit (consul-skipper) src goPackagePath; }
     ];
 
-    buildInputs = [ logrus consul-skipper docopt-go hipchat-go influxdb gopherduty ];
+    buildInputs = [ logrus docopt-go hipchat-go gopherduty ];
   };
 
   consul-migrate = buildGoPackage rec {
@@ -1437,6 +1440,24 @@ let
     propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd ];
   };
 
+  influxdb8 = buildGoPackage rec {
+    rev = "v0.8.8";
+    name = "influxdb-${rev}";
+    goPackagePath = "github.com/influxdb/influxdb";
+    goPackageAliases = [
+      "github.com/influxdb/influxdb-go"
+    ];
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "influxdb";
+      repo = "influxdb";
+      sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv";
+    };
+
+    buildInputs = [ statik crypto protobuf log4go toml pmylund.go-cache ];
+  };
+
   eckardt.influxdb-go = buildGoPackage rec {
     rev = "8b71952efc257237e077c5d0672e936713bad38f";
     name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}";

From 35da88466730822573b19205d1d292f51924bdf8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 22:56:44 -0700
Subject: [PATCH 1110/1143] ceph: Support newer versions

---
 pkgs/tools/filesystems/ceph/generic.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 36baee6b99d5..33d9b3dc64f3 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -62,10 +62,10 @@ let
     none = [ ];
   };
 
-  wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $lib)\""
+  wrapArgs = "--set PYTHONPATH : \"$(toPythonPath $lib)\""
     + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
     + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
-    + " --prefix PATH : \"$out/bin\"";
+    + " --set PATH : \"$out/bin\"";
 in
 stdenv.mkDerivation {
   name="ceph-${version}";
@@ -79,7 +79,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
     boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib
-  ] ++ optional (versionAtLeast version "0.95") [
+  ] ++ optional (versionAtLeast version "9.0.0") [
     git                   # Used for the gitversion string
     pythonPackages.sphinx # Used for docs
   ] ++ optional stdenv.isLinux [
@@ -158,6 +158,10 @@ stdenv.mkDerivation {
     (mkWith   (libaio != null)             "libaio"            null)
     (mkWith   (libxfs != null)             "libxfs"            null)
     (mkWith   (zfs != null)                "libzfs"            null)
+  ] ++ optional (versionAtLeast version "10.0.0") [
+    (mkWith   true                         "man-pages"         null)
+    (mkWith   false                        "tcmalloc-minimal"  null)
+    (mkWith   false                        "valgrind"          null)
   ];
 
   installFlags = [ "sysconfdir=\${out}/etc" ];

From 5c8ea1958dc2d39ea3aea36c18690211f16f2417 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 20 May 2015 06:57:17 +0100
Subject: [PATCH 1111/1143] youtube-dl: update to 2015.05.15

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 60d31fec8c3d..12f6cb18aa2e 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
-  version = "2015.04.03";
+  version = "2015.05.15";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0ndzswv6vq5ld5p1ny23sh76cx6acf8yli9gi9r21dm94ida2885";
+    sha256 = "0b4fnlgfnwdh1z8avydbc8rr75jpcyvfpvs39ln1gh7m8vyxwjz6";
   };
 
   buildInputs = [ python makeWrapper zip pandoc ];

From d2f21ab3fcf33582afc7ede5452ab3c28d80e58e Mon Sep 17 00:00:00 2001
From: Ossi Herrala <oherrala@gmail.com>
Date: Wed, 20 May 2015 09:02:13 +0300
Subject: [PATCH 1112/1143] cfr: Update to version 0_101 and remove platform
 restrictions

cfr is written in Java, so it should work in every platform supported
by jre. This fix makes cfr usable in Darwin.
---
 pkgs/development/tools/java/cfr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 6025a59f44cb..a7be59a1fea1 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre }:
 
-let version = "0_100"; in
+let version = "0_101"; in
 stdenv.mkDerivation rec {
   name = "cfr-${version}";
 
   src = fetchurl {
-    sha256 = "0q5kh5qdksykz339p55jz0q5cjqvxdzv3a7r4kkijgbfjm1ldr5f";
+    sha256 = "0zwl3whypdm2qrw3hwaqjnifkb4wcdn8fx9scrjkli54bhr6dqch";
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.benf.org/other/cfr/;
     license = with licenses; mit;
-    platforms = with platforms; linux;
+    platforms = with platforms; all;
     maintainers = with maintainers; [ nckx ];
   };
 

From 72aa6aaa04d4616b38d253af10cc31746e4453a3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 23:03:16 -0700
Subject: [PATCH 1113/1143] lightdm: 1.14.0 -> 1.15.0

---
 pkgs/applications/display-managers/lightdm/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 8a613ee68617..301eb60429e3 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -4,15 +4,15 @@
 }:
 
 let
-  ver_branch = "1.14";
-  version = "1.14.0";
+  ver_branch = "1.15";
+  version = "1.15.0";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "0fkbzqncx34dhylrg5328fih7xywmsqj2p40smnx33nyf047jdgc";
+    sha256 = "0f0c2irb7qq49dabxhh99bwyvkxpfpscy4vynm7y800sz15lm2hs";
   };
 
   buildInputs = [
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional (qt5 != null) qt5.base;
 
   configureFlags = [
-    "--enable-liblightdm-gobject"
     "--localstatedir=/var"
     "--sysconfdir=/etc"
   ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"

From 69a990f6b34969e3db14c6b6b03aa71793903cb4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 23:30:51 -0700
Subject: [PATCH 1114/1143] libssh: 0.6.4 -> 0.7.0

---
 pkgs/development/libraries/libssh/default.nix | 67 ++++++++++++++++---
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 88af054654b9..533cdc1a7093 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,22 +1,73 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt, openssl }:
+{ stdenv, fetchurl, pkgconfig, cmake
+
+# Optional Dependencies
+, heimdal ? null, zlib ? null, libsodium ? null
+
+# Crypto Dependencies
+, openssl ? null, libgcrypt ? null
+}:
+
+let
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  # Prefer openssl
+  cryptoStr = if shouldUsePkg openssl != null then "openssl"
+    else if shouldUsePkg libgcrypt != null then "libgcrypt"
+      else "none";
+  crypto = {
+    openssl = openssl;
+    libgcrypt = libgcrypt;
+    none = null;
+  }.${cryptoStr};
+
+  optHeimdal = shouldUsePkg heimdal;
+  optZlib = shouldUsePkg zlib;
+  optLibsodium = shouldUsePkg libsodium;
+in
+
+assert crypto != null;
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.6.4";
+  name = "libssh-0.7.0";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/107/${name}.tar.gz";
-    sha256 = "0lkb45sc7w0wd67p46yh8rsprglssnkqar1sp0impwsvx7i0acky";
+    url = "https://red.libssh.org/attachments/download/140/libssh-0.7.0.tar.xz";
+    sha256 = "0as07vz3h5qa14ysvgsddb90m1qh605p6ccv6kf1sr1k3wsbql85";
   };
 
-  # option we don't provide (yet): use libgcrypt instead of openssl
-  buildInputs = [ zlib /*libgcrypt*/ openssl ];
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ optHeimdal optZlib optLibsodium crypto ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  cmakeFlags = [
+    "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
+    "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}"
+    "-DWITH_SSH1=OFF"
+    "-DWITH_SFTP=ON"
+    "-DWITH_SERVER=ON"
+    "-DWITH_STATIC_LIB=OFF"
+    "-DWITH_DEBUG_CRYPTO=OFF"
+    "-DWITH_DEBUG_CALLTRACE=OFF"
+    "-DWITH_GCRYPT=${if cryptoStr == "libgcrypt" then "ON" else "OFF"}"
+    "-DWITH_PCAP=ON"
+    "-DWITH_INTERNAL_DOC=OFF"
+    "-DWITH_TESTING=OFF"
+    "-DWITH_CLIENT_TESTING=OFF"
+    "-DWITH_BENCHMARKS=OFF"
+    "-DWITH_EXAMPLES=OFF"
+    "-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}"
+  ] ++ stdenv.lib.optionals (optLibsodium != null) [
+    "-DNACL_LIBRARY=${optLibsodium}/lib"
+    "-DNACL_INCLUDE_DIR=${optLibsodium}/include"
+  ];
+
+  postPatch = ''
+    sed -i 's,nacl/,sodium/,g' include/libssh/curve25519.h src/curve25519.c
+  '';
 
   meta = with stdenv.lib; {
     description = "SSH client library";
     license = licenses.lgpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    maintainers = with maintainers; [ sander urkud wkennington ];
     platforms = platforms.all;
   };
 }

From ef7c804a6f308630e325f58c78a7850423c110c0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 23:53:54 -0700
Subject: [PATCH 1115/1143] openresolv: 3.5.7 -> 3.7.0

---
 pkgs/tools/networking/openresolv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index ee5241bfcad8..4b9f868bf1b7 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "openresolv-3.5.7";
+  name = "openresolv-3.7.0";
 
   src = fetchurl {
     url = "mirror://roy/openresolv/${name}.tar.bz2";
-    sha256 = "14n51wqnh49zdvx11l79s3fh1jhg7kg9cfny5vk7zsix78spmyx7";
+    sha256 = "1pimiipic4m90f832rgw3ayqrh457qfymcpfpj9iidb5c4phnz4b";
   };
 
   buildInputs = [ makeWrapper ];

From 5c6f06e56a5a456be830a0f0795f6c8c6dc13a06 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 23:51:36 -0700
Subject: [PATCH 1116/1143] lxc: 1.1.1 -> 1.1.2

---
 pkgs/os-specific/linux/lxc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 9939a5525747..0d80fe6d2b1b 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -9,13 +9,13 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxc-1.1.1";
+  name = "lxc-1.1.2";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxc";
     rev = name;
-    sha256 = "04zpznd364862y3dwn97klvwfw9i2b6n1lh4fkci0z74c6z9svql";
+    sha256 = "149nq630h9bg87hb3cn086ci0cz29l7fp3i6qf1mqxv7hnildm8p";
   };
 
   buildInputs = [

From 3ee72b7379964467526dd8de88415ce363981ef8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 19 May 2015 23:48:55 -0700
Subject: [PATCH 1117/1143] lxc: Cleanup postInstall

---
 pkgs/os-specific/linux/lxc/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 0d80fe6d2b1b..8115aa1055be 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -41,18 +41,13 @@ stdenv.mkDerivation rec {
     "--enable-tests"
   ];
 
-  installFlags = [ "DESTDIR=\${out}" ];
-
-  postInstall = ''
-    mv $out/$out/* $out
-    DIR=$out/$out
-    while rmdir $DIR 2>/dev/null; do
-      DIR="$(dirname "$DIR")"
-    done
-
-    # Remove the unneeded var/lib directories
-    rm -rf $out/var
-  '';
+  installFlags = [
+    "localstatedir=\${TMPDIR}"
+    "sysconfdir=\${out}/etc"
+    "sysconfigdir=\${out}/etc/default"
+    "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs"
+    "LXCPATH=\${TMPDIR}/var/lib/lxc"
+  ];
 
   meta = {
     homepage = "http://lxc.sourceforge.net";

From d220ea72e5cb04e25353bc47441cf3a5a53241ec Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 20 May 2015 00:26:12 -0700
Subject: [PATCH 1118/1143] gnu-efi: 3.0b -> 3.0.2

---
 .../development/libraries/gnu-efi/default.nix | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index a78d98907291..43479a8f66d1 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pciutils }:
 
 stdenv.mkDerivation rec {
-  name = "gnu-efi_${version}";
-  version = "3.0u";
+  name = "gnu-efi-${version}";
+  version = "3.0.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnu-efi/${name}.orig.tar.gz";
-    sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w";
+    url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
+    sha256 = "1mxl6xarwickhssn0nc5hyvayyf2cjh5p10l37jd1ymirl75hjqr";
   };
 
-  arch = with stdenv.lib; head (splitString "-" stdenv.system);
+  buildInputs = [ pciutils ];
 
   makeFlags = [
+    "PREFIX=\${out}"
     "CC=gcc"
     "AS=as"
     "LD=ld"
@@ -20,18 +21,6 @@ stdenv.mkDerivation rec {
     "OBJCOPY=objcopy"
   ];
 
-  buildPhase = ''
-    make $makeFlags
-    make $makeFlags -C apps clean all
-  '';
-
-  installPhase = ''
-    mkdir -pv $out/include/efi/{protocol,$arch}
-    make PREFIX="$out" $makeFlags install
-    mkdir -pv $out/share/gnu-efi
-    install -D -m644 apps/*.efi $out/share/gnu-efi
-  '';
-
   meta = with stdenv.lib; {
     description = "GNU EFI development toolchain";
     homepage = http://sourceforge.net/projects/gnu-efi/;

From 3b79ea5ce4dd53a1e34f3c18f781598e23f32b87 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 20 May 2015 00:26:45 -0700
Subject: [PATCH 1119/1143] libtheora: Refactor

---
 .../libraries/libtheora/default.nix           | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index ef7a8ab09a8e..da590adae062 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation rec {
   name = "libtheora-1.1.1";
+
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.gz;
+    url = "http://downloads.xiph.org/releases/theora/${name}.tar.gz";
     sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
   };
 
-  buildInputs = [pkgconfig];
-
-  propagatedBuildInputs = [libogg libvorbis];
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ libogg libvorbis ];
 
   # GCC's -fforce-addr flag is not supported by clang
   # It's just an optimization, so it's safe to simply remove it
@@ -17,23 +17,11 @@ stdenv.mkDerivation ({
     substituteInPlace configure --replace "-fforce-addr" ""
   '';
 
-  crossAttrs = {
-    propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv];
-    configureFlags = "--disable-examples";
-  };
-
   meta = with stdenv.lib; {
     homepage = http://www.theora.org/;
     description = "Library for Theora, a free and open video compression format";
     license = licenses.bsd3;
-    maintainers = [ maintainers.spwhitt ];
+    maintainers = with maintainers; [ spwhitt wkennington ];
     platforms = platforms.unix;
   };
 }
-
-# It has an old config.guess that doesn't know the mips64el.
-// stdenv.lib.optionalAttrs (stdenv.system == "mips64el-linux")
-{
-  propagatedBuildInputs = [libogg libvorbis autoconf automake libtool];
-  preConfigure = "rm config.guess; sh autogen.sh";
-})

From 0bc84ecccd9d4612673095f3505cea7a25246d3e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 20 May 2015 00:27:03 -0700
Subject: [PATCH 1120/1143] gummiboot: 45 -> 48

---
 pkgs/tools/misc/gummiboot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix
index 376550200620..8adea97ff14a 100644
--- a/pkgs/tools/misc/gummiboot/default.nix
+++ b/pkgs/tools/misc/gummiboot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
 
 stdenv.mkDerivation rec {
-  name = "gummiboot-45";
+  name = "gummiboot-48";
 
   buildInputs = [ gnu-efi pkgconfig libxslt utillinux ];
 
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-45.tar.xz/5d4957390e959cb9f325b87712ddd3f1/gummiboot-45.tar.xz;
-    sha256 = "15227d6abi90vg7rs234fm13af511nsd6dv87c3jvsjhgb9ib0hm";
+    url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-48.tar.xz/05ef3951e8322b76c31f2fd14efdc185/gummiboot-48.tar.xz;
+    sha256 = "1bzygyglgglhb3aj77w2qcb0dz9sxgb7lq5krxf6417431h198rg";
   };
 
   meta = {

From 9a159fc2bcbc868e16769a85d92366989d125db3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 May 2015 11:34:08 +0200
Subject: [PATCH 1121/1143] php: Update to latest versions

---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 pkgs/development/interpreters/php/5.5.nix | 4 ++--
 pkgs/development/interpreters/php/5.6.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 7133b1e0824f..c10425631b3c 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd }:
 callPackage ./generic.nix {
-  phpVersion = "5.4.40";
-  sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628";
+  phpVersion = "5.4.41";
+  sha = "0wl27f5z6vymajm2bzfp440zsp1jdxqn71avryiq1zw029db9i2v";
   apacheHttpd = apacheHttpd;
 }
diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix
index fdc1ab79c769..0d66e64693a9 100644
--- a/pkgs/development/interpreters/php/5.5.nix
+++ b/pkgs/development/interpreters/php/5.5.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd  }:
 callPackage ./generic.nix {
-  phpVersion = "5.5.21";
-  sha = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2";
+  phpVersion = "5.5.25";
+  sha = "0qrc4qll07hfs5a3l4ajrj7969w10d0n146zq1smdl6x4pkkgpv8";
   apacheHttpd = apacheHttpd;
 }
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
index 5f69e46189fa..425f51ce5c66 100644
--- a/pkgs/development/interpreters/php/5.6.nix
+++ b/pkgs/development/interpreters/php/5.6.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd  }:
 callPackage ./generic.nix {
-  phpVersion = "5.6.6";
-  sha = "0k5vml94p5809bk2d5a8lhzf3h7f1xgs75b9qy6ikj70cndmqqh9";
+  phpVersion = "5.6.9";
+  sha = "1fdwk8g509gxd5ad3y1s3j49hfkjdg8mgmzn9ki3pflbgdxvilqr";
   apacheHttpd = apacheHttpd;
 }

From f247481b5dc10a25970f4a44b66628166e56f4b9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 20 May 2015 02:34:00 -0700
Subject: [PATCH 1122/1143] buildGoPackage: Only install files from the
 goPackagePath

---
 pkgs/development/go-modules/generic/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 353956e48630..f747ade72f27 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -113,12 +113,12 @@ go.stdenv.mkDerivation (
     mkdir -p $out
 
     if [ -z "$dontInstallSrc" ]; then
-        local dir
-        for d in pkg src; do
-            mkdir -p $out/share/go
-            dir="$NIX_BUILD_TOP/go/$d"
-            [ -e "$dir" ] && cp -r $dir $out/share/go
-        done
+        (cd "$NIX_BUILD_TOP/go"
+        find . -type f | while read f; do
+          echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
+          mkdir -p "$(dirname "$out/share/go/$f")"
+          cp $NIX_BUILD_TOP/go/$f $out/share/go/$f
+        done)
     fi
 
     dir="$NIX_BUILD_TOP/go/bin"

From 3d2d78cb396a5a3fe144b15207069bb11775ff9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 20 May 2015 09:51:42 +0200
Subject: [PATCH 1123/1143] nixos/libvirtd: add 'extraOptions' option

And move the '--verbose' flag to extraOptions, so that users can easily
disable it.
---
 nixos/modules/virtualisation/libvirtd.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 7410609e0642..14c4e992d3b6 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -57,6 +57,17 @@ in
           '';
       };
 
+    virtualisation.libvirtd.extraOptions =
+      mkOption {
+        type = types.listOf types.str;
+        default = [ "--verbose" ];  # for historical reasons, should be empty
+        example = [ "--verbose" ];
+        description =
+          ''
+            Extra command line arguments passed to libvirtd on startup.
+          '';
+      };
+
     virtualisation.libvirtd.onShutdown =
       mkOption {
         type = types.enum ["shutdown" "suspend" ];
@@ -140,7 +151,7 @@ in
             done
           ''; # */
 
-        serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon --verbose'';
+        serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon ${concatStringsSep " " cfg.extraOptions}'';
         serviceConfig.Type = "forking";
         serviceConfig.KillMode = "process"; # when stopping, leave the VMs alone
 

From db991a40245ffd55cb49ccfe300c9851e0851924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 20 May 2015 10:06:21 +0200
Subject: [PATCH 1124/1143] nixos/libvirtd: remove --verbose flag

Because it spams the log:

  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13
  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1
  .libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1
  .libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: [137B blob data]
---
 nixos/modules/virtualisation/libvirtd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 14c4e992d3b6..16aedbbb185d 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -60,7 +60,7 @@ in
     virtualisation.libvirtd.extraOptions =
       mkOption {
         type = types.listOf types.str;
-        default = [ "--verbose" ];  # for historical reasons, should be empty
+        default = [ ];
         example = [ "--verbose" ];
         description =
           ''

From 2fe90843977bb7809c964047822d33b4f520e93d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 3 May 2015 20:18:18 +0300
Subject: [PATCH 1125/1143] azure-image: fix, split into bootstrap and regular
 configurations

Conflicts:
	nixos/modules/virtualisation/azure-image.nix
---
 nixos/modules/virtualisation/azure-common.nix | 60 +++++++++++++++++++
 nixos/modules/virtualisation/azure-image.nix  | 32 +---------
 2 files changed, 61 insertions(+), 31 deletions(-)
 create mode 100644 nixos/modules/virtualisation/azure-common.nix

diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
new file mode 100644
index 000000000000..4fc7a085f868
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -0,0 +1,60 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  imports = [ ../profiles/headless.nix ];
+
+  boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ];
+  boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ];
+
+  # Generate a GRUB menu. 
+  boot.loader.grub.device = "/dev/sda";
+  boot.loader.grub.version = 2;
+  boot.loader.grub.timeout = 0;
+
+  # Don't put old configurations in the GRUB menu.  The user has no
+  # way to select them anyway.
+  boot.loader.grub.configurationLimit = 0;
+
+  fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time, ping client connections to avoid timeouts
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
+  services.openssh.extraConfig = ''
+    ClientAliveInterval 180
+  '';
+
+  # Force getting the hostname from Azure
+  networking.hostName = mkDefault "";
+
+  # Always include cryptsetup so that NixOps can use it.
+  environment.systemPackages = [ pkgs.cryptsetup ];
+
+  networking.usePredictableInterfaceNames = false;
+
+  services.udev.extraRules = ''
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:0", ATTR{removable}=="0", SYMLINK+="disk/by-lun/0",
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:1", ATTR{removable}=="0", SYMLINK+="disk/by-lun/1",
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:2", ATTR{removable}=="0", SYMLINK+="disk/by-lun/2"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:3", ATTR{removable}=="0", SYMLINK+="disk/by-lun/3"
+
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:4", ATTR{removable}=="0", SYMLINK+="disk/by-lun/4"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:5", ATTR{removable}=="0", SYMLINK+="disk/by-lun/5"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:6", ATTR{removable}=="0", SYMLINK+="disk/by-lun/6"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:7", ATTR{removable}=="0", SYMLINK+="disk/by-lun/7"
+
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:8", ATTR{removable}=="0", SYMLINK+="disk/by-lun/8"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:9", ATTR{removable}=="0", SYMLINK+="disk/by-lun/9"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:10", ATTR{removable}=="0", SYMLINK+="disk/by-lun/10"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:11", ATTR{removable}=="0", SYMLINK+="disk/by-lun/11"
+
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:12", ATTR{removable}=="0", SYMLINK+="disk/by-lun/12"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:13", ATTR{removable}=="0", SYMLINK+="disk/by-lun/13"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:14", ATTR{removable}=="0", SYMLINK+="disk/by-lun/14"
+    ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:15", ATTR{removable}=="0", SYMLINK+="disk/by-lun/15"
+
+  '';
+
+}
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index ab5a9c51fa5b..3f554d127c35 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -5,8 +5,6 @@ let
   diskSize = "4096";
 in
 {
-  imports = [ ../profiles/headless.nix ];
-
   system.build.azureImage =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "azure-image"
@@ -24,7 +22,6 @@ in
 
           postVM =
             ''
-              echo Converting
               mkdir -p $out
               ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
               rm $diskImage
@@ -93,34 +90,11 @@ in
         ''
     );
 
-  fileSystems."/".device = "/dev/disk/by-label/nixos";
+  imports = [ ./azure-common.nix ];
 
   # Azure metadata is available as a CD-ROM drive.
   fileSystems."/metadata".device = "/dev/sr0";
 
-  boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ];
-  boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ];
-
-  # Generate a GRUB menu. 
-  boot.loader.grub.device = "/dev/sda";
-  boot.loader.grub.version = 2;
-  boot.loader.grub.timeout = 0;
-
-  # Don't put old configurations in the GRUB menu.  The user has no
-  # way to select them anyway.
-  boot.loader.grub.configurationLimit = 0;
-
-  # Allow root logins only using the SSH key that the user specified
-  # at instance creation time.
-  services.openssh.enable = true;
-  services.openssh.permitRootLogin = "without-password";
-
-  # Force getting the hostname from Azure
-  networking.hostName = mkDefault "";
-
-  # Always include cryptsetup so that NixOps can use it.
-  environment.systemPackages = [ pkgs.cryptsetup ];
-
   systemd.services.fetch-ssh-keys =
     { description = "Fetch host keys and authorized_keys for root user";
 
@@ -157,8 +131,4 @@ in
       serviceConfig.StandardOutput = "journal+console";
      };
 
-  networking.usePredictableInterfaceNames = false;
-
-  #users.extraUsers.root.openssh.authorizedKeys.keys = [ (builtins.readFile <ssh-pub-key>) ];
-
 }

From d6a8bdcdc62087b279f4d1e3b4b6849413063cc9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 17 May 2015 19:26:43 +0300
Subject: [PATCH 1126/1143] azure sdk for python: update from 0.9.0 to 0.11.0

Conflicts:
	pkgs/top-level/python-packages.nix
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd96c9234ce2..20436811c494 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -750,13 +750,13 @@ let
   }));
 
   azure = buildPythonPackage rec {
-    version = "0.10.2";
+    version = "0.11.0";
     name = "azure-${version}";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/azure/${name}.zip";
-      md5 = "8eaa0f8e649b21b6527a5ee801cef33a";
+      md5 = "5499efd85c54c757c0e757b5407ee47f";
     };
 
     propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ];

From 8ed3ab50eab1ebfe7f1f295d03b395098ea09de6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 20 May 2015 13:22:20 +0300
Subject: [PATCH 1127/1143] azure-image: common: add sg3_utils

---
 nixos/modules/virtualisation/azure-common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
index 4fc7a085f868..47022c6887c3 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -30,7 +30,8 @@ with lib;
   networking.hostName = mkDefault "";
 
   # Always include cryptsetup so that NixOps can use it.
-  environment.systemPackages = [ pkgs.cryptsetup ];
+  # sg_scan is needed to finalize disk removal on older kernels
+  environment.systemPackages = [ pkgs.cryptsetup pkgs.sg3_utils ];
 
   networking.usePredictableInterfaceNames = false;
 

From 404608478d0d7d89fd7708995cf8e32c8d97364b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 20 May 2015 11:57:15 +0000
Subject: [PATCH 1128/1143] networkmanagerapplet: fix VPN plugins path. Closes
 #7908

---
 pkgs/tools/networking/network-manager-applet/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 1ea61b0fea2b..dc1079c8226b 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "0liia390bhkl09lvk2rplcwhmfbxpjffa1xszfawc0h00v9fivaz";
   };
 
+  configureFlags = [ "--sysconfdir=/etc" ];
+
   buildInputs = [
     gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib gsettings_desktop_schemas
     polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring
@@ -30,6 +32,11 @@ stdenv.mkDerivation rec {
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
   ];
 
+  preInstall =
+    ''
+      installFlagsArray=( "sysconfdir=$out/etc" )
+    '';
+
   preFixup = ''
     wrapProgram "$out/bin/nm-applet" \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \

From e98da673e4d2f7e45dff25c280ea7c29915fb0eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 May 2015 13:51:57 +0200
Subject: [PATCH 1129/1143] nixos-checkout: Add nixpkgs-channels as a remote

This way, you can do things like

  git checkout channels/nixos-14.12

to get the latest tested and built version of NixOS.
---
 .../installer/tools/nixos-checkout.nix        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix
index 3338e5119acb..9cdd8a74a188 100644
--- a/nixos/modules/installer/tools/nixos-checkout.nix
+++ b/nixos/modules/installer/tools/nixos-checkout.nix
@@ -1,5 +1,5 @@
-# This module generates the nixos-checkout script, which replaces the
-# Nixpkgs source trees in /etc/nixos/nixpkgs with a Git checkout.
+# This module generates the nixos-checkout script, which performs a
+# checkout of the Nixpkgs Git repository.
 
 { config, lib, pkgs, ... }:
 
@@ -37,8 +37,19 @@ let
             mv nixpkgs nixpkgs-$backupTimestamp
         fi
 
-        # Check out the NixOS and Nixpkgs sources.
-        git clone git://github.com/NixOS/nixpkgs.git nixpkgs
+        # Check out the Nixpkgs sources.
+        if ! [ -e nixpkgs/.git ]; then
+            echo "Creating repository in $prefix/nixpkgs..."
+            git init --quiet nixpkgs
+        else
+            echo "Updating repository in $prefix/nixpkgs..."
+        fi
+        cd nixpkgs
+        git remote add origin git://github.com/NixOS/nixpkgs.git || true
+        git remote add channels git://github.com/NixOS/nixpkgs-channels.git || true
+        git remote set-url origin --push git@github.com:NixOS/nixpkgs.git
+        git remote update
+        git checkout master
       '';
    };
 

From 10ce7ae76938da13aba228b4d79f32479a4ea085 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 May 2015 14:16:00 +0200
Subject: [PATCH 1130/1143] Document the nixpkgs-channels repo

This replaces update-channel-branches.sh with standard Git
invocations.
---
 nixos/doc/manual/development/sources.xml | 44 +++++++++++++++---------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index 3ac07da19f12..879a31e32c59 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -24,6 +24,9 @@ $ mkdir -p <replaceable>/my/sources</replaceable>
 $ cd <replaceable>/my/sources</replaceable>
 $ nix-env -i git
 $ git clone git://github.com/NixOS/nixpkgs.git
+$ cd nixpkgs
+$ git remote add channels git://github.com/NixOS/nixpkgs-channels.git
+$ git remote update channels
 </screen>
 
 This will check out the latest NixOS sources to
@@ -31,7 +34,12 @@ This will check out the latest NixOS sources to
 and the Nixpkgs sources to
 <filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>.
 (The NixOS source tree lives in a subdirectory of the Nixpkgs
-repository.)</para>
+repository.) The remote <literal>channels</literal> refers to a
+read-only repository that tracks the Nixpkgs/NixOS channels (see <xref
+linkend="sec-upgrading"/> for more information about channels). Thus,
+the Git branch <literal>channels/nixos-14.12</literal> will contain
+the latest built and tested version available in the
+<literal>nixos-14.12</literal> channel.</para>
 
 <para>It’s often inconvenient to develop directly on the master
 branch, since if somebody has just committed (say) a change to GCC,
@@ -40,28 +48,32 @@ rebuild everything from source. So you may want to create a local
 branch based on your current NixOS version:
 
 <screen>
-$ <replaceable>/my/sources</replaceable>/nixpkgs/maintainers/scripts/update-channel-branches.sh
-Fetching channels from https://nixos.org/channels:
- * [new branch]      cbe467e           -> channels/remotes/nixos-unstable
-Fetching channels from nixos-version:
- * [new branch]      9ff4738           -> channels/current-system
-Fetching channels from ~/.nix-defexpr:
- * [new branch]      0d4acad           -> channels/root/nixos
-$ git checkout -b local channels/current-system
+$ nixos-version
+14.04.273.ea1952b (Baboon)
+
+$ git checkout -b local ea1952b
 </screen>
 
-Or, to base your local branch on the latest version available in the
+Or, to base your local branch on the latest version available in a
 NixOS channel:
 
 <screen>
-$ <replaceable>/my/sources</replaceable>/nixpkgs/maintainers/scripts/update-channel-branches.sh
-$ git checkout -b local channels/remotes/nixos-unstable
+$ git remote update channels
+$ git checkout -b local channels/nixos-14.12
 </screen>
 
-You can then use <command>git rebase</command> to sync your local
-branch with the upstream branch, and use <command>git
-cherry-pick</command> to copy commits from your local branch to the
-upstream branch.</para>
+(Replace <literal>nixos-14.12</literal> with the name of the channel
+you want to use.) You can use <command>git merge</command> or
+<command>git rebase</command> to keep your local branch in sync with
+the channel, e.g.
+
+<screen>
+$ git remote update channels
+$ git merge channels/nixos-14.12
+</screen>
+
+You can use <command>git cherry-pick</command> to copy commits from
+your local branch to the upstream branch.</para>
 
 <para>If you want to rebuild your system using your (modified)
 sources, you need to tell <command>nixos-rebuild</command> about them

From 49fa221c624a9a0d982b1f1b77a0a9376abda352 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 20 May 2015 07:24:14 -0500
Subject: [PATCH 1131/1143] Update libbluedevil to 2.1

The bluedevil build has been failing since it was updated to
2.1.1. Bluedevil and libbluedevil must be kept at the same major version!
---
 pkgs/development/libraries/libbluedevil/default.nix | 8 +++++---
 pkgs/tools/bluetooth/bluedevil/default.nix          | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix
index 8443ddaa6062..44b8d47b5e3b 100644
--- a/pkgs/development/libraries/libbluedevil/default.nix
+++ b/pkgs/development/libraries/libbluedevil/default.nix
@@ -3,11 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "libbluedevil";
-  version = "1.9.3";
+  # bluedevil must have the same major version (x.y) as libbluedevil!
+  # do not update this package without checking bluedevil
+  version = "2.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0fdq083145mb3ynw14pc471ahp7is48wqpmswrvfz3hkyayriss3";
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c";
   };
 
   buildInputs = [ cmake qt4 ];
diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix
index 229b0512679b..e018972d2aaf 100644
--- a/pkgs/tools/bluetooth/bluedevil/default.nix
+++ b/pkgs/tools/bluetooth/bluedevil/default.nix
@@ -3,6 +3,8 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bluedevil";
+  # bluedevil must have the same major version (x.y) as libbluedevil!
+  # do not update this package without checking libbluedevil
   version = "2.1.1";
 
   src = fetchurl {

From cf6ab47be2e2417601af102f0b947e383c142d9e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 May 2015 16:18:33 +0200
Subject: [PATCH 1132/1143] oracle-instantclient: don't strip or patchelf this
 library

---
 pkgs/development/libraries/oracle-instantclient/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index ebb3aaeee582..a2c007194638 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -53,6 +53,9 @@ let requireSource = version: part: hash: (requireFile rec {
     done
   '';
 
+  dontStrip = true;
+  dontPatchELF = true;
+
   meta = with stdenv.lib; {
     description = "Oracle instant client libraries and sqlplus CLI.";
     longDescription = ''

From b4ceac808b5b6197a307f3539625727da59d452f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 19 May 2015 01:42:08 +0200
Subject: [PATCH 1133/1143] cassandra 2.0.14 -> 2.0.15

---
 pkgs/servers/nosql/cassandra/2.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix
index defb4f657d6c..adda65ce60a3 100644
--- a/pkgs/servers/nosql/cassandra/2.0.nix
+++ b/pkgs/servers/nosql/cassandra/2.0.nix
@@ -10,8 +10,8 @@
 
 let
 
-  version = "2.0.14";
-  sha256 = "06vsv141dk5i5z47nh1glkqpscjl5fgynbhaxb4yjab9lskwv5jk";
+  version = "2.0.15";
+  sha256 = "00rxmf8il9w1fmfpxfy9gbhbvgid5h8d80g3ljw25jscr00lcyh0";
 
 in
 

From 622bd2e15f2e4e1a992cefc3f07015a13e5a0246 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 19 May 2015 01:46:56 +0200
Subject: [PATCH 1134/1143] cassandra 2.1.4 -> 2.1.5

---
 pkgs/servers/nosql/cassandra/2.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index d62e8aa450c4..88a1d464b671 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -10,8 +10,8 @@
 
 let
 
-  version = "2.1.4";
-  sha256 = "1wdp1hcp541bwja0h5kb0ff2yy74mlhkr93chrlz2199lynynpgv";
+  version = "2.1.5";
+  sha256 = "1zrnmwyxcrdphcbi82ps0qp81yrn1gny4iv2wa4n4mwwp8pqwxid";
 
 in
 

From d01927269e395983d9c892b2b29b91dc253b8a3a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 19 May 2015 02:15:40 +0200
Subject: [PATCH 1135/1143] uae: use archive.org links

The original homepage is long gone (as is the tarball it hosted).
---
 pkgs/misc/emulators/uae/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix
index 85fc6df9520f..f877eff5c641 100644
--- a/pkgs/misc/emulators/uae/default.nix
+++ b/pkgs/misc/emulators/uae/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, pkgconfig, gtk, alsaLib, SDL}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "uae-0.8.29";
   src = fetchurl {
-    url = http://www.amigaemulator.org/files/sources/develop/uae-0.8.29.tar.bz2;
+    url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/${name}.tar.bz2";
     sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4";
   };
   configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Ultimate/Unix/Unusable Amiga Emulator";
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://www.amigaemulator.org;
+    homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/;
     maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }

From 8a53e1a312c6ac2c0d16eb8e910f36453cc0ca9d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 20 May 2015 16:42:13 +0200
Subject: [PATCH 1136/1143] geolite-legacy -> 2015-05-20

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 7715a0db2362..ef7511afb17f 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-05-07";
+  version = "2015-05-20";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
   srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
     "1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb";
   srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
-    "1y5b68s1giw01vw98c99qdhjiaxx6l4hrc2mx4rdaja46zic4maz";
+    "09vv3jg6gnz2k30pkwgcakvfvklfrkwsj0xq5q2awcw6ik0vkfcm";
   srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
-    "0crl31yc11w4jzgvbr9pgqd7x6ivpsgsip19s1g5xl71qbpmmjxm";
+    "1qdprh1idxa1l4s23lcjg33hi4i8qzlk4fjril2zcd3prff1xkz2";
 
   meta = with stdenv.lib; {
     inherit version;

From 57ec8364163f748b7b88167b52e5dea23e5a632e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <PascalWittmann@gmx.net>
Date: Wed, 20 May 2015 18:06:18 +0200
Subject: [PATCH 1137/1143] aliceml: update version string

---
 pkgs/development/compilers/aliceml/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
index a57cd5b60064..6fbc1a350f5c 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -1,7 +1,7 @@
 {stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome, pango, sqlite, libxml2, zlib, gmp, smlnj }:
 
 stdenv.mkDerivation {
-  name = "aliceml-1.4-493cd356";
+  name = "aliceml-1.4-7d44dc8e";
 
   src = fetchgit {
     url = "https://github.com/aliceml/aliceml";

From 824da827ac40eea4ff8dfe909c368164ab32f22b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 20 May 2015 18:53:06 +0200
Subject: [PATCH 1138/1143] phpPackages.redis: update from 2.2.5 to 2.2.7

---
 pkgs/top-level/php-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 9187d5606028..fe06043a8596 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -90,9 +90,8 @@ let self = with self; {
   };
 
   redis = buildPecl {
-    name = "redis-2.2.5";
-
-    sha256 = "0hrk0lf8h6l30zrjld29csl186zb1cl2rz1gfn9dma33np4iisyw";
+    name = "redis-2.2.7";
+    sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm";
   };
 
   composer = pkgs.stdenv.mkDerivation rec {

From e3ed4b590b0f867a430c13ea92dd496a595ba78e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 20 May 2015 14:09:15 -0400
Subject: [PATCH 1139/1143] Fix tarball

---
 pkgs/applications/audio/gtkpod/default.nix                   | 2 +-
 pkgs/servers/monitoring/prometheus/alertmanager/default.nix  | 2 +-
 pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index 9c08b2ab6d7d..f01abb13e67c 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser
     flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
-    gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme
+    gnome.gdl gnome.defaultIconTheme
     hicolor_icon_theme ];
 
   patchPhase = ''
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
index 4ef870bfcf93..06dfc1ef1c97 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
   buildInputs = [
     goPackages.glog
     goPackages.protobuf
-    goPackages.fsnotify
+    goPackages.fsnotify.v1
     goPackages.httprouter
     goPackages.prometheus.client_golang
     goPackages.pushover
diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
index da15952f0f37..b6548b90f299 100644
--- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
@@ -13,7 +13,7 @@ goPackages.buildGoPackage rec {
   };
 
   buildInputs = with goPackages; [
-    fsnotify
+    fsnotify.v1
     prometheus.client_golang
   ];
 

From 64ecc21b9a5e49fa894b21ae260d19a34c87e5f0 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 31 Mar 2015 09:34:48 +0200
Subject: [PATCH 1140/1143] Add mozc and its dependency zinnia.

---
 pkgs/tools/inputmethods/mozc/default.nix      | 73 +++++++++++++++++++
 .../tegaki-zinnia-japanese/default.nix        | 23 ++++++
 pkgs/tools/inputmethods/zinnia/default.nix    | 23 ++++++
 pkgs/top-level/all-packages.nix               |  7 ++
 4 files changed, 126 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/mozc/default.nix
 create mode 100644 pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
 create mode 100644 pkgs/tools/inputmethods/zinnia/default.nix

diff --git a/pkgs/tools/inputmethods/mozc/default.nix b/pkgs/tools/inputmethods/mozc/default.nix
new file mode 100644
index 000000000000..20789a33a0c0
--- /dev/null
+++ b/pkgs/tools/inputmethods/mozc/default.nix
@@ -0,0 +1,73 @@
+{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
+
+let
+  japanese_usage_dictionary = fetchsvn {
+    url = "http://japanese-usage-dictionary.googlecode.com/svn/trunk";
+    rev = "10";
+    sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
+  };
+in clangStdenv.mkDerivation rec {
+  name = "mozc-${version}";
+  version = "2015-05-02";
+
+  meta = with clangStdenv.lib; {
+    description = "Japanese input method from Google";
+    homepage = http://code.google.com/p/mozc/;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.gebner ];
+  };
+
+  nativeBuildInputs = [ gyp which ninja python pkgconfig ];
+  buildInputs = [ protobuf ibus gtk zinnia qt4 libxcb ];
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "mozc";
+    rev = "d9783737ecfcb68c3d98d84e7052d716f4d0e0cb";
+    sha256 = "52a83658e2e4a7b38e31a4085682be24c9c5f4c51a01578598a30b9833827b72";
+  };
+  postUnpack = ''
+    ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
+  '';
+
+  configurePhase = ''
+    export GYP_DEFINES="ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc ibus_mozc_icon_path=$out/share/ibus-mozc/product_icon.png document_dir=$out/share/doc/mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model use_libprotobuf=1"
+    python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc
+  '';
+
+  buildPhase = ''
+    python src/build_mozc.py build -c Release \
+      unix/ibus/ibus.gyp:ibus_mozc \
+      unix/emacs/emacs.gyp:mozc_emacs_helper \
+      server/server.gyp:mozc_server \
+      gui/gui.gyp:mozc_tool \
+      renderer/renderer.gyp:mozc_renderer
+  '';
+
+  checkPhase = ''
+    python src/build_mozc.py runtests -c Release
+  '';
+
+  installPhase = ''
+    install -D -m 755 src/out_linux/Release/mozc_server $out/lib/mozc/mozc_server
+    install    -m 755 src/out_linux/Release/mozc_tool   $out/lib/mozc/mozc_tool
+
+    install -d $out/share/doc/mozc
+    install -m 644 src/data/installer/*.html $out/share/doc/mozc/
+
+    install -D -m 755 src/out_linux/Release/ibus_mozc       $out/lib/ibus-mozc/ibus-engine-mozc
+    install -D -m 644 src/out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml
+    install -D -m 644 src/data/images/unix/ime_product_icon_opensource-32.png $out/share/ibus-mozc/product_icon.png
+    install    -m 644 src/data/images/unix/ui-tool.png          $out/share/ibus-mozc/tool.png
+    install    -m 644 src/data/images/unix/ui-properties.png    $out/share/ibus-mozc/properties.png
+    install    -m 644 src/data/images/unix/ui-dictionary.png    $out/share/ibus-mozc/dictionary.png
+    install    -m 644 src/data/images/unix/ui-direct.png        $out/share/ibus-mozc/direct.png
+    install    -m 644 src/data/images/unix/ui-hiragana.png      $out/share/ibus-mozc/hiragana.png
+    install    -m 644 src/data/images/unix/ui-katakana_half.png $out/share/ibus-mozc/katakana_half.png
+    install    -m 644 src/data/images/unix/ui-katakana_full.png $out/share/ibus-mozc/katakana_full.png
+    install    -m 644 src/data/images/unix/ui-alpha_half.png    $out/share/ibus-mozc/alpha_half.png
+    install    -m 644 src/data/images/unix/ui-alpha_full.png    $out/share/ibus-mozc/alpha_full.png
+    install -D -m 755 src/out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer
+  '';
+}
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
new file mode 100644
index 000000000000..55cf09455823
--- /dev/null
+++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "tegaki-zinnia-japanese-${version}";
+  version = "0.3";
+
+  src = fetchurl {
+    url = "http://www.tegaki.org/releases/0.3/models/tegaki-zinnia-japanese-0.3.zip";
+    sha256 = "1nmg9acxhcqly9gwkyb9m0hpy76fll91ywk4b1q4xms0ajxip1h7";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Japanese handwriting model for the Zinnia engine";
+    homepage = http://tegaki.org/;
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.gebner ];
+  };
+
+  buildInputs = [ unzip ];
+
+  makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ];
+}
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
new file mode 100644
index 000000000000..fd8c9bd7c79d
--- /dev/null
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "zinnia-${version}";
+  version = "2015-03-15";
+
+  src = fetchFromGitHub {
+    owner = "taku910";
+    repo = "zinnia";
+    rev = "d8de1180d5175d7579e6c41b000f1ab4dd9cd697";
+    sha256 = "ac09a16c04c5ef9b46626984e627250dc717d85711d14f1bbfa7f1ca0ca713dc";
+  };
+
+  setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)";
+
+  meta = with stdenv.lib; {
+    description = "Online hand recognition system with machine learning";
+    homepage = "http://taku910.github.io/zinnia/";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.gebner ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9936330936c2..4a20ae872b06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1045,6 +1045,10 @@ let
 
   anthy = callPackage ../tools/inputmethods/anthy { };
 
+  mozc = callPackage ../tools/inputmethods/mozc {
+    inherit (pythonPackages) gyp;
+  };
+
   ibus = callPackage ../tools/inputmethods/ibus { };
 
   ibus-qt = callPackage ../tools/inputmethods/ibus-qt { };
@@ -3315,6 +3319,9 @@ let
 
   zile = callPackage ../applications/editors/zile { };
 
+  zinnia = callPackage ../tools/inputmethods/zinnia { };
+  tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { };
+
   zip = callPackage ../tools/archivers/zip { };
 
   zpaq = callPackage ../tools/archivers/zpaq { };

From 97160a8644dddc2d08a2f40ee1bed7ccd53f9cc0 Mon Sep 17 00:00:00 2001
From: Ozan Sener <ozan@ozansener.com>
Date: Mon, 19 Jan 2015 02:14:02 +0200
Subject: [PATCH 1141/1143] Add Thrust 0.7.6

---
 lib/maintainers.nix                       |  1 +
 pkgs/development/tools/thrust/default.nix | 47 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 ++
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/tools/thrust/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 875d66e04bd4..bf1e1bba1c8f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -151,6 +151,7 @@
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   olcai = "Erik Timan <dev@timan.info>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
+  osener = "Ozan Sener <ozan@ozansener.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";
   paholg = "Paho Lurie-Gregg <paho@paholg.com>";
   pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
new file mode 100644
index 000000000000..02b21b3569f8
--- /dev/null
+++ b/pkgs/development/tools/thrust/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk
+, pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss
+, xlibs, libcap, unzip
+}:
+
+let
+  thrustEnv = buildEnv {
+    name = "env-thrust";
+    paths = [
+      stdenv.cc.gcc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf
+      cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11
+      xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite
+      xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap
+    ];
+  };
+in stdenv.mkDerivation rec {
+  name = "thrust-${version}";
+  version = "0.7.6";
+
+  src = fetchurl {
+    url = "https://github.com/breach/thrust/releases/download/v${version}/thrust-v${version}-linux-x64.zip";
+    sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc";
+  };
+
+  buildInputs = [ thrustEnv makeWrapper unzip ];
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/libexec/thrust
+    unzip -d $out/libexec/thrust/ $src
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $out/libexec/thrust/thrust_shell
+    wrapProgram $out/libexec/thrust/thrust_shell \
+      --prefix "LD_LIBRARY_PATH" : "${thrustEnv}/lib:${thrustEnv}/lib64"
+    ln -s $out/libexec/thrust/thrust_shell $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Chromium-based cross-platform / cross-language application framework";
+    homepage = https://github.com/breach/thrust;
+    license = [ licenses.mit ];
+    maintainers = [ maintainers.osener ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d582114946cd..ca79a3e9a924 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4479,6 +4479,10 @@ let
   teyjus = callPackage ../development/compilers/teyjus {
     omake = omake_rc1;
   };
+  
+  thrust = callPackage ../development/tools/thrust {
+    gconf = pkgs.gnome.GConf;
+  };
 
   tinycc = callPackage ../development/compilers/tinycc { };
 

From 2043857a7331f927c78f920be55ba0d36c6438c5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 20 May 2015 21:14:45 +0200
Subject: [PATCH 1142/1143] youtube-dl: update from 2015-05-15 to 2015-05-20

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 12f6cb18aa2e..14d6dccb041f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
-  version = "2015.05.15";
+  version = "2015.05.20";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0b4fnlgfnwdh1z8avydbc8rr75jpcyvfpvs39ln1gh7m8vyxwjz6";
+    sha256 = "1crfada7vq3d24062wr06sfam66cf14j06wnhg7w5ljzrbynvpll";
   };
 
   buildInputs = [ python makeWrapper zip pandoc ];

From 98ad87fb4de1fddc91fdbce6e0138a1420d8d66f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 20 May 2015 15:41:23 -0500
Subject: [PATCH 1143/1143] t1lib: Conditionalize a recent change for Darwin

---
 pkgs/development/libraries/t1lib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 039dc59774c5..5ed773c56d2c 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXaw ];
   buildFlags = "without_doc";
 
-  postInstall = "chmod +x $out/lib/*.so.*"; # ??
+  postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
 
 }