diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/development/tools/devpi-server/default.nix | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/development/tools/devpi-server/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/devpi-server/default.nix | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix index b5ddda9f08b1..8e78bebebe9b 100644 --- a/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/nixpkgs/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 |