From 24524c1cf38fdb016b0917771bbd8c2acd6a5060 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 28 Sep 2024 13:11:25 -0400 Subject: [PATCH 1/7] cdist: drop explicitly added pythonImportsCheckHook --- pkgs/tools/admin/cdist/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/admin/cdist/default.nix b/pkgs/tools/admin/cdist/default.nix index 8467605727c9..a84eeb4a1a27 100644 --- a/pkgs/tools/admin/cdist/default.nix +++ b/pkgs/tools/admin/cdist/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitea -, pythonImportsCheckHook , six , sphinxHook , sphinx-rtd-theme @@ -21,7 +20,6 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - pythonImportsCheckHook six sphinxHook sphinx-rtd-theme From 14ff4058cf40ccff20a92140d3e7f084266014cc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 28 Sep 2024 13:15:42 -0400 Subject: [PATCH 2/7] python312Packages.cffconvert: fix typo pythonImportsCheckHook -> pythonImportsCheck --- pkgs/development/python-modules/cffconvert/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cffconvert/default.nix b/pkgs/development/python-modules/cffconvert/default.nix index befd378ac31d..c7dba79bb5cb 100644 --- a/pkgs/development/python-modules/cffconvert/default.nix +++ b/pkgs/development/python-modules/cffconvert/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { "tests/cli/test_rawify_url.py" ]; - pythonImportsCheckHook = [ "cffconvert" ]; + pythonImportsCheck = [ "cffconvert" ]; meta = { changelog = "https://github.com/citation-file-format/cffconvert/blob/${src.rev}/CHANGELOG.md"; From 2dd770f56f2d6eb75389f98015f11a39e48716e5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 28 Sep 2024 13:16:51 -0400 Subject: [PATCH 3/7] python312Packages.vharfbuzz: drop explicitly added pythonImportsCheckHook --- pkgs/development/python-modules/vharfbuzz/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/vharfbuzz/default.nix b/pkgs/development/python-modules/vharfbuzz/default.nix index 5d41a3a2e57b..e822dacb633a 100644 --- a/pkgs/development/python-modules/vharfbuzz/default.nix +++ b/pkgs/development/python-modules/vharfbuzz/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, fonttools, - pythonImportsCheckHook, uharfbuzz, }: @@ -21,7 +20,6 @@ buildPythonPackage rec { fonttools uharfbuzz ]; - nativeBuildInputs = [ pythonImportsCheckHook ]; # Package has no tests. doCheck = false; From 19402d25f33be1b3fdb06bb6a8d584051fedf5c2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 28 Sep 2024 13:17:46 -0400 Subject: [PATCH 4/7] python312Packages.stringbrewer: drop explicitly added pythonImportsCheckHook --- pkgs/development/python-modules/stringbrewer/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/stringbrewer/default.nix b/pkgs/development/python-modules/stringbrewer/default.nix index 8b79efd7be55..9b5fe137e087 100644 --- a/pkgs/development/python-modules/stringbrewer/default.nix +++ b/pkgs/development/python-modules/stringbrewer/default.nix @@ -4,7 +4,6 @@ fetchPypi, rstr, sre-yield, - pythonImportsCheckHook, }: buildPythonPackage rec { @@ -21,7 +20,6 @@ buildPythonPackage rec { rstr sre-yield ]; - nativeBuildInputs = [ pythonImportsCheckHook ]; # Package has no tests doCheck = false; From 53803e36c824e85ba28e76d3f71a30f17a01d355 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 28 Sep 2024 13:19:35 -0400 Subject: [PATCH 5/7] python312Packages.sphinx-hoverxref: drop explicitly added pythonImportsCheckHook --- pkgs/development/python-modules/sphinx-hoverxref/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index 643e3111311d..903005d0df9a 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pythonImportsCheckHook, # documentation build dependencies sphinxHook, sphinx-notfound-page, @@ -37,7 +36,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core - pythonImportsCheckHook sphinxHook sphinx-notfound-page From d7be485798cda6edf2057c852546b1a610896712 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 28 Sep 2024 13:20:38 -0400 Subject: [PATCH 6/7] python312Packages.sphinx-version-warning: drop explicitly added pythonImportsCheckHook --- .../python-modules/sphinx-version-warning/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 6856bcd4fee7..771b674c18de 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - pythonImportsCheckHook, pythonOlder, setuptools, sphinx, @@ -47,7 +46,6 @@ buildPythonPackage { ]; nativeBuildInputs = [ - pythonImportsCheckHook sphinx-autoapi sphinx-prompt sphinx-rtd-theme From 742e50c7f155064a562301cf0e068ddee0151833 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 28 Sep 2024 13:21:30 -0400 Subject: [PATCH 7/7] python312Packages.sphinx-notfound-page: drop explicitly added pythonImportsCheckHook --- .../development/python-modules/sphinx-notfound-page/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index 58c81240c42a..93e7662214ef 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pythonImportsCheckHook, pythonOlder, # documentation build dependencies sphinxHook, @@ -38,7 +37,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core - pythonImportsCheckHook sphinxHook sphinx-prompt sphinx-rtd-theme