From f8378d5909058a4b9389cc36cd2c43ef317425fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 11:41:39 +0000 Subject: [PATCH 1/2] python312Packages.pyfwup: 0.5.0 -> 0.5.2 --- pkgs/development/python-modules/pyfwup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix index 5203a2bcf98c..82ec5095ac2c 100644 --- a/pkgs/development/python-modules/pyfwup/default.nix +++ b/pkgs/development/python-modules/pyfwup/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyfwup"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "pyfwup"; rev = "refs/tags/${version}"; - hash = "sha256-HZaR7X19kWb8w/VcnRHReGPkUBQ/u89BjmkTPpayoxE="; + hash = "sha256-Kyc3f8beTg0W1+U7SvZuNPN1pdsco9rBUfoEtR7AI44="; }; dependencies = [ From 1de931f2335ca890d5a87565ca4065641027618c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 9 Sep 2024 18:36:09 +0200 Subject: [PATCH 2/2] python312Packages.pyfwup: drop setuptools-git-versioning --- pkgs/development/python-modules/pyfwup/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix index 82ec5095ac2c..ae3bb2ca109b 100644 --- a/pkgs/development/python-modules/pyfwup/default.nix +++ b/pkgs/development/python-modules/pyfwup/default.nix @@ -6,7 +6,6 @@ tqdm, libusb1, setuptools, - setuptools-git-versioning, pythonOlder, }: @@ -25,16 +24,19 @@ buildPythonPackage rec { hash = "sha256-Kyc3f8beTg0W1+U7SvZuNPN1pdsco9rBUfoEtR7AI44="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + dependencies = [ pyusb tqdm libusb1 ]; - build-system = [ - setuptools - setuptools-git-versioning - ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "fwup"