Merge pull request #273666 from adisbladis/setupcfg2nix-removal

python3.pkgs.buildsetupcfg: Remove

authored by Frederik Rietdijk and committed by GitHub 2feabab3 5d43a876

+1 -59
-26
pkgs/build-support/build-setupcfg/default.nix
··· 1 - # Build a python package from info made available by setupcfg2nix. 2 - # 3 - # * src: The source of the package. 4 - # * info: The package information generated by setupcfg2nix. 5 - # * meta: Standard nixpkgs metadata. 6 - # * application: Whether this package is a python library or an 7 - # application which happens to be written in python. 8 - # * doCheck: Whether to run the test suites. 9 - lib: pythonPackages: 10 - { src, info, meta ? {}, application ? false, doCheck ? true}: let 11 - build = if application 12 - then pythonPackages.buildPythonApplication 13 - else pythonPackages.buildPythonPackage; 14 - in build { 15 - inherit (info) pname version; 16 - 17 - inherit src meta doCheck; 18 - 19 - nativeBuildInputs = map (p: pythonPackages.${p}) ( 20 - (info.setup_requires or []) ++ 21 - (lib.optionals doCheck (info.tests_require or [])) 22 - ); 23 - 24 - propagatedBuildInputs = map (p: pythonPackages.${p}) 25 - (info.install_requires or []); 26 - }
-5
pkgs/development/interpreters/python/python-packages-base.nix
··· 47 47 toPythonModule = x: x; # Application does not provide modules. 48 48 })); 49 49 50 - # See build-setupcfg/default.nix for documentation. 51 - buildSetupcfg = import ../../../build-support/build-setupcfg lib self; 52 - 53 50 # Check whether a derivation provides a Python module. 54 51 hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; 55 52 ··· 92 89 disabledIf = x: drv: if x then disabled drv else drv; 93 90 94 91 in { 95 - 96 92 inherit lib pkgs stdenv; 97 93 inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; 98 94 inherit buildPythonPackage buildPythonApplication; 99 95 inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; 100 96 inherit toPythonModule toPythonApplication; 101 - inherit buildSetupcfg; 102 97 103 98 python = toPythonModule python; 104 99 # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions
-19
pkgs/development/tools/setupcfg2nix/default.nix
··· 1 - { buildSetupcfg, fetchFromGitHub, lib }: 2 - 3 - buildSetupcfg rec { 4 - info = import ./info.nix; 5 - src = fetchFromGitHub { 6 - owner = "target"; 7 - repo = "setupcfg2nix"; 8 - rev = info.version; 9 - sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m"; 10 - }; 11 - application = true; 12 - meta = { 13 - description = "Generate nix expressions from setup.cfg for a python package"; 14 - homepage = "https://github.com/target/setupcfg2nix"; 15 - license = lib.licenses.mit; 16 - platforms = lib.platforms.all; 17 - maintainers = [ lib.maintainers.shlevy ]; 18 - }; 19 - }
-7
pkgs/development/tools/setupcfg2nix/info.nix
··· 1 - { 2 - pname = "setupcfg2nix"; 3 - version = "2.0.1"; 4 - install_requires = [ 5 - "setuptools" 6 - ]; 7 - }
+1
pkgs/top-level/aliases.nix
··· 859 859 sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 860 860 searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 861 861 session-desktop-appimage = session-desktop; 862 + setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 862 863 sequoia = sequoia-sq; # Added 2023-06-26 863 864 sexp = sexpp; # Added 2023-07-03 864 865 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
-2
pkgs/top-level/all-packages.nix
··· 17934 17934 17935 17935 pypi-mirror = callPackage ../development/tools/pypi-mirror { }; 17936 17936 17937 - setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix { }; 17938 - 17939 17937 svg2tikz = with python3.pkgs; toPythonApplication svg2tikz; 17940 17938 17941 17939 svg2pdf = callPackage ../tools/graphics/svg2pdf { };