Merge pull request #194049 from makefu/pkgs/devpi-server/6.7.0

devpi-server: 6.2.0 -> 6.7.0

pkgs/development/tools/devpi-server/default.nix

@@ -1,49 +1,56 @@
-{ lib, fetchFromGitHub, python3, nginx }:
+{ lib, fetchFromGitHub, buildPythonApplication, isPy27
+, aiohttp
+, appdirs
+, beautifulsoup4
+, defusedxml
+, devpi-common
+, execnet
+, itsdangerous
+, nginx
+, packaging
+, passlib
+, platformdirs
+, pluggy
+, pyramid
+, pytest-flake8
+, pytestCheckHook
+, repoze_lru
+, setuptools
+, strictyaml
+, waitress
+, webtest
+}:
 
-let
-  py = python3.override {
-    packageOverrides = self: super: {
-      # pyramid 2.0 no longer has a 'pyramid.compat' module
-      pyramid = super.pyramid.overridePythonAttrs (oldAttrs: rec {
-        version = "1.10.8";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "sha256-t81mWVvvkvgXZLl23d4rL6jk9fMl4C9l9ux/NwiynPY=";
-        };
-      });
-    };
-  };
 
-in with py.pkgs;
 buildPythonApplication rec {
   pname = "devpi-server";
-  version = "6.2.0";
+  version = "6.7.0";
+
+  disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "devpi";
     repo = "devpi";
-    rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c";
-    sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm";
+    rev = "server-${version}";
+    hash = "sha256-tevQ/Ocusz2PythGnedP6r4xARgetVosAc8uTD49H3M=";
   };
 
   sourceRoot = "source/server";
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "pluggy>=0.6.0,<1.0" "pluggy>=0.6.0,<2.0"
-  '';
-
   propagatedBuildInputs = [
-    py
+    aiohttp
     appdirs
-    devpi-common
     defusedxml
+    devpi-common
     execnet
     itsdangerous
-    repoze_lru
+    packaging
     passlib
+    platformdirs
     pluggy
     pyramid
+    repoze_lru
+    setuptools
     strictyaml
     waitress
   ] ++ passlib.optional-dependencies.argon2;
@@ -51,10 +58,10 @@ buildPythonApplication rec {
   checkInputs = [
     beautifulsoup4
     nginx
-    pytestCheckHook
     pytest-flake8
+    pytestCheckHook
     webtest
-  ] ++ lib.optionals isPy27 [ mock ];
+  ];
 
   # root_passwd_hash tries to write to store
   # TestMirrorIndexThings tries to write to /var through ngnix

pkgs/top-level/all-packages.nix

@@ -13374,7 +13374,7 @@ with pkgs;
 
   devpi-client = python3Packages.callPackage ../development/tools/devpi-client {};
 
-  devpi-server = callPackage ../development/tools/devpi-server {};
+  devpi-server = python3Packages.callPackage ../development/tools/devpi-server {};
 
   dictu = callPackage ../development/compilers/dictu { };