diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index eeecb640d966..957037b95f4f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -48,7 +48,6 @@ Based on the packages defined in `pkgs/top-level/python-packages.nix` an attribute set is created for each available Python interpreter. The available sets are -* `pkgs.python27Packages` * `pkgs.python3Packages` * `pkgs.python311Packages` * `pkgs.python312Packages` @@ -60,9 +59,7 @@ sets are and the aliases -* `pkgs.python2Packages` pointing to `pkgs.python27Packages` * `pkgs.python3Packages` pointing to `pkgs.python313Packages` -* `pkgs.pythonPackages` pointing to `pkgs.python2Packages` * `pkgs.pypy2Packages` pointing to `pkgs.pypy27Packages` * `pkgs.pypy3Packages` pointing to `pkgs.pypy310Packages` * `pkgs.pypyPackages` pointing to `pkgs.pypy2Packages` @@ -573,9 +570,6 @@ In contrast to [`python.buildEnv`](#python.buildenv-function), [`python.withPack more advanced options such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use [`python.buildEnv`](#python.buildenv-function). -Python 2 namespace packages may provide `__init__.py` that collide. In that case -[`python.buildEnv`](#python.buildenv-function) should be used with `ignoreCollisions = true`. - #### Setup hooks {#setup-hooks} The following are setup hooks specifically for Python packages. Most of these @@ -627,10 +621,9 @@ buildPythonPackage.override { stdenv = customStdenv; } { Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python3` refers to the default -interpreter, which is currently CPython 3.13. The attribute `python` refers to -CPython 2.7 for backwards compatibility. It is also possible to refer to -specific versions, e.g., `python313` refers to CPython 3.13, and `pypy` refers to -the default PyPy interpreter. +interpreter, which is currently CPython 3.13. It is also possible to refer to +specific versions, e.g., `python313` refers to CPython 3.13, and `pypy` refers +to the default PyPy interpreter. Python is used a lot, and in different ways. This affects also how it is packaged. In the case of Python on Nix, an important distinction is made between @@ -1910,9 +1903,8 @@ pkgs.mkShell rec { } ``` -In case the supplied venvShellHook is insufficient, or when Python 2 support is -needed, you can define your own shell hook and adapt to your needs like in the -following example: +In case the supplied venvShellHook is insufficient, you can define your own +shell hook and adapt to your needs like in the following example: ```nix with import { }; @@ -1925,8 +1917,6 @@ pkgs.mkShell rec { name = "impurePythonEnv"; buildInputs = [ pythonPackages.python - # Needed when using python 2.7 - # pythonPackages.virtualenv # ... ]; @@ -1939,8 +1929,6 @@ pkgs.mkShell rec { echo "Skipping venv creation, '${venvDir}' already exists" else echo "Creating new venv environment in path: '${venvDir}'" - # Note that the module venv was only introduced in python 3, so for 2.7 - # this needs to be replaced with a call to virtualenv ${pythonPackages.python.interpreter} -m venv "${venvDir}" fi diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index f029f3e9032f..798e204a578d 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -18,6 +18,8 @@ - `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly. +- Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use. + ## Other Notable Changes {#sec-release-26.11-notable-changes} diff --git a/pkgs/by-name/re/replacement/package.nix b/pkgs/by-name/re/replacement/package.nix index 97c24a44a4f8..0802d55315b4 100644 --- a/pkgs/by-name/re/replacement/package.nix +++ b/pkgs/by-name/re/replacement/package.nix @@ -9,8 +9,6 @@ python3Packages.buildPythonApplication (finalAttrs: { version = "0.4.4"; pyproject = true; - disabled = python3Packages.isPy27; - src = fetchFromGitHub { owner = "siriobalmelli"; repo = "replacement"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix deleted file mode 100644 index e706fc0b9125..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ - stdenv, - lib, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "python27-docs-html"; - version = "2.7.18"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-html.tar.bz2"; - sha256 = "03igxwpqc2lvzspnj78zz1prnmfwwj00jbvh1wsxvb0wayd5wi10"; - }; - installPhase = '' - mkdir -p $out/share/doc/python27 - cp -R ./ $out/share/doc/python27/html - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix deleted file mode 100644 index 31d8a2fe337f..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ - stdenv, - lib, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "python27-docs-pdf-a4"; - version = "2.7.18"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-pdf-a4.tar.bz2"; - sha256 = "0rxb2fpxwivjpk5wi2pl1fqibr4khf9s0yq6a49k9b4awi9nkb6v"; - }; - installPhase = '' - mkdir -p $out/share/doc/python27 - cp -R ./ $out/share/doc/python27/pdf-a4 - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix deleted file mode 100644 index 7ee205efc947..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ - stdenv, - lib, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "python27-docs-pdf-letter"; - version = "2.7.18"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-pdf-letter.tar.bz2"; - sha256 = "07hbqvrdlq01cb95r1574bxqqhiqbkj4f92wzlq4d6dq1l272nan"; - }; - installPhase = '' - mkdir -p $out/share/doc/python27 - cp -R ./ $out/share/doc/python27/pdf-letter - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix deleted file mode 100644 index 8caea548ffa0..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ - stdenv, - lib, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "python27-docs-text"; - version = "2.7.18"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-text.tar.bz2"; - sha256 = "1wj7mxs52kp5lmn5mvv574sygkfnk00kbz9ya9c03yfq5dd5nvy8"; - }; - installPhase = '' - mkdir -p $out/share/doc/python27 - cp -R ./ $out/share/doc/python27/text - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix index a2d6a35ba8b5..d5cc62a92120 100644 --- a/pkgs/development/interpreters/python/cpython/docs/default.nix +++ b/pkgs/development/interpreters/python/cpython/docs/default.nix @@ -8,36 +8,24 @@ let pythonDocs = { html = { recurseForDerivations = true; - python27 = import ./2.7-html.nix { - inherit stdenv fetchurl lib; - }; python310 = import ./3.10-html.nix { inherit stdenv fetchurl lib; }; }; pdf_a4 = { recurseForDerivations = true; - python27 = import ./2.7-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; python310 = import ./3.10-pdf-a4.nix { inherit stdenv fetchurl lib; }; }; pdf_letter = { recurseForDerivations = true; - python27 = import ./2.7-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; python310 = import ./3.10-pdf-letter.nix { inherit stdenv fetchurl lib; }; }; text = { recurseForDerivations = true; - python27 = import ./2.7-text.nix { - inherit stdenv fetchurl lib; - }; python310 = import ./3.10-text.nix { inherit stdenv fetchurl lib; }; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 11a150d78506..d87e115892b8 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -30,18 +30,6 @@ in { - python27 = callPackage ./cpython/2.7 { - self = __splicedPackages.python27; - sourceVersion = { - major = "2"; - minor = "7"; - patch = "18"; - suffix = ".12"; # ActiveState's Python 2 extended support - }; - hash = "sha256-RuEgfpags9wJm9Xe0daotqUx4knABEUc7DvtgnQXEfE="; - inherit passthruFun; - }; - python311 = callPackage ./cpython { self = __splicedPackages.python311; sourceVersion = { diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index e302e9b6bdc0..005ba62ba742 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -79,7 +79,7 @@ let keep = self: hooks self { }; optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; - python2Extension = import ../../../top-level/python2-packages.nix; + python2Extension = import ../../misc/resholve/python2-packages.nix; extensions = lib.composeManyExtensions ( [ hooks @@ -109,12 +109,10 @@ let ); in rec { - isPy27 = pythonVersion == "2.7"; isPy311 = pythonVersion == "3.11"; isPy312 = pythonVersion == "3.12"; isPy313 = pythonVersion == "3.13"; isPy314 = pythonVersion == "3.14"; - isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; isPyPy = lib.hasInfix "pypy" interpreter; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index aeb5582e4c8b..68b10dfc8c6a 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -102,7 +102,11 @@ let ); mkPythonDerivation = - if python.isPy3k then ./mk-python-derivation.nix else ./python2/mk-python-derivation.nix; + if python.isPy3k then + ./mk-python-derivation.nix + else + # Python 2 build infrastructure lives with its only consumers (resholve, pypy27). + ../../misc/resholve/python2/mk-python-derivation.nix; buildPythonPackage = makeOverridablePythonPackage ( overrideStdenvCompat ( @@ -186,7 +190,6 @@ in { inherit lib pkgs stdenv; inherit (python.passthru) - isPy27 isPy311 isPy312 isPy313 diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch b/pkgs/development/misc/resholve/cpython-2.7/2.5.2-ctypes-util-find_library.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.5.2-ctypes-util-find_library.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch b/pkgs/development/misc/resholve/cpython-2.7/2.5.2-tkinter-x11.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.5.2-tkinter-x11.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch b/pkgs/development/misc/resholve/cpython-2.7/2.6.2-ssl-threads.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.6.2-ssl-threads.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch b/pkgs/development/misc/resholve/cpython-2.7/2.6.5-FD_SETSIZE.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.6.5-FD_SETSIZE.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch b/pkgs/development/misc/resholve/cpython-2.7/2.6.5-export-PySignal_SetWakeupFd.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.6.5-export-PySignal_SetWakeupFd.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch b/pkgs/development/misc/resholve/cpython-2.7/2.6.5-ncurses-abi6.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.6.5-ncurses-abi6.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch b/pkgs/development/misc/resholve/cpython-2.7/2.7.3-dbm.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.7.3-dbm.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch b/pkgs/development/misc/resholve/cpython-2.7/2.7.3-dylib.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.7.3-dylib.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch b/pkgs/development/misc/resholve/cpython-2.7/2.7.3-getpath-exe-extension.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.7.3-getpath-exe-extension.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch b/pkgs/development/misc/resholve/cpython-2.7/2.7.3-no-libm.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.7.3-no-libm.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch b/pkgs/development/misc/resholve/cpython-2.7/atomic_pyc.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch rename to pkgs/development/misc/resholve/cpython-2.7/atomic_pyc.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch b/pkgs/development/misc/resholve/cpython-2.7/cross-compile.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch rename to pkgs/development/misc/resholve/cpython-2.7/cross-compile.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/misc/resholve/cpython-2.7/default.nix similarity index 99% rename from pkgs/development/interpreters/python/cpython/2.7/default.nix rename to pkgs/development/misc/resholve/cpython-2.7/default.nix index 9f3d064ceeb1..e68c988ca0b4 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/misc/resholve/cpython-2.7/default.nix @@ -146,7 +146,7 @@ let # It does break aarch64-darwin, which we do support. See: # * https://bugs.python.org/issue35523 # * https://github.com/python/cpython/commit/e6b247c8e524 - ../3.7/no-win64-workaround.patch + ./no-win64-workaround.patch # fix openssl detection by reverting irrelevant change for us, to enable hashlib which is required by pip (fetchpatch { @@ -378,7 +378,7 @@ stdenv.mkDerivation ( postFixup = '' # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7. - cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + cp ${../../../interpreters/python/sitecustomize.py} $out/${sitePackages}/sitecustomize.py '' + lib.optionalString strip2to3 '' rm -R $out/bin/2to3 $out/lib/python*/lib2to3 diff --git a/pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch b/pkgs/development/misc/resholve/cpython-2.7/deterministic-build.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch rename to pkgs/development/misc/resholve/cpython-2.7/deterministic-build.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch b/pkgs/development/misc/resholve/cpython-2.7/find_library-gcc10.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch rename to pkgs/development/misc/resholve/cpython-2.7/find_library-gcc10.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch b/pkgs/development/misc/resholve/cpython-2.7/nix-store-mtime.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch rename to pkgs/development/misc/resholve/cpython-2.7/nix-store-mtime.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch b/pkgs/development/misc/resholve/cpython-2.7/no-ldconfig.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch rename to pkgs/development/misc/resholve/cpython-2.7/no-ldconfig.patch diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch b/pkgs/development/misc/resholve/cpython-2.7/no-win64-workaround.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch rename to pkgs/development/misc/resholve/cpython-2.7/no-win64-workaround.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/profile-task.patch b/pkgs/development/misc/resholve/cpython-2.7/profile-task.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/profile-task.patch rename to pkgs/development/misc/resholve/cpython-2.7/profile-task.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch b/pkgs/development/misc/resholve/cpython-2.7/python-2.7-distutils-C++.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch rename to pkgs/development/misc/resholve/cpython-2.7/python-2.7-distutils-C++.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/search-path.patch b/pkgs/development/misc/resholve/cpython-2.7/search-path.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/search-path.patch rename to pkgs/development/misc/resholve/cpython-2.7/search-path.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/misc/resholve/cpython-2.7/use-correct-tcl-tk-on-darwin.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch rename to pkgs/development/misc/resholve/cpython-2.7/use-correct-tcl-tk-on-darwin.patch diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index a8061d19fe0d..1582b64fc339 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -12,35 +12,8 @@ let knownVulnerabilities = [ ]; }; }); - # We are removing `meta.knownVulnerabilities` from `python27`, - # and setting it in `resholve` itself. - python27' = (removeKnownVulnerabilities pkgsBuildHost.python27).override { - self = python27'; - pkgsBuildHost = pkgsBuildHost // { - python27 = python27'; - }; - # strip down that python version as much as possible - openssl = null; - bzip2 = null; - readline = null; - ncurses = null; - gdbm = null; - sqlite = null; - rebuildBytecode = false; - stripBytecode = true; - strip2to3 = true; - stripConfig = true; - stripIdlelib = true; - stripTests = true; - enableOptimizations = false; - packageOverrides = final: prev: { - pip = removeKnownVulnerabilities prev.pip; - setuptools = removeKnownVulnerabilities prev.setuptools; - }; - }; - callPackage = lib.callPackageWith (pkgsBuildHost // { python27 = python27'; }); + callPackage = lib.callPackageWith pkgsBuildHost; source = callPackage ./source.nix { }; - deps = callPackage ./deps.nix { }; # not exposed in all-packages resholveBuildTimeOnly = removeKnownVulnerabilities resholve; in @@ -49,8 +22,6 @@ rec { resholve = ( callPackage ./resholve.nix { inherit (source) rSrc version; - inherit (deps.oil) oildev; - inherit (deps) configargparse; inherit resholve-utils; # used only in tests resholve = resholveBuildTimeOnly; diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix deleted file mode 100644 index e96e049528c1..000000000000 --- a/pkgs/development/misc/resholve/deps.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - callPackage, - fetchFromGitHub, - python27, - fetchPypi, - ... -}: - -/* - Notes on specific dependencies: - - if/when python2.7 is removed from nixpkgs, this may need to figure - out how to build oil's vendored python2 -*/ - -rec { - oil = callPackage ./oildev.nix { - inherit python27; - inherit six; - inherit typing; - }; - configargparse = python27.pkgs.buildPythonPackage rec { - pname = "configargparse"; - version = "1.5.3"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "bw2"; - repo = "ConfigArgParse"; - rev = "v${version}"; - sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; - }; - - doCheck = false; - - pythonImportsCheck = [ "configargparse" ]; - - meta = { - description = "Drop-in replacement for argparse"; - homepage = "https://github.com/bw2/ConfigArgParse"; - license = lib.licenses.mit; - }; - }; - six = python27.pkgs.buildPythonPackage rec { - pname = "six"; - version = "1.16.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; - }; - - doCheck = false; - - meta = { - description = "Python 2 and 3 compatibility library"; - homepage = "https://pypi.org/project/six/"; - license = lib.licenses.mit; - }; - }; - typing = python27.pkgs.buildPythonPackage rec { - pname = "typing"; - version = "3.10.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; - }; - - doCheck = false; - - meta = { - description = "Backport of typing module to Python versions older than 3.5"; - homepage = "https://docs.python.org/3/library/typing.html"; - license = lib.licenses.psfl; - }; - }; -} diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix deleted file mode 100644 index 7eb6314a2edc..000000000000 --- a/pkgs/development/misc/resholve/oildev.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - lib, - stdenv, - python27, - callPackage, - fetchFromGitHub, - makeWrapper, - re2c, - # oil deps - glibcLocales, - file, - six, - typing, -}: - -{ - /* - Upstream isn't interested in packaging this as a library - (or accepting all of the patches we need to do so). - This creates one without disturbing upstream too much. - */ - oildev = python27.pkgs.buildPythonPackage rec { - pname = "oildev-unstable"; - version = "2024-02-26"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "oilshell"; - repo = "oil"; - # rev == present HEAD of release/0.20.0 - rev = "f730c79e2dcde4bc08e85a718951cfa42102bd01"; - hash = "sha256-HBj3Izh1gD63EzbgZ/9If5vihR5L2HhnyCyMah6rMg4="; - - /* - It's not critical to drop most of these; the primary target is - the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 - files, dozens of which get interpreter script patches in fixup. - - Note: -f is necessary to keep it from being a pain to update - hash on rev updates. Command will fail w/o and not print hash. - */ - postFetch = '' - rm -rf $out/{Python-2.7.13,metrics,py-yajl,rfc,gold,web,testdata,services,demo} - ''; - }; - - # patch to support a python package, pass tests on macOS, drop deps, etc. - patchSrc = fetchFromGitHub { - owner = "abathur"; - repo = "nix-py-dev-oil"; - rev = "v0.20.0.0"; - hash = "sha256-qoA54rnzAdnFZ3k4kRzQWEdgtEjraCT5+NFw8AWnRDk="; - }; - - patches = [ - "${patchSrc}/0001-add_setup_py.patch" - "${patchSrc}/0002-add_MANIFEST_in.patch" - "${patchSrc}/0006-disable_failing_libc_tests.patch" - "${patchSrc}/0007-namespace_via_init.patch" - "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" - "${patchSrc}/0010-disable-line-input.patch" - "${patchSrc}/0011-disable-fanos.patch" - "${patchSrc}/0012-disable-doc-cmark.patch" - "${patchSrc}/0013-fix-pyverify.patch" - "${patchSrc}/0015-fix-compiled-extension-import-paths.patch" - ]; - - configureFlags = [ - "--without-readline" - ]; - - nativeBuildInputs = [ - re2c - file - makeWrapper - ]; - - propagatedBuildInputs = [ - six - typing - ]; - - doCheck = true; - - preBuild = '' - build/py.sh all - ''; - - postPatch = '' - patchShebangs asdl build core doctools frontend pyext oil_lang ysh - rm cpp/stdlib.h # keep modules from finding the wrong stdlib? - # work around hard parse failure documented in oilshell/oil#1468 - substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' - ''; - - # See earlier note on glibcLocales TODO: verify needed? - LOCALE_ARCHIVE = lib.optionalString ( - stdenv.buildPlatform.libc == "glibc" - ) "${glibcLocales}/lib/locale/locale-archive"; - - # not exhaustive; sample what resholve uses as a sanity check - pythonImportsCheck = [ - "oil" - "oil.asdl" - "oil.core" - "oil.frontend" - "oil._devbuild" - "oil._devbuild.gen.id_kind_asdl" - "oil._devbuild.gen.syntax_asdl" - "oil.osh" - "oil.tools.ysh_ify" - ]; - - meta = { - license = with lib.licenses; [ - psfl # Includes a portion of the python interpreter and standard library - asl20 # Licence for Oil itself - ]; - }; - }; -} diff --git a/pkgs/development/python2-modules/bootstrapped-pip/default.nix b/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix similarity index 100% rename from pkgs/development/python2-modules/bootstrapped-pip/default.nix rename to pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix diff --git a/pkgs/development/misc/resholve/python2-modules/configargparse/default.nix b/pkgs/development/misc/resholve/python2-modules/configargparse/default.nix new file mode 100644 index 000000000000..b05dee7079c2 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/configargparse/default.nix @@ -0,0 +1,28 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, +}: + +buildPythonPackage rec { + pname = "configargparse"; + version = "1.5.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bw2"; + repo = "ConfigArgParse"; + rev = "v${version}"; + sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; + }; + + doCheck = false; + + pythonImportsCheck = [ "configargparse" ]; + + meta = { + description = "Drop-in replacement for argparse"; + homepage = "https://github.com/bw2/ConfigArgParse"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/misc/resholve/python2-modules/oildev/default.nix b/pkgs/development/misc/resholve/python2-modules/oildev/default.nix new file mode 100644 index 000000000000..e8cf4e5df6f2 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/oildev/default.nix @@ -0,0 +1,115 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + makeWrapper, + re2c, + glibcLocales, + file, + six, + typing, +}: + +# Upstream isn't interested in packaging this as a library +# (or accepting all of the patches we need to do so). +# This creates one without disturbing upstream too much. +buildPythonPackage rec { + pname = "oildev-unstable"; + version = "2024-02-26"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "oilshell"; + repo = "oil"; + # rev == present HEAD of release/0.20.0 + rev = "f730c79e2dcde4bc08e85a718951cfa42102bd01"; + hash = "sha256-HBj3Izh1gD63EzbgZ/9If5vihR5L2HhnyCyMah6rMg4="; + + /* + It's not critical to drop most of these; the primary target is + the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 + files, dozens of which get interpreter script patches in fixup. + + Note: -f is necessary to keep it from being a pain to update + hash on rev updates. Command will fail w/o and not print hash. + */ + postFetch = '' + rm -rf $out/{Python-2.7.13,metrics,py-yajl,rfc,gold,web,testdata,services,demo} + ''; + }; + + # patch to support a python package, pass tests on macOS, drop deps, etc. + patchSrc = fetchFromGitHub { + owner = "abathur"; + repo = "nix-py-dev-oil"; + rev = "v0.20.0.0"; + hash = "sha256-qoA54rnzAdnFZ3k4kRzQWEdgtEjraCT5+NFw8AWnRDk="; + }; + + patches = [ + "${patchSrc}/0001-add_setup_py.patch" + "${patchSrc}/0002-add_MANIFEST_in.patch" + "${patchSrc}/0006-disable_failing_libc_tests.patch" + "${patchSrc}/0007-namespace_via_init.patch" + "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" + "${patchSrc}/0010-disable-line-input.patch" + "${patchSrc}/0011-disable-fanos.patch" + "${patchSrc}/0012-disable-doc-cmark.patch" + "${patchSrc}/0013-fix-pyverify.patch" + "${patchSrc}/0015-fix-compiled-extension-import-paths.patch" + ]; + + configureFlags = [ + "--without-readline" + ]; + + nativeBuildInputs = [ + re2c + file + makeWrapper + ]; + + propagatedBuildInputs = [ + six + typing + ]; + + doCheck = true; + + preBuild = '' + build/py.sh all + ''; + + postPatch = '' + patchShebangs asdl build core doctools frontend pyext oil_lang ysh + rm cpp/stdlib.h # keep modules from finding the wrong stdlib? + # work around hard parse failure documented in oilshell/oil#1468 + substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' + ''; + + # See earlier note on glibcLocales TODO: verify needed? + LOCALE_ARCHIVE = lib.optionalString ( + stdenv.buildPlatform.libc == "glibc" + ) "${glibcLocales}/lib/locale/locale-archive"; + + # not exhaustive; sample what resholve uses as a sanity check + pythonImportsCheck = [ + "oil" + "oil.asdl" + "oil.core" + "oil.frontend" + "oil._devbuild" + "oil._devbuild.gen.id_kind_asdl" + "oil._devbuild.gen.syntax_asdl" + "oil.osh" + "oil.tools.ysh_ify" + ]; + + meta = { + license = with lib.licenses; [ + psfl # Includes a portion of the python interpreter and standard library + asl20 # Licence for Oil itself + ]; + }; +} diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/misc/resholve/python2-modules/pip/default.nix similarity index 100% rename from pkgs/development/python2-modules/pip/default.nix rename to pkgs/development/misc/resholve/python2-modules/pip/default.nix diff --git a/pkgs/development/misc/resholve/python2-modules/sedparse/default.nix b/pkgs/development/misc/resholve/python2-modules/sedparse/default.nix new file mode 100644 index 000000000000..3426d25d23a0 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/sedparse/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, +}: + +buildPythonPackage { + pname = "sedparse"; + version = "0.1.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "aureliojargas"; + repo = "sedparse"; + rev = "0.1.2"; + hash = "sha256-Q17A/oJ3GZbdSK55hPaMdw85g43WhTW9tuAuJtDfHHU="; + }; + + meta = { + description = "Python port of GNU sed's parser"; + homepage = "https://github.com/aureliojargas/sedparse"; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python2-modules/setuptools/default.nix b/pkgs/development/misc/resholve/python2-modules/setuptools/default.nix similarity index 100% rename from pkgs/development/python2-modules/setuptools/default.nix rename to pkgs/development/misc/resholve/python2-modules/setuptools/default.nix diff --git a/pkgs/development/python2-modules/setuptools/tag-date.patch b/pkgs/development/misc/resholve/python2-modules/setuptools/tag-date.patch similarity index 100% rename from pkgs/development/python2-modules/setuptools/tag-date.patch rename to pkgs/development/misc/resholve/python2-modules/setuptools/tag-date.patch diff --git a/pkgs/development/misc/resholve/python2-modules/six/default.nix b/pkgs/development/misc/resholve/python2-modules/six/default.nix new file mode 100644 index 000000000000..951c42c107d1 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/six/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "six"; + version = "1.16.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; + }; + + doCheck = false; + + meta = { + description = "Python 2 and 3 compatibility library"; + homepage = "https://pypi.org/project/six/"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/misc/resholve/python2-modules/typing/default.nix b/pkgs/development/misc/resholve/python2-modules/typing/default.nix new file mode 100644 index 000000000000..d26e5e2da706 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/typing/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "typing"; + version = "3.10.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; + }; + + doCheck = false; + + meta = { + description = "Backport of typing module to Python versions older than 3.5"; + homepage = "https://docs.python.org/3/library/typing.html"; + license = lib.licenses.psfl; + }; +} diff --git a/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/pkgs/development/misc/resholve/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch similarity index 100% rename from pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch rename to pkgs/development/misc/resholve/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch diff --git a/pkgs/development/python2-modules/wheel/default.nix b/pkgs/development/misc/resholve/python2-modules/wheel/default.nix similarity index 100% rename from pkgs/development/python2-modules/wheel/default.nix rename to pkgs/development/misc/resholve/python2-modules/wheel/default.nix diff --git a/pkgs/development/misc/resholve/python2-packages.nix b/pkgs/development/misc/resholve/python2-packages.nix new file mode 100644 index 000000000000..45e066d3311c --- /dev/null +++ b/pkgs/development/misc/resholve/python2-packages.nix @@ -0,0 +1,29 @@ +# Python 2 overlay applied to resholve's local python27 package set. +# Provides the bootstrap toolchain (bootstrapped-pip/pip/setuptools/wheel) +# plus resholve's own python2 build dependencies, kept here so all of +# resholve's python2 surface lives in one place. + +self: super: + +with self; +with super; +{ + bootstrapped-pip = toPythonModule (callPackage ./python2-modules/bootstrapped-pip { }); + + pip = callPackage ./python2-modules/pip { }; + + setuptools = callPackage ./python2-modules/setuptools { }; + + wheel = callPackage ./python2-modules/wheel { }; + + # resholve build deps + configargparse = callPackage ./python2-modules/configargparse { }; + + six = callPackage ./python2-modules/six { }; + + typing = callPackage ./python2-modules/typing { }; + + oildev = callPackage ./python2-modules/oildev { }; + + sedparse = callPackage ./python2-modules/sedparse { }; +} diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/misc/resholve/python2/mk-python-derivation.nix similarity index 100% rename from pkgs/development/interpreters/python/python2/mk-python-derivation.nix rename to pkgs/development/misc/resholve/python2/mk-python-derivation.nix diff --git a/pkgs/development/misc/resholve/python27.nix b/pkgs/development/misc/resholve/python27.nix new file mode 100644 index 000000000000..677cf13dc0d8 --- /dev/null +++ b/pkgs/development/misc/resholve/python27.nix @@ -0,0 +1,69 @@ +{ + lib, + pkgsBuildHost, +}: + +let + removeKnownVulnerabilities = + pkg: + pkg.overrideAttrs (old: { + meta = (old.meta or { }) // { + knownVulnerabilities = [ ]; + }; + }); + + passthruFun = import ../../interpreters/python/passthrufun.nix { + inherit lib; + inherit (pkgsBuildHost) + stdenv + callPackage + pythonPackagesExtensions + config + makeScopeWithSplicing' + ; + }; + + python27Base = pkgsBuildHost.callPackage ./cpython-2.7 { + self = python27; + sourceVersion = { + major = "2"; + minor = "7"; + patch = "18"; + suffix = ".12"; # ActiveState's Python 2 extended support + }; + hash = "sha256-RuEgfpags9wJm9Xe0daotqUx4knABEUc7DvtgnQXEfE="; + inherit passthruFun; + }; + + # We are removing `meta.knownVulnerabilities` from `python27`, + # and setting it in `resholve` itself. + python27 = (removeKnownVulnerabilities python27Base).override { + self = python27; + pkgsBuildHost = pkgsBuildHost // { + inherit python27; + }; + # python2-only overrides for bootstrapped-pip/pip/setuptools/wheel + # (no longer applied globally — kept local to resholve) + packageOverrides = lib.composeExtensions (import ./python2-packages.nix) ( + _self: super: { + pip = removeKnownVulnerabilities super.pip; + setuptools = removeKnownVulnerabilities super.setuptools; + } + ); + # strip down that python version as much as possible + openssl = null; + bzip2 = null; + readline = null; + ncurses = null; + gdbm = null; + sqlite = null; + rebuildBytecode = false; + stripBytecode = true; + strip2to3 = true; + stripConfig = true; + stripIdlelib = true; + stripTests = true; + enableOptimizations = false; + }; +in +python27 diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 16c9924510e3..67200729d4ef 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,32 +1,16 @@ { lib, callPackage, - python27, - fetchFromGitHub, installShellFiles, rSrc, version, - oildev, - configargparse, gawk, binlore, resholve, resholve-utils, }: - let - sedparse = python27.pkgs.buildPythonPackage { - pname = "sedparse"; - version = "0.1.2"; - format = "setuptools"; - src = fetchFromGitHub { - owner = "aureliojargas"; - repo = "sedparse"; - rev = "0.1.2"; - hash = "sha256-Q17A/oJ3GZbdSK55hPaMdw85g43WhTW9tuAuJtDfHHU="; - }; - }; - + python27 = callPackage ./python27.nix { }; in python27.pkgs.buildPythonApplication { pname = "resholve"; @@ -35,7 +19,7 @@ python27.pkgs.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python27.pkgs; [ oildev configargparse sedparse diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index 75b13b7c1900..a2cc8aaffe69 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -13,7 +13,6 @@ bats, libressl, openssl, - python27, file, gettext, rSrc, diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 7bcf18ee24d6..ee5c35e27fae 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -5,7 +5,6 @@ setuptools, pytestCheckHook, pytest-asyncio, - isPy27, }: buildPythonPackage rec { @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "0.2.2"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "fantix"; repo = "aiocontextvars"; diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix index 87784477ccbd..4bc47fe3bd51 100644 --- a/pkgs/development/python-modules/aspell-python/default.nix +++ b/pkgs/development/python-modules/aspell-python/default.nix @@ -4,7 +4,6 @@ aspellDicts, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "1.15"; pyproject = true; - disabled = isPy27; - src = fetchPypi { pname = "aspell-python-py3"; inherit version; diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 3a74d1e2c350..504834368922 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, autoconf, automake, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "3.1.1"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix index 45b1d5407db4..e21dcbfa9f61 100644 --- a/pkgs/development/python-modules/basiciw/default.nix +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -4,7 +4,6 @@ fetchPypi, gcc, wirelesstools, - isPy27, isPyPy, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "0.2.2"; format = "setuptools"; - disabled = isPy27 || isPyPy; + disabled = isPyPy; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index aad6383f249e..bd556adcaef3 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -12,11 +12,8 @@ sqlalchemy, pycrypto, cryptography, - isPy27, pytestCheckHook, setuptools, - funcsigs ? null, - pycryptopp ? null, }: buildPythonPackage rec { @@ -38,10 +35,6 @@ buildPythonPackage rec { sqlalchemy pycrypto cryptography - ] - ++ lib.optionals isPy27 [ - funcsigs - pycryptopp ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix index d3035a11df13..32b08f75003d 100644 --- a/pkgs/development/python-modules/ci-info/default.nix +++ b/pkgs/development/python-modules/ci-info/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, pytest, pytestCheckHook, @@ -12,8 +11,6 @@ buildPythonPackage rec { format = "setuptools"; pname = "ci-info"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 5e06ace61034..c87468bd5955 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, # propagates click, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "click-completion"; version = "0.5.2"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix index 283633f6d04f..89795e6001ca 100644 --- a/pkgs/development/python-modules/coapthon3/default.nix +++ b/pkgs/development/python-modules/coapthon3/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, cachetools, fetchFromGitHub, - isPy27, lib, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "coapthon3"; version = "1.0.2"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "Tanganelli"; diff --git a/pkgs/development/python-modules/debts/default.nix b/pkgs/development/python-modules/debts/default.nix index ba8a49c20034..25d37cc566f1 100644 --- a/pkgs/development/python-modules/debts/default.nix +++ b/pkgs/development/python-modules/debts/default.nix @@ -3,7 +3,6 @@ python, buildPythonPackage, fetchFromGitLab, - isPy27, jinja2, pytest, }: @@ -22,8 +21,6 @@ buildPythonPackage rec { sha256 = "1d66nka81mv9c07mki78lp5hdajqv4cq6aq2k7bh3mhkc5hwnwlg"; }; - disabled = isPy27; - propagatedBuildInputs = [ jinja2 ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index 0d659cf4833c..e128ab588b06 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, pyserial, srp, lib, @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "digi-xbee"; version = "1.5.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { pname = "digi_xbee"; diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index e1310b1ef37d..c5ce2cd1685e 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, appdirs, asn1crypto, cffi, @@ -29,7 +28,6 @@ buildPythonPackage rec { pname = "etesync"; version = "0.12.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 0b1b0bf32747..7ee213a87409 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, setuptools, pytestCheckHook, @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.9.0"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; extension = "zip"; diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 6a93631fe79b..685b9ffa6b81 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - isPy27, pythonAtLeast, coloredlogs, humanfriendly, @@ -21,7 +20,7 @@ buildPythonPackage rec { format = "setuptools"; # pipes is removed in python 3.13 - disabled = isPy27 || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "xolox"; diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix index e30677548552..9b432d32c042 100644 --- a/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "gibberish-detector"; version = "0.1.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "domanchi"; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index f478acffb27e..765793f90ea4 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -10,13 +10,11 @@ libndtypes, libxnd, libgumath, - isPy27, }: buildPythonPackage { pname = "gumath"; format = "setuptools"; - disabled = isPy27; inherit (libgumath) src version meta; patches = [ diff --git a/pkgs/development/python-modules/halo/default.nix b/pkgs/development/python-modules/halo/default.nix index 094331f54f75..9750b7686691 100644 --- a/pkgs/development/python-modules/halo/default.nix +++ b/pkgs/development/python-modules/halo/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, colorama, fetchPypi, - isPy27, lib, log-symbols, six, @@ -14,7 +13,6 @@ buildPythonPackage (finalAttrs: { pname = "halo"; version = "0.0.31"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit (finalAttrs) pname version; diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index 05f774c3dc43..3bfd9a6e2ca6 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - isPy27, idna, - typing ? null, }: buildPythonPackage rec { @@ -17,7 +15,7 @@ buildPythonPackage rec { sha256 = "0sx50lkivsfjxx9zr4yh7l9gll2l9kvl0v0w8w4wk2x5v9bzjyj2"; }; - propagatedBuildInputs = [ idna ] ++ lib.optionals isPy27 [ typing ]; + propagatedBuildInputs = [ idna ]; meta = { description = "Featureful, correct URL for Python"; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index ed8cc71addac..a4b0b46ffb4a 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - isPy27, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "inflection"; version = "0.5.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index 80539b22e3e0..68a1e2967d8a 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, nbval, jupyter-packaging, @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "4.3.5"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-OU8kiVdlh8/XVTd6CaBn9GytIggZZQkgIf0avL54Uqg="; diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix index 01f4514eafb5..1e1eb826b7d7 100644 --- a/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools-scm, more-itertools, pytestCheckHook, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "3.4.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.classes"; diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index 72696d60e7a2..52d42233e8b1 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, lib, numpy, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "javaobj-py3"; version = "0.4.4"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/json-rpc/default.nix b/pkgs/development/python-modules/json-rpc/default.nix index 10e4ae35245f..477c48b91abb 100644 --- a/pkgs/development/python-modules/json-rpc/default.nix +++ b/pkgs/development/python-modules/json-rpc/default.nix @@ -1,15 +1,10 @@ { lib, - isPy27, buildPythonPackage, fetchPypi, pytestCheckHook, - mock, }: -let - pythonEnv = lib.optional isPy27 mock; -in buildPythonPackage rec { pname = "json-rpc"; version = "1.15.0"; @@ -20,9 +15,7 @@ buildPythonPackage rec { hash = "sha256-5kQdVsHc1UJByTfQotzRk73wvcU5tTFlJHE/VUt/hbk="; }; - nativeCheckInputs = pythonEnv ++ [ pytestCheckHook ]; - - nativeBuildInputs = pythonEnv; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "JSON-RPC 1/2 transport implementation"; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 6fcb892bd977..fd66f5dab78c 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -4,7 +4,6 @@ fetchPypi, fetchpatch, python, - isPy27, six, zope-testing, }: @@ -13,7 +12,6 @@ buildPythonPackage rec { pname = "manuel"; version = "1.13.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index b66bfccc410e..83a82ef0251a 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -8,14 +8,12 @@ pytestCheckHook, hypothesis, setuptools-scm, - isPy27, }: buildPythonPackage rec { pname = "matchpy"; version = "0.5.5"; # Don't upgrade to 4.3.1, this tag is very old format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "HPAC"; diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix index eeb055381880..6854d80dc3c9 100644 --- a/pkgs/development/python-modules/mergedeep/default.nix +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "mergedeep"; version = "1.3.4"; format = "setuptools"; - disabled = isPy27; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 0ec60de6f4d8..21431e8a373e 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -1,6 +1,5 @@ { lib, - isPy27, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -14,7 +13,6 @@ buildPythonPackage rec { pname = "mlrose"; version = "1.3.0"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "gkhayes"; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 8b0cf517676d..886238be38e4 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools, pytestCheckHook, scipy, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "0.24.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "rasbt"; repo = "mlxtend"; diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 23cb82eaf307..ff90bccc086c 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -1,9 +1,7 @@ { buildPythonPackage, fetchFromGitHub, - isPy27, lib, - mock, numpy, pytestCheckHook, }: @@ -20,7 +18,7 @@ buildPythonPackage rec { sha256 = "17r37pbxiv5dw857bmg990x836gq6sgww069w3q5jjg9m3xdm7dh"; }; - propagatedBuildInputs = [ numpy ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 0c7e59f6a6fa..a4392d767292 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pymongo, - isPy27, six, blinker, pytestCheckHook, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "mongoengine"; version = "0.29.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; diff --git a/pkgs/development/python-modules/mongoquery/default.nix b/pkgs/development/python-modules/mongoquery/default.nix index 01a1985031df..ae4a0cfc88d5 100644 --- a/pkgs/development/python-modules/mongoquery/default.nix +++ b/pkgs/development/python-modules/mongoquery/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, six, - isPy27, }: buildPythonPackage rec { @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.4.3"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; sha256 = "sha256-6QH4buWvfvbtovLCb0vSz+g4DYHxeLfjYH27zc7pcjk="; diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix index 840a1a7a2285..a77a245a2f01 100644 --- a/pkgs/development/python-modules/ms-cv/default.nix +++ b/pkgs/development/python-modules/ms-cv/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "0.1.1"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "OpenXbox"; repo = "ms_cv"; diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 21b13ffee682..95419e06d9b6 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -5,13 +5,11 @@ python, numpy, libndtypes, - isPy27, }: buildPythonPackage { pname = "ndtypes"; format = "setuptools"; - disabled = isPy27; inherit (libndtypes) version src meta; outputs = [ diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix index 103286a0f0b1..0b6c2aad4d88 100644 --- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -5,14 +5,12 @@ jinja2, setuptools, rope, - isPy27, }: buildPythonPackage rec { pname = "nixpkgs-pytools"; version = "1.3.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index 5f4bdc99f89d..5cbb845e9e74 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, flake8, flask-sqlalchemy, - isPy27, mock, peewee, pytest-django, @@ -21,7 +20,6 @@ buildPythonPackage rec { pname = "nplusone"; version = "1.0.0"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "jmcarp"; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index b7a02b04a9d8..f2f0d8c973bc 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - isPy27, libopus, pytestCheckHook, lib, @@ -16,8 +15,6 @@ buildPythonPackage { version = "3.0.3"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "orion-labs"; repo = "opuslib"; diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index 720433461cf1..cefec10cb7f4 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "2.0.3"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "piccata"; diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix index aba650e2cbef..9831ba3b8140 100644 --- a/pkgs/development/python-modules/plexauth/default.nix +++ b/pkgs/development/python-modules/plexauth/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchFromGitHub, aiohttp, - isPy27, }: buildPythonPackage rec { pname = "plexauth"; version = "0.0.6"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "jjlawren"; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 3275848c97da..ebd4220c69a3 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, setuptools, setuptools-scm, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "1.8.2"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-dlYfDeaKAdpN9q846ZVcTJ0aXJDac/fkAnalco7IPRA="; diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 63f4fc43c848..e6a3ee02086d 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage rec { pname = "pq"; version = "1.9.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 45e69dd12445..2b3290c32b94 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -4,7 +4,6 @@ click, fetchPypi, flask, - isPy27, nixosTests, prometheus-client, py-air-control, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "py-air-control-exporter"; version = "0.3.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix index 322454a2f59d..d1689fcc7c08 100644 --- a/pkgs/development/python-modules/py-sonic/default.nix +++ b/pkgs/development/python-modules/py-sonic/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage rec { pname = "py-sonic"; version = "1.0.3"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyaehw4a1/default.nix b/pkgs/development/python-modules/pyaehw4a1/default.nix index ab7dc9d4b854..b10e845296c4 100644 --- a/pkgs/development/python-modules/pyaehw4a1/default.nix +++ b/pkgs/development/python-modules/pyaehw4a1/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "0.3.9"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "bannhead"; repo = "pyaehw4a1"; diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix index 80a3fefcb45c..e3ef26bd7c20 100644 --- a/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, cffi, pytest, }: @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "pycmarkgfm"; version = "1.2.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 3ca3b126b8f3..4c0ac8884e18 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - isPy27, fetchPypi, enchant_2, }: @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "pyenchant"; version = "3.3.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pypubsub/default.nix b/pkgs/development/python-modules/pypubsub/default.nix index 3b4f97f73a61..b37b97e135fa 100644 --- a/pkgs/development/python-modules/pypubsub/default.nix +++ b/pkgs/development/python-modules/pypubsub/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage { pname = "pypubsub"; version = "4.0.3"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "schollii"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 85cedbede6af..89f5cc650dca 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, setuptools, - isPy27, fetchPypi, pkg-config, dbus, @@ -30,8 +29,6 @@ buildPythonPackage rec { version = "5.15.10"; pyproject = true; - disabled = isPy27; - src = fetchPypi { pname = "PyQt5"; inherit version; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 5de6872ce99e..f9b58f18bad5 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - isPy27, lib, setuptools, setuptools-declarative-requirements, @@ -13,7 +12,6 @@ buildPythonPackage rec { pname = "pytest-helpers-namespace"; version = "2021.12.29"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix index f66343a8823b..12d82c4ee36c 100644 --- a/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytest, tornado, }: @@ -11,7 +10,6 @@ buildPythonPackage { pname = "pytest-tornasync"; version = "0.6.0.post2"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "eukaryote"; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 47f40cab27e0..f656f3dfa416 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - isPy27, }: buildPythonPackage { pname = "pyxl3"; version = "1.4"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "gvanrossum"; diff --git a/pkgs/development/python-modules/reparser/default.nix b/pkgs/development/python-modules/reparser/default.nix index 5d35bc128083..b1749ded00e6 100644 --- a/pkgs/development/python-modules/reparser/default.nix +++ b/pkgs/development/python-modules/reparser/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "1.4.3"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "xmikos"; repo = "reparser"; diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index 5baae3a107e8..cd560fd2cca9 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -5,14 +5,12 @@ requests, pytest, flask, - isPy27, }: buildPythonPackage rec { version = "4.1"; format = "setuptools"; pname = "roku"; - disabled = isPy27; src = fetchFromGitHub { owner = "jcarbaugh"; diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index d2a83c7260ec..05a38a1ca7f3 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -1,7 +1,6 @@ { fetchFromGitHub, buildPythonPackage, - isPy27, setuptools, cython, portaudio, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "rtmixer"; version = "0.1.7"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "spatialaudio"; diff --git a/pkgs/development/python-modules/sansio-multipart/default.nix b/pkgs/development/python-modules/sansio-multipart/default.nix index ef47ab77c7ed..aa12f71a01e7 100644 --- a/pkgs/development/python-modules/sansio-multipart/default.nix +++ b/pkgs/development/python-modules/sansio-multipart/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, }: @@ -9,8 +8,6 @@ buildPythonPackage rec { pname = "sansio-multipart"; version = "0.3"; - disabled = isPy27; - format = "setuptools"; src = fetchPypi { diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index aa36b958343c..f6a2cc54fcbf 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -15,14 +15,12 @@ kmapper, tadasets, pytest, - isPy27, }: buildPythonPackage rec { pname = "scikit-tda"; version = "1.1.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "scikit-tda"; diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 63968d773aee..60e3c961d0db 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools, regex, csvw, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "segments"; version = "2.4.0"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix index 3d488ca98eb0..d15858c59f03 100644 --- a/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.0.0"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-eGj7HIv6dkwaxWPTzzacOB0TJdNhJJM6cm8p/NqoEuk="; diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix index 1518b29537ae..d0aa31dadddd 100644 --- a/pkgs/development/python-modules/simpleaudio/default.nix +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -2,7 +2,6 @@ alsa-lib, buildPythonPackage, fetchFromGitHub, - isPy27, lib, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "simpleaudio"; version = "1.0.4"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "hamiltron"; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index c85eb0c4ad81..d042bbde7d4f 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - isPy27, fetchPypi, setuptools, setuptools-scm, @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "4.1.1"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-BtB1CniEsR4OjiDOC8fG1O1fF0PUVmlTQNE/3/lQAaY="; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index fa0168b0337c..c7d4995fc1cc 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, callPackage, fetchPypi, - isPy27, pythonOlder, lib, cryptography, @@ -11,7 +10,6 @@ grpcio-tools, hadoop, pytestCheckHook, - python, setuptools, versioneer, }: @@ -77,8 +75,5 @@ buildPythonPackage rec { alexbiehl illustris ]; - problems = lib.optionalAttrs isPy27 { - broken.message = "${pname} not supported on ${python.executable}"; - }; }; } diff --git a/pkgs/development/python-modules/snapshot-restore-py/default.nix b/pkgs/development/python-modules/snapshot-restore-py/default.nix index bb478bc8d11c..be8456cc2d58 100644 --- a/pkgs/development/python-modules/snapshot-restore-py/default.nix +++ b/pkgs/development/python-modules/snapshot-restore-py/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, setuptools, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "aws"; repo = "snapshot-restore-py"; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 4a7e62dee817..3f3fdb55ad07 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - isPy27, setuptools, cffi, numpy, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "sounddevice"; version = "0.5.3"; pyproject = true; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index aba070269087..591091073f8b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-jsmath"; version = "1.0.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit (finalAttrs) pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index da92f50fbfb8..8a5a6b9fdbc9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, deepmerge, fetchPypi, - isPy27, setuptools-scm, jsonschema, picobox, @@ -16,7 +15,6 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; version = "0.8.4"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/spiderpy/default.nix b/pkgs/development/python-modules/spiderpy/default.nix index 5f247cca2cdc..d62ea82b6759 100644 --- a/pkgs/development/python-modules/spiderpy/default.nix +++ b/pkgs/development/python-modules/spiderpy/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, poetry-core, requests, @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "1.7.2"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "peternijssen"; repo = "spiderpy"; diff --git a/pkgs/development/python-modules/spinners/default.nix b/pkgs/development/python-modules/spinners/default.nix index 049894a49bb0..5b9df19c1368 100644 --- a/pkgs/development/python-modules/spinners/default.nix +++ b/pkgs/development/python-modules/spinners/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, lib, }: @@ -9,7 +8,6 @@ buildPythonPackage rec { pname = "spinners"; version = "0.0.24"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index a7c90aa2c73e..977b78e0080d 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, future, imageio, @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "0.628"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "williamFalcon"; repo = "test-tube"; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 0133e47553c0..4dcf73be19fe 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, lib, fetchFromGitHub, - isPy27, setuptools, pytestCheckHook, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "6.2.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "asottile"; repo = "tokenize-rt"; diff --git a/pkgs/development/python-modules/update-checker/default.nix b/pkgs/development/python-modules/update-checker/default.nix index 54dc1c552357..f6100125a88a 100644 --- a/pkgs/development/python-modules/update-checker/default.nix +++ b/pkgs/development/python-modules/update-checker/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchPypi, requests, - isPy27, }: buildPythonPackage rec { pname = "update-checker"; version = "0.18.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { pname = "update_checker"; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 6b9a45b06fc0..5d60eff54efc 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, pytest-cov-stub, setuptools, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "3.1.1"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-U0+zs1VmkoPrOVRYGTHl0dBx/OYdAp1Y8yGaXjpvDEE="; diff --git a/pkgs/development/python2-modules/README.md b/pkgs/development/python2-modules/README.md deleted file mode 100644 index 97252d996691..000000000000 --- a/pkgs/development/python2-modules/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Python 2 is Not Supported - -Packages, applications, and services based on Python 2 are no longer supported and are being removed. If you require a Python 2-based package, you can include that package in your own local repository. - -Some packages may continue to be maintained for internal use by Nixpkgs, but they should not be used by new public packages. - -For more details, see [Issue #201859](https://github.com/NixOS/nixpkgs/pull/201859). diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e1690f5858a1..33291f2d7943 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1816,15 +1816,21 @@ mapAliases { pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27 pyotherside = warnAlias "'pyotherside' has been renamed to 'libsForQt5.pyotherside'. A Qt6 build is available at 'qt6Packages.pyotherside'."; # Added 2026-03-27 pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27 + python2 = throw "python2 has been removed; Python 2 is end-of-life. Use `python3` instead."; # Added 2026-05-03 + python2Full = throw "python2Full has been removed; Python 2 is end-of-life. Use `python3` instead."; # Added 2026-05-03 + python2Packages = throw "python2Packages has been removed; Python 2 is end-of-life. Use `python3Packages` instead."; # Added 2026-05-03 python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 + python27 = throw "python27 has been removed from the top-level package set; Python 2 is end-of-life. Use `python3` instead."; # Added 2026-05-03 + python27Full = throw "python27Full has been removed; Python 2 is end-of-life. Use `python3` instead."; # Added 2026-05-03 + python27Packages = throw "python27Packages has been removed; Python 2 is end-of-life. Use `python3Packages` instead."; # Added 2026-05-03 python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 - python = throw "`python` previously pointed to Python 2; use `python3` or `python2` if necessary"; # Converted to throw 2025-10-27 + python = throw "`python` previously pointed to Python 2; use `python3` instead"; # Converted to throw 2025-10-27 python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14 - pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` or `python2Full` if necessary"; # Converted to throw 2025-10-27 - pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` or `python2.pkgs` if necessary"; # Converted to throw 2025-10-27 + pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` instead"; # Converted to throw 2025-10-27 + pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` instead"; # Converted to throw 2025-10-27 pywal = pywal16; # Added 2026-02-01 q2pro = throw "'q2pro' has been removed as upstream repository was deleted and no direct active forks were available."; # Added 2025-12-27 qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02a360aa1034..75ecd515cf1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4855,11 +4855,9 @@ with pkgs; # Python interpreters. All standard library modules are included except for tkinter, which is # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md - python2 = python27; python3 = python313; # pythonPackages further below, but assigned here because they need to be in sync - python2Packages = dontRecurseIntoAttrs python27Packages; python3Packages = dontRecurseIntoAttrs python313Packages; pypy = pypy2; @@ -4868,16 +4866,6 @@ with pkgs; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - python2Full = python2.override { - self = python2Full; - pythonAttr = "python2Full"; - x11Support = true; - }; - python27Full = python27.override { - self = python27Full; - pythonAttr = "python27Full"; - x11Support = true; - }; # https://py-free-threading.github.io python313FreeThreading = python313.override { @@ -4898,7 +4886,6 @@ with pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) - python27 python311 python312 python313 @@ -4914,7 +4901,6 @@ with pkgs; pythonPackagesExtensions = [ ]; # Python package sets. - python27Packages = python27.pkgs; python311Packages = python311.pkgs; python312Packages = python312.pkgs; python313Packages = recurseIntoAttrs python313.pkgs; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8b09738955a..2fe8b765a2a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8985,7 +8985,6 @@ self: super: with self; { p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; - broken = super.meta.broken or isPy27; }; }) ) diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix deleted file mode 100644 index 8784cb32b65a..000000000000 --- a/pkgs/top-level/python2-packages.nix +++ /dev/null @@ -1,71 +0,0 @@ -# Extension with Python 2 packages that is overlaid on top -# of the Python 3 packages set. This way, Python 2+3 compatible -# packages can still be used. - -self: super: - -with self; -with super; -{ - attrs = disabled super.attrs; - - bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); - - cffi = disabled super.cffi; - - configparser = disabled super.configparser; - - contextlib2 = disabled super.contextlib2; - - coverage = disabled super.coverage; - - filelock = disabled super.filelock; - - hypothesis = disabled super.hypothesis; - - importlib-metadata = disabled super.importlib-metadata; - - jinja2 = disabled super.jinja2; - - markupsafe = disabled super.markupsafe; - - mock = disabled super.mock; - - more-itertools = disabled super.more-itertools; - - ninja = disabled super.ninja; - - packaging = disabled super.packaging; - - pip = callPackage ../development/python2-modules/pip { }; - - pluggy = disabled super.pluggy; - - pycairo = disabled super.pycairo; - - pyparsing = disabled super.pyparsing; - - pytest = disabled super.pytest; - - pytest_4 = disabled super.pytest; - - pytest-xdist = disabled super.pytest-xdist; - - recoll = disabled super.recoll; - - rivet = disabled super.rivet; - - rpm = disabled super.rpm; - - setuptools = callPackage ../development/python2-modules/setuptools { }; - - six = disabled super.six; - - wcwidth = disabled super.wcwidth; - - wheel = callPackage ../development/python2-modules/wheel { }; - - zeek = disabled super.zeek; - - zipp = disabled super.zipp; -}