about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/plux/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-08-23 10:09:14 +0000
committerAlyssa Ross <hi@alyssa.is>2023-08-26 09:07:03 +0000
commit63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch)
treed58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/python-modules/plux/default.nix
parentc4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff)
parent91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff)
downloadnixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar
nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz
nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2
nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz
nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz
nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst
nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/plux/default.nix')
-rw-r--r--nixpkgs/pkgs/development/python-modules/plux/default.nix26
1 files changed, 21 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/plux/default.nix b/nixpkgs/pkgs/development/python-modules/plux/default.nix
index 5f6ac1e851f5..567aff8f51b0 100644
--- a/nixpkgs/pkgs/development/python-modules/plux/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/plux/default.nix
@@ -1,24 +1,40 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, stevedore
+, fetchpatch
 , pytestCheckHook
+, setuptools
+, stevedore
+, wheel
 }:
 
 buildPythonPackage rec {
   pname = "plux";
-  version = "1.3.1";
+  version = "1.4.0";
   format = "pyproject";
 
   # Tests are not available from PyPi
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "plux";
-    # Request for proper tags: https://github.com/localstack/plux/issues/4
-    rev = "a412ab0a0d7d17c3b5e1f560b7b31dc1876598f7";
-    hash = "sha256-zFwrRc93R4cXah7zYXjVLBIeBpDedsInxuyXOyBI8SA=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-AybMHkCUNJsL51XwiskkIltEtqZ27fGHrpyct8IUjmo=";
   };
 
+  patches = [
+    # https://github.com/localstack/plux/pull/8
+    (fetchpatch {
+      name = "remove-pytest-runner.patch";
+      url = "https://github.com/localstack/plux/commit/3cda22e51f43a86304d0dedd7e554b21aa82c8b0.patch";
+      hash = "sha256-ZFHUTkUYFSTgKbx+c74JQzre0la+hFW9gNOxOehvVoE=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];
+
   propagatedBuildInputs = [
     stevedore
   ];