Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'

v#	modified:   nixpkgs/pkgs/tools/networking/dhcpcd/default.nix

1 files changed, 29 insertions, 17 deletions

diff --git a/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix
index f3ade82e52e8..d883af1b0686 100644
--- a/nixpkgs/pkgs/development/tools/devpi-server/default.nix
+++ b/nixpkgs/pkgs/development/tools/devpi-server/default.nix
@@ -1,28 +1,40 @@
- { stdenv, pythonPackages, nginx }:
+ { stdenv, python3Packages, nginx }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "devpi-server";
-  version = "4.4.0";
+  version = "4.9.0";
 
-  src = pythonPackages.fetchPypi {
+  src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0y77kcnk26pfid8vsw07v2k61x9sdl6wbmxg5qxnz3vd7703xpkl";
+    sha256 = "0cx0nv1qqv8lg6p1v8dv5val0dxnc3229c15imibl9wrhrffjbg9";
   };
 
-  propagatedBuildInputs = with pythonPackages;
-    [ devpi-common execnet itsdangerous pluggy waitress pyramid passlib ];
-  checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout mock pyyaml ];
-  preCheck = ''
-    # These tests pass with pytest 3.3.2 but not with pytest 3.4.0.
-    sed -i 's/test_basic/noop/' test_devpi_server/test_log.py
-    sed -i 's/test_new/noop/' test_devpi_server/test_log.py
-    sed -i 's/test_thread_run_try_again/noop/' test_devpi_server/test_replica.py
-  '';
+  propagatedBuildInputs = with python3Packages; [
+    appdirs
+    devpi-common
+    execnet
+    itsdangerous
+    passlib
+    pluggy
+    pyramid
+    strictyaml
+    waitress
+  ];
+
+  checkInputs = with python3Packages; [
+    beautifulsoup4
+    mock
+    nginx
+    pytest
+    pytest-flakes
+    pytestpep8
+    webtest
+  ];
+
+  # test_genconfig.py needs devpi-server on PATH
   checkPhase = ''
-    runHook preCheck
-    cd test_devpi_server/
-    PATH=$PATH:$out/bin pytest --slow -rfsxX
+    PATH=$PATH:$out/bin pytest ./test_devpi_server --slow -rfsxX
   '';
 
   meta = with stdenv.lib;{