From f8905acb281f8a649fb54768716fb3788c534e10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Aug 2023 12:02:22 +0200 Subject: [PATCH 1/2] python310Packages.k-diffusion: 0.0.14 -> 0.0.16 Diff: https://github.com/crowsonkb/k-diffusion/compare/v0.0.14...v0.0.16 --- pkgs/development/python-modules/k-diffusion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/k-diffusion/default.nix b/pkgs/development/python-modules/k-diffusion/default.nix index 0d1410a5ced0..138dc73eea06 100644 --- a/pkgs/development/python-modules/k-diffusion/default.nix +++ b/pkgs/development/python-modules/k-diffusion/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "k-diffusion"; - version = "0.0.14"; + version = "0.0.16"; format = "setuptools"; src = fetchFromGitHub { owner = "crowsonkb"; repo = "k-diffusion"; rev = "v${version}"; - hash = "sha256-KKVgk+1hidDBVaRnXjoqwuSRydI10OPHK3YModAizZU="; + hash = "sha256-tOWDFt0/hGZF5HENiHPb9a2pBlXdSvDvCNTsCMZljC4="; }; propagatedBuildInputs = [ From 9a038452ced93cc89844ae61b7460420c78d4b90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Aug 2023 12:08:46 +0200 Subject: [PATCH 2/2] python310Packages.k-diffusion: disable on unsupported Python releases --- .../python-modules/k-diffusion/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/k-diffusion/default.nix b/pkgs/development/python-modules/k-diffusion/default.nix index 138dc73eea06..55a3ce36f80c 100644 --- a/pkgs/development/python-modules/k-diffusion/default.nix +++ b/pkgs/development/python-modules/k-diffusion/default.nix @@ -1,15 +1,14 @@ { lib -, buildPythonPackage -, fetchFromGitHub - -# dependencies , accelerate +, buildPythonPackage , clean-fid , clip-anytorch , einops +, fetchFromGitHub , jsonmerge , kornia , pillow +, pythonOlder , resize-right , scikit-image , scipy @@ -19,7 +18,6 @@ , torchvision , tqdm , wandb - }: buildPythonPackage rec { @@ -27,15 +25,17 @@ buildPythonPackage rec { version = "0.0.16"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "crowsonkb"; repo = "k-diffusion"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-tOWDFt0/hGZF5HENiHPb9a2pBlXdSvDvCNTsCMZljC4="; }; propagatedBuildInputs = [ - accelerate + accelerate clean-fid clip-anytorch einops