Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'

1 files changed, 25 insertions, 15 deletions

diff --git a/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix
index 4b5499b87bc2..7ddff92402cb 100644
--- a/nixpkgs/pkgs/development/tools/devpi-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/devpi-server/default.nix
@@ -1,18 +1,22 @@
-{ stdenv, python3Packages, nginx }:
+{ stdenv, fetchFromGitHub, python3Packages, nginx }:
 
 python3Packages.buildPythonApplication rec {
   pname = "devpi-server";
-  version = "5.5.0";
+  version = "6.0.0.dev0";
 
-  src = python3Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "0lily4a0k13bygx07x2f2q4nkwny0fj34hpac9i6mc70ysdn1hhi";
+  src = fetchFromGitHub {
+    owner = "devpi";
+    repo = "devpi";
+    rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c";
+    sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm";
   };
+  sourceRoot = "source/server";
 
   propagatedBuildInputs = with python3Packages; [
     py
     appdirs
     devpi-common
+    defusedxml
     execnet
     itsdangerous
     repoze_lru
@@ -26,24 +30,30 @@ python3Packages.buildPythonApplication rec {
   checkInputs = with python3Packages; [
     beautifulsoup4
     nginx
-    pytest
+    pytestCheckHook
     pytest-flake8
-    pytestpep8
     webtest
   ] ++ stdenv.lib.optionals isPy27 [ mock ];
 
   # root_passwd_hash tries to write to store
   # TestMirrorIndexThings tries to write to /var through ngnix
   # nginx tests try to write to /var
-  checkPhase = ''
-    PATH=$PATH:$out/bin HOME=$TMPDIR pytest \
-      ./test_devpi_server --slow -rfsxX \
-      --ignore=test_devpi_server/test_nginx_replica.py \
-      --ignore=test_devpi_server/test_streaming_nginx.py \
-      --ignore=test_devpi_server/test_streaming_replica_nginx.py \
-      -k 'not root_passwd_hash_option \
-          and not TestMirrorIndexThings'
+  preCheck = ''
+    export PATH=$PATH:$out/bin
+    export HOME=$TMPDIR
   '';
+  pytestFlagsArray = [
+    "./test_devpi_server"
+    "--slow"
+    "-rfsxX"
+    "--ignore=test_devpi_server/test_nginx_replica.py"
+    "--ignore=test_devpi_server/test_streaming_nginx.py"
+    "--ignore=test_devpi_server/test_streaming_replica_nginx.py"
+  ];
+  disabledTests = [
+    "root_passwd_hash_option"
+    "TestMirrorIndexThings"
+  ];
 
   meta = with stdenv.lib;{
     homepage = "http://doc.devpi.net";