From df1d5a482736a96075eced4a936a1c6774bad128 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sun, 3 Sep 2017 14:21:16 -0400
Subject: [PATCH 01/79] adms: init at 2.3.6

---
 .../science/electronics/adms/default.nix      | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/adms/default.nix

diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix
new file mode 100644
index 00000000000..d4ec974007c
--- /dev/null
+++ b/pkgs/applications/science/electronics/adms/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libtool, autoreconfHook, flex, bison, gperf,
+  libxml2, perl, perlPackages, gd }:
+
+stdenv.mkDerivation rec {
+  version = "2.3.6";
+  name = "adms-${version}";
+
+  src = fetchFromGitHub {
+    owner = "Qucs";
+    repo = "adms";
+    rev = "release-${version}";
+    sha256 = "1pcwq5khzdq4x33lid9hq967gv78dr5i4f2sk8m8rwkfqb9vdzrg";
+  };
+
+  buildInputs = [ autoreconfHook flex bison gperf libxml2 perl gd perlPackages.XMLLibXML ];
+  configureFlags = [ "--enable-maintainer-mode" ];
+
+  meta = {
+    description = "automatic device model synthesizer";
+    homepage = https://github.com/Qucs/adms;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [disassembler];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05663bb8977..ce1177c2fac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18409,6 +18409,8 @@ with pkgs;
 
   ### SCIENCE / ELECTRONICS
 
+  adms = callPackage ../applications/science/electronics/adms { };
+
   eagle = callPackage ../applications/science/electronics/eagle { };
 
   caneda = callPackage ../applications/science/electronics/caneda { };
@@ -18432,6 +18434,7 @@ with pkgs;
 
   qucs = callPackage ../applications/science/electronics/qucs { };
 
+
   xoscope = callPackage ../applications/science/electronics/xoscope { };
 
 

From 00753e078d3ae073fdefb6130df0be7519e20576 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sun, 3 Sep 2017 14:21:52 -0400
Subject: [PATCH 02/79] qucs: 0.0.18 -> 0.0.19

---
 .../science/electronics/qucs/cmakelists.patch | 34 +++++++++++++++++++
 .../science/electronics/qucs/default.nix      | 19 +++++++----
 2 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/science/electronics/qucs/cmakelists.patch

diff --git a/pkgs/applications/science/electronics/qucs/cmakelists.patch b/pkgs/applications/science/electronics/qucs/cmakelists.patch
new file mode 100644
index 00000000000..27066f09c84
--- /dev/null
+++ b/pkgs/applications/science/electronics/qucs/cmakelists.patch
@@ -0,0 +1,34 @@
+diff --git i/qucs-core/CMakeLists.txt w/qucs-core/CMakeLists.txt
+index 2dbbd41..d174b50 100644
+--- i/qucs-core/CMakeLists.txt
++++ w/qucs-core/CMakeLists.txt
+@@ -158,26 +158,9 @@ ENDIF()
+ 
+ #
+ # Need Bison
+-#
+-# This is a HACK to get arround a PATH issue with Qt Creator on OSX.
+-# It seams impossible to pass a custom PATH to Qt Creator on OSX, ie, cannot prepend `/usr/local/bin/` for intance.
+-# The FIND_PACKAGE fails. For now we provide a fallback with a custom FIND_PROGRAM. The variable BISON_DIR is also available.
+-IF(WIN32)
+-  FIND_PACKAGE(BISON 2.4 REQUIRED)
+-  IF(BISON_FOUND)
+-    #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" )
+-  ENDIF()
+-ELSE()  # Linux, OSX
+-  # use -DBISON_DIR=/path/ to provide the path to bison
+-  FIND_PROGRAM( BISON_EXECUTABLE bison
+-    PATHS /usr/local/bin/ /opt/local/bin/ /usr/bin ${BISON_DIR}
+-    DOC "bison path"
+-    NO_DEFAULT_PATH )
+-  IF(BISON_EXECUTABLE )
+-    MESSAGE(STATUS "Found bison: " ${BISON_EXECUTABLE})
+-  ELSE()
+-	  MESSAGE(FATAL_ERROR "Unable to find bison. Try to provide -DBISON_DIR=[path]")
+-  ENDIF()
++FIND_PACKAGE(BISON 2.4 REQUIRED)
++IF(BISON_FOUND)
++  #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" )
+ ENDIF()
+ 
+ #
diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix
index 6d89d9e5271..1a5fbf90d10 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@@ -1,16 +1,23 @@
-{stdenv, fetchurl, flex, bison, qt4, libX11 }:
+{stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }:
 
 stdenv.mkDerivation rec {
-  name = "qucs-0.0.18";
+  version = "0.0.19";
+  name = "qucs-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/qucs/${name}.tar.gz";
-    sha256 = "3609a18b57485dc9f19886ac6694667f3251702175bd1cbbbea37981b2c482a7";
+  src = fetchFromGitHub {
+    owner = "Qucs";
+    repo = "qucs";
+    rev = "qucs-${version}";
+    sha256 = "106h3kjyg7c0hkmzkin7h8fcl32n60835121b2qqih8ixi6r5id6";
   };
 
   QTDIR=qt4;
 
-  buildInputs = [ flex bison qt4 libX11 ];
+  patches = [
+    ./cmakelists.patch
+  ];
+
+  buildInputs = [ flex bison qt4 libX11 cmake gperf adms ];
 
   meta = {
     description = "Integrated circuit simulator";

From e153fa84a5ff88ee9f4b23e7b0d9685b5efde58c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 4 Sep 2017 14:03:20 -0400
Subject: [PATCH 03/79] Add XMonad test

---
 nixos/release-combined.nix |  1 +
 nixos/release.nix          |  1 +
 nixos/tests/xmonad.nix     | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 nixos/tests/xmonad.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 54fd4a15ffc..047860d3e49 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -115,6 +115,7 @@ in rec {
         (all nixos.tests.slim)
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)
+        (all nixos.tests.xmonad)
 
         nixpkgs.tarball
         (all allSupportedNixpkgs.emacs)
diff --git a/nixos/release.nix b/nixos/release.nix
index ca2a164bb6c..c687722ec3e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -312,6 +312,7 @@ in rec {
   tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
   tests.wordpress = callTest tests/wordpress.nix {};
   tests.xfce = callTest tests/xfce.nix {};
+  tests.xmonad = callTest tests/xmonad.nix {};
 
 
   /* Build a bunch of typical closures so that Hydra can keep track of
diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix
new file mode 100644
index 00000000000..2e86f942a66
--- /dev/null
+++ b/nixos/tests/xmonad.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "xmonad";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { lib, pkgs, ... }: {
+    imports = [ ./common/x11.nix ./common/user-account.nix ];
+    services.xserver.displayManager.auto.user = "alice";
+    services.xserver.windowManager.default = lib.mkForce "xmonad";
+    services.xserver.windowManager.xmonad = {
+      enable = true;
+      enableContribAndExtras = true;
+      extraPackages = with pkgs.haskellPackages; haskellPackages: [ xmobar ];
+    };
+  };
+
+  testScript = { nodes, ... }: ''
+    $machine->waitForX;
+    $machine->waitForFile("/home/alice/.Xauthority");
+    $machine->succeed("xauth merge ~alice/.Xauthority");
+    $machine->sleep(3);
+    $machine->sendKeys("alt-shift-ret");
+    $machine->waitForWindow(qr/machine.*alice/);
+    $machine->sleep(1);
+    $machine->screenshot("terminal");
+  '';
+})

From 2bb57ef7761fc9d408bb27b2733d36c8640e0e4b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 4 Sep 2017 19:02:05 -0400
Subject: [PATCH 04/79] docker: Allow package selection in module

---
 nixos/modules/virtualisation/docker.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 5a8a0e27436..a9a2095499a 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -126,14 +126,23 @@ in
         '';
       };
     };
+
+    package = mkOption {
+      default = pkgs.docker;
+      type = types.package;
+      example = pkgs.docker-edge;
+      description = ''
+        Docker package to be used in the module.
+      '';
+    };
   };
 
   ###### implementation
 
   config = mkIf cfg.enable (mkMerge [{
-      environment.systemPackages = [ pkgs.docker ];
+      environment.systemPackages = [ cfg.package ];
       users.extraGroups.docker.gid = config.ids.gids.docker;
-      systemd.packages = [ pkgs.docker ];
+      systemd.packages = [ cfg.package ];
 
       systemd.services.docker = {
         wantedBy = optional cfg.enableOnBoot "multi-user.target";
@@ -142,7 +151,7 @@ in
           ExecStart = [
             ""
             ''
-              ${pkgs.docker}/bin/dockerd \
+              ${cfg.package}/bin/dockerd \
                 --group=docker \
                 --host=fd:// \
                 --log-driver=${cfg.logDriver} \
@@ -180,7 +189,7 @@ in
         serviceConfig.Type = "oneshot";
 
         script = ''
-          ${pkgs.docker}/bin/docker system prune -f ${toString cfg.autoPrune.flags}
+          ${cfg.package}/bin/docker system prune -f ${toString cfg.autoPrune.flags}
         '';
 
         startAt = optional cfg.autoPrune.enable cfg.autoPrune.dates;

From 380ed98bd793b2f3cbf257b7ef9601770c4f8d48 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 4 Sep 2017 19:02:44 -0400
Subject: [PATCH 05/79] docker: Add test for docker-edge, check for proper
 versions in tests

---
 nixos/release-combined.nix  |  2 ++
 nixos/release.nix           |  1 +
 nixos/tests/docker-edge.nix | 47 +++++++++++++++++++++++++++++++++++++
 nixos/tests/docker.nix      |  6 ++++-
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/docker-edge.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 54fd4a15ffc..4bf5df293fe 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -81,6 +81,8 @@ in rec {
         (all nixos.tests.boot.uefiUsb)
         (all nixos.tests.boot-stage1)
         nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
+        nixos.tests.docker.x86_64-linux
+        nixos.tests.docker-edge.x86_64-linux
         (all nixos.tests.ecryptfs)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
diff --git a/nixos/release.nix b/nixos/release.nix
index ca2a164bb6c..0e56fa28c1a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -234,6 +234,7 @@ in rec {
   tests.containers-hosts = callTest tests/containers-hosts.nix {};
   tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
+  tests.docker-edge = hydraJob (import tests/docker-edge.nix { system = "x86_64-linux"; });
   tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };
   tests.ecryptfs = callTest tests/ecryptfs.nix {};
   tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix
new file mode 100644
index 00000000000..38d25daff19
--- /dev/null
+++ b/nixos/tests/docker-edge.nix
@@ -0,0 +1,47 @@
+# This test runs docker and checks if simple container starts
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "docker";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus offline ];
+  };
+
+  nodes = {
+    docker =
+      { config, pkgs, ... }:
+        {
+          virtualisation.docker.enable = true;
+          virtualisation.docker.package = pkgs.docker-edge;
+
+          users.users = {
+            noprivs = {
+              isNormalUser = true;
+              description = "Can't access the docker daemon";
+              password = "foobar";
+            };
+
+            hasprivs = {
+              isNormalUser = true;
+              description = "Can access the docker daemon";
+              password = "foobar";
+              extraGroups = [ "docker" ];
+            };
+          };
+        };
+    };
+
+  testScript = ''
+    startAll;
+
+    $docker->waitForUnit("sockets.target");
+    $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg");
+    $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10");
+    $docker->succeed("docker ps | grep sleeping");
+    $docker->succeed("sudo -u hasprivs docker ps");
+    $docker->fail("sudo -u noprivs docker ps");
+    $docker->succeed("docker stop sleeping");
+
+    # Must match version twice to ensure client and server versions are correct
+    $docker->succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "2" ]');
+  '';
+})
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 9096a5868f6..c6c8f4cdb5f 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -3,7 +3,7 @@
 import ./make-test.nix ({ pkgs, ...} : {
   name = "docker";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ offline ];
+    maintainers = [ nequissimus offline ];
   };
 
   nodes = {
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       { config, pkgs, ... }:
         {
           virtualisation.docker.enable = true;
+          virtualisation.docker.package = pkgs.docker;
 
           users.users = {
             noprivs = {
@@ -39,5 +40,8 @@ import ./make-test.nix ({ pkgs, ...} : {
     $docker->succeed("sudo -u hasprivs docker ps");
     $docker->fail("sudo -u noprivs docker ps");
     $docker->succeed("docker stop sleeping");
+
+    # Must match version twice to ensure client and server versions are correct
+    $docker->succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]');
   '';
 })

From 04b0f3255fc2c9e275ac93eeb29c37f6465a3992 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 5 Sep 2017 19:03:54 -0400
Subject: [PATCH 06/79] tests: Add sysctl

---
 nixos/release-combined.nix |  1 +
 nixos/release.nix          |  1 +
 nixos/tests/sysctl.nix     | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 nixos/tests/sysctl.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 84dda8cc64c..30f5f96dc50 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -115,6 +115,7 @@ in rec {
         (all nixos.tests.sddm.default)
         (all nixos.tests.simple)
         (all nixos.tests.slim)
+        (all nixos.tests.sysctl)
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 59c269627f1..c557349a326 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -309,6 +309,7 @@ in rec {
   tests.slim = callTest tests/slim.nix {};
   tests.smokeping = callTest tests/smokeping.nix {};
   tests.snapper = callTest tests/snapper.nix {};
+  tests.sysctl = callTest tests/sysctl.nix {};
   tests.taskserver = callTest tests/taskserver.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
diff --git a/nixos/tests/sysctl.nix b/nixos/tests/sysctl.nix
new file mode 100644
index 00000000000..d7220cabb22
--- /dev/null
+++ b/nixos/tests/sysctl.nix
@@ -0,0 +1,25 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "sysctl";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { config, lib, pkgs, ... }:
+    {
+      boot.kernelPackages = pkgs.linuxPackages;
+      boot.kernel.sysctl = {
+        "kernel.dmesg_restrict" = true; # Restrict dmesg access
+        "net.core.bpf_jit_enable" = false; # Turn off bpf JIT
+        "user.max_user_namespaces" = 0; # Disable user namespaces
+        "vm.swappiness" = 2; # Low swap usage
+      };
+    };
+
+  testScript =
+    ''
+      $machine->succeed("sysctl kernel.dmesg_restrict | grep 'kernel.dmesg_restrict = 1'");
+      $machine->succeed("sysctl net.core.bpf_jit_enable | grep 'net.core.bpf_jit_enable = 0'");
+      $machine->succeed("sysctl user.max_user_namespaces | grep 'user.max_user_namespaces = 0'");
+      $machine->succeed("sysctl vm.swappiness | grep 'vm.swappiness = 2'");
+    '';
+})

From 3e2975e892527fe45e4f574401cb7d19eb9542a6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 5 Sep 2017 19:04:43 -0400
Subject: [PATCH 07/79] tests: Add kernelParams

---
 nixos/release-combined.nix    |  1 +
 nixos/release.nix             |  1 +
 nixos/tests/kernel-params.nix | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 nixos/tests/kernel-params.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 30f5f96dc50..f820c040801 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -93,6 +93,7 @@ in rec {
         (all nixos.tests.plasma5)
         (all nixos.tests.kernel-latest)
         (all nixos.tests.kernel-lts)
+        (all nixos.tests.kernel-params)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
         (all nixos.tests.misc)
diff --git a/nixos/release.nix b/nixos/release.nix
index c557349a326..6348c2f15d4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -264,6 +264,7 @@ in rec {
   tests.kernel-copperhead = tests/kernel-copperhead.nix {};
   tests.kernel-latest = tests/kernel-latest.nix {};
   tests.kernel-lts = tests/kernel-lts.nix {};
+  tests.kernel-params = tests/kernel-params.nix {};
   tests.keystone = callTest tests/keystone.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
diff --git a/nixos/tests/kernel-params.nix b/nixos/tests/kernel-params.nix
new file mode 100644
index 00000000000..14a39335691
--- /dev/null
+++ b/nixos/tests/kernel-params.nix
@@ -0,0 +1,24 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "kernel-params";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { config, lib, pkgs, ... }:
+    {
+      boot.kernelPackages = pkgs.linuxPackages;
+      boot.kernelParams = [
+        "nohibernate"
+        "page_poison=1"
+        "vsyscall=none"
+      ];
+    };
+
+  testScript =
+    ''
+      $machine->fail("cat /proc/cmdline | grep page_poison=0");
+      $machine->succeed("cat /proc/cmdline | grep nohibernate");
+      $machine->succeed("cat /proc/cmdline | grep page_poison=1");
+      $machine->succeed("cat /proc/cmdline | grep vsyscall=none");
+    '';
+})

From b4ccef2163d07e5f35bc802c357d2d2167409a3a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 5 Sep 2017 19:05:37 -0400
Subject: [PATCH 08/79] tests: Add environment

---
 nixos/release-combined.nix |  1 +
 nixos/release.nix          |  1 +
 nixos/tests/env.nix        | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 nixos/tests/env.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index f820c040801..4cc140ebb15 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -82,6 +82,7 @@ in rec {
         (all nixos.tests.boot-stage1)
         nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
         (all nixos.tests.ecryptfs)
+        (all nixos.tests.env)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
         (all nixos.tests.keymap.azerty)
diff --git a/nixos/release.nix b/nixos/release.nix
index 6348c2f15d4..bad9cfe6c7e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -240,6 +240,7 @@ in rec {
   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.elk = callTest tests/elk.nix {};
+  tests.env = callTest tests/env.nix {};
   tests.ferm = callTest tests/ferm.nix {};
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
new file mode 100644
index 00000000000..c6b0424e97b
--- /dev/null
+++ b/nixos/tests/env.nix
@@ -0,0 +1,35 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "environment";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { config, lib, pkgs, ... }:
+    {
+      boot.kernelPackages = pkgs.linuxPackages;
+      environment.etc."plainFile".text = ''
+        Hello World
+      '';
+      environment.etc."folder/with/file".text = ''
+        Foo Bar!
+      '';
+
+      environment.sessionVariables = {
+        TERMINFO_DIRS = "/run/current-system/sw/share/terminfo";
+        NIXCON = "awesome";
+      };
+    };
+
+  testScript =
+    ''
+      $machine->succeed('[ -L "/etc/plainFile" ]');
+      $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
+      $machine->succeed('[ -d "/etc/folder" ]');
+      $machine->succeed('[ -d "/etc/folder/with" ]');
+      $machine->succeed('[ -L "/etc/folder/with/file" ]');
+      $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
+
+      $machine->succeed('echo ''${TERMINFO_DIRS} | grep "/run/current-system/sw/share/terminfo"');
+      $machine->succeed('echo ''${NIXCON} | grep "awesome"');
+    '';
+})

From 8bd1a220d924201de15352df03a84281f78c2158 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 5 Sep 2017 19:57:29 -0400
Subject: [PATCH 09/79] docker: 17.06.1-ce -> 17.06.2-ce

---
 .../applications/virtualization/docker/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 3ba019aa8d5..043f27e13d2 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -177,13 +177,13 @@ rec {
   # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
 
   docker_17_06 = dockerGen rec {
-    version = "17.06.1-ce";
-    rev = "874a7374f31c77aca693d025101b2de1b20b96c2"; # git commit
-    sha256 = "08xhww2rhpyj73zgh5maycs85zpc0sm3ak8yyyd92dwgncmyi2im";
-    runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4";
-    runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq";
-    containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429";
-    containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j";
+    version = "17.06.2-ce";
+    rev = "cec0b72a9940e047e945a09e1febd781e88366d6"; # git commit
+    sha256 = "1scqx28vzh72ziq00lbx92vsb896mj974j8f0zg11y6qc5n5jx3l";
+    runcRev = "810190ceaa507aa2727d7ae6f4790c76ec150bd2";
+    runcSha256 = "0f1x1z262qg579qb1w21axj3mibq4fbff3gamliw49sdqqnb7vk3";
+    containerdRev = "6e23458c129b551d5c9871e5174f6b1b7f6d1170";
+    containerdSha256 = "12kzc5z1nhxdbizzr494ywilbs6rdv39v5ql7lmfzwh350gwlg93";
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };

From 7f860249e1d95947ff320ba047a7329168d29b42 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 5 Sep 2017 22:35:00 -0500
Subject: [PATCH 10/79] =?UTF-8?q?pinentry-mac:=20no=20=E2=80=98fill=20plis?=
 =?UTF-8?q?t=E2=80=99=20stuff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #26774
---
 pkgs/tools/security/pinentry-mac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
index cd0060cbcb9..074d71c0830 100644
--- a/pkgs/tools/security/pinentry-mac/default.nix
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = "pinentry-mac";
-    rev = "d60aa902644a1f0126ec50e79937423a3a7c3bc4";
-    sha256 = "0xp4rdyj0mw6gg1z1wraggb1qlkjb5845mibrz3nj0l692da52nq";
+    rev = "6dfef256c8ea32d642fea847f27d800f024cf51e";
+    sha256 = "0g75302697gqcxyf2hyqzvcbd5pyss1bl2xvfd40wqav7dlyvj83";
   };
 
   buildInputs = [ xcbuild libiconv Cocoa ncurses ];

From a26bbe547e27048dcdfe87da38777514089f479d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Wed, 6 Sep 2017 14:32:11 +0200
Subject: [PATCH 11/79] coq: fetch source from GitHub

---
 .../science/logic/coq/default.nix             | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 9620140dde4..b4181e0c426 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -2,10 +2,10 @@
 # - The csdp program used for the Micromega tactic is statically referenced.
 #   However, coq can build without csdp by setting it to null.
 #   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-# - The patch-level version can be specified through the `version` argument to
-#   the derivation; it defaults to the greatest.
+# - The exact version can be specified through the `version` argument to
+#   the derivation; it defaults to the latest stable version.
 
-{ stdenv, fetchurl, writeText, pkgconfig
+{ stdenv, fetchFromGitHub, writeText, pkgconfig
 , ocamlPackages, ncurses
 , buildIde ? true
 , csdp ? null
@@ -14,11 +14,11 @@
 
 let
   sha256 = {
-   "8.5pl1"	= "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb";
-   "8.5pl2"	= "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";
-   "8.5pl3"	= "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh";
-   "8.6"	= "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f";
-   "8.6.1"      = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j";
+   "8.5pl1"    = "1976ki5xjg2r907xj9p7gs0kpdinywbwcqlgxqw75dgp0hkgi00n";
+   "8.5pl2"    = "109rrcrx7mz0fj7725kjjghfg5ydwb24hjsa5hspa27b4caah7rh";
+   "8.5pl3"    = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw";
+   "8.6"       = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4";
+   "8.6.1"     = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   camlp5 = ocamlPackages.camlp5_strict;
@@ -81,8 +81,10 @@ self = stdenv.mkDerivation {
     '';
   };
 
-  src = fetchurl {
-    url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
+  src = fetchFromGitHub {
+    owner = "coq";
+    repo = "coq";
+    rev = "V${version}";
     inherit sha256;
   };
 

From 9efd7a9b6eac19c5d782e3c4d53c78a8228a1200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Wed, 6 Sep 2017 14:45:23 +0200
Subject: [PATCH 12/79] coq_8_7: init at 8.7+beta1

---
 pkgs/applications/science/logic/coq/default.nix | 1 +
 pkgs/top-level/all-packages.nix                 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index b4181e0c426..7378aedc1be 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -19,6 +19,7 @@ let
    "8.5pl3"    = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw";
    "8.6"       = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4";
    "8.6.1"     = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
+   "8.7+beta1" = "006rn5896pf39p4z9c6d4xj4zm80j4b67v5gwcixd63msrjqkmxp";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   camlp5 = ocamlPackages.camlp5_strict;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8fd83bcb93..4d30e7f1fab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18235,6 +18235,9 @@ with pkgs;
     version = "8.5pl3";
   };
   coq_8_6 = callPackage ../applications/science/logic/coq {};
+  coq_8_7 = callPackage ../applications/science/logic/coq {
+    version = "8.7+beta1";
+  };
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {

From 51eafbe028d5daf4bfb23db2e60bed1d1b689862 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 6 Sep 2017 21:22:24 +0200
Subject: [PATCH 13/79] ucl: only pass -stc=c90 when using gcc

Also remove -fPIC, it's included in the hardening flags by default.
---
 pkgs/development/libraries/ucl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix
index ceb97b6088b..aa983b1394b 100644
--- a/pkgs/development/libraries/ucl/default.nix
+++ b/pkgs/development/libraries/ucl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "ucl-1.03";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
 
   # needed to successfully compile with gcc 6
-  NIX_CFLAGS_COMPILE = "-std=c90 -fPIC";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=c90";
 
   meta = {
     homepage = http://www.oberhumer.com/opensource/ucl/;

From 024b501907eafbd89624e465ff21afbc96e9fec6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 6 Sep 2017 22:01:48 -0400
Subject: [PATCH 14/79] tests: Fix hibernate

---
 nixos/tests/hibernate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index db58a2f5c85..a95235887e8 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -37,7 +37,7 @@ import ./make-test.nix (pkgs: {
       $machine->waitForShutdown;
       $machine->start;
       $probe->waitForUnit("network.target");
-      $probe->waitUntilSucceeds("echo test | nc machine 4444");
+      $probe->waitUntilSucceeds("echo test | nc machine 4444 -q 0");
     '';
 
 })

From e6c40a4dee91a54f5e56085a301b9a87deb2efa5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 7 Sep 2017 09:53:04 +0800
Subject: [PATCH 15/79] syncthing: 0.14.36 -> 0.14.37

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index dd2576cd083..e82bd462fe3 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.36";
+  version = "0.14.37";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "1l4s74qlabwfkpi9lmm588ym0myavbs06a5gpp9nihzrsal18727";
+    sha256 = "0mk09m5wc6g7w65cf86rrvzb2gfzbg4jrkwpsabn732iyhkkaj4z";
   };
 
   buildInputs = [ go removeReferencesTo ];

From 6afa844d31bcf118b512def81a5478f6ea937c21 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 7 Sep 2017 01:10:48 +0200
Subject: [PATCH 16/79] CODEOWNERS: add Profpatsch to various paths

---
 .github/CODEOWNERS | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d77f064ed55..2341577476d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,15 +7,26 @@
 # For documentation on this file, see https://help.github.com/articles/about-codeowners/
 # Mentioned users will get code review requests.
 
+# Boostraping and core infra
+pkgs/stdenv/	@Ericson2314
+pkgs/build-support/cc-wrapper/	@Ericson2314
+
+# Libraries
+lib/  @Profpatsch
+
+# Build-Support
+pkgs/build-support  @Profpatsch
+
 # Python-related code and docs
 pkgs/top-level/python-packages.nix	@FRidh
 pkgs/development/interpreters/python/*	@FRidh
 pkgs/development/python-modules/*	@FRidh
 doc/languages-frameworks/python.md	@FRidh
 
-# Boostraping and core infra
-pkgs/stdenv/	@Ericson2314
-pkgs/build-support/cc-wrapper/	@Ericson2314
+# Haskell
+pkgs/development/haskell-modules/default.nix  @Profpatsch
+pkgs/development/haskell-modules/generic-builder.nix  @Profpatsch
+pkgs/development/haskell-modules/hoogle.nix  @Profpatsch
 
 # Darwin-related
 pkgs/stdenv/darwin/*	@copumpkin @LnL7

From baf9dfc4761f1755a6cf5f3073fbdadb743ded15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 09:01:47 +0200
Subject: [PATCH 17/79] CODEOWNERS: add peti for Haskell-related code

---
 .github/CODEOWNERS | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2341577476d..ed8c85746ab 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -24,9 +24,11 @@ pkgs/development/python-modules/*	@FRidh
 doc/languages-frameworks/python.md	@FRidh
 
 # Haskell
-pkgs/development/haskell-modules/default.nix  @Profpatsch
-pkgs/development/haskell-modules/generic-builder.nix  @Profpatsch
-pkgs/development/haskell-modules/hoogle.nix  @Profpatsch
+pkgs/development/compilers/ghc @peti
+pkgs/development/haskell-modules @peti
+pkgs/development/haskell-modules/default.nix  @Profpatsch @peti
+pkgs/development/haskell-modules/generic-builder.nix  @Profpatsch @peti
+pkgs/development/haskell-modules/hoogle.nix  @Profpatsch @peti
 
 # Darwin-related
 pkgs/stdenv/darwin/*	@copumpkin @LnL7

From a95c577038199d4d1ac93219e351d964dd333f89 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 09:03:49 +0200
Subject: [PATCH 18/79] CODEOWNERS: add peti for R-related code

---
 .github/CODEOWNERS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ed8c85746ab..bdee34abaea 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -30,6 +30,10 @@ pkgs/development/haskell-modules/default.nix  @Profpatsch @peti
 pkgs/development/haskell-modules/generic-builder.nix  @Profpatsch @peti
 pkgs/development/haskell-modules/hoogle.nix  @Profpatsch @peti
 
+# R
+pkgs/applications/science/math/R @peti
+pkgs/development/r-modules @peti
+
 # Darwin-related
 pkgs/stdenv/darwin/*	@copumpkin @LnL7
 pkgs/os-specific/darwin/*	@LnL7

From 88d11c4e4beafb6901fed4802d7c6003462c6c67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 09:06:01 +0200
Subject: [PATCH 19/79] CODEOWNERS: tabs are evil

---
 .github/CODEOWNERS | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bdee34abaea..d3aaff952f8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,8 +8,8 @@
 # Mentioned users will get code review requests.
 
 # Boostraping and core infra
-pkgs/stdenv/	@Ericson2314
-pkgs/build-support/cc-wrapper/	@Ericson2314
+pkgs/stdenv/    @Ericson2314
+pkgs/build-support/cc-wrapper/  @Ericson2314
 
 # Libraries
 lib/  @Profpatsch
@@ -18,10 +18,10 @@ lib/  @Profpatsch
 pkgs/build-support  @Profpatsch
 
 # Python-related code and docs
-pkgs/top-level/python-packages.nix	@FRidh
-pkgs/development/interpreters/python/*	@FRidh
-pkgs/development/python-modules/*	@FRidh
-doc/languages-frameworks/python.md	@FRidh
+pkgs/top-level/python-packages.nix      @FRidh
+pkgs/development/interpreters/python/*  @FRidh
+pkgs/development/python-modules/*       @FRidh
+doc/languages-frameworks/python.md      @FRidh
 
 # Haskell
 pkgs/development/compilers/ghc @peti
@@ -35,6 +35,6 @@ pkgs/applications/science/math/R @peti
 pkgs/development/r-modules @peti
 
 # Darwin-related
-pkgs/stdenv/darwin/*	@copumpkin @LnL7
-pkgs/os-specific/darwin/*	@LnL7
-pkgs/os-specific/darwin/apple-source-releases/*	@copumpkin
+pkgs/stdenv/darwin/*    @copumpkin @LnL7
+pkgs/os-specific/darwin/*       @LnL7
+pkgs/os-specific/darwin/apple-source-releases/* @copumpkin

From b1ca0f465f60a9ab087a30075b260c6b76ccabef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 09:07:40 +0200
Subject: [PATCH 20/79] CODEOWNERS: (align-regexp "@") my code blocks

---
 .github/CODEOWNERS | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d3aaff952f8..44d22fb5225 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -24,15 +24,15 @@ pkgs/development/python-modules/*       @FRidh
 doc/languages-frameworks/python.md      @FRidh
 
 # Haskell
-pkgs/development/compilers/ghc @peti
-pkgs/development/haskell-modules @peti
-pkgs/development/haskell-modules/default.nix  @Profpatsch @peti
-pkgs/development/haskell-modules/generic-builder.nix  @Profpatsch @peti
-pkgs/development/haskell-modules/hoogle.nix  @Profpatsch @peti
+pkgs/development/compilers/ghc                       @peti
+pkgs/development/haskell-modules                     @peti
+pkgs/development/haskell-modules/default.nix         @Profpatsch @peti
+pkgs/development/haskell-modules/generic-builder.nix @Profpatsch @peti
+pkgs/development/haskell-modules/hoogle.nix          @Profpatsch @peti
 
 # R
 pkgs/applications/science/math/R @peti
-pkgs/development/r-modules @peti
+pkgs/development/r-modules       @peti
 
 # Darwin-related
 pkgs/stdenv/darwin/*    @copumpkin @LnL7

From 4c183f4b42a6eed0adfcec5d8285052cb235a31a Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Tue, 5 Sep 2017 17:04:42 +0800
Subject: [PATCH 21/79] pythonPackages.urllib3: Fix buildInputs and
 meta.description

---
 pkgs/development/python-modules/urllib3/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index a23ae0f0b74..10021e14f12 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -1,5 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi
-, coverage, tornado, mock, nose, psutil, pysocks }:
+, pytest, mock, tornado, pyopenssl, cryptography
+, idna, certifi, ipaddress, pysocks }:
 
 buildPythonPackage rec {
   pname = "urllib3";
@@ -22,11 +23,12 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  buildInputs = [ coverage tornado mock nose psutil pysocks ];
+  checkInputs = [ pytest mock tornado ];
+  propagatedBuildInputs = [ pyopenssl cryptography idna certifi ipaddress pysocks ];
 
   meta = with stdenv.lib; {
-    description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
-    homepage = https://www.dropbox.com/developers/core/docs;
+    description = "Powerful, sanity-friendly HTTP client for Python";
+    homepage = https://github.com/shazow/urllib3;
     license = licenses.mit;
   };
 }

From ea0c1c1bfd8defe02788644dae3acc5a5672830b Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Tue, 5 Sep 2017 17:06:19 +0800
Subject: [PATCH 22/79] pythonPackages.coveralls: Add missing dependencies to
 fix build

---
 .../python-modules/coveralls/default.nix          | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index f3b01c66815..4d11354df0a 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -2,12 +2,15 @@
 , lib
 , fetchPypi
 , mock
-, pytest_27
+, pytest
+, pytestrunner
 , sh
 , coverage
 , docopt
 , requests
+, urllib3
 , git
+, isPy3k
 }:
 
 buildPythonPackage rec {
@@ -21,13 +24,17 @@ buildPythonPackage rec {
     sha256 = "510682001517bcca1def9f6252df6ce730fcb9831c62d9fff7c7d55b6fdabdf3";
   };
 
-  buildInputs = [
+  checkInputs = [
     mock
     sh
-    pytest_27
+    pytest
     git
   ];
 
+  buildInputs = [
+    pytestrunner
+  ];
+
   # FIXME: tests requires .git directory to be present
   doCheck = false;
 
@@ -39,7 +46,7 @@ buildPythonPackage rec {
     coverage
     docopt
     requests
-  ];
+  ] ++ lib.optional (!isPy3k) urllib3;
 
   meta = {
     description = "Show coverage stats online via coveralls.io";

From eae28752a8fd1ad70d73c19c03a8fc7d42bdf1d2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 6 Sep 2017 12:37:40 +0200
Subject: [PATCH 23/79] pythonPackages.dropbox: fix build dependencies

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c811c05777..1fbbe507de1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5196,6 +5196,7 @@ in {
       sha256 = "0bixx80zjq0286dwm4zhg8bdhc8pqlrqy4n2jg7i6m6a4gv4gak5";
     };
 
+    buildInputs = with self; [ pytestrunner ];
     propagatedBuildInputs = with self; [ requests urllib3 mock setuptools ];
 
     meta = {

From cec4dcb7bbfb6c81b99bd4b5d113fdb2351b0f35 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 6 Sep 2017 09:24:07 +0200
Subject: [PATCH 24/79] pythonPackages.pamqp: add missing build 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 1fbbe507de1..a6aeea3a158 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15497,7 +15497,7 @@ in {
       sha256 = "1vmyvynqzx5zvbipaxff4fnzy3h3dvl3zicyr15yb816j93jl2ca";
     };
 
-    buildInputs = with self; [ mock nose pep8 pylint ];
+    buildInputs = with self; [ mock nose pep8 pylint mccabe ];
 
     meta = {
       description = "RabbitMQ Focused AMQP low-level library";

From f31c6c150a714f4ceb7bc27b416f0c104ab560ca Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Mon, 28 Aug 2017 02:11:20 +0200
Subject: [PATCH 25/79] python.pkgs.secretstorage: init at 2.3.1

---
 lib/maintainers.nix                           |  1 +
 .../python-modules/secretstorage/default.nix  | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/secretstorage/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ea1cff03fe2..e2ee441d9dd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -577,6 +577,7 @@
   tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
   ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
   teh = "Tom Hunger <tehunger@gmail.com>";
+  teto = "Matthieu Coudron <mcoudron@hotmail.com>";
   telotortium = "Robert Irelan <rirelan@gmail.com>";
   thall = "Niclas Thall <niclas.thall@gmail.com>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix
new file mode 100644
index 00000000000..e37e87f7d88
--- /dev/null
+++ b/pkgs/development/python-modules/secretstorage/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage
+, dbus-python, cryptography }:
+
+buildPythonPackage rec {
+  pname = "secretstorage";
+  version = "2.3.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "mitya57";
+    repo = "secretstorage";
+    rev = version;
+    sha256 = "1sjd2jjbxgkkxyrfwx89x0hsnn39w2cr2qkxbg1iz52znr4sqism";
+  };
+
+  propagatedBuildInputs = [ dbus-python cryptography ];
+
+  doCheck = false; # requires dbus session
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mitya57/secretstorage";
+    description = "Python bindings to FreeDesktop.org Secret Service API";
+    license = licenses.bsdOriginal;
+    platforms = platforms.linux;
+    maintainer = with maintainers; [ teto ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a6aeea3a158..37e4e506561 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20905,6 +20905,8 @@ in {
     };
   };
 
+  secretstorage = callPackage ../development/python-modules/secretstorage { };
+
   semantic = buildPythonPackage rec {
     name = "semantic-1.0.3";
 

From 712942dea39cb4e4c5f316a9847c0f08c5af2239 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 20:57:13 +0200
Subject: [PATCH 26/79] pythonPackages.aioamqp: init at 0.10.0

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

diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix
new file mode 100644
index 00000000000..10a1d899157
--- /dev/null
+++ b/pkgs/development/python-modules/aioamqp/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, isPy33, pythonOlder,
+  asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "aioamqp";
+  name = "${pname}-${version}";
+  version = "0.10.0";
+
+  meta = {
+    homepage = https://github.com/polyconseil/aioamqp;
+    description = "AMQP implementation using asyncio";
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0132921yy31ijb8w439zcz1gla4hiws4hx8zf6la4hjr01nsy666";
+  };
+
+  buildInputs = lib.optionals isPy33 [ asyncio ];
+
+  disabled = pythonOlder "3.3";
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37e4e506561..b3fef431164 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -117,6 +117,8 @@ in {
 
   agate-sql = callPackage ../development/python-modules/agate-sql { };
 
+  aioamqp = callPackage ../development/python-modules/aioamqp { };
+
   ansicolor = callPackage ../development/python-modules/ansicolor { };
 
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };

From f89fd55833c0a74e4f4791d497e559d91e9be95e Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:01:15 +0200
Subject: [PATCH 27/79] pythonPackages.asana: init at 0.6.2

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

diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
new file mode 100644
index 00000000000..346257db098
--- /dev/null
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchPypi,
+  pytest, requests, requests_oauthlib, six
+}:
+
+buildPythonPackage rec {
+  pname = "asana";
+  version = "0.6.2";
+  name = "${pname}-${version}";
+
+  meta = {
+    description = "Python client library for Asana";
+    homepage = https://github.com/asana/python-asana;
+    license = lib.licenses.mit;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0skai72392n3i1c4bl3hn2kh5lj990qsbasdwkbjdcy6vq57jggf";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ requests requests_oauthlib six ];
+
+  patchPhase = ''
+    echo > requirements.txt
+    sed -i "s/requests~=2.9.1/requests >=2.9.1/" setup.py
+    sed -i "s/requests_oauthlib~=0.6.1/requests_oauthlib >=0.6.1/" setup.py
+  '';
+
+  # ERROR: file not found: tests
+  doCheck = false; 
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3fef431164..cc0712468ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -121,6 +121,8 @@ in {
 
   ansicolor = callPackage ../development/python-modules/ansicolor { };
 
+  asana = callPackage ../development/python-modules/asana { };
+
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };
 
   astropy = callPackage ../development/python-modules/astropy {  };

From 6d9ec9efcf5d7deb136778affdc9b90df7c2c499 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:02:34 +0200
Subject: [PATCH 28/79] pythonPackages.diff-match-patch: init at 20121119

---
 .../diff-match-patch/default.nix               | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/python-modules/diff-match-patch/default.nix

diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix
new file mode 100644
index 00000000000..7907f1ffac0
--- /dev/null
+++ b/pkgs/development/python-modules/diff-match-patch/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "diff-match-patch";
+  name = "${pname}-${version}";
+  version = "20121119";
+
+  meta = {
+    homepage = https://code.google.com/p/google-diff-match-patch/;
+    description = "Diff, Match and Patch libraries for Plain Text";
+    license = lib.licenses.asl20;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0k1f3v8nbidcmmrk65m7h8v41jqi37653za9fcs96y7jzc8mdflx";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cc0712468ad..15ceba80199 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -173,6 +173,8 @@ in {
 
   distorm3 = callPackage ../development/python-modules/distorm3 { };
 
+  diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
+
   h5py = callPackage ../development/python-modules/h5py {
     hdf5 = pkgs.hdf5;
   };

From 4fe7f3e56154f3f08992c121d58d49936dd1eec2 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:04:37 +0200
Subject: [PATCH 29/79] pythonPackages.pycryptodomex: init at 3.4.5

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

diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix
new file mode 100644
index 00000000000..1d1ac67732a
--- /dev/null
+++ b/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "pycryptodomex";
+  name = "${pname}-${version}";
+  version = "3.4.5";
+
+  meta = {
+    description = "A self-contained cryptographic library for Python";
+    homepage = https://www.pycryptodome.org;
+    license = lib.licenses.bsd2;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1n5w5ls5syapmb39kavqgz2sa9pinzx4c9dvwa2147gj0hkh87wj";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15ceba80199..c663ca4f957 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -225,6 +225,8 @@ in {
 
   pycryptodome = callPackage ../development/python-modules/pycryptodome { };
 
+  pycryptodomex = callPackage ../development/python-modules/pycryptodomex { };
+
   PyChromecast = callPackage ../development/python-modules/pychromecast {
     protobuf = self.protobuf3_2;
   };

From 3909871991bb346fe659846a077d779b1be6b2f1 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:07:15 +0200
Subject: [PATCH 30/79] pythonPackages.pyjwkest: init at 1.3.2

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

diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix
new file mode 100644
index 00000000000..03cea021be8
--- /dev/null
+++ b/pkgs/development/python-modules/pyjwkest/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi,
+  future, pycryptodomex, pytest, requests, six
+}:
+
+buildPythonPackage rec {
+  pname = "pyjwkest";
+  name = "${pname}-${version}";
+  version = "1.3.2";
+
+  meta = {
+    description = "Implementation of JWT, JWS, JWE and JWK";
+    homepage = https://github.com/rohe/pyjwkest;
+    license = lib.licenses.asl20;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "11rrswsmma3wzi2qnmq929323yc6i9fkjsv8zr7b3vajd72yr49d";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ future pycryptodomex requests six ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c663ca4f957..a477991d961 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -251,6 +251,8 @@ in {
     libglade = pkgs.gnome2.libglade;
   };
 
+  pyjwkest = callPackage ../development/python-modules/pyjwkest { };
+
   pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
     pythonPackages = self;
   };

From c7031704f53c68e2f4b4afeb3cd6eb373a7949d0 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:09:29 +0200
Subject: [PATCH 31/79] pythonPackages.django-ipware: init at 1.1.6

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

diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix
new file mode 100644
index 00000000000..c4d993ac03b
--- /dev/null
+++ b/pkgs/development/python-modules/django-ipware/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, django }:
+
+buildPythonPackage rec {
+  pname = "django-ipware";
+  name = "${pname}-${version}";
+  version = "1.1.6";
+
+  meta = {
+    description = "A Django application to retrieve user's IP address";
+    homepage = https://github.com/un33k/django-ipware;
+    license = lib.licenses.mit;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "00zah4g2h93nbsijz556j97v9qkn9sxcia1a2wrwdwnav2fhzack";
+  };
+
+  propagatedBuildInputs = [ django ];
+
+  # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_TRUSTED_PROXY_LIST, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a477991d961..e4e3cd5261f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8634,6 +8634,8 @@ in {
 
   django_guardian = callPackage ../development/python-modules/django_guardian.nix { };
 
+  django-ipware = callPackage ../development/python-modules/django-ipware { };
+
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
   django_tagging = callPackage ../development/python-modules/django_tagging { };

From 0b2fc117c1a8406c1c9b3815bb49ce0c9ba4afff Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:11:11 +0200
Subject: [PATCH 32/79] pythonPackages.easy-thumbnails: init at 2.4.1

---
 .../easy-thumbnails/default.nix               | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/easy-thumbnails/default.nix

diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix
new file mode 100644
index 00000000000..79743f8ac0d
--- /dev/null
+++ b/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi,
+  django, pillow
+}:
+
+buildPythonPackage rec {
+  pname = "easy-thumbnails";
+  name = "${pname}-${version}";
+  version = "2.4.1";
+
+  meta = {
+    description = "Easy thumbnails for Django";
+    homepage = https://github.com/SmileyChris/easy-thumbnails;
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0w228b6hx8k4r15v7z62hyg99qp6xp4mdkgqs1ah64fyqxp1riaw";
+  };
+
+  propagatedBuildInputs = [ django pillow ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4e3cd5261f..bdea70faf75 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5269,6 +5269,8 @@ in {
     };
   };
 
+  easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
+
   eccodes = if (isPy27) then
       (pkgs.eccodes.overrideAttrs (oldattrs: {
     name = "${python.libPrefix}-" + oldattrs.name;

From b80cb36cde2e2460674ee6cb4514550f7df00676 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:14:00 +0200
Subject: [PATCH 33/79] pythonPackages.django-jinja: init at 2.2.2

---
 .../python-modules/django-jinja2/default.nix  | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-jinja2/default.nix

diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix
new file mode 100644
index 00000000000..aabfecfcacc
--- /dev/null
+++ b/pkgs/development/python-modules/django-jinja2/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchPypi,
+  django, jinja2, pytz, tox
+ }:
+
+buildPythonPackage rec {
+  pname = "django-jinja";
+  name = "${pname}-${version}";
+  version = "2.2.2";
+
+  meta = {
+    description = "Simple and nonobstructive jinja2 integration with Django";
+    homepage = https://github.com/niwinz/django-jinja;
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "099b99iprkvlsndrjmw4v3i3i60i9gm1aq5r88z15r7vgmv6sigj";
+  };
+
+  buildInputs = [ django pytz tox ];
+  propagatedBuildInputs = [ django jinja2 ];
+
+  # python installed: The directory '/homeless-shelter/.cache/pip/http' or its parent directory is not owned by the current user and the cache has been disabled. Please check the permissions and owner of that directory. If executing pip with sudo, you may want sudo's -H flag.,appdirs==1.4.3,Django==1.11.1,django-jinja==2.2.2,Jinja2==2.9.6,MarkupSafe==1.0,packaging==16.8,pyparsing==2.2.0,pytz==2017.2,six==1.10.0
+  doCheck = false;
+  checkPhase = ''
+    tox
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bdea70faf75..644d16c33bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8638,6 +8638,8 @@ in {
 
   django-ipware = callPackage ../development/python-modules/django-ipware { };
 
+  django-jinja = callPackage ../development/python-modules/django-jinja2 { };
+
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
   django_tagging = callPackage ../development/python-modules/django_tagging { };

From 28e186f42937da94278e7c53e92cb12e454ba0f0 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:15:35 +0200
Subject: [PATCH 34/79] pythonPackages.django-pglocks: init at 1.0.2

---
 .../python-modules/django-pglocks/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-pglocks/default.nix

diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix
new file mode 100644
index 00000000000..2207aa348ab
--- /dev/null
+++ b/pkgs/development/python-modules/django-pglocks/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, django }:
+
+buildPythonPackage rec {
+  pname = "django-pglocks";
+  name = "${pname}-${version}";
+  version = "1.0.2";
+
+  meta = {
+    description = "PostgreSQL locking context managers and functions for Django.";
+    homepage = https://github.com/Xof/django-pglocks;
+    license = lib.licenses.mit;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ks4k0bk4457wfl3xgzr4v7xb0lxmnkhxwhlp0bbnmzipdafw1cl";
+  };
+
+  buildInputs = [ django ];
+  propagatedBuildInputs = [ django ];
+
+  # tests need a postgres database
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 644d16c33bc..fdd5a060bb7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8640,6 +8640,8 @@ in {
 
   django-jinja = callPackage ../development/python-modules/django-jinja2 { };
 
+  django-pglocks = callPackage ../development/python-modules/django-pglocks { };
+
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
   django_tagging = callPackage ../development/python-modules/django_tagging { };

From 48855344c4fb9773c444b1753fa1f0dc7ee9544f Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:17:22 +0200
Subject: [PATCH 35/79] pythonPackages.django-picklefield: init at 0.3.2

---
 .../django-picklefield/default.nix             | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-picklefield/default.nix

diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix
new file mode 100644
index 00000000000..20a1c3dc221
--- /dev/null
+++ b/pkgs/development/python-modules/django-picklefield/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "django-picklefield";
+  name = "${pname}-${version}";
+  version = "0.3.2";
+
+  meta = {
+    description = "A pickled object field for Django";
+    homepage = https://github.com/gintas/django-picklefield;
+    license = lib.licenses.mit;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qlsbp3798ii68ny9zlz2ppkna00jf7i4hmjal3p8433gi18md7s";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fdd5a060bb7..8e64527d148 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8642,6 +8642,8 @@ in {
 
   django-pglocks = callPackage ../development/python-modules/django-pglocks { };
 
+  django-picklefield = callPackage ../development/python-modules/django-picklefield { };
+
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
   django_tagging = callPackage ../development/python-modules/django_tagging { };

From f69a072f5b5038d2393abac581991baef4c244df Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:23:18 +0200
Subject: [PATCH 36/79] pythonPackages.django-sampledatahelper: init at 0.4.1

---
 .../django-sampledatahelper/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-sampledatahelper/default.nix

diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/pkgs/development/python-modules/django-sampledatahelper/default.nix
new file mode 100644
index 00000000000..5bc0dc379dc
--- /dev/null
+++ b/pkgs/development/python-modules/django-sampledatahelper/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi,
+  django, nose, pillow, sampledata, six, versiontools
+}:
+
+buildPythonPackage rec {
+  pname = "django-sampledatahelper";
+  name = "${pname}-${version}";
+  version = "0.4.1";
+
+  meta = {
+    description = "Helper class for generate sample data for django apps development";
+    homepage = https://github.com/kaleidos/django-sampledatahelper;
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1795zg73lajcsfyd8i8cprb2v93d4csifjnld6bfnya90ncsbl4n";
+  };
+
+  buildInputs = [ django nose pillow sampledata six versiontools ];
+  propagatedBuildInputs = [ django sampledata ];
+
+  # HACK To prevent collision with pythonPackages.sampledata
+  preBuild = ''
+    rm tests/*
+  '';
+
+  # ERROR: test_image_from_directory (tests.tests.TestImageHelpers)
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e64527d148..97eff3605b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8646,6 +8646,8 @@ in {
 
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
+  django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { };
+
   django_tagging = callPackage ../development/python-modules/django_tagging { };
 
   django_tagging_0_3 = self.django_tagging.overrideAttrs (attrs: rec {

From e55f5fe4bc1701978ec2b5f85a92acd35b5335b7 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:24:35 +0200
Subject: [PATCH 37/79] pythonPackages.django-sites: init at 0.9

---
 .../python-modules/django-sites/default.nix   | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-sites/default.nix

diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix
new file mode 100644
index 00000000000..41b532ea184
--- /dev/null
+++ b/pkgs/development/python-modules/django-sites/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, django }:
+
+buildPythonPackage rec {
+  pname = "django-sites";
+  name = "${pname}-${version}";
+  version = "0.9";
+
+  meta = {
+    description = ''
+      Alternative implementation of django "sites" framework
+      based on settings instead of models.
+    '';
+    homepage = https://github.com/niwinz/django-sites;
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05nrydk4a5a99qrxjrcnacs8nbbq5pfjikdpj4w9yn5yfayp057s";
+  };
+
+  propagatedBuildInputs = [ django ];
+
+  # django.core.exceptions.ImproperlyConfigured: Requested settings, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97eff3605b8..5648be16ae8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8648,6 +8648,8 @@ in {
 
   django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { };
 
+  django-sites = callPackage ../development/python-modules/django-sites { };
+
   django_tagging = callPackage ../development/python-modules/django_tagging { };
 
   django_tagging_0_3 = self.django_tagging.overrideAttrs (attrs: rec {

From d18f4dcba36167b5dbe9332aa7f56bc26a12c4f1 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:26:02 +0200
Subject: [PATCH 38/79] pythonPackages.django-sr: init at 0.0.4

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

diff --git a/pkgs/development/python-modules/django-sr/default.nix b/pkgs/development/python-modules/django-sr/default.nix
new file mode 100644
index 00000000000..1f8f9f17d3d
--- /dev/null
+++ b/pkgs/development/python-modules/django-sr/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, django, nose }:
+
+buildPythonPackage rec {
+  pname = "django-sr";
+  name = "${pname}-${version}";
+  version = "0.0.4";
+
+  meta = {
+    description = "Django settings resolver";
+    homepage = https://github.com/jespino/django-sr;
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0d3yqppi1q3crcn9nxx58wzm4yw61d5m7435g6rb9wcamr9bi1im";
+  };
+
+  buildInputs = [ django nose ];
+  propagatedBuildInputs = [ django ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5648be16ae8..e93ebcbb466 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8650,6 +8650,8 @@ in {
 
   django-sites = callPackage ../development/python-modules/django-sites { };
 
+  django-sr = callPackage ../development/python-modules/django-sr { };
+
   django_tagging = callPackage ../development/python-modules/django_tagging { };
 
   django_tagging_0_3 = self.django_tagging.overrideAttrs (attrs: rec {

From 3ac8eed5fd6d7c746628eda2c9af0a0b59815a3e Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:27:20 +0200
Subject: [PATCH 39/79] pythonPackages.djmail: init at 1.0.1

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

diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix
new file mode 100644
index 00000000000..c8e6e2fa03d
--- /dev/null
+++ b/pkgs/development/python-modules/djmail/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi,
+  celery, django, psycopg2
+}:
+
+buildPythonPackage rec {
+  pname = "djmail";
+  name = "${pname}-${version}";
+  version = "1.0.1";
+
+  meta = {
+    description = "Simple, powerfull and nonobstructive django email middleware.";
+    homepage = https://github.com/bameda/djmail;
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1827i9qcn1ki09i5pg0lmar7cxjv18avh76x1n20947p1cimf3rp";
+  };
+
+  propagatedBuildInputs = [ celery django psycopg2 ];
+
+  # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e93ebcbb466..96197cfe343 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8901,6 +8901,8 @@ in {
     };
   };
 
+  djmail = callPackage ../development/python-modules/djmail { };
+
   pillowfight = buildPythonPackage rec {
     name = "pillowfight-${version}";
     version = "0.2";

From 63d57bf246f9646922cc28c05d49c10331ca7662 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Thu, 31 Aug 2017 21:29:58 +0200
Subject: [PATCH 40/79] pythonPackages.flask-mail: init at 0.9.1

---
 .../python-modules/flask-mail/default.nix     | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-mail/default.nix

diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/pkgs/development/python-modules/flask-mail/default.nix
new file mode 100644
index 00000000000..99545a55ba3
--- /dev/null
+++ b/pkgs/development/python-modules/flask-mail/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi,
+  blinker, flask, mock, nose, speaklater
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-Mail";
+  name = "${pname}-${version}";
+  version = "0.9.1";
+
+  meta = {
+    description = "Flask-Mail is a Flask extension providing simple email sending capabilities.";
+    homepage = "https://pypi.python.org/pypi/Flask-Mail";
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hazjc351s3gfbhk975j8k65cg4gf31yq404yfy0gx0bjjdfpr92";
+  };
+
+  propagatedBuildInputs = [ blinker flask ];
+  buildInputs = [ blinker mock nose speaklater ];
+
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96197cfe343..595efffd045 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9470,6 +9470,8 @@ in {
 
   flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { };
 
+  flask_mail = callPackage ../development/python-modules/flask-mail { };
+
   flask_migrate = callPackage ../development/python-modules/flask-migrate { };
 
   flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { };

From d3fc82d81b8d452b5e67dbe48f749be3e9294555 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 1 Sep 2017 10:18:33 +0200
Subject: [PATCH 41/79] pythonPackages.flask-marshmallow: init at 0.8.0

---
 .../flask-marshmallow/default.nix             | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-marshmallow/default.nix

diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix
new file mode 100644
index 00000000000..078b2386975
--- /dev/null
+++ b/pkgs/development/python-modules/flask-marshmallow/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi,
+  flask, six, marshmallow
+}:
+
+buildPythonPackage rec {
+  pname = "flask-marshmallow";
+  name = "${pname}-${version}";
+  version = "0.8.0";
+
+  meta = {
+    homepage = "https://github.com/marshmallow-code/flask-marshmallow";
+    description = "Flask + marshmallow for beautiful APIs";
+    license = lib.licenses.mit;
+  }; 
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fa6xgxrn9bbc2pazbg46iw3ykvpcwib5b5s46qn59ndwj77lifi";
+  };
+
+  propagatedBuildInputs = [ flask marshmallow ];
+  buildInputs = [ six ];
+
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 595efffd045..87a530973f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9472,6 +9472,8 @@ in {
 
   flask_mail = callPackage ../development/python-modules/flask-mail { };
 
+  flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { };
+
   flask_migrate = callPackage ../development/python-modules/flask-migrate { };
 
   flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { };

From b696d6c90db5ebb40cd4b9a9d58f2cadd4441267 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 1 Sep 2017 10:22:26 +0200
Subject: [PATCH 42/79] pythonPackages.marshmallow: init at 2.13.5

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

diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
new file mode 100644
index 00000000000..17325d3204d
--- /dev/null
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi,
+  dateutil, simplejson
+}:
+
+buildPythonPackage rec {
+  pname = "marshmallow";
+  name = "${pname}-${version}";
+  version = "2.13.5";
+
+  meta = {
+    homepage = "https://github.com/marshmallow-code/marshmallow";
+    description = ''
+      A lightweight library for converting complex objects to and from
+      simple Python datatypes.
+    '';
+    license = lib.licenses.mit;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "048rzdkvnais51xdiy27nail5vxjb4ggw3vd60prn1q11lf16wig";
+  };
+
+  propagatedBuildInputs = [ dateutil simplejson ];
+
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87a530973f0..7f5e5af363a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11907,6 +11907,8 @@ in {
     };
   };
 
+  marshmallow = callPackage ../development/python-modules/marshmallow { };
+
   manuel = buildPythonPackage rec {
     name = "manuel-${version}";
     version = "1.8.0";

From 7a337231552d90c6c91ac4bc1edd4950b5d8c5ef Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 1 Sep 2017 10:24:46 +0200
Subject: [PATCH 43/79] pythonPackages.fn: init at 0.4.3

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

diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix
new file mode 100644
index 00000000000..d286459b137
--- /dev/null
+++ b/pkgs/development/python-modules/fn/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "fn";
+  name = "${pname}-${version}";
+  version = "0.4.3";
+
+  meta = {
+    description = ''
+      Functional programming in Python: implementation of missing
+      features to enjoy FP
+    '';
+    homepage = https://github.com/kachayev/fn.py;
+    license = lib.licenses.asl20;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nmsjmn8jb4gp22ksx0j0hhdf4y0zm8rjykyy2i6flzimg6q1kgq";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7f5e5af363a..d08a9f2fbe3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9739,6 +9739,8 @@ in {
     };
   });
 
+  fn = callPackage ../development/python-modules/fn { };
+
   folium = callPackage ../development/python-modules/folium { };
 
   fontforge = pkgs.fontforge.override {

From 820aa5fef983c50f83fd05664fe66cf705194290 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 1 Sep 2017 10:27:02 +0200
Subject: [PATCH 44/79] pythonPackages.marshmallow-sqlalchemy: init at 0.13.1

---
 .../marshmallow-sqlalchemy/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix

diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
new file mode 100644
index 00000000000..a024d73037f
--- /dev/null
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi,
+  marshmallow, sqlalchemy
+}:
+
+buildPythonPackage rec {
+  pname = "marshmallow-sqlalchemy";
+  name = "${pname}-${version}";
+  version = "0.13.1";
+
+  meta = {
+    homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
+    description = "SQLAlchemy integration with marshmallow ";
+    license = lib.licenses.mit;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0082ca2wwc9bymzkp1mr1l5h6rq0k1csv3vcq8ab24x0hdyg5qgk";
+  };
+
+  propagatedBuildInputs = [ marshmallow sqlalchemy ];
+
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d08a9f2fbe3..301100bd29a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11911,6 +11911,8 @@ in {
 
   marshmallow = callPackage ../development/python-modules/marshmallow { };
 
+  marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { };
+
   manuel = buildPythonPackage rec {
     name = "manuel-${version}";
     version = "1.8.0";

From 4b4e05c6ec4f4589a98bb0523ad78a4cdcd89268 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 1 Sep 2017 10:28:52 +0200
Subject: [PATCH 45/79] pythonPackages.premailer: init at 3.0.1

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

diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix
new file mode 100644
index 00000000000..f2f8c0f89fd
--- /dev/null
+++ b/pkgs/development/python-modules/premailer/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi,
+  cssselect, cssutils, lxml, mock, nose, requests
+}:
+
+buildPythonPackage rec {
+  pname = "premailer";
+  name = "${pname}-${version}";
+  version = "3.0.1";
+
+  meta = {
+    description = "Turns CSS blocks into style attributes ";
+    homepage = https://github.com/peterbe/premailer;
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0cmlvqx1dvy16k5q5ylmr43nlfpb9k2zl3q7s4kzhf0lml4wqwaf";
+  };
+
+  buildInputs = [ mock nose ];
+  propagatedBuildInputs = [ cssselect cssutils lxml requests ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 301100bd29a..b1d3b2a0186 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16436,6 +16436,8 @@ in {
     };
   };
 
+  premailer = callPackage ../development/python-modules/premailer { };
+
   prettytable = buildPythonPackage rec {
     name = "prettytable-0.7.1";
 

From 007313d044b39a03e3c8ea896cdddf52cf884b59 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 1 Sep 2017 10:29:59 +0200
Subject: [PATCH 46/79] pythonPackages.psd-tools: init at 1.4

---
 .../python-modules/psd-tools/default.nix      | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/psd-tools/default.nix

diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix
new file mode 100644
index 00000000000..801936d906c
--- /dev/null
+++ b/pkgs/development/python-modules/psd-tools/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi,
+  docopt, pillow
+}:
+
+buildPythonPackage rec {
+  pname = "psd-tools";
+  name = "${pname}-${version}";
+  version = "1.4";
+
+  meta = {
+    description = "Python package for reading Adobe Photoshop PSD files";
+    homepage = https://github.com/kmike/psd-tools;
+    license = lib.licenses.mit;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g2vss5hwlk96w0yj42n7ia56mly51n92f2rlbrifhn8hfbxd38s";
+  };
+
+  propagatedBuildInputs = [ docopt pillow ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b1d3b2a0186..e0ed81a6cbd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16499,6 +16499,8 @@ in {
     protobuf = pkgs.protobuf2_5;
   };
 
+  psd-tools = callPackage ../development/python-modules/psd-tools { };
+
   psutil = buildPythonPackage rec {
     name = "psutil-${version}";
     version = "4.3.0";

From 3836ee50e335638d14ff579e04bb9b69922e8d96 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 1 Sep 2017 10:31:54 +0200
Subject: [PATCH 47/79] pythonPackages.sampledata: init at 0.3.7

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

diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix
new file mode 100644
index 00000000000..b6beb3ec887
--- /dev/null
+++ b/pkgs/development/python-modules/sampledata/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi,
+  nose, pytz, six, versiontools
+}:
+
+buildPythonPackage rec {
+  pname = "sampledata";
+  name = "${pname}-${version}";
+  version = "0.3.7";
+
+  meta = {
+    description = "Sample Data generator for Python ";
+    homepage = https://github.com/jespino/sampledata;
+    license = lib.licenses.bsd3;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1kx2j49lag30d32zhzsr50gl5b949wa4lcdap2filg0d07picsdh";
+  };
+
+  buildInputs = [ nose versiontools ];
+  propagatedBuildInputs = [ pytz six ];
+
+# ERROR: test_image_path_from_directory (tests.tests.TestImageHelpers)
+# ERROR: test_image_stream (tests.tests.TestImageHelpers)
+  doCheck = false;
+
+  checkPhase = ''
+    nosetests -e "TestImageHelpers"
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e0ed81a6cbd..03db39d94ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20080,6 +20080,8 @@ in {
     propagatedBuildInputs = [ self.cffi ];
   };
 
+  sampledata = callPackage ../development/python-modules/sampledata { };
+
   scapy = buildPythonPackage rec {
     name = "scapy-2.2.0";
 

From 7e7f91d23abc690753b834cac4119841cbfa60ee Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 1 Sep 2017 10:33:30 +0200
Subject: [PATCH 48/79] pythonPackages.serpy: init at 0.1.1

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

diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix
new file mode 100644
index 00000000000..e2ecbdcb67a
--- /dev/null
+++ b/pkgs/development/python-modules/serpy/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi,
+  flake8, py, pyflakes, six, tox
+}:
+
+buildPythonPackage rec {
+  pname = "serpy";
+  name = "${pname}-${version}";
+  version = "0.1.1";
+
+  meta = {
+    description = "ridiculously fast object serialization";
+    homepage = https://github.com/clarkduvall/serpy;
+    license = lib.licenses.mit;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0r9wn99x9nbqxfancnq9jh3cn83i1b6gc79xj0ipnxixp661yj5i";
+  };
+
+  buildInputs = [ flake8 py pyflakes tox ];
+  propagatedBuildInputs = [ six ];
+
+  # ImportError: No module named 'tests
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03db39d94ef..49c1d933976 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20206,6 +20206,8 @@ in {
     '';
   };
 
+  serpy = callPackage ../development/python-modules/serpy { };
+
   setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
 
   setuptoolsDarcs = buildPythonPackage rec {

From 4934a4d553843c1fb2bef1fb9075c0e7d86d455c Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Wed, 23 Aug 2017 21:32:24 -0500
Subject: [PATCH 49/79] pythonPackages.parse: init at 1.6.6

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

diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix
new file mode 100644
index 00000000000..eaca200e2bf
--- /dev/null
+++ b/pkgs/development/python-modules/parse/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchPypi, fetchpatch
+, buildPythonPackage, python
+}:
+buildPythonPackage rec {
+  pname = "parse";
+  version = "1.6.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "71435aaac494e08cec76de646de2aab8392c114e56fe3f81c565ecc7eb886178";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "python-3.5-tests-compat.patch";
+      url = "https://github.com/r1chardj0n3s/parse/pull/34.patch";
+      sha256 = "16iicgkf3lwivmdnp3xkq4n87wjmr3nb77z8mwz67b7by9nnp3jg";
+    })
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} test_parse.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/r1chardj0n3s/parse;
+    description = "parse() is the opposite of format()";
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ alunduil ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49c1d933976..40afe46c3b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27574,6 +27574,8 @@ EOF
   thinc = callPackage ../development/python-modules/thinc { };
 
   spacy = callPackage ../development/python-modules/spacy { };
+ 
+  parse = callPackage ../development/python-modules/parse { };
 });
 
 in fix' (extends overrides packages)

From f06d7bd1251e69c746761011f21ad849316f550f Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Wed, 23 Aug 2017 21:43:08 -0500
Subject: [PATCH 50/79] pythonPackages.pyhamcrest: init at 1.9.0

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

diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
new file mode 100644
index 00000000000..6b1eebd95c4
--- /dev/null
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonApplication, fetchPypi
+, mock, pytest
+, six
+}:
+buildPythonApplication rec {
+  pname = "PyHamcrest";
+  version = "1.9.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd";
+  };
+
+  checkInputs = [ mock pytest ];
+  propagatedBuildInputs = [ six ];
+
+  doCheck = false;  # pypi tarball does not include tests
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/hamcrest/PyHamcrest;
+    description = "Hamcrest framework for matcher objects";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [
+      alunduil
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40afe46c3b7..ded6e0ff4c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27574,6 +27574,8 @@ EOF
   thinc = callPackage ../development/python-modules/thinc { };
 
   spacy = callPackage ../development/python-modules/spacy { };
+
+  pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
  
   parse = callPackage ../development/python-modules/parse { };
 });

From 83dbb41aed4033318eb83f3897a22816a6943a14 Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Wed, 23 Aug 2017 22:57:28 -0500
Subject: [PATCH 51/79] pythonPackages.parse-type: init at 0.3.4

---
 .../python-modules/parse-type/default.nix     | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/parse-type/default.nix

diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
new file mode 100644
index 00000000000..69a02c42b74
--- /dev/null
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchPypi, fetchpatch
+, buildPythonPackage, pythonOlder
+, pytest, pytestrunner
+, parse, six, enum34
+}:
+buildPythonPackage rec {
+  pname = "parse-type";
+  version = "0.3.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "parse_type";
+    sha256 = "3dd0b323bafcb8c25e000ce5589042a1c99cba9c3bec77b9f591e46bc9606147";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "python-3.5-tests-compat.patch";
+      url = "https://github.com/jenisys/parse_type/pull/4.patch";
+      sha256 = "1mmn2fxss6q3qhaydd4s4v8vjgvgkg41v1vcivrzdsvgsc3npg7m";
+    })
+  ];
+
+  checkInputs = [ pytest pytestrunner ];
+  propagatedBuildInputs = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/jenisys/parse_type;
+    description = "Simplifies to build parse types based on the parse module";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ alunduil ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ded6e0ff4c6..8843aad0a92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27578,6 +27578,8 @@ EOF
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
  
   parse = callPackage ../development/python-modules/parse { };
+  
+  parse-type = callPackage ../development/python-modules/parse-type { };
 });
 
 in fix' (extends overrides packages)

From 637ccde4354e5991106a6e35c9c6c451bda27be4 Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Sun, 27 Aug 2017 22:09:23 -0500
Subject: [PATCH 52/79] python.pkgs.behave: init at 1.2.5

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

diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
new file mode 100644
index 00000000000..80acc58f654
--- /dev/null
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchPypi
+, buildPythonApplication, python, pythonAtLeast
+, mock, nose, pyhamcrest
+, glibcLocales, parse, parse-type, six
+}:
+buildPythonApplication rec {
+  pname = "behave";
+  version = "1.2.5";
+  name = "${pname}-${version}";
+
+  disabled = pythonAtLeast "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "81b731ac5187e31e4aad2594944fa914943683a9818320846d037c5ebd6d5d0b";
+  };
+
+  checkInputs = [ mock nose pyhamcrest ];
+  buildInputs = [ glibcLocales ];
+  propagatedBuildInputs = [ parse parse-type six ];
+
+  postPatch = ''
+    patchShebangs bin
+  '';
+
+  doCheck = true;
+
+  checkPhase = ''
+    export LANG="en_US.UTF-8"
+    export LC_ALL="en_US.UTF-8"
+
+    nosetests -x
+
+    ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/
+    ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/
+    ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/behave/behave;
+    description = "behaviour-driven development, Python style";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ alunduil ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8843aad0a92..11573007151 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27575,6 +27575,8 @@ EOF
 
   spacy = callPackage ../development/python-modules/spacy { };
 
+  behave = callPackage ../development/python-modules/behave { };
+
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
  
   parse = callPackage ../development/python-modules/parse { };

From 2c3cc4e921a22c68098e8d1c3089316c4b7ac011 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 6 Sep 2017 15:54:37 +0200
Subject: [PATCH 53/79] pythonPackages.django: 1.11.4 -> 1.11.5

Fixes CVE-2017-12794
See https://docs.djangoproject.com/en/1.11/releases/1.11.5/
---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index cbdbb57181a..f727751eda5 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -5,13 +5,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "1.11.4";
+  version = "1.11.5";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
-    sha256 = "1ckvq2sdlgpy2sqy6fwl84ms9dggvdbys9x76qapm2d9vmknxs5b";
+    sha256 = "0a9bk1a0n0264lcr67fmwzqyhkhy6bqdzkxsj9a8dpyzca0qfdhq";
   };
 
   patches = [

From a602e1aa7061c2dfc1e348863f655c749db32fa9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 4 Sep 2017 17:19:30 +0200
Subject: [PATCH 54/79] pythonPackages.libarchive-c: Disable failing test

https://github.com/NixOS/nixpkgs/commit/f9f9749fd2a7b75bea9660a60634965de98bac88#commitcomment-24028305
(cherry picked from commit 22d4630e683b9e0fddf34fdc276fc08014e4ae61)
---
 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 11573007151..ed359b9fb98 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24054,7 +24054,7 @@ EOF
         "find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'"
     '';
     checkPhase = ''
-      py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip'
+      py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar'
     '';
 
     buildInputs = with self; [ pytest pkgs.glibcLocales ];

From 90433ed831e8ec58a5a803ad5f923c7e2fcbd894 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 31 Aug 2017 15:53:02 +0800
Subject: [PATCH 55/79] diffoscope: 77 -> 85

---
 pkgs/tools/misc/diffoscope/default.nix | 38 ++++++++++++--------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 6472f1ea09c..61066cec04d 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,25 +1,24 @@
-{ lib, stdenv, fetchgit, fetchpatch, python3, docutils
+{ lib, stdenv, fetchgit, fetchpatch, python3Packages, docutils
 , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
-, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz
+, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, xxd, xz
 , colordiff
 , enableBloat ? false
 }:
 
-python3.pkgs.buildPythonApplication rec {
-  pname = "diffoscope";
-  name = "${pname}-${version}";
-  version = "77";
+python3Packages.buildPythonApplication rec {
+  name = "diffoscope-${version}";
+  version = "85";
 
   src = fetchgit {
-    url = "git://anonscm.debian.org/reproducible/diffoscope.git";
-    rev = "refs/tags/${version}";
-    sha256 = "0l5q24sqb88qkz62cz85bq65myfqig3z3m1lj2s92hdlqip9946b";
+    url    = "git://anonscm.debian.org/reproducible/diffoscope.git";
+    rev    = "refs/tags/${version}";
+    sha256 = "0kmcfhgva1fl6x5b07sc7k6ba9mqs3ma0lvspxm31w7nrrrqcvlr";
   };
 
-  patches =
-    [ # Ignore different link counts.
-      ./ignore_links.patch
-    ];
+  patches = [
+    # Ignore different link counts - doesn't work with 85
+    # ./ignore_links.patch
+  ];
 
   postPatch = ''
     # Upstream doesn't provide a PKG-INFO file
@@ -28,10 +27,9 @@ python3.pkgs.buildPythonApplication rec {
 
   # Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf
   # Also these libraries: python3-guestfs
-  # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-  pythonPath = with python3.pkgs;
+  pythonPath = with python3Packages;
     [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext
-      gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
+      gzip libcaca poppler_utils sng sqlite squashfsTools unzip xxd xz colordiff
     ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
@@ -53,9 +51,9 @@ python3.pkgs.buildPythonApplication rec {
       diffoscope is developed as part of the "reproducible builds" Debian
       project and was formerly known as "debbindiff".
     '';
-    homepage = https://wiki.debian.org/ReproducibleBuilds;
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.linux;
+    homepage    = https://wiki.debian.org/ReproducibleBuilds;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ dezgeg ];
+    platforms   = platforms.linux;
   };
 }

From 1b9615e62cf5c01961039bfd0fe9478e71a7cc59 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 31 Aug 2017 15:52:46 +0800
Subject: [PATCH 56/79] libarchive-c: 2.5 -> 2.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed359b9fb98..5ca794bdf87 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24040,11 +24040,11 @@ EOF
 
   libarchive-c = buildPythonPackage rec {
     name = "libarchive-c-${version}";
-    version = "2.5";
+    version = "2.7";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/libarchive-c/${name}.tar.gz";
-      sha256 = "98660daa2501d2da51ab6f39893dc24e88916e72b2d80c205641faa5bce66859";
+      sha256 = "011bfsmqpcwd6920kckllh7zhw2y4rrasgmddb7wjzn2hg1xpsjn";
     };
 
     LC_ALL="en_US.UTF-8";

From a869636e54e71fcb18db96ebd255b1bc9582ebfb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Thu, 24 Aug 2017 10:52:29 +0200
Subject: [PATCH 57/79] pythonPackages.markdown: 2.6.7 -> 2.6.8

---
 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 5ca794bdf87..3ff642184b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11932,12 +11932,12 @@ in {
   };
 
   markdown = buildPythonPackage rec {
-    version = "2.6.7";
+    version = "2.6.8";
     name = "markdown-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/M/Markdown/Markdown-${version}.tar.gz";
-      sha256 = "1h055llfd0ps0ig7qb3v1j9068xv90dc9s7xkhkgz9zg8r4g5sys";
+      sha256 = "0cqfhr1km2s5d8jm6hbwgkrrj9hvkjf2gab3s2axlrw1clgaij0a";
     };
 
     # error: invalid command 'test'

From 70de5af18cfc8c5c9a9f63e0316ca29fbf881440 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Thu, 24 Aug 2017 10:55:09 +0200
Subject: [PATCH 58/79] pythonPackages.backports_weakref: init 1.0rc1

---
 .../backports_weakref/default.nix             | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 ++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/backports_weakref/default.nix

diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix
new file mode 100644
index 00000000000..ad9f7582c09
--- /dev/null
+++ b/pkgs/development/python-modules/backports_weakref/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+# , backports
+, python
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "backports.weakref";
+  version = "1.0rc1";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "14i8m3lspykdfpzf50grij3z286j9q8f32f2bnwdicv659qvy4w8";
+  };
+
+  buildInputs = [ setuptools_scm ];
+#   checkInputs = [ backports ];
+
+  # Requires backports package
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Backports of new features in Python’s weakref module";
+    license = licenses.psfl;
+    maintainers = with maintainers; [ jpbernardy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ff642184b8..796bd1cb428 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27571,6 +27571,8 @@ EOF
 
   preshed = callPackage ../development/python-modules/preshed { };
 
+  backports_weakref = callPackage ../development/python-modules/backports_weakref { }; 
+
   thinc = callPackage ../development/python-modules/thinc { };
 
   spacy = callPackage ../development/python-modules/spacy { };
@@ -27580,8 +27582,9 @@ EOF
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
  
   parse = callPackage ../development/python-modules/parse { };
-  
+
   parse-type = callPackage ../development/python-modules/parse-type { };
+
 });
 
 in fix' (extends overrides packages)

From 2489a0aca7efde1f2c983cf7a0cab81c01f6cda6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Thu, 24 Aug 2017 10:57:45 +0200
Subject: [PATCH 59/79] protobuf: add 3.3

---
 pkgs/development/libraries/protobuf/3.3.nix | 6 ++++++
 pkgs/top-level/all-packages.nix             | 3 +--
 pkgs/top-level/python-packages.nix          | 6 +++++-
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/protobuf/3.3.nix

diff --git a/pkgs/development/libraries/protobuf/3.3.nix b/pkgs/development/libraries/protobuf/3.3.nix
new file mode 100644
index 00000000000..e6a8f05cc18
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.3.nix
@@ -0,0 +1,6 @@
+{ callPackage, lib, ... }:
+
+lib.overrideDerivation (callPackage ./generic-v3.nix {
+  version = "3.3.0";
+  sha256 = "1258yz9flyyaswh3izv227kwnhwcxn4nwavdz9iznqmh24qmi59w";
+}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d30e7f1fab..3f8f8793db1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9983,10 +9983,9 @@ with pkgs;
 
   protobuf = protobuf2_6;
   protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
-  # 3.0.0-beta-2 is only introduced for tensorflow. remove this version when tensorflow is moved to 3.0.
-  protobuf3_0_0b2 = lowPrio (callPackage ../development/libraries/protobuf/3.0.0-beta-2.nix { });
   protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
   protobuf3_2 = callPackage ../development/libraries/protobuf/3.2.nix { };
+  protobuf3_3 = callPackage ../development/libraries/protobuf/3.3.nix { };
   protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 796bd1cb428..69a1e4200b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16478,7 +16478,11 @@ in {
   });
 
   protobuf = self.protobuf2_6;
-  # only required by tensorflow
+  protobuf3_3 = callPackage ../development/python-modules/protobuf.nix {
+    disabled = isPyPy;
+    doCheck = !isPy3k;
+    protobuf = pkgs.protobuf3_3;
+  };
   protobuf3_2 = callPackage ../development/python-modules/protobuf.nix {
     disabled = isPyPy;
     doCheck = !isPy3k;

From d51bd3664652d7614a42b1747cab4577a65b703c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Thu, 24 Aug 2017 13:51:53 +0200
Subject: [PATCH 60/79] cudnn: add 6.0

---
 .../science/math/cudnn/8.0-6.0/default.nix    | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix

diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix
new file mode 100644
index 00000000000..21efe5b5957
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, requireFile
+, cudatoolkit
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  version = "6.0";
+  cudatoolkit_version = "8.0";
+
+  name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}";
+
+  src = fetchurl {
+    url = "http://developer.download.nvidia.com/compute/redist/cudnn/v6.0/cudnn-8.0-linux-x64-v6.0.tgz";
+    sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv";
+  };
+
+  installPhase = ''
+    function fixRunPath {
+      p=$(patchelf --print-rpath $1)
+      patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1
+    }
+    fixRunPath lib64/libcudnn.so
+
+    mkdir -p $out
+    cp -a include $out/include
+    cp -a lib64 $out/lib64
+  '';
+
+  propagatedBuildInputs = [
+    cudatoolkit
+  ];
+
+  meta = with stdenv.lib; {
+    description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
+    homepage = https://developer.nvidia.com/cudnn;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with maintainers; [ jpbernardy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f8f8793db1..a1fecd1b087 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1565,6 +1565,10 @@ with pkgs;
     cudatoolkit = cudatoolkit8;
   };
 
+  cudnn60_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-6.0 {
+    cudatoolkit = cudatoolkit8;
+  };
+
   curlFull = curl.override {
     idnSupport = true;
     ldapSupport = true;

From 49ce901f119db06a237a9bad36a1d45d82949b98 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 16:36:58 +0200
Subject: [PATCH 61/79] python.pkgs.cgkit: remove old and broken package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69a1e4200b2..c1386fea6f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2644,34 +2644,6 @@ in {
 
   characteristic = callPackage ../development/python-modules/characteristic { };
 
-  # This package is no longer actively maintained and can be removed if it becomes broken.
-  cgkit = buildPythonPackage rec {
-    version = "2.0.0";
-    name = "cgkit-${version}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz";
-      sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6";
-    };
-
-    patches = [ ../development/python-modules/cgkit/scons-env.patch ];
-
-    buildInputs = with pkgs; [ scons boost mesa ];
-
-    preBuild = ''
-      cd supportlib
-      scons
-      cd -
-    '';
-
-    meta = {
-      homepage = http://cgkit.sourceforge.net;
-      description = "Python Computer Graphics Kit";
-      maintainers = with maintainers; [ expipiplus1 ];
-    };
-  };
-
   cheetah = buildPythonPackage rec {
     version = "2.4.4";
     name = "cheetah-${version}";

From b00be43cdfa323bb52ca1b7a0271bcdd7bc2e272 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 16:38:46 +0200
Subject: [PATCH 62/79] gmvault: fix build

---
 pkgs/tools/networking/gmvault/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index ba22d1d679c..06eb196c7a7 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -21,6 +21,7 @@ pythonPackages.buildPythonApplication rec {
     cat ${startScript} > etc/scripts/gmvault
     chmod +x etc/scripts/gmvault
     substituteInPlace setup.py --replace "==" ">="
+    substituteInPlace setup.py --replace "argparse" ""
   '';
 
   meta = {

From 79257d28e8c8dc3474a620e538041883e73134fe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 16:44:30 +0200
Subject: [PATCH 63/79] python.pkgs.zetup: 0.2.42 -> 0.2.34

downgrade because the previous upgrade broke the package. The latest
version requires a setuptools bump which we won't do yet.
---
 pkgs/development/python-modules/zetup/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
index a682a6e4e92..0c1ece54fb6 100644
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -5,18 +5,18 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "zetup";
-  version = "0.2.42";
+  version = "0.2.34";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c";
+    sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf";
   };
 
   checkPhase = ''
     py.test test
   '';
 
-  buildInputs = [ pytest pathpy nbconvert ];
+  checkInputs = [ pytest pathpy nbconvert ];
   propagatedBuildInputs = [ setuptools_scm ];
 
   meta = with stdenv.lib; {

From d45e554457b934814a2306d96db7eee58887511b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 16:52:41 +0200
Subject: [PATCH 64/79] mycli: move out of python-packages.nix and fix build

---
 pkgs/tools/admin/mycli/default.nix | 38 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 33 --------------------------
 3 files changed, 40 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/tools/admin/mycli/default.nix

diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix
new file mode 100644
index 00000000000..bd0f051bd84
--- /dev/null
+++ b/pkgs/tools/admin/mycli/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, python
+}:
+
+with python.pkgs;
+
+buildPythonApplication rec {
+  pname = "mycli";
+  version = "1.6.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qg4b62kizyb16kk0cvpk70bfs3gg4q4hj2b15nnc7a3gqqfp67j";
+  };
+
+  propagatedBuildInputs = [
+    pymysql configobj sqlparse prompt_toolkit pygments click pycrypto
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "==" ">="
+  '';
+
+  # No tests in archive. Newer versions do include tests
+  doCheck = false;
+
+  meta = {
+    inherit version;
+    description = "Command-line interface for MySQL";
+    longDescription = ''
+      Rich command-line interface for MySQL with auto-completion and
+      syntax highlighting.
+    '';
+    homepage = http://mycli.net;
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1fecd1b087..30a6625cf39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3351,6 +3351,8 @@ with pkgs;
 
   munge = callPackage ../tools/security/munge { };
 
+  mycli = callPackage ../tools/admin/mycli { };
+
   mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { };
 
   mysqltuner = callPackage ../tools/misc/mysqltuner { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c1386fea6f6..77c43d6f3d2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15984,39 +15984,6 @@ in {
     };
   };
 
-
-  mycli = buildPythonPackage rec {
-    name = "mycli-${version}";
-    version = "1.6.0";
-    disabled = isPy35;
-
-    src = pkgs.fetchFromGitHub {
-      sha256 = "0vvl36gxawa0h36v119j47fdylj8k73ak6hv04s5cjqn5adcjjbh";
-      rev = "v${version}";
-      repo = "mycli";
-      owner = "dbcli";
-    };
-
-    propagatedBuildInputs = with self; [
-      pymysql configobj sqlparse prompt_toolkit pygments click pycrypto
-    ];
-
-    postPatch = ''
-      substituteInPlace setup.py --replace "==" ">="
-    '';
-
-    meta = {
-      inherit version;
-      description = "Command-line interface for MySQL";
-      longDescription = ''
-        Rich command-line interface for MySQL with auto-completion and
-        syntax highlighting.
-      '';
-      homepage = http://mycli.net;
-      license = licenses.bsd3;
-    };
-  };
-
   pickleshare = buildPythonPackage rec {
     version = "0.7.4";
     name = "pickleshare-${version}";

From 785d7f2349642f8130b185bbc86c3c3f4ce7ecc2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 16:58:52 +0200
Subject: [PATCH 65/79] python.pkgs.jsonnet: disable for Python 3

---
 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 77c43d6f3d2..23c53798e17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11146,6 +11146,8 @@ in {
 
   jsonnet = buildPythonPackage {
     inherit (pkgs.jsonnet) name src;
+    # Python 3 is not yet supported https://github.com/google/jsonnet/pull/335
+    disabled = isPy3k;
   };
 
   jupyter_client = callPackage ../development/python-modules/jupyter_client { };

From c7299ea37b13192808f265524b127f7139c56277 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 17:03:47 +0200
Subject: [PATCH 66/79] python.pkgs.koji: fix build

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

diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
index d43e56781a7..5c14fa05af6 100644
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pycurl }:
+{ stdenv, fetchurl, buildPythonPackage, pycurl, isPy3k }:
 
 buildPythonPackage rec {
   pname = "koji";
@@ -7,12 +7,15 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";
-    sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
+    url = "https://github.com/koji-project/koji/archive/koji-1.8.0.tar.gz";
+    sha256 = "17rkipdxccdccbbb70f9wx91cq9713psmq23j7lgb4mlnwan926h";
   };
 
   propagatedBuildInputs = [ pycurl ];
 
+  # Judging from SyntaxError
+  disabled = isPy3k;
+
   makeFlags = "DESTDIR=$(out)";
 
   postInstall = ''

From 6bbc2e09da03f7b49794b3381c2baeb62ac62f24 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 17:15:30 +0200
Subject: [PATCH 67/79] python.pkgs.astropy: fix build

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

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 44ff96cf826..ba73c232c89 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -2,9 +2,7 @@
 , fetchPypi
 , buildPythonPackage
 , numpy
-, cython
-, h5py
-, scipy }:
+, pytest }:
 
 buildPythonPackage rec {
   
@@ -17,7 +15,8 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e";
   };
-  propagatedBuildInputs = [ numpy cython h5py scipy ];
+
+  propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
 
 
   meta = {

From c4ec44e4d72d7a5a4c6670a4feb59de4df8516d7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 17:28:21 +0200
Subject: [PATCH 68/79] python.pkgs.pylint: use fetchPypi

---
 .../python-modules/pylint/default.nix         | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 8c82cb52910..8c0fd1b7a8f 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,42 +1,42 @@
-{ stdenv, fetchurl, buildPythonPackage, python, astroid, isort,
+{ stdenv, buildPythonPackage, fetchPypi, python, astroid, isort,
   pytest, pytestrunner,  mccabe, configparser, backports_functools_lru_cache }:
 
-  buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "pylint";
-    version = "1.7.2";
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pylint";
+  version = "1.7.2";
 
-    src = fetchurl {
-      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69";
-    };
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69";
+  };
 
-    buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
+  buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
 
-    propagatedBuildInputs = [ astroid configparser isort ];
+  propagatedBuildInputs = [ astroid configparser isort ];
 
-    postPatch = ''
-      # Remove broken darwin tests
-      sed -i -e '/test_parallel_execution/,+2d' pylint/test/test_self.py
-      sed -i -e '/test_py3k_jobs_option/,+4d' pylint/test/test_self.py
-      rm -vf pylint/test/test_functional.py
-    '';
+  postPatch = ''
+    # Remove broken darwin tests
+    sed -i -e '/test_parallel_execution/,+2d' pylint/test/test_self.py
+    sed -i -e '/test_py3k_jobs_option/,+4d' pylint/test/test_self.py
+    rm -vf pylint/test/test_functional.py
+  '';
 
-    checkPhase = ''
-      cd pylint/test
-      ${python.interpreter} -m unittest discover -p "*test*"
-    '';
+  checkPhase = ''
+    cd pylint/test
+    ${python.interpreter} -m unittest discover -p "*test*"
+  '';
 
-    postInstall = ''
-      mkdir -p $out/share/emacs/site-lisp
-      cp "elisp/"*.el $out/share/emacs/site-lisp/
-    '';
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp
+    cp "elisp/"*.el $out/share/emacs/site-lisp/
+  '';
 
-    meta = with stdenv.lib; {
-      homepage = http://www.logilab.org/project/pylint;
-      description = "A bug and style checker for Python";
-      platforms = platforms.all;
-      license = licenses.gpl1Plus;
-      maintainers = with maintainers; [ nand0p ];
-    };
-  }
+  meta = with stdenv.lib; {
+    homepage = http://www.logilab.org/project/pylint;
+    description = "A bug and style checker for Python";
+    platforms = platforms.all;
+    license = licenses.gpl1Plus;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}

From b1504b444bc72db3414b0ca095d76789f68ebcd3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 17:28:57 +0200
Subject: [PATCH 69/79] conan: 0.21.2 -> 0.26.2, and fix build

---
 .../tools/build-managers/conan/default.nix    | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 69cc2db3ff2..1558772ed60 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,18 +1,41 @@
-{ stdenv, pythonPackages }:
+{ stdenv, python }:
 
-pythonPackages.buildPythonApplication rec {
-  name = "${pname}-${version}";
-  version = "0.21.2";
-  pname = "conan";
-
-  src = pythonPackages.fetchPypi {
-    inherit pname version;
-    sha256 = "0x9s5h81d885xdrjw5x99q18lhmj11kalrs6xnjy2phrr8qzil8c";
+let
+  p = python.override {
+    packageOverrides = self: super: {
+      astroid = super.astroid.overridePythonAttrs (oldAttrs: rec {
+        version = "1.4.9";
+        name = "${oldAttrs.pname}-${version}";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7";
+        };
+      });
+      pylint = super.pylint.overridePythonAttrs (oldAttrs: rec {
+        version = "1.6.5";
+        name = "${oldAttrs.pname}-${version}";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "a673984a8dd78e4a8b8cfdee5359a1309d833cf38405008f4a249994a8456719";
+        };
+      });
+    };
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+in p.pkgs.buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "0.26.1";
+  pname = "conan";
+
+  src = p.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "2da5a140a74d912d5561698b8cc5a5e5583b9dbe36623c59b4ce4be586476e7c";
+  };
+
+  propagatedBuildInputs = with p.pkgs; [
     requests fasteners pyyaml pyjwt colorama patch
     bottle pluginbase six distro pylint node-semver
+    future pygments mccabe
   ];
 
   # enable tests once all of these pythonPackages available:

From 6d3f5cb40906b46e9bc1ebac6b6f959a8f4f3b92 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 17:31:38 +0200
Subject: [PATCH 70/79] python.pkgs.flask: disable tests

---
 pkgs/development/python-modules/flask/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index b16dc08a5e1..5e77de84fed 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, itsdangerous, click, werkzeug, jinja2 }:
+, itsdangerous, click, werkzeug, jinja2, pytest }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -11,8 +11,16 @@ buildPythonPackage rec {
     sha256 = "1hfs2jr2m5lr51xd4gblb28rncd0xrpycz6c07cyqsbv4dhl9x29";
   };
 
+  checkInputs = [ pytest ];
   propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ];
 
+  checkPhase = ''
+    py.test
+  '';
+
+  # Tests require extra dependencies
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = http://flask.pocoo.org/;
     description = "A microframework based on Werkzeug, Jinja 2, and good intentions";

From a3e524054fcb129a71c4bf35cffba67e983fe1af Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 17:46:09 +0200
Subject: [PATCH 71/79] mitmproxy: fix build

which was broken after the cryptography bump to 2.x.

cc maintainer @fpletz
---
 pkgs/tools/networking/mitmproxy/default.nix | 29 ++++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 2d24a2973f2..db01b012a14 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -1,6 +1,27 @@
-{ stdenv, fetchpatch, fetchFromGitHub, python3Packages, glibcLocales }:
+{ stdenv, fetchpatch, fetchFromGitHub, python3, glibcLocales }:
 
-python3Packages.buildPythonPackage rec {
+let
+  p = python3.override {
+    packageOverrides = self: super: {
+      cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec {
+        version = "1.8.2";
+        name = "${oldAttrs.pname}-${version}";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "8e88ebac371a388024dab3ccf393bf3c1790d21bc3c299d5a6f9f83fb823beda";
+        };
+      });
+      cryptography_vectors = super.cryptography_vectors.overridePythonAttrs (oldAttrs: rec {
+        version = self.cryptography.version;
+        name = "${oldAttrs.pname}-${version}";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "00daa04c9870345f56605d91d7d4897bc1b16f6fff7c74cb602b08ef16c0fb43";
+        };
+      });
+    };
+  };
+in p.pkgs.buildPythonPackage rec {
   baseName = "mitmproxy";
   name = "${baseName}-${version}";
   version = "2.0.2";
@@ -33,7 +54,7 @@ python3Packages.buildPythonPackage rec {
     LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo'
   '';
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with p.pkgs; [
     blinker click certifi construct cryptography
     cssutils editorconfig h2 html2text hyperframe
     jsbeautifier kaitaistruct passlib pyasn1 pyopenssl
@@ -41,7 +62,7 @@ python3Packages.buildPythonPackage rec {
     urwid watchdog brotlipy sortedcontainers
   ];
 
-  buildInputs = with python3Packages; [
+  buildInputs = with p.pkgs; [
     beautifulsoup4 flask pytz pytest pytestrunner protobuf3_2 glibcLocales
   ];
 

From 5e64cc6cf0d077499b10dd40b6bd9918ebf352e2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 18:01:27 +0200
Subject: [PATCH 72/79] toot: 0.8.0 -> 0.13.0

---
 pkgs/applications/misc/toot/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index 4f66d7167e1..0342722c7f7 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,19 +1,25 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.8.0";
+  version = "0.13.0";
   name    = "toot-${version}";
 
   src = fetchFromGitHub {
     owner  = "ihabunek";
     repo   = "toot";
     rev    = "${version}";
-    sha256 = "1y1jz4f53njq94zab0icf7jhd4jp10ywm508l4lw6spb69wr7rdy";
+    sha256 = "0gbsq43qv5qg4avx7czs57k40m8lzh8f1z5yizqqc7r02p2sacnc";
   };
 
+  checkInputs = with pythonPackages; [ pytest ];
+
   propagatedBuildInputs = with pythonPackages;
     [ requests beautifulsoup4 future ];
 
+  checkPhase = ''
+    py.test
+  '';
+
   meta = with stdenv.lib; {
     description = "Mastodon CLI interface";
     homepage    = "https://github.com/ihabunek/toot";

From 8d7e8a6720aecd242a3d12c1a6a09b190513f1ca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 18:04:56 +0200
Subject: [PATCH 73/79] python.pkgs.passlib: move to own file

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

diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
new file mode 100644
index 00000000000..bdf51461355
--- /dev/null
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, bcrypt
+}:
+
+buildPythonPackage rec {
+  pname = "passlib";
+  version = "1.6.5";
+  name    = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8";
+  };
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ bcrypt ];
+
+  meta = {
+    description = "A password hashing library for Python";
+    homepage    = https://code.google.com/p/passlib/;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23c53798e17..86f341969dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7195,23 +7195,7 @@ in {
     };
   };
 
-  passlib = buildPythonPackage rec {
-    version = "1.6.5";
-    name    = "passlib-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/passlib/passlib-${version}.tar.gz";
-      sha256 = "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ bcrypt ];
-
-    meta = {
-      description = "A password hashing library for Python";
-      homepage    = https://code.google.com/p/passlib/;
-    };
-  };
+  passlib = callPackage ../development/python-modules/passlib { };
 
   path-and-address = buildPythonPackage rec {
     version = "2.0.1";

From a4129e7b9e598389f0cbf5b3fbdb29de062b89bf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 18:09:45 +0200
Subject: [PATCH 74/79] python.pkgs.passlib: 1.6.5 -> 1.7.1

---
 pkgs/development/python-modules/passlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index bdf51461355..c269a414f82 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "passlib";
-  version = "1.6.5";
+  version = "1.7.1";
   name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8";
+    sha256 = "3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0";
   };
 
   checkInputs = [ nose ];

From a2b8f39d636dfc3b4411aa4bc8dd42cb07d128b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 18:15:46 +0200
Subject: [PATCH 75/79] python.pkgs.ftfy: disable Python 2

---
 pkgs/development/python-modules/ftfy/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index e5335867702..f5d25626bcf 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -5,6 +5,7 @@
 , wcwidth
 , nose
 , python
+, isPy3k
 }:
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -18,14 +19,21 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ html5lib wcwidth];
 
-  buildInputs = [
+  checkInputs = [
     nose
   ];
 
   checkPhase = ''
-    nosetests -v
+    nosetests -v tests
   '';
 
+  # Several tests fail with
+  # FileNotFoundError: [Errno 2] No such file or directory: 'ftfy'
+  doCheck = false;
+
+  # "this version of ftfy is no longer written for Python 2"
+  disabled = !isPy3k;
+
   meta = with stdenv.lib; {
     description = "Given Unicode text, make its representation consistent and possibly less broken.";
     homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests;

From 62464e28fd41825b65819e59a86beb3788525de5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 18:37:33 +0200
Subject: [PATCH 76/79] python.pkgs.pybfd: fix build

---
 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 86f341969dc..5c44b423e93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16842,7 +16842,7 @@ in {
     preConfigure = ''
       substituteInPlace setup.py \
         --replace '"/usr/include"' '"${pkgs.gdb}/include"' \
-        --replace '"/usr/lib"' '"${pkgs.binutils.out}/lib"'
+        --replace '"/usr/lib"' '"${pkgs.binutils.lib}/lib"'
     '';
 
     meta = {

From 71670376bc59469cb0811878102a0a36af6d40d1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 18:42:35 +0200
Subject: [PATCH 77/79] python.pkgs.yamllint: fix build

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

diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 2f0b12618e5..2923fcaf3eb 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, nose, pyyaml }:
+, nose, pyyaml, pathspec }:
 
 buildPythonPackage rec {
   pname = "yamllint";
@@ -11,9 +11,12 @@ buildPythonPackage rec {
     sha256 = "048743567ca9511e19222233ebb53795586a2cede07b79e801577e0a9b4f173c";
   };
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
 
-  propagatedBuildInputs = [  pyyaml ];
+  propagatedBuildInputs = [  pyyaml pathspec ];
+
+  # Two test failures
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "A linter for YAML files";

From e4b94fa60f72a4e55c966f1566b5a828e7ccc5ca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 18:42:51 +0200
Subject: [PATCH 78/79] python.pkgs.pathspec: 0.5.2 -> 0.5.3

---
 .../python-modules/pathspec/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +--------------
 2 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/pathspec/default.nix

diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
new file mode 100644
index 00000000000..f3995758521
--- /dev/null
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname   = "pathspec";
+  version = "0.5.3";
+  name    = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "54478a66a360f4ebe4499c9235e4206fca5dec837b8e272d1ce37e0a626cc64d";
+  };
+
+  meta = {
+    description = "Utility library for gitignore-style pattern matching of file paths";
+    homepage = "https://github.com/cpburnz/python-path-specification";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ copumpkin ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c44b423e93..4d029cbf7ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7136,23 +7136,7 @@ in {
     };
   };
 
-  pathspec = buildPythonPackage rec {
-    pname   = "pathspec";
-    version = "0.5.2";
-    name    = "${pname}-${version}";
-
-    src = self.fetchPypi {
-      inherit pname version;
-      sha256 = "f9fdf4408f4adb30e9f507f61d3a41c968e9c6e6c519d4bbd2a189627b5e86f0";
-    };
-
-    meta = {
-      description = "Utility library for gitignore-style pattern matching of file paths";
-      homepage = "https://github.com/cpburnz/python-path-specification";
-      license = licenses.mpl20;
-      maintainers = with maintainers; [ copumpkin ];
-    };
-  };
+  pathspec = callPackage ../development/python-modules/pathspec { };
 
   pathtools = buildPythonPackage rec {
     name = "pathtools-${version}";

From 4ecfeb56a78e4c9c673c2fb9e30463e41fa2b131 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 18:51:58 +0200
Subject: [PATCH 79/79] acd-cli: use python36

---
 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 30a6625cf39..4324e76b668 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13413,7 +13413,7 @@ with pkgs;
   abook = callPackage ../applications/misc/abook { };
 
   acd-cli = callPackage ../applications/networking/sync/acd_cli {
-    inherit (python35Packages)
+    inherit (python3Packages)
       buildPythonApplication appdirs colorama dateutil
       requests requests_toolbelt sqlalchemy fusepy;
   };