From c5dbc6d16165577428f03a50fad798088c5a7c58 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Wed, 11 May 2022 13:39:59 +0200
Subject: [PATCH] =?UTF-8?q?pypiserver:=201.4.2=20->=201.5.0,=20add=20Super?=
 =?UTF-8?q?Sandro2000=20as=20maintainer,=20add=20to=E2=80=A6=20(#172417)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: austinbutler <austinbutler@users.noreply.github.com>
---
 .../python-modules/pypiserver/default.nix     | 36 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix
index d1c6fee942c..ae7a98cfbe8 100644
--- a/pkgs/development/python-modules/pypiserver/default.nix
+++ b/pkgs/development/python-modules/pypiserver/default.nix
@@ -1,15 +1,23 @@
-{ buildPythonPackage, fetchFromGitHub, lib, passlib, pytestCheckHook, setuptools
-, setuptools-git, twine, webtest }:
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, passlib
+, pytestCheckHook
+, setuptools
+, setuptools-git
+, twine
+, webtest
+}:
 
 buildPythonPackage rec {
   pname = "pypiserver";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1z5rsmqgin98m6ihy1ww42fxxr6jb4hzldn8vlc9ssv7sawdz8vz";
+    sha256 = "sha256-BK5vQsaWIMOnUqyeofAWJC1nQJPsTvmzl9i2893JCDI=";
   };
 
   nativeBuildInputs = [ setuptools-git ];
@@ -20,13 +28,23 @@ buildPythonPackage rec {
     export HOME=$TMPDIR
   '';
 
-  checkInputs = [ passlib pytestCheckHook twine webtest ];
+  checkInputs = [
+    passlib
+    pytestCheckHook
+    twine
+    webtest
+  ];
 
-  # These tests try to use the network
   disabledTests = [
-    "test_pipInstall_openOk"
-    "test_pipInstall_authedOk"
+    # fails to install the package
     "test_hash_algos"
+    "test_pip_install_authed_succeeds"
+    "test_pip_install_open_succeeds"
+  ];
+
+  disabledTestPaths = [
+    # requires docker service running
+    "docker/test_docker.py"
   ];
 
   pythonImportsCheck = [ "pypiserver" ];
@@ -35,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pypiserver/pypiserver";
     description = "Minimal PyPI server for use with pip/easy_install";
     license = with licenses; [ mit zlib ];
-    maintainers = [ maintainers.austinbutler ];
+    maintainers = with maintainers; [ austinbutler SuperSandro2000 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cc1acb82de..369f864df22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22450,6 +22450,8 @@ with pkgs;
 
   pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { };
 
+  pypiserver = with python3Packages; toPythonApplication pypiserver;
+
   qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
 
   qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { };