From b57deb82421b8353a662c0ce55b38de882649dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 07:31:45 +0100
Subject: [PATCH 1/2] python.pkgs.zetup: init at 0.2.34

(needed as dependency for moretools)
---
 .../python-modules/zetup/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/zetup/default.nix

diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
new file mode 100644
index 00000000000..66a4718fe9e
--- /dev/null
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, setuptools_scm, pathpy, nbconvert
+, pytest }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "zetup";
+  version = "0.2.34";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf";
+  };
+
+  checkPhase = ''
+    py.test test
+  '';
+
+  buildInputs = [ pytest pathpy nbconvert ];
+  propagatedBuildInputs = [ setuptools_scm ];
+
+  meta = with stdenv.lib; {
+    description = ''
+      Zimmermann's Extensible Tools for Unified Project setups
+    '';
+    homepage = https://github.com/zimmermanncode/zetup;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74d87420502..8eeeac3ead7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24556,6 +24556,8 @@ EOF
     };
   };
 
+  zetup = callPackage ../development/python-modules/zetup { };
+
   zope_broken = buildPythonPackage rec {
     name = "zope.broken-3.6.0";
 

From bbd2a0323bf514ba47b6dc6ead29bac21771f8f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 07:32:42 +0100
Subject: [PATCH 2/2] python.pkgs.moretools: 0.1a41 -> 0.1.8

Progress on: #28643
---
 .../python-modules/moretools/default.nix      | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +-----------
 2 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/moretools/default.nix

diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix
new file mode 100644
index 00000000000..83fa05d4b1c
--- /dev/null
+++ b/pkgs/development/python-modules/moretools/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, six, pathpy, zetup, pytest
+, decorator }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "moretools";
+  version = "0.1.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03ni7k0kcgrm3y605c29gqlyp779fx1xc3r8xb742lzd6ni30kdg";
+  };
+
+  checkPhase = ''
+    py.test test
+  '';
+
+  buildInputs = [ six pathpy pytest ];
+  propagatedBuildInputs = [ decorator zetup ];
+
+  meta = with stdenv.lib; {
+    description = ''
+      Many more basic tools for python 2/3 extending itertools, functools, operator and collections
+    '';
+    homepage = https://bitbucket.org/userzimmermann/python-moretools;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8eeeac3ead7..15052c708e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12976,24 +12976,7 @@ in {
     };
   });
 
-  moretools = buildPythonPackage rec {
-    name = "moretools-0.1a41";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/moretools/${name}.tar.gz";
-      sha256 = "1n442wprbl3cmg08233m1sr3g4z0i8hv9g6bhch7kzdmbl21399f";
-    };
-
-    buildInputs = with self; [ six pathpy setuptools ];
-    propagatedBuildInputs = with self; [ decorator ];
-
-    meta = {
-      description = "Many more basic tools for python 2/3 extending itertools, functools, operator and collections";
-      homepage = https://bitbucket.org/userzimmermann/python-moretools;
-      license = licenses.gpl3Plus;
-      platforms = platforms.linux;
-    };
-  };
+  moretools = callPackage ../development/python-modules/moretools { };
 
   moto = buildPythonPackage rec {
     version = "0.4.25";