diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-09-14 09:47:04 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-09-14 09:47:04 -0700 |
commit | 60ab0ab2db14e405ac6f019229b88ca4ff3e8883 (patch) | |
tree | 779abd889a508dac12bb66bee83d3cfc0a02edae | |
parent | 4f6afcb88ad34c2865ab729c0b2b4d944ac7cc9e (diff) | |
download | nixpkgs-60ab0ab2db14e405ac6f019229b88ca4ff3e8883.tar nixpkgs-60ab0ab2db14e405ac6f019229b88ca4ff3e8883.tar.gz nixpkgs-60ab0ab2db14e405ac6f019229b88ca4ff3e8883.tar.bz2 nixpkgs-60ab0ab2db14e405ac6f019229b88ca4ff3e8883.tar.lz nixpkgs-60ab0ab2db14e405ac6f019229b88ca4ff3e8883.tar.xz nixpkgs-60ab0ab2db14e405ac6f019229b88ca4ff3e8883.tar.zst nixpkgs-60ab0ab2db14e405ac6f019229b88ca4ff3e8883.zip |
devpi-server: 6.0.0.dev0 -> 6.2.0, override pyramid version
-rw-r--r-- | pkgs/development/tools/devpi-server/default.nix | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index b5ddda9f08b..8e78bebebe9 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,8 +1,23 @@ -{ lib, fetchFromGitHub, python3Packages, nginx }: +{ lib, fetchFromGitHub, python3, nginx }: -python3Packages.buildPythonApplication rec { +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.0.0.dev0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "devpi"; @@ -10,9 +25,15 @@ python3Packages.buildPythonApplication rec { rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c"; sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm"; }; + sourceRoot = "source/server"; - propagatedBuildInputs = with python3Packages; [ + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.6.0,<1.0" "pluggy>=0.6.0,<2.0" + ''; + + propagatedBuildInputs = [ py appdirs devpi-common @@ -27,7 +48,7 @@ python3Packages.buildPythonApplication rec { waitress ]; - checkInputs = with python3Packages; [ + checkInputs = [ beautifulsoup4 nginx pytestCheckHook |