From ff806fc7df051489f41beff99f70b8523cb02499 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:45:41 -0400 Subject: [PATCH 01/10] python312Packages.ibm-cloud-sdk-core: drop pythonRelaxDepsHook --- pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 9acf56259bc8..81ce3ddee218 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -7,7 +7,6 @@ python-dateutil, pythonAtLeast, pythonOlder, - pythonRelaxDepsHook, requests, responses, setuptools, @@ -29,8 +28,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ pyjwt python-dateutil From caba9f893a290fddbfa75c0ffdb95a1905398b92 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:47:17 -0400 Subject: [PATCH 02/10] python312Packages.samarium: drop pythonRelaxDepsHook and pythonRelaxDeps --- pkgs/development/python-modules/samarium/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/samarium/default.nix b/pkgs/development/python-modules/samarium/default.nix index 89d5a700a7bc..9e32e1c5b5df 100644 --- a/pkgs/development/python-modules/samarium/default.nix +++ b/pkgs/development/python-modules/samarium/default.nix @@ -5,7 +5,6 @@ poetry-core, crossandra, dahlia, - pythonRelaxDepsHook }: buildPythonPackage rec { @@ -20,11 +19,9 @@ buildPythonPackage rec { hash = "sha256-sOkJ67B8LaIA2cwCHaFnc16lMG8uaegBJCzF6Li77vk="; }; - build-system = [ poetry-core pythonRelaxDepsHook ]; + build-system = [ poetry-core ]; dependencies = [ crossandra dahlia ]; - pythonRelaxDeps = [ "crossandra" ]; - meta = with lib; { changelog = "https://github.com/samarium-lang/samarium/blob/${src.rev}/CHANGELOG.md"; description = "The Samarium Programming Language"; From 76beea9e05eba9b33b02e94a6e5a080d2c9ea430 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:48:37 -0400 Subject: [PATCH 03/10] python312Packages.discum: drop pythonRelaxDepsHook --- pkgs/development/python-modules/discum/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/discum/default.nix b/pkgs/development/python-modules/discum/default.nix index acc3a6e49a03..ffa8b9957993 100644 --- a/pkgs/development/python-modules/discum/default.nix +++ b/pkgs/development/python-modules/discum/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools, - pythonRelaxDepsHook, brotli, colorama, filetype, @@ -28,8 +27,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ brotli colorama From 6e1523e3a0516d41896e7ec8afe12ad2eaf6a558 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:49:53 -0400 Subject: [PATCH 04/10] python312Packages.datashaper: drop pythonRelaxDepsHook --- pkgs/development/python-modules/datashaper/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/datashaper/default.nix b/pkgs/development/python-modules/datashaper/default.nix index 1da7346f2669..3ad28d2228ed 100644 --- a/pkgs/development/python-modules/datashaper/default.nix +++ b/pkgs/development/python-modules/datashaper/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pythonRelaxDepsHook, poetry-core, dacite, diskcache, @@ -26,8 +25,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "pyarrow" ]; dependencies = [ From cf96f76cf4e0992ea39f468c767ed64e22dacf0c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:50:41 -0400 Subject: [PATCH 05/10] python312Packages.pyzx: drop pythonRelaxDepsHook --- pkgs/development/python-modules/pyzx/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix index a391f26a3139..d39d2b48ef24 100644 --- a/pkgs/development/python-modules/pyzx/default.nix +++ b/pkgs/development/python-modules/pyzx/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - pythonRelaxDepsHook, pytestCheckHook, setuptools, ipywidgets, From 0a5dd928b81bc0d51c158c4a0cb0e3daba045198 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:52:22 -0400 Subject: [PATCH 06/10] python312Packages.spatialmath-python: drop pythonRelaxDepsHook --- pkgs/development/python-modules/spatialmath-python/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix index 3613763f3105..f889c325ac2e 100644 --- a/pkgs/development/python-modules/spatialmath-python/default.nix +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -17,7 +17,6 @@ pytest-xvfb, sympy, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -36,7 +35,6 @@ buildPythonPackage rec { nativeBuildInputs = [ oldest-supported-numpy setuptools - pythonRelaxDepsHook ]; pythonRemoveDeps = [ "pre-commit" ]; From ae4c5b2eced656e77102b5e1d3bc64064b42dd04 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:56:02 -0400 Subject: [PATCH 07/10] python312Packages.h5py: drop pythonRelaxDepsHook --- pkgs/development/python-modules/h5py/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 13a464dccb4c..14f7532f8c56 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -7,7 +7,6 @@ setuptools, numpy, hdf5, - pythonRelaxDepsHook, cython_0, pkgconfig, mpi4py ? null, @@ -15,7 +14,6 @@ pytestCheckHook, pytest-mpi, cached-property, - stdenv, }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -67,7 +65,6 @@ buildPythonPackage rec { preBuild = lib.optionalString mpiSupport "export CC=${lib.getDev mpi}/bin/mpicc"; nativeBuildInputs = [ - pythonRelaxDepsHook cython_0 pkgconfig setuptools From ea52205ebd47e8ea6ebe3991702c16acd4a20fc9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:57:25 -0400 Subject: [PATCH 08/10] cewler: drop pythonRelaxDepsHook --- pkgs/by-name/ce/cewler/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix index f4f96039b9f6..92399307e6a7 100644 --- a/pkgs/by-name/ce/cewler/package.nix +++ b/pkgs/by-name/ce/cewler/package.nix @@ -19,7 +19,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools wheel - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ From acc67601d91d0af571f887f2371ec35aeaa4bb0d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 09:58:54 -0400 Subject: [PATCH 09/10] zotify: drop pythonRelaxDepsHook --- pkgs/by-name/zo/zotify/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/zo/zotify/package.nix b/pkgs/by-name/zo/zotify/package.nix index d5250b780a42..c6704ab2e53a 100644 --- a/pkgs/by-name/zo/zotify/package.nix +++ b/pkgs/by-name/zo/zotify/package.nix @@ -20,8 +20,6 @@ python3Packages.buildPythonApplication rec { build-system = [ python3Packages.setuptools ]; - nativeBuildInputs = [ python3Packages.pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "protobuf" ]; dependencies = with python3Packages; [ From 0106a3ce4c9e9eb196c648a68bba7679f243a49c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 14 Sep 2024 10:00:51 -0400 Subject: [PATCH 10/10] sherlock: drop pythonRelaxDepsHook --- pkgs/by-name/sh/sherlock/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix index 9d96cc3da382..50421ff991b6 100644 --- a/pkgs/by-name/sh/sherlock/package.nix +++ b/pkgs/by-name/sh/sherlock/package.nix @@ -64,7 +64,6 @@ python3.pkgs.buildPythonApplication rec { jsonschema openpyxl stem - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "stem" ];