diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/tools/devpi-server | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/tools/devpi-server')
-rw-r--r-- | pkgs/development/tools/devpi-server/default.nix | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 4b5499b87bc..b5ddda9f08b 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,18 +1,22 @@ -{ stdenv, python3Packages, nginx }: +{ lib, 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,26 +30,34 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ beautifulsoup4 nginx - pytest + pytestCheckHook pytest-flake8 - pytestpep8 webtest - ] ++ stdenv.lib.optionals isPy27 [ mock ]; + ] ++ 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" + ]; + + __darwinAllowLocalNetworking = true; - meta = with stdenv.lib;{ + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; license = licenses.mit; |