diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index bbc5da116a6a..acbfb306b4ff 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -50,7 +50,6 @@ sets are * `pkgs.python27Packages` * `pkgs.python3Packages` -* `pkgs.python39Packages` * `pkgs.python310Packages` * `pkgs.python311Packages` * `pkgs.python312Packages` diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 4072c31dc296..b33dc33b5df8 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -309,14 +309,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ buildInputs; - prePatch = - optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"' - '' - + optionalString (pythonOlder "3.9" && stdenv.hostPlatform.isDarwin && x11Support) '' - # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch - substituteInPlace setup.py --replace-fail /Library/Frameworks /no-such-path - ''; + prePatch = optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"' + ''; patches = [ @@ -772,14 +767,6 @@ stdenv.mkDerivation (finalAttrs: { inherit src; name = "python${pythonVersion}-${version}-doc"; - patches = optionals (pythonAtLeast "3.9" && pythonOlder "3.10") [ - # https://github.com/python/cpython/issues/98366 - (fetchpatch { - url = "https://github.com/python/cpython/commit/5612471501b05518287ed61c1abcb9ed38c03942.patch"; - hash = "sha256-p41hJwAiyRgyVjCVQokMSpSFg/VDDrqkCSxsodVb6vY="; - }) - ]; - postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") '' substituteInPlace Doc/tools/extensions/pyspecific.py \ --replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator" diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b16381009828..580f3db89968 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -44,18 +44,6 @@ inherit passthruFun; }; - python39 = callPackage ./cpython { - self = __splicedPackages.python39; - sourceVersion = { - major = "3"; - minor = "9"; - patch = "21"; - suffix = ""; - }; - hash = "sha256-MSb1lZLJsNeYWEdV8r97CB+hyjXOem/qmAEI11KgW7E="; - inherit passthruFun; - }; - python310 = callPackage ./cpython { self = __splicedPackages.python310; sourceVersion = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c5a3c202b49..87b60aa85d4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7589,12 +7589,6 @@ with pkgs; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; - python39Full = python39.override { - self = python39Full; - pythonAttr = "python39Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; - }; python310Full = python310.override { self = python310Full; pythonAttr = "python310Full"; @@ -7639,7 +7633,6 @@ with pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 - python39 python310 python311 python312 @@ -7655,7 +7648,6 @@ with pkgs; # Python package sets. python27Packages = python27.pkgs; - python39Packages = python39.pkgs; python310Packages = python310.pkgs; python311Packages = python311.pkgs; python312Packages = recurseIntoAttrs python312.pkgs; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7f4ec006185d..d0721da803c3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -38,14 +38,12 @@ mapAliases ({ python2Packages = throw "do not use python2Packages when building Python packages, specify each used package as a separate argument"; # do not remove python27Packages = throw "do not use python27Packages when building Python packages, specify each used package as a separate argument"; # do not remove python3Packages = throw "do not use python3Packages when building Python packages, specify each used package as a separate argument"; # do not remove - python39Packages = throw "do not use python39Packages when building Python packages, specify each used package as a separate argument"; # do not remove python310Packages = throw "do not use python310Packages when building Python packages, specify each used package as a separate argument"; # do not remove python311Packages = throw "do not use python311Packages when building Python packages, specify each used package as a separate argument"; # do not remove python312Packages = throw "do not use python312Packages when building Python packages, specify each used package as a separate argument"; # do not remove python313Packages = throw "do not use python313Packages when building Python packages, specify each used package as a separate argument"; # do not remove python2 = throw "do not use python2 when building Python packages, use the generic python parameter instead"; # do not remove python3 = throw "do not use python3 when building Python packages, use the generic python parameter instead"; # do not remove - python39 = throw "do not use python39 when building Python packages, use the generic python parameter instead"; # do not remove python310 = throw "do not use python310 when building Python packages, use the generic python parameter instead"; # do not remove python311 = throw "do not use python311 when building Python packages, use the generic python parameter instead"; # do not remove python312 = throw "do not use python312 when building Python packages, use the generic python parameter instead"; # do not remove