From 6b9f45ae37450d224a89d072df672551ead5453a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 12 Dec 2023 12:05:34 +1300 Subject: [PATCH 1/2] python3.pkgs.buildsetupcfg: Remove function from python-packages-base.nix This function is not, and never have been, used anywhere inside nixpkgs, outside of bootstrapping setupcfg2nix itself. It was added in https://github.com/NixOS/nixpkgs/pull/38778 by @shlevy. It has no out-of-tree users on Github either. External breakage is not expected. --- pkgs/build-support/build-setupcfg/default.nix | 26 ------------------- .../python/python-packages-base.nix | 5 ---- .../tools/setupcfg2nix/default.nix | 13 ++++++---- pkgs/development/tools/setupcfg2nix/info.nix | 7 ----- 4 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 pkgs/build-support/build-setupcfg/default.nix delete mode 100644 pkgs/development/tools/setupcfg2nix/info.nix diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix deleted file mode 100644 index 5737989249af..000000000000 --- a/pkgs/build-support/build-setupcfg/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Build a python package from info made available by setupcfg2nix. -# -# * src: The source of the package. -# * info: The package information generated by setupcfg2nix. -# * meta: Standard nixpkgs metadata. -# * application: Whether this package is a python library or an -# application which happens to be written in python. -# * doCheck: Whether to run the test suites. -lib: pythonPackages: -{ src, info, meta ? {}, application ? false, doCheck ? true}: let - build = if application - then pythonPackages.buildPythonApplication - else pythonPackages.buildPythonPackage; -in build { - inherit (info) pname version; - - inherit src meta doCheck; - - nativeBuildInputs = map (p: pythonPackages.${p}) ( - (info.setup_requires or []) ++ - (lib.optionals doCheck (info.tests_require or [])) - ); - - propagatedBuildInputs = map (p: pythonPackages.${p}) - (info.install_requires or []); -} diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index b5afaf34ce61..2126b796ca9d 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -47,9 +47,6 @@ let toPythonModule = x: x; # Application does not provide modules. })); - # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../../../build-support/build-setupcfg lib self; - # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -92,13 +89,11 @@ let disabledIf = x: drv: if x then disabled drv else drv; in { - inherit lib pkgs stdenv; inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; - inherit buildSetupcfg; python = toPythonModule python; # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix index 4cc1ec320ccd..f57e83db5551 100644 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -1,14 +1,17 @@ -{ buildSetupcfg, fetchFromGitHub, lib }: +{ buildPythonApplication, fetchFromGitHub, lib, setuptools }: + +buildPythonApplication rec { + pname = "setupcfg2nix"; + version = "2.0.1"; + format = "setuptools"; -buildSetupcfg rec { - info = import ./info.nix; src = fetchFromGitHub { owner = "target"; repo = "setupcfg2nix"; - rev = info.version; + rev = version; sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m"; }; - application = true; + meta = { description = "Generate nix expressions from setup.cfg for a python package"; homepage = "https://github.com/target/setupcfg2nix"; diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix deleted file mode 100644 index 17e888fee416..000000000000 --- a/pkgs/development/tools/setupcfg2nix/info.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - pname = "setupcfg2nix"; - version = "2.0.1"; - install_requires = [ - "setuptools" - ]; -} From ef2a69c86654a6eb682796ac0d30b85b34ac39d1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 12 Dec 2023 12:15:21 +1300 Subject: [PATCH 2/2] setupcfg2nix: Remove package It's unmaintained and the supporting build infrastructure was just removed from nixpkgs. --- .../tools/setupcfg2nix/default.nix | 22 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/tools/setupcfg2nix/default.nix diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix deleted file mode 100644 index f57e83db5551..000000000000 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildPythonApplication, fetchFromGitHub, lib, setuptools }: - -buildPythonApplication rec { - pname = "setupcfg2nix"; - version = "2.0.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "target"; - repo = "setupcfg2nix"; - rev = version; - sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m"; - }; - - meta = { - description = "Generate nix expressions from setup.cfg for a python package"; - homepage = "https://github.com/target/setupcfg2nix"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.shlevy ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9466a2c52587..016c8a655020 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -859,6 +859,7 @@ mapAliases ({ sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 session-desktop-appimage = session-desktop; + setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18538c0d86fd..abc7d4eb9432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17936,8 +17936,6 @@ with pkgs; pypi-mirror = callPackage ../development/tools/pypi-mirror { }; - setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix { }; - svg2tikz = with python3.pkgs; toPythonApplication svg2tikz; svg2pdf = callPackage ../tools/graphics/svg2pdf { };