From 4021d4d5ee7338ddaff4a1c5c2e41c85da206f18 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 8 Aug 2017 17:19:02 +0000
Subject: [PATCH 01/48] Make version a parameter in GHC HEAD derivation

If you want to override the source but the major version changes (ie 8.1
-> 8.3) then you also have to modify the version. Otherwise the build
will fail with difficult to understand errors, making version a
parameter makes it easy to override.
---
 pkgs/development/compilers/ghc/head.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 5a505f39b1a..6573c60ac3a 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -5,6 +5,7 @@
   # If enabled GHC will be build with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
 , enableIntegerSimple ? false, gmp
+, version ? "8.1.20170106"
 }:
 
 let
@@ -12,7 +13,6 @@ let
 
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
-  version = "8.1.20170106";
   rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
   commonPreConfigure =  ''

From cf7b262485cc81feec53966fa8846d241bb78bca Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 8 Aug 2017 17:21:22 +0000
Subject: [PATCH 02/48] Boot ghc HEAD with ghc-8.0.2

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 81a32e1219f..09e3835712f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -84,7 +84,7 @@ in rec {
       selfPkgs = packages.ghc821;
     };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
-      bootPkgs = packages.ghc7103;
+      bootPkgs = packages.ghc802;
       inherit (bootPkgs) alex happy;
       inherit buildPlatform targetPlatform;
       selfPkgs = packages.ghcHEAD;

From 770743bd91685befe4e3f1caee280d54c17aa641 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 8 Aug 2017 17:32:26 +0000
Subject: [PATCH 03/48] Bump ghc HEAD version ghc-8.3.20170808

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 6573c60ac3a..362b4895b7e 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -5,7 +5,7 @@
   # If enabled GHC will be build with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
 , enableIntegerSimple ? false, gmp
-, version ? "8.1.20170106"
+, version ? "8.3.20170808"
 }:
 
 let
@@ -13,7 +13,7 @@ let
 
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
-  rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
+  rev = "14457cf6a50f708eecece8f286f08687791d51f7";
 
   commonPreConfigure =  ''
     echo ${version} >VERSION
@@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec {
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0";
+    sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y";
   };
 
   postPatch = "patchShebangs .";

From 2adf36ab8c7903e100e6e7a0a6447934ec09b10e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 8 Aug 2017 23:22:24 +0200
Subject: [PATCH 04/48] gcc: fix clang build

---
 pkgs/development/compilers/gcc/5/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e95ef92c3f6..c9780077835 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -325,7 +325,13 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+  preConfigure =
+    # Not sure why this is causing problems, now that the stdenv
+    # exports CPP=cpp the build fails with strange errors on darwin.
+    # https://github.com/NixOS/nixpkgs/issues/27889
+    stdenv.lib.optionalString stdenv.cc.isClang ''
+    unset CPP
+  '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

From bc5160eacde131d83c3a25827963a676d1391abe Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 9 Aug 2017 08:41:48 +0200
Subject: [PATCH 05/48] gdb: fix clang build

---
 pkgs/development/tools/misc/gdb/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 02ff52155b1..410fd36ef25 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -66,6 +66,13 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (!pythonSupport) "--without-python"
     ++ stdenv.lib.optional multitarget "--enable-targets=all";
 
+  preConfigure =
+    # Not sure why this is causing problems, now that the stdenv
+    # exports CPP=cpp the build fails with strange errors on darwin.
+    stdenv.lib.optionalString stdenv.cc.isClang ''
+      unset CPP
+    '';
+
   postInstall =
     '' # Remove Info files already provided by Binutils and other packages.
        rm -v $out/share/info/bfd.info

From 1db52734ad19aeea18f30f54a6f543f5b0cd1764 Mon Sep 17 00:00:00 2001
From: Marius Metzger <mariusmetzger@versanet.de>
Date: Wed, 9 Aug 2017 12:41:15 +0200
Subject: [PATCH 06/48] check_ssl_cert: init at 1.51.0 (#28069)

---
 .../nagios/plugins/check_ssl_cert.nix         | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
new file mode 100644
index 00000000000..935b1092e66
--- /dev/null
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -0,0 +1,33 @@
+{ pkgs, openssl }:
+#with import <nixpkgs> {};
+with pkgs;
+
+stdenv.mkDerivation rec {
+  name = "check_ssl_cert-${version}";
+  version = "1.51.0";
+
+  src = fetchgit {
+    url = https://github.com/matteocorti/check_ssl_cert;
+    rev = "4e31a82008a48cd6efb82914e0bb1e136b339a31"; # v1.51.0
+    sha256 = "1x1lcxxgzvjznn1iyla4hmc02c0vqdbzvd8xj61niknm02q07lcf";
+  };
+
+  buildInputs = [ makeWrapper file ];
+  #nativeBuildInputs = [ makeWrapper ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/man
+    cp check_ssl_cert $out/bin
+    cp check_ssl_cert.1 $out/man1
+    wrapProgram $out/bin/check_ssl_cert \
+      --prefix PATH : "${openssl}/bin:${file}/bin"
+  '';
+
+  meta = {
+    description = "A Nagios plugin to check the CA and validity of an X.509 certificate";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9571367340..1cd996fca06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11360,6 +11360,8 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
+  
+  checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 

From cbca75b8c94e2f99b6505012a1658c40162839e1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 12:50:58 +0200
Subject: [PATCH 07/48] Revert "check_ssl_cert: init at 1.51.0 (#28069)"

This reverts commit 1db52734ad19aeea18f30f54a6f543f5b0cd1764.
---
 .../nagios/plugins/check_ssl_cert.nix         | 33 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
deleted file mode 100644
index 935b1092e66..00000000000
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ pkgs, openssl }:
-#with import <nixpkgs> {};
-with pkgs;
-
-stdenv.mkDerivation rec {
-  name = "check_ssl_cert-${version}";
-  version = "1.51.0";
-
-  src = fetchgit {
-    url = https://github.com/matteocorti/check_ssl_cert;
-    rev = "4e31a82008a48cd6efb82914e0bb1e136b339a31"; # v1.51.0
-    sha256 = "1x1lcxxgzvjznn1iyla4hmc02c0vqdbzvd8xj61niknm02q07lcf";
-  };
-
-  buildInputs = [ makeWrapper file ];
-  #nativeBuildInputs = [ makeWrapper ];
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/man
-    cp check_ssl_cert $out/bin
-    cp check_ssl_cert.1 $out/man1
-    wrapProgram $out/bin/check_ssl_cert \
-      --prefix PATH : "${openssl}/bin:${file}/bin"
-  '';
-
-  meta = {
-    description = "A Nagios plugin to check the CA and validity of an X.509 certificate";
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cd996fca06..e9571367340 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11360,8 +11360,6 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
-  
-  checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 

From fd6e51d5505c128c2051ddcbcb395d12c0d94299 Mon Sep 17 00:00:00 2001
From: Marius Metzger <mariusmetzger@versanet.de>
Date: Wed, 9 Aug 2017 12:41:15 +0200
Subject: [PATCH 08/48] check_ssl_cert: init at 1.51.0 (#28069)

---
 .../nagios/plugins/check_ssl_cert.nix         | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
new file mode 100644
index 00000000000..4989a01c9e3
--- /dev/null
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl }:
+
+stdenv.mkDerivation rec {
+  name = "check_ssl_cert-${version}";
+  version = "1.51.0";
+
+  src = fetchFromGitHub {
+    owner = "matteocorti";
+    repo = "check_ssl_cert";
+    rev = "v${version}";
+    sha256 = "07g4dhwp1plzmlqazapn0s0hysmf3kk0pa2x0wns482xm1v1mr05";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  makeFlags = [ "DESTDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/check_ssl_cert \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Nagios plugin to check the CA and validity of an X.509 certificate";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9571367340..1cd996fca06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11360,6 +11360,8 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
+  
+  checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 

From 9c5f6f9528817a633a355c95f62cf6307f2b5a4c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:18:44 +0800
Subject: [PATCH 09/48] pythonPackages.zope_testrunner: Remove subunit
 dependency, no longer necessary since latest release

---
 pkgs/development/python-modules/zope_testrunner/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index 6d4d8be4856..7f2af64d915 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -6,7 +6,6 @@
 , zope_exceptions
 , zope_testing
 , six
-, subunit
 }:
 
 
@@ -21,7 +20,7 @@ buildPythonPackage rec {
     extension = "zip";
   };
 
-  propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!isPy3k) subunit;
+  propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
 
   meta = with stdenv.lib; {
     description = "A flexible test runner with layer support";

From 45addeacb0385b6c466e17cc5eb1d876ff289714 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:19:26 +0800
Subject: [PATCH 10/48] pythonPackages.aiohttp-cors: Remove zodb3 dependency

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb5e5459450..7225f65e11b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -356,7 +356,7 @@ in {
     # Requires network access
     doCheck = false;
 
-    propagatedBuildInputs = with self; [ zodb3 aiohttp ]
+    propagatedBuildInputs = with self; [ aiohttp ]
       ++ optional (pythonOlder "3.5") typing;
 
     meta = {

From a0c1167e0eab15de69a9b209cb07201b1d92b64d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:20:11 +0800
Subject: [PATCH 11/48] pythonPackages.zope_browserresource: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7225f65e11b..c9131681e13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25017,24 +25017,6 @@ EOF
     };
   };
 
-  zope_browserresource = buildPythonPackage rec {
-    name = "zope.browserresource-4.0.1";
-
-    propagatedBuildInputs = with self; [
-      zope_component zope_configuration zope_contenttype zope_i18n
-      zope_interface zope_location zope_publisher zope_schema zope_traversing
-    ];
-
-    # all tests fail
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.browserresource/zope.browserresource-4.0.1.zip";
-      sha256 = "d580184562e7098950ae377b5b37fbb88becdaa2256ac2a6760b69a3e86a99b2";
-    };
-  };
-
-
 
   zope_component = buildPythonPackage rec {
     name = "zope.component-4.2.1";

From 88648d42f4d6203d65ba3f85b2c65c9956ae764c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:20:36 +0800
Subject: [PATCH 12/48] pythonPackages.zope_container: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9131681e13..95a3b371943 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25060,29 +25060,6 @@ EOF
   };
 
 
-  zope_container = buildPythonPackage rec {
-    name = "zope.container-4.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.container/${name}.tar.gz";
-      sha256 = "5c04e61b52fd04d8b7103476532f557c2278c86281aae30d44f88a5fbe888940";
-    };
-
-    # a test is failing
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [
-      zodb3 zope_broken zope_dottedname zope_publisher
-      zope_filerepresentation zope_lifecycleevent zope_size
-      zope_traversing
-    ];
-
-    meta = {
-        maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   zope_contenttype = buildPythonPackage rec {
     name = "zope.contenttype-4.0.1";
 

From 30291227f2411abaca097773eedb49b8f259e297 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:21:11 +0800
Subject: [PATCH 13/48] pythonPackages.almir: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95a3b371943..376b5dca389 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -411,88 +411,6 @@ in {
     };
   };
 
-  almir = let
-    sqlalchemy_0_8 = buildPythonPackage rec {
-      name = "SQLAlchemy-0.8.7";
-      disabled = isPy34 || isPy35;
-#       doCheck = !isPyPy;
-
-      src = pkgs.fetchurl {
-        url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
-        sha256 = "9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc";
-      };
-
-      preConfigure = optionalString isPy3k ''
-        python3 sa2to3.py --no-diffs -w lib test examples
-      '';
-
-      buildInputs = with self; [ nose mock ]
-        ++ stdenv.lib.optional doCheck pysqlite;
-
-      checkPhase = ''
-        ${python.executable} sqla_nose.py
-      '';
-
-      doCheck = false;
-
-      meta = {
-        homepage = http://www.sqlalchemy.org/;
-        description = "A Python SQL toolkit and Object Relational Mapper";
-      };
-    };
-  in buildPythonPackage rec {
-    name = "almir-0.1.8";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/almir/${name}.zip";
-      sha256 = "5dc0b8a5071f3ff46cd2d92608f567ba446e4c733c063b17d89703caeb9868fe";
-    };
-
-    buildInputs = with self; [
-      pkgs.which
-      self.coverage
-      self.mock
-      self.tissue
-      self.unittest2
-      self.webtest
-    ];
-
-    propagatedBuildInputs = with self; [
-      pkgs.makeWrapper
-      pkgs.bacula
-      self.colander
-      self.deform
-      self.deform_bootstrap
-      self.docutils
-      self.nose
-      self.mysql_connector_repackaged
-      self.pg8000
-      self.pyramid
-      self.pyramid_beaker
-      self.pyramid_exclog
-      self.pyramid_jinja2
-      self.pyramid_tm
-      self.pytz
-      sqlalchemy_0_8
-      self.transaction
-      self.waitress
-      self.webhelpers
-      self.psycopg2
-      (self.zope_sqlalchemy.override rec {propagatedBuildInputs = with self; [ sqlalchemy_0_8 transaction ];})
-    ];
-
-    postInstall = ''
-      ln -s ${pkgs.bacula}/bin/bconsole $out/bin
-    '';
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-      platforms = platforms.all;
-      # Two versions of sqlalchemy in closure
-      broken = true;
-    };
-  };
-
 
   alot = buildPythonPackage rec {
     rev = "0.5.1";

From 313ea3827b52aa030af19528607e074735a65e16 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:21:46 +0800
Subject: [PATCH 14/48] pythonPackages.zope_sqlalchemy: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 376b5dca389..adf9a6d6425 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25224,26 +25224,6 @@ EOF
   };
 
 
-  zope_sqlalchemy = buildPythonPackage rec {
-    name = "zope.sqlalchemy-0.7.6";
-
-    doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.sqlalchemy/${name}.zip";
-      sha256 = "0vxhpdvzihsmg63aralmc7hx62lzrsnlxvskvlcr4mkwzwb22haj";
-    };
-
-    buildInputs = with self; [ zope_testing zope_interface ];
-    propagatedBuildInputs = with self; [ sqlalchemy transaction ];
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.all;
-    };
-  };
-
-
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
     version = "4.6.1";

From 64259cdd7c16d14bb1620963b8ec1d0ddbfd8c7e Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:22:14 +0800
Subject: [PATCH 15/48] pythonPackages.zope_traversing: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index adf9a6d6425..b80b026726d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25248,24 +25248,6 @@ EOF
 
   zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };
 
-  zope_traversing = buildPythonPackage rec {
-    name = "zope.traversing-4.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.traversing/${name}.zip";
-      sha256 = "79d38b92ec1d9a2467966ee954b792d83ac66f22e45e928113d4b5dc1f5e74eb";
-    };
-
-    propagatedBuildInputs = with self; [ zope_location zope_security zope_publisher transaction zope_tales ];
-
-    # circular dependency on zope_browserresource
-    doCheck = false;
-
-    meta = {
-        maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
 
   zope_interface = callPackage ../development/python-modules/zope_interface { };
 

From 5583e3a2bd6be3b03c38d5ea729f64b569fa8f42 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:22:32 +0800
Subject: [PATCH 16/48] pythonPackages.zope_publisher: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b80b026726d..a2f6877d8a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25150,24 +25150,6 @@ EOF
   };
 
 
-  zope_publisher = buildPythonPackage rec {
-    name = "zope.publisher-3.12.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.publisher/${name}.tar.gz";
-      sha256 = "d994d8eddfba504841492115032a9a7d86b1713ebc96d0ca16fbc6ee93168ba4";
-    };
-
-    propagatedBuildInputs = with self; [
-      zope_browser zope_contenttype zope_i18n zope_security
-    ];
-
-    meta = {
-        maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   zope_schema = buildPythonPackage rec {
     name = "zope.schema-4.4.2";
 

From fab8f7ac4b6cd784cfa384ea2e3547b0f7807557 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:22:49 +0800
Subject: [PATCH 17/48] pythonPackages.zope_browser: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a2f6877d8a2..b3bc1588aa2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24920,22 +24920,6 @@ EOF
   };
 
 
-  zope_browser = buildPythonPackage rec {
-    name = "zope.browser-2.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.browser/${name}.zip";
-      sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy";
-    };
-
-    propagatedBuildInputs = with self; [ zope_interface ];
-
-    meta = {
-        maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   zope_component = buildPythonPackage rec {
     name = "zope.component-4.2.1";
 

From c06cfd0404ac57e796215157672256e15d0b662c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:23:27 +0800
Subject: [PATCH 18/48] pythonPackages.zope_security: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3bc1588aa2..e732a4d7150 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25155,25 +25155,6 @@ EOF
   };
 
 
-  zope_security = buildPythonPackage rec {
-    name = "zope.security-4.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.security/${name}.tar.gz";
-      sha256 = "8da30b03d5491464d59397e03b88192f31f587325ee6c6eb1ca596a1e487e2ec";
-    };
-
-    propagatedBuildInputs = with self; [
-      zope_component zope_configuration zope_i18nmessageid zope_schema
-      zope_proxy zope_testrunner
-    ];
-
-    meta = {
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   zope_size = buildPythonPackage rec {
     name = "zope.size-3.5.0";
 

From ced137d980e7180afc98d4b436d4d0eb76ba9035 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:24:13 +0800
Subject: [PATCH 19/48] pythonPackages.zodb3: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e732a4d7150..411441f9488 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24809,26 +24809,6 @@ EOF
     };
   };
 
-  zodb3 = buildPythonPackage rec {
-    name = "zodb3-${version}";
-    version = "3.11.0";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZODB3/ZODB3-${version}.tar.gz";
-      sha256 = "b5767028e732c619f45c27189dd001e14ec155d7984807991fce751b35b4fcb0";
-    };
-
-    propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ];
-
-    meta = {
-      description = "An object-oriented database for Python";
-      homepage = http://pypi.python.org/pypi/ZODB3;
-      license = licenses.zpl20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
   zodb = buildPythonPackage rec {
     name = "zodb-${version}";
     disabled = isPyPy;

From 80ef4d6fc7c330d4f5a694a691abde13ac6e8dab Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:24:52 +0800
Subject: [PATCH 20/48] pythonPackages.zope_tales: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 411441f9488..b5966262d10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8830,18 +8830,6 @@ in {
 
   };
 
-  zope_tales = buildPythonPackage rec {
-    name = "zope.tales-4.0.2";
-
-    propagatedBuildInputs = with self; [ zope_interface six zope_testrunner ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.tales/${name}.zip";
-      sha256 = "c0485f09c3f23c7a0ceddabcb02d4a40ebecf8f8f36c87fa9a02c415f96c969e";
-    };
-  };
-
-
   zope_deprecation = buildPythonPackage rec {
     name = "zope.deprecation-4.1.2";
 

From 48b305ca6dcc9597104de5a2b2c41cf3463b2ce5 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:25:23 +0800
Subject: [PATCH 21/48] pythonPackages.pyramid_zodbconn: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5966262d10..30fce14fd28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8496,26 +8496,6 @@ in {
     };
   };
 
-  pyramid_zodbconn = buildPythonPackage rec {
-    name = "pyramid_zodbconn-0.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid_zodbconn/${name}.tar.gz";
-      sha256 = "56cfdb6b13dc87b1c51c7abc1557c63960d6b858e14a2d4c9693c3f7877f5f63";
-    };
-
-    # should be fixed in next release
-    doCheck = false;
-
-    buildInputs = with self; [ mock ];
-    propagatedBuildInputs = with self; [ pyramid zodb zodburi ZEO ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
-
   pyramid_mailer = buildPythonPackage rec {
     name = "pyramid_mailer-0.13";
 

From 953484b4e30407ecee589d40d6403cdf800c6114 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:26:04 +0800
Subject: [PATCH 22/48] pythonPackages.zodburi: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30fce14fd28..534f3e5eaae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8549,22 +8549,6 @@ in {
     };
   };
 
-
-  zodburi = buildPythonPackage rec {
-    name = "zodburi-2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zodburi/${name}.tar.gz";
-      sha256 = "c04b9beca032bb7b968a3464417596ba4607a927c5e65929860962ddba1cccc0";
-    };
-
-    buildInputs = with self; [ zodb mock ZEO ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
   ZEO = self.buildPythonPackage rec {
     name = "ZEO-4.0.0";
 

From 660b225903c975dc94b0b4ef8eb3b596f316517b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:26:29 +0800
Subject: [PATCH 23/48] pythonPackages.ZEO: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 534f3e5eaae..95becbb10c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8549,21 +8549,6 @@ in {
     };
   };
 
-  ZEO = self.buildPythonPackage rec {
-    name = "ZEO-4.0.0";
-
-    propagatedBuildInputs = with self; [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZEO/${name}.tar.gz";
-      sha256 = "63555b6d2b5f98d215c4b5fdce004fb0475daa6efc8b70f39c77d646c12d7e51";
-    };
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/ZEO;
-    };
-  };
-
   random2 = self.buildPythonPackage rec {
     name = "random2-1.0.1";
 

From b7b66c31f288fd88e529a2b0939d4874489ed97d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:27:00 +0800
Subject: [PATCH 24/48] pythonPackages.pyramid_mailer: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95becbb10c1..10bf51d535a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8496,21 +8496,6 @@ in {
     };
   };
 
-  pyramid_mailer = buildPythonPackage rec {
-    name = "pyramid_mailer-0.13";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid_mailer/${name}.tar.gz";
-      sha256 = "4debfad05ee65a05ba6f43e2af913e6e30db75ba42254e4aa0291500c4caa1fc";
-    };
-
-    buildInputs = with self; [ pyramid transaction ];
-    propagatedBuildInputs = with self; [ repoze_sendmail ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
 
   pyrtlsdr = buildPythonPackage rec {
     name = "pyrtlsdr-0.2.0";

From bc6d9b0d466f4e35fc01847808c9716d66b1c2ad Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:27:28 +0800
Subject: [PATCH 25/48] pythonPackages.repoze_sendmail: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10bf51d535a..a84b17ca30e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8518,22 +8518,6 @@ in {
     };
   };
 
-
-  repoze_sendmail = buildPythonPackage rec {
-    name = "repoze.sendmail-4.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/repoze.sendmail/${name}.tar.gz";
-      sha256 = "51813730adc24728d5ce2609038f7bb81aa1632539d7a79045ef4aa6942eaba2";
-    };
-
-    buildInputs = with self; [ transaction ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
   random2 = self.buildPythonPackage rec {
     name = "random2-1.0.1";
 

From 6d82bac4243231338ff01c88886d3b012a6b041e Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:28:02 +0800
Subject: [PATCH 26/48] pythonPackages.hypatia: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a84b17ca30e..136315cac86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8383,21 +8383,6 @@ in {
     };
   };
 
-  hypatia = buildPythonPackage rec {
-    name = "hypatia-0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hypatia/${name}.tar.gz";
-      sha256 = "fb4d394eeac4b06ff2259cada6174aebbe77edd243ffd1deda320cb327f98bd9";
-    };
-
-    buildInputs = with self; [ zope_interface zodb ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
 
   zope_copy = buildPythonPackage rec {
     name = "zope.copy-4.0.2";

From 5167116ebabe1f6eaf341bd701fb23e4d512433f Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:28:46 +0800
Subject: [PATCH 27/48] pythonPackages.pyramid_tm: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 136315cac86..05125aa778a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8074,22 +8074,6 @@ in {
   };
 
 
-  pyramid_tm = buildPythonPackage rec {
-    name = "pyramid_tm-0.10";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid_tm/${name}.tar.gz";
-      sha256 = "99528c54accf2bd5860d10634fe8972e8375b2d0f50ee08f208ed0484ffafc1d";
-    };
-
-    propagatedBuildInputs = with self; [ transaction pyramid ];
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar matejc ];
-      platforms = platforms.all;
-    };
-  };
-
-
   pyramid_multiauth = buildPythonPackage rec {
     name = "pyramid_multiauth-${version}";
     version = "0.8.0";

From 490df6756228390846dbed82b359f50fba88149b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:33:54 +0800
Subject: [PATCH 28/48] pythonPackages.pecan: 1.0.3 -> 1.2.1

---
 .../python-modules/pecan/default.nix          | 40 +++++++++++++++++++
 .../pecan/python36_test_fix.patch             | 13 ++++++
 pkgs/top-level/python-packages.nix            | 22 +---------
 3 files changed, 54 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/pecan/default.nix
 create mode 100644 pkgs/development/python-modules/pecan/python36_test_fix.patch

diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
new file mode 100644
index 00000000000..b6e022640cb
--- /dev/null
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+# Python deps
+, singledispatch
+, logutils
+, webtest
+, Mako
+, genshi
+, Kajiki
+, sqlalchemy
+, gunicorn
+, jinja2
+, virtualenv
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pecan";
+  version = "1.2.1";
+
+  patches = [
+    ./python36_test_fix.patch
+  ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ikc32rd2hr8j2jxc0mllvdjvxydx3fwfp3z8sdxmkzdkixlb5cd";
+  };
+
+  propagatedBuildInputs = [ singledispatch logutils ];
+  buildInputs = [
+    webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Pecan";
+    homepage = "http://github.com/pecan/pecan";
+  };
+}
diff --git a/pkgs/development/python-modules/pecan/python36_test_fix.patch b/pkgs/development/python-modules/pecan/python36_test_fix.patch
new file mode 100644
index 00000000000..65e0733ab06
--- /dev/null
+++ b/pkgs/development/python-modules/pecan/python36_test_fix.patch
@@ -0,0 +1,13 @@
+diff --git a/pecan/tests/test_conf.py b/pecan/tests/test_conf.py
+index 0573d84..7c98e16 100644
+--- a/pecan/tests/test_conf.py
++++ b/pecan/tests/test_conf.py
+@@ -157,7 +157,7 @@ class TestConf(PecanTestCase):
+
+             try:
+                 configuration.conf_from_file(f.name)
+-            except (ValueError, SystemError) as e:
++            except (ValueError, SystemError, ImportError) as e:
+                 assert 'relative import' in str(e)
+             else:
+                 raise AssertionError(
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 05125aa778a..4f933b4364d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15332,27 +15332,7 @@ in {
     '';
   };
 
-  pecan = buildPythonPackage rec {
-    name = "pecan-${version}";
-    version = "1.0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pecan/${name}.tar.gz";
-      sha256 = "04abmybab8jzbwgmrr0fcpcfhcvvkdsv9q135dss02wyk9q9jv4d";
-    };
-
-    propagatedBuildInputs = with self; [
-      singledispatch logutils
-    ];
-    buildInputs = with self; [
-      webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
-    ];
-
-    meta = with stdenv.lib; {
-      description = "Pecan";
-      homepage = "http://github.com/pecan/pecan";
-    };
-  };
+  pecan = callPackage ../development/python-modules/pecan { };
 
   kaitaistruct = buildPythonPackage rec {
     name = "kaitaistruct-${version}";

From f06a5f4935bfdc80bc916b8fba2cc6c0434619ff Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:37:57 +0800
Subject: [PATCH 29/48] pythonPackages.transaction: 1.4.3 -> 2.1.2

---
 .../python-modules/transaction/default.nix    | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +-----------
 2 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/transaction/default.nix

diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix
new file mode 100644
index 00000000000..31f69971e52
--- /dev/null
+++ b/pkgs/development/python-modules/transaction/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, zope_interface
+, mock
+}:
+
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "transaction";
+  version = "2.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mab0r3grmgz9d97y8pynhg0r34v0am35vpxyvh7ff5sgmg3dg5r";
+  };
+
+  propagatedBuildInputs = [ zope_interface mock ];
+
+  meta = with stdenv.lib; {
+    description = "Transaction management";
+    homepage = http://pypi.python.org/pypi/transaction;
+    license = licenses.zpl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f933b4364d..f56561053ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23386,23 +23386,8 @@ in {
   };
 
 
-  transaction = buildPythonPackage rec {
-    name = "transaction-${version}";
-    version = "1.4.3";
+  transaction = callPackage ../development/python-modules/transaction { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/transaction/${name}.tar.gz";
-      sha256 = "1b2304a886a85ad014f73d93346c14350fc214ae22a4f565f42f6761cfb9ecc5";
-    };
-
-    propagatedBuildInputs = with self; [ zope_interface ];
-
-    meta = {
-      description = "Transaction management";
-      homepage = http://pypi.python.org/pypi/transaction;
-      license = licenses.zpl20;
-    };
-  };
 
   transmissionrpc = buildPythonPackage rec {
     name = "transmissionrpc-${version}";

From 3ba2300b2d24fd90e97468a605d50b5441c2770f Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 13:18:05 +0800
Subject: [PATCH 30/48] pythonPackages.zodb: 4.0.1 -> 5.2.4

---
 .../python-modules/zodb/default.nix           | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +----------
 2 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/zodb/default.nix

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
new file mode 100644
index 00000000000..a4855c23865
--- /dev/null
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, isPy3k
+, zope_testrunner
+, transaction
+, six
+, wheel
+, zope_interface
+, zodbpickle
+, zconfig
+, persistent
+, zc_lockfile
+, BTrees
+, manuel
+}:
+
+buildPythonPackage rec {
+    pname = "ZODB";
+    version = "5.2.4";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc";
+    };
+
+    propagatedBuildInputs = [
+      manuel
+      transaction
+      zope_testrunner
+      six
+      wheel
+      zope_interface
+      zodbpickle
+      zconfig
+      persistent
+      zc_lockfile
+      BTrees
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Zope Object Database: object database and persistence";
+      homepage = http://pypi.python.org/pypi/ZODB;
+      license = licenses.zpl21;
+      maintainers = with maintainers; [ goibhniu ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f56561053ce..94345955e96 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24649,33 +24649,7 @@ EOF
     };
   };
 
-  zodb = buildPythonPackage rec {
-    name = "zodb-${version}";
-    disabled = isPyPy;
-
-    version = "4.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZODB/ZODB-${version}.tar.gz";
-      sha256 = "c5d8ffcca37ab4d0a9bfffead6228d58c00cf1c78135abc98a8dbf05b8c8fb58";
-    };
-
-    propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ]
-      ++ optionals isPy3k [ zodbpickle ];
-
-    preCheck = if isPy3k then ''
-      # test failure on py3.4
-      rm src/ZODB/tests/testDB.py
-      rm src/ZODB/tests/test_fsdump.py # Error with Python 3.6
-    '' else "";
-
-    meta = {
-      description = "An object-oriented database for Python";
-      homepage = http://pypi.python.org/pypi/ZODB;
-      license = licenses.zpl20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
+  zodb = callPackage ../development/python-modules/zodb {};
 
   zodbpickle = callPackage ../development/python-modules/zodbpickle {};
 

From 9cd05278a69f0864d2229823e8e1a61f2fb7c7ba Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 13:19:39 +0800
Subject: [PATCH 31/48] vulnix: use zodb from pythonPackages

---
 pkgs/tools/security/vulnix/default.nix      | 10 ++---
 pkgs/tools/security/vulnix/requirements.nix | 47 ---------------------
 2 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/tools/security/vulnix/requirements.nix

diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index a058c2ee1a8..1beb2268fc6 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -1,10 +1,6 @@
-{ stdenv, pythonPackages, fetchurl, callPackage, nix, }:
+{ stdenv, pythonPackages, fetchurl, callPackage, nix }:
 
-let
-  external = callPackage ./requirements.nix {
-    inherit pythonPackages;
-  };
-in pythonPackages.buildPythonApplication rec{
+pythonPackages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "vulnix";
   version = "1.2.2";
@@ -28,7 +24,7 @@ in pythonPackages.buildPythonApplication rec{
     lxml
     pyyaml
     requests
-    external.zodb
+    zodb
   ]);
 
   checkPhase = "py.test";
diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
deleted file mode 100644
index 716b0aac51e..00000000000
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ pythonPackages, fetchurl, stdenv }:
-
-rec {
-  zodb = pythonPackages.buildPythonPackage {
-    name = "ZODB-5.2.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz";
-      sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x";
-    };
-    doCheck = false;
-    propagatedBuildInputs = [
-      transaction
-    ] ++ (with pythonPackages; [
-      six
-      wheel
-      zope_interface
-      zodbpickle
-      zconfig
-      persistent
-      zc_lockfile
-      BTrees
-    ]);
-
-    meta = with stdenv.lib; {
-      license = licenses.zpl21;
-      description = "Zope Object Database: object database and persistence";
-    };
-  };
-
-  transaction = pythonPackages.buildPythonPackage {
-    name = "transaction-2.0.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz";
-      sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f";
-    };
-    propagatedBuildInputs = with pythonPackages; [
-      zope_interface
-      six
-      wheel
-      mock
-    ];
-    meta = with stdenv.lib; {
-      license = licenses.zpl21;
-      description = "Transaction management for Python";
-    };
-  };
-}

From ed55bdb50103bfc22abff15389d7634c268d499c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 9 Aug 2017 14:22:26 +0000
Subject: [PATCH 32/48] lkl: 2017-06-27 -> 2017-08-09

Just bumping the package version to pick up a bugfix.

Fixes #28055
---
 pkgs/applications/virtualization/lkl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index d1bf5792a1b..b790a15e607 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "lkl-2017-06-27";
-  rev  = "0d91d102b046eec535a6d67df9829b80b24e9ce9";
+  name = "lkl-2017-08-09";
+  rev  = "083cdeece0577635d523244dcf0da86074e23e4e";
 
   outputs = [ "dev" "lib" "out" ];
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     owner  = "lkl";
     repo   = "linux";
-    sha256 = "1sc18fik2dm0hnsb5q4srvwbf6wgv27zlf3qa7x39g4vbj1jqgas";
+    sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a";
   };
 
   # Fix a /usr/bin/env reference in here that breaks sandboxed builds

From 10bcf0818f47b460d73c812ba50a2d50884bacd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 9 Aug 2017 16:36:32 +0200
Subject: [PATCH 33/48] knot-resolver: security 1.3.2 -> 1.3.3

https://lists.nic.cz/pipermail/knot-dns-users/2017-August/001184.html
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index d4210c31eb8..390bf43d4d6 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "846b7496cb6273b831fd52eca09078c0454b06a8a6b792e2125c7b6818246edb";
+    sha256 = "c679238bea5744de8a99f4402a61e9e58502bc42b40ecfa370e53679ed5d5b80";
   };
 
   outputs = [ "out" "dev" ];

From 30d76b8ccdf12412df7e00cb619c5fe12a09706a Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Sun, 6 Aug 2017 19:09:33 +0200
Subject: [PATCH 34/48] seafile-client: 5.0.7 -> 6.1.0

bump to qt5
---
 .../networking/seafile-client/default.nix     | 41 +++++++------------
 .../libraries/libsearpc/default.nix           |  2 +-
 pkgs/misc/seafile-shared/default.nix          |  6 +--
 pkgs/tools/networking/ccnet/default.nix       |  8 ++--
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 9c6aefd8ced..d930e24883e 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -1,39 +1,28 @@
-{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafile-shared, ccnet, makeWrapper}:
+{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools
+, seafile-shared, ccnet, makeWrapper }:
 
-stdenv.mkDerivation rec
-{
-  version = "5.0.7";
+stdenv.mkDerivation rec {
+  version = "6.1.0";
   name = "seafile-client-${version}";
 
-  src = fetchurl
-  {
+  src = fetchurl {
     url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
-    sha256 = "ae6975bc1adf45d09cf9f6332ceac7cf285f8191f6cf50c6291ed45f8cf4ffa5";
+    sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd";
   };
 
-  buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
-
-  builder = writeScript "${name}-builder.sh" ''
-    source $stdenv/setup
-
-    tar xvfz $src
-    cd seafile-client-*
-
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" .
-    make -j1
-
-    make install
+  nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
+  buildInputs = [ qtbase qttools seafile-shared ];
 
+  postInstall = ''
     wrapProgram $out/bin/seafile-applet \
       --suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}
-    '';
+  '';
 
-  meta =
-  {
-    homepage = https://github.com/haiwen/seafile-clients;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/haiwen/seafile-client;
     description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.calrama ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.calrama ];
   };
 }
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 12922d4612d..0457c0eb9c4 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec
 {
   version = "3.0.7";
-  seafileVersion = "5.0.7";
+  seafileVersion = "6.1.0";
   name = "libsearpc-${version}";
 
   src = fetchurl
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index fba78132bb5..6ce337855d9 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec
 {
-  version = "5.0.7";
+  version = "6.1.0";
   name = "seafile-shared-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
-    sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670";
+    sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6";
   };
 
   buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ];
   propagatedBuildInputs = [ ccnet curl ];
 
   preConfigure = ''
-  sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
+  sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh
   ./autogen.sh
   '';
 
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index bab8cbc8639..22237794f07 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec
 {
-  version = "5.0.7";
-  seafileVersion = "5.0.7";
+  version = "6.1.0";
+  seafileVersion = "6.1.0";
   name = "ccnet-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
-    sha256 = "1e1c670a85619b174328a15925a050c7a8b323fecd13434992332f5c15e05de1";
+    sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb";
   };
 
   buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ];
   propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];
 
   preConfigure = ''
-  sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
+  sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh
   ./autogen.sh
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cd996fca06..b349aa2a374 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15973,7 +15973,7 @@ with pkgs;
     inherit (gnome2) libart_lgpl;
   };
 
-  seafile-client = callPackage ../applications/networking/seafile-client { };
+  seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };
 
   seeks = callPackage ../tools/networking/p2p/seeks {
     protobuf = protobuf2_5;

From 1ed786292b438930b510aeb78f7678917be21aba Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 9 Aug 2017 19:38:59 +0200
Subject: [PATCH 35/48] searx: cleanup, remove python name prefix

---
 pkgs/servers/web-apps/searx/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
index 551f3a015a1..0feae7d7241 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ lib, pythonPackages, fetchFromGitHub }:
 
 pythonPackages.buildPythonApplication rec {
   name = "searx-${version}";
   version = "0.12.0";
+  namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "asciimoo";
@@ -25,10 +26,10 @@ pythonPackages.buildPythonApplication rec {
     pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/asciimoo/searx;
     description = "A privacy-respecting, hackable metasearch engine";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ matejc fpletz profpatsch ];
   };
- }
+}

From 2d5c1226c65192a2f8c503e23f6d9738f47be206 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 9 Aug 2017 19:51:25 +0200
Subject: [PATCH 36/48] cacert: really fix utf-8 certname blacklists

See #27576.
---
 pkgs/data/misc/cacert/default.nix             |  7 ++++---
 .../misc/cacert/fix-unicode-ca-names.patch    | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/data/misc/cacert/fix-unicode-ca-names.patch

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index fbf9af36f27..22cd14fe4ab 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, nss, python3
+{ stdenv, fetchurl, writeText, nss, python
 , blacklist ? []
 , includeEmail ? false
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = nss.src;
 
-  nativeBuildInputs = [ python3 ];
+  nativeBuildInputs = [ python ];
 
   configurePhase = ''
     ln -s nss/lib/ckfw/builtins/certdata.txt
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
     ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)}
     EOF
 
-    cp ${certdata2pem} certdata2pem.py
+    cat ${certdata2pem} > certdata2pem.py
+    patch -p1 < ${./fix-unicode-ca-names.patch}
     ${optionalString includeEmail ''
       # Disable CAs used for mail signing
       substituteInPlace certdata2pem.py --replace \[\'CKA_TRUST_EMAIL_PROTECTION\'\] '''
diff --git a/pkgs/data/misc/cacert/fix-unicode-ca-names.patch b/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
new file mode 100644
index 00000000000..07d3629196a
--- /dev/null
+++ b/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
@@ -0,0 +1,20 @@
+--- a/certdata2pem.py	2017-08-01 23:10:00.000000000 +0300
++++ b/certdata2pem.py	2017-08-01 23:08:21.131297636 +0300
+@@ -88,7 +88,7 @@
+ \# Read blacklist.
+ blacklist = []
+ if os.path.exists('blacklist.txt'):
+-    for line in open('blacklist.txt', 'r'):
++    for line in io.open('blacklist.txt', 'r', encoding='utf-8'):
+         line = line.strip()
+         if line.startswith('#') or len(line) == 0:
+             continue
+@@ -101,7 +101,7 @@
+     if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
+         continue
+     if obj['CKA_LABEL'] in blacklist:
+-        print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'])
++        print("Certificate %s blacklisted, ignoring." % unicode(obj['CKA_LABEL']).encode('utf-8'))
+     elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
+         trust[obj['CKA_LABEL']] = True
+     elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':

From 6225f1bf665c884f0a24f26b81f7c06355bf20cd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 9 Aug 2017 21:32:38 +0200
Subject: [PATCH 37/48] android-studio-preview: 3.0.0.8 -> 3.0.0.9

"Android Studio 3.0 Canary 9" -> "Android Studio 3.0 Beta 1"
---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 17f795ad68d..1a324b544dc 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.8"; # This is actually "Android Studio 3.0 Canary 9"
-    build = "171.4220116";
-    sha256Hash = "02aw1m65wb5cgjq1dxm86c5m6p8b41kgjcgsl5d0h93fb4clf64b";
+    version = "3.0.0.9"; # This is actually "Android Studio 3.0 Beta 1"
+    build = "171.4243858";
+    sha256Hash = "137jd4146srjigyzcfds8pf7b185q1qdkb0zp2yqc8g6bv4ccb22";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";

From d93c6367370f6acff76260308f4e7522a41c1c9e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 9 Aug 2017 21:37:29 +0200
Subject: [PATCH 38/48] Revert "gcc: fix clang build"

This fixes the gcc build but results in a gcc that doesn't generate
valid binaries.

gcc -o hello hello.c
./hello
Killed: 9

This reverts commit 2adf36ab8c7903e100e6e7a0a6447934ec09b10e.
---
 pkgs/development/compilers/gcc/5/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index c9780077835..e95ef92c3f6 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -325,13 +325,7 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure =
-    # Not sure why this is causing problems, now that the stdenv
-    # exports CPP=cpp the build fails with strange errors on darwin.
-    # https://github.com/NixOS/nixpkgs/issues/27889
-    stdenv.lib.optionalString stdenv.cc.isClang ''
-    unset CPP
-  '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

From 4872be756d46805e4bf0a47c96496ec39ce11184 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Fri, 4 Aug 2017 18:27:20 +0200
Subject: [PATCH 39/48] monit: 5.20.0 -> 5.23.0

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

diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 055a480f92a..71a4db63c84 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.20.0";
+  name = "monit-5.23.0";
 
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b";
+    sha256 = "04v7sp2vc1q6h8c5j8h4izffn9d97cdj0k64m4ml00lw6wxgwffx";
   };
 
   nativeBuildInputs = [ bison flex ];

From 08e450df469a4ca4079d115ad06584ebe3aa45ff Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Fri, 4 Aug 2017 18:35:44 +0200
Subject: [PATCH 40/48] movit: 1.2.0 -> 1.5.1

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

diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index fa765a6b107..a344b8fa92f 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "movit-${version}";
-  version = "1.2.0";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "http://movit.sesse.net/${name}.tar.gz";
-    sha256 = "0wyl5xl4pkw17pkxsdg8idqvsgm4fxapd0r4dw9wlxw250915nmf";
+    sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
   };
 
   outputs = [ "out" "dev" ];

From 37bf3c87824422b39558833e56a3c2e0b4251917 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 21:24:06 +0200
Subject: [PATCH 41/48] pythonPackages.distorm3: init at 3.3.4

---
 .../python-modules/distorm3/default.nix       | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/distorm3/default.nix

diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix
new file mode 100644
index 00000000000..db781af2a5d
--- /dev/null
+++ b/pkgs/development/python-modules/distorm3/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  pname = "distorm3";
+  version = "3.3.4";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/${pname}/${name}.zip";
+    sha256 = "1bh9xdiz9mkf9lfffimfn3hgd0mh60y7wl1micgkxzpl7hnxrpd4";
+  };
+
+  # no tests included
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Powerful Disassembler Library For x86/AMD64";
+    homepage = https://github.com/gdabah/distorm;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94345955e96..efb40cd6241 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -163,6 +163,8 @@ in {
 
   discordpy = callPackage ../development/python-modules/discordpy { };
 
+  distorm3 = callPackage ../development/python-modules/distorm3 { };
+
   h5py = callPackage ../development/python-modules/h5py {
     hdf5 = pkgs.hdf5;
   };

From 2e29774f4cd295d633adf3176ac89874a3ebce95 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Fri, 4 Aug 2017 19:02:05 +0200
Subject: [PATCH 42/48] volatility: 2.4 -> 2.6, refactor, update outdated
 homepage

---
 pkgs/tools/security/volatility/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index 6f1b7fe6ef4..b64124b3c54 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "volatility-2.4";
+  version = "2.6";
+  name = "volatility-${version}";
 
   src = fetchurl {
-    url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz";
-    sha256 = "1wffrkvj2lrkqhwamyix9fy05y6g6w8h1sz2iqlm6i6ag7yxykv8";
+    url = "http://downloads.volatilityfoundation.org/releases/${version}/${name}.zip";
+    sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv";
   };
 
   doCheck = false;
 
-  propagatedBuildInputs = [ pythonPackages.pycrypto ];
+  propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ];
 
   meta = with stdenv.lib; {
-    homepage = https://code.google.com/p/volatility;
+    homepage = http://www.volatilityfoundation.org/;
     description = "Advanced memory forensics framework";
     maintainers = with maintainers; [ bosu ];
     license = stdenv.lib.licenses.gpl2Plus;

From e9a2cfda7bfad1b58b5b316fda77c8be32ef283c Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Sat, 5 Aug 2017 00:09:05 +0200
Subject: [PATCH 43/48] vigra: 1.10.0 -> 1.11.1

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

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index c122928eddd..2910e8b7dbb 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -6,11 +6,11 @@ let
   # Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
 in stdenv.mkDerivation rec {
   name = "vigra-${version}";
-  version = "1.10.0";
+  version = "1.11.1";
 
   src = fetchurl {
     url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz";
-    sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0";
+    sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj";
   };
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";

From c7f14143c40dacbd4ca464a67d3da5538bf4e1ca Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 8 Aug 2017 20:37:00 -0700
Subject: [PATCH 44/48] miniupnpc: fix on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For some reason miniupnpc needs libtool for static linking. Probably not ideal
but it’s doing similar on other platforms as well (using ar).
---
 pkgs/tools/networking/miniupnpc/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix             | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 09459e0e283..2cca57121e9 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, which, cctools }:
 
 let
   generic = { version, sha256 }:
@@ -10,11 +10,14 @@ let
         inherit sha256;
       };
 
+      nativeBuildInputs = [] ++
+        stdenv.lib.optionals stdenv.isDarwin [ which cctools ];
+
       patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
 
       doCheck = !stdenv.isFreeBSD;
 
-      installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
+      makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
       meta = {
         homepage = http://miniupnp.free.fr/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97cd763bb22..2da885c140c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3192,7 +3192,8 @@ with pkgs;
 
   minissdpd = callPackage ../tools/networking/minissdpd { };
 
-  inherit (callPackage ../tools/networking/miniupnpc { })
+  inherit (callPackage ../tools/networking/miniupnpc
+            { inherit (darwin) cctools; })
     miniupnpc_1 miniupnpc_2;
   miniupnpc = miniupnpc_1;
 

From 7e5332c86870336706f51faca50ea5a1b3e9bad5 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 9 Aug 2017 22:07:01 +0000
Subject: [PATCH 45/48] tinc: allow the daemon to write to files in
 /etc/tinc/${network}/hosts

Follow up https://github.com/NixOS/nixpkgs/pull/27756: tinc daemon may also create new files in ```/etc/tinc/$network/hosts```
---
 nixos/modules/services/networking/tinc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index b70e44ff542..7410908b735 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -172,6 +172,7 @@ in
         };
         preStart = ''
           mkdir -p /etc/tinc/${network}/hosts
+          chown tinc.${network} /etc/tinc/${network}/hosts
 
           # Determine how we should generate our keys
           if type tinc >/dev/null 2>&1; then

From 767b2ae327ba3dcd0e245c074836893439e53148 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 7 Aug 2017 01:30:27 +0200
Subject: [PATCH 46/48] nixos/dnscrypt-proxy: default to random upstream
 resolver

---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 077aeca457e..ed658258c7f 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -82,14 +82,13 @@ in
       };
 
       resolverName = mkOption {
-        default = "dnscrypt.eu-nl";
+        default = "random";
+        example = "dnscrypt.eu-nl";
         type = types.nullOr types.str;
         description = ''
           The name of the DNSCrypt resolver to use, taken from
-          <filename>${resolverList}</filename>.  The default
-          resolver is located in Holland, supports DNS security
-          extensions, and <emphasis>claims</emphasis> to not
-          keep logs.
+          <filename>${resolverList}</filename>.  The default is to
+          pick a random non-logging resolver that supports DNSSEC.
         '';
       };
 

From 310563fab8669da2c62ec0b7db22f14141957922 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 10 Aug 2017 04:52:16 +0200
Subject: [PATCH 47/48] gist: 4.5.0 -> 4.6.1

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

diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index f0ab06066a5..11fcae85528 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "gist";
-  version = "4.5.0";
-  sha256 = "0k9bgjdmnr14whmjx6c8d5ak1dpazirj96hk5ds69rl5d9issw0l";
+  version = "4.6.1";
+  sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff";
 
   buildInputs = [ makeWrapper ];
 

From b224644795bc2601da244b0e708ca7754bac64d4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 Aug 2017 10:57:42 +0800
Subject: [PATCH 48/48] unetbootin: 613 -> 655

---
 pkgs/tools/cd-dvd/unetbootin/default.nix | 44 ++++++++++++++----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 14076a757f4..4d6ddd546db 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,31 +1,37 @@
-{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
 , p7zip, mtools, syslinux }:
 
 stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
-  version = "613";
+  version = "655";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1f389z5lqimp4hlxm6zlrh1ja474r6ivzb9r43i9bvf0z1n21f0q";
+  src = fetchFromGitHub {
+    owner  = "unetbootin";
+    repo   = "unetbootin";
+    rev    = version;
+    sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py";
   };
 
-  sourceRoot = ".";
+  sourceRoot = "${name}-src/src/unetbootin";
 
-  buildInputs = [ makeWrapper qt4 qmake4Hook ];
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ makeWrapper qmake4Hook ];
+  enableParallelBuilding = true;
 
   # Lots of nice hard-coded paths...
-  postUnpack = ''
+  postPatch = ''
     substituteInPlace unetbootin.cpp \
-      --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
-      --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
-      --replace /sbin/blkid ${utillinux}/sbin/blkid \
-      --replace /bin/df ${coreutils}/bin/df \
-      --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
-      --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
+      --replace /bin/df             ${coreutils}/bin/df \
+      --replace /sbin/blkid         ${utillinux}/sbin/blkid \
+      --replace /sbin/fdisk         ${utillinux}/sbin/fdisk \
+      --replace /sbin/sfdisk        ${utillinux}/sbin/sfdisk \
+      --replace /usr/bin/syslinux   ${syslinux}/bin/syslinux \
+      --replace /usr/bin/extlinux   ${syslinux}/sbin/extlinux \
       --replace /usr/share/syslinux ${syslinux}/share/syslinux
+
     substituteInPlace main.cpp \
       --replace /usr/share/unetbootin $out/share/unetbootin
+
     substituteInPlace unetbootin.desktop \
       --replace /usr/bin $out/bin
   '';
@@ -46,15 +52,15 @@ stdenv.mkDerivation rec {
     cp unetbootin.desktop $out/share/applications
 
     wrapProgram $out/bin/unetbootin \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \
       --set QT_X11_NO_MITSHM 1
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://unetbootin.sourceforge.net/;
+    homepage    = http://unetbootin.sourceforge.net/;
     description = "A tool to create bootable live USB drives from ISO images";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ebzzry ];
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ ebzzry ];
   };
 }