From 585a6171199356044a017f0f82be2e4ac844d1cf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 4 Oct 2017 14:38:44 +0200
Subject: [PATCH 1/2] pythonPackages.devpi-common: 3.0.1 -> 3.2.0rc1

---
 .../python-modules/devpi-common/default.nix   | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-------------
 2 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/devpi-common/default.nix

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
new file mode 100644
index 000000000000..ad5f8fef8855
--- /dev/null
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -0,0 +1,26 @@
+{ pythonPackages }:
+
+with pythonPackages;buildPythonPackage rec {
+  pname = "devpi-common";
+  version = "3.2.0rc1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9";
+  };
+
+  propagatedBuildInputs = [ requests py ];
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    homepage = https://github.com/devpi/devpi;
+    description = "Utilities jointly used by devpi-server and devpi-client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ lewo makefu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 327af2fb3307..a10f4e9830ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2355,25 +2355,7 @@ in {
     };
   };
 
-  devpi-common = buildPythonPackage rec {
-    name = "devpi-common";
-    version = "3.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/devpi-common/devpi-common-${version}.tar.gz";
-      sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
-    };
-
-    propagatedBuildInputs = [ self.requests self.py ];
-
-    meta = {
-      homepage = https://bitbucket.org/hpk42/devpi;
-      description = "Utilities jointly used by devpi-server and devpi-client";
-      license = licenses.mit;
-      maintainers = with maintainers; [ lewo makefu ];
-    };
-  };
-
+  devpi-common = callPackage ../development/python-modules/devpi-common { };
   # A patched version of buildout, useful for buildout based development on Nix
   zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
 

From 396836356f28f1a3072420dbaab7c831cf668f9f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 4 Oct 2017 14:40:20 +0200
Subject: [PATCH 2/2] devpi-client: 2.7.0 -> 3.1.0rc1

---
 .../tools/devpi-client/default.nix            | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index f724b65dd823..9da88f6c63d8 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchurl, pythonPackages, glibcLocales} :
+{ stdenv, pythonPackages, glibcLocales} :
 
 pythonPackages.buildPythonApplication rec {
-  name = "devpi-client-${version}";
-  version = "2.7.0";
+  name = "${pname}-${version}";
+  pname = "devpi-client";
+  version = "3.1.0rc1";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/devpi-client/${name}.tar.gz";
-    sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3";
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3";
   };
-
-  doCheck = false;
+  # requires devpi-server which is currently not packaged
+  doCheck = true;
+  checkInputs = with pythonPackages; [ pytest webtest mock ];
+  checkPhase = "py.test";
 
   LC_ALL = "en_US.UTF-8";
-  buildInputs = with pythonPackages; [ glibcLocales tox check-manifest pkginfo ];
-
-  propagatedBuildInputs = with pythonPackages; [ py devpi-common ];
+  buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ];
+  propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ];
 
   meta = {
     homepage = http://doc.devpi.net;