From 63c7ae53f043aead2084c17542f09dfc390a484d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 00:03:14 +0000 Subject: [PATCH 1/2] python310Packages.grad-cam: 1.4.8 -> 1.5.0 --- pkgs/development/python-modules/grad-cam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index 8636a71ecdce..f98c4674473f 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "grad-cam"; - version = "1.4.8"; + version = "1.5.0"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-BNcwDaEEmRsEoJ4nvvGfjZ9LdG0eRqZCFuY5/Gmp5N4="; + hash = "sha256-aw7Z/6/AMKH2PVBcOr8HxsmRDa6c3v8Xd4xa8HTiFGA="; }; postPatch = '' From 25d1a883ef0a56ed258d8ebd6dc595a63454fbf0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Dec 2023 11:27:37 +0100 Subject: [PATCH 2/2] python310Packages.grad-cam: refactor --- .../development/python-modules/grad-cam/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index f98c4674473f..42d65ae433b7 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -7,6 +7,7 @@ , opencv4 , pillow , scikit-learn +, setuptools , torch , torchvision , ttach @@ -16,8 +17,9 @@ buildPythonPackage rec { pname = "grad-cam"; version = "1.5.0"; - disabled = pythonOlder "3.6"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -25,9 +27,14 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace requirements.txt --replace "opencv-python" "opencv" + substituteInPlace requirements.txt\ + --replace "opencv-python" "opencv" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ matplotlib numpy