Unverified Commit 8e93fb0f authored by Martin Weinelt's avatar Martin Weinelt
Browse files

python39: drop before the 25.05 branch-off

End of security support is scheduled for 2025-10-31, which does not cover
the complete 25.05 release cycle.
parent 1076d576
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ sets are

* `pkgs.python27Packages`
* `pkgs.python3Packages`
* `pkgs.python39Packages`
* `pkgs.python310Packages`
* `pkgs.python311Packages`
* `pkgs.python312Packages`
+3 −16
Original line number Diff line number Diff line
@@ -309,13 +309,8 @@ stdenv.mkDerivation (finalAttrs: {
    ]
    ++ buildInputs;

  prePatch =
    optionalString stdenv.hostPlatform.isDarwin ''
  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
  '';

  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"
+0 −12
Original line number Diff line number Diff line
@@ -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 = {
+0 −8
Original line number Diff line number Diff line
@@ -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;
+0 −2
Original line number Diff line number Diff line
@@ -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