From 14ee766024a7d1cf97e215c66d2193012ee346ca Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 18:15:50 -0500
Subject: [PATCH 001/144] openblas: set NUM_THREADS and USE_OPENMP

---
 pkgs/development/libraries/science/math/openblas/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 67d95f97e07..0597cbae77a 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -14,6 +14,8 @@ let local = config.openblas.preferLocalBuild or false;
         "DYNAMIC_ARCH=1"
         "NUM_THREADS=64"
         "BINARY=${binary}"
+        "USE_OPENMP=1"
+        "NUM_THREADS=64"
       ];
     localFlags = config.openblas.flags or
       optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];

From 86fb034008b007e4e9a4a595f6d789e105958772 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 18:16:06 -0500
Subject: [PATCH 002/144] openblas: build with native-width integers by default

---
 .../science/math/openblas/default.nix         | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 0597cbae77a..ef76c33fb6d 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils
+# Most packages depending on openblas expect integer width to match pointer width,
+# but some expect to use 32-bit integers always (for compatibility with reference BLAS).
+, blas64 ? null
+}:
 
 with stdenv.lib;
 
 let local = config.openblas.preferLocalBuild or false;
     binary =
-      {
-        i686-linux = "32";
+      { i686-linux = "32";
         x86_64-linux = "64";
         x86_64-darwin = "64";
       }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
     genericFlags =
-      [
-        "DYNAMIC_ARCH=1"
-        "NUM_THREADS=64"
-        "BINARY=${binary}"
-        "USE_OPENMP=1"
+      [ "DYNAMIC_ARCH=1"
         "NUM_THREADS=64"
       ];
     localFlags = config.openblas.flags or
       optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
+    blas64Orig = blas64;
 in
 stdenv.mkDerivation rec {
   version = "0.2.14";
@@ -45,9 +45,13 @@ stdenv.mkDerivation rec {
       # thus is not an explicit dependency.
       "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
       ''PREFIX="''$(out)"''
-      "INTERFACE64=1"
+      "BINARY=${binary}"
+      "USE_OPENMP=1"
+      "INTERFACE64=${if blas64 then "1" else "0"}"
     ];
 
+  blas64 = if blas64Orig != null then blas64Orig else hasPrefix "x86_64" stdenv.system;
+
   meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;

From a376a68f74eebeeee85e5f7a876d14f449623a17 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 06:27:20 -0500
Subject: [PATCH 003/144] openblas: add openblasCompat

openblasCompat uses 32-bit integers on all platforms for compatibility
with standard BLAS and LAPACK.
---
 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 6b54674cb65..076e34b263c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13877,6 +13877,10 @@ let
     liblapack = liblapack_3_5_0;
   };
 
+  # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
+  # standard BLAS and LAPACK.
+  openblasCompat = openblas.override { blas64 = false; };
+
   mathematica = callPackage ../applications/science/math/mathematica { };
   mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };
 

From a0a5fb46ff889be6b5c66521a896f3e206d76e36 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 06:27:57 -0500
Subject: [PATCH 004/144] openblas: use default liblapack

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 076e34b263c..0e74825b67d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13873,9 +13873,7 @@ let
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
-  openblas = callPackage ../development/libraries/science/math/openblas {
-    liblapack = liblapack_3_5_0;
-  };
+  openblas = callPackage ../development/libraries/science/math/openblas { };
 
   # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
   # standard BLAS and LAPACK.

From b4eb8a5bc32c99b8ee7c3fcd2d414ce10d39b437 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 06:28:37 -0500
Subject: [PATCH 005/144] openblas: remove old expressions

---
 .../science/math/openblas/0.2.10.nix          | 37 -------------------
 .../libraries/science/math/openblas/0.2.2.nix | 37 -------------------
 2 files changed, 74 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/openblas/0.2.10.nix
 delete mode 100644 pkgs/development/libraries/science/math/openblas/0.2.2.nix

diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
deleted file mode 100644
index ec4422ce895..00000000000
--- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
-
-let local = config.openblas.preferLocalBuild or false;
-    localTarget = config.openblas.target or "";
-in
-stdenv.mkDerivation rec {
-  version = "0.2.10";
-
-  name = "openblas-${version}";
-  src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
-    sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
-    name = "openblas-${version}.tar.gz";
-  };
-
-  preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
-
-  buildInputs = [gfortran perl];
-
-  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
-
-  target = if local then localTarget else
-    if cpu == "i686" then "P2" else
-    if cpu == "x86_64" then "CORE2" else
-     # allow autodetect
-      "";
-
-  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
-
-  meta = with stdenv.lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.bsd3;
-    homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
deleted file mode 100644
index c476dac955a..00000000000
--- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
-
-let local = config.openblas.preferLocalBuild or false;
-    localTarget = config.openblas.target or "";
-in
-stdenv.mkDerivation rec {
-  version = "0.2.2";
-
-  name = "openblas-${version}";
-  src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
-    sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr";
-    name = "openblas-${version}.tar.gz";
-  };
-
-  preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
-
-  buildInputs = [gfortran perl];
-
-  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
-
-  target = if local then localTarget else
-    if cpu == "i686" then "P2" else
-    if cpu == "x86_64" then "CORE2" else
-     # allow autodetect
-      "";
-
-  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\"";
-
-  meta = with stdenv.lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.bsd3;
-    homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}

From 982aabc5617f144626a108fa6dc57bdcb9592e87 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 17:31:34 -0500
Subject: [PATCH 006/144] suitesparse_4_2: build with openblas

Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
---
 .../science/math/suitesparse/4.2.nix          | 34 +++++++++++++++----
 .../math/suitesparse/disable-metis.patch      | 18 ----------
 2 files changed, 28 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/disable-metis.patch

diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 4d27701b135..16174a80212 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -1,22 +1,44 @@
-{ stdenv, fetchurl, blas, liblapack, gfortran } :
+{ stdenv, fetchurl, gfortran, openblas }:
+
+let
+  int_t = if openblas.blas64 then "int64_t" else "int32_t";
+in
 stdenv.mkDerivation rec {
   version = "4.2.1";
   name = "suitesparse-${version}";
   src = fetchurl {
     url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
-    sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";  			
+    sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";
   };
-  buildInputs = [blas liblapack gfortran] ;
-  patches = [./disable-metis.patch];
+
+  nativeBuildInputs = [ gfortran ];
+  buildInputs = [ openblas ];
 
   preConfigure = ''
-    export PREFIX=$out
     mkdir -p $out/lib
     mkdir -p $out/include
+
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/METIS .*$/METIS =/' \
+        -e 's/METIS_PATH .*$/METIS_PATH =/' \
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
   '';
 
-  makeFlags = ''PREFIX=\"$(out)\" INSTALL_LIB=$(out)/lib INSTALL_INCLUDE=$(out)/include'';
+  makeFlags = [
+    "PREFIX=\"$(out)\""
+    "INSTALL_LIB=$(out)/lib"
+    "INSTALL_INCLUDE=$(out)/include"
+    "BLAS=-lopenblas"
+    "LAPACK="
+  ];
 
   NIX_CFLAGS = "-fPIC";
 
+  meta = with stdenv.lib; {
+    homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
+    description = "A suite of sparse matrix algorithms";
+    license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
+    maintainers = with maintainers; [ ttuegel ];
+  };
 }
diff --git a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch
deleted file mode 100644
index 5b735eb7d3c..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile
-*** SuiteSparse/UMFPACK/Demo/Makefile	2009-11-11 21:09:45.000000000 +0100
---- SuiteSparse-new/UMFPACK/Demo/Makefile	2010-08-02 12:53:16.000000000 +0200
-***************
-*** 40,46 ****
-  ../../CAMD/Lib/libcamd.a:
-  	( cd ../../CAMD ; $(MAKE) library )
-  
-- $(METIS):
-- 	( cd $(METIS_PATH) && $(MAKE) )
-  
-  UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
---- 40,44 ----
-  ../../CAMD/Lib/libcamd.a:
-  	( cd ../../CAMD ; $(MAKE) library )
-  
-  
-  UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \

From b02f300c445296c9580d9ccd1d7000a09ac10b0d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 17:33:11 -0500
Subject: [PATCH 007/144] suitesparse_4_4_1: build with openblas

Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
---
 .../math/suitesparse/0001-disable-metis.patch | 36 ------------------
 .../science/math/suitesparse/default.nix      | 38 +++++++++++--------
 2 files changed, 23 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch

diff --git a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch
deleted file mode 100644
index b0f7715f755..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 456b26d0c9101adaa5876954baac0ca0e872dab6 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:18:01 -0600
-Subject: [PATCH 1/3] disable metis
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index ba2da23..e1514bf 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -212,8 +212,8 @@ XERBLA =
- # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
- # You may wish to use an absolute path.  METIS is optional.  Compile
- # CHOLMOD with -DNPARTITION if you do not wish to use METIS.
--METIS_PATH = ../../metis-4.0
--METIS = ../../metis-4.0/libmetis.a
-+# METIS_PATH = ../../metis-4.0
-+# METIS = ../../metis-4.0/libmetis.a
- 
- #------------------------------------------------------------------------------
- # UMFPACK configuration:
-@@ -273,7 +273,7 @@ UMFPACK_CONFIG =
- # -DNSUNPERF        for Solaris only.  If defined, do not use the Sun
- #                   Performance Library
- 
--CHOLMOD_CONFIG = $(GPU_CONFIG)
-+CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION
- 
- # uncomment this line to compile CHOLMOD without METIS:
- # CHOLMOD_CONFIG = -DNPARTITION
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index add4ca9a08f..ccd0c378a81 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,33 +1,41 @@
-{ stdenv, fetchurl, substituteAll
-, atlasWithLapack, gfortran }:
+{ stdenv, fetchurl, gfortran, openblas }:
 
 let
-  name = "suitesparse-4.4.1";
+  version = "4.4.1";
+  name = "suitesparse-${version}";
+
+  int_t = if openblas.blas64 then "int64_t" else "int32_t";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.1.tar.gz";
+    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
     sha256 = "0y8i6dizrr556xggpjyc7wijjv4jbizhssmjj4jv8n1s7zxy2z0n";
   };
 
-  patches = [
-    ./0001-disable-metis.patch
-    ./0002-set-install-dir.patch
-    (substituteAll {
-      src = ./0003-blas-lapack-flags.patch;
-      blasFlags = "-lf77blas -latlas -lcblas -lgfortran";
-      lapackFlags= "-llapack -latlas -lcblas";
-    })
-  ];
-
   preConfigure = ''
     substituteAllInPlace SuiteSparse_config/SuiteSparse_config.mk
     mkdir -p $out/lib
     mkdir -p $out/include
+
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/METIS .*$/METIS =/' \
+        -e 's/METIS_PATH .*$/METIS_PATH =/' \
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
   '';
 
+  makeFlags = [
+    "PREFIX=\"$(out)\""
+    "INSTALL_LIB=$(out)/lib"
+    "INSTALL_INCLUDE=$(out)/include"
+    "BLAS=-lopenblas"
+    "LAPACK="
+  ];
+
+  NIX_CFLAGS = "-fPIC";
+
   postInstall = ''
     # Install documentation
     outdoc=$out/share/doc/${name}
@@ -47,7 +55,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ gfortran ];
-  buildInputs = [ atlasWithLapack ];
+  buildInputs = [ openblas ];
 
   meta = with stdenv.lib; {
     homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;

From e5ee1a0577164d7e253ba69a2239f37b78a9c3c0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 17:34:31 -0500
Subject: [PATCH 008/144] suitesparse: remove unnecessary patches

---
 .../suitesparse/0002-set-install-dir.patch    |  27 --
 .../suitesparse/0003-blas-lapack-flags.patch  |  27 --
 .../math/suitesparse/SuiteSparse_config.mk    | 452 ------------------
 .../science/math/suitesparse/default.nix      |   1 -
 4 files changed, 507 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk

diff --git a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch b/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch
deleted file mode 100644
index ef861f68091..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e0fee492a315ce1ef8697b056af210beb1465334 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:18:12 -0600
-Subject: [PATCH 2/3] set install dir
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index e1514bf..f1046a6 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -95,8 +95,8 @@ F77LIB =
- # LIB = -lm
- 
- # For "make install"
--INSTALL_LIB = /usr/local/lib
--INSTALL_INCLUDE = /usr/local/include
-+INSTALL_LIB = @out@/lib
-+INSTALL_INCLUDE = @out@/include
- 
- # Which version of MAKE you are using (default is "make")
- # MAKE = make
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch b/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch
deleted file mode 100644
index db0b1c45655..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a99cca30cfd965683564ae024e8ecc615c61697a Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:24:08 -0600
-Subject: [PATCH 3/3] blas lapack flags
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index f1046a6..1710162 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -119,8 +119,8 @@ INSTALL_INCLUDE = @out@/include
- # naming the BLAS and LAPACK library (*.a or *.so) files.
- 
- # This is probably slow ... it might connect to the Standard Reference BLAS:
--  BLAS = -lblas -lgfortran
--  LAPACK = -llapack
-+  BLAS = @blasFlags@
-+  LAPACK = @lapackFlags@
- 
- # MKL 
- # BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk b/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk
deleted file mode 100644
index 157a20d7b5a..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk
+++ /dev/null
@@ -1,452 +0,0 @@
-#===============================================================================
-# SuiteSparse_config.mk:  common configuration file for the SuiteSparse
-#===============================================================================
-
-# This file contains all configuration settings for all packages authored or
-# co-authored by Tim Davis:
-#
-# Package Version       Description
-# ------- -------       -----------
-# AMD     1.2 or later  approximate minimum degree ordering
-# COLAMD  2.4 or later  column approximate minimum degree ordering
-# CCOLAMD 1.0 or later  constrained column approximate minimum degree ordering
-# CAMD    any           constrained approximate minimum degree ordering
-# UMFPACK 4.5 or later  sparse LU factorization, with the BLAS
-# CHOLMOD any           sparse Cholesky factorization, update/downdate
-# KLU     0.8 or later  sparse LU factorization, BLAS-free
-# BTF     0.8 or later  permutation to block triangular form
-# LDL     1.2 or later  concise sparse LDL'
-# CXSparse any          extended version of CSparse (int/long, real/complex)
-# SuiteSparseQR any     sparse QR factorization
-# RBio    2.0 or later  read/write sparse matrices in Rutherford-Boeing format
-#
-# By design, this file is NOT included in the CSparse makefile.
-# That package is fully stand-alone.  CSparse is primarily for teaching;
-# production code should use CXSparse.
-#
-# The SuiteSparse_config directory and the above packages should all appear in
-# a single directory, in order for the Makefile's within each package to find
-# this file.
-#
-# To enable an option of the form "# OPTION = ...", edit this file and
-# delete the "#" in the first column of the option you wish to use.
-#
-# The use of METIS 4.0.1 is optional.  To exclude METIS, you must compile with
-# CHOLMOD_CONFIG set to -DNPARTITION.  See below for details.  However, if you
-# do not have a metis-4.0 directory inside the SuiteSparse directory, the
-# */Makefile's that optionally rely on METIS will automatically detect this
-# and compile without METIS.
-
-#------------------------------------------------------------------------------
-# Generic configuration
-#------------------------------------------------------------------------------
-
-# Using standard definitions from the make environment, typically:
-#
-#   CC              cc      C compiler
-#   CXX             g++     C++ compiler
-#   CFLAGS          [ ]     flags for C and C++ compiler
-#   CPPFLAGS        [ ]     flags for C and C++ compiler
-#   TARGET_ARCH     [ ]     target architecture
-#   FFLAGS          [ ]     flags for Fortran compiler
-#   RM              rm -f   delete a file
-#   AR              ar      create a static *.a library archive
-#   ARFLAGS         rv      flags for ar
-#   MAKE            make    make itself (sometimes called gmake)
-#
-# You can redefine them here, but by default they are used from the
-# default make environment.
-
-# To use OpenMP add -openmp to the CFLAGS
-# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
-# as the number of cores per socket on the machine being used to maximize
-# memory performance
-  CFLAGS = 
-# CFLAGS = -g
-# for the icc compiler and OpenMP:
-# CFLAGS = -openmp
-
-# C and C++ compiler flags.  The first three are standard for *.c and *.cpp
-# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
-  CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
-# for the MKL BLAS:
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
-# with no optimization:
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH)     -fexceptions -fPIC
-
-# ranlib, and ar, for generating libraries.  If you don't need ranlib,
-# just change it to RANLAB = echo
-RANLIB = ranlib
-ARCHIVE = $(AR) $(ARFLAGS)
-
-# copy and delete a file
-CP = cp -f
-MV = mv -f
-
-# Fortran compiler (not required for 'make' or 'make library')
-F77 = gfortran
-F77FLAGS = $(FFLAGS) -O
-F77LIB =
-
-# C and Fortran libraries.  Remove -lrt if you don't have it.
-  LIB = -lm -lrt
-# Using the following requires CF = ... -DNTIMER on POSIX C systems.
-# LIB = -lm
-
-# For "make install"
-INSTALL_LIB = @out@/lib
-INSTALL_INCLUDE = @out@/include
-
-# Which version of MAKE you are using (default is "make")
-# MAKE = make
-# MAKE = gmake
-
-#------------------------------------------------------------------------------
-# BLAS and LAPACK configuration:
-#------------------------------------------------------------------------------
-
-# UMFPACK and CHOLMOD both require the BLAS.  CHOLMOD also requires LAPACK.
-# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
-# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
-# LAPACK is at http://www.netlib.org/lapack/ .  You can use the standard
-# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
-# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
-# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
-# on a 2.5Ghz dual-core AMD Opteron.
-
-# These settings will probably not work, since there is no fixed convention for
-# naming the BLAS and LAPACK library (*.a or *.so) files.
-
-# This is probably slow ... it might connect to the Standard Reference BLAS:
-  BLAS = -lf77blas -latlas -lcblas -lgfortran
-  LAPACK = -llapack -latlas -lcblas
-
-# MKL 
-# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
-# LAPACK = 
-
-# ACML
-# BLAS = -lacml -lgfortran
-# LAPACK =
-
-# OpenBLAS
-# BLAS = -lopenblas
-# LAPACK = 
-
-# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
-# statement.  Rather, the Goto BLAS is written by Dr. Kazushige Goto.
-# Using the Goto BLAS:
-# BLAS = -lgoto -lgfortran -lgfortranbegin
-# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
-
-# Using non-optimized versions:
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin
-# LAPACK = -llapack_plain
-
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin
-# LAPACK = -llapack
-
-# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
-# the BLAS.  Also, the standard xerbla requires the Fortran I/O library, and
-# stops the application program if an error occurs.  A C version of xerbla
-# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
-# includes a Fortran-callable xerbla routine that prints nothing and does not
-# stop the application program.  This is optional.
-
-# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a 
-
-# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
-# use this option:
-XERBLA = 
-
-# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
-# use this:
-
-# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a 
-
-#------------------------------------------------------------------------------
-# GPU configuration for CHOLMOD and SPQR
-#------------------------------------------------------------------------------
-
-# no cuda
-  CUDA_ROOT     =
-  GPU_BLAS_PATH =
-  GPU_CONFIG    =
-  CUDA_PATH     =
-  CUDART_LIB    =
-  CUBLAS_LIB    =
-  CUDA_INC_PATH =
-  NV20          =
-  NV30          =
-  NV35          =
-  NVCC          = echo
-  NVCCFLAGS     =
-
-# with cuda for CHOLMOD
-# CUDA_ROOT     = /usr/local/cuda
-# GPU_BLAS_PATH = $(CUDA_ROOT)
-# with 4 cores (default):
-# GPU_CONFIG    = -I$(CUDA_ROOT)/include -DGPU_BLAS
-# with 10 cores:
-# GPU_CONFIG    = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
-# CUDA_PATH     = $(CUDA_ROOT)
-# CUDART_LIB    = $(CUDA_ROOT)/lib64/libcudart.so
-# CUBLAS_LIB    = $(CUDA_ROOT)/lib64/libcublas.so
-# CUDA_INC_PATH = $(CUDA_ROOT)/include/
-# NV20          = -arch=sm_20 -Xcompiler -fPIC
-# NV30          = -arch=sm_30 -Xcompiler -fPIC
-# NV35          = -arch=sm_35 -Xcompiler -fPIC
-# NVCC          = $(CUDA_ROOT)/bin/nvcc
-# NVCCFLAGS     = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
-
-# was NVCC      = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
-
-#------------------------------------------------------------------------------
-# METIS, optionally used by CHOLMOD
-#------------------------------------------------------------------------------
-
-# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
-# compile CHOLMOD with the -DNPARTITION flag.
-
-# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
-# You may wish to use an absolute path.  METIS is optional.  Compile
-# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-# METIS_PATH = ../../metis-4.0
-# METIS = ../../metis-4.0/libmetis.a
-
-#------------------------------------------------------------------------------
-# UMFPACK configuration:
-#------------------------------------------------------------------------------
-
-# Configuration flags for UMFPACK.  See UMFPACK/Source/umf_config.h for details.
-#
-# -DNBLAS       do not use the BLAS.  UMFPACK will be very slow.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#               LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF    do not use the Sun Perf. Library (default is use it on Solaris)
-# -DNRECIPROCAL do not multiply by the reciprocal
-# -DNO_DIVIDE_BY_ZERO   do not divide by zero
-# -DNCHOLMOD    do not use CHOLMOD as a ordering method.  If -DNCHOLMOD is
-#               included in UMFPACK_CONFIG, then UMFPACK  does not rely on
-#               CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
-
-UMFPACK_CONFIG =
-
-# uncomment this line to compile UMFPACK without CHOLMOD:
-# UMFPACK_CONFIG = -DNCHOLMOD
-
-#------------------------------------------------------------------------------
-# CHOLMOD configuration
-#------------------------------------------------------------------------------
-
-# CHOLMOD Library Modules, which appear in libcholmod.a:
-# Core          requires: none
-# Check         requires: Core
-# Cholesky      requires: Core, AMD, COLAMD.  optional: Partition, Supernodal
-# MatrixOps     requires: Core
-# Modify        requires: Core
-# Partition     requires: Core, CCOLAMD, METIS.  optional: Cholesky
-# Supernodal    requires: Core, BLAS, LAPACK
-#
-# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
-# Tcov          requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
-#               optional: Partition
-# Valgrind      same as Tcov
-# Demo          requires: Core, Check, Cholesky, MatrixOps, Supernodal
-#               optional: Partition
-#
-# Configuration flags:
-# -DNCHECK          do not include the Check module.       License GNU LGPL
-# -DNCHOLESKY       do not include the Cholesky module.    License GNU LGPL
-# -DNPARTITION      do not include the Partition module.   License GNU LGPL
-#                   also do not include METIS.
-# -DNCAMD           do not use CAMD, etc from Partition module.    GNU LGPL
-# -DNGPL            do not include any GNU GPL Modules in the CHOLMOD library:
-# -DNMATRIXOPS      do not include the MatrixOps module.   License GNU GPL
-# -DNMODIFY         do not include the Modify module.      License GNU GPL
-# -DNSUPERNODAL     do not include the Supernodal module.  License GNU GPL
-#
-# -DNPRINT          do not print anything.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#                   LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF        for Solaris only.  If defined, do not use the Sun
-#                   Performance Library
-
-CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION
-
-# uncomment this line to compile CHOLMOD without METIS:
-# CHOLMOD_CONFIG = -DNPARTITION
-
-#------------------------------------------------------------------------------
-# SuiteSparseQR configuration:
-#------------------------------------------------------------------------------
-
-# The SuiteSparseQR library can be compiled with the following options:
-#
-# -DNPARTITION      do not include the CHOLMOD partition module
-# -DNEXPERT         do not include the functions in SuiteSparseQR_expert.cpp
-# -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
-
-# default, without timing, without TBB:
-SPQR_CONFIG = $(GPU_CONFIG)
-# with TBB:
-# SPQR_CONFIG = -DHAVE_TBB
-
-# This is needed for IBM AIX: (but not for and C codes, just C++)
-# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
-
-# with TBB, you must select this:
-# TBB = -ltbb
-# without TBB:
-TBB =
-
-#------------------------------------------------------------------------------
-# code formatting
-#------------------------------------------------------------------------------
-
-# Use "grep" only, if you do not have "indent"  
-# PRETTY = grep -v "^\#"
-# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
-  PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
-
-#------------------------------------------------------------------------------
-# Linux
-#------------------------------------------------------------------------------
-
-# Using default compilers:
-# CC = gcc
-# CF = $(CFLAGS) -O3 -fexceptions
-
-# alternatives:
-# CF = $(CFLAGS) -g -fexceptions \
-#       -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-#       -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
-#       -funit-at-a-time
-# CF = $(CFLAGS) -O3 -fexceptions \
-#       -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-#       -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-# CF = $(CFLAGS) -O3
-# CF = $(CFLAGS) -O3 -g -fexceptions
-# CF = $(CFLAGS) -g -fexceptions \
-#       -Wall -W -Wshadow \
-#       -Wredundant-decls -Wdisabled-optimization -ansi
-
-# consider:
-# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
-# -frename-registers -ffast-math -funroll-loops
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
-
-# Using Intel's icc and ifort compilers:
-#   (does not work for mexFunctions unless you add a mexopts.sh file)
-# F77 = ifort
-# CC = icc
-# CF = $(CFLAGS) -O3 -xN -vec_report=0
-# CF = $(CFLAGS) -g
-
-# 64bit:
-# F77FLAGS = -O -m64
-# CF = $(CFLAGS) -O3 -fexceptions -m64
-# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
-# LAPACK = -llapack64
-
-# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-
-# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto -lgfortran
-
-#------------------------------------------------------------------------------
-# Mac
-#------------------------------------------------------------------------------
-
-# As recommended by macports, http://suitesparse.darwinports.com/
-# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
-# on my MacBook Air, and they work fine.
-
-# F77 = gfortran
-# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
-# LIB = -lm
-
-#------------------------------------------------------------------------------
-# Solaris
-#------------------------------------------------------------------------------
-
-# 32-bit
-# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
-
-# 64-bit
-# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
-
-# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
-
-# The Sun Performance Library includes both LAPACK and the BLAS:
-# BLAS = -xlic_lib=sunperf
-# LAPACK =
-
-
-#------------------------------------------------------------------------------
-# Compaq Alpha
-#------------------------------------------------------------------------------
-
-# 64-bit mode only
-# CF = $(CFLAGS) -O2 -std1
-# BLAS = -ldxml
-# LAPACK =
-
-#------------------------------------------------------------------------------
-# IBM RS 6000
-#------------------------------------------------------------------------------
-
-# BLAS = -lessl
-# LAPACK =
-
-# 32-bit mode:
-# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384
-
-# 64-bit mode:
-# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
-
-#------------------------------------------------------------------------------
-# SGI IRIX
-#------------------------------------------------------------------------------
-
-# BLAS = -lscsl
-# LAPACK =
-
-# 32-bit mode
-# CF = $(CFLAGS) -O
-
-# 64-bit mode (32 bit int's and 64-bit long's):
-# CF = $(CFLAGS) -64
-# F77FLAGS = -64
-
-# SGI doesn't have ranlib
-# RANLIB = echo
-
-#------------------------------------------------------------------------------
-# AMD Opteron (64 bit)
-#------------------------------------------------------------------------------
-
-# BLAS = -lgoto_opteron64 -lg2c
-# LAPACK = -llapack_opteron64
-
-# SUSE Linux 10.1, AMD Opteron
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-# LAPACK = -llapack_opteron64
-
-#------------------------------------------------------------------------------
-# remove object files and profile output
-#------------------------------------------------------------------------------
-
-CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index ccd0c378a81..740ea3a09a6 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation {
   };
 
   preConfigure = ''
-    substituteAllInPlace SuiteSparse_config/SuiteSparse_config.mk
     mkdir -p $out/lib
     mkdir -p $out/include
 

From 4f98287afa7c20ae8d5316cad603f834a60a7b18 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 18:14:51 -0500
Subject: [PATCH 009/144] julia02: build with openblas

Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
---
 pkgs/development/compilers/julia/0.2.nix | 14 ++++++++------
 pkgs/top-level/all-packages.nix          |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.2.nix b/pkgs/development/compilers/julia/0.2.nix
index cc1be3db8a5..9d585e07fe1 100644
--- a/pkgs/development/compilers/julia/0.2.nix
+++ b/pkgs/development/compilers/julia/0.2.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
- , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
+ , ncurses, libunistring, lighttpd, patchelf, openblas
  , tcl, tk, xproto, libX11, git, mpfr
  } :
 let
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
     fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-    openblas liblapack tcl tk xproto libX11 git mpfr
+    openblas tcl tk xproto libX11 git mpfr
     ];
 
   configurePhase = ''
@@ -91,14 +91,13 @@ stdenv.mkDerivation rec {
     copy_kill_hash "${dsfmt_src}" deps/random
 
     ${if realGcc ==null then "" else 
-    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''}
+    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -lopenblas -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''}
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
 
     export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
 
     export GLPK_PREFIX="${glpk}/include"
 
-    mkdir -p "$out/lib"
     sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
     sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
 
@@ -111,9 +110,12 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     mkdir -p usr/lib
-    
-    echo "$out"
+
     mkdir -p "$out/lib"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so"
+
+    echo "$out"
     (
     cd "$(mktemp -d)"
     for i in "${suitesparse}"/lib/lib*.a; do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e74825b67d..fb089239f8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3990,7 +3990,6 @@ let
   jikes = callPackage ../development/compilers/jikes { };
 
   julia02 = callPackage ../development/compilers/julia/0.2.nix {
-    liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
     suitesparse = suitesparse_4_2;
   };

From 77a454b866633b6accd144a28c2616a2ea1fd8b0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 18:15:08 -0500
Subject: [PATCH 010/144] julia03: refactor and build with openblas

Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
---
 pkgs/development/compilers/julia/0.3.nix | 128 +++++++++++++----------
 pkgs/top-level/all-packages.nix          |   9 +-
 2 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 9f216c7207f..dc51441bb17 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,26 +1,24 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
- , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
- , ncurses, libunistring, patchelf, openblas, liblapack
- , tcl, tk, xproto, libX11, git, mpfr, which, wget
- } :
+, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
+, ncurses, libunistring, patchelf, openblas
+, tcl, tk, xproto, libX11, git, mpfr, which
+}:
 
-assert stdenv.isLinux; 
+with stdenv.lib;
 
 let
   realGcc = stdenv.cc.cc;
-in
-stdenv.mkDerivation rec {
-  pname = "julia";
-  version = "0.3.6";
-  name = "${pname}-${version}";
+  arch = head (splitString "-" stdenv.system);
+  march =
+    {
+      "x86_64-linux" = "x86-64";
+      "i686-linux" = "i686";
+    }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
 
   dsfmt_ver = "2.2";
   grisu_ver = "1.1.1";
-  openblas_ver = "v0.2.13";
-  lapack_ver = "3.5.0";
   arpack_ver = "3.1.5";
   patchelf_ver = "0.8";
-  pcre_ver = "8.36";
   utf8proc_ver = "1.1.6";
 
   dsfmt_src = fetchurl {
@@ -32,33 +30,26 @@ stdenv.mkDerivation rec {
     url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
     md5 = "29b533ed4311161267bff1a9a97e2953";
   };
-  openblas_src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
-    name = "openblas-${openblas_ver}.tar.gz";
-    md5 = "74adf4c0d0d82bff4774be5bf2134183";
-  };
   arpack_src = fetchurl rec {
     url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz";
     md5 = "d84e1b6108d9ee67c0d21aba7099e953";
     name = "arpack-ng-${arpack_ver}.tar.gz";
   };
-  lapack_src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
-    name = "lapack-${lapack_ver}.tgz";
-    md5 = "b1d3e3e425b2e44a06760ff173104bdf";
-  };
   patchelf_src = fetchurl {
     url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
     md5 = "5087261514b4b5814a39c3d3a36eb6ef";
   };
-  pcre_src = fetchurl {
-    url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2";
-    md5 = "b767bc9af0c20bc9c1fe403b0d41ad97";
-  };
   utf8proc_src = fetchurl {
     url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
     md5 = "2462346301fac2994c34f5574d6c3ca7";
   };
+in
+stdenv.mkDerivation rec {
+  pname = "julia";
+  version = "0.3.6";
+  name = "${pname}-${version}";
+
+  extraSrcs = [ dsfmt_src grisu_src arpack_src utf8proc_src ];
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
@@ -67,59 +58,81 @@ stdenv.mkDerivation rec {
     name = "julia-git-v${version}";
   };
 
-  buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
-    fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-    openblas liblapack tcl tk xproto libX11 git mpfr which wget
+  buildInputs =
+    [
+      gfortran perl m4 gmp pcre llvm readline zlib
+      fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
+      openblas tcl tk xproto libX11 git mpfr which
     ];
 
+  makeFlags =
+    [
+      "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_OPENBLAS=1"
+      "USE_SYSTEM_BLAS=1"
+      "USE_SYSTEM_LAPACK=1"
+      "ARCH=${arch}"
+      "MARCH=${march}"
+      "JULIA_CPU_TARGET=${march}"
+      "PREFIX=$(out)"
+      "prefix=$(out)"
+      "SHELL=${stdenv.shell}"
+    ];
+
+  GLPK_PREFIX = "${glpk}/include";
+
+  NIX_CFLAGS_COMPILE = [ "-fPIC" ];
+  NIX_LDFLAGS =
+    optionals
+      (realGcc != null)
+      [
+        "-L${realGcc}/lib"
+        "-L${realGcc}/lib64"
+        "-lpcre" "-lm" "-lfftw3f" "-lfftw3" "-lglpk"
+        "-lunistring" "-lz" "-lgmp" "-lmpfr" "-lopenblas"
+      ];
+
+  postPatch = ''
+    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
+    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
+
+    patchShebangs . contrib
+
+    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
+    # is probably not what we want anyway on non-NixOS
+    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
+  '';
+
   configurePhase = ''
     for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
     do
       makeFlags="$makeFlags USE_SYSTEM_$i=1 "
     done
-	makeFlags="$makeFlags JULIA_CPU_TARGET=core2";
 
     copy_kill_hash(){
       cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
     }
 
-    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" \
-        "${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do
+    for i in $extraSrcs; do
       copy_kill_hash "$i" deps
     done
 
-    ${if realGcc ==null then "" else 
-    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr -lblas -lopenblas -L$out/lib"''}
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
+    ${if realGcc ==null then "" else ''export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"''}
 
     export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
 
-    export GLPK_PREFIX="${glpk}/include"
-
-    mkdir -p "$out/lib"
-    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
-    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
-
-    export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell} prefix=$out"
-
-    export dontPatchELF=1
-
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
 
-    patchShebangs . contrib
-
     export PATH="$PATH:${stdenv.cc.libc}/sbin"
-
-    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
-    # is probably not what we want anyway on non-NixOS
-    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
-
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
   '';
 
   preBuild = ''
+    mkdir -p "$out/lib"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so"
+
     mkdir -p usr/lib
-    
+
     echo "$out"
     mkdir -p "$out/lib"
     (
@@ -137,6 +150,7 @@ stdenv.mkDerivation rec {
   '';
 
   dontStrip = true;
+  dontPatchELF = true;
 
   enableParallelBuilding = true;
 
@@ -147,8 +161,8 @@ stdenv.mkDerivation rec {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "http://julialang.org/";
     license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     broken = false;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb089239f8f..32c7cdbef23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3994,13 +3994,8 @@ let
     suitesparse = suitesparse_4_2;
   };
 
-  julia03 = let
-    liblapack = liblapack_3_5_0.override {shared = true;};
-  in callPackage ../development/compilers/julia/0.3.nix {
-    inherit liblapack;
-    suitesparse = suitesparse_4_2.override {
-      inherit liblapack;
-    };
+  julia03 = callPackage ../development/compilers/julia/0.3.nix {
+    suitesparse = suitesparse_4_2;
     llvm = llvm_33;
   };
   julia = julia03;

From bbda7d427b0858be50236d99011de29416652c2d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 20:09:37 -0500
Subject: [PATCH 011/144] suitesparse: version derivations by major version
 only

---
 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 32c7cdbef23..5c600c47817 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13879,7 +13879,7 @@ let
   sage = callPackage ../applications/science/math/sage { };
 
   suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
-  suitesparse_4_4_1 = callPackage ../development/libraries/science/math/suitesparse {};
+  suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
 
   ipopt = callPackage ../development/libraries/science/math/ipopt { };
 

From a17d8bcc4bbf3e74cacecf956cd06cb9a98b52ba Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 20:33:42 -0500
Subject: [PATCH 012/144] suitesparse_4_4: update to 4.4.4

---
 .../libraries/science/math/suitesparse/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 740ea3a09a6..af9396ad900 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gfortran, openblas }:
 
 let
-  version = "4.4.1";
+  version = "4.4.4";
   name = "suitesparse-${version}";
 
   int_t = if openblas.blas64 then "int64_t" else "int32_t";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
-    sha256 = "0y8i6dizrr556xggpjyc7wijjv4jbizhssmjj4jv8n1s7zxy2z0n";
+    sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj";
   };
 
   preConfigure = ''

From 86c54040aa1fba0307eeaebe00968a0a81871127 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 20:33:59 -0500
Subject: [PATCH 013/144] julia03: build with suitesparse_4_4

---
 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 5c600c47817..0e96c04b7d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3995,7 +3995,6 @@ let
   };
 
   julia03 = callPackage ../development/compilers/julia/0.3.nix {
-    suitesparse = suitesparse_4_2;
     llvm = llvm_33;
   };
   julia = julia03;
@@ -13880,6 +13879,7 @@ let
 
   suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
   suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
+  suitesparse = suitesparse_4_4;
 
   ipopt = callPackage ../development/libraries/science/math/ipopt { };
 

From adcdec2e70905a35c99bd2ba0991dbdd13280f38 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 20:34:30 -0500
Subject: [PATCH 014/144] julia03: use system patchelf

---
 pkgs/development/compilers/julia/0.3.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index dc51441bb17..c7cda274924 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -18,7 +18,6 @@ let
   dsfmt_ver = "2.2";
   grisu_ver = "1.1.1";
   arpack_ver = "3.1.5";
-  patchelf_ver = "0.8";
   utf8proc_ver = "1.1.6";
 
   dsfmt_src = fetchurl {
@@ -35,10 +34,6 @@ let
     md5 = "d84e1b6108d9ee67c0d21aba7099e953";
     name = "arpack-ng-${arpack_ver}.tar.gz";
   };
-  patchelf_src = fetchurl {
-    url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
-    md5 = "5087261514b4b5814a39c3d3a36eb6ef";
-  };
   utf8proc_src = fetchurl {
     url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
     md5 = "2462346301fac2994c34f5574d6c3ca7";

From e36b3ec0a56c3b06152a205a46804733b88695d6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 07:09:29 -0500
Subject: [PATCH 015/144] suitesparse: build shared libraries

---
 pkgs/development/compilers/julia/0.3.nix      | 19 +++----------------
 .../science/math/suitesparse/default.nix      | 12 ++++++++++++
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index c7cda274924..62a1f4f98cc 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
   makeFlags =
     [
       "USE_SYSTEM_PATCHELF=1"
-      "USE_SYSTEM_OPENBLAS=1"
       "USE_SYSTEM_BLAS=1"
       "USE_SYSTEM_LAPACK=1"
       "ARCH=${arch}"
@@ -122,25 +121,13 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild = ''
+    # Link dynamically loaded shared libraries into output so they are found at runtime.
     mkdir -p "$out/lib"
     ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
     ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so"
-
-    mkdir -p usr/lib
-
-    echo "$out"
-    mkdir -p "$out/lib"
-    (
-    cd "$(mktemp -d)"
-    for i in "${suitesparse}"/lib/lib*.a; do
-      ar -x $i
-    done
-    gcc *.o --shared -o "$out/lib/libsuitesparse.so"
-    )
-    cp "$out/lib/libsuitesparse.so" usr/lib
+    ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/libsuitesparse.so"
     for i in umfpack cholmod amd camd colamd spqr; do
-      ln -s libsuitesparse.so "$out"/lib/lib$i.so;
-      ln -s libsuitesparse.so "usr"/lib/lib$i.so;
+      ln -s libsuitesparse.so "$out/lib/lib$i.so";
     done
   '';
 
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index af9396ad900..f30db472b0d 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -36,6 +36,18 @@ stdenv.mkDerivation {
   NIX_CFLAGS = "-fPIC";
 
   postInstall = ''
+    # Build and install shared library
+    (
+        cd "$(mktemp -d)"
+        for i in "$out"/lib/lib*.a; do
+          ar -x $i
+        done
+        gcc *.o --shared -o "$out/lib/libsuitesparse.so"
+    )
+    for i in umfpack cholmod amd camd colamd spqr; do
+      ln -s libsuitesparse.so "$out"/lib/lib$i.so;
+    done
+
     # Install documentation
     outdoc=$out/share/doc/${name}
     mkdir -p $outdoc

From fff0191f481c49320d5c540ed8ae491a44b59c8e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 07:17:30 -0500
Subject: [PATCH 016/144] arpack: build with openblas

---
 .../libraries/science/math/arpack/default.nix       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 01bb3371f5e..c896ecca472 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gfortran, atlasWithLapack }:
+{ stdenv, fetchurl, gfortran, openblas }:
+
+with stdenv.lib;
 
 let
   version = "3.2.0";
@@ -10,10 +12,15 @@ stdenv.mkDerivation {
     sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff";
   };
 
-  buildInputs = [ gfortran atlasWithLapack ];
+  buildInputs = [ gfortran openblas ];
 
   # Auto-detection fails because gfortran brings in BLAS by default
-  configureFlags="--with-blas=-latlas --with-lapack=-latlas";
+  configureFlags = [
+    "--with-blas=-lopenblas"
+    "--with-lapack=-lopenblas"
+  ];
+
+  FFLAGS = optional openblas.blas64 "-fdefault-integer-8";
 
   meta = {
     homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";

From 5c9750e5bbf52977d6fb95d9ff07e09f10769b01 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 08:35:54 -0500
Subject: [PATCH 017/144] julia03: link shared libraries privately

---
 pkgs/development/compilers/julia/0.3.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 62a1f4f98cc..d5e763003b1 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -122,12 +122,12 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     # Link dynamically loaded shared libraries into output so they are found at runtime.
-    mkdir -p "$out/lib"
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so"
-    ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/libsuitesparse.so"
+    mkdir -p "$out/lib/julia"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so"
+    ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so"
     for i in umfpack cholmod amd camd colamd spqr; do
-      ln -s libsuitesparse.so "$out/lib/lib$i.so";
+      ln -s libsuitesparse.so "$out/lib/julia/lib$i.so";
     done
   '';
 

From 41cc06fd000293d2ce9eb81ab8ca5a3654f5ad73 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 07:17:38 -0500
Subject: [PATCH 018/144] julia03: use system arpack

---
 pkgs/development/compilers/julia/0.3.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index d5e763003b1..563e59a2f58 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
 , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
-, ncurses, libunistring, patchelf, openblas
+, ncurses, libunistring, patchelf, openblas, arpack
 , tcl, tk, xproto, libX11, git, mpfr, which
 }:
 
@@ -17,7 +17,6 @@ let
 
   dsfmt_ver = "2.2";
   grisu_ver = "1.1.1";
-  arpack_ver = "3.1.5";
   utf8proc_ver = "1.1.6";
 
   dsfmt_src = fetchurl {
@@ -29,11 +28,6 @@ let
     url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
     md5 = "29b533ed4311161267bff1a9a97e2953";
   };
-  arpack_src = fetchurl rec {
-    url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz";
-    md5 = "d84e1b6108d9ee67c0d21aba7099e953";
-    name = "arpack-ng-${arpack_ver}.tar.gz";
-  };
   utf8proc_src = fetchurl {
     url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
     md5 = "2462346301fac2994c34f5574d6c3ca7";
@@ -44,7 +38,7 @@ stdenv.mkDerivation rec {
   version = "0.3.6";
   name = "${pname}-${version}";
 
-  extraSrcs = [ dsfmt_src grisu_src arpack_src utf8proc_src ];
+  extraSrcs = [ dsfmt_src grisu_src utf8proc_src ];
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
@@ -57,7 +51,7 @@ stdenv.mkDerivation rec {
     [
       gfortran perl m4 gmp pcre llvm readline zlib
       fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-      openblas tcl tk xproto libX11 git mpfr which
+      arpack openblas tcl tk xproto libX11 git mpfr which
     ];
 
   makeFlags =
@@ -65,6 +59,7 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_PATCHELF=1"
       "USE_SYSTEM_BLAS=1"
       "USE_SYSTEM_LAPACK=1"
+      "USE_SYSTEM_ARPACK=1"
       "ARCH=${arch}"
       "MARCH=${march}"
       "JULIA_CPU_TARGET=${march}"
@@ -126,6 +121,7 @@ stdenv.mkDerivation rec {
     ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so"
     ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so"
     ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so"
+    ln -s "${arpack}/lib/libarpack.so" "$out/lib/julia/libarpack.so"
     for i in umfpack cholmod amd camd colamd spqr; do
       ln -s libsuitesparse.so "$out/lib/julia/lib$i.so";
     done

From bd280660f75b0da002a6faa456e10ea63d6851bf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 11:07:44 -0500
Subject: [PATCH 019/144] julia03: clean up LDFLAGS and LD_LIBRARY_PATH

There were a few unused LDFLAGS and LD_LIBRARY_PATH settings. There was
also an incorrect setting; Julia prefers to be linked to threaded
FFTW. The libary names are now set correctly so that it's not necessary
to link system libraries into $out/lib/julia as if they were private
libraries. The LDFLAGS were also moved out of NIX_LDFLAGS so they will
affect only the Julia build itself, and not all the individual private
libraries.
---
 pkgs/development/compilers/julia/0.3.nix | 117 ++++++++++++-----------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 563e59a2f58..3eb55ad8ac0 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -8,38 +8,12 @@ with stdenv.lib;
 
 let
   realGcc = stdenv.cc.cc;
-  arch = head (splitString "-" stdenv.system);
-  march =
-    {
-      "x86_64-linux" = "x86-64";
-      "i686-linux" = "i686";
-    }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
-
-  dsfmt_ver = "2.2";
-  grisu_ver = "1.1.1";
-  utf8proc_ver = "1.1.6";
-
-  dsfmt_src = fetchurl {
-    url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
-    name = "dsfmt-${dsfmt_ver}.tar.gz";
-    md5 = "cb61be3be7254eae39684612c524740d";
-  };
-  grisu_src = fetchurl {
-    url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
-    md5 = "29b533ed4311161267bff1a9a97e2953";
-  };
-  utf8proc_src = fetchurl {
-    url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
-    md5 = "2462346301fac2994c34f5574d6c3ca7";
-  };
 in
 stdenv.mkDerivation rec {
   pname = "julia";
   version = "0.3.6";
   name = "${pname}-${version}";
 
-  extraSrcs = [ dsfmt_src grisu_src utf8proc_src ];
-
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
     rev = "refs/tags/v${version}";
@@ -47,6 +21,27 @@ stdenv.mkDerivation rec {
     name = "julia-git-v${version}";
   };
 
+  extraSrcs =
+    let
+      dsfmt_ver = "2.2";
+      grisu_ver = "1.1.1";
+      utf8proc_ver = "1.1.6";
+
+      dsfmt_src = fetchurl {
+        url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
+        name = "dsfmt-${dsfmt_ver}.tar.gz";
+        md5 = "cb61be3be7254eae39684612c524740d";
+      };
+      grisu_src = fetchurl {
+        url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
+        md5 = "29b533ed4311161267bff1a9a97e2953";
+      };
+      utf8proc_src = fetchurl {
+        url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
+        md5 = "2462346301fac2994c34f5574d6c3ca7";
+      };
+    in [ dsfmt_src grisu_src utf8proc_src ];
+
   buildInputs =
     [
       gfortran perl m4 gmp pcre llvm readline zlib
@@ -55,31 +50,37 @@ stdenv.mkDerivation rec {
     ];
 
   makeFlags =
-    [
-      "USE_SYSTEM_PATCHELF=1"
-      "USE_SYSTEM_BLAS=1"
-      "USE_SYSTEM_LAPACK=1"
-      "USE_SYSTEM_ARPACK=1"
+    let
+      arch = head (splitString "-" stdenv.system);
+      march =
+        {
+          "x86_64-linux" = "x86-64";
+          "i686-linux" = "i686";
+        }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+    in [
       "ARCH=${arch}"
       "MARCH=${march}"
       "JULIA_CPU_TARGET=${march}"
       "PREFIX=$(out)"
       "prefix=$(out)"
       "SHELL=${stdenv.shell}"
+
+      "USE_SYSTEM_PATCHELF=1"
+
+      "USE_SYSTEM_BLAS=1"
+      "LIBBLAS=-lopenblas"
+      "LIBBLASNAME=libopenblas"
+
+      "USE_SYSTEM_LAPACK=1"
+      "LIBLAPACK=-lopenblas"
+      "LIBLAPACKNAME=libopenblas"
+
+      "USE_SYSTEM_ARPACK=1"
     ];
 
   GLPK_PREFIX = "${glpk}/include";
 
   NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-  NIX_LDFLAGS =
-    optionals
-      (realGcc != null)
-      [
-        "-L${realGcc}/lib"
-        "-L${realGcc}/lib64"
-        "-lpcre" "-lm" "-lfftw3f" "-lfftw3" "-lglpk"
-        "-lunistring" "-lz" "-lgmp" "-lmpfr" "-lopenblas"
-      ];
 
   postPatch = ''
     sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
@@ -92,6 +93,24 @@ stdenv.mkDerivation rec {
     sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
   '';
 
+  # Julia tries to load these libraries dynamically at runtime, but they can't be found.
+  # Easier by far to link against them as usual.
+  # These go in LDFLAGS, where they affect only Julia itself, and not NIX_LDFLAGS,
+  # where they would also be used for all the private libraries Julia builds.
+  LDFLAGS = [
+    "-larpack"
+    "-lfftw3_threads"
+    "-lfftw3f_threads"
+    "-lglpk"
+    "-lgmp"
+    "-lmpfr"
+    "-lopenblas"
+    "-lpcre"
+    "-lsuitesparse"
+    "-lunistring"
+    "-lz"
+  ];
+
   configurePhase = ''
     for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
     do
@@ -106,27 +125,9 @@ stdenv.mkDerivation rec {
       copy_kill_hash "$i" deps
     done
 
-    ${if realGcc ==null then "" else ''export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"''}
-
-    export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
-
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
-
     export PATH="$PATH:${stdenv.cc.libc}/sbin"
   '';
 
-  preBuild = ''
-    # Link dynamically loaded shared libraries into output so they are found at runtime.
-    mkdir -p "$out/lib/julia"
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so"
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so"
-    ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so"
-    ln -s "${arpack}/lib/libarpack.so" "$out/lib/julia/libarpack.so"
-    for i in umfpack cholmod amd camd colamd spqr; do
-      ln -s libsuitesparse.so "$out/lib/julia/lib$i.so";
-    done
-  '';
-
   dontStrip = true;
   dontPatchELF = true;
 

From 2b525f60c9981f67eb6ebe662a8d9b1c51f552d1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 12:36:34 -0500
Subject: [PATCH 020/144] update julia-0.3.6 -> julia-0.3.9

Includes a workaround for the test suite suggested by
upstream (https://github.com/JuliaLang/julia/commit/b192bf0e2f0a0c5b232c3352c6e996e5f11053f2#commitcomment-11139348)
for a buggy system wcwidth.
---
 pkgs/development/compilers/julia/0.3.nix      |  6 +++--
 .../0001-work-around-buggy-wcwidth.patch      | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 3eb55ad8ac0..9faeda21593 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -11,16 +11,18 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.3.6";
+  version = "0.3.9";
   name = "${pname}-${version}";
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
     rev = "refs/tags/v${version}";
-    md5 = "d28e8f428485219f756d80c011d5dd32";
+    sha256 = "ad0820affefd04eb6fba7deb2603756974711846a251900a9202b8d2665a37cf";
     name = "julia-git-v${version}";
   };
 
+  patches = [ ./0001-work-around-buggy-wcwidth.patch ];
+
   extraSrcs =
     let
       dsfmt_ver = "2.2";
diff --git a/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch
new file mode 100644
index 00000000000..7c4870fb2a8
--- /dev/null
+++ b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch
@@ -0,0 +1,24 @@
+From b9070aeab0ab672ffe321089631f9afe263b0caa Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Thu, 4 Jun 2015 12:03:32 -0500
+Subject: [PATCH] work around buggy wcwidth
+
+---
+ test/unicode.jl | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/unicode.jl b/test/unicode.jl
+index 52c3e6a..f1ef698 100644
+--- a/test/unicode.jl
++++ b/test/unicode.jl
+@@ -103,5 +103,6 @@ end
+ 
+ # handling of embedded NUL chars (#10958)
+ @test length("\0w") == length("\0α") == 2
+-@test strwidth("\0w") == strwidth("\0α") == 1
++@test strwidth("\0w") == charwidth('\0') + charwidth('w')
++@test strwidth("\0α") == charwidth('\0') + charwidth('α')
+ @test normalize_string("\0W", casefold=true) == "\0w"
+-- 
+2.4.1
+

From 63be59abc75eb79eaeaf455608539001624ce420 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 12:37:57 -0500
Subject: [PATCH 021/144] utf8proc: use makeFlags instead of overriding
 installPhase

---
 pkgs/development/libraries/utf8proc/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 63de08b46dd..c8a2fd6a4e9 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf";
   };
 
-  installPhase = ''
-    make install prefix=$out
-  '';
+  makeFlags = [ "prefix=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A clean C library for processing UTF-8 Unicode data";

From b255f8df2ed76e9696dbbcfefc126a6a84f7e6dc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 12:38:36 -0500
Subject: [PATCH 022/144] julia03: use system utf8proc

---
 pkgs/development/compilers/julia/0.3.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 9faeda21593..560298243d2 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
 , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
-, ncurses, libunistring, patchelf, openblas, arpack
-, tcl, tk, xproto, libX11, git, mpfr, which
+, ncurses, patchelf, openblas, arpack
+, tcl, tk, xproto, libX11, git, mpfr, which, utf8proc
 }:
 
 with stdenv.lib;
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     let
       dsfmt_ver = "2.2";
       grisu_ver = "1.1.1";
-      utf8proc_ver = "1.1.6";
 
       dsfmt_src = fetchurl {
         url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
@@ -38,19 +37,17 @@ stdenv.mkDerivation rec {
         url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
         md5 = "29b533ed4311161267bff1a9a97e2953";
       };
-      utf8proc_src = fetchurl {
-        url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
-        md5 = "2462346301fac2994c34f5574d6c3ca7";
-      };
-    in [ dsfmt_src grisu_src utf8proc_src ];
+    in [ dsfmt_src grisu_src ];
 
   buildInputs =
     [
-      gfortran perl m4 gmp pcre llvm readline zlib
-      fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-      arpack openblas tcl tk xproto libX11 git mpfr which
+      gfortran gmp pcre llvm readline zlib
+      fftw fftwSinglePrec libunwind suitesparse glpk ncurses
+      arpack openblas tcl tk xproto libX11 mpfr utf8proc
     ];
 
+  nativeBuildInputs = [ patchelf perl m4 which git ];
+
   makeFlags =
     let
       arch = head (splitString "-" stdenv.system);
@@ -78,6 +75,8 @@ stdenv.mkDerivation rec {
       "LIBLAPACKNAME=libopenblas"
 
       "USE_SYSTEM_ARPACK=1"
+
+      "USE_SYSTEM_UTF8PROC=1"
     ];
 
   GLPK_PREFIX = "${glpk}/include";
@@ -109,7 +108,6 @@ stdenv.mkDerivation rec {
     "-lopenblas"
     "-lpcre"
     "-lsuitesparse"
-    "-lunistring"
     "-lz"
   ];
 

From 6f3dfc0cf886643b3a5e79b2eb7dc412ab9dc833 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 12:48:46 -0500
Subject: [PATCH 023/144] julia03: remove unused dependencies

---
 pkgs/development/compilers/julia/0.3.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 560298243d2..9f228212a3b 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,14 +1,11 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
 , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
 , ncurses, patchelf, openblas, arpack
-, tcl, tk, xproto, libX11, git, mpfr, which, utf8proc
+, git, mpfr, which, utf8proc
 }:
 
 with stdenv.lib;
 
-let
-  realGcc = stdenv.cc.cc;
-in
 stdenv.mkDerivation rec {
   pname = "julia";
   version = "0.3.9";
@@ -43,7 +40,7 @@ stdenv.mkDerivation rec {
     [
       gfortran gmp pcre llvm readline zlib
       fftw fftwSinglePrec libunwind suitesparse glpk ncurses
-      arpack openblas tcl tk xproto libX11 mpfr utf8proc
+      arpack openblas mpfr utf8proc
     ];
 
   nativeBuildInputs = [ patchelf perl m4 which git ];

From 1a11b52ffab4c1832f0367fa15142f8b3ebda9c4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 13:18:45 -0500
Subject: [PATCH 024/144] julia03: use system double_conversion (grisu)

---
 pkgs/development/compilers/julia/0.3.nix | 43 ++++++++++++------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 9f228212a3b..fdf6ee1dec2 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,7 +1,11 @@
-{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
-, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
-, ncurses, patchelf, openblas, arpack
-, git, mpfr, which, utf8proc
+{ stdenv, fetchgit, fetchurl
+# build tools
+, gfortran, git, m4, patchelf, perl, which
+# libjulia dependencies
+, libunwind, llvm, readline, utf8proc, zlib
+# standard library dependencies
+, double_conversion, fftwSinglePrec, fftw, glpk, gmp, mpfr, pcre
+, openblas, arpack, suitesparse
 }:
 
 with stdenv.lib;
@@ -23,34 +27,28 @@ stdenv.mkDerivation rec {
   extraSrcs =
     let
       dsfmt_ver = "2.2";
-      grisu_ver = "1.1.1";
 
       dsfmt_src = fetchurl {
         url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
         name = "dsfmt-${dsfmt_ver}.tar.gz";
         md5 = "cb61be3be7254eae39684612c524740d";
       };
-      grisu_src = fetchurl {
-        url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
-        md5 = "29b533ed4311161267bff1a9a97e2953";
-      };
-    in [ dsfmt_src grisu_src ];
+    in [ dsfmt_src ];
 
   buildInputs =
-    [
-      gfortran gmp pcre llvm readline zlib
-      fftw fftwSinglePrec libunwind suitesparse glpk ncurses
-      arpack openblas mpfr utf8proc
+    [ libunwind llvm readline utf8proc zlib
+      double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
+      openblas arpack suitesparse
     ];
 
-  nativeBuildInputs = [ patchelf perl m4 which git ];
+  nativeBuildInputs = [ gfortran git m4 patchelf perl which ];
 
   makeFlags =
     let
       arch = head (splitString "-" stdenv.system);
       march =
-        {
-          "x86_64-linux" = "x86-64";
+        { "x86_64-linux" = "x86-64";
+          "x86_64-darwin" = "x86-64";
           "i686-linux" = "i686";
         }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
     in [
@@ -61,8 +59,6 @@ stdenv.mkDerivation rec {
       "prefix=$(out)"
       "SHELL=${stdenv.shell}"
 
-      "USE_SYSTEM_PATCHELF=1"
-
       "USE_SYSTEM_BLAS=1"
       "LIBBLAS=-lopenblas"
       "LIBBLASNAME=libopenblas"
@@ -72,7 +68,8 @@ stdenv.mkDerivation rec {
       "LIBLAPACKNAME=libopenblas"
 
       "USE_SYSTEM_ARPACK=1"
-
+      "USE_SYSTEM_GRISU=1"
+      "USE_SYSTEM_PATCHELF=1"
       "USE_SYSTEM_UTF8PROC=1"
     ];
 
@@ -81,8 +78,10 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-fPIC" ];
 
   postPatch = ''
-    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
-    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
+    sed -i deps/Makefile \
+        -e "s@/usr/local/lib@$out/lib@g" \
+        -e "s@/usr/lib@$out/lib@g" \
+        -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g"
 
     patchShebangs . contrib
 

From 6e3eac5c92036554974b34443e8157b7af9b67df Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 13:31:15 -0500
Subject: [PATCH 025/144] julia03: avoid opaque shell scripts

The old expression used a shell script to set some repetitive
makeFlags. The makeFlags settings were spread out over different parts
of the expression. This deters new contributors. The new expression is
clearer, at the cost of being slightly repetitive.
---
 pkgs/development/compilers/julia/0.3.nix | 61 +++++++++++++-----------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index fdf6ee1dec2..42b296c7b85 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -35,6 +35,29 @@ stdenv.mkDerivation rec {
       };
     in [ dsfmt_src ];
 
+  prePatch = ''
+    copy_kill_hash(){
+      cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
+    }
+
+    for i in $extraSrcs; do
+      copy_kill_hash "$i" deps
+    done
+  '';
+
+  postPatch = ''
+    sed -i deps/Makefile \
+        -e "s@/usr/local/lib@$out/lib@g" \
+        -e "s@/usr/lib@$out/lib@g" \
+        -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g"
+
+    patchShebangs . contrib
+
+    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
+    # is probably not what we want anyway on non-NixOS
+    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
+  '';
+
   buildInputs =
     [ libunwind llvm readline utf8proc zlib
       double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
@@ -68,28 +91,25 @@ stdenv.mkDerivation rec {
       "LIBLAPACKNAME=libopenblas"
 
       "USE_SYSTEM_ARPACK=1"
+      "USE_SYSTEM_FFTW=1"
+      "USE_SYSTEM_GLPK=1"
+      "USE_SYSTEM_GMP=1"
       "USE_SYSTEM_GRISU=1"
+      "USE_SYSTEM_LIBUNWIND=1"
+      "USE_SYSTEM_LLVM=1"
+      "USE_SYSTEM_MPFR=1"
       "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_PCRE=1"
+      "USE_SYSTEM_READLINE=1"
+      "USE_SYSTEM_SUITESPARSE=1"
       "USE_SYSTEM_UTF8PROC=1"
+      "USE_SYSTEM_ZLIB=1"
     ];
 
   GLPK_PREFIX = "${glpk}/include";
 
   NIX_CFLAGS_COMPILE = [ "-fPIC" ];
 
-  postPatch = ''
-    sed -i deps/Makefile \
-        -e "s@/usr/local/lib@$out/lib@g" \
-        -e "s@/usr/lib@$out/lib@g" \
-        -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g"
-
-    patchShebangs . contrib
-
-    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
-    # is probably not what we want anyway on non-NixOS
-    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
-  '';
-
   # Julia tries to load these libraries dynamically at runtime, but they can't be found.
   # Easier by far to link against them as usual.
   # These go in LDFLAGS, where they affect only Julia itself, and not NIX_LDFLAGS,
@@ -107,20 +127,7 @@ stdenv.mkDerivation rec {
     "-lz"
   ];
 
-  configurePhase = ''
-    for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
-    do
-      makeFlags="$makeFlags USE_SYSTEM_$i=1 "
-    done
-
-    copy_kill_hash(){
-      cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
-    }
-
-    for i in $extraSrcs; do
-      copy_kill_hash "$i" deps
-    done
-
+  preConfigure = ''
     export PATH="$PATH:${stdenv.cc.libc}/sbin"
   '';
 

From 90b2afee040c8c20af58fdcec789e9bb73908b9a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 13:49:41 -0500
Subject: [PATCH 026/144] haskell-hmatrix: build with openblas

Fixes #6392.
---
 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 ade2055187d..dbb7aadb4a2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -119,6 +119,11 @@ self: super: {
   # Help libconfig find it's C language counterpart.
   libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
 
+  hmatrix = overrideCabal super.hmatrix (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ];
+    extraLibraries = [ pkgs.openblasCompat ];
+  });
+
   # The Haddock phase fails for one reason or another.
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
   base-noprelude = dontHaddock super.base-noprelude;

From e729a88474da9e6cccd111a5f7c71f164ab8d784 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 16:49:04 -0500
Subject: [PATCH 027/144] R: build with openblas

Fixes #6393.
---
 pkgs/applications/science/math/R/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index d0adb338207..72de0677e73 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt
+{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt
 , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
 , texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
-, imake, which, jdk, atlas
+, imake, which, jdk, openblas
 , withRecommendedPackages ? true
 }:
 
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm";
   };
 
-  buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
+  buildInputs = [ bzip2 gfortran libX11 libXmu libXt
     libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
     texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake
-    which jdk atlas
+    which jdk openblas
   ];
 
   patches = [ ./no-usr-local-search-paths.patch ];
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
     configureFlagsArray=(
       --disable-lto
       --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages
-      --with-blas="-L${atlas}/lib -lf77blas -latlas"
-      --with-lapack="-L${liblapack}/lib -llapack"
+      --with-blas="-L${openblas}/lib -lopenblas"
+      --with-lapack="-L${openblas}/lib -lopenblas"
       --with-readline
       --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh"
       --with-cairo
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e96c04b7d8..9f95e32e951 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8556,6 +8556,7 @@ let
   R = callPackage ../applications/science/math/R {
     inherit (xlibs) libX11 libXt;
     texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
+    openblas = openblasCompat;
     withRecommendedPackages = false;
   };
 

From bfe106cfa6613c4ab5c6b7aa6a0650e11bc63267 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 17:17:40 -0500
Subject: [PATCH 028/144] Build numpy and scipy with openblas

Fixes #6772.
---
 .../python-modules/numpy-scipy-support.nix         | 14 +++++++-------
 pkgs/top-level/python-packages.nix                 |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix
index 22be22633c2..915b27cb4cd 100644
--- a/pkgs/development/python-modules/numpy-scipy-support.nix
+++ b/pkgs/development/python-modules/numpy-scipy-support.nix
@@ -3,14 +3,14 @@
   python,
   # Name of package (e.g. numpy or scipy)
   pkgName,
-  # Atlas math library
-  atlas
+  # OpenBLAS math library
+  openblas
 }:
 
 {
-  # Re-export atlas here so that it can be sure that the same one will be used
+  # Re-export openblas here so that it can be sure that the same one will be used
   # in the propagatedBuildInputs.
-  inherit atlas;
+  inherit openblas;
 
   # First "install" the package, then import what was installed, and call the
   # .test() function, which will run the test suite.
@@ -48,9 +48,9 @@
   preBuild = ''
     echo "Creating site.cfg file..."
     cat << EOF > site.cfg
-    [atlas]
-    include_dirs = ${atlas}/include
-    library_dirs = ${atlas}/lib
+    [openblas]
+    include_dirs = ${openblas}/include
+    library_dirs = ${openblas}/lib
     EOF
   '';
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5ad7e46f4f..80931ecfe1f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7798,7 +7798,7 @@ let
   numpy = let
     support = import ../development/python-modules/numpy-scipy-support.nix {
       inherit python;
-      atlas = pkgs.atlasWithLapack;
+      openblas = pkgs.openblasCompat;
       pkgName = "numpy";
     };
   in buildPythonPackage ( rec {
@@ -7821,7 +7821,7 @@ let
     setupPyBuildFlags = ["--fcompiler='gnu95'"];
 
     buildInputs = [ pkgs.gfortran self.nose ];
-    propagatedBuildInputs = [ support.atlas ];
+    propagatedBuildInputs = [ support.openblas ];
 
     meta = {
       description = "Scientific tools for Python";
@@ -11260,7 +11260,7 @@ let
   scipy = let
     support = import ../development/python-modules/numpy-scipy-support.nix {
       inherit python;
-      atlas = pkgs.atlasWithLapack;
+      openblas = pkgs.openblasCompat;
       pkgName = "numpy";
     };
   in buildPythonPackage rec {

From fa290cb741cb23a04024f09e2018d5ea7bc0e3a3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 7 Jun 2015 13:44:24 -0500
Subject: [PATCH 029/144] qrupdate: build with openblas

Replaces ATLAS and LAPACK with OpenBLAS. Also builds both static and
shared libraries. (Octave upstream recommends the shared library.)
---
 .../libraries/qrupdate/default.nix            | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index 465ec7eebb2..aaa9ab8a61a 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -1,29 +1,34 @@
 { stdenv
 , fetchurl
 , gfortran
-, liblapack
+, openblas
 }:
 stdenv.mkDerivation {
   name = "qrupdate-1.1.2";
   src = fetchurl {
     url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ;
-    sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";  			
+    sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";
   };
-  
-  configurePhase = ''
-    export PREFIX=$out
-    sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \
-      -e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \
-      Makeconf
-  '';
+
+  configurePhase =
+    ''
+      export PREFIX=$out
+      sed -i -e 's,^BLAS=.*,BLAS=-L${openblas}/lib -lopenblas,' \
+          -e 's,^LAPACK=.*,LAPACK=-L${openblas}/lib -lopenblas,' \
+          Makeconf
+    ''
+    + stdenv.lib.optionalString openblas.blas64
+    ''
+      sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/'
+    '';
 
   doCheck = true;
 
   checkTarget = "test";
 
-  buildTarget = "lib";
+  buildFlags = [ "lib" "solib" ];
 
-  installTarget = "install-staticlib";
-  
-  buildInputs = [ gfortran liblapack ];
+  installTargets = "install";
+
+  buildInputs = [ gfortran openblas ];
 }

From 614c867b29299668dced9ab705bacebcd433bef3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 7 Jun 2015 13:45:36 -0500
Subject: [PATCH 030/144] octave: build with openblas

The expression inherits integer width from OpenBLAS, so Octave will use
64-bit integers if OpenBLAS supports it. However, this feature in Octave
is experimental, so we continue to use OpenBLAS with 32-bit integers by
default. (This only applies to the integer width, the pointer width is
always the platform-native width.)
---
 .../interpreters/octave/default.nix           | 26 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 9ad8c2790da..bdf6f775277 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,10 +1,22 @@
 { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
-, libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk
-, fftw, fftwSinglePrec, zlib, curl, qrupdate
+, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk
+, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas
 , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
 , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null
 }:
 
+let
+  suitesparseOrig = suitesparse;
+  qrupdateOrig = qrupdate;
+in
+# integer width is determined by openblas, so all dependencies must be built
+# with exactly the same openblas
+let
+  suitesparse =
+    if suitesparseOrig != null then suitesparseOrig.override { inherit openblas; } else null;
+  qrupdate = if qrupdateOrig != null then qrupdateOrig.override { inherit openblas; } else null;
+in
+
 stdenv.mkDerivation rec {
   version = "4.0.0";
   name = "octave-${version}";
@@ -14,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
+    graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas
     fftw fftwSinglePrec qrupdate ]
     ++ (stdenv.lib.optional (qt != null) qt)
     ++ (stdenv.lib.optional (qscintilla != null) qscintilla)
@@ -34,7 +46,13 @@ stdenv.mkDerivation rec {
   # problems on Hydra
   enableParallelBuilding = false;
 
-  configureFlags = [ "--enable-readline" "--enable-dl" ];
+  configureFlags =
+    [ "--enable-readline"
+      "--enable-dl"
+      "--with-blas=openblas"
+      "--with-lapack=openblas"
+    ]
+    ++ stdenv.lib.optional openblas.blas64 "--enable-64";
 
   # Keep a copy of the octave tests detailed results in the output
   # derivation, because someone may care
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f95e32e951..69c46414c9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4820,6 +4820,7 @@ let
     glpk = null;
     suitesparse = null;
     jdk = null;
+    openblas = openblasCompat;
   };
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
     fltk = fltk13.override { cfg.xftSupport = true; };

From 71b848b45dc58d7e75eb7f07b214fb8c62e5f58d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 06:34:52 -0500
Subject: [PATCH 031/144] openblas: build with USE_OPENMP=0 on Darwin

Darwin's clang does not support OpenMP yet. OpenMP is required on other
platforms for e.g. Julia.
---
 pkgs/development/libraries/science/math/openblas/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index ef76c33fb6d..a4bf1efbb73 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
       ''PREFIX="''$(out)"''
       "BINARY=${binary}"
-      "USE_OPENMP=1"
+      "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
       "INTERFACE64=${if blas64 then "1" else "0"}"
     ];
 

From b120a737fd3f2871af7d57c88c010884041ce6d4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 11:43:00 -0500
Subject: [PATCH 032/144] rPackages.BayesLogit: build with openblas

---
 pkgs/development/r-modules/default.nix                    | 1 +
 pkgs/development/r-modules/patches/BayesLogit_cblas.patch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 11d7193edee..4bad1224cc1 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1087,6 +1087,7 @@ let
 
     BayesLogit = old.BayesLogit.overrideDerivation (attrs: {
       patches = [ ./patches/BayesLogit.patch ];
+      buildInputs = (attrs.buildInputs or []) ++ [ pkgs.openblasCompat ];
     });
 
     BayesBridge = old.BayesBridge.overrideDerivation (attrs: {
diff --git a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch
index 4c8778c4697..ef776f3531d 100644
--- a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch
+++ b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch
@@ -6,7 +6,7 @@ diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars
  OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \
  	PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o
 -PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) 
-+PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -llapack -lf77blas -lcblas -latlas -lgfortran
++PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lopenblas
  # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra
  PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW 
  

From 77aa1c990ec673446c38b4c733f8ad7db9e66af1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 11:47:12 -0500
Subject: [PATCH 033/144] rPackages.Mposterior: build with openblas

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 4bad1224cc1..2f387599d6d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -997,7 +997,7 @@ let
     });
 
     Mposterior = old.Mposterior.overrideDerivation (attrs: {
-      PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas";
+      PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
     });
 
     qtbase = old.qtbase.overrideDerivation (attrs: {

From 58754130cc3f34169de05f7ef14a9102221f5f13 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 11:47:26 -0500
Subject: [PATCH 034/144] rPackages.slfm: build with openblas

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2f387599d6d..2d211ed9a5b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1037,7 +1037,7 @@ let
     });
 
     slfm = old.slfm.overrideDerivation (attrs: {
-      PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas";
+      PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
     });
 
     SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: {

From 8245caedf158ca91997412f8797f1802e2c8a925 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 11:47:40 -0500
Subject: [PATCH 035/144] rPackages.SamplerCompare: build with openblas

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2d211ed9a5b..2f8c22fe865 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1041,7 +1041,7 @@ let
     });
 
     SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: {
-      PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas";
+      PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
     });
 
     gputools = old.gputools.overrideDerivation (attrs: {

From 406428d6a4641f0a1a05e58a3b09f7d183059cfd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 13:48:36 -0500
Subject: [PATCH 036/144] haskellPackages.bindings-levmar: build with openblas

---
 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 dbb7aadb4a2..7f55abc4dda 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -124,6 +124,14 @@ self: super: {
     extraLibraries = [ pkgs.openblasCompat ];
   });
 
+  bindings-levmar = overrideCabal super.bindings-levmar (drv: {
+    preConfigure = ''
+      sed -i bindings-levmar.cabal \
+          -e 's,extra-libraries: lapack blas,extra-libraries: openblas,'
+    '';
+    extraLibraries = [ pkgs.openblas ];
+  });
+
   # The Haddock phase fails for one reason or another.
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
   base-noprelude = dontHaddock super.base-noprelude;

From 7a87a1e73f951cc84181a6d5a0e39c6523d2576c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lancelot@lancelotsix.com>
Date: Tue, 9 Jun 2015 20:49:24 +0200
Subject: [PATCH 037/144] Fix pythonPackages.networkx

---
 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 c324ae1c00c..4e99e61114c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15564,7 +15564,7 @@ let
       sha256 = "6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59";
     };
 
-    buildInputs = with self; [ nose decorator ];
+    propagatedBuildInputs = with self; [ nose decorator ];
 
     meta = {
       homepage = "https://networkx.github.io/";

From 661ce66483b8f8850f50452531e34e5b7d553389 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 14:31:19 -0500
Subject: [PATCH 038/144] haskellPackages.hmatrix: remove impure openblas path

---
 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 7f55abc4dda..03359133a5f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -122,6 +122,9 @@ self: super: {
   hmatrix = overrideCabal super.hmatrix (drv: {
     configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ];
     extraLibraries = [ pkgs.openblasCompat ];
+    preConfigure = ''
+      sed -i hmatrix.cabal -e 's@/usr/lib/openblas/lib@${pkgs.openblasCompat}/lib@'
+    '';
   });
 
   bindings-levmar = overrideCabal super.bindings-levmar (drv: {

From 0ac1de60e93568524873d1bb1c69f06a1bcb6033 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 Jun 2015 16:34:45 +0000
Subject: [PATCH 039/144] lsof: 4.87 -> 4.88

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

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 1ef292407a4..6370e7447f2 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "lsof-4.87";
+  name = "lsof-4.88";
 
   src = fetchurl {
-    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.87.tar.bz2;
-    sha256 = "0b6si72sml7gr9784ak491cxxbm9mx5bh174yg6rrirbv04kgpfz";
+    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.88.tar.bz2;
+    sha256 = "16y9wm26rg81mihnzcbdg8h8vhxmq8kn62ssxb8cqydp4q79nvzy";
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";

From 4387cd58417ced3eb24abe8ce9d3da576e81d034 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 Jun 2015 17:16:31 +0000
Subject: [PATCH 040/144] glances: 2.3 -> 2.4.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 ac800873860..84c5d181c17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5708,14 +5708,14 @@ let
 
   glances = buildPythonPackage rec {
     name = "glances-${version}";
-    version = "2.3";
+    version = "2.4.2";
     disabled = isPyPy;
 
     src = pkgs.fetchFromGitHub {
       owner = "nicolargo";
       repo = "glances";
       rev = "v${version}";
-      sha256 = "09x9g4wzfxfhpby3aa1fbhw3iqv1vyd6h526nrm9612ba5d0myh9";
+      sha256 = "1ghx62z63yyf8wv4bcvfxwxs5mc7b4nrcss6lc1i5s0yjvzvyi6h";
     };
 
     doCheck = false;

From 50bf92623df5ec88de6fb63d8a83ba6e39049f03 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 10 Jun 2015 23:57:13 +0200
Subject: [PATCH 041/144] Update package 'fira' to version 4.103.

---
 pkgs/data/fonts/fira/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index 151c945ee9e..6646fcb86b1 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-4.1";
+  name = "fira-4.103";
 
   src = fetchurl {
-    url = "http://www.carrois.com/downloads/fira_4_1/FiraFonts4100.zip";
-    sha256 = "0mqmmq1m2p0hb0x4mr74gghqr75iglilah7psfb3vdc80fc9h6yk";
+    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4103.zip;
+    sha256 = "1nw5icg3134qq2qfspvj2kclsv3965szby2lfcr65imf7lj4k52z";
   };
 
   buildInputs = [unzip];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraFonts4100";
+  sourceRoot = "FiraFonts4103";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

From 3b95f897359cb63270a0c34df300a5f447dd15d0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 11 Jun 2015 00:06:44 +0200
Subject: [PATCH 042/144] Update package 'fira-mono' to version 3.203.

---
 pkgs/data/fonts/fira-mono/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
index 92d6b1e25b5..a01f2a62424 100644
--- a/pkgs/data/fonts/fira-mono/default.nix
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-mono-3.2";
+  name = "fira-mono-3.203";
 
   src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3200.zip;
-    sha256 = "0g3i54q8czf3vylgasj62w2n7l1a2yrbyibjlx1qk3awh7fr1r7p";
+    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3203.zip;
+    sha256 = "0qaplpmsqys42a49x8d15ca2gqw1v6a6k2d56ja1j38dmr2qmpv4";
   };
 
   buildInputs = [ unzip ];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraMonoFonts3200";
+  sourceRoot = "FiraMonoFonts3203";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

From bb23251c90068e849c447830f6b6bd52565239f1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 10 Jun 2015 15:33:22 -0700
Subject: [PATCH 043/144] java: Fix jre derivations

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70d38f76e60..fc66f38a755 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3946,27 +3946,27 @@ let
     bootjdk = openjdk7-bootstrap;
   };
   openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
-  openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; };
+  openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; };
 
   openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
     bootjdk = openjdk8-bootstrap;
   };
   openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
-  openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; };
+  openjdk8_jre = openjdk8.jre // { outputs = [ "jre" ]; };
 
   openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
 
   java7 = openjdk7;
   jdk7 = java7 // { outputs = [ "out" ]; };
-  jre7 = java7 // { outputs = [ "jre" ]; };
+  jre7 = java7.jre // { outputs = [ "jre" ]; };
 
   java8 = openjdk8;
   jdk8 = java8 // { outputs = [ "out" ]; };
-  jre8 = java8 // { outputs = [ "jre" ]; };
+  jre8 = java8.jre // { outputs = [ "jre" ]; };
 
   java = if stdenv.isDarwin then openjdk-darwin else jdk8;
   jdk = java // { outputs = [ "out" ]; };
-  jre = java // { outputs = [ "jre" ]; };
+  jre = java.jre // { outputs = [ "jre" ]; };
 
   oraclejdk = pkgs.jdkdistro true false;
 

From 502a19b2b47418393ff00c38622285207884d460 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 10 Jun 2015 15:47:08 -0700
Subject: [PATCH 044/144] nixos/grub: Support labeling efi bootloaders with
 independent id's

---
 .../modules/system/boot/loader/grub/grub.nix  | 21 +++++++++++++++++--
 .../system/boot/loader/grub/install-grub.pl   |  3 ++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index cb01774f9ab..449f58ae4dd 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -27,7 +27,12 @@ let
 
   f = x: if x == null then "" else "" + x;
 
-  grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML
+  grubConfig = args:
+    let
+      efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
+      efiSysMountPoint' = replaceChars [ "/" ] [ "-" ] efiSysMountPoint;
+    in
+    pkgs.writeText "grub-config.xml" (builtins.toXML
     { splashImage = f cfg.splashImage;
       grub = f grub;
       grubTarget = f (grub.grubTarget or "");
@@ -36,7 +41,8 @@ let
       grubEfi = f grubEfi;
       grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
       bootPath = args.path;
-      efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
+      bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId;
+      inherit efiSysMountPoint;
       inherit (args) devices;
       inherit (efi) canTouchEfiVariables;
       inherit (cfg)
@@ -141,6 +147,17 @@ in
             '';
           };
 
+          efiBootloaderId = mkOption {
+            default = null;
+            example = "NixOS-fsid";
+            type = types.nullOr types.str;
+            description = ''
+              The id of the bootloader to store in efi nvram.
+              The default is to name it NixOS and append the path or efiSysMountPoint.
+              This is only used if <literal>boot.loader.efi.canTouchEfiVariables</literal> is true.
+            '';
+          };
+
           devices = mkOption {
             default = [ ];
             example = [ "/dev/sda" "/dev/sdb" ];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 016b5a23ed4..66d82e091d1 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -59,6 +59,7 @@ my $canTouchEfiVariables = get("canTouchEfiVariables");
 my $efiSysMountPoint = get("efiSysMountPoint");
 my $gfxmodeEfi = get("gfxmodeEfi");
 my $gfxmodeBios = get("gfxmodeBios");
+my $bootloaderId = get("bootloaderId");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -521,7 +522,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
 if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) {
     print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n";
     if ($canTouchEfiVariables eq "true") {
-        system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint") == 0
+        system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--bootloader-id=$bootloaderId") == 0
                 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n";
     } else {
         system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0

From 51ce29718750fb34c0d849942a9462e520081577 Mon Sep 17 00:00:00 2001
From: William Giokas <1007380@gmail.com>
Date: Sun, 7 Jun 2015 11:34:29 -0700
Subject: [PATCH 045/144] youtube-dl: make a python package

This allows youtube-dl to support all versions of python, and be built
correctly even when the python version is overridden by the user.

An alias to youtube-dl has been added which points to the default python
version's youtube-dl.

Also, ffmpeg has been made into an optional dependency. If ffmpeg is set
to 'null' then it will not be built and there will be no wrapper for it
either. An extra package, youtube-dl-light, is the same as youtube-dl
but without the ffmpeg dependency.
---
 pkgs/tools/misc/youtube-dl/default.nix | 18 ++++++------------
 pkgs/top-level/all-packages.nix        |  7 +------
 pkgs/top-level/python-packages.nix     | 13 +++++++++++++
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 3985f8a0c83..eb337573018 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, python, zip, ffmpeg, pandoc ? null }:
+{ stdenv, fetchurl, makeWrapper, buildPythonPackage, zip, ffmpeg
+, pandoc ? null }:
 
 # Pandoc is required to build the package's man page. Release tarballs
 # contain a formatted man page already, though, so it's fine to pass
@@ -7,7 +8,7 @@
 # case someone wants to use this derivation to build a Git version of
 # the tool that doesn't have the formatted man page included.
 
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   name = "youtube-dl-${version}";
   version = "2015.05.29";
 
@@ -16,18 +17,11 @@ stdenv.mkDerivation rec {
     sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
   };
 
-  buildInputs = [ python makeWrapper zip pandoc ];
-
-  patchPhase = "rm youtube-dl";
-
-  configurePhase = ''
-    makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python )
-  '';
+  buildInputs = [ makeWrapper zip pandoc ];
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
-  postInstall = ''
-    wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"
-  '';
+  postInstall = stdenv.lib.optionalString (ffmpeg != null) 
+    ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {
     homepage = "http://rg3.github.com/youtube-dl/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b49c2e3b59d..3eb1ef1fddd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3391,12 +3391,6 @@ let
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 
-  youtube-dl = callPackage ../tools/misc/youtube-dl {
-    # Release versions don't need pandoc because the formatted man page
-    # is included in the tarball.
-    pandoc = null;
-  };
-
   zbar = callPackage ../tools/graphics/zbar {
     pygtk = lib.overrideDerivation pygtk (x: {
       gtk = gtk2;
@@ -14774,6 +14768,7 @@ let
   lttngUst = lttng-ust;  # added 2014-07-31
   jquery_ui = jquery-ui;  # added 2014-09-07
   youtubeDL = youtube-dl;  # added 2014-10-26
+  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   htmlTidy = html-tidy;  # added 2014-12-06
   libtidy = html-tidy;  # added 2014-12-21
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3ddc879a17..c602200e81f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13466,6 +13466,19 @@ let
     };
   });
 
+  youtube-dl = callPackage ../tools/misc/youtube-dl {
+    # Release versions don't need pandoc because the formatted man page
+    # is included in the tarball.
+    pandoc = null;
+  };
+
+  youtube-dl-light = callPackage ../tools/misc/youtube-dl {
+    # Release versions don't need pandoc because the formatted man page
+    # is included in the tarball.
+    ffmpeg = null;
+    pandoc = null;
+  };
+
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";
 

From 117dfac3d1f07e3958cd20843177d95fdc174c58 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 11 Jun 2015 00:58:23 +0200
Subject: [PATCH 046/144] gnome-pomodoro: Fix meta description

---
 pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
index ad95b76b2a3..650d978277b 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
@@ -38,9 +38,11 @@ stdenv.mkDerivation rec {
 
   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";
+    description = "A time management utility for GNOME based on the pomodoro technique";
+    longDescription = ''
+      This GNOME utility helps to manage time according to Pomodoro Technique.
+      It intends to improve productivity and focus by taking short breaks.
+    '';
     maintainers = with maintainers; [ DamienCassou jgeerds ];
     license = licenses.gpl3;
     platforms = platforms.linux;

From f2d7f573af9063a3a484c80e426490e5093afe32 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 11 Jun 2015 02:42:20 +0200
Subject: [PATCH 047/144] neovim: adding python2 and python3 support

neovim:
- possibility to extend neovim (via .override) and passing extraPythonPackages
  or extraPython3Packages
- neovim's python interpreter can be found as nvim-python / nvim-python3
- wrapping nvim binary and setting `g:python_host_prog` and
  `g:python3_host_prog` via --cmd flag

python-packages.nix fixes:
- ordereddict builds for py26 and uses disabled argument to tell this
- trollius builds on all python platforms except 3.4 (where is included in
  standard librarary)
- neovim builds on all python platforms
---
 pkgs/applications/editors/neovim/default.nix | 61 +++++++++++++++-----
 pkgs/top-level/python-packages.nix           | 37 +++++++-----
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 814b05ced36..e2dbc4abc56 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack
 , libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack
-, luabitop, ncurses, perl, pkgconfig, unibilium
-, withJemalloc ? true, jemalloc }:
+, luabitop, ncurses, perl, pkgconfig, unibilium, makeWrapper
+, withPython ? true, pythonPackages, extraPythonPackages ? []
+, withPython3 ? true, python3Packages, extraPython3Packages ? []
+, withJemalloc ? true, jemalloc
+}:
 
-let version = "2015-06-09"; in
-stdenv.mkDerivation rec {
-  name = "neovim-${version}";
+with stdenv.lib;
 
-  src = fetchFromGitHub {
-    sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
-    rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
-    repo = "neovim";
-    owner = "neovim";
-  };
+let
+
+  version = "2015-06-09";
 
   # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
   neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec {
@@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
 
     enableParallelBuilding = true;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "VT220/xterm/ECMA-48 terminal emulator library";
       homepage = http://www.leonerd.org.uk/code/libvterm/;
       license = licenses.mit;
@@ -40,9 +38,30 @@ stdenv.mkDerivation rec {
     };
   };
 
+  pythonEnv = pythonPackages.python.buildEnv.override {
+    extraLibs = [ pythonPackages.neovim ] ++ extraPythonPackages;
+    ignoreCollisions = true;
+  };
+
+  python3Env = python3Packages.python.buildEnv.override {
+    extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages;
+    ignoreCollisions = true;
+  };
+
+in stdenv.mkDerivation rec {
+  name = "neovim-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
+    rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
+    repo = "neovim";
+    owner = "neovim";
+  };
+
   enableParallelBuilding = true;
 
   buildInputs = [
+    makeWrapper
     cmake
     glib
     libtermkey
@@ -57,7 +76,8 @@ stdenv.mkDerivation rec {
     neovimLibvterm
     pkgconfig
     unibilium
-  ] ++ stdenv.lib.optional withJemalloc jemalloc;
+  ] ++ optional withJemalloc jemalloc;
+
   nativeBuildInputs = [
     gettext
   ];
@@ -65,7 +85,20 @@ stdenv.mkDerivation rec {
   LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
   LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
 
-  meta = with stdenv.lib; {
+  postInstall = optionalString withPython ''
+    ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
+  '' + optionalString withPython3 ''
+    ln -s ${python3Env}/bin/python $out/bin/nvim-python3
+  '' + optionalString (withPython || withPython3) ''
+      wrapProgram $out/bin/nvim --add-flags "${
+        (optionalString withPython
+          ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') +
+        (optionalString withPython3
+          ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\"'')
+      }"
+  '';
+
+  meta = {
     description = "Vim text editor fork focused on extensibility and agility";
     longDescription = ''
       Neovim is a project that seeks to aggressively refactor Vim in order to:
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b47aa36f2c7..4da6cdbcf78 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8100,14 +8100,21 @@ let
   #   };
   # });
 
-  ordereddict = if isPy26 then (buildPythonPackage {
+  ordereddict = buildPythonPackage rec {
     name = "ordereddict-1.1";
+    disabled = !isPy26;
+
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz";
+      url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz";
       md5 = "a0ed854ee442051b249bfad0f638bbec";
     };
-    doCheck = false;
-  }) else null;
+
+    meta = {
+      description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6.";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ garbas ];
+    };
+  };
 
   ply = buildPythonPackage (rec {
     name = "ply-3.4";
@@ -15775,16 +15782,23 @@ let
   trollius = buildPythonPackage rec {
     version = "1.0.4";
     name = "trollius-${version}";
-    disabled = ! isPy27;
+    disabled = isPy34;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/trollius/${name}.tar.gz";
       md5 = "3631a464d49d0cbfd30ab2918ef2b783";
     };
 
-    buildInputs = [ self.mock ];
+    buildInputs = with self; [ mock ]
+      ++ optional isPy26 unittest2;
 
-    propagatedBuildInputs = [ self.futures ];
+    propagatedBuildInputs = with self; []
+      ++ optional isPy26 ordereddict
+      ++ optional (isPy26 || isPy27 || isPyPy) futures;
+
+    patchPhase = optionalString isPy26 ''
+      sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py
+    '';
 
     meta = {
       description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
@@ -15797,18 +15811,15 @@ let
   neovim = buildPythonPackage rec {
     version = "0.0.36";
     name = "neovim-${version}";
-    disabled = ! isPy27;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/neovim/${name}.tar.gz";
       md5 = "8cdad23402e29c7c5a1e85770e976edf";
     };
 
-    propagatedBuildInputs = with self; [
-      msgpack
-      trollius
-      greenlet
-    ];
+    propagatedBuildInputs = with self; [ msgpack ]
+      ++ optional (!isPyPy) greenlet
+      ++ optional (!isPy34) trollius;
 
     meta = {
       description = "Python client for Neovim";

From 11f0f3cba9bfade848a89a292797cdc0363d6c39 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Wed, 10 Jun 2015 21:36:51 -0400
Subject: [PATCH 048/144] photoqt: 1.1.0.1 -> 1.2

remove no longer necessary patch
---
 .../applications/graphics/photoqt/default.nix |  6 +--
 .../photoqt/graphicsmagick-path.patch         | 46 -------------------
 2 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/applications/graphics/photoqt/graphicsmagick-path.patch

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 9e2c3a18a63..2d41cfe5189 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,19 +1,17 @@
 { stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }:
 
 let
-  version = "1.1.0.1";
+  version = "1.2";
 in
 stdenv.mkDerivation rec {
   name = "photoqt-${version}";
   src = fetchurl {
     url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    sha256 = "1y59ys1dgjppahs7v7kxwva7ik23s0x7j2f6glv6sn23l9cfq9rp";
+    sha256 = "1dnnj2h3j517hcbjxlzk035fis44wdmqq7dvhwpmq1rcr0v32aaa";
   };
 
   buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ];
 
-  patches = [ ./graphicsmagick-path.patch ];
-
   preConfigure = ''
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
   '';
diff --git a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch b/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch
deleted file mode 100644
index da9b70e31ed..00000000000
--- a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/CMake/FindMagick.cmake	2014-10-13 19:24:30.000000000 +0200
-+++ b/CMake/FindMagick.cmake	2014-12-27 18:54:19.611759021 +0100
-@@ -19,28 +19,11 @@
- SET(MAGICK++_FOUND "NO" )
- 
- FIND_PATH( MAGICK_INCLUDE_DIR magick/magick.h
--  "$ENV{MAGICK_LOCATION}/magick"
--  "$ENV{MAGICK_LOCATION}/include/magick"
--  "$ENV{MAGICK_HOME}/include/magick"
--  /usr/include/magick
--  /usr/include/
--  /usr/include/GraphicsMagick
--  /opt/local/include/GraphicsMagick/magick
--  /opt/local/include/GraphicsMagick
-+  "$ENV{MAGICK_LOCATION}"
-   )
- 
- FIND_PATH( MAGICK++_INCLUDE_DIR Magick++.h
--  "$ENV{MAGICK++_LOCATION}/Magick++"
--  "$ENV{MAGICK++_LOCATION}/include/"
--  "$ENV{MAGICK_LOCATION}/Magick++"
--  "$ENV{MAGICK_LOCATION}/include/Magick++"
--  "$ENV{MAGICK_LOCATION}/include/"
--  "$ENV{MAGICK_HOME}/include/"
--  /usr/include/Magick++
--  /usr/include/GraphicsMagick
--  /usr/include/
--  /opt/local/include/GraphicsMagick/Magick++
--  /opt/local/include/GraphicsMagick
-+  "$ENV{MAGICK_LOCATION}"
-   )
-   
- FIND_LIBRARY( Magick GraphicsMagick
-@@ -55,12 +38,7 @@
- 
- FIND_LIBRARY( Magick++ GraphicsMagick++
-   PATHS 
--  "$ENV{MAGICK++_LOCATION}/.libs"
--  "$ENV{MAGICK_LOCATION}/.libs"
--  "$ENV{MAGICK++_LOCATION}/lib"
-   "$ENV{MAGICK_LOCATION}/lib"
--  "$ENV{MAGICK_HOME}/lib"
--  /opt/local/lib
-   DOC   "GraphicsMagick Magick++ library"
- )
- 

From 4227b13af6d37225cbbca8fb91a64cc6da1f3d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 1 Jun 2015 18:48:24 +0200
Subject: [PATCH 049/144] pypy: 2.5.1 -> 2.6.0

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

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index c5abefc6a78..a453fd3e1a9 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -6,8 +6,8 @@ assert zlibSupport -> zlib != null;
 
 let
 
-  majorVersion = "2.5";
-  version = "${majorVersion}.1";
+  majorVersion = "2.6";
+  version = "${majorVersion}.0";
   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 = "0gzhgc0rh5ywpkvzishpvkninl41r5k207y8afa8vxwpfx03vcrj";
+      sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh";
     };
 
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]

From fdc83edd08bf72a68efa52697e4b9e1ed586468c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 11 Jun 2015 10:39:39 +0200
Subject: [PATCH 050/144] Removing python-packages-generated.nix

It was an experiment by @garbas in 2014 that has been forgotten
because of other, newer experiments.

Packages also weren't updated so we shouldn't let them rot in nixpkgs.
---
 pkgs/top-level/python-packages-generated.nix | 5317 ------------------
 pkgs/top-level/python-packages.json          |  150 -
 pkgs/top-level/python-packages.nix           |    7 +-
 3 files changed, 1 insertion(+), 5473 deletions(-)
 delete mode 100644 pkgs/top-level/python-packages-generated.nix
 delete mode 100644 pkgs/top-level/python-packages.json

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
deleted file mode 100644
index 3876476623b..00000000000
--- a/pkgs/top-level/python-packages-generated.nix
+++ /dev/null
@@ -1,5317 +0,0 @@
-{ pkgs, stdenv, fetchurl, python, self }:
-
-let
-in
-{
-
-} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") {
-
-
-  "plone.uuid-1.0.3" = self.buildPythonPackage {
-    name = "plone.uuid-1.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip";
-        md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UUIDs for content items
-        '';
-      homepage = "http://plone.org";
-      license = "BSD";
-    };
-  };
-
-
-  "six-1.2.0" = self.buildPythonPackage {
-    name = "six-1.2.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz";
-        md5 = "2a5d1afc79912832ac78fd38e3d75d7e";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python 2 and 3 compatibility utilities
-        '';
-      homepage = "http://pypi.python.org/pypi/six/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "Products.ZopeVersionControl-1.1.3" = self.buildPythonPackage {
-    name = "Products.ZopeVersionControl-1.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip";
-        md5 = "238239102f3ac798ee4f4c53343a561f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Version Control
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZopeVersionControl";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "Products.Archetypes-1.9.7" = self.buildPythonPackage {
-    name = "Products.Archetypes-1.9.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.7.zip";
-        md5 = "35060c0ed8faf76c3c488fa642bb9715";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.folder-1.0.5" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Archetypes is a developers framework for rapidly developing and deploying rich, full featured content types within the context of Zope/CMF and Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.Archetypes";
-      license = "GPL";
-    };
-  };
-
-
-  "cssselect-0.9.1" = self.buildPythonPackage {
-    name = "cssselect-0.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.1.tar.gz";
-        md5 = "c74f45966277dc7a0f768b9b0f3522ac";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        cssselect parses CSS3 Selectors and translates them to XPath 1.0
-        '';
-      homepage = "http://packages.python.org/cssselect/";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.Marshall-2.1.2" = self.buildPythonPackage {
-    name = "Products.Marshall-2.1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip";
-        md5 = "bde4d7f75195c1ded8371554b04d2541";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Configurable Marshallers for Archetypes
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.Marshall";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.folder-1.0.5" = self.buildPythonPackage {
-    name = "plone.folder-1.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.5.zip";
-        md5 = "2722124a411e2d267b08d6f4d81e262c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        BTree-based folder implementation with order support
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.folder";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.CMFPlone-4.3.3" = self.buildPythonPackage {
-    name = "Products.CMFPlone-4.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.3.zip";
-        md5 = "e6638766d7bf59d27517174e9d67ea6b";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.10" self."archetypes.referencebrowserwidget-2.4.20" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-2.3.0" self."plone.app.blob-1.5.9" self."plone.app.collection-1.0.11" self."plone.app.content-2.1.4" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.10" self."plone.app.contentrules-3.0.6" self."plone.app.controlpanel-2.3.8" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.12" self."plone.app.folder-1.0.6" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.7" self."plone.app.layout-2.3.11" self."plone.app.linkintegrity-1.5.4" self."plone.app.locales-4.3.3" self."plone.app.portlets-2.4.8" self."plone.app.redirector-1.2" self."plone.app.search-1.1.7" self."plone.app.upgrade-1.3.6" self."plone.app.users-1.2" self."plone.app.uuid-1.1" self."plone.app.viewletmanager-2.0.5" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.batching-1.0.1" self."plone.browserlayer-2.1.3" self."plone.contentrules-2.0.4" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.9" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1.1" self."plonetheme.classic-1.3.3" self."plonetheme.sunburst-1.4.6" self."Products.Archetypes-1.9.7" self."Products.ATContentTypes-2.1.14" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.16" self."Products.PlacelessTranslationService-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.6" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.5" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Plone Content Management System (core)
-        '';
-      homepage = "http://plone.org/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "waitress-0.8.9" = self.buildPythonPackage {
-    name = "waitress-0.8.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.9.tar.gz";
-        md5 = "da3f2e62b3676be5dd630703a68e2a04";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Waitress WSGI server
-        '';
-      homepage = "https://github.com/Pylons/waitress";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.deferredimport-3.5.3" = self.buildPythonPackage {
-    name = "zope.deferredimport-3.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz";
-        md5 = "68fce3bf4f011d4a840902fd763884ee";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.proxy-3.6.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.deferredimport allows you to perform imports names that will only be resolved when used in the code.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.deferredimport";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "six-1.6.1" = self.buildPythonPackage {
-    name = "six-1.6.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/s/six/six-1.6.1.tar.gz";
-        md5 = "07d606ac08595d795bf926cc9985674f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python 2 and 3 compatibility utilities
-        '';
-      homepage = "http://pypi.python.org/pypi/six/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "zope.deprecation-4.1.1" = self.buildPythonPackage {
-    name = "zope.deprecation-4.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.1.1.tar.gz";
-        md5 = "ce261b9384066f7e13b63525778430cb";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Deprecation Infrastructure
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.deprecation";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFUid-2.2.1" = self.buildPythonPackage {
-    name = "Products.CMFUid-2.2.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
-        md5 = "e20727959351dffbf0bac80613eee110";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Uid product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFUid";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.autoform-1.6" = self.buildPythonPackage {
-    name = "plone.autoform-1.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.6.zip";
-        md5 = "27412ab43f728064a60e2aeb564726b5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Tools to construct z3c.form forms
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "LGPL";
-    };
-  };
-
-
-  "roman-1.4.0" = self.buildPythonPackage {
-    name = "roman-1.4.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz";
-        md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integer to Roman numerals converter
-        '';
-      homepage = "http://pypi.python.org/pypi/roman";
-      license = "Python 2.1.1";
-    };
-  };
-
-
-  "archetypes.referencebrowserwidget-2.4.20" = self.buildPythonPackage {
-    name = "archetypes.referencebrowserwidget-2.4.20";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.20.zip";
-        md5 = "352ea75e5dbdcdca8897f88fd77ecd3e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.jquerytools-1.5.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A referencebrowser implementation for Archetypes
-        '';
-      homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.fieldsets-2.0.2" = self.buildPythonPackage {
-    name = "plone.fieldsets-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip";
-        md5 = "4158c8a1f784fcb5cecbd63deda7222f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.formlib-1.0.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        An extension to zope.formlib, which allows to group fields into different fieldsets.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.fieldsets";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.redirector-1.2" = self.buildPythonPackage {
-    name = "plone.app.redirector-1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip";
-        md5 = "bc0508844f276ac7a7b9556d37281cc8";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        redirection tool
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.redirector";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "nose-1.3.3" = self.buildPythonPackage {
-    name = "nose-1.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.3.tar.gz";
-        md5 = "42776061bf5206670cb819176dc78654";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        nose extends unittest to make testing easier
-        '';
-      homepage = "http://readthedocs.org/docs/nose/";
-      license = "GNU LGPL";
-    };
-  };
-
-
-  "plone.app.blob-1.5.9" = self.buildPythonPackage {
-    name = "plone.app.blob-1.5.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.9.zip";
-        md5 = "3ac753daa2758e3e8290e1e3a1887183";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.3" self."plone.app.imaging-1.0.10" self."plone.scale__storage-1.3.3" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZODB blob support for Plone
-        '';
-      homepage = "http://plone.org/products/plone.app.blob";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "suds" = self."suds-0.4";
-
-  "suds-0.4" = self.buildPythonPackage {
-    name = "suds-0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";
-        md5 = "b7502de662341ed7275b673e6bd73191";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Lightweight SOAP client
-        '';
-      homepage = "https://fedorahosted.org/suds";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.testbrowser-3.11.1" = self.buildPythonPackage {
-    name = "zope.testbrowser-3.11.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz";
-        md5 = "64abbee892121e7f1a91aed12cfc155a";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."mechanize-0.2.5" self."pytz-2013b" self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Programmable browser for functional black-box tests
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.testbrowser";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.ZCTextIndex-2.13.5" = self.buildPythonPackage {
-    name = "Products.ZCTextIndex-2.13.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.5.zip";
-        md5 = "9a3717674b33d1d7c11b2c3728663d5b";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Full text indexing for ZCatalog / Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.outputfilters-1.12" = self.buildPythonPackage {
-    name = "plone.outputfilters-1.12";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.12.zip";
-        md5 = "ed76b9cf028cf7e04f3aa408e22b61ca";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Transformations applied to HTML in Plone text fields as they are rendered
-        '';
-      homepage = "http://github.com/plone/plone.outputfilters";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.site-3.9.2" = self.buildPythonPackage {
-    name = "zope.site-3.9.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz";
-        md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Local registries for zope component architecture
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.site";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.contentmenu-2.0.10" = self.buildPythonPackage {
-    name = "plone.app.contentmenu-2.0.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.10.zip";
-        md5 = "d28bc995bbe5a6f4aeabad07438ffb85";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.4" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone's content menu implementation
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentmenu";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "mechanize-0.2.5" = self.buildPythonPackage {
-    name = "mechanize-0.2.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz";
-        md5 = "32657f139fc2fb75bcf193b63b8c60b2";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Stateful programmatic web browsing.
-        '';
-      homepage = "http://wwwsearch.sourceforge.net/mechanize/";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.PlacelessTranslationService-2.0.4" = self.buildPythonPackage {
-    name = "Products.PlacelessTranslationService-2.0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.4.zip";
-        md5 = "4b5a1ddc66eeaa02d32ee4a685905c10";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PlacelessTranslationService";
-      license = "GPL";
-    };
-  };
-
-
-  "ZConfig-2.9.1" = self.buildPythonPackage {
-    name = "ZConfig-2.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz";
-        md5 = "4738de641d90b992de5b89ff1bc2fe49";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Structured Configuration Library
-        '';
-      homepage = "http://www.zope.org/Members/fdrake/zconfig/";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.deprecation-3.4.1" = self.buildPythonPackage {
-    name = "zope.deprecation-3.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz";
-        md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Deprecation Infrastructure
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.deprecation";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFFormController-3.0.3" = self.buildPythonPackage {
-    name = "Products.CMFFormController-3.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip";
-        md5 = "6573df7dcb39e3b63ba22abe2acd639e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        CMFFormController provides a form validation mechanism for CMF.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFFormController";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.validation-2.0" = self.buildPythonPackage {
-    name = "Products.validation-2.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip";
-        md5 = "afa217e2306637d1dccbebf337caa8bf";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Data validation package for Archetypes
-        '';
-      homepage = "UNKNOWN";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.event-4.0.3" = self.buildPythonPackage {
-    name = "zope.event-4.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.3.tar.gz";
-        md5 = "9a3780916332b18b8b85f522bcc3e249";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Very basic event publishing system
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.event";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.caching-1.0" = self.buildPythonPackage {
-    name = "plone.caching-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip";
-        md5 = "2c2e3b27d13b9101c92dfed222fde36c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 2 integration for z3c.caching
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.caching";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.proxy-3.6.1" = self.buildPythonPackage {
-    name = "zope.proxy-3.6.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip";
-        md5 = "a400b0a26624b17fa889dbcaa989d440";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Generic Transparent Proxies
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.proxy";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.componentvocabulary-1.0.1" = self.buildPythonPackage {
-    name = "zope.componentvocabulary-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz";
-        md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Component vocabularies
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.componentvocabulary";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFCore-2.2.7" = self.buildPythonPackage {
-    name = "Products.CMFCore-2.2.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
-        md5 = "9320a4023b8575097feacfd4a400e930";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Content Management Framework core components
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFCore";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.PlonePAS-4.1.3" = self.buildPythonPackage {
-    name = "Products.PlonePAS-4.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.3.zip";
-        md5 = "785c10242b77bfb0612c76b0262e361e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        PlonePAS adapts the PluggableAuthService for use by Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PlonePAS";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "mock-1.0.1" = self.buildPythonPackage {
-    name = "mock-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/m/mock/mock-1.0.1.tar.gz";
-        md5 = "c3971991738caa55ec7c356bbc154ee2";
-    };
-    doCheck = true;
-    buildInputs = [ self."unittest2-0.5.1" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A Python Mocking and Patching Library for Testing
-        '';
-      homepage = "http://www.voidspace.org.uk/python/mock/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "Products.ATReferenceBrowserWidget-3.0" = self.buildPythonPackage {
-    name = "Products.ATReferenceBrowserWidget-3.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip";
-        md5 = "157bdd32155c8353450c17c649aad042";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.20" self.setuptools self."zope.deprecation-3.4.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        ATReferenceBrowserWidget is reference widget for Archetypes.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ATReferenceBrowserWidget";
-      license = "GPL";
-    };
-  };
-
-
-  "MultiMapping-2.13.0" = self.buildPythonPackage {
-    name = "MultiMapping-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip";
-        md5 = "d69c5904c105b9f2f085d4103e0f0586";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Special MultiMapping objects used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/MultiMapping";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.ZSQLMethods-2.13.4" = self.buildPythonPackage {
-    name = "Products.ZSQLMethods-2.13.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip";
-        md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        SQL method support for Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.transformchain-1.0.3" = self.buildPythonPackage {
-    name = "plone.transformchain-1.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip";
-        md5 = "f5fb7ca894249e3e666501c4fae52a6c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Hook into repoze.zope2 that allows third party packages to register a sequence of hooks that will be allowed to modify the response before it is returned to the browser
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.transformchain";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.CMFQuickInstallerTool-3.0.6" = self.buildPythonPackage {
-    name = "Products.CMFQuickInstallerTool-3.0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz";
-        md5 = "af34adb87ddf2b6da48eff8b70ca2989";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        CMFQuickInstallerTool is a facility for comfortable activation/deactivation of CMF compliant products.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFQuickInstallerTool";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.14";
-
-  "plone.recipe.zope2instance-4.2.14" = self.buildPythonPackage {
-    name = "plone.recipe.zope2instance-4.2.14";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.14.zip";
-        md5 = "e5e76023d357592ee7b0236bb9764b9d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Buildout recipe for creating a Zope 2 instance
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.event-3.5.2" = self.buildPythonPackage {
-    name = "zope.event-3.5.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
-        md5 = "6e8af2a16157a74885d4f0d88137cefb";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Very basic event publishing system
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.event";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFEditions-2.2.9" = self.buildPythonPackage {
-    name = "Products.CMFEditions-2.2.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.9.zip";
-        md5 = "4cd9db460f4056b14d425ff2fdc34952";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.4" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Versioning for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFEditions";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.processlifetime-1.0" = self.buildPythonPackage {
-    name = "zope.processlifetime-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz";
-        md5 = "69604bfd668a01ebebdd616a8f26ccfe";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope process lifetime events
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.processlifetime";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFDefault-2.2.4" = self.buildPythonPackage {
-    name = "Products.CMFDefault-2.2.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.4.tar.gz";
-        md5 = "3d4444a8c4b486a2d769060e35a3ee01";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Default product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFDefault";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.form-2.2.4" = self.buildPythonPackage {
-    name = "plone.app.form-2.2.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.4.zip";
-        md5 = "1784f608dcb3a1701d91d4985ca31e63";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.14" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.formlib integration for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.form";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.PasswordResetTool-2.0.16" = self.buildPythonPackage {
-    name = "Products.PasswordResetTool-2.0.16";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.16.zip";
-        md5 = "c9069dff718878a32b1ef91875acf240";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Password reset tool for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.synchronize-1.0.1" = self.buildPythonPackage {
-    name = "plone.synchronize-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip";
-        md5 = "d25e86ace8daa0816861296c3288c4fb";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Simple decorators to support synchronized methods
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.synchronize";
-      license = "BSD";
-    };
-  };
-
-
-  "collective.monkeypatcher-1.0.1" = self.buildPythonPackage {
-    name = "collective.monkeypatcher-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip";
-        md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Support for applying monkey patches late in the startup cycle by using ZCML configuration actions
-        '';
-      homepage = "http://pypi.python.org/pypi/collective.monkeypatcher";
-      license = "BSD";
-    };
-  };
-
-
-  "lxml-3.3.5" = self.buildPythonPackage {
-    name = "lxml-3.3.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.3.5.tar.gz";
-        md5 = "88c75f4c73fc8f59c9ebb17495044f2f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
-        '';
-      homepage = "http://lxml.de/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "PasteDeploy-1.5.2" = self.buildPythonPackage {
-    name = "PasteDeploy-1.5.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.2.tar.gz";
-        md5 = "352b7205c78c8de4987578d19431af3b";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Load, configure, and compose WSGI applications and servers
-        '';
-      homepage = "http://pythonpaste.org/deploy/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "plonetheme.sunburst-1.4.6" = self.buildPythonPackage {
-    name = "plonetheme.sunburst-1.4.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.6.zip";
-        md5 = "6e236f7d2ab944b708fb26de6f343ceb";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The default theme for Plone 4.
-        '';
-      homepage = "http://pypi.python.org/pypi/plonetheme.sunburst";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.openid-2.0.2" = self.buildPythonPackage {
-    name = "plone.openid-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.2.zip";
-        md5 = "046133795cf232ab6d19db940f02197a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        OpenID authentication support for PAS
-        '';
-      homepage = "http://svn.plone.org/svn/plone/plone.openid";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.sequencesort-3.4.0" = self.buildPythonPackage {
-    name = "zope.sequencesort-3.4.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz";
-        md5 = "cfc35fc426a47f5c0ee43c416224b864";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Sequence Sorting
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.PortalTransforms-2.1.3" = self.buildPythonPackage {
-    name = "Products.PortalTransforms-2.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.3.zip";
-        md5 = "a2f1f9e0388ed081028bb4c93fd24317";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.MimetypesRegistry-2.0.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        MIME based content transformations
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PortalTransforms";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.interface-4.1.1" = self.buildPythonPackage {
-    name = "zope.interface-4.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.1.tar.gz";
-        md5 = "edcd5f719c5eb2e18894c4d06e29b6c6";
-    };
-    doCheck = true;
-    buildInputs = [ self."zope.event-4.0.3" ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Interfaces for Python
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.interface";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.app.publication-3.12.0" = self.buildPythonPackage {
-    name = "zope.app.publication-3.12.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
-        md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.authentication-3.7.1" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.error-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope publication
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.app.publication";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.component-4.2.1" = self.buildPythonPackage {
-    name = "zope.component-4.2.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz";
-        md5 = "cf55d496428d976f9329a4a2330a8b54";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Component Architecture
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.component";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.content-2.1.4" = self.buildPythonPackage {
-    name = "plone.app.content-2.1.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.4.zip";
-        md5 = "6930a2376e2d856e4f24e17f789568e5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0.1" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Content Views for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.content";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.alterego-1.0" = self.buildPythonPackage {
-    name = "plone.alterego-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip";
-        md5 = "b7b6dbcbba00505d98d5aba83e016408";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Low level support for dynamic modules
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "LGPL";
-    };
-  };
-
-
-  "Products.ExternalEditor-1.1.0" = self.buildPythonPackage {
-    name = "Products.ExternalEditor-1.1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
-        md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope External Editor
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ExternalEditor";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFDiffTool-2.1" = self.buildPythonPackage {
-    name = "Products.CMFDiffTool-2.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip";
-        md5 = "7513d954294e9f318182f9d61660abdb";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Diff tool for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFDiffTool";
-      license = "GPL";
-    };
-  };
-
-
-  "repoze.lru-0.6" = self.buildPythonPackage {
-    name = "repoze.lru-0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/r/repoze.lru/repoze.lru-0.6.tar.gz";
-        md5 = "2c3b64b17a8e18b405f55d46173e14dd";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A tiny LRU cache implementation and decorator
-        '';
-      homepage = "http://www.repoze.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "Markdown-2.0.3" = self.buildPythonPackage {
-    name = "Markdown-2.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.tar.gz";
-        md5 = "751e8055be2433dfd1a82e0fb1b12f13";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python implementation of Markdown.
-        '';
-      homepage = "http://www.freewisdom.org/projects/python-markdown";
-      license = "BSD License";
-    };
-  };
-
-
-  "z3c.formwidget.query-0.10" = self.buildPythonPackage {
-    name = "z3c.formwidget.query-0.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.10.zip";
-        md5 = "912773ecfa4409bc8911e9e8dd981e58";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A source query widget for z3c.form.
-        '';
-      homepage = "http://pypi.python.org/pypi/z3c.formwidget.query";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.DCWorkflow-2.2.4" = self.buildPythonPackage {
-    name = "Products.DCWorkflow-2.2.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
-        md5 = "c90a16c4f3611015592ba8173a5f1863";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        DCWorkflow product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.DCWorkflow";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.behavior-1.0.2" = self.buildPythonPackage {
-    name = "plone.behavior-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip";
-        md5 = "4459b91287ebc2f2cf4fa38728b2a739";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Infrastructure for maintaining a registry of available behaviors
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "BSD";
-    };
-  };
-
-
-  "diazo-1.0.5" = self.buildPythonPackage {
-    name = "diazo-1.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.5.zip";
-        md5 = "9b304d079eab7c9dd6d10487f2fc94a4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Diazo implements a Deliverance like language using a pure
-        XSLT engine. With Diazo, you "compile" your theme and ruleset in one
-        step, then use a superfast/simple transform on each request thereafter.
-        Alternatively, compile your theme during development, check it into
-        version control, and not touch Diazo during deployment.
-        '';
-      homepage = "http://diazo.org";
-      license = "New BSD";
-    };
-  };
-
-
-  "zope.tales-3.5.3" = self.buildPythonPackage {
-    name = "zope.tales-3.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz";
-        md5 = "a2dbc6e41140c29de81b66a4d703fc3f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.tal-3.5.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Template Application Language Expression Syntax (TALES)
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.tales";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "feedparser-5.0.1" = self.buildPythonPackage {
-    name = "feedparser-5.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2";
-        md5 = "702835de74bd4a578524f311e62c2877";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-
-        '';
-      homepage = "https://code.google.com/p/feedparser/";
-      license = "";
-    };
-  };
-
-
-  "DateTime-3.0.3" = self.buildPythonPackage {
-    name = "DateTime-3.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.3.zip";
-        md5 = "5ebf0a8e3775b744c5de2e6685b37ae9";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."pytz-2013b" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module.
-        '';
-      homepage = "http://pypi.python.org/pypi/DateTime";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Missing-2.13.1" = self.buildPythonPackage {
-    name = "Missing-2.13.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
-        md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Special Missing objects used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Missing";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "z3c.autoinclude-0.3.5" = self.buildPythonPackage {
-    name = "z3c.autoinclude-0.3.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.5.zip";
-        md5 = "44f113a1c280dd238ab9b8490ae88857";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" self."zope.configuration-3.7.4" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Automatically include ZCML
-        '';
-      homepage = "http://pypi.python.org/pypi/z3c.autoinclude";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "pytz-2013b" = self.buildPythonPackage {
-    name = "pytz-2013b";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pytz/pytz-2013b.tar.bz2";
-        md5 = "34f47470eedd5cd1faf6c3da2741967b";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        World timezone definitions, modern and historical
-        '';
-      homepage = "http://pytz.sourceforge.net";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "zope.configuration-3.7.4" = self.buildPythonPackage {
-    name = "zope.configuration-3.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip";
-        md5 = "5b0271908ef26c05059eda76928896ea";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Configuration Markup Language (ZCML)
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.configuration";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.iterate-2.1.12" = self.buildPythonPackage {
-    name = "plone.app.iterate-2.1.12";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.12.zip";
-        md5 = "1d05316d4e9a68ed738e890aafa3c9e2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.9" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        check-out/check-in staging for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.iterate";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.theming-1.1.1" = self.buildPythonPackage {
-    name = "plone.app.theming-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
-        md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."diazo-1.0.5" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.8" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.3" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integrates the Diazo theming engine with Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.theming";
-      license = "GPL";
-    };
-  };
-
-
-  "python-openid-2.2.5" = self.buildPythonPackage {
-    name = "python-openid-2.2.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz";
-        md5 = "393f48b162ec29c3de9e2973548ea50d";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        OpenID support for servers and consumers.
-        '';
-      homepage = "http://github.com/openid/python-openid";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "Products.MailHost-2.13.1" = self.buildPythonPackage {
-    name = "Products.MailHost-2.13.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip";
-        md5 = "1102e523435d8bf78a15b9ddb57478e1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.sendmail integration for Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.MailHost";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.broken-3.6.0" = self.buildPythonPackage {
-    name = "zope.broken-3.6.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
-        md5 = "eff24d7918099a3e899ee63a9c31bee6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Broken Object Interfaces
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.broken";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "DocumentTemplate-2.13.2" = self.buildPythonPackage {
-    name = "DocumentTemplate-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
-        md5 = "07bb086c77c1dfe94125ad2efbba94b7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Document Templating Markup Language (DTML)
-        '';
-      homepage = "http://pypi.python.org/pypi/DocumentTemplate";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.PythonScripts-2.13.2" = self.buildPythonPackage {
-    name = "Products.PythonScripts-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip";
-        md5 = "04c86f2c45a29a162297a80dac61d14f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Provides support for restricted execution of Python scripts in Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PythonScripts";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.ptresource-3.9.0" = self.buildPythonPackage {
-    name = "zope.ptresource-3.9.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz";
-        md5 = "f4645e51c15289d3fdfb4139039e18e9";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browserresource-3.10.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Page template resource plugin for zope.browserresource
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.ptresource/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "plone.namedfile__scales-2.0.5" = self.buildPythonPackage {
-    name = "plone.namedfile__scales-2.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.5.zip";
-        md5 = "54f73c5961cbdf5020cf59ae780601ea";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.rfc822-1.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        File types and fields for images, files and blob files with filenames
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.namedfile";
-      license = "BSD";
-    };
-  };
-
-
-  "docutils-0.9.1" = self.buildPythonPackage {
-    name = "docutils-0.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz";
-        md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Docutils -- Python Documentation Utilities
-        '';
-      homepage = "http://docutils.sourceforge.net/";
-      license = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)";
-    };
-  };
-
-
-  "plone.app.controlpanel-2.3.8" = self.buildPythonPackage {
-    name = "plone.app.controlpanel-2.3.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.8.zip";
-        md5 = "230fa6df467f5bcc0b987d1cd66ccd9f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.PlonePAS-4.1.3" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Formlib-based controlpanels for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.controlpanel";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "beautifulsoup4-4.3.2" = self.buildPythonPackage {
-    name = "beautifulsoup4-4.3.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.2.tar.gz";
-        md5 = "b8d157a204d56512a4cc196e53e7d8ee";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Screen-scraping library
-        '';
-      homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "WebOb-1.4" = self.buildPythonPackage {
-    name = "WebOb-1.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.4.tar.gz";
-        md5 = "8437607c0cc00c35f658f972516ffb55";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        WSGI request and response object
-        '';
-      homepage = "http://webob.org/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "zope.error-3.7.4" = self.buildPythonPackage {
-    name = "zope.error-3.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
-        md5 = "281445a906458ff5f18f56923699a127";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        An error reporting utility for Zope3
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.error";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.openid-2.0.2" = self.buildPythonPackage {
-    name = "plone.app.openid-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz";
-        md5 = "ae0748f91cab0612a498926d405d8edd";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."plone.app.portlets-2.4.8" self."plone.openid-2.0.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone OpenID authentication support
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.openid";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.indexer-1.0.2" = self.buildPythonPackage {
-    name = "plone.indexer-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
-        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Hooks to facilitate managing custom index values in Zope 2/CMF applications
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.indexer";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.app.portlets-2.4.8" = self.buildPythonPackage {
-    name = "plone.app.portlets-2.4.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.8.zip";
-        md5 = "7d25027d89d871a50aba91c95b798bb2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.14" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone integration for the basic plone.portlets package
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.portlets";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.keyring-2.0.1" = self.buildPythonPackage {
-    name = "plone.keyring-2.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip";
-        md5 = "f3970e9bddb2cc65e461a2c62879233f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Manage secrets
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.keyring";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.formwidget.namedfile-1.0.9" = self.buildPythonPackage {
-    name = "plone.formwidget.namedfile-1.0.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.9.zip";
-        md5 = "96f2634a8c4c1d98c2f39646a77c87fc";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Image widget for z3c.form and Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile";
-      license = "GPL";
-    };
-  };
-
-
-  "Persistence-2.13.2" = self.buildPythonPackage {
-    name = "Persistence-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
-        md5 = "92693648ccdc59c8fc71f7f06b1d228c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Persistent ExtensionClass
-        '';
-      homepage = "http://pypi.python.org/pypi/Persistence";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFPlacefulWorkflow-1.5.10" = self.buildPythonPackage {
-    name = "Products.CMFPlacefulWorkflow-1.5.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.10.zip";
-        md5 = "997648c5bed6d5a54ac922c6ba9351a9";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Workflow policies for CMF and Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.dexterity-2.2.1" = self.buildPythonPackage {
-    name = "plone.dexterity-2.2.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.2.1.zip";
-        md5 = "c62d427e3f6c24da1cca58d7cb152e1f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.folder-1.0.5" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.4" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Flexible CMF content
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zc.recipe.egg-1.3.2" = self.buildPythonPackage {
-    name = "zc.recipe.egg-1.3.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.3.2.tar.gz";
-        md5 = "1cb6af73f527490dde461d3614a36475";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Recipe for installing Python package distributions as eggs
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zc.recipe.egg";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.dexterity-2.0.11" = self.buildPythonPackage {
-    name = "plone.app.dexterity-2.0.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.11.zip";
-        md5 = "649f08fd008908121f5f70dfd33e513a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."lxml-2.3.6" self."plone.app.content-2.1.4" self."plone.app.layout-2.3.11" self."plone.app.textfield-1.2.3" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.4" self."plone.dexterity-2.2.1" self."plone.formwidget.namedfile-1.0.9" self."plone.namedfile__scales-2.0.5" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.7" self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular.
-        '';
-      homepage = "http://plone.org/products/dexterity";
-      license = "GPL";
-    };
-  };
-
-
-  "mailinglogger-3.7.0" = self.buildPythonPackage {
-    name = "mailinglogger-3.7.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz";
-        md5 = "f865f0df6059ce23062b7457d01dbac5";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Enhanced emailing handlers for the python logging package.
-        '';
-      homepage = "http://www.simplistix.co.uk/software/python/mailinglogger";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage {
-    name = "Products.BTreeFolder2-2.13.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz";
-        md5 = "f57c85673036af7ccd34c3fa251f6bb2";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A BTree based implementation for Zope 2's OFS.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.locking-2.0.4" = self.buildPythonPackage {
-    name = "plone.locking-2.0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
-        md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        webdav locking support
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.locking";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.viewletmanager-2.0.5" = self.buildPythonPackage {
-    name = "plone.app.viewletmanager-2.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.5.zip";
-        md5 = "e923d0a9a087ef79a6f0303f64a0f853";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.14" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        configurable viewlet manager
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.testing-3.9.7" = self.buildPythonPackage {
-    name = "zope.testing-3.9.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz";
-        md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope testing framework, including the testrunner script.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.testing";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.lifecycleevent-3.6.2" = self.buildPythonPackage {
-    name = "zope.lifecycleevent-3.6.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz";
-        md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Object life-cycle events
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.lifecycleevent";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.imaging-1.0.10" = self.buildPythonPackage {
-    name = "plone.app.imaging-1.0.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.10.zip";
-        md5 = "511ed465cef112bac3d074f09810ca80";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.scale__storage-1.3.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        User-configurable, blob-aware image scaling for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.imaging";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.contentrules-3.0.6" = self.buildPythonPackage {
-    name = "plone.app.contentrules-3.0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.6.zip";
-        md5 = "95eeb55a9489c85c93eb11a87467d867";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.contentrules-2.0.4" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.11" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone integration for plone.contentrules
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentrules";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "translationstring-1.1" = self.buildPythonPackage {
-    name = "translationstring-1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/t/translationstring/translationstring-1.1.tar.gz";
-        md5 = "0979b46d8f0f852810c8ec4be5c26cf2";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Utility library for i18n relied on by various Repoze and Pyramid packages
-        '';
-      homepage = "http://pylonsproject.org";
-      license = "BSD-like (http://repoze.org/license.html)";
-    };
-  };
-
-
-  "zope.pagetemplate-3.6.3" = self.buildPythonPackage {
-    name = "zope.pagetemplate-3.6.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip";
-        md5 = "834a4bf702c05fba1e669677b4dc871f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.security__untrustedpython-3.7.4" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Page Templates
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.pagetemplate";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.users-1.2" = self.buildPythonPackage {
-    name = "plone.app.users-1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2.zip";
-        md5 = "c94682960a960da6d75c8bfba587a836";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.8" self."plone.app.layout-2.3.11" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A package for all things users and groups related (specific to plone)
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.users";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zc.buildout-1.7.1" = self.buildPythonPackage {
-    name = "zc.buildout-1.7.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-1.7.1.tar.gz";
-        md5 = "8834a21586bf2be53dc412002241a996";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        System for managing development buildouts
-        '';
-      homepage = "http://pypi.python.org/pypi/zc.buildout";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "archetypes.schemaextender-2.1.3" = self.buildPythonPackage {
-    name = "archetypes.schemaextender-2.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.3.zip";
-        md5 = "105f2f8e9c18f34bd09d1a90a10c91d2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Dynamically extend Archetypes schemas with named adapters.
-        '';
-      homepage = "http://pypi.python.org/pypi/archetypes.schemaextender";
-      license = "GPL";
-    };
-  };
-
-
-  "ZopeUndo-2.12.0" = self.buildPythonPackage {
-    name = "ZopeUndo-2.12.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
-        md5 = "2b8da09d1b98d5558f62e12f6e52c401";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZODB undo support for Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/ZopeUndo";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.tal-3.5.2" = self.buildPythonPackage {
-    name = "zope.tal-3.5.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip";
-        md5 = "13869f292ba36b294736b7330b1396fd";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 3 Template Application Languate (TAL)
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.tal";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.OFSP-2.13.2" = self.buildPythonPackage {
-    name = "Products.OFSP-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip";
-        md5 = "c76d40928753c2ee56db873304e65bd5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Persistence-2.13.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        General Zope 2 help screens.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.OFSP";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "pyramid" = self."pyramid-1.5";
-
-  "pyramid-1.5" = self.buildPythonPackage {
-    name = "pyramid-1.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.5.tar.gz";
-        md5 = "8747658dcbab709a9c491e43d3b0d58b";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" self."WebTest-2.0.15" self."zope.component-4.2.1" self."zope.interface-4.1.1" ];
-    propagatedBuildInputs = [ self."PasteDeploy-1.5.2" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.4" self."zope.deprecation-4.1.1" self."zope.interface-4.1.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Pyramid Web Framework, a Pylons project
-        '';
-      homepage = "http://pylonsproject.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "plone.app.search-1.1.7" = self.buildPythonPackage {
-    name = "plone.app.search-1.1.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.7.zip";
-        md5 = "fc3c8d3f64300f6a02770027d7d14136";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.5" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Search user interface for Plone CMS.
-        '';
-      homepage = "http://github.com/plone/plone.app.search";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.container-3.11.2" = self.buildPythonPackage {
-    name = "zope.container-3.11.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz";
-        md5 = "fc66d85a17b8ffb701091c9328983dcc";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.broken-3.6.0" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.filerepresentation-3.6.1" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Container
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.container";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "unittest2-0.5.1" = self.buildPythonPackage {
-    name = "unittest2-0.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.tar.gz";
-        md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The new features in unittest for Python 2.7 backported to Python 2.3+.
-        '';
-      homepage = "http://pypi.python.org/pypi/unittest2";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.schema-4.2.2" = self.buildPythonPackage {
-    name = "zope.schema-4.2.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
-        md5 = "e7e581af8193551831560a736a53cf58";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.interface extension for defining data schemas
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.schema";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.schema-4.4.1" = self.buildPythonPackage {
-    name = "zope.schema-4.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.4.1.tar.gz";
-        md5 = "afb9281217b79840e1679abeb302467a";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.interface extension for defining data schemas
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.schema";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zExceptions-2.13.0" = self.buildPythonPackage {
-    name = "zExceptions-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip";
-        md5 = "4c679696c959040d8e656ef85ae40136";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        zExceptions contains common exceptions used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/zExceptions";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFDynamicViewFTI-4.0.5" = self.buildPythonPackage {
-    name = "Products.CMFDynamicViewFTI-4.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip";
-        md5 = "2d31b1700ed8b1441adc737b454af693";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        CMFDynamicViewFTI is a product for dynamic views in CMF.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFDynamicViewFTI";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.publisher-3.12.6" = self.buildPythonPackage {
-    name = "zope.publisher-3.12.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz";
-        md5 = "495131970cc7cb14de8e517fb3857ade";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Zope publisher publishes Python objects on the web.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.publisher";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.browserpage-3.12.2" = self.buildPythonPackage {
-    name = "zope.browserpage-3.12.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
-        md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZCML directives for configuring browser views for Zope.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browserpage/";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.i18n-2.0.2" = self.buildPythonPackage {
-    name = "plone.app.i18n-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip";
-        md5 = "a10026573463dfc1899bf4062cebdbf2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone specific i18n extensions.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.i18n";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.security__untrustedpython-3.7.4" = self.buildPythonPackage {
-    name = "zope.security__untrustedpython-3.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
-        md5 = "072ab8d11adc083eace11262da08630c";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" self."RestrictedPython-3.6.0" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Security Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.security";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.cachepurging-1.0.5" = self.buildPythonPackage {
-    name = "plone.cachepurging-1.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.5.zip";
-        md5 = "ae893d47c424cb8a4cd688f6d9b46dc0";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Cache purging support for Zope 2 applications
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.cachepurging";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "psycopg2" = self."psycopg2-2.5.3";
-
-  "psycopg2-2.5.3" = self.buildPythonPackage {
-    name = "psycopg2-2.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.3.tar.gz";
-        md5 = "09dcec70f623a9ef774f1aef75690995";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.postgresql ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python-PostgreSQL Database Adapter
-        '';
-      homepage = "http://initd.org/psycopg/";
-      license = with stdenv.lib.licenses; [ lgpl3Plus zpt20 ];
-    };
-  };
-
-
-  "zope.component__zcml-3.9.5" = self.buildPythonPackage {
-    name = "zope.component__zcml-3.9.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz";
-        md5 = "22780b445b1b479701c05978055d1c82";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Component Architecture
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.component";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Acquisition-2.13.8" = self.buildPythonPackage {
-    name = "Acquisition-2.13.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
-        md5 = "8c33160c157b50649e2b2b3224622579";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in.
-        '';
-      homepage = "http://pypi.python.org/pypi/Acquisition";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Unidecode-0.04.1" = self.buildPythonPackage {
-    name = "Unidecode-0.04.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
-        md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        US-ASCII transliterations of Unicode text
-        '';
-      homepage = "http://code.zemanta.com/tsolc/unidecode/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "plone.rfc822-1.1" = self.buildPythonPackage {
-    name = "plone.rfc822-1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.1.zip";
-        md5 = "ba3e26cab9e751fb1cf40639d661d2f0";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        RFC822 marshalling for zope.schema fields
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.rfc822";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.viewlet-3.7.2" = self.buildPythonPackage {
-    name = "zope.viewlet-3.7.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz";
-        md5 = "367e03096df57e2f9b74fff43f7901f9";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Viewlets
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.viewlet";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.ATContentTypes-2.1.14" = self.buildPythonPackage {
-    name = "Products.ATContentTypes-2.1.14";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.14.zip";
-        md5 = "7e777ed4034ffc23688f2a8072a6c109";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.20" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.app.layout-2.3.11" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Default Content Types for Plone
-        '';
-      homepage = "http://plone.org/";
-      license = "GPL";
-    };
-  };
-
-
-  "coverage-3.7.1" = self.buildPythonPackage {
-    name = "coverage-3.7.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.7.1.tar.gz";
-        md5 = "c47b36ceb17eaff3ecfab3bcd347d0df";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Code coverage measurement for Python
-        '';
-      homepage = "http://nedbatchelder.com/code/coverage";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.i18n__zcml-3.7.4" = self.buildPythonPackage {
-    name = "zope.i18n__zcml-3.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz";
-        md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.schema-4.2.2" self."zope.configuration-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Internationalization Support
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.i18n";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.browserresource-3.10.3" = self.buildPythonPackage {
-    name = "zope.browserresource-3.10.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip";
-        md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Browser resources implementation for Zope.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browserresource/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "RelStorage" = self."RelStorage-1.5.1";
-
-  "RelStorage-1.5.1" = self.buildPythonPackage {
-    name = "RelStorage-1.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/R/RelStorage/RelStorage-1.5.1.tar.gz";
-        md5 = "2454211d086ac02a4af10f7292e260ec";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."zc.lockfile-1.0.2" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A backend for ZODB that stores pickles in a relational database.
-        '';
-      homepage = "http://pypi.python.org/pypi/RelStorage";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "five.formlib-1.0.4" = self.buildPythonPackage {
-    name = "five.formlib-1.0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip";
-        md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.formlib integration for Zope 2
-        '';
-      homepage = "http://pypi.python.org/pypi/five.formlib";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "xlrd" = self."xlrd-0.9.3";
-
-  "xlrd-0.9.3" = self.buildPythonPackage {
-    name = "xlrd-0.9.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.3.tar.gz";
-        md5 = "6f3325132f246594988171bc72e1a385";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Library for developers to extract data from Microsoft Excel (tm) spreadsheet files
-        '';
-      homepage = "http://www.python-excel.org/";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.statusmessages-4.0" = self.buildPythonPackage {
-    name = "Products.statusmessages-4.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip";
-        md5 = "265324b0a58a032dd0ed038103ed0473";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        statusmessages provides an easy way of handling internationalized status messages managed via an BrowserRequest adapter storing status messages in client-side cookies.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.statusmessages";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.MimetypesRegistry-2.0.5" = self.buildPythonPackage {
-    name = "Products.MimetypesRegistry-2.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.5.zip";
-        md5 = "1be555ad13648e139174c034631fce34";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        MIME type handling for Zope
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "plone.app.upgrade-1.3.6" = self.buildPythonPackage {
-    name = "plone.app.upgrade-1.3.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.6.zip";
-        md5 = "36703e1085f0d5d1d0f6e635e72fd5c1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.6" self."plone.app.portlets-2.4.8" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.27" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Upgrade machinery for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.upgrade";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage {
-    name = "Products.PloneLanguageTool-3.2.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
-        md5 = "bd9eb6278bf76e8cbce99437ca362164";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.intelligenttext-2.0.2" = self.buildPythonPackage {
-    name = "plone.intelligenttext-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip";
-        md5 = "51688fa0815b49e00334e3ef948328ba";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Provides transforms from text/x-web-intelligent to text/html and vice versa.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.intelligenttext";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.contenttype-3.5.5" = self.buildPythonPackage {
-    name = "zope.contenttype-3.5.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip";
-        md5 = "c6ac80e6887de4108a383f349fbdf332";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope contenttype
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.contenttype";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.proxy-4.1.4" = self.buildPythonPackage {
-    name = "zope.proxy-4.1.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.4.tar.gz";
-        md5 = "3bcaf8b8512a99649ecf2f158c11d05b";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Generic Transparent Proxies
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.proxy";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.globalrequest-1.0" = self.buildPythonPackage {
-    name = "zope.globalrequest-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip";
-        md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Global way of retrieving the currently active request.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.globalrequest";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.sendmail-3.7.5" = self.buildPythonPackage {
-    name = "zope.sendmail-3.7.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz";
-        md5 = "8a513ecf2b41cad849f6607bf16d6818";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope sendmail
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.sendmail";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.annotation-3.5.0" = self.buildPythonPackage {
-    name = "zope.annotation-3.5.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz";
-        md5 = "4238153279d3f30ab5613438c8e76380";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Object annotation mechanism
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.annotation";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.customerize-1.2.2" = self.buildPythonPackage {
-    name = "plone.app.customerize-1.2.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip";
-        md5 = "6a3802c4e8fbd955597adc6a8298febf";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.3" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integrate five.customerize into Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.customerize/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.registry-1.2.3" = self.buildPythonPackage {
-    name = "plone.app.registry-1.2.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip";
-        md5 = "b2269e10516e8f2faf83545e3d0163d8";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.registry-1.0.1" self."plone.supermodel-1.2.4" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 2 and Plone  integration for plone.registry
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.registry";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.session-3.5.3" = self.buildPythonPackage {
-    name = "plone.session-3.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip";
-        md5 = "f95872454735abc8f27c3dcbc9434c11";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Session based authentication for Zope
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.session";
-      license = "BSD";
-    };
-  };
-
-
-  "z3c.caching__zcml-2.0a1" = self.buildPythonPackage {
-    name = "z3c.caching__zcml-2.0a1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz";
-        md5 = "17f250b5084c2324a7d15c6810ee628e";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.configuration-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Caching infrastructure for web apps
-        '';
-      homepage = "UNKNOWN";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.filerepresentation-3.6.1" = self.buildPythonPackage {
-    name = "zope.filerepresentation-3.6.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz";
-        md5 = "4a7a434094f4bfa99a7f22e75966c359";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        File-system Representation Interfaces
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.filerepresentation";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.memoize-1.1.1" = self.buildPythonPackage {
-    name = "plone.memoize-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip";
-        md5 = "d07cd14b976160e1f26a859e3370147e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.ramcache-1.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Decorators for caching the values of functions and methods
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.memoize";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.interface-3.6.7" = self.buildPythonPackage {
-    name = "zope.interface-3.6.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip";
-        md5 = "9df962180fbbb54eb1875cff9fe436e5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Interfaces for Python
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.interface";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.size-3.4.1" = self.buildPythonPackage {
-    name = "zope.size-3.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz";
-        md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Interfaces and simple adapter that give the size of an object
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.size";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "five.customerize-1.1" = self.buildPythonPackage {
-    name = "five.customerize-1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip";
-        md5 = "80772212a2d55150a6c070fc4638b0c7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        TTW customization of template-based Zope views
-        '';
-      homepage = "http://pypi.python.org/pypi/five.customerize";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.dottedname-3.4.6" = self.buildPythonPackage {
-    name = "zope.dottedname-3.4.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz";
-        md5 = "62d639f75b31d2d864fe5982cb23959c";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Resolver for Python dotted names.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.dottedname";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.resource-1.0.2" = self.buildPythonPackage {
-    name = "plone.resource-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip";
-        md5 = "594d41e3acd913ae92f2e9ef96503b9f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "https://svn.plone.org/svn/plone/plone.resource";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.app.locales-4.3.3" = self.buildPythonPackage {
-    name = "plone.app.locales-4.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.3.zip";
-        md5 = "d774b4de1d16bed639c22c306ad0ada7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Translation files for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.locales";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "collective.z3cform.datetimewidget-1.2.6" = self.buildPythonPackage {
-    name = "collective.z3cform.datetimewidget-1.2.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.6.zip";
-        md5 = "b8101e810c552a5afb8b57144ab6338a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        z3c.form date and datetime widgets
-        '';
-      homepage = "https://github.com/collective/collective.z3cform.datetimewidget";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.contentlisting-1.0.5" = self.buildPythonPackage {
-    name = "plone.app.contentlisting-1.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip";
-        md5 = "9fc15b8ecad1c918778c3ea9a75bf533";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Listing of content for the Plone CMS
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentlisting";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Zope2-2.13.22" = self.buildPythonPackage {
-    name = "Zope2-2.13.22";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.22.zip";
-        md5 = "4322d37b5ca63b2e4fe43cfc67960819";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.27" self."Products.ZCTextIndex-2.13.5" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope2 application server / web framework
-        '';
-      homepage = "http://zope2.zope.org";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.textfield-1.2.3" = self.buildPythonPackage {
-    name = "plone.app.textfield-1.2.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.3.zip";
-        md5 = "1a018fa11ea21de5894f85b67161bcf1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Text field with MIME type support
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.ExternalMethod-2.13.0" = self.buildPythonPackage {
-    name = "Products.ExternalMethod-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
-        md5 = "15ba953ef6cb632eb571977651252ea6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        This package provides support for external Python methods within a Zope 2 environment.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ExternalMethod";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.browserlayer-2.1.3" = self.buildPythonPackage {
-    name = "plone.browserlayer-2.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.3.zip";
-        md5 = "41df50201e912fa10286c63687aaec3d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Browser layer management for Zope 2 applications
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.browserlayer";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.workflow-2.1.7" = self.buildPythonPackage {
-    name = "plone.app.workflow-2.1.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.7.zip";
-        md5 = "269dc3dfdb8dae195ca6e1dff26a51da";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        workflow and security settings for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.workflow";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.folder-1.0.6" = self.buildPythonPackage {
-    name = "plone.app.folder-1.0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.6.zip";
-        md5 = "78e76f9d20e0c0e6e8edef7cb7e5d8f1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.folder-1.0.5" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integration package for `plone.folder` into Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.folder/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zc.lockfile-1.0.2" = self.buildPythonPackage {
-    name = "zc.lockfile-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz";
-        md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Basic inter-process locks
-        '';
-      homepage = "http://www.python.org/pypi/zc.lockfile";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.StandardCacheManagers-2.13.0" = self.buildPythonPackage {
-    name = "Products.StandardCacheManagers-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip";
-        md5 = "c5088b2b62bd26d63d9579a04369cb73";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Cache managers for Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "RestrictedPython-3.6.0" = self.buildPythonPackage {
-    name = "RestrictedPython-3.6.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip";
-        md5 = "aa75a7dcc7fbc966357837cc66cacec6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code.
-        '';
-      homepage = "http://pypi.python.org/pypi/RestrictedPython";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.stringinterp-1.0.11" = self.buildPythonPackage {
-    name = "plone.stringinterp-1.0.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.11.zip";
-        md5 = "e54dfa87b20a72f9b1465fcee1fd7ecd";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Adaptable string interpolation
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.stringinterp";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "tempstorage-2.12.2" = self.buildPythonPackage {
-    name = "tempstorage-2.12.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
-        md5 = "7a2b76b39839e229249b1bb175604480";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A RAM-based storage for ZODB
-        '';
-      homepage = "http://pypi.python.org/pypi/tempstorage";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.uuid-1.1" = self.buildPythonPackage {
-    name = "plone.app.uuid-1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.1.zip";
-        md5 = "12ab2dee1a23d1c731b563686cf7b59f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.indexer-1.0.2" self."plone.uuid-1.0.3" self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone integration for the basic plone.uuid package
-        '';
-      homepage = "http://plone.org";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.datetime-3.4.1" = self.buildPythonPackage {
-    name = "zope.datetime-3.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz";
-        md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope datetime
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.datetime";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "lxml-2.3.6" = self.buildPythonPackage {
-    name = "lxml-2.3.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
-        md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
-        '';
-      homepage = "http://lxml.de/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.location-4.0.3" = self.buildPythonPackage {
-    name = "zope.location-4.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz";
-        md5 = "201416f4eb72a9cf61c7d6d37bb87f24";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" self."zope.proxy-4.1.4" self."zope.schema-4.4.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Location
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.location/";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "WSGIProxy2-0.4.1" = self.buildPythonPackage {
-    name = "WSGIProxy2-0.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.4.1.zip";
-        md5 = "fb8937620dc24270916678f6f07e337b";
-    };
-    doCheck = true;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."six-1.6.1" self."WebOb-1.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "https://github.com/gawel/WSGIProxy2/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "zope.app.locales-3.6.2" = self.buildPythonPackage {
-    name = "zope.app.locales-3.6.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz";
-        md5 = "bd2b4c6040e768f33004b1210d3207fa";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope locale extraction and management utilities
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.app.locales";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "five.globalrequest-1.0" = self.buildPythonPackage {
-    name = "five.globalrequest-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
-        md5 = "87f8996bd21d4aa156aa26e7d21b8744";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 2 integration for zope.globalrequest
-        '';
-      homepage = "http://pypi.python.org/pypi/five.globalrequest";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.app.content-3.5.1" = self.buildPythonPackage {
-    name = "zope.app.content-3.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz";
-        md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.componentvocabulary-1.0.1" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Content Type
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zope.app.content";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.discussion-2.2.12" = self.buildPythonPackage {
-    name = "plone.app.discussion-2.2.12";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.12.zip";
-        md5 = "410d25455ff13100aa7ef2eca9f28ac4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.11" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Enhanced discussion support for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.discussion";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.MIMETools-2.13.0" = self.buildPythonPackage {
-    name = "Products.MIMETools-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
-        md5 = "ad5372fc1190599a19493db0864448ec";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.MIMETools";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.z3cform-0.7.6" = self.buildPythonPackage {
-    name = "plone.app.z3cform-0.7.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.6.zip";
-        md5 = "292367803fafba716f04fa7a546e7064";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."z3c.formwidget.query-0.10" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A collection of widgets, templates and other components for use with z3c.form and Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.z3cform";
-      license = "GPL";
-    };
-  };
-
-
-  "python-dateutil-1.5" = self.buildPythonPackage {
-    name = "python-dateutil-1.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
-        md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Extensions to the standard python 2.3+ datetime module
-        '';
-      homepage = "http://labix.org/python-dateutil";
-      license = "PSF License";
-    };
-  };
-
-
-  "plone.i18n-2.0.9" = self.buildPythonPackage {
-    name = "plone.i18n-2.0.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.9.zip";
-        md5 = "8e8ceffc64f04beecf1579a24edc2670";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."Unidecode-0.04.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Advanced i18n/l10n features
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.i18n";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.contentmigration-2.1.7" = self.buildPythonPackage {
-    name = "Products.contentmigration-2.1.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.7.zip";
-        md5 = "50cefdb73c88e15d331dff50086c109e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A generic content migration framework for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.contentmigration";
-      license = "LGPL";
-    };
-  };
-
-
-  "zope.browsermenu-3.9.1" = self.buildPythonPackage {
-    name = "zope.browsermenu-3.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip";
-        md5 = "a47c7b1e786661c912a1150bf8d1f83f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Browser menu implementation for Zope.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browsermenu/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "ZODB3-3.10.5" = self.buildPythonPackage {
-    name = "ZODB3-3.10.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
-        md5 = "6f180c6897a1820948fee2a6290503cd";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Object Database: object database and persistence
-        '';
-      homepage = "UNKNOWN";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.jquery-1.7.2" = self.buildPythonPackage {
-    name = "plone.app.jquery-1.7.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz";
-        md5 = "e204cf45456d26217263531832b5bdac";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        jQuery integration for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.jquery";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "venusian-1.0a8" = self.buildPythonPackage {
-    name = "venusian-1.0a8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/v/venusian/venusian-1.0a8.tar.gz";
-        md5 = "a1a72166fd7cccf0f30e3305e09ce5cf";
-    };
-    doCheck = false;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A library for deferring decorator actions
-        '';
-      homepage = "http://pylonsproject.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "plone.contentrules-2.0.4" = self.buildPythonPackage {
-    name = "plone.contentrules-2.0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.4.zip";
-        md5 = "21b189c2139ec7baea63a1e7ee187c55";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone ContentRules Engine
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.contentrules";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.protect-2.0.2" = self.buildPythonPackage {
-    name = "plone.protect-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip";
-        md5 = "74925ffb08782e72f9b1e850fa78fffa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Security for browser forms
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.protect";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.i18nmessageid-3.5.3" = self.buildPythonPackage {
-    name = "zope.i18nmessageid-3.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
-        md5 = "cb84bf61c2b7353e3b7578057fbaa264";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Message Identifiers for internationalization
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.i18nmessageid";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "transaction-1.1.1" = self.buildPythonPackage {
-    name = "transaction-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz";
-        md5 = "30b062baa34fe1521ad979fb088c8c55";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Transaction management for Python
-        '';
-      homepage = "http://www.zope.org/Products/ZODB";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.cachedescriptors-3.5.1" = self.buildPythonPackage {
-    name = "zope.cachedescriptors-3.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
-        md5 = "263459a95238fd61d17e815d97ca49ce";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Method and property caching decorators
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.cachedescriptors";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.theme-2.1.1" = self.buildPythonPackage {
-    name = "plone.theme-2.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.1.zip";
-        md5 = "28f06c6486059221648e38b5da1d304d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Tools for managing themes in CMF and Plone sites
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.theme";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "borg.localrole-3.0.2" = self.buildPythonPackage {
-    name = "borg.localrole-3.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip";
-        md5 = "04082694dfda9ae5cda62747b8ac7ccf";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A PAS plugin which can manage local roles via an adapter lookup on the current context
-        '';
-      homepage = "http://pypi.python.org/pypi/borg.localrole";
-      license = "LGPL";
-    };
-  };
-
-
-  "Products.ZCatalog-2.13.27" = self.buildPythonPackage {
-    name = "Products.ZCatalog-2.13.27";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.27.zip";
-        md5 = "49cad3f1c408973cc9a1430acc9e1432";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.5" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 2's indexing and search solution.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZCatalog";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.TinyMCE-1.3.6" = self.buildPythonPackage {
-    name = "Products.TinyMCE-1.3.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.6.zip";
-        md5 = "c9e7aa751768f88f3647c5881cc84603";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.imaging-1.0.10" self."plone.app.layout-2.3.11" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.5" self."plone.outputfilters-1.12" self."Products.ResourceRegistries-2.2.10" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Adds support for TinyMCE, a platform independent web based Javascript HTML WYSIWYG editor, to Plone.
-        '';
-      homepage = "http://plone.org/products/tinymce";
-      license = "LGPL";
-    };
-  };
-
-
-  "plone.app.layout-2.3.11" = self.buildPythonPackage {
-    name = "plone.app.layout-2.3.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.11.zip";
-        md5 = "641297ae21cba8fc6cbf03bbbb81c11f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.content-2.1.4" self."plone.app.portlets-2.4.8" self."plone.app.viewletmanager-2.0.5" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self.setuptools self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Layout mechanisms for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.layout";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Pillow-2.3.0" = self.buildPythonPackage {
-    name = "Pillow-2.3.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-2.3.0.zip";
-        md5 = "56b6614499aacb7d6b5983c4914daea7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    configurePhase = ''
-      sed -i "setup.py" \
-          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ;
-              s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;
-              s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
-              s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
-    '';
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python Imaging Library (Fork)
-        '';
-      homepage = "http://python-imaging.github.io/";
-      license = "Standard PIL License";
-    };
-  };
-
-
-  "plone.supermodel-1.2.4" = self.buildPythonPackage {
-    name = "plone.supermodel-1.2.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.4.zip";
-        md5 = "f07134bc7ff1ab30735a61bc6f7d4c47";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools self."z3c.zcmlhook-1.0b1" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Serialize Zope schema definitions to and from XML
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.app.caching-1.1.8" = self.buildPythonPackage {
-    name = "plone.app.caching-1.1.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.8.zip";
-        md5 = "f74d9f293ba3a89b9dd91589ab6672b5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.6" self."plone.cachepurging-1.0.5" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.1.1" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone UI and default rules for plone.caching/z3c.caching
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.caching";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.exceptions-3.6.2" = self.buildPythonPackage {
-    name = "zope.exceptions-3.6.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz";
-        md5 = "d7234d99d728abe3d9275346e8d24fd9";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Exceptions
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zope.exceptions";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.z3cform-0.8.0" = self.buildPythonPackage {
-    name = "plone.z3cform-0.8.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
-        md5 = "bdb23dd162544964d2f8f8f5f002e874";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.batching-1.0.1" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.z3cform";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "AccessControl-3.0.8" = self.buildPythonPackage {
-    name = "AccessControl-3.0.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.8.zip";
-        md5 = "06bea3be59d1ce76c815661180b7ffd9";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Security framework for Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/AccessControl";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Record-2.13.0" = self.buildPythonPackage {
-    name = "Record-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip";
-        md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Special Record objects used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Record";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "python-gettext-1.2" = self.buildPythonPackage {
-    name = "python-gettext-1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
-        md5 = "cd4201d440126d1296d1d2bc2b4795f3";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."unittest2-0.5.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python Gettext po to mo file compiler.
-        '';
-      homepage = "http://pypi.python.org/pypi/python-gettext";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.resourceeditor-1.0" = self.buildPythonPackage {
-    name = "plone.resourceeditor-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
-        md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "https://github.com/plone/plone.resourceeditor";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.ResourceRegistries-2.2.10" = self.buildPythonPackage {
-    name = "Products.ResourceRegistries-2.2.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.10.zip";
-        md5 = "207878a7c4b1583fe3cd609116e40bee";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Registry for managing CSS and JS
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "pyquery-1.2.8" = self.buildPythonPackage {
-    name = "pyquery-1.2.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.8.zip";
-        md5 = "a2a9c23a88f7b2615b41722a3ddebeb7";
-    };
-    doCheck = true;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."cssselect-0.9.1" self."lxml-3.3.5" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A jquery-like library for python
-        '';
-      homepage = "https://github.com/gawel/pyquery";
-      license = "BSD";
-    };
-  };
-
-
-  "initgroups-2.13.0" = self.buildPythonPackage {
-    name = "initgroups-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip";
-        md5 = "38e842dcab8445f65e701fec75213acd";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Convenience uid/gid helper function used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/initgroups";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zdaemon-2.0.7" = self.buildPythonPackage {
-    name = "zdaemon-2.0.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz";
-        md5 = "291a875f82e812110557eb6704af8afe";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Daemon process control library and tools for Unix-based systems
-        '';
-      homepage = "http://www.python.org/pypi/zdaemon";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.querystring-1.1.1" = self.buildPythonPackage {
-    name = "plone.app.querystring-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.1.1.zip";
-        md5 = "845c1a4fc37f615022b536667281b80e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.11" self."plone.app.vocabularies-2.1.14" self."plone.batching-1.0.1" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.querystring";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "z3c.zcmlhook-1.0b1" = self.buildPythonPackage {
-    name = "z3c.zcmlhook-1.0b1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz";
-        md5 = "7b6c80146f5930409eb0b355ddf3daeb";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Easily hook into the ZCML processing machinery
-        '';
-      homepage = "UNKNOWN";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.authentication-3.7.1" = self.buildPythonPackage {
-    name = "zope.authentication-3.7.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
-        md5 = "7d6bb340610518f2fc71213cfeccda68";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Definition of authentication basics for the Zope Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.authentication";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "eggtestinfo-0.3" = self.buildPythonPackage {
-    name = "eggtestinfo-0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz";
-        md5 = "6f0507aee05f00c640c0d64b5073f840";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Add test information to .egg-info
-        '';
-      homepage = "http://pypi.python.org/pypi/eggtestinfo";
-      license = with stdenv.lib.licenses; [ psfl zpt20 ];
-    };
-  };
-
-
-  "plone.batching-1.0.1" = self.buildPythonPackage {
-    name = "plone.batching-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.1.zip";
-        md5 = "4b57b660082683ad66910b3c6725c141";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Batching facilities used in Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.batching";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.portlet.collection-2.1.5" = self.buildPythonPackage {
-    name = "plone.portlet.collection-2.1.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip";
-        md5 = "065f0d9141860229cf66d0ff2ed6d4ea";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A portlet that fetches results from a collection
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.portlet.collection";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.browser-1.3" = self.buildPythonPackage {
-    name = "zope.browser-1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip";
-        md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Shared Zope Toolkit browser components
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browser";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.collection-1.0.11" = self.buildPythonPackage {
-    name = "plone.app.collection-1.0.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.11.zip";
-        md5 = "3f97abc0cd5e370c4bbb1a73f7ee05a7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.querywidget-1.0.10" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        This package adds 'saved search' functionality to Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.collection";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.CMFCalendar-2.2.3" = self.buildPythonPackage {
-    name = "Products.CMFCalendar-2.2.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.3.tar.gz";
-        md5 = "75659630aa12cfe86cc740db64ef294f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.app.form-4.0.2" self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Calendar product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFCalendar";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Plone" = self."Plone-4.3.3";
-
-  "Plone-4.3.3" = self.buildPythonPackage {
-    name = "Plone-4.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.3.zip";
-        md5 = "ce8ab3b3033e05b9544a8127dc67e09a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.caching-1.1.8" self."plone.app.dexterity-2.0.11" self."plone.app.iterate-2.1.12" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.CMFPlone-4.3.3" self.setuptools self."wicked-1.1.10" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Plone Content Management System
-        '';
-      homepage = "http://plone.org/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage {
-    name = "Products.PluggableAuthService-1.10.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
-        md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Pluggable Zope2 authentication / authorization framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "wicked-1.1.10" = self.buildPythonPackage {
-    name = "wicked-1.1.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
-        md5 = "f65611f11d547d7dc8e623bf87d3929d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone
-        '';
-      homepage = "http://pypi.python.org/pypi/wicked";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.app.jquerytools-1.5.7" = self.buildPythonPackage {
-    name = "plone.app.jquerytools-1.5.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.7.zip";
-        md5 = "f87fe3088f5258a8dae1490d7d989988";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        jQuery Tools integration for Plone plus overlay and AJAX form helpers.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.jquerytools";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.GenericSetup-1.7.4" = self.buildPythonPackage {
-    name = "Products.GenericSetup-1.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.4.tar.gz";
-        md5 = "f93251ed519e8c4aea0bc001416027b1";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Read Zope configuration state from profile dirs / tarballs
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.GenericSetup";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "ExtensionClass-2.13.2" = self.buildPythonPackage {
-    name = "ExtensionClass-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
-        md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Metaclass for subclassable extension types
-        '';
-      homepage = "http://pypi.python.org/pypi/ExtensionClass";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.schemaeditor-1.3.7" = self.buildPythonPackage {
-    name = "plone.schemaeditor-1.3.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.7.zip";
-        md5 = "94535ff5b8d8d871fbbd9806912c4c00";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.autoform-1.6" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Provides through-the-web editing of a zope schema/interface.
-        '';
-      homepage = "http://svn.plone.org/svn/plone/plone.schemaeditor";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.structuredtext-3.5.1" = self.buildPythonPackage {
-    name = "zope.structuredtext-3.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz";
-        md5 = "eabbfb983485d0879322bc878d2478a0";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        StructuredText parser
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.structuredtext";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.ramcache-1.0" = self.buildPythonPackage {
-    name = "zope.ramcache-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip";
-        md5 = "87289e15f0e51f50704adda1557c02a7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope RAM Cache
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.ramcache";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.traversing-3.13.2" = self.buildPythonPackage {
-    name = "zope.traversing-3.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip";
-        md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Resolving paths in the object hierarchy
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.traversing";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.contentprovider-3.7.2" = self.buildPythonPackage {
-    name = "zope.contentprovider-3.7.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz";
-        md5 = "1bb2132551175c0123f17939a793f812";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.tales-3.5.3" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Content Provider Framework for Zope Templates
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.contentprovider";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plonetheme.classic-1.3.3" = self.buildPythonPackage {
-    name = "plonetheme.classic-1.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.3.zip";
-        md5 = "5bcf588a8998f4a1c5aecb99c3d9ecf4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The classic Plone 3 default theme.
-        '';
-      homepage = "http://pypi.python.org/pypi/plonetheme.classic";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.scale__storage-1.3.3" = self.buildPythonPackage {
-    name = "plone.scale__storage-1.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.3.zip";
-        md5 = "f2d56ec944e5677a4998b3b9e21534e3";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."Persistence-2.13.2" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Image scaling
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.scale";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.portlet.static-2.0.2" = self.buildPythonPackage {
-    name = "plone.portlet.static-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
-        md5 = "ec0dc691b4191a41ff97779b117f9985";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A simple static HTML portlet for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.portlet.static";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.SecureMailHost-1.1.2" = self.buildPythonPackage {
-    name = "Products.SecureMailHost-1.1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip";
-        md5 = "7db0f1fa867bd0df972082f502a7a707";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements.
-        '';
-      homepage = "http://svn.plone.org/svn/collective/SecureMailHost/trunk";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "plone.portlets-2.2" = self.buildPythonPackage {
-    name = "plone.portlets-2.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip";
-        md5 = "5b7e06bee6e40af83694b82e1fee8c2d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        An extension of zope.viewlet to support dynamic portlets
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.portlets";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.PluginRegistry-1.3" = self.buildPythonPackage {
-    name = "Products.PluginRegistry-1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
-        md5 = "5b166193ca1eb84dfb402051f779ebab";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Configure application plugins based on interfaces
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PluginRegistry";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "repoze.xmliter-0.5" = self.buildPythonPackage {
-    name = "repoze.xmliter-0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip";
-        md5 = "99da76bcbad6fbaced4a273bde29b10e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Wrapper for ``lxml`` trees which serializes to string upon iteration.
-        '';
-      homepage = "http://www.repoze.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "zLOG-2.11.1" = self.buildPythonPackage {
-    name = "zLOG-2.11.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz";
-        md5 = "68073679aaa79ac5a7b6a5c025467147";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A general logging facility
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zLOG";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.location-3.9.1" = self.buildPythonPackage {
-    name = "zope.location-3.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz";
-        md5 = "1684a8f986099d15296f670c58e713d8";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Location
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.location/";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "experimental.cssselect-0.3" = self.buildPythonPackage {
-    name = "experimental.cssselect-0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip";
-        md5 = "3fecdcf1fbc3ea6025e115a56a262957";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Experimental version of lxml.cssselect
-        '';
-      homepage = "https://github.com/lrowe/experimental.cssselect";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.formlib-4.0.6" = self.buildPythonPackage {
-    name = "zope.formlib-4.0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip";
-        md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.datetime-3.4.1" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Form generation and validation library for Zope
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.formlib";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.copy-3.5.0" = self.buildPythonPackage {
-    name = "zope.copy-3.5.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz";
-        md5 = "a9836a5d36cd548be45210eb00407337";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Pluggable object copying mechanism
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.copy";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.vocabularies-2.1.14" = self.buildPythonPackage {
-    name = "plone.app.vocabularies-2.1.14";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.14.zip";
-        md5 = "c3ce7028fd0e3f70588167b8d3c002d5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A collection of generally useful vocabularies.
-        '';
-      homepage = "https://github.com/plone/plone.app.vocabularies";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "archetypes.querywidget-1.0.10" = self.buildPythonPackage {
-    name = "archetypes.querywidget-1.0.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.10.zip";
-        md5 = "6b65a6ff701ebcb6e9550d27c7e2a855";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.7" self."plone.app.querystring-1.1.1" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "http://pypi.python.org/pypi/archetypes.querywidget";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.registry-1.0.1" = self.buildPythonPackage {
-    name = "plone.registry-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip";
-        md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A debconf-like (or about:config-like) registry for storing application settings
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.registry";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.ExtendedPathIndex-3.1" = self.buildPythonPackage {
-    name = "Products.ExtendedPathIndex-3.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip";
-        md5 = "00c048a4b103200bdcbda61fa22c66df";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope catalog index for paths
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.subrequest-1.6.8" = self.buildPythonPackage {
-    name = "plone.subrequest-1.6.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.8.zip";
-        md5 = "6ea93bc17d56612d41a497cdc5f2960b";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Subrequests for Zope2
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.subrequest/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "z3c.form-3.1.1" = self.buildPythonPackage {
-    name = "z3c.form-3.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.1.1.zip";
-        md5 = "0b54d848d6a1be9eab867255e10f5504";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        An advanced form and widget framework for Zope 3
-        '';
-      homepage = "https://launchpad.net/z3c.form";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFActionIcons-2.1.3" = self.buildPythonPackage {
-    name = "Products.CMFActionIcons-2.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz";
-        md5 = "ab1dc62404ed11aea84dc0d782b2235e";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Action icons product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "WebTest-2.0.15" = self.buildPythonPackage {
-    name = "WebTest-2.0.15";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.15.zip";
-        md5 = "49314bdba23f4d0bd807facb2a6d3f90";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" self."unittest2-0.5.1" self."pyquery-1.2.8" self."WSGIProxy2-0.4.1" self."PasteDeploy-1.5.2" self."mock-1.0.1" self."coverage-3.7.1" pkgs.unzip ];
-    propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.6.1" self."waitress-0.8.9" self."WebOb-1.4" ];
-    preConfigure = ''substituteInPlace setup.py --replace "nose<1.3.0" "nose"'';
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Helper to test WSGI applications
-        '';
-      homepage = "http://webtest.pythonpaste.org/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "plone.app.linkintegrity-1.5.4" = self.buildPythonPackage {
-    name = "plone.app.linkintegrity-1.5.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.4.zip";
-        md5 = "f82e73603ade6f588bc27f01c5aea404";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Manage link integrity in Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.app.form-4.0.2" = self.buildPythonPackage {
-    name = "zope.app.form-4.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz";
-        md5 = "3d2b164d9d37a71490a024aaeb412e91";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.datetime-3.4.1" self."zope.exceptions-3.6.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Original Zope 3 Form Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.app.form";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "five.localsitemanager-2.0.5" = self.buildPythonPackage {
-    name = "five.localsitemanager-2.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip";
-        md5 = "5e3a658e6068832bd802018ebc83f2d4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Local site manager implementation for Zope 2
-        '';
-      homepage = "http://pypi.python.org/pypi/five.localsitemanager";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-}
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
deleted file mode 100644
index 8dbd010b9b6..00000000000
--- a/pkgs/top-level/python-packages.json
+++ /dev/null
@@ -1,150 +0,0 @@
-[
-  { "name": "pyramid",
-    "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
-    "override": {
-      "pyramid": {
-        "buildInputs": [
-          "nose",
-          "WebTest",
-          "zope.component",
-          "zope.interface"
-        ]
-      },
-      "cssselect": {
-        "doCheck": false
-      },
-      "lxml": {
-        "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
-        "doCheck": false
-      },
-      "six": {
-        "doCheck": false
-      },
-      "beautifulsoup4": {
-        "doCheck": false
-      },
-      "zope.exceptions": {
-        "doCheck": false
-      },
-      "zope.component": {
-        "doCheck": false
-      },
-      "zope.schema": {
-        "doCheck": false
-      },
-      "zope.testing": {
-        "buildInputs": [ "zope.location" ]
-      },
-      "waitress": {
-        "doCheck": false
-      },
-      "venusian": {
-        "buildInputs": [ "nose" ],
-        "doCheck": false
-      },
-      "Mako": {
-        "buildInputs": [ "nose" ]
-      },
-      "WebOb": {
-        "buildInputs": [ "nose" ],
-        "propagatedBuildInputs": [ "python.modules.ssl" ]
-      },
-      "WebTest": {
-        "buildInputs": [
-          "nose",
-          "unittest2",
-          "pyquery",
-          "WSGIProxy2",
-          "PasteDeploy",
-          "mock",
-          "coverage"
-        ]
-      },
-      "mock": {
-        "buildInputs": [ "unittest2" ]
-      },
-      "PasteDeploy": {
-        "buildInputs": [ "nose" ]
-      },
-      "Chameleon": {
-        "buildInputs": [ "zope.event" ],
-        "doCheck": false
-      },
-      "zope.interface": {
-        "buildInputs": [ "zope.event" ]
-      },
-      "translationstring": {
-        "buildInputs": [ "nose" ]
-      },
-      "repoze.lru": {
-        "buildInputs": [ "nose" ]
-      }
-    }
-  },
-  { "name": "Plone",
-    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
-    "doCheck": false,
-    "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .",
-    "override": {
-      "Products.DCWorkflow": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "lxml": {
-        "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
-        "doCheck": false
-      },
-      "Products.CMFDefault": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Products.CMFQuickInstallerTool": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Products.CMFUid": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Products.CMFActionIcons": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Products.CMFCalendar": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Pillow": {
-        "buildInputs": [
-          "pkgs.freetype",
-          "pkgs.libjpeg",
-          "pkgs.zlib",
-          "pkgs.libtiff",
-          "pkgs.libwebp"
-        ],
-        "configurePhase": [
-          "sed -i \"setup.py\" \\",
-          "    -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include(\"${pkgs.freetype}\")|g ;",
-          "        s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include(\"${pkgs.libjpeg}\")|g ;",
-          "        s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include(\"${pkgs.zlib}\")|g ;",
-          "        s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include(\"${pkgs.libwebp}\")|g ;",
-          "        s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include(\"${pkgs.libtiff}\")|g ;'"
-        ]
-      }
-    }
-  },
-  { "name": "plone.recipe.zope2instance",
-    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
-    "doCheck": false
-  },
-  { "name": "RelStorage",
-    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
-    "doCheck": false
-  },
-  { "name": "psycopg2",
-    "buildInputs": [ "pkgs.postgresql" ],
-    "doCheck": false
-  },
-  { "name": "xlrd",
-    "doCheck": false
-  },
-  { "name": "suds",
-    "doCheck": false
-  },
-  { "name": "html2text"
-  }
-]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4da6cdbcf78..95655002afa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32,12 +32,7 @@ let
     crypt = null;
   };
 
-  pythonPackages = modules // import ./python-packages-generated.nix {
-    inherit pkgs python;
-    inherit (pkgs) stdenv fetchurl;
-    self = pythonPackages;
-  }
-// {
+  pythonPackages = modules // {
 
   inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName buildPythonPackage;
 

From 27007155670c2ac739d0ac5fb945cff13c21b4c5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 11 Jun 2015 10:37:49 +0200
Subject: [PATCH 051/144] global: update from 6.4 to 6.5

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

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 0fa54709788..13903b4c7b9 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.4";
+  name = "global-6.5";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri";
+    sha256 = "1af6lhwhrpdnigd3707fnk3dd6y53pbc4g0i75xjf0563bdi5zaa";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];

From 6125f583e636afbf636ba85eb230008640f73f6d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 11 Jun 2015 10:46:12 +0200
Subject: [PATCH 052/144] redis: update from 3.0.1 to 3.0.2, fixes
 CVE-2015-4335

---
 pkgs/servers/nosql/redis/3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix
index 0e7a7d0f250..ae5a98d5f0a 100644
--- a/pkgs/servers/nosql/redis/3.0.nix
+++ b/pkgs/servers/nosql/redis/3.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.1";
+  version = "3.0.2";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "https://github.com/antirez/redis/archive/${version}.tar.gz";
-    sha256 = "1m34s60qvj1xyqw7x7ar0graw52wypx47dhvfb0br67vfb62l8sl";
+    sha256 = "00gazq98ccz64l4l5vzpynyk5wg15iwmwwvznaarkwm99b9rsz4g";
   };
 
   makeFlags = "PREFIX=$(out)";

From 19248c309ac08d314805d7c717beb998c018cf9c Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 11 Jun 2015 10:48:29 +0200
Subject: [PATCH 053/144] neovim: uses vimUtils to make it configurable like
 vim_configurable is

- vimAlias argument , when true, will create a @out/bin/vim symlink
- configure argument, which will configure neovim the same way as it does
  vim_configurable. eg.: ~/.nixpkgs/config.nix

    {

      packageOverrides = pkgs : with pkgs; rec {
        vimg = neovim.override {
          vimAlias = true;
          configure = {
            customRC = ''
              set spell
            '';
            vam.pluginDictionaries = [
              { names = [ "youcompleteme" "ctrlp"]; }
            ];
          };
        };
      };

     }

Enjoy!
---
 pkgs/applications/editors/neovim/default.nix | 149 +++++++++++--------
 1 file changed, 84 insertions(+), 65 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index e2dbc4abc56..599b04e1028 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,9 +1,13 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack
-, libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack
-, luabitop, ncurses, perl, pkgconfig, unibilium, makeWrapper
+{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey
+, libtool, libuv, lpeg, lua, luajit, luaMessagePack, luabitop, ncurses, perl
+, pkgconfig, unibilium, makeWrapper, vimUtils
+
 , withPython ? true, pythonPackages, extraPythonPackages ? []
 , withPython3 ? true, python3Packages, extraPython3Packages ? []
 , withJemalloc ? true, jemalloc
+
+, vimAlias ? false
+, configure ? null
 }:
 
 with stdenv.lib;
@@ -48,74 +52,89 @@ let
     ignoreCollisions = true;
   };
 
-in stdenv.mkDerivation rec {
-  name = "neovim-${version}";
+  neovim = stdenv.mkDerivation rec {
+    name = "neovim-${version}";
 
-  src = fetchFromGitHub {
-    sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
-    rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
-    repo = "neovim";
-    owner = "neovim";
-  };
+    src = fetchFromGitHub {
+      sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
+      rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
+      repo = "neovim";
+      owner = "neovim";
+    };
 
-  enableParallelBuilding = true;
+    enableParallelBuilding = true;
 
-  buildInputs = [
-    makeWrapper
-    cmake
-    glib
-    libtermkey
-    libuv
-    luajit
-    lua
-    lpeg
-    luaMessagePack
-    luabitop
-    libmsgpack
-    ncurses
-    neovimLibvterm
-    pkgconfig
-    unibilium
-  ] ++ optional withJemalloc jemalloc;
+    buildInputs = [
+      makeWrapper
+      cmake
+      glib
+      libtermkey
+      libuv
+      luajit
+      lua
+      lpeg
+      luaMessagePack
+      luabitop
+      libmsgpack
+      ncurses
+      neovimLibvterm
+      pkgconfig
+      unibilium
+    ] ++ optional withJemalloc jemalloc;
 
-  nativeBuildInputs = [
-    gettext
-  ];
+    nativeBuildInputs = [
+      gettext
+    ];
 
-  LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
-  LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
+    LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
+    LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
 
-  postInstall = optionalString withPython ''
-    ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
-  '' + optionalString withPython3 ''
-    ln -s ${python3Env}/bin/python $out/bin/nvim-python3
-  '' + optionalString (withPython || withPython3) ''
-      wrapProgram $out/bin/nvim --add-flags "${
-        (optionalString withPython
-          ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') +
-        (optionalString withPython3
-          ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\"'')
-      }"
-  '';
-
-  meta = {
-    description = "Vim text editor fork focused on extensibility and agility";
-    longDescription = ''
-      Neovim is a project that seeks to aggressively refactor Vim in order to:
-      - Simplify maintenance and encourage contributions
-      - Split the work between multiple developers
-      - Enable the implementation of new/modern user interfaces without any
-        modifications to the core source
-      - Improve extensibility with a new plugin architecture
+    postInstall = optionalString withPython ''
+      ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
+    '' + optionalString withPython3 ''
+      ln -s ${python3Env}/bin/python $out/bin/nvim-python3
+    '' + optionalString (withPython || withPython3) ''
+        wrapProgram $out/bin/nvim --add-flags "${
+          (optionalString withPython
+            ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') +
+          (optionalString withPython3
+            ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '')
+        }"
     '';
-    homepage    = http://www.neovim.io;
-    # "Contributions committed before b17d96 by authors who did not sign the
-    # Contributor License Agreement (CLA) remain under the Vim license.
-    # Contributions committed after b17d96 are licensed under Apache 2.0 unless
-    # those contributions were copied from Vim (identified in the commit logs
-    # by the vim-patch token). See LICENSE for details."
-    license = with licenses; [ asl20 vim ];
-    maintainers = with maintainers; [ manveru nckx ];
-    platforms   = platforms.unix;
+
+    meta = {
+      description = "Vim text editor fork focused on extensibility and agility";
+      longDescription = ''
+        Neovim is a project that seeks to aggressively refactor Vim in order to:
+        - Simplify maintenance and encourage contributions
+        - Split the work between multiple developers
+        - Enable the implementation of new/modern user interfaces without any
+          modifications to the core source
+        - Improve extensibility with a new plugin architecture
+      '';
+      homepage    = http://www.neovim.io;
+      # "Contributions committed before b17d96 by authors who did not sign the
+      # Contributor License Agreement (CLA) remain under the Vim license.
+      # Contributions committed after b17d96 are licensed under Apache 2.0 unless
+      # those contributions were copied from Vim (identified in the commit logs
+      # by the vim-patch token). See LICENSE for details."
+      license = with licenses; [ asl20 vim ];
+      maintainers = with maintainers; [ manveru nckx garbas ];
+      platforms   = platforms.unix;
+    };
   };
+
+in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec {
+  name = "neovim-${version}-configured";
+  buildInputs = [ makeWrapper ];
+  buildCommand = ''
+    mkdir -p $out/bin
+    for item in ${neovim}/bin/*; do
+      ln -s $item $out/bin/
+    done
+  '' + optionalString vimAlias ''
+    ln -s $out/bin/nvim $out/bin/vim
+  '' + optionalString (configure != null) ''
+    wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}"
+  '';
 }

From d9461e945f6dda78ce51f797ea09ba83613855d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jun 2015 12:40:14 +0200
Subject: [PATCH 054/144] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/bab92d665cf0dc5c4cc74cc6b8afe84080cb426a
 with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1

---
 .../haskell-modules/hackage-packages.nix      | 315 +++++++++++++++---
 1 file changed, 268 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d29bddf0c39..4794ec73879 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10657,9 +10657,9 @@ self: {
      }:
      mkDerivation {
        pname = "Neks";
-       version = "0.3.0.0";
-       sha256 = "1nqww81d9hdm4d2kgv5k4vhp3wavlpa39vym4x7bddcxg1g5drmv";
-       isLibrary = false;
+       version = "0.4.0.0";
+       sha256 = "0xi5d9wvk2xzsn500d61b6mmvwd36fs2n92l5qy4hzhww5lmkrrb";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring cereal containers directory hashable messagepack
@@ -14442,6 +14442,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "TestExplode" = callPackage
+    ({ mkDerivation, base, containers, directory, fgl, graphviz
+     , interpolatedstring-perl6, mtl, process, text
+     }:
+     mkDerivation {
+       pname = "TestExplode";
+       version = "0.1.0.0";
+       sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
+       buildDepends = [
+         base containers directory fgl graphviz interpolatedstring-perl6 mtl
+         process text
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/testexplode/testexplode";
+       description = "Generates testcases from program-snippets";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Theora" = callPackage
     ({ mkDerivation, base, ogg, theora }:
      mkDerivation {
@@ -25018,6 +25036,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bindings-potrace" = callPackage
+    ({ mkDerivation, base, bindings-DSL, potrace }:
+     mkDerivation {
+       pname = "bindings-potrace";
+       version = "0.1";
+       sha256 = "0vb889f49li0lwy3zsji0f1cwzriizh9x6kg3r8676q5j08p7znd";
+       buildDepends = [ base bindings-DSL ];
+       extraLibraries = [ potrace ];
+       homepage = "https://github.com/rwbarton/bindings-potrace";
+       description = "Low-level bindings to the potrace bitmap tracing library";
+       license = stdenv.lib.licenses.gpl2;
+     }) { inherit (pkgs) potrace;};
+
   "bindings-ppdev" = callPackage
     ({ mkDerivation, base, bindings-DSL, ioctl }:
      mkDerivation {
@@ -25797,18 +25828,19 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Decimal, hspec
-     , http-conduit, network, record, split, text, time
+    ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
+     , network, record, scientific, split, text, time
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.1.0.0";
-       sha256 = "05k2cwkd9y327c75fhjqwyxhwrwxhalsx724xa0ng5dw3d30icc2";
+       version = "0.2.0.0";
+       sha256 = "1n0hp16rpddm74q2rfldga7vpvvsqfn099qdp8qd5pqh8swkmwq8";
        buildDepends = [
-         aeson base bytestring Decimal http-conduit network record split
+         aeson base bytestring http-conduit network record scientific split
          text time
        ];
        testDepends = [ aeson base bytestring hspec record time ];
+       homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -30565,31 +30597,29 @@ self: {
 
   "chatter" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
-     , deepseq, directory, filepath, fullstop, ghc-prim, HUnit, mbox
-     , MonadRandom, parsec, QuickCheck, quickcheck-instances
-     , random-shuffle, regex-base, regex-tdfa, regex-tdfa-text, safe
-     , split, test-framework, test-framework-hunit
+     , deepseq, directory, filepath, fullstop, HUnit, mbox, MonadRandom
+     , parsec, QuickCheck, quickcheck-instances, random-shuffle
+     , regex-tdfa, regex-tdfa-text, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-skip, text, tokenize
      , transformers, zlib
      }:
      mkDerivation {
        pname = "chatter";
-       version = "0.5.0.1";
-       sha256 = "0saavfnxd6l6w3ybvdmi14ia06ssc4lndb0ba8hhyqb3qzz7l7zs";
+       version = "0.5.0.2";
+       sha256 = "1nbdc4np4hmvnsh1rfpldi2j1wm1klmfm9szi2kz9fa8g8n3kxxl";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base bytestring cereal containers deepseq directory filepath
-         fullstop ghc-prim mbox MonadRandom parsec QuickCheck
-         quickcheck-instances random-shuffle regex-base regex-tdfa
-         regex-tdfa-text safe split text tokenize transformers zlib
+         fullstop mbox MonadRandom parsec QuickCheck quickcheck-instances
+         random-shuffle regex-tdfa regex-tdfa-text text tokenize
+         transformers zlib
        ];
        testDepends = [
          base cereal containers filepath HUnit parsec QuickCheck
          quickcheck-instances test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-skip text tokenize
        ];
-       jailbreak = true;
        homepage = "http://github.com/creswick/chatter";
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -32800,8 +32830,8 @@ self: {
      }:
      mkDerivation {
        pname = "coinbase-exchange";
-       version = "0.1.0.0";
-       sha256 = "0l09gjn0lk7v51s1gw52p0m9i8amhci93qpi98p1r1nlxx09xj3v";
+       version = "0.2.0.0";
+       sha256 = "1x9cgdj38z1zhrx464rj3qhh8rxqs98mfpqfsnn5yill037p1ig8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -32815,7 +32845,6 @@ self: {
          base bytestring http-client-tls http-conduit old-locale tasty
          tasty-hunit tasty-quickcheck tasty-th time transformers uuid
        ];
-       jailbreak = true;
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43508,8 +43537,8 @@ self: {
      }:
      mkDerivation {
        pname = "dsh-sql";
-       version = "0.2.0.1";
-       sha256 = "0vr9wsad74735py2i2kqwqi4phf49ksw3d4w89jlcgi6xpsc02s1";
+       version = "0.2.0.2";
+       sha256 = "00r1wbgbkpnza1jjd14vqr4hwgfkhnz7yivkx4bla5frfdlv5q58";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -44398,8 +44427,8 @@ self: {
     ({ mkDerivation, base, edenmodules, parallel }:
      mkDerivation {
        pname = "edenskel";
-       version = "2.0.0.2";
-       sha256 = "0dkvbdy04w4zbbc3q11hzzg3h5d8azka11yiiz3rvy1nkhp9wv5l";
+       version = "2.1.0.0";
+       sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q";
        buildDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
@@ -47805,6 +47834,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fay-geoposition" = callPackage
+    ({ mkDerivation, fay-base, fay-text }:
+     mkDerivation {
+       pname = "fay-geoposition";
+       version = "0.1.0.1";
+       sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q";
+       buildDepends = [ fay-base fay-text ];
+       homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
+       description = "W3C compliant implementation of GeoPosition API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fay-hsx" = callPackage
     ({ mkDerivation, fay-base, fay-jquery }:
      mkDerivation {
@@ -52808,6 +52849,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-simple" = callPackage
+    ({ mkDerivation, base, data-default, ghc, ghc-paths }:
+     mkDerivation {
+       pname = "ghc-simple";
+       version = "0.1.0.0";
+       sha256 = "0a8xla80al1glxpf0dsbzdgwbzwxmk9cr6xwfmmz237q7dv4pjhf";
+       buildDepends = [ base data-default ghc ghc-paths ];
+       homepage = "https://github.com/valderman/ghc-simple";
+       description = "Simplified interface to the GHC API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ghc-srcspan-plugin" = callPackage
     ({ mkDerivation, array, base, containers, ghc, hpc }:
      mkDerivation {
@@ -52996,8 +53049,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.4";
-       sha256 = "0z54444ygxc3irnqjkd9cdzg2b6df9d87lkkazj1cl2qy1x5kbv0";
+       version = "0.4.2";
+       sha256 = "094ffwwlxg7qgrcgw35rmzincfrwyhxkh6iw9bqdib5l8w9gcr6d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74970,6 +75023,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c-win32" = callPackage
+    ({ mkDerivation, base, containers, inline-c, template-haskell
+     , Win32
+     }:
+     mkDerivation {
+       pname = "inline-c-win32";
+       version = "0.1";
+       sha256 = "14255dn7smmm1rpnjifn7gn2amcncnf3j45ah22bblyb4h27iikm";
+       buildDepends = [ base containers inline-c template-haskell Win32 ];
+       homepage = "https://github.com/anton-dessiatov/inline-c-win32";
+       description = "Win32 API Context for the inline-c library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "inquire" = callPackage
     ({ mkDerivation, aether, base, text }:
      mkDerivation {
@@ -75598,6 +75665,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ip-quoter" = callPackage
+    ({ mkDerivation, base, network, split, tasty, tasty-hunit
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "ip-quoter";
+       version = "1.0.0.0";
+       revision = "1";
+       sha256 = "1idi03f6l9nwnsfp2mvkxz4sgwqlpa8ag3h5drb3i4hwgx0mkhfg";
+       editedCabalFile = "5cd6b449c4acd24b27d27a839acdab85f65b5556dd7bc8be115b7e2f6dc5df11";
+       buildDepends = [ base network split template-haskell ];
+       testDepends = [ base network tasty tasty-hunit ];
+       homepage = "https://github.com/shlevy/ip-quoter";
+       description = "Quasiquoter for IP addresses";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ip6addr" = callPackage
     ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
@@ -81116,14 +81200,14 @@ self: {
 
   "lens-simple" = callPackage
     ({ mkDerivation, base, lens-family, lens-family-core
-     , lens-family-th
+     , lens-family-th, transformers
      }:
      mkDerivation {
        pname = "lens-simple";
-       version = "0.1.0.3";
-       sha256 = "17s7fjggajlamqi2lc2lrhswykbyba6zv5rf0kr24hn3mv8a6yrk";
+       version = "0.1.0.4";
+       sha256 = "0cr1jghg8dnyclih21zlm9190j2dyl6mwc0gw216l5yj67c5aly3";
        buildDepends = [
-         base lens-family lens-family-core lens-family-th
+         base lens-family lens-family-core lens-family-th transformers
        ];
        homepage = "https://github.com/michaelt/lens-simple";
        description = "simplified import of elementary lens-family combinators";
@@ -82370,6 +82454,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "linear-grammar" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances }:
+     mkDerivation {
+       pname = "linear-grammar";
+       version = "0.0.0.5";
+       sha256 = "0cw0w1fz3m2kwnbff543h5as9zvl66y1ry1q3ppvy9lc409570ry";
+       buildDepends = [ base ];
+       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       description = "A simple grammar for building linear equations and inclusive inequalities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "linear-maps" = callPackage
     ({ mkDerivation, base, containers, HUnit }:
      mkDerivation {
@@ -84756,9 +84852,12 @@ self: {
      mkDerivation {
        pname = "machinecell";
        version = "1.3.1";
+       revision = "1";
        sha256 = "1v4rrjszh6sm2x1nwq33f4xwa41bnls0awhy9qfkap62bpad8fxg";
+       editedCabalFile = "5a7ee43c327694ac753228da8f16d681a60d23b4926132726e2a093ecacb4725";
        buildDepends = [ arrows base free mtl profunctors semigroups ];
        testDepends = [ base hspec mtl profunctors QuickCheck ];
+       jailbreak = true;
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -90266,16 +90365,17 @@ self: {
      }) {};
 
   "multistate" = callPackage
-    ({ mkDerivation, base, mtl, transformers }:
+    ({ mkDerivation, base, hspec, mtl, tagged, transformers }:
      mkDerivation {
        pname = "multistate";
-       version = "0.3.0.0";
-       sha256 = "1sqaxvvs94max8gw1sz3kkgnp8y9zwrjdclnzv1kkkhciix9a1d1";
+       version = "0.6.0.0";
+       sha256 = "17b54qy4dgacj0lwy61nf3hbppd950xk9c1yphjn6i6jcr8z66li";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl transformers ];
+       buildDepends = [ base mtl tagged transformers ];
+       testDepends = [ base hspec transformers ];
        homepage = "https://github.com/lspitzner/multistate";
-       description = "like mtl's ReaderT/WriterT/StateT, but more than one contained value/type";
+       description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -95856,8 +95956,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.7.1.1";
-       sha256 = "1n96g7l16cn1qcp9xsbdmp844078lpcjsz3lg1x81drnzax9fpa1";
+       version = "0.7.2";
+       sha256 = "0dpr74alkz9vy5yc09bnqb968hcrqys2xlydjda1g3qsarjg7p9y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -95870,7 +95970,6 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
-       jailbreak = true;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95881,8 +95980,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.2.0";
-       sha256 = "0q9ia1nzmzv1q8hplrmxszwk49mlp4v8skbfv4ggsl8s0vxc1c6f";
+       version = "0.1.2.1";
+       sha256 = "1hr2jfbzanpqbkvsfcbzvlfsnzba11hdrmvc3j63fwqk931qi2jm";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -98829,6 +98928,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-mongodb" = callPackage
+    ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
+     mkDerivation {
+       pname = "pipes-mongodb";
+       version = "0.1.0.0";
+       sha256 = "0h4334fajrza7r8jrr78nqhs522kxnbzdj0gnbp7ndvzvx5ij888";
+       buildDepends = [ base monad-control mongoDB pipes ];
+       testDepends = [ base monad-control mongoDB pipes text ];
+       homepage = "http://github.com/jb55/pipes-mongodb";
+       description = "Stream results from MongoDB";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pipes-network" = callPackage
     ({ mkDerivation, base, bytestring, network, network-simple, pipes
      , pipes-safe, transformers
@@ -100642,6 +100754,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) adns;  inherit (pkgs) openssl;};
 
+  "potrace" = callPackage
+    ({ mkDerivation, base, bindings-potrace, bytestring, containers
+     , data-default, JuicyPixels, vector
+     }:
+     mkDerivation {
+       pname = "potrace";
+       version = "0.1.0.0";
+       sha256 = "1frxf3jzjyyp3bfj6b2mi29fxwcml4bya6sn4c5aizg741dhphng";
+       buildDepends = [
+         base bindings-potrace bytestring containers data-default
+         JuicyPixels vector
+       ];
+       description = "Trace bitmap images to paths using potrace";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "potrace-diagrams" = callPackage
+    ({ mkDerivation, base, diagrams-lib, JuicyPixels, potrace }:
+     mkDerivation {
+       pname = "potrace-diagrams";
+       version = "0.1.0.0";
+       sha256 = "0ys70a5k384czz0c6bpyy0cqrk35wa1yg6ph19smhm3ag9d8161v";
+       buildDepends = [ base diagrams-lib JuicyPixels potrace ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Potrace bindings for the diagrams library";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "powermate" = callPackage
     ({ mkDerivation, base, directory, network, unix }:
      mkDerivation {
@@ -108719,6 +108859,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "safe-printf" = callPackage
+    ({ mkDerivation, base, doctest, haskell-src-meta, hspec, QuickCheck
+     , template-haskell, th-lift
+     }:
+     mkDerivation {
+       pname = "safe-printf";
+       version = "0.1.0.0";
+       sha256 = "19nw306q7xlj6s132qxlfskg67x6rx3zhsk2n6lbz2kryr7v99g6";
+       buildDepends = [ base haskell-src-meta template-haskell th-lift ];
+       testDepends = [
+         base doctest haskell-src-meta hspec QuickCheck template-haskell
+         th-lift
+       ];
+       homepage = "https://github.com/konn/safe-printf";
+       description = "Well-typed, flexible and variadic printf for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "safecopy" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, quickcheck-instances, tasty
@@ -109533,8 +109691,8 @@ self: {
      }:
      mkDerivation {
        pname = "schedule-planner";
-       version = "1.0.0.1";
-       sha256 = "0p2k67g281f08njhann4yv0vhfbjh4m6rr2x58smxhwqxgpjg399";
+       version = "1.0.1.0";
+       sha256 = "0vlr4wwazpr7xf5pym2f42gwniy017h02wwymn0zn80wypiv6dz1";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -118894,8 +119052,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "structural-induction";
-       version = "0.2";
-       sha256 = "1lr91wc1m655pi3ljw3n89svfazrb16785s9mfx361jgn335m8rd";
+       version = "0.2.0.1";
+       sha256 = "0ac5yhx6cbxzcdqy74lp791xwgammsnd8jazx0xy3ngxn4wwf23r";
        buildDepends = [ base containers genifunctors mtl pretty safe ];
        testDepends = [
          base geniplate language-haskell-extract mtl pretty QuickCheck safe
@@ -124568,6 +124726,46 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tip-haskell-frontend" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , geniplate-mirror, ghc, ghc-paths, mtl, pretty, pretty-show
+     , QuickCheck, split, tip-lib
+     }:
+     mkDerivation {
+       pname = "tip-haskell-frontend";
+       version = "0.1.1";
+       sha256 = "0za8ls980f98qj3k6pgmzaidmnrlk0nzg1r7skif6jmhh1snqc5h";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring containers directory filepath geniplate-mirror ghc
+         ghc-paths mtl pretty pretty-show QuickCheck split tip-lib
+       ];
+       homepage = "http://tip-org.github.io";
+       description = "Convert from Haskell to Tip";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "tip-lib" = callPackage
+    ({ mkDerivation, alex, array, base, containers, geniplate-mirror
+     , happy, mtl, optparse-applicative, pretty, pretty-show, split
+     }:
+     mkDerivation {
+       pname = "tip-lib";
+       version = "0.1.1";
+       sha256 = "0xvsr6hh7r6y82linkpvbby6jkxw744y3mh82kma4cbpwc84gxhi";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         array base containers geniplate-mirror mtl optparse-applicative
+         pretty pretty-show split
+       ];
+       buildTools = [ alex happy ];
+       homepage = "http://tip-org.github.io";
+       description = "tons of inductive problems - support library and tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "titlecase" = callPackage
     ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, text
@@ -125699,6 +125897,28 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "trurl" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, hastache
+     , http-conduit, MissingH, scientific, tar, tasty, tasty-hunit, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "trurl";
+       version = "0.1.0.0";
+       sha256 = "0lq4x3vkif6sldcw07llmhwixgk1x2bfyzi0zq32jardp7ah0rc5";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring directory hastache http-conduit MissingH
+         scientific tar text unordered-containers
+       ];
+       testDepends = [ base hastache tasty tasty-hunit ];
+       jailbreak = true;
+       homepage = "http://github.com/dbushenko/trurl";
+       description = "Haskell template code generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tsession" = callPackage
     ({ mkDerivation, base, containers, mtl, time, transformers }:
      mkDerivation {
@@ -127361,6 +127581,7 @@ test/package-dump/ghc-7.10.txt";
          hashable mtl network old-locale primitive process syb transformers
          uhc-util uulib vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
@@ -127373,8 +127594,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.5.5";
-       sha256 = "00b1ycdnm0gm01izs96qwsx3c3p1mrcimzamscaimyr1y14jvfc1";
+       version = "0.1.5.6";
+       sha256 = "1axg2apkvg3xk1cq78shbnc68i0h6fqcpjg8z3l4nc49kl5dywwz";
        buildDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib

From 1c31a4660a53b631ccaa4a45befbcdaa1121ec74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:02:53 +0200
Subject: [PATCH 055/144] haskell-pipes-mongodb: disable the test suite which
 tries to access the network

---
 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 8ee927f6fb8..c58d047ae8f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -305,6 +305,7 @@ self: super: {
   marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
   network-transport-tcp = dontCheck super.network-transport-tcp;
   network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
+  pipes-mongodb = dontCheck super.pipes-mongodb;        # http://hydra.cryp.to/build/926195/log/raw
   raven-haskell = dontCheck super.raven-haskell;        # http://hydra.cryp.to/build/502053/log/raw
   riak = dontCheck super.riak;                          # http://hydra.cryp.to/build/498763/log/raw
   scotty-binding-play = dontCheck super.scotty-binding-play;

From 9e04c74d9580abe76f0e153d55ad1279db728a5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:04:19 +0200
Subject: [PATCH 056/144] haskell-bitx-bitcoin: disable the test suite which
 tries to access the network

---
 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 c58d047ae8f..420050147aa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -293,6 +293,7 @@ self: super: {
   amqp-conduit = dontCheck super.amqp-conduit;
   bitcoin-api = dontCheck super.bitcoin-api;
   bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
+  bitx-bitcoin = dontCheck super.bitx-bitcoin;          # http://hydra.cryp.to/build/926187/log/raw
   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 2f6c8127f5c00ef8ee2f2cd53411e66cf39004aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:06:41 +0200
Subject: [PATCH 057/144] uhc: update to version 1.1.9.1

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

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index c788112fb91..64d51f971b9 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.9.0";
+  version = "1.1.9.1";
   name = "uhc-${version}";
 
   src = fetchgit {
     url = "https://github.com/UU-ComputerScience/uhc.git";
-    rev = "0363bbcf4cf8c47d30c3a188e3e53b3f8454bbe4";
-    sha256 = "0sa9b341mm5ggmbydc33ja3h7k9w65qnki9gsaagb06gkvvqc7c2";
+    rev = "c4955d01089485cdcfec785fe2bbcdf2253bee4b";
+    sha256 = "1n2bfbzni2hwv90z3mgn0x3l3jwc7sy8ryk81p5mlvlis1wzxnq3";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";

From 283b75910a62ec3b07ed642a7ce6f981d76a3223 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:11:15 +0200
Subject: [PATCH 058/144] haskell-Win32: mark broken on systems other than
 Cygwin

---
 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 420050147aa..e5f41f2d9bc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -849,4 +849,8 @@ self: super: {
   # Avoid spurious test suite failures.
   fft = dontCheck super.fft;
 
+  # This package can't be built on non-Windows systems.
+  Win32 = overrideCabal super.Win32 (drv: { broken = !pkgs.stdenv.isCygwin; });
+  inline-c-win32 = dontDistribute super.inline-c-win32;
+
 }

From 414d71c4995a49bdd21abf41fd027adcb48375c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:43:22 +0200
Subject: [PATCH 059/144] haskell-cron-compat: unnecessary fork of 'cron' that
 doesn't compile anyway

---
 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 e5f41f2d9bc..7835ed7d96f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -853,4 +853,7 @@ self: super: {
   Win32 = overrideCabal super.Win32 (drv: { broken = !pkgs.stdenv.isCygwin; });
   inline-c-win32 = dontDistribute super.inline-c-win32;
 
+  # Doesn't work with recent versions of mtl.
+  cron-compat = markBroken super.cron-compat;
+
 }

From 84dfce0bc07991a128d4e6162b12c1bfc15fecda Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 12:07:15 +0200
Subject: [PATCH 060/144] mercurial: install bash completion

---
 pkgs/applications/version-management/mercurial/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 2409e8e2240..565c95af508 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -51,6 +51,9 @@ stdenv.mkDerivation {
       mkdir -p $out/share/cgi-bin
       cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
       chmod u+x $out/share/cgi-bin/hgweb.cgi
+
+      # install bash completion
+      install -D -v contrib/bash_completion $out/share/bash-completion/completions/mercurial
     '';
 
   meta = {

From 84327822e1ada2a73b67f23ebc238ab07bf6c185 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 11 Jun 2015 12:27:39 +0200
Subject: [PATCH 061/144] gnome-latest.sh: use bash, it doesn't work with sh

---
 maintainers/scripts/gnome-latest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh
index 9290b6deaff..63b309c5a77 100755
--- a/maintainers/scripts/gnome-latest.sh
+++ b/maintainers/scripts/gnome-latest.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
 

From 9aa07ac846ddd8c89b8e6924e861133de1758a5c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 11 Jun 2015 12:27:57 +0200
Subject: [PATCH 062/144] sourceforge: remove unreachable mirrors

---
 pkgs/build-support/fetchurl/mirrors.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 1453af3a62a..0e2a6e756f6 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -14,8 +14,6 @@ rec {
     http://heanet.dl.sourceforge.net/sourceforge/
     http://surfnet.dl.sourceforge.net/sourceforge/
     http://dfn.dl.sourceforge.net/sourceforge/
-    http://mesh.dl.sourceforge.net/sourceforge/
-    http://ovh.dl.sourceforge.net/sourceforge/
     http://osdn.dl.sourceforge.net/sourceforge/
     http://kent.dl.sourceforge.net/sourceforge/
   ];

From 8a7c23456d78858051c9d4dadf9983ec831d490a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 10 Jun 2015 22:40:42 +0200
Subject: [PATCH 063/144] jetty: Update from 9.2.5 to 9.2.11

---
 pkgs/servers/http/jetty/9.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix
index 41afc9b40af..4ac38e8d3cb 100644
--- a/pkgs/servers/http/jetty/9.2.nix
+++ b/pkgs/servers/http/jetty/9.2.nix
@@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
   name = "jetty-9.2.5";
 
   src = fetchurl {
-    url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz&r=1";
-    name = "jetty-distribution-9.2.5.v20141112.tar.gz";
-    sha256 = "1azqhvvqm9il5n07vms5vv27vr3qhmsy44nmqcgsaggq7p37swf1";
+    url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.11.v20150529.tar.gz&r=1";
+    name = "jetty-distribution-9.2.11.v20150529.tar.gz";
+    sha256 = "1d9s9l64b1l3x6vkx8qwgzfqwm55iq5g9xjjm2h2akf494yx1mrd";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 63bb4f919c59c3024f71b7f9c0fb6914340960e4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 11 Jun 2015 14:31:44 +0200
Subject: [PATCH 064/144] Update evolution and evolution-data-server

---
 pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix         | 4 ++--
 .../gnome-3/3.16/core/evolution-data-server/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
index af60d890673..b4240a35a68 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
@@ -7,11 +7,11 @@
 let
   majVer = gnome3.version;
 in stdenv.mkDerivation rec {
-  name = "evolution-${majVer}.1";
+  name = "evolution-${majVer}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${majVer}/${name}.tar.xz";
-    sha256 = "1lm877rrcfy98mpp4iq7m9p8r1nr9kir916n4qin2ygas9zx0qlb";
+    sha256 = "1mh769adz40r22x0jw5z4carkcbhx36qy2j8kl2djjbp1jf5vhnd";
   };
 
   doCheck = true;
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
index 7193b845468..82397b385d5 100644
--- 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
@@ -4,11 +4,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "evolution-data-server-${gnome3.version}.1";
+  name = "evolution-data-server-${gnome3.version}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0lgb8jvn8kx50692gg1m9klvwm7msvk4f7wm0yl7rj880wbxzvh4";
+    sha256 = "19dcvhlqh25pkkd29hhm9yik8xxfy01hcakikrai0x1a04aa2s7f";
   };
 
   buildInputs = with gnome3;

From a51e9610e76ec2e45cdbb9f9802ba8b4519d5c1c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 10:02:44 +0200
Subject: [PATCH 065/144] fix libtermkey on darwin

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

diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index e5965a10f67..c59542fdfed 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   buildInputs = [ libtool pkgconfig ncurses ];
 

From 414d6d9e87b8e74944f4124969633fc45f1e2dac Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 10:03:23 +0200
Subject: [PATCH 066/144] fix unibilium on darwin

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

diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 663432f8ec8..369e271191f 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "143j7qrqjxxmdf3yzhn6av2qwiyjjk4cnskkgz6ir2scjfd5gvja";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   buildInputs = [ libtool pkgconfig ];
 

From 8ffce0888c3f6138fa915e1a3c5d94b0056de940 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 10:04:51 +0200
Subject: [PATCH 067/144] fix luaPackages.luabitop on darwin

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 84befe7f652..c5fbaf6df2a 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -33,8 +33,15 @@ let
       sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj";
     };
 
+    buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx";
+
+    patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+      sed -e "s,MACOSX_DEPLOYMENT_TARGET=10.4,MACOSX_DEPLOYMENT_TARGET=10.10," -i Makefile
+    '';
+
     preBuild = ''
       makeFlagsArray=(
+        ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"}
         INCLUDES="-I${lua}/include"
         LUA="${lua}/bin/lua");
     '';

From c7f36cb5f0ddc86d50774ba7181064372e417f85 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 10:05:59 +0200
Subject: [PATCH 068/144] fix neovim on darwin

---
 pkgs/applications/editors/neovim/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 599b04e1028..3943a9910a4 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -29,7 +29,8 @@ let
 
     buildInputs = [ libtool perl ];
 
-    makeFlags = "PREFIX=$(out)";
+    makeFlags = [ "PREFIX=$(out)" ]
+      ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
     enableParallelBuilding = true;
 
@@ -89,7 +90,16 @@ let
     LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
     LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
 
-    postInstall = optionalString withPython ''
+    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+      export DYLD_LIBRARY_PATH=${jemalloc}/lib
+    '';
+
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      echo patching $out/bin/nvim
+      install_name_tool -change libjemalloc.1.dylib \
+                ${jemalloc}/lib/libjemalloc.1.dylib \
+                $out/bin/nvim
+    '' + optionalString withPython ''
       ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
     '' + optionalString withPython3 ''
       ln -s ${python3Env}/bin/python $out/bin/nvim-python3

From c7a73dbbdbd2a303f5d1e26726adfd66e6e294de Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 14:30:00 +0200
Subject: [PATCH 069/144] removed unnecessary patch

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c5fbaf6df2a..d53bd43a800 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -35,10 +35,6 @@ let
 
     buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx";
 
-    patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
-      sed -e "s,MACOSX_DEPLOYMENT_TARGET=10.4,MACOSX_DEPLOYMENT_TARGET=10.10," -i Makefile
-    '';
-
     preBuild = ''
       makeFlagsArray=(
         ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"}

From 020f466ef4b3f1fe5906169569ed82ef5145b227 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 11 Jun 2015 10:35:40 +0200
Subject: [PATCH 070/144] disable tests for pythonPackages.trollius

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7af8b7e0052..e2e35a1aa04 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15795,6 +15795,8 @@ let
       sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py
     '';
 
+    doCheck = !stdenv.isDarwin;
+
     meta = {
       description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
       homepage = "https://bitbucket.org/enovance/trollius";

From 61531556d8d69db7c4677245b26c2f7a0e8b8b6d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 11 Jun 2015 10:47:27 +0200
Subject: [PATCH 071/144] remove hardcoded clang

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index d53bd43a800..c1b04afba38 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -37,7 +37,7 @@ let
 
     preBuild = ''
       makeFlagsArray=(
-        ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"}
+        ${stdenv.lib.optionalString stdenv.cc.isClang "CC=$CC"}
         INCLUDES="-I${lua}/include"
         LUA="${lua}/bin/lua");
     '';

From e1683eeff1a3bffa7837a162b58fda648ff95c08 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 11 Jun 2015 14:54:30 +0200
Subject: [PATCH 072/144] lsof: url is behind auth. changed downloaded url for
 lsof

---
 pkgs/development/tools/misc/lsof/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 6370e7447f2..af9145bc409 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lsof-4.88";
 
   src = fetchurl {
-    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.88.tar.bz2;
+    url = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_4.88.tar.bz2";
     sha256 = "16y9wm26rg81mihnzcbdg8h8vhxmq8kn62ssxb8cqydp4q79nvzy";
   };
 

From fbfdc71e1ffd555fe47eff8ff28688308feaac99 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 11 Jun 2015 15:46:50 +0200
Subject: [PATCH 073/144] libical: fix crash when TZDIR is empty, and add
 non-nixos zoneinfo paths. Closes #8285

---
 .../libraries/libical/respect-env-tzdir.patch     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch
index 980a0d5c71a..fad78c2fb8a 100644
--- a/pkgs/development/libraries/libical/respect-env-tzdir.patch
+++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch
@@ -1,28 +1,25 @@
-diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
-index fe984c9..22ba0a1 100644
---- a/src/libical/icaltz-util.c
-+++ b/src/libical/icaltz-util.c
-@@ -107,7 +107,7 @@ typedef struct
+--- a/src/libical/icaltz-util.c	2015-06-11 15:40:58.843138630 +0200
++++ b/src/libical/icaltz-util.c	2015-06-11 15:43:12.722046252 +0200
+@@ -107,7 +107,7 @@
  	char	charcnt[4];			
  } tzinfo; 
  
 -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};
-+static char *search_paths [] = {"/etc/zoneinfo"};
++static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"};
  static char *zdir = NULL;
  
  #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))
-@@ -194,6 +194,16 @@ set_zonedir (void)
+@@ -194,6 +194,15 @@
  	const char *fname = ZONES_TAB_SYSTEM_FILENAME;
  	unsigned int i;
  
-+	const char *env_tzdir = strdup (getenv ("TZDIR"));
++	const char *env_tzdir = getenv ("TZDIR");
 +	if (env_tzdir) {
 +		sprintf (file_path, "%s/%s", env_tzdir, fname);
 +		if (!access (file_path, F_OK|R_OK)) {
 +			zdir = env_tzdir;
 +			return;
 +		}
-+		free (env_tzdir);
 +	}
 +
  	for (i = 0; i < NUM_SEARCH_PATHS; i++) {

From fb19019af7c122b145eb3403dae3fc0a8287671a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 11 Jun 2015 16:01:24 +0200
Subject: [PATCH 074/144] pythonPackages.trollius: disable the tests that fail
 on darwin

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2e35a1aa04..c65fe86c382 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15791,12 +15791,38 @@ let
       ++ optional isPy26 ordereddict
       ++ optional (isPy26 || isPy27 || isPyPy) futures;
 
-    patchPhase = optionalString isPy26 ''
+    # Some of the tests fail on darwin with `error: AF_UNIX path too long'
+    # because of the *long* path names for sockets
+    patchPhase = optionalString stdenv.isDarwin ''
+      sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|" tests/test_events.py
+      sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py
+      sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py
+      sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|" tests/test_unix_events.py
+      sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|" tests/test_unix_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py
+      sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|" tests/test_streams.py
+      sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|" tests/test_streams.py
+      sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|" tests/test_streams.py
+      sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|" tests/test_streams.py
+      sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
+      sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
+      sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
+    '' + optionalString isPy26 ''
       sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py
     '';
 
-    doCheck = !stdenv.isDarwin;
-
     meta = {
       description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
       homepage = "https://bitbucket.org/enovance/trollius";

From 7a0ca5226727911bc6f3e7148407701d611d783d Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 11 Jun 2015 16:49:43 +0200
Subject: [PATCH 075/144] scollector: Change type of collectors to allow proper
 merging

---
 nixos/modules/services/monitoring/scollector.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 0143d2e327b..179c587431e 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -73,7 +73,7 @@ in {
       };
 
       collectors = mkOption {
-        type = types.attrs;
+        type = with types; attrsOf (listOf path);
         default = {};
         example = literalExample "{ 0 = [ \"\${postgresStats}/bin/collect-stats\" ]; }";
         description = ''

From 58fd4f672f08a323f86a6a2eb57069be83893084 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Thu, 11 Jun 2015 18:23:58 +0200
Subject: [PATCH 076/144] Chromium: Update and build fixes.

Changes included:
- Update versions.
- Use gyp package not gyp_svn1977.
- Remove icu from buildInputs, since this causes a build error due to inferference with use_system_icu=false.
- Remove the hack that inserts the absolute path into gyp files, and pass `--depth .` to gyp. This resolves the `third_party/angle` gyp error.
- Do a normal copy of the source code not a symlink copy. This resolves some link error where the symlinks interfere with relative paths (seems like because gyp resolves symlinks first). Note, this used to be worked around with the absolute path insertion hack.
- Change the bucketURL in update.nix to https (for more secure updates).
---
 .../networking/browsers/chromium/common.nix   | 17 +++++--------
 .../browsers/chromium/source/sources.nix      | 24 +++++++++----------
 .../browsers/chromium/source/update.nix       |  2 +-
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 1f6c272aceb..d3a0c86daf4 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ninja, which
 
 # default dependencies
-, bzip2, flac, speex, icu, libopus
+, bzip2, flac, speex, libopus
 , libevent, expat, libjpeg, snappy
 , libpng, libxml2, libxslt, libcap
 , xdg_utils, yasm, minizip, libwebp
@@ -84,7 +84,7 @@ let
   };
 
   defaultDependencies = [
-    bzip2 flac speex icu opusWithCustomModes
+    bzip2 flac speex opusWithCustomModes
     libevent expat libjpeg snappy
     libpng libxml2 libxslt libcap
     xdg_utils yasm minizip libwebp
@@ -113,7 +113,7 @@ let
       glib gtk dbus_glib
       libXScrnSaver libXcursor libXtst mesa
       pciutils protobuf speechd libXdamage
-      pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2
+      pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2
     ] ++ optional gnomeKeyringSupport libgnome_keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optional enableSELinux libselinux
@@ -124,15 +124,10 @@ let
     #      be fixed, then try again to unbundle everything into separate
     #      derivations.
     prePatch = ''
-      cp -dsr --no-preserve=mode "${source.main}"/* .
-      cp -dsr --no-preserve=mode "${source.sandbox}" sandbox
+      cp -dr --no-preserve=mode "${source.main}"/* .
+      cp -dr --no-preserve=mode "${source.sandbox}" sandbox
       cp -dr "${source.bundled}" third_party
       chmod -R u+w third_party
-
-      # Hardcode source tree root in all gyp files
-      find -iname '*.gyp*' \( -type f -o -type l \) \
-        -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \
-        -exec chmod u+w {} +
     '';
 
     postPatch = optionalString (versionOlder version "42.0.0.0") ''
@@ -200,7 +195,7 @@ let
       # This is to ensure expansion of $out.
       libExecPath="${libExecPath}"
       python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
-      python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
+      python build/gyp_chromium -f ninja --depth . ${gypFlags}
     '';
 
     buildPhase = let
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index e1144a44afb..3adbbab8392 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "43.0.2327.5";
-    sha256 = "0k9jpzm1n7d3zv6f77vz33jcvmnbxnl6plabvlrf8w83kbzhi76n";
-    sha256bin32 = "1dm4xp0x02kqj82giw45qd2z12wf22h2bs0d3hnlz050innxgcb6";
-    sha256bin64 = "1b13g44y704llsnw68840zmaahj1hwzram50v8fqmff44w1b0bxb";
+    version = "45.0.2421.0";
+    sha256 = "1qc80y0mhwnvxrvpc3csskgb536wq34c0fgk19h1qb4xc62lxhsk";
+    sha256bin32 = "1xqhyrlmh00md6i1q4wr0xihqbvcpshzscnjclrn53dlw5zs2s89";
+    sha256bin64 = "0akdhwwdfcbqfh65a82zigbhsi8sbhhw6904cjprb3bmv4l3c598";
   };
   beta = {
-    version = "42.0.2311.39";
-    sha256 = "0qiyg8bg9f1daf8v2jlrv54lis7156h44ak42jdx96xanvj2rvj0";
-    sha256bin32 = "0v4dr2a3n51dais2mg0dml0rmqfmalfj0zgp20a4kkarbpih1x0v";
-    sha256bin64 = "19638ik9qgfmxpzdry0qwkwpzvhlbs2h2nn1kwsjja5j49817ksx";
+    version = "44.0.2403.39";
+    sha256 = "15c4adg0r9ym3pxya7vv4d148gv2pdwaaymxvvw511fjwffdv71n";
+    sha256bin32 = "1gaypkah10y31gb5f7vnyv0v73z5zjznmsp6vh2m4hfajx7s55jn";
+    sha256bin64 = "1j1ma6asl3ibjv3apyw24vhyi1qy64f586w8jizqzp4h962gj95c";
   };
   stable = {
-    version = "41.0.2272.89";
-    sha256 = "1saxcyqp8pz496qwdgl4dqxll6l9icbljm56w1rrkxgwrrvl4iwk";
-    sha256bin32 = "19srg0isp1k4fwixwjxm1j88bnqx9sb349n992i038c3h8raa1v4";
-    sha256bin64 = "1fb8ffgbsjsij7bd1qawa03z9pybasfig1cmdzwybmlwg2fdlvfv";
+    version = "43.0.2357.124";
+    sha256 = "09m8bb5f17mx6cd3h5irslw07h2s0drda35v17vcr7qfhk8jdh92";
+    sha256bin32 = "15n2fla1ixrqzi0in0vyl8n5wkv20fpd96lff65rwr9diylz287p";
+    sha256bin64 = "0x6igpcf29zmwqgphvy9nm527k9g7na2cvgc5nimw4fs5dakzzjr";
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 27af85de546..e639cdb087b 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -9,7 +9,7 @@ let
             then import ./sources.nix
             else null;
 
-  bucketURL = "http://commondatastorage.googleapis.com/"
+  bucketURL = "https://commondatastorage.googleapis.com/"
             + "chromium-browser-official";
 
   debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g";

From 6a8afa4bb35ee9cffb8e62f5a294adc781b9d348 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jun 2015 19:34:29 +0200
Subject: [PATCH 077/144] chromium: Fix plugin_paths patch for version 44.

The pepper effects plugin has been removed and migrated to NaCl, so I'm
just dropping the hunk of that patch.

Upstream reviow URL: https://codereview.chromium.org/1085393003

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/default.nix      | 13 ++-
 .../chromium/source/nix_plugin_paths_44.patch | 84 +++++++++++++++++++
 2 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 54430bb5be9..a3a46631484 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -18,7 +18,7 @@ let
     "s,^/,,"
   ]);
 
-  pre42 = versionOlder version "42.0.0.0";
+  pre44 = versionOlder version "44.0.0.0";
 
 in stdenv.mkDerivation {
   name = "chromium-source-${version}";
@@ -47,10 +47,10 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches = if pre42 then [
-    ./sandbox_userns_36.patch ./nix_plugin_paths.patch
-  ] else [
+  patches = if pre44 then [
     ./nix_plugin_paths_42.patch
+  ] else [
+    ./nix_plugin_paths_44.patch
   ];
 
   patchPhase = let
@@ -73,11 +73,10 @@ in stdenv.mkDerivation {
       -e 's|/bin/echo|echo|' \
       -e "/python_arch/s/: *'[^']*'/: '""'/" \
       "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi"
-  '' + optionalString useOpenSSL ''
-    cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
-  '' + optionalString (!pre42) ''
     sed -i -e '/LOG.*no_suid_error/d' \
       "$main/content/browser/browser_main_loop.cc"
+  '' + optionalString useOpenSSL ''
+    cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
   '';
 
   preferLocalBuild = true;
diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch
new file mode 100644
index 00000000000..326da7f420a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch
@@ -0,0 +1,84 @@
+diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
+index 8a205a6..d5c24e1 100644
+--- a/chrome/common/chrome_paths.cc
++++ b/chrome/common/chrome_paths.cc
+@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath>
+     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
+ 
+ // Gets the path for internal plugins.
+-bool GetInternalPluginsDirectory(base::FilePath* result) {
+-#if defined(OS_MACOSX) && !defined(OS_IOS)
+-  // If called from Chrome, get internal plugins from a subdirectory of the
+-  // framework.
+-  if (base::mac::AmIBundled()) {
+-    *result = chrome::GetFrameworkBundlePath();
+-    DCHECK(!result->empty());
+-    *result = result->Append("Internet Plug-Ins");
+-    return true;
+-  }
+-  // In tests, just look in the module directory (below).
+-#endif
+-
+-  // The rest of the world expects plugins in the module directory.
+-  return PathService::Get(base::DIR_MODULE, result);
++bool GetInternalPluginsDirectory(base::FilePath* result,
++                                 const std::string& ident) {
++  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
++  const char* value = getenv(full_env.c_str());
++  if (value == NULL)
++      return PathService::Get(base::DIR_MODULE, result);
++  else
++      *result = base::FilePath(value);
+ }
+ 
+ }  // namespace
+@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) {
+       create_dir = true;
+       break;
+     case chrome::DIR_INTERNAL_PLUGINS:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "ALL"))
+         return false;
+       break;
+     case chrome::DIR_PEPPER_FLASH_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
+         return false;
+       cur = cur.Append(kPepperFlashBaseDirectory);
+       break;
+@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) {
+       cur = cur.Append(FILE_PATH_LITERAL("script.log"));
+       break;
+     case chrome::FILE_FLASH_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "FILEFLASH"))
+         return false;
+       cur = cur.Append(kInternalFlashPluginFileName);
+       break;
+@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // We currently need a path here to look up whether the plugin is disabled
+     // and what its permissions are.
+     case chrome::FILE_NACL_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "NACL"))
+         return false;
+       cur = cur.Append(kInternalNaClPluginFileName);
+       break;
+@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) {
+         cur = cur.DirName();
+       }
+ #else
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
+         return false;
+ #endif
+       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
+@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // In the component case, this is the source adapter. Otherwise, it is the
+     // actual Pepper module that gets loaded.
+     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
+         return false;
+       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
+       break;

From af54ddf8b635e2897db64d775317e33a42c259e2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jun 2015 19:36:28 +0200
Subject: [PATCH 078/144] chromium: Drop plugin_paths patch for old versions.

The patch was for versions prior to version 22, so we no longer need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../chromium/source/nix_plugin_paths.patch    | 99 -------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch
deleted file mode 100644
index 0220d042941..00000000000
--- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
-index 8a205a6..d5c24e1 100644
---- a/chrome/common/chrome_paths.cc
-+++ b/chrome/common/chrome_paths.cc
-@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath>
-     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
- 
- // Gets the path for internal plugins.
--bool GetInternalPluginsDirectory(base::FilePath* result) {
--#if defined(OS_MACOSX) && !defined(OS_IOS)
--  // If called from Chrome, get internal plugins from a subdirectory of the
--  // framework.
--  if (base::mac::AmIBundled()) {
--    *result = chrome::GetFrameworkBundlePath();
--    DCHECK(!result->empty());
--    *result = result->Append("Internet Plug-Ins");
--    return true;
--  }
--  // In tests, just look in the module directory (below).
--#endif
--
--  // The rest of the world expects plugins in the module directory.
--  return PathService::Get(base::DIR_MODULE, result);
-+bool GetInternalPluginsDirectory(base::FilePath* result,
-+                                 const std::string& ident) {
-+  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
-+  const char* value = getenv(full_env.c_str());
-+  if (value == NULL)
-+      return PathService::Get(base::DIR_MODULE, result);
-+  else
-+      *result = base::FilePath(value);
- }
- 
- }  // namespace
-@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) {
-       create_dir = true;
-       break;
-     case chrome::DIR_INTERNAL_PLUGINS:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "ALL"))
-         return false;
-       break;
-     case chrome::DIR_PEPPER_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
-         return false;
-       cur = cur.Append(kPepperFlashBaseDirectory);
-       break;
-@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) {
-       cur = cur.Append(FILE_PATH_LITERAL("script.log"));
-       break;
-     case chrome::FILE_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "FILEFLASH"))
-         return false;
-       cur = cur.Append(kInternalFlashPluginFileName);
-       break;
-@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) {
-       cur = cur.Append(chrome::kPepperFlashPluginFilename);
-       break;
-     case chrome::FILE_PDF_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PDF"))
-         return false;
-       cur = cur.Append(kInternalPDFPluginFileName);
-       break;
-     case chrome::FILE_EFFECTS_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS"))
-         return false;
-       cur = cur.Append(kEffectsPluginFileName);
-       break;
-@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // We currently need a path here to look up whether the plugin is disabled
-     // and what its permissions are.
-     case chrome::FILE_NACL_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "NACL"))
-         return false;
-       cur = cur.Append(kInternalNaClPluginFileName);
-       break;
-@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) {
-         cur = cur.DirName();
-       }
- #else
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
-         return false;
- #endif
-       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
-@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // In the component case, this is the source adapter. Otherwise, it is the
-     // actual Pepper module that gets loaded.
-     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
-         return false;
-       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
-       break;

From 03e4e3e92a25386ed559e3c4a70782c7f07fa355 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 11 Jun 2015 17:33:11 +0200
Subject: [PATCH 079/144] bosun: Update to 0.2.0

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

diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index 807ee702267..dfb2ffbb838 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -3,14 +3,14 @@
 with goPackages;
 
 buildGoPackage rec {
-  rev = "20150506172827";
+  rev = "0.2.0";
   name = "bosun-${rev}";
   goPackagePath = "bosun.org";
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8";
+    sha256 = "146k37zg4l01l10vwhnhjs6jv8d35zf5l5rljmvy9ydq2npadsjd";
   };
   subPackages = [ "cmd/bosun" ];
 

From 85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Thu, 11 Jun 2015 10:52:00 -0700
Subject: [PATCH 080/144] openconnect: update to version 7.06 and support
 openssl or gnutls

---
 pkgs/tools/networking/openconnect.nix | 15 +++++++++++----
 pkgs/top-level/all-packages.nix       | 11 ++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix
index d53af5c9e40..54239b76617 100644
--- a/pkgs/tools/networking/openconnect.nix
+++ b/pkgs/tools/networking/openconnect.nix
@@ -1,13 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2, zlib } :
+{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, zlib } :
+
+let
+  xor = a: b: (a || b) && (!(a && b));
+in
+
+assert xor (openssl != null) (gnutls != null);
 
 stdenv.mkDerivation rec {
-  name = "openconnect-5.02";
+  name = "openconnect-7.06";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
     ];
-    sha256 = "1y7dn42gd3763sgwv2j72xy9hsikd6y9x142g84kwdbn0y0psgi4";
+    sha256 = "1wkhmgfxkdkhy2p9w9idrgipxmxij2z4f88flfk3fifwd19nkkzs";
   };
 
   preConfigure = ''
@@ -22,5 +28,6 @@ stdenv.mkDerivation rec {
     "--without-openssl-version-check"
   ];
 
-  propagatedBuildInputs = [ vpnc openssl libxml2 zlib ];
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 991928ae5db..a9d9848904d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3144,7 +3144,16 @@ let
 
   vpnc = callPackage ../tools/networking/vpnc { };
 
-  openconnect = callPackage ../tools/networking/openconnect.nix { };
+  openconnect = openconnect_openssl;
+
+  openconnect_openssl = callPackage ../tools/networking/openconnect.nix {
+    gnutls = null;
+  };
+
+  openconnect_gnutls = lowPrio (openconnect.override {
+    openssl = null;
+    gnutls = gnutls;
+  });
 
   vtun = callPackage ../tools/networking/vtun { };
 

From f3ca1cc2382acdeaa992ea599d34086b32605b92 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Thu, 11 Jun 2015 20:58:05 +0200
Subject: [PATCH 081/144] gyp: 2015-05-17 -> 2015-06-11

---
 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 c65fe86c382..58b2a9ee213 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5920,12 +5920,12 @@ let
 
   gyp = buildPythonPackage rec {
     name = "gyp-${version}";
-    version = "2015-05-15";
+    version = "2015-06-11";
 
     src = pkgs.fetchgit {
       url = "https://chromium.googlesource.com/external/gyp.git";
-      rev = "9f594095c5b14f8bc518081a660e77890c294861";
-      sha256 = "1xqi44alnw9c31jg2hz7flz5nabq003b4jyin12h3s9zl82y6vd5";
+      rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043";
+      sha256 = "176sdxkva2irr1v645nn4q6rwc6grbb1wxj82n7x9hh09q4bxqcz";
     };
 
     patches = optionals pkgs.stdenv.isDarwin [

From 39902b01bfb583621d4844f23a1ff7d069a7d763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 20:50:43 +0200
Subject: [PATCH 082/144] goffice: separate from gnome3

It's got practically no coupling with gnome, except for gtk3.
---
 pkgs/applications/office/gnumeric/default.nix             | 4 ++--
 pkgs/desktops/gnome-3/3.16/default.nix                    | 8 --------
 .../3.16/misc => development/libraries}/goffice/0.8.nix   | 4 ++--
 .../misc => development/libraries}/goffice/default.nix    | 0
 .../libraries}/goffice/pcre_info.patch                    | 0
 pkgs/top-level/all-packages.nix                           | 8 +++++++-
 6 files changed, 11 insertions(+), 13 deletions(-)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/0.8.nix (91%)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/default.nix (100%)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/pcre_info.patch (100%)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 02a78a2b2d1..e54dd591cfd 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
-, gnome3, makeWrapper, gtk3
+, goffice, gnome3, makeWrapper, gtk3
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # ToDo: optional libgda, python, introspection?
   buildInputs = [
     pkgconfig intltool perl perlXMLParser
-    gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme
+    goffice gtk3 makeWrapper gnome3.defaultIconTheme
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 15f4a210e04..be60a58db26 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -273,14 +273,6 @@ rec {
 
   gfbgraph = callPackage ./misc/gfbgraph { };
 
-  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/desktops/gnome-3/3.16/misc/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix
similarity index 91%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
rename to pkgs/development/libraries/goffice/0.8.nix
index 02520a9f121..75a7dfb4898 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
+++ b/pkgs/development/libraries/goffice/0.8.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
 , pango, libgsf, libxml2, libart, intltool, gettext
-, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
+, cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }:
 
 stdenv.mkDerivation rec {
   name = "goffice-0.8.17";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = gnome3.goffice.meta // {
+  meta = goffice.meta // {
     maintainers = [ ];
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
rename to pkgs/development/libraries/goffice/default.nix
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch
rename to pkgs/development/libraries/goffice/pcre_info.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 991928ae5db..bff25e186c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11260,7 +11260,13 @@ let
     goffice = goffice_0_8;
   };
 
-  goffice_0_8 = gnome3.goffice_0_8;
+  goffice = callPackage ../development/libraries/goffice { };
+
+  goffice_0_8 = callPackage ../development/libraries/goffice/0.8.nix {
+    inherit (pkgs.gnome2) libglade libgnomeui;
+    gconf = pkgs.gnome2.GConf;
+    libart = pkgs.gnome2.libart_lgpl;
+  };
 
   idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
 

From cfc753478e9e32714364d1c7463f5a59318c9755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 20:52:03 +0200
Subject: [PATCH 083/144] abiword: support goffice

/cc maintainer @pSub.
---
 pkgs/applications/office/abiword/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 2aaf1e8f032..c17a4910f44 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi
 , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
-, boost, libxslt
+, boost, libxslt, goffice
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
-      libgsf enchant wv libjpeg perl boost libxslt
+      libgsf enchant wv libjpeg perl boost libxslt goffice
     ];
 
   meta = with stdenv.lib; {

From 3a90a80a9dbd9d228ffd0c247bb365e52bc02f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 21:06:35 +0200
Subject: [PATCH 084/144] abiword: fix gschemas crash and missing icons

The gtk3 file dialogs were crashing, as always without wrapping.
/cc maintainer @pSub.
---
 pkgs/applications/office/abiword/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix              | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index c17a4910f44..18ece7a7401 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi
 , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
-, boost, libxslt, goffice
+, boost, libxslt, goffice, makeWrapper, iconTheme
 }:
 
 stdenv.mkDerivation rec {
@@ -16,9 +16,14 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
-      libgsf enchant wv libjpeg perl boost libxslt goffice
+      libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme
     ];
 
+  postFixup = ''
+    wrapProgram "$out/bin/abiword" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
   meta = with stdenv.lib; {
     description = "Word processing program, similar to Microsoft Word";
     homepage = http://www.abisource.com/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bff25e186c7..4a4e2182f33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10413,6 +10413,7 @@ let
 
   abiword = callPackage ../applications/office/abiword {
     inherit (gnome) libglade libgnomecanvas;
+    iconTheme = gnome3.defaultIconTheme;
   };
 
   abook = callPackage ../applications/misc/abook { };

From e5b56cdfff989b2e1afce09fe0ab0a3f59946617 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Thu, 7 May 2015 14:28:36 +0300
Subject: [PATCH 085/144] firefox: add option to build with GTK3 (close #7743)

---
 pkgs/applications/networking/browsers/firefox/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                           | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 03b96acc712..727f89fe668 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -1,9 +1,10 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL
 , libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base, icu
+, enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Shiretoko" or whatever, enable this option.  However, those
@@ -34,7 +35,8 @@ stdenv.mkDerivation rec {
       xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
       hunspell libevent libstartup_notification libvpx cairo
       gstreamer gst_plugins_base icu
-    ];
+    ]
+    ++ lib.optional enableGTK3 gtk3;
 
   configureFlags =
     [ "--enable-application=browser"
@@ -64,6 +66,7 @@ stdenv.mkDerivation rec {
       "--disable-updater"
       "--disable-pulseaudio"
     ]
+    ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
     ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
                       else [ "--disable-debug" "--enable-release"
                              "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a4e2182f33..c10bf661571 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11150,6 +11150,7 @@ let
   firefox = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
+    enableGTK3 = false;
   };
 
   firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };

From d15777fac98f26d5f7ab599a86bc418105ebcd4f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jun 2015 21:28:16 +0200
Subject: [PATCH 086/144] gyp: Remove old SVN version to build Chromium.

This reverts commit b26de392522176b9a176eb21bb5be4a5ac8d9062.

We no longer need this version because Chromium now builds with the
latest gyp version, see 58fd4f672f08a323f86a6a2eb57069be83893084.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58b2a9ee213..c625301926b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5941,28 +5941,6 @@ let
     };
   };
 
-  # Needed to build Chromium until #7402 is fixed.
-  gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec {
-    rev = "1977";
-    name = "gyp-r${rev}";
-
-    src = pkgs.fetchsvn {
-      url = "http://gyp.googlecode.com/svn/trunk";
-      inherit rev;
-      sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8";
-    };
-
-    patches = optionals pkgs.stdenv.isDarwin [
-      ../development/python-modules/gyp/no-darwin-cflags.patch
-    ];
-
-    meta = {
-      homepage = http://code.google.com/p/gyp;
-      license = licenses.bsd3;
-      description = "Generate Your Projects";
-    };
-  });
-
   guessit = buildPythonPackage rec {
     version = "0.9.4";
     name = "guessit-${version}";

From 69945a8701457a9e58020aee5f2e281731ce0e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 21:34:32 +0200
Subject: [PATCH 087/144] ffmpeg: remove 0.11 and replace by 0.10

That branch is better supported, and 0.11 only had one user -
minidlna still builds
---
 pkgs/development/libraries/ffmpeg/0.11.nix |  7 -------
 pkgs/top-level/all-packages.nix            | 13 ++++++-------
 2 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/0.11.nix

diff --git a/pkgs/development/libraries/ffmpeg/0.11.nix b/pkgs/development/libraries/ffmpeg/0.11.nix
deleted file mode 100644
index abdb2666877..00000000000
--- a/pkgs/development/libraries/ffmpeg/0.11.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.5";
-  branch = "0.11";
-  sha256 = "1h5qwn4h7sppqw36hri5p6zlv2387vwaxh2pyj070xfn8hgrk4ll";
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c10bf661571..3acdd30a0e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5995,12 +5995,11 @@ let
   fcgi = callPackage ../development/libraries/fcgi { };
 
   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_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
   # Aliases
-  ffmpeg_0 = ffmpeg_0_11;
+  ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
   ffmpeg_2 = ffmpeg_2_6;
   ffmpeg = ffmpeg_2;
@@ -6253,7 +6252,7 @@ let
   gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
 
   gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
   };
 
   gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
@@ -7572,7 +7571,7 @@ let
 
   openscenegraph = callPackage ../development/libraries/openscenegraph {
     giflib = giflib_4_1;
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
   };
 
   openspades = callPackage ../games/openspades {};
@@ -10476,7 +10475,7 @@ let
   audacious = callPackage ../applications/audio/audacious { };
 
   audacity = callPackage ../applications/audio/audacity {
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
   };
 
   milkytracker = callPackage ../applications/audio/milkytracker { };
@@ -11107,7 +11106,7 @@ let
       blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python
       readline sqlite tcl tk libtiff freetype makeWrapper wxGTK;
     fftw = fftwSinglePrec;
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
     motif = lesstif;
     opendwg = libdwg;
     wxPython = wxPython28;
@@ -13473,7 +13472,7 @@ let
   ultimatestunts = callPackage ../games/ultimatestunts { };
 
   ultrastardx = callPackage ../games/ultrastardx {
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
     lua = lua5;
   };
 

From cdc70b69f518ff2317cdb6b402c4a4d07437de71 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jun 2015 21:35:22 +0200
Subject: [PATCH 088/144] steam-original: Mark package as lowPrio.

This is to avoid accidentally installing it via "nix-env -i", which
leads to a non-working Steam on NixOS.

Thanks to srhh and Pamelloes on IRC for bringing this up.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 3acdd30a0e7..362af5d3e17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13418,7 +13418,7 @@ let
 
   stardust = callPackage ../games/stardust {};
 
-  steam-original = callPackage ../games/steam { };
+  steam-original = lowPrio (callPackage ../games/steam { });
 
   steam = callPackage ../games/steam/chrootenv.nix { };
 

From 6a76633bb6e2fd49fbe264a55b39ce0a5166605f Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Thu, 11 Jun 2015 00:45:24 +0200
Subject: [PATCH 089/144] llvm-3.4: enable RTTI (close #8289)

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

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index d3beb2e7461..a44f157a13e 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -44,6 +44,7 @@ in stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_REQUIRES_RTTI=1"
     "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
     "-DCMAKE_CXX_FLAGS=-std=c++11"
   ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";

From 885808a8d910ea54a899e9b82042413e401ff638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 22:11:21 +0200
Subject: [PATCH 090/144] liferea: maintenance update

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

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 26078c8e583..28baa2f7b67 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.14";
+    version = "1.10.15";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0szazfknarw6ivnr4flr928ar309pz2mv6alc6pk6l1i9jchcnfs";
+    sha256 = "0iicw42rf0vhq4xs81awlj5v3v7xfid3h5fh87f3bqbpn9pmifdg";
   };
 
   buildInputs = with gst_all_1; [

From 95def7e4f03b19295060dcfd27a8c97c48baadd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 22:19:20 +0200
Subject: [PATCH 091/144] lib/maintainers: recommend to re-use github usernames

---
 lib/maintainers.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index df7a442ac52..1a0a3b832e3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -1,8 +1,11 @@
 /* -*- coding: utf-8; -*- */
 
 {
-  /* Add your name and email address here.  Keep the list
-     alphabetically sorted.  */
+  /* Add your name and email address here.
+     Keep the list alphabetically sorted.
+     Prefer the same attrname as your github username, please,
+     so it's easy to ping a package @maintainer.
+  */
 
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";

From f12a466730c835633354d486f6bc9fbf311359ed Mon Sep 17 00:00:00 2001
From: Adrien Devresse <adrien.devresse@epfl.ch>
Date: Mon, 1 Jun 2015 10:05:53 +0200
Subject: [PATCH 092/144] New expression for the davix toolkit

---
 lib/maintainers.nix                     |  1 +
 pkgs/tools/networking/davix/default.nix | 28 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/networking/davix/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index df7a442ac52..62e7a33db8b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -6,6 +6,7 @@
 
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
+  adev	   = "Adrien Devresse <adev@adev.name>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
new file mode 100644
index 00000000000..748e28407b2
--- /dev/null
+++ b/pkgs/tools/networking/davix/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, libxml2, boost }:
+
+stdenv.mkDerivation rec {
+  name = "davix-0.4.0";
+  buildInputs = [ stdenv pkgconfig cmake openssl libxml2 boost ];
+
+  src = fetchFromGitHub {
+    owner = "cern-it-sdc-id";
+    repo = "davix";
+    rev = "R_0_4_0-1";
+    sha256 = "0i6ica7rmpc3hbybjql5mr500cd43w4qzc69cj1djkc6bqqb752v";
+  };
+
+
+  meta = with stdenv.lib; {
+    description = "Toolkit for Http-based file management";
+
+    longDescription = "Davix is a toolkit designed for file 
+    operations with Http based protocols (WebDav, Amazon S3, ...).
+    Davix provides an API and a set of command line tools";
+
+    license     = licenses.lgpl2Plus;
+    homepage    = http://dmc.web.cern.ch/projects/davix/home;
+    maintainers = [ maintainers.adev ];
+    platforms   = platforms.all;
+  };  
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..f91bc9a71eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -988,6 +988,8 @@ let
 
   cadaver = callPackage ../tools/networking/cadaver { };
 
+  davix = callPackage ../tools/networking/davix { };
+
   cantata = callPackage ../applications/audio/cantata { };
 
   can-utils = callPackage ../os-specific/linux/can-utils { };

From 838c8f252023f19b05d25f7ab4376d9023d89a6a Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Thu, 11 Jun 2015 23:42:14 +0200
Subject: [PATCH 093/144] wavpack: 4.70.0 -> 4.75.0

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

diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 08465861f27..b205519eea1 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
-  version = "4.70.0";
+  version = "4.75.0";
 
   enableParallelBuilding = true;
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.wavpack.com/${name}.tar.bz2";
-    sha256 = "191h8hv8qk72hfh1crg429i9yq3cminwqb249sy9zadbn1wy7b9c";
+    sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6";
   };
 
   meta = with stdenv.lib; {

From 4e49773d266bdb6fb60030c9f2d46c85402a673d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 02:01:48 +0300
Subject: [PATCH 094/144] sdl-jstest: add package

---
 pkgs/tools/misc/sdl-jstest/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/misc/sdl-jstest/default.nix

diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
new file mode 100644
index 00000000000..3da62874c13
--- /dev/null
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -0,0 +1,21 @@
+{ fetchgit, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }:
+
+stdenv.mkDerivation rec {
+  name = "sdl-jstest-20150611";
+  src = fetchgit {
+    url = "https://github.com/Grumbel/sdl-jstest";
+    rev = "684d168e5526da16760dcfc6d40da0103ab284cc";
+    sha256 = "fc110a858edc2defc5cd8b176a5ce74666d3957d0268b861d0f9669362a1bd03";
+  };
+
+  buildInputs = [ SDL SDL2 ncurses ];
+  nativeBuildInputs = [ cmake pkgconfig docbook_xsl ];
+  
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Grumbel/sdl-jstest;
+    description = "Simple SDL joystick test application for the console";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43f679bc55a..2f5df67d078 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2815,6 +2815,8 @@ let
 
   sdcv = callPackage ../applications/misc/sdcv { };
 
+  sdl-jstest = callPackage ../tools/misc/sdl-jstest { };
+
   sec = callPackage ../tools/admin/sec { };
 
   seccure = callPackage ../tools/security/seccure { };

From 9a517da2b19f9c1165fcee7665d80fdcac1f00f7 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Wed, 10 Jun 2015 21:20:40 -0400
Subject: [PATCH 095/144] Add dfilemanager/dfm

---
 .../misc/dfilemanager/default.nix             | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/misc/dfilemanager/default.nix

diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
new file mode 100644
index 00000000000..40bb2e8fe56
--- /dev/null
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, cmake, qt5, file, kde5}:
+
+let
+  version = "git-2015-06-10";
+in
+stdenv.mkDerivation rec {
+  name = "dfilemanager-${version}";
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/dfilemanager/code";
+    rev = "806a28aa8fed30941a2fd6784c7c9c240bca30e3";
+    sha256 = "1k15qzjmqg9ffv4cl809b071dpyckf8jspkhfhpbmfd9wasr0m7i";
+  };
+
+  buildInputs = [ cmake qt5.base qt5.tools qt5.x11extras file kde5.solid];
+
+  cmakeFlags = "-DQT5BUILD=true";
+
+  meta = {
+    homepage = "http://dfilemanager.sourceforge.net/";
+    description = "File manager written in Qt/C++, it does use one library from kdelibs, the solid lib for easy device handling";
+    #license = stdenv.lib.licenses; # license not specified
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.eduarrrd ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b43fb9c7896..6566e899446 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -800,6 +800,8 @@ let
 
   ddate = callPackage ../tools/misc/ddate { };
 
+  dfilemanager = callPackage ../applications/misc/dfilemanager { };
+
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
     inherit (haskellngPackages) ghcWithPackages diagrams-builder;
   };

From cd28c5517c224c0c969f6bccb1f85dcc280ed7f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 01:37:45 +0200
Subject: [PATCH 096/144] Revert "Drop tests.installer.grub1 as release
 critical"

This reverts commit 1907ca8a2aaa51d3e6910bb086dd75efffa81a6b. See

https://github.com/NixOS/nixpkgs/commit/1907ca8a2aaa51d3e6910bb086dd75efffa81a6b#commitcomment-9719007
---
 nixos/release-combined.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ddedcd9fe97..191d5044341 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,6 +52,7 @@ in rec {
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)
+        (all nixos.tests.installer.grub1)
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.luksroot)
         (all nixos.tests.installer.separateBoot)

From bc3217251e4fb8dd9d648b41d963d8804a0d8f67 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 11 Jun 2015 19:23:25 -0500
Subject: [PATCH 097/144] pythonPackages.scikitlearn: build with openblas

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80931ecfe1f..c05aff22a5d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11298,15 +11298,14 @@ let
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ numpy scipy pkgs.atlas ];
+    propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ];
 
     buildPhase = ''
-      export ATLAS=${pkgs.atlas}
       ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95'
     '';
 
     checkPhase = ''
-      LC_ALL="en_US.UTF-8" HOME=$TMPDIR ATLAS="" nosetests
+      LC_ALL="en_US.UTF-8" HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests
     '';
 
     meta = {

From ffcd8acee643994dd1de65fa567e1213006e8ab7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 11 Jun 2015 13:44:57 -0700
Subject: [PATCH 098/144] nixos/pulseaudio: Fix description

---
 nixos/modules/config/pulseaudio.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index bd010738500..2ebc6126055 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -81,7 +81,10 @@ in {
       support32Bit = mkOption {
         type = types.bool;
         default = false;
-        description = "no";
+        description = ''
+          Whether to include the 32-bit pulseaudio libraries in the systemn or not.
+          This is only useful on 64-bit systems and currently limited to x86_64-linux.
+        '';
       };
 
       configFile = mkOption {

From 776608a332656d970fcdebb9103f3f8be2a30dac Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 10 Jun 2015 13:02:16 +0200
Subject: [PATCH 099/144] aha: remove default GitHub downloadPage

---
 pkgs/tools/text/aha/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index a0be19607ea..4ae8048623c 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
       aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code.
     '';
     homepage = https://github.com/theZiz/aha;
-    downloadPage = https://github.com/theZiz/aha/releases;
     license = with licenses; [ lgpl2Plus mpl11 ];
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];

From 21569371662a891b0837257508a3cf1c7cc1dd66 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 12 Jun 2015 00:17:11 +0200
Subject: [PATCH 100/144] include-what-you-use 3.6 -> 0.4 (sic)

Not a downgrade. Upstream's weird.
---
 .../analysis/include-what-you-use/default.nix  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 9a8df0f4690..36164bffebf 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, cmake, llvmPackages_35 }:
+{ stdenv, fetchurl, cmake, llvmPackages_36 }:
 
-let version = "3.5"; in with llvmPackages_35;
-stdenv.mkDerivation rec {
+let
+  version = "0.4";
+  llvmPackages = llvmPackages_36;
+in stdenv.mkDerivation rec {
   name = "include-what-you-use-${version}";
 
   src = fetchurl {
-    sha256 = "1wfl78wkg8m2ssjnkb2rwcqy35nhc8fa63mk3sa60jrshpy7b15w";
+    sha256 = "19pwhgwvfr86n8ks099p9r02v7zh8d3qs7g7snzkhpdgq1azww85";
     url = "${meta.homepage}/downloads/${name}.src.tar.gz";
   };
 
@@ -19,14 +21,16 @@ stdenv.mkDerivation rec {
       actually needed for this file (for both .cc and .h files), and by
       replacing #includes with forward-declares when possible.
     '';
-    homepage = http://include-what-you-use.com;
+    homepage = http://include-what-you-use.org;
     license = licenses.bsd3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ clang cmake llvm ];
+  buildInputs = with llvmPackages; [ clang llvm ];
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}";
 
-  cmakeFlags = [ "-DLLVM_PATH=${llvm}" ];
   enableParallelBuilding = true;
 }

From 29db05132b5e0921e3fae35d62c30634e85a271f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 11 Jun 2015 19:35:35 -0500
Subject: [PATCH 101/144] pythonPackages.cvxopt: build with openblas

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c05aff22a5d..cb649a2ec97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1011,7 +1011,12 @@ let
       sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97";
     };
     doCheck = false;
-    buildInputs = with pkgs; [ liblapack blas ];
+    buildInputs = with pkgs; [ openblasCompat ];
+    preConfigure = ''
+      export CVXOPT_BLAS_LIB_DIR=${pkgs.openblasCompat}/lib
+      export CVXOPT_BLAS_LIB=openblas
+      export CVXOPT_LAPACK_LIB=openblas
+    '';
     meta = {
       homepage = "http://cvxopt.org/";
       description = "Python Software for Convex Optimization";

From 6cc817cf516159efa48f5322bfb1bf258ae01501 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 03:22:50 +0300
Subject: [PATCH 102/144] mueval: add patch until release is pushed to Hackage

---
 .../haskell-modules/configuration-common.nix  |  2 +-
 .../configuration-ghc-7.10.x.nix              |  5 --
 .../haskell-modules/mueval-fix.patch          | 90 +++++++++++++++++++
 3 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/mueval-fix.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7835ed7d96f..e1f45351a78 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -760,7 +760,7 @@ self: super: {
   dyre = appendPatch super.dyre ./dyre-nix.patch;
 
   # https://github.com/gwern/mueval/issues/9
-  mueval = markBrokenVersion "0.9.1.1" super.mueval;
+  mueval = appendPatch super.mueval ./mueval-fix.patch;
 
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
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 335b133f555..28c74f61925 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -116,11 +116,6 @@ self: super: {
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 
-  # Until the changes have been pushed to Hackage
-  mueval = appendPatch super.mueval (pkgs.fetchpatch {
-    url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch";
-    sha256 = "0h1lx4z15imq009k0qmwkn5l3hmigw463ahvwffdnszi2n618kpg";
-  });
   present = appendPatch super.present (pkgs.fetchpatch {
     url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch";
     sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8";
diff --git a/pkgs/development/haskell-modules/mueval-fix.patch b/pkgs/development/haskell-modules/mueval-fix.patch
new file mode 100644
index 00000000000..62a8f8f61e2
--- /dev/null
+++ b/pkgs/development/haskell-modules/mueval-fix.patch
@@ -0,0 +1,90 @@
+diff --git a/Mueval/ArgsParse.hs b/Mueval/ArgsParse.hs
+index 05c8fd9..0c32e27 100644
+--- a/Mueval/ArgsParse.hs
++++ b/Mueval/ArgsParse.hs
+@@ -1,10 +1,9 @@
++{-# LANGUAGE CPP #-}
+ module Mueval.ArgsParse (Options(..), interpreterOpts, getOptions) where
+ 
+ import Control.Monad (liftM)
+ import System.Console.GetOpt
+ 
+-import qualified Codec.Binary.UTF8.String as Codec (decodeString)
+-
+ import Mueval.Context (defaultModules, defaultPackages)
+ 
+ -- | See the results of --help for information on what each option means.
+@@ -98,4 +97,11 @@ header = "Usage: mueval [OPTION...] --expression EXPRESSION..."
+ -- | Just give us the end result options; this parsing for
+ --   us. Bonus points for handling UTF.
+ getOptions :: [String] -> Either (Bool, String) Options
+-getOptions = interpreterOpts . map Codec.decodeString
+\ No newline at end of file
++getOptions = interpreterOpts . map decodeString
++
++decodeString :: String -> String
++#if __GLASGOW_HASKELL__ >= 702
++decodeString = id
++#else
++decodeString = Codec.decodeString
++#endif
+diff --git a/Mueval/Context.hs b/Mueval/Context.hs
+index 78925cf..548514c 100644
+--- a/Mueval/Context.hs
++++ b/Mueval/Context.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ module Mueval.Context (
+   cleanModules,
+   defaultModules,
+@@ -32,7 +33,9 @@ defaultModules = ["Prelude",
+                   "Control.Monad.Error",
+                   "Control.Monad.Fix",
+                   "Control.Monad.Identity",
++#if !MIN_VERSION_base(4,7,0)
+                   "Control.Monad.Instances",
++#endif
+                   "Control.Monad.RWS",
+                   "Control.Monad.Reader",
+                   "Control.Monad.State",
+diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs
+index 29b771f..6c39482 100644
+--- a/Mueval/Interpreter.hs
++++ b/Mueval/Interpreter.hs
+@@ -1,4 +1,5 @@
+ {-# LANGUAGE PatternGuards #-}
++{-# LANGUAGE FlexibleContexts #-}
+ -- TODO: suggest the convenience functions be put into Hint proper?
+ module Mueval.Interpreter where
+ 
+@@ -12,8 +13,6 @@ import System.Exit (exitFailure)
+ import System.FilePath.Posix (takeFileName)
+ import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..))
+ 
+-import qualified System.IO.UTF8 as UTF (putStrLn)
+-
+ import Language.Haskell.Interpreter (eval, set, reset, setImportsQ, loadModules, liftIO,
+                                      installedModulesInScope, languageExtensions,
+                                      typeOf, setTopLevelModules, runInterpreter, glasgowExtensions,
+@@ -100,7 +99,7 @@ mvload lfl = do canonfile <- makeRelativeToCurrentDirectory lfl
+ -- flooding. Lambdabot has a similar limit.
+ sayIO :: String -> IO ()
+ sayIO str = do (out,b) <- render 1024 str
+-               UTF.putStrLn out
++               putStrLn out
+                when b exitFailure
+ 
+ -- | Oh no, something has gone wrong. If it's a compilation error pretty print
+diff --git a/mueval.cabal b/mueval.cabal
+index 3f9406d..b86d796 100644
+--- a/mueval.cabal
++++ b/mueval.cabal
+@@ -32,7 +32,7 @@ library
+         exposed-modules:     Mueval.Parallel, Mueval.Context, Mueval.Interpreter,
+                              Mueval.ArgsParse, Mueval.Resources
+         build-depends:       base>=4 && < 5, containers, directory, mtl>2, filepath, unix, process,
+-                             hint>=0.3.1, show>=0.3, utf8-string, Cabal, extensible-exceptions, simple-reflect
++                             hint>=0.3.1, show>=0.3, Cabal, extensible-exceptions, simple-reflect
+         ghc-options:         -Wall -static
+ 
+ executable mueval-core

From bb6e504d6b75b9e21beed9a55037ac2ff9a9427c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 03:30:47 +0300
Subject: [PATCH 103/144] thermald: update and adopt

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

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 86d121f0c22..85bc40caa27 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -1,13 +1,16 @@
-{ stdenv, fetchurl, unzip, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3";
+  version = "1.4.2";
   name = "thermald-${version}";
-  src = fetchurl {
-    url = "https://github.com/01org/thermal_daemon/archive/v${version}.zip";
-    sha256 = "0jqxc8vvd4lx4z0kcdisk8lpdf823nysvjcfjxlr5wzla1xysqwc";
+  src = fetchFromGitHub {
+    owner = "01org";
+    repo = "thermal_daemon";
+    rev = "v${version}";
+    sha256 = "051119wb0n31rn15pnx56d1r58a2d1fmj030q991mcv7pcy6c8mg";
   };
-  buildInputs = [ unzip autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];
+
+  buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];
 
   patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
 
@@ -25,12 +28,11 @@ stdenv.mkDerivation rec {
   preInstall = "sysconfdir=$out/etc";
 
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Thermal Daemon";
-    longDescription = ''
-         Thermal Daemon
-    '';
     homepage = https://01.org/linux-thermal-daemon;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
   };
 }

From bb3db4e6534d26b0be2d3ef8113e8b34463a80d0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 03:54:11 +0300
Subject: [PATCH 104/144] mueval: reapply Nix-specific patch

---
 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 e1f45351a78..55a7e330aa4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -760,7 +760,7 @@ self: super: {
   dyre = appendPatch super.dyre ./dyre-nix.patch;
 
   # https://github.com/gwern/mueval/issues/9
-  mueval = appendPatch super.mueval ./mueval-fix.patch;
+  mueval = appendPatch (appendPatch super.mueval ./mueval-fix.patch) ./mueval-nix.patch;
 
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;

From b6c589b2da2b46aed1dc2950ffae07437606bbff Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 27 May 2015 06:12:26 +0000
Subject: [PATCH 105/144] Simple EC2 user-data VM test

---
 nixos/lib/test-driver/Machine.pm              |  2 -
 .../scripts/ec2/amazon-base-config.nix        |  2 +-
 nixos/release.nix                             |  1 +
 nixos/tests/ec2.nix                           | 96 +++++++++++++++++++
 4 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 nixos/tests/ec2.nix

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 6df8ddb9e95..41088ed75f7 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -43,8 +43,6 @@ sub new {
         $startCommand .= "-bios $args->{bios} "
             if defined $args->{bios};
         $startCommand .= $args->{qemuFlags} || "";
-    } else {
-        $startCommand = Cwd::abs_path $startCommand;
     }
 
     my $tmpDir = $ENV{'TMPDIR'} || "/tmp";
diff --git a/nixos/maintainers/scripts/ec2/amazon-base-config.nix b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
index d23f15e828b..097d722554c 100644
--- a/nixos/maintainers/scripts/ec2/amazon-base-config.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
@@ -1,5 +1,5 @@
 { modulesPath, ...}:
 {
-  imports = [ "${modulesPath}/virtualisation/amazon-config.nix" ];
+  imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
   services.journald.rateLimitBurst = 0;
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index 51a58da4454..103bf9b2c5b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -247,6 +247,7 @@ in rec {
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
   tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });
   tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
+  tests.ec2 = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).bootEc2NixOps;
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
new file mode 100644
index 00000000000..7ea9b3d07f7
--- /dev/null
+++ b/nixos/tests/ec2.nix
@@ -0,0 +1,96 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with import ../lib/qemu-flags.nix;
+with pkgs.lib;
+
+let
+  image =
+    (import ../lib/eval-config.nix {
+      inherit system;
+      modules = [
+        ../maintainers/scripts/ec2/amazon-hvm-config.nix
+        ../../nixos/modules/testing/test-instrumentation.nix
+        { boot.initrd.kernelModules = [ "virtio" "virtio_blk" "virtio_pci" "virtio_ring" ]; }
+      ];
+    }).config.system.build.amazonImage;
+
+  makeEc2Test = { name, userData, script, hostname ? "ec2-instance", sshPublicKey ? null }:
+    let
+      metaData = pkgs.stdenv.mkDerivation {
+        name = "metadata";
+        buildCommand = ''
+          mkdir -p $out/2011-01-01
+          ln -s ${pkgs.writeText "userData" userData} $out/2011-01-01/user-data
+          mkdir -p $out/1.0/meta-data
+          echo "${hostname}" > $out/1.0/meta-data/hostname
+        '' + optionalString (sshPublicKey != null) ''
+          mkdir -p $out/1.0/meta-data/public-keys/0
+          ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key
+        '';
+      };
+    in makeTest {
+      name = "ec2-" + name;
+      nodes = {};
+      testScript =
+        ''
+          use File::Temp qw/ tempfile /;
+          my ($fh, $filename) = tempfile();
+
+          `qemu-img create -f qcow2 -o backing_file=${image}/nixos.img $filename`;
+
+          my $startCommand = "qemu-kvm -m 768 -net nic -net 'user,net=169.254.0.0/16,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
+          $startCommand .= " -drive file=" . Cwd::abs_path($filename) . ",if=virtio,werror=report";
+          $startCommand .= " \$QEMU_OPTS";
+
+          my $machine = createMachine({ startCommand => $startCommand });
+          ${script}
+        '';
+    };
+
+  snakeOilPrivateKey = [
+    "-----BEGIN EC PRIVATE KEY-----"
+    "MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49"
+    "AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN"
+    "r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA=="
+    "-----END EC PRIVATE KEY-----"
+  ];
+
+  snakeOilPublicKey = pkgs.lib.concatStrings [
+    "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
+    "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
+    "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"
+  ];
+in {
+  bootEc2NixOps = makeEc2Test {
+    name         = "nixops-userdata";
+    sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!
+
+    userData = ''
+      SSH_HOST_DSA_KEY_PUB:${snakeOilPublicKey}
+      SSH_HOST_DSA_KEY:${pkgs.lib.concatStringsSep "|" snakeOilPrivateKey}
+    '';
+    script = ''
+      $machine->start;
+      $machine->waitForFile("/root/user-data");
+      $machine->waitForUnit("sshd.service");
+
+      # We have no keys configured on the client side yet, so this should fail
+      $machine->fail("ssh -o BatchMode=yes localhost exit");
+
+      # Let's install our client private key
+      $machine->succeed("mkdir -p ~/.ssh");
+      ${concatMapStrings (s: "$machine->succeed('echo ${s} >> ~/.ssh/id_ecdsa');") snakeOilPrivateKey}
+      $machine->succeed("chmod 600 ~/.ssh/id_ecdsa");
+
+      # We haven't configured the host key yet, so this should still fail
+      $machine->fail("ssh -o BatchMode=yes localhost exit");
+
+      # Add the host key; ssh should finally succeed
+      $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts");
+      $machine->succeed("ssh -o BatchMode=yes localhost exit");
+
+      $machine->shutdown;
+    '';
+  };
+}

From 089f9d6486b9c0d5f27b116468ca131697ef8e16 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 11 Jun 2015 22:00:13 -0500
Subject: [PATCH 106/144] gnuapl: latest version doesn't require liblapack

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

diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 687b7319cf4..44462161407 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, liblapack, readline, gettext, ncurses }:
+{ stdenv, fetchurl, readline, gettext, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "gnu-apl-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h4diq3wfbdwxp5nm0z4b0p1zq13lwip0y7v28r9v0mbbk8xsfh1";
   };
 
-  buildInputs = [ liblapack readline gettext ncurses ];
+  buildInputs = [ readline gettext ncurses ];
 
   postInstall = ''
     cp -r support-files/ $out/share/doc/

From da6eec001ab9437a50d4f91d8c1a3704c193647c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 11 Jun 2015 22:10:56 -0500
Subject: [PATCH 107/144] nixpkgs: z3 4.3.2 -> 4.4.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/z3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 2296a28444b..fb3fb959ae6 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "z3-${version}";
-  version = "4.3.2";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner  = "Z3Prover";
     repo   = "z3";
-    rev    = "ac21ffebdf1512da2a77dc46c47bde87cc3850f3";
-    sha256 = "1y86akhpy41wx3gx7r8gvf7xbax7dj36ikj6gqh5a7p6r6maz9ci";
+    rev    = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152";
+    sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx";
   };
 
   buildInputs = [ python ];

From 4b758e374e19774509a5c93726d79dde4744a8bc Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Fri, 10 Apr 2015 06:06:52 +0200
Subject: [PATCH 108/144] Initial attempt at configuring from EC2 userdata
 (with input from cstrahan). Now with VM tests!

---
 .../scripts/ec2/amazon-base-config.nix        |  2 +-
 nixos/modules/virtualisation/amazon-init.nix  | 52 +++++++++++++++++++
 nixos/release.nix                             |  3 +-
 nixos/tests/ec2.nix                           | 25 ++++++++-
 4 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/virtualisation/amazon-init.nix

diff --git a/nixos/maintainers/scripts/ec2/amazon-base-config.nix b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
index 097d722554c..28317317eab 100644
--- a/nixos/maintainers/scripts/ec2/amazon-base-config.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
@@ -1,5 +1,5 @@
 { modulesPath, ...}:
 {
-  imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
+  imports = [ "${modulesPath}/virtualisation/amazon-init.nix" ];
   services.journald.rateLimitBurst = 0;
 }
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
new file mode 100644
index 00000000000..c5dfb3643e1
--- /dev/null
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, modulesPath, ... }:
+
+# This attempts to pull a nix expression from this EC2 instance's user-data.
+
+let
+  bootScript = pkgs.writeScript "bootscript.sh" ''
+    #!${pkgs.stdenv.shell} -eux
+
+    echo "attempting to fetch configuration from user-data..."
+
+    export PATH=${pkgs.nix}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
+    export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
+
+    userData="$(mktemp)"
+    wget -q --wait=1 --tries=0 --retry-connrefused -O - http://169.254.169.254/2011-01-01/user-data > "$userData"
+
+    if [[ $? -eq 0 ]]; then
+      echo "user-data fetched"
+      # If the user-data looks like it could be a nix expression,
+      # copy it over. Also, look for a magic three-hash comment and set
+      # that as the channel.
+      if sed '/^\(#\|SSH_HOST_.*\)/d' < "$userData" | grep -q '\S'; then
+        channels="$(grep '^###' "$userData" | sed 's|###\s*||')"
+        printf "%s" "$channels" | while read channel; do
+          echo "writing channel: $channel"
+        done
+
+        if [[ -n "$channels" ]]; then
+          printf "%s" "$channels" > /root/.nix-channels
+          nix-channel --update
+        fi
+
+        echo "setting configuration"
+        cp "$userData" /etc/nixos/configuration.nix
+      else
+        echo "user-data does not appear to be a nix expression; ignoring"
+      fi
+    else
+      echo "failed to fetch user-data"
+    fi
+
+    type -f nixos-rebuild
+
+    nixos-rebuild switch
+  '';
+in {
+  imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
+  ec2.metadata = true;
+  boot.postBootCommands = ''
+    ${bootScript} &
+  '';
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index 103bf9b2c5b..6afcdbff3e1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -247,7 +247,8 @@ in rec {
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
   tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });
   tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
-  tests.ec2 = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).bootEc2NixOps;
+  tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
+  tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index 7ea9b3d07f7..1296ff4e8e3 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -62,7 +62,7 @@ let
     "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"
   ];
 in {
-  bootEc2NixOps = makeEc2Test {
+  boot-ec2-nixops = makeEc2Test {
     name         = "nixops-userdata";
     sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!
 
@@ -93,4 +93,27 @@ in {
       $machine->shutdown;
     '';
   };
+
+  boot-ec2-config = makeEc2Test {
+    name         = "config-userdata";
+    sshPublicKey = snakeOilPublicKey;
+
+    userData = ''
+      ### http://nixos.org/channels/nixos-unstable nixos
+      {
+        imports = [
+          <nixpkgs/nixos/modules/virtualisation/amazon-image.nix>
+          <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
+        ];
+        environment.etc.testFile = {
+          text = "whoa";
+        };
+      }
+    '';
+    script = ''
+      $machine->start;
+      $machine->waitForFile("/etc/testFile");
+      $machine->succeed("cat /etc/testFile | grep -q 'whoa'");
+    '';
+  };
 }

From 214aae46c79186d4d96fd434b55cdf701cb48307 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Jun 2015 10:32:36 +0200
Subject: [PATCH 109/144] emacs-monky: add an Mercurial mode that's inspired by
 Magit

---
 .../editors/emacs-modes/monky/default.nix     | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/monky/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/monky/default.nix b/pkgs/applications/editors/emacs-modes/monky/default.nix
new file mode 100644
index 00000000000..8e35a4e2b57
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/monky/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, emacs, unzip }:
+
+stdenv.mkDerivation {
+  name = "emacs-monky-20150404";
+
+  src = fetchurl {
+    url = "https://github.com/ananthakumaran/monky/archive/48c0200910739b6521f26f6423b2bfb8c38b4482.zip";
+    sha256 = "0yp3pzddx7yki9n3qrriqa5p442qyrdivvlc4xbl024vzjyzddrj";
+  };
+
+  buildInputs = [ emacs unzip ];
+
+  buildPhase = "emacs -L . --batch -f batch-byte-compile *.el";
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2630b2f79b..a6a6ed3aeeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10934,6 +10934,8 @@ let
 
     metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { };
 
+    monky = callPackage ../applications/editors/emacs-modes/monky { };
+
     notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; });
 
     ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };

From 4d404fd6a48e67db0c9da507d6dbf829cb47e3de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Jun 2015 10:50:40 +0200
Subject: [PATCH 110/144] ihaskell-wrapper: avoid use of /bin/sh

https://github.com/NixOS/nixpkgs/issues/183
---
 pkgs/development/tools/haskell/ihaskell/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 035ad738a82..c00f46577a8 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -7,7 +7,7 @@ let
     self.ihaskell-display
   ] ++ packages self);
   ihaskellSh = writeScriptBin "ihaskell-notebook" ''
-    #!/bin/sh
+    #! ${stdenv.shell}
     export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
     export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin"
     ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell

From 69829dd4ff0248a3b96970e9e2b94790c738bf30 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 11:22:59 +0200
Subject: [PATCH 111/144] Debian: Update to 8.1

---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 53a01365435..c4fefe4d501 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1710,22 +1710,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.0-jessie-i386";
-      fullName = "Debian 8.0 Jessie (i386)";
+      name = "debian-8.1-jessie-i386";
+      fullName = "Debian 8.1 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "0lrv1lnd595c346ci7z8ja2b0rm2gx5r4hwp0wbp9lzxi8k5nk1d";
+        sha256 = "e658c2aebc3c0bc529e89de3ad916a71372f0a80161111d86a7dab1026644507";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.0-jessie-amd64";
-      fullName = "Debian 8.0 Jessie (amd64)";
+      name = "debian-8.1-jessie-amd64";
+      fullName = "Debian 8.1 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4";
+        sha256 = "265907f3cb05aff5f653907e9babd4704902f78cd5e355d4cd4ae590e4d5b043";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 248a1b4d51555ce1ca5c3d8d496ec4ee9ef07f54 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 12 Jun 2015 11:45:58 +0200
Subject: [PATCH 112/144] nixos-artwork: only download the necessary artwork

---
 pkgs/data/misc/nixos-artwork/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix
index 99f3e8b1177..b35a96fff82 100644
--- a/pkgs/data/misc/nixos-artwork/default.nix
+++ b/pkgs/data/misc/nixos-artwork/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "nixos-artwork-2015-02-27";
   # Remember to check the default lightdm wallpaper when updating
 
-  src = fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixos-artwork";
-    rev = "e71b6846023919136795ede22b16d73b2cf1693d";
-    sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb";
+  GnomeDark = fetchurl {
+    url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
+    sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
   };
 
+  unpackPhase = "true";
+
   installPhase = ''
-    mkdir -p $out/share/artwork
-    cp -r * $out/share/artwork
-    find $out -name \*.xcf -exec rm {} \;
+    mkdir -p $out/share/artwork/gnome
+    ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png
   '';
   
   meta = with stdenv.lib; {
-    homepage = "https://github.com/NixOS/nixos-artwork";
+    homepage = https://github.com/NixOS/nixos-artwork;
     platforms = platforms.all;
   };
 }

From 69f4fc4be6e799fbd7aa3bafa8849e24e8f1d4fb Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 12 Jun 2015 11:53:33 +0200
Subject: [PATCH 113/144] Add hicolor_icon_theme dependency

This avoids having icon-theme.cache generated.
---
 pkgs/applications/audio/gmpc/default.nix | 4 ++--
 pkgs/tools/misc/gparted/default.nix      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 7cc8aeda367..4da235dd8a9 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
 , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
-, libSM, libICE, sqlite
+, libSM, libICE, sqlite, hicolor_icon_theme
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
-    libunique libmpd gob2 vala libSM libICE sqlite
+    libunique libmpd gob2 vala libSM libICE sqlite hicolor_icon_theme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index dd2798de272..464e40ec014 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid
-, pkgconfig, gtkmm, libxml2 }:
+, pkgconfig, gtkmm, libxml2, hicolor_icon_theme
+}:
 
 stdenv.mkDerivation rec {
   name = "gparted-0.22.0";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-doc";
 
   buildInputs = [
-    parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2
+    parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 hicolor_icon_theme
   ];
 
   meta = with stdenv.lib; {

From 0a7c5e4f686ade2cfac329afdaee5da05a366556 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 5 Jun 2015 10:34:00 +0200
Subject: [PATCH 114/144] cygwin: libedit patch for cygwin

---
 .../libraries/libedit/01-cygwin.patch         | 25 +++++++++++++++++++
 .../development/libraries/libedit/default.nix |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/libedit/01-cygwin.patch

diff --git a/pkgs/development/libraries/libedit/01-cygwin.patch b/pkgs/development/libraries/libedit/01-cygwin.patch
new file mode 100644
index 00000000000..33bd39ed61e
--- /dev/null
+++ b/pkgs/development/libraries/libedit/01-cygwin.patch
@@ -0,0 +1,25 @@
+--- libedit-20120311-3.0/src/chartype.h	2012-03-11 10:54:58.000000000 +0100
++++ libedit-20120311-3.0/src/chartype.h	2012-05-03 19:00:20.651847423 +0200
+@@ -56,9 +56,11 @@
+ /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
+  * ref: ISO/IEC DTR 19769
+  */
++#ifndef __CYGWIN__
+ #if WCHAR_MAX < INT32_MAX
+ #warning Build environment does not support non-BMP characters
+ #endif
++#endif
+ 
+ #ifndef HAVE_WCSDUP
+ wchar_t *wcsdup(const wchar_t *s);
+--- libedit-20120311-3.0/src/editline/readline.h	2011-02-26 23:42:59.000000000 +0100
++++ libedit-20120311-3.0/src/editline/readline.h	2012-05-03 19:00:49.211244803 +0200
+@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
+ 
+ #ifndef CTRL
+ #include <sys/ioctl.h>
+-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__)
+ #include <sys/ttydefaults.h>
+ #endif
+ #ifndef CTRL
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 61bb15dde7d..dc2f5842b28 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
   NROFF = "${groff}/bin/nroff";
 
+  patches = if stdenv.isCygwin then [
+    ./01-cygwin.patch
+  ] else null;
+
   postInstall = ''
     sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
   '';

From 85b7673e92029853311c84aabec677092024d898 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 5 Jun 2015 15:47:32 +0200
Subject: [PATCH 115/144] cygwin: turn off tests for swig since they depend on
 tcl (which i havent yet figure out how to build)

---
 pkgs/development/tools/misc/swig/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index c4fcd315845..e10fd25d046 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r";
   };
 
-  doCheck = true;
+  doCheck = !stdenv.isCygwin;
   # 'make check' uses boost and tcl
   buildInputs = stdenv.lib.optionals doCheck [ boost tcl ];
 

From d5087119c63ce8820c564e392ddb8e3c1865855e Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 5 Jun 2015 15:49:11 +0200
Subject: [PATCH 116/144] cygwin: remove kerberos from builsInputs for serf

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

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index df8749622be..580460d5fc0 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c";
   };
 
-  buildInputs = [ apr scons openssl aprutil zlib kerberos pkgconfig ];
+  buildInputs = [ apr scons openssl aprutil zlib ]
+    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos
+    ++ [ pkgconfig ];
 
   configurePhase = ''
     ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
         APU="$(echo "${aprutil}"/bin/*-config)" CC="${
           if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc"
         }" ${
-          if stdenv.isDarwin then "" else "GSSAPI=\"${kerberos}\""
+          if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\""
         }
   '';
 

From 7c67c350a3cd1d3074efb826f70d5017d2f28cf8 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 5 Jun 2015 15:50:14 +0200
Subject: [PATCH 117/144] cygwin: turn off ldap and crypt for apr-util to make
 it build

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

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 0f21af94c64..bceb10e3355 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, apr, expat, gnused
 , sslSupport ? true, openssl
 , bdbSupport ? false, db
-, ldapSupport ? true, openldap
+, ldapSupport ? !stdenv.isCygwin, openldap
 , libiconv
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     --with-apr=${apr} --with-expat=${expat}
-    --with-crypto
+    ${if !stdenv.isCygwin then "--with-crypto" else "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
     ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
     ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
     ${stdenv.lib.optionalString ldapSupport "--with-ldap"}

From fac474080f4f71fd751c718d24d0cec88a3538e4 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 9 Jun 2015 14:49:39 +0200
Subject: [PATCH 118/144] cygwin: patchShebangs fails without proper findutils

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

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 74524164dd0..19878a24e95 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, python }:
+{ stdenv, fetchFromGitHub, autoreconfHook, python, findutils }:
 
 let version = "2.0.22"; in
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ python ];
+  buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
 
   patchPhase = ''
     patchShebangs event_rpcgen.py

From 277c263c1e2497a9c0009be242939ed4f7615a24 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 14:08:12 +0200
Subject: [PATCH 119/144] cygwin: update patch for cmake 3.2.2

---
 .../build-managers/cmake/3.2.2-cygwin.patch   | 274 ++++++++++++++++++
 .../tools/build-managers/cmake/default.nix    |   7 +-
 2 files changed, 277 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch

diff --git a/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch
new file mode 100644
index 00000000000..982aba17e87
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch
@@ -0,0 +1,274 @@
+--- cmake-3.2.2/Source/cmFileCommand.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/ccmFileCommand.cxx	2015-06-10 11:02:27.345598700 +0200
+@@ -1179,7 +1179,7 @@
+   MatchProperties CollectMatchProperties(const char* file)
+     {
+     // Match rules are case-insensitive on some platforms.
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+     std::string lower = cmSystemTools::LowerCase(file);
+     const char* file_to_match = lower.c_str();
+ #else
+--- cmake-3.2.2/Source/cmInstallCommand.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/cmInstallCommand.cxx	2015-06-10 11:04:19.257935200 +0200
+@@ -1138,7 +1138,7 @@
+       {
+       literal_args += " REGEX \"";
+     // Match rules are case-insensitive on some platforms.
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+       std::string regex = cmSystemTools::LowerCase(args[i]);
+ #else
+       std::string regex = args[i];
+--- cmake-3.2.2/Source/kwsys/Glob.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/kwsys/Glob.cxx	2015-06-10 11:05:51.602674000 +0200
+@@ -37,7 +37,7 @@
+ #include <string.h>
+ namespace KWSYS_NAMESPACE
+ {
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+ // On Windows and apple, no difference between lower and upper case
+ # define KWSYS_GLOB_CASE_INDEPENDENT
+ #endif
+--- cmake-3.2.2/Source/kwsys/SystemInformation.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/kwsys/SystemInformation.cxx	2015-06-10 11:13:00.308303500 +0200
+@@ -911,7 +911,7 @@
+ // Hide implementation details in an anonymous namespace.
+ namespace {
+ // *****************************************************************************
+-#if defined(__linux) || defined(__APPLE__)
++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
+ int LoadLines(
+       FILE *file,
+       kwsys_stl::vector<kwsys_stl::string> &lines)
+@@ -947,7 +947,7 @@
+   return nRead;
+ }
+ 
+-# if defined(__linux)
++# if defined(__linux) || defined(__CYGWIN__)
+ // *****************************************************************************
+ int LoadLines(
+       const char *fileName,
+@@ -986,7 +986,7 @@
+ }
+ #endif
+ 
+-#if defined(__linux)
++#if defined(__linux) || defined(__CYGWIN__)
+ // ****************************************************************************
+ template<typename T>
+ int GetFieldsFromFile(
+@@ -3132,7 +3132,6 @@
+     pos = buffer.find("processor\t",pos+1);
+     }
+ 
+-#ifdef __linux
+   // Find the largest physical id.
+   int maxId = -1;
+   kwsys_stl::string idc =
+@@ -3165,14 +3164,6 @@
+             atoi(this->ExtractValueFromCpuInfoFile(buffer,"ncpus active").c_str());
+     }
+ 
+-#else // __CYGWIN__
+-  // does not have "physical id" entries, neither "cpu cores"
+-  // this has to be fixed for hyper-threading.
+-  kwsys_stl::string cpucount =
+-    this->ExtractValueFromCpuInfoFile(buffer,"cpu count");
+-  this->NumberOfPhysicalCPU=
+-    this->NumberOfLogicalCPU = atoi(cpucount.c_str());
+-#endif
+   // gotta have one, and if this is 0 then we get a / by 0n
+   // better to have a bad answer than a crash
+   if(this->NumberOfPhysicalCPU <= 0)
+@@ -3370,7 +3361,7 @@
+   GlobalMemoryStatusEx(&statex);
+   return statex.ullTotalPhys/1024;
+ # endif
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   SystemInformation::LongLong memTotal=0;
+   int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal);
+   if (ierr)
+@@ -3501,7 +3492,7 @@
+   GlobalMemoryStatusEx(&statex);
+   return (statex.ullTotalPhys - statex.ullAvailPhys)/1024;
+ # endif
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   const char *names[3]={"MemTotal:","MemFree:",NULL};
+   SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)};
+   int ierr=GetFieldsFromFile("/proc/meminfo",names,values);
+@@ -3560,7 +3551,7 @@
+     return -2;
+     }
+   return pmc.WorkingSetSize/1024;
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   SystemInformation::LongLong memUsed=0;
+   int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed);
+   if (ierr)
+@@ -3612,7 +3603,7 @@
+ {
+ #if defined(_WIN32)
+   return GetCurrentProcessId();
+-#elif defined(__linux) || defined(__APPLE__)
++#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
+   return getpid();
+ #else
+   return -1;
+--- cmake-3.2.2/Source/kwsys/SystemTools.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/kwsys/SystemTools.cxx	2015-06-10 11:21:58.980443200 +0200
+@@ -93,19 +93,12 @@
+ # if defined(_MSC_VER) && _MSC_VER >= 1800
+ #  define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+ # endif
+-#elif defined (__CYGWIN__)
+-# include <windows.h>
+-# undef _WIN32
+ #endif
+ 
+ #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H
+ extern char **environ;
+ #endif
+ 
+-#ifdef __CYGWIN__
+-# include <sys/cygwin.h>
+-#endif
+-
+ // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
+ // same for TIOCGWINSZ
+ #if defined(_WIN32) || defined (__LIBCATAMOUNT__)
+@@ -1148,15 +1141,7 @@
+     {
+     return false;
+     }
+-#if defined(__CYGWIN__)
+-  // Convert filename to native windows path if possible.
+-  char winpath[MAX_PATH];
+-  if(SystemTools::PathCygwinToWin32(filename.c_str(), winpath))
+-    {
+-    return (GetFileAttributesA(winpath) != INVALID_FILE_ATTRIBUTES);
+-    }
+-  return access(filename.c_str(), R_OK) == 0;
+-#elif defined(_WIN32)
++#if defined(_WIN32)
+   return (GetFileAttributesW(
+             SystemTools::ConvertToWindowsExtendedPath(filename).c_str())
+           != INVALID_FILE_ATTRIBUTES);
+@@ -1190,28 +1175,6 @@
+ }
+ 
+ //----------------------------------------------------------------------------
+-#ifdef __CYGWIN__
+-bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
+-{
+-  SystemToolsTranslationMap::iterator i =
+-    SystemTools::Cyg2Win32Map->find(path);
+-
+-  if (i != SystemTools::Cyg2Win32Map->end())
+-    {
+-    strncpy(win32_path, i->second.c_str(), MAX_PATH);
+-    }
+-  else
+-    {
+-    if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0)
+-      {
+-      win32_path[0] = 0;
+-      }
+-    SystemToolsTranslationMap::value_type entry(path, win32_path);
+-    SystemTools::Cyg2Win32Map->insert(entry);
+-    }
+-  return win32_path[0] != 0;
+-}
+-#endif
+ 
+ bool SystemTools::Touch(const kwsys_stl::string& filename, bool create)
+ {
+@@ -4307,7 +4270,7 @@
+ 
+ bool SystemTools::FileIsFullPath(const char* in_name, size_t len)
+ {
+-#if defined(_WIN32) || defined(__CYGWIN__)
++#if defined(_WIN32)
+   // On Windows, the name must be at least two characters long.
+   if(len < 2)
+     {
+@@ -5078,9 +5041,6 @@
+ static unsigned int SystemToolsManagerCount;
+ SystemToolsTranslationMap *SystemTools::TranslationMap;
+ SystemToolsTranslationMap *SystemTools::LongPathMap;
+-#ifdef __CYGWIN__
+-SystemToolsTranslationMap *SystemTools::Cyg2Win32Map;
+-#endif
+ 
+ // SystemToolsManager manages the SystemTools singleton.
+ // SystemToolsManager should be included in any translation unit
+@@ -5126,9 +5086,6 @@
+   // Allocate the translation map first.
+   SystemTools::TranslationMap = new SystemToolsTranslationMap;
+   SystemTools::LongPathMap = new SystemToolsTranslationMap;
+-#ifdef __CYGWIN__
+-  SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap;
+-#endif
+ 
+   // Add some special translation paths for unix.  These are not added
+   // for windows because drive letters need to be maintained.  Also,
+@@ -5183,9 +5140,6 @@
+ {
+   delete SystemTools::TranslationMap;
+   delete SystemTools::LongPathMap;
+-#ifdef __CYGWIN__
+-  delete SystemTools::Cyg2Win32Map;
+-#endif
+ }
+ 
+ 
+--- cmake-3.2.2/Source/kwsys/SystemTools.hxx.in	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/kwsys/SystemTools.hxx.in	2015-06-10 11:24:24.271286600 +0200
+@@ -298,15 +298,6 @@
+   static bool FileExists(const kwsys_stl::string& filename);
+ 
+   /**
+-   * Converts Cygwin path to Win32 path. Uses dictionary container for
+-   * caching and calls to cygwin_conv_to_win32_path from Cygwin dll
+-   * for actual translation.  Returns true on success, else false.
+-   */
+-#ifdef __CYGWIN__
+-  static bool PathCygwinToWin32(const char *path, char *win32_path);
+-#endif
+-
+-  /**
+    * Return file length
+    */
+   static unsigned long FileLength(const kwsys_stl::string& filename);
+@@ -942,9 +933,6 @@
+    */
+   static SystemToolsTranslationMap *TranslationMap;
+   static SystemToolsTranslationMap *LongPathMap;
+-#ifdef __CYGWIN__
+-  static SystemToolsTranslationMap *Cyg2Win32Map;
+-#endif
+   friend class SystemToolsManager;
+ };
+ 
+--- cmake-3.2.2/Modules/FindCurses.cmake	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Modules/FindCurses.cmake	2015-06-10 12:10:19.682030300 +0200
+@@ -60,15 +60,6 @@
+ if(CURSES_NCURSES_LIBRARY  AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
+   set(CURSES_USE_NCURSES TRUE)
+ endif()
+-# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
+-# cygwin ncurses stopped providing curses.h symlinks see above
+-# message.  Cygwin is an ncurses package, so force ncurses on
+-# cygwin if the curses.h is missing
+-if(CYGWIN)
+-  if(NOT EXISTS /usr/include/curses.h)
+-    set(CURSES_USE_NCURSES TRUE)
+-  endif()
+-endif()
+ 
+ 
+ # Not sure the logic is correct here.
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 9f2ed0a7352..e882f47cfe3 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
       url = "http://public.kitware.com/Bug/file_download.php?"
           + "file_id=4981&type=bug";
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    }) ++ stdenv.lib.optional stdenv.isCygwin ./2.8.11-cygwin.patch;
+    }) ++ stdenv.lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
   buildInputs =
     [ bzip2 curl expat libarchive xz zlib ]
-    ++ optional (jsoncpp != null) jsoncpp
+    ++ optional (jsoncpp != null && !stdenv.isCygwin) jsoncpp
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
@@ -53,8 +53,7 @@ stdenv.mkDerivation rec {
       "--docdir=/share/doc/${name}"
       "--mandir=/share/man"
     ]
-    ++ optional (!stdenv.isCygwin) "--system-libs"
-    ++ optional (jsoncpp == null) "--no-system-jsoncpp"
+    ++ optional (jsoncpp == null || stdenv.isCygwin) "--no-system-jsoncpp"
     ++ optional useQt4 "--qt-gui"
     ++ ["--"]
     ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";

From b980b7445f7335e59b32bf6265e865ccde039625 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 14:09:44 +0200
Subject: [PATCH 120/144] cygwin: skip ssl support for postgresql (temporary)

---
 pkgs/servers/sql/postgresql/9.2.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index e04309fc466..5c51a7c578a 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "world" ];
 
-  configureFlags = [ "--with-openssl" ];
+  configureFlags = stdenv.lib.optionals (!stdenv.isCygwin) [ "--with-openssl" ];
 
   patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
 

From 0860826795dddb0f00a975f54f2e71521fac6770 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 14:37:46 +0200
Subject: [PATCH 121/144] cygwin: cmake expression should not change for linux

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index e882f47cfe3..8cdf231729f 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
       "--docdir=/share/doc/${name}"
       "--mandir=/share/man"
     ]
+    ++ optional (!stdenv.isCygwin) "--system-libs"
     ++ optional (jsoncpp == null || stdenv.isCygwin) "--no-system-jsoncpp"
     ++ optional useQt4 "--qt-gui"
     ++ ["--"]

From 617c16f8f68088b78e815dd539eda0d3f1241da7 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 11 Jun 2015 16:25:56 +0200
Subject: [PATCH 122/144] cygwin: python27 gdbm module needs gettext

---
 pkgs/development/interpreters/python/2.7/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index e67c2682998..4ad4679bd6e 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, self, callPackage
-, bzip2, openssl
+, bzip2, openssl, gettext
 
 , includeModules ? false
 
 , db, gdbm, ncurses, sqlite, readline
 
-, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true
+, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
 , zlib ? null, zlibSupport ? true
 , expat, libffi
 }:
@@ -224,7 +224,7 @@ let
     gdbm = buildInternalPythonModule {
       moduleName = "gdbm";
       internalName = "gdbm";
-      deps = [ gdbm ];
+      deps = [ gdbm ] ++ stdenv.lib.optional stdenv.isCygwin gettext;
     };
 
     sqlite3 = buildInternalPythonModule {

From 36a1d2d4f8c74a58ca6c56b7d768753c0dac0752 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Fri, 12 Jun 2015 13:49:28 +1200
Subject: [PATCH 123/144] Update tor to 0.2.6.9

---
 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 c6a5917640e..bfa1a0ab9f4 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.6.8";
+  name = "tor-0.2.6.9";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "0xlsc2pa7i8hm8dyilln6p4rb0pig62b9c31yp1m0hj5jqw3d2xq";
+    sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a";
   };
 
   # Note: torsocks is specified as a dependency, as the distributed

From a6e12c23fcb5890e44094b95a91ddb6c3e9cc081 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 8 Jun 2015 19:56:37 +0200
Subject: [PATCH 124/144] Link Xen scripts to /etc/xen

---
 nixos/modules/virtualisation/xen-dom0.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index ea9f61aad6a..65efdabb3b4 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -6,7 +6,6 @@ with lib;
 
 let
   cfg = config.virtualisation.xen;
-  xen = pkgs.xen;
 in
 
 {
@@ -88,9 +87,9 @@ in
       message = "Xen currently does not support EFI boot";
     } ];
 
-    virtualisation.xen.stored = mkDefault "${xen}/bin/oxenstored";
+    virtualisation.xen.stored = mkDefault "${pkgs.xen}/bin/oxenstored";
 
-    environment.systemPackages = [ xen ];
+    environment.systemPackages = [ pkgs.xen ];
 
     # Make sure Domain 0 gets the required configuration
     #boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; };
@@ -122,7 +121,7 @@ in
 
     system.extraSystemBuilderCmds =
       ''
-        ln -s ${xen}/boot/xen.gz $out/xen.gz
+        ln -s ${pkgs.xen}/boot/xen.gz $out/xen.gz
         echo "${toString cfg.bootParams}" > $out/xen-params
       '';
 
@@ -158,13 +157,16 @@ in
 
 
     environment.etc =
-      [ { source = "${xen}/etc/xen/xl.conf";
+      [ { source = "${pkgs.xen}/etc/xen/xl.conf";
           target = "xen/xl.conf";
         }
+        { source = "${pkgs.xen}/etc/xen/scripts";
+          target = "xen/scripts";
+        }
       ];
 
     # Xen provides udev rules.
-    services.udev.packages = [ xen ];
+    services.udev.packages = [ pkgs.xen ];
 
     services.udev.path = [ pkgs.bridge-utils pkgs.iproute ];
 

From 399b5496119d1f81fb64dc1a86143adade698129 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 9 Jun 2015 15:08:06 +0200
Subject: [PATCH 125/144] Fix: xen-bridge systemd service

---
 nixos/modules/virtualisation/xen-dom0.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 65efdabb3b4..7b5d714622c 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -262,16 +262,13 @@ in
       wantedBy = [ "multi-user.target" ];
       before = [ "xen-domains.service" ];
       serviceConfig.RemainAfterExit = "yes";
-      serviceConfig.ExecStart = ''
-        ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge}
-        ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up
-        '';
-      serviceConfig.ExecStop = ''
-        ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down
-        ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge}
-        '';
+      serviceConfig.ExecStart = "${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge}";
+      postStart = "${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up";
+      serviceConfig.ExecStop = "${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down";
+      postStop = "${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge}";
     };
 
+
     systemd.services.xen-domains = {
       description = "Xen domains - automatically starts, saves and restores Xen domains";
       wantedBy = [ "multi-user.target" ];

From dbac15d66c887689e7701837ffb462fa5820025d Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Tue, 9 Jun 2015 17:07:11 +0800
Subject: [PATCH 126/144] aacgain: Add package.

This adds aacgain which is a normalizer for AAC (.m4a) audio files.
---
 pkgs/applications/audio/aacgain/default.nix | 72 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/applications/audio/aacgain/default.nix

diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
new file mode 100644
index 00000000000..4cfc51970aa
--- /dev/null
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchgit, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }:
+
+stdenv.mkDerivation {
+  name = "aacgain-1.9";
+  srcs = [
+    (fetchgit {
+      url = "https://github.com/mecke/aacgain.git";
+      rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8";
+      sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4";
+    })
+    mp3gain.src
+    mp4v2.src
+    faad2.src
+  ];
+
+  buildInputs = [ unzip m4 libtool automake autoconf ];
+
+  setSourceRoot = "sourceRoot=`pwd`";
+
+  postUnpack = ''
+    cd $sourceRoot
+    # mp3gain does not unzip to its own directory, so move files accordingly.
+    mkdir mp3gain
+    find . -type f -maxdepth 1 -exec mv {} mp3gain/ \;
+    mv mpglibDBL mp3gain/
+
+    mv aacgain-* aacgain
+    mv faad2-* faad2
+    mv mp4v2-* mp4v2
+  '';
+
+  patchPhase = ''
+    cd $sourceRoot
+    patch -p2 -N < aacgain/linux/mp3gain.patch
+  '';
+
+  configurePhase = ''
+    cd $sourceRoot/mp4v2
+    ./configure
+
+    cd $sourceRoot/faad2
+    ./configure
+  '';
+
+  buildPhase = ''
+    cd $sourceRoot/mp4v2
+    make libmp4v2.la
+
+    cd $sourceRoot/faad2/libfaad
+    make
+
+    cd $sourceRoot/aacgain/linux
+    sh prepare.sh
+    mkdir build
+    cd build
+    ../../../configure
+    make
+  '';
+
+  installPhase = ''
+    strip -s aacgain/aacgain
+    install -vD aacgain/aacgain "$out/bin/aacgain"
+  '';
+
+  meta = {
+    description = "ReplayGain for AAC files";
+    homepage = https://github.com/mecke/aacgain.git;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.robbinch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6a6ed3aeeb..093c9d15540 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10404,6 +10404,8 @@ let
 
   a2jmidid = callPackage ../applications/audio/a2jmidid { };
 
+  aacgain = callPackage ../applications/audio/aacgain { };
+
   aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { };
 
   aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { };

From 681cbedd4a522b0ef99f49cba4c5e53b3920d718 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Wed, 10 Jun 2015 17:43:34 +0800
Subject: [PATCH 127/144] aacgain: Use fetchFromGitHub instead of fetchgit.

---
 pkgs/applications/audio/aacgain/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
index 4cfc51970aa..3f1c67a2a61 100644
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchgit, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }:
+{ stdenv, fetchFromGitHub, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }:
 
 stdenv.mkDerivation {
   name = "aacgain-1.9";
   srcs = [
-    (fetchgit {
-      url = "https://github.com/mecke/aacgain.git";
+    (fetchFromGitHub {
+      owner = "mecke";
+      repo = "aacgain";
       rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8";
       sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4";
     })

From c07fb11cd2c7495780200f26ac798574ea0dd111 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Thu, 11 Jun 2015 00:12:46 +0800
Subject: [PATCH 128/144] aacgain: Use more up-to-date upstream repository.

Use more up-to-date upstream repostiory, which allows for a cleaner
build. It includes mp4v2 and faad, which will be built statically and
linked to the resulting binary.
---
 pkgs/applications/audio/aacgain/default.nix | 65 ++++++---------------
 1 file changed, 19 insertions(+), 46 deletions(-)

diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
index 3f1c67a2a61..69cc798ec0f 100644
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -1,61 +1,34 @@
-{ stdenv, fetchFromGitHub, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "aacgain-1.9";
-  srcs = [
-    (fetchFromGitHub {
-      owner = "mecke";
-      repo = "aacgain";
-      rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8";
-      sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4";
-    })
-    mp3gain.src
-    mp4v2.src
-    faad2.src
-  ];
-
-  buildInputs = [ unzip m4 libtool automake autoconf ];
-
-  setSourceRoot = "sourceRoot=`pwd`";
-
-  postUnpack = ''
-    cd $sourceRoot
-    # mp3gain does not unzip to its own directory, so move files accordingly.
-    mkdir mp3gain
-    find . -type f -maxdepth 1 -exec mv {} mp3gain/ \;
-    mv mpglibDBL mp3gain/
-
-    mv aacgain-* aacgain
-    mv faad2-* faad2
-    mv mp4v2-* mp4v2
-  '';
-
-  patchPhase = ''
-    cd $sourceRoot
-    patch -p2 -N < aacgain/linux/mp3gain.patch
-  '';
+  name = "aacgain-1.9.0";
+  src = fetchFromGitHub {
+    owner = "mulx";
+    repo = "aacgain";
+    rev = "7c29dccd878ade1301710959aeebe87a8f0828f5";
+    sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0";
+  };
 
   configurePhase = ''
-    cd $sourceRoot/mp4v2
+    cd mp4v2
     ./configure
 
-    cd $sourceRoot/faad2
+    cd ../faad2
+    ./configure
+
+    cd ..
     ./configure
   '';
 
   buildPhase = ''
-    cd $sourceRoot/mp4v2
+    cd mp4v2
     make libmp4v2.la
 
-    cd $sourceRoot/faad2/libfaad
-    make
+    cd ../faad2
+    make LDFLAGS=-static
 
-    cd $sourceRoot/aacgain/linux
-    sh prepare.sh
-    mkdir build
-    cd build
-    ../../../configure
-    make
+    cd ..
+    make   
   '';
 
   installPhase = ''
@@ -65,7 +38,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "ReplayGain for AAC files";
-    homepage = https://github.com/mecke/aacgain.git;
+    homepage = https://github.com/mulx/aacgain;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.robbinch ];

From da7748a6fc47e9efec56470ec01f9a137c14816f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 12 Jun 2015 13:02:06 +0200
Subject: [PATCH 129/144] nixos: set high fs.inotify.max_user_watches when
 xserver is enabled

---
 nixos/modules/services/x11/xserver.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 5198864ef6e..9fddc6a7210 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -469,6 +469,11 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
+    # The default max inotify watches is 8192.
+    # Nowadays most apps require a good number of inotify watches,
+    # the value below is used by default on several other distros.
+    boot.kernel.sysctl."fs.inotify.max_user_watches" = mkDefault 524288;
+
     systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
     systemd.services.display-manager =

From 4e9327e7acbab44f7b562cfe37daf894106c7286 Mon Sep 17 00:00:00 2001
From: Fabian Schmitthenner <development@schmitthenner.eu>
Date: Wed, 27 May 2015 17:57:26 +0000
Subject: [PATCH 130/144] add qt decrypt ssl traffic option

this introduces an argument to qt5 that if enabled allows
e.g. wireshark to show decrypted ssl traffic from a qt
application
---
 pkgs/development/libraries/qt-5/5.4/0100-ssl.patch | 13 +++++++++++++
 pkgs/development/libraries/qt-5/5.4/default.nix    |  3 ++-
 pkgs/development/libraries/qt-5/5.4/qtbase.nix     |  4 +++-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.4/0100-ssl.patch

diff --git a/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch
new file mode 100644
index 00000000000..4607274de74
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch
@@ -0,0 +1,13 @@
+diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+index 8833e3f..c56d381 100644
+--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp
++++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+@@ -47,7 +47,7 @@
+ ****************************************************************************/
+ 
+ //#define QSSLSOCKET_DEBUG
+-//#define QT_DECRYPT_SSL_TRAFFIC
++#define QT_DECRYPT_SSL_TRAFFIC
+ 
+ #include "qssl_p.h"
+ #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index c7e3a5c6123..139bba2db89 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -20,6 +20,7 @@
 
 # options
 , developerBuild ? false
+, decryptSslTraffic ? false
 }:
 
 with autonix;
@@ -61,7 +62,7 @@ let
         # GNOME dependencies are not used unless gtkStyle == true
         inherit (gnome) libgnomeui GConf gnome_vfs;
         bison = bison2; # error: too few arguments to function 'int yylex(...
-        inherit developerBuild srcs version;
+        inherit developerBuild srcs version decryptSslTraffic;
       };
 
       connectivity = callPackage
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 9e11dcdde86..7ef39a40860 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -20,6 +20,7 @@
 , buildTests ? false
 , developerBuild ? false
 , gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk
+, decryptSslTraffic ? false
 }:
 
 with stdenv.lib;
@@ -68,7 +69,8 @@ stdenv.mkDerivation {
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
       ./0013-xdg_config_dirs.patch
-    ];
+    ]
+    ++ (optional decryptSslTraffic ./0100-ssl.patch);
 
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"

From cbbefbdabb698b69357f4b758cfa525170f36e7a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 12 Jun 2015 13:08:14 +0200
Subject: [PATCH 131/144] mcelog -> 120

Fix potential NULL reference while parsing kernel efi files
---
 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 1706b8b87fa..63bab2ddd76 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 = "119"; in
+let version = "120"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "04zm8pa7r6awjgza8m048srvqcyayzdzw93vl8yrjzhh37p5m4gp";
+    sha256 = "1x50g0vrarcv31x4xszcxkpwklkq6mrv2xr1dxbbds26qz8jk11l";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From 192d20e8203dfac526add4da26c5076c60d82e23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 13:19:35 +0200
Subject: [PATCH 132/144] nix: Update to 1.9

---
 pkgs/tools/package-management/nix/default.nix | 12 +++++-------
 pkgs/tools/package-management/nix/xfs.patch   | 13 -------------
 pkgs/top-level/all-packages.nix               |  7 +++++--
 3 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/xfs.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2d105113133..d64e194e93e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
-, pkgconfig, boehmgc, perlPackages
+{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
+, pkgconfig, boehmgc, perlPackages, libsodium
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.8";
+  name = "nix-1.9";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-    sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c";
+    sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
   };
 
-  patches = [ ./xfs.patch ];
-
   nativeBuildInputs = [ perl pkgconfig ];
 
-  buildInputs = [ curl openssl sqlite ];
+  buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
 
   propagatedBuildInputs = [ boehmgc ];
 
diff --git a/pkgs/tools/package-management/nix/xfs.patch b/pkgs/tools/package-management/nix/xfs.patch
deleted file mode 100644
index 62ee9189ac1..00000000000
--- a/pkgs/tools/package-management/nix/xfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
-index 119e71a..422ec97 100644
---- a/src/libexpr/primops.cc
-+++ b/src/libexpr/primops.cc
-@@ -796,7 +796,7 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
-     for (auto & ent : entries) {
-         Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name));
-         if (ent.type == DT_UNKNOWN)
--            ent.type = getFileType(path);
-+            ent.type = getFileType(path + "/" + ent.name);
-         mkStringNoCopy(*ent_val,
-             ent.type == DT_REG ? "regular" :
-             ent.type == DT_DIR ? "directory" :
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 093c9d15540..22ff26e098e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14431,10 +14431,13 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
-  nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
+  nixUnstable = nixStable;
+  /*
+  nixUnstable = lowPrio (callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
-  };
+  });
+  */
 
   nixops = callPackage ../tools/package-management/nixops { };
 

From 07aa0f7f2165ac0dcab2441cc54940bc4a28e6ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 13:20:18 +0200
Subject: [PATCH 133/144] Revert "Use nixUnstable by default"

This reverts commit 64a41b7a90bd99f532847ef1b6ad3c3c6a2a7120.
---
 nixos/modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 42a9d46f1d6..6d25fef4576 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -63,7 +63,7 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.nixUnstable;
+        default = pkgs.nix;
         description = ''
           This option specifies the Nix package instance to use throughout the system.
         '';

From e982ac10177a67ea460928096edb43f65801ec70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 13:47:30 +0200
Subject: [PATCH 134/144] php: Update to 5.4.42, 5.6.10

CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 pkgs/development/interpreters/php/5.6.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index c10425631b3..c1ba35a9134 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.41";
-  sha = "0wl27f5z6vymajm2bzfp440zsp1jdxqn71avryiq1zw029db9i2v";
+  phpVersion = "5.4.42";
+  sha = "1yg03b6a88i7hg593m9zmmcm4kr59wdrhz9xk1frx9ps9gkb51b2";
   apacheHttpd = apacheHttpd;
 }
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
index 425f51ce5c6..e05f1ae10bd 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.9";
-  sha = "1fdwk8g509gxd5ad3y1s3j49hfkjdg8mgmzn9ki3pflbgdxvilqr";
+  phpVersion = "5.6.10";
+  sha = "0iccgibmbc659z6dh6c58l1b7vnqly7al37fbs0l3si4qy0rqmqa";
   apacheHttpd = apacheHttpd;
 }

From cb6daa036bf4de47fc73ad4a9ce218d845902a5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 13:50:37 +0200
Subject: [PATCH 135/144] sqlite: Update to 3.8.10.2

---
 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 ee8aec79af1..963566e27fa 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.10.1";
+  name = "sqlite-3.8.10.2";
 
   src = fetchurl {
-    url = "http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz";
-    sha1 = "86bfed5752783fb24c051f3efac5972ce11023f0";
+    url = "http://sqlite.org/2015/sqlite-autoconf-3081002.tar.gz";
+    sha1 = "c2f2c17d3dc4c4e179d35cc04e4420636d48a152";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];

From 74e4f6befab4514c6ee5bef7a4f3cfdae302ce68 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 12 Jun 2015 07:26:47 -0500
Subject: [PATCH 136/144] ipopt: build with openblas

---
 .../development/libraries/science/math/ipopt/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 4dd1ca46e95..89d2a242f96 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }:
+{ stdenv, fetchurl, unzip, openblas, gfortran }:
 
 stdenv.mkDerivation rec {
   version = "3.12.3";
@@ -13,9 +13,14 @@ stdenv.mkDerivation rec {
      export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO"
   '';
 
+  configureFlags = [
+    "--with-blas-lib=-lopenblas"
+    "--with-lapack-lib=-lopenblas"
+  ];
+
   nativeBuildInputs = [ unzip ];
 
-  buildInputs = [ gfortran blas liblapack ];
+  buildInputs = [ gfortran openblas ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69c46414c9e..937c404d74f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13883,7 +13883,7 @@ let
   suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
   suitesparse = suitesparse_4_4;
 
-  ipopt = callPackage ../development/libraries/science/math/ipopt { };
+  ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; };
 
   ### SCIENCE/MOLECULAR-DYNAMICS
 

From 4fb98dd6a760315f5219e15d599200271d890ef3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 12 Jun 2015 07:56:04 -0500
Subject: [PATCH 137/144] jags: build with openblas

---
 pkgs/applications/science/math/jags/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix
index 785c2460bb4..9d70d268691 100644
--- a/pkgs/applications/science/math/jags/default.nix
+++ b/pkgs/applications/science/math/jags/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gfortran, liblapack, blas}:
+{stdenv, fetchurl, gfortran, openblas}:
 
 stdenv.mkDerivation rec {
   name = "JAGS-3.4.0";
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
     sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib";
   };
-  buildInputs = [gfortran liblapack blas];
+  buildInputs = [gfortran openblas];
+  configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ];
 
   meta = {
     description = "Just Another Gibbs Sampler";

From c02dd4a7260f36901088830ae23d9723968ed066 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 12 Jun 2015 08:04:02 -0500
Subject: [PATCH 138/144] Update release notes about OpenBLAS

---
 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 cf67014a69d..fcbf6ed0add 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -153,6 +153,19 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    The OpenBLAS library has been updated to version
+    <literal>0.2.14</literal>. Support for the
+    <literal>x86_64-darwin</literal> platform was added. Dynamic
+    architecture detection was enabled; OpenBLAS now selects
+    microarchitecture-optimized routines at runtime, so optimal
+    performance is achieved without the need to rebuild OpenBLAS
+    locally. OpenBLAS has replaced ATLAS in most packages which use an
+    optimized BLAS or LAPACK implementation.
+ </para>
+</listitem>
+
 </itemizedlist>
 </para>
 

From 32ed6018831954a5c2345ddff7de640521c620a5 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Fri, 29 May 2015 12:46:49 +0200
Subject: [PATCH 139/144] init ladspaPlugins-git at git-2015-03-04

---
 .../applications/audio/ladspa-plugins/git.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/audio/ladspa-plugins/git.nix

diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix
new file mode 100644
index 00000000000..e9ab932a88e
--- /dev/null
+++ b/pkgs/applications/audio/ladspa-plugins/git.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, automake, autoreconfHook, fftw, gettext, ladspaH, libxml2, pkgconfig, perl, perlPackages }:
+
+stdenv.mkDerivation {
+  name = "swh-plugins-git-2015-03-04";
+
+  src = fetchgit {
+    url = https://github.com/swh/ladspa.git;
+    rev = "4b8437e8037cace3d5bf8ce6d1d1da0182aba686";
+    sha256 = "7d9aa13a064903b330bd52e35c1f810f1c8a253ea5eb4e5a3a69a051af03150e";
+  };
+
+  buildInputs = [ automake autoreconfHook fftw gettext ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
+
+  patchPhase = ''
+    patchShebangs .
+    patchShebangs ./metadata/
+    cp ${automake}/share/automake-*/mkinstalldirs .
+  '';
+
+  configurePhase = ''
+    autoreconf -i
+    ./configure --prefix=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://plugin.org.uk/;
+    description = "LADSPA format audio 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 b55478313a5..a1bec97f066 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11622,6 +11622,10 @@ let
     fftw = fftwSinglePrec;
   };
 
+  ladspaPlugins-git = callPackage ../applications/audio/ladspa-plugins/git.nix {
+    fftw = fftwSinglePrec;
+  };
+
   ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
 
   caps = callPackage ../applications/audio/caps { };

From 90f0bb83c3e77cc9548e68845df251f2c7015290 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 12 Jun 2015 17:06:32 +0200
Subject: [PATCH 140/144] dotnet: Add FSharpDataSQLProvider, FsPickler and
 Suave

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 852856d4c69..3aca091f0df 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -14,6 +14,8 @@
 
 let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
+  # BINARY PACKAGES
+
   Autofac = fetchNuGet {
     baseName = "Autofac";
     version = "3.5.2";
@@ -44,6 +46,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net40/*" ];
   };
 
+  FSharpDataSQLProvider = fetchNuGet {
+    baseName = "SQLProvider";
+    version = "0.0.9-alpha";
+    sha256 = "1wmgr5ca9hh6a7f0s8yc87n6arn7bq6nwc8n4crbbdil4r0bw46w";
+    outputFiles = [ "lib/net40/*" ];
+  };
+
   FsCheck = fetchNuGet {
     baseName = "FsCheck";
     version = "1.0.4";
@@ -58,6 +67,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net45/*" ];
   };
 
+  FsPickler = fetchNuGet {
+    baseName = "FsPickler";
+    version = "1.2.9";
+    sha256 = "12fgcj7pvffsj1s1kaz15j22i1n98dy5mf4z84555xdf7mw7dpm4";
+    outputFiles = [ "lib/net45/*" ];
+  };
+
   FsUnit = fetchNuGet {
     baseName = "FsUnit";
     version = "1.3.0.1";
@@ -87,6 +103,15 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ];
   };
 
+  Suave = fetchNuGet {
+    baseName = "Suave";
+    version = "0.29.0";
+    sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln";
+    outputFiles = [ "lib/net40/*" ];
+  };
+
+  # SOURCE PACKAGES
+
   ExtCore = buildDotnetPackage rec {
     baseName = "ExtCore";
     version = "0.8.46";
@@ -492,4 +517,5 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       platforms = with stdenv.lib.platforms; linux;
     };
   };
+
 }; in self

From 5c8a993a422bd649a1493917a062ccb077ea583f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 12 Jun 2015 17:13:21 +0200
Subject: [PATCH 141/144] fetchnuget: run fixupPhase to honor
 propagatedBuildInputs

---
 pkgs/build-support/fetchnuget/default.nix | 2 +-
 pkgs/top-level/dotnet-packages.nix        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix
index 803db27c9d5..95bb7b7cd8d 100644
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/pkgs/build-support/fetchnuget/default.nix
@@ -18,7 +18,7 @@ attrs @
 
     buildInputs = [ unzip ];
 
-    phases = [ "unpackPhase" "installPhase" ];
+    dontBuild = true;
 
     preInstall = ''
       function traverseRename () {
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 3aca091f0df..e08af379da8 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -106,6 +106,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
   Suave = fetchNuGet {
     baseName = "Suave";
     version = "0.29.0";
+    propagatedBuildInputs = [ FsPickler ];
     sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln";
     outputFiles = [ "lib/net40/*" ];
   };

From fd187980c71dc44a134f4ebcbb0f9f9e93c47870 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 12 Jun 2015 16:18:42 +0000
Subject: [PATCH 142/144] Put dysnomia in system environment if Disnix is
 enabled

---
 nixos/modules/services/misc/disnix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 48bb9e4293e..c439efe9f8e 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -67,7 +67,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    environment.systemPackages = [ pkgs.disnix pkgs.dysnomia ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     services.dbus.enable = true;
     services.dbus.packages = [ pkgs.disnix ];

From 093b2de396c7f6a6ea1fab1dc5f3b527bf672bc9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 12 Jun 2015 16:19:26 +0000
Subject: [PATCH 143/144] dysnomia: fix compatibility with mariadb derivation

---
 pkgs/tools/package-management/disnix/dysnomia/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 021225c1b4d..0507ff45dc7 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   
   buildInputs = [ getopt ]
     ++ stdenv.lib.optional enableEjabberdDump ejabberd
-    ++ stdenv.lib.optional enableMySQLDatabase mysql.lib
+    ++ stdenv.lib.optional enableMySQLDatabase mysql.out
     ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
     ++ stdenv.lib.optional enableSubversionRepository subversion
     ++ stdenv.lib.optional enableMongoDatabase mongodb;

From 5ee75e236c0cf758ed6b1188e10448acfcbc93b4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 12 Jun 2015 15:56:06 -0400
Subject: [PATCH 144/144] apache-kafka: Enable overriding the kafka package

---
 nixos/modules/services/misc/apache-kafka.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 90555ebc468..5314a096fe0 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -116,11 +116,19 @@ in {
       ];
     };
 
+    package = mkOption {
+      description = "The kafka package to use";
+
+      default = pkgs.apacheKafka;
+
+      type = types.package;
+    };
+
   };
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [pkgs.apacheKafka];
+    environment.systemPackages = [cfg.package];
 
     users.extraUsers = singleton {
       name = "apache-kafka";
@@ -136,7 +144,7 @@ in {
       serviceConfig = {
         ExecStart = ''
           ${pkgs.jre}/bin/java \
-            -cp "${pkgs.apacheKafka}/libs/*:${configDir}" \
+            -cp "${cfg.package}/libs/*:${configDir}" \
             ${toString cfg.jvmOptions} \
             kafka.Kafka \
             ${configDir}/server.properties