From d6670b9d92df578d6ee05bc386dbf4ec8543eed3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 00:31:46 +0200 Subject: [PATCH 1/4] python313Packages.humanfriendly: replace pipes module usage It was deprecated in 3.11 and removed in 3.13. --- .../development/python-modules/humanfriendly/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 766fb1339159..f4761c2e2a49 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch2, }: buildPythonPackage rec { @@ -14,6 +15,14 @@ buildPythonPackage rec { sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; + patches = [ + (fetchpatch2 { + # https://github.com/xolox/python-humanfriendly/pull/75 + url = "https://github.com/musicinmybrain/python-humanfriendly/commit/13d05b8057010121acd2a402a337ef4ee5834062.patch"; + hash = "sha256-m7cySiIx0gNhh6KKhT71DJFOtFu2Copk9ic2yaiCulk="; + }) + ]; + # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to # build this package so we have to disable the test suite :( From 4707354446e4b5e5a47fce883238c37247927ff9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 00:33:04 +0200 Subject: [PATCH 2/4] python312Packages.humanfriendly: use pep517 builder --- pkgs/development/python-modules/humanfriendly/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index f4761c2e2a49..8c217e3ac228 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -3,12 +3,13 @@ buildPythonPackage, fetchPypi, fetchpatch2, + setuptools, }: buildPythonPackage rec { pname = "humanfriendly"; version = "10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -23,6 +24,8 @@ buildPythonPackage rec { }) ]; + build-system = [ setuptools ]; + # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to # build this package so we have to disable the test suite :( From a1f575ab06d868512371f8f4c535593a76e5b849 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 01:31:02 +0200 Subject: [PATCH 3/4] python312Packages.bork: relax build constraint --- pkgs/development/python-modules/bork/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index d3368634604d..b48ff6603f33 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "build" "packaging" "readme-renderer" "twine" From 41d281fc4cd47d2e3f38a5114b661b7f3c962bd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 01:53:24 +0200 Subject: [PATCH 4/4] python312Packages.spsdk: relax requests constraint --- pkgs/development/python-modules/spsdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index fdc74f982c29..0e0d56aa027e 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { "click" "cryptography" "platformdirs" + "requests" "typing-extensions" ];