Merge staging-next into staging

pkgs/development/interpreters/python/cpython/docs/3.14-html.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation {
   pname = "python314-docs-html";
-  version = "3.14";
+  version = "3.14.6";
 
   src = fetchurl {
-    url = "https://docs.python.org/3.14/archives/python-3.14-docs-html.tar.bz2";
-    sha256 = "0igikxq71zqyps8swfib4rwfi81vgvi4fdc6j4sz3x1981nh4j3v";
+    url = "https://www.python.org/ftp/python/doc/3.14.6/python-3.14.6-docs-html.tar.bz2";
+    sha256 = "0hm49y5di6zxka8425q6ksw2psfzcn9mmgjq2k5x86w3x47k0jrh";
   };
   installPhase = ''
     mkdir -p $out/share/doc/python314

pkgs/development/interpreters/python/cpython/docs/3.14-pdf-a4.nix

@@ -1,26 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{
-  stdenv,
-  fetchurl,
-  lib,
-}:
-
-stdenv.mkDerivation {
-  pname = "python314-docs-pdf-a4";
-  version = "3.14";
-
-  src = fetchurl {
-    url = "https://docs.python.org/3.14/archives/python-3.14-docs-pdf-a4.tar.bz2";
-    sha256 = "0nb69h3wz2vixf80alh9x8fafz3ipq2hdrxccj8vp8vvrcqna75y";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python314
-    cp -R ./ $out/share/doc/python314/pdf-a4
-  '';
-  meta = {
-    maintainers = with lib.maintainers; [
-      panicgh
-    ];
-  };
-}

pkgs/development/interpreters/python/cpython/docs/3.14-texinfo.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation {
   pname = "python314-docs-texinfo";
-  version = "3.14";
+  version = "3.14.6";
 
   src = fetchurl {
-    url = "https://docs.python.org/3.14/archives/python-3.14-docs-texinfo.tar.bz2";
-    sha256 = "0r89zg2dzh90iv3qff9rx0ckfsds8hin5z53ai31cchxhglg4b8s";
+    url = "https://www.python.org/ftp/python/doc/3.14.6/python-3.14.6-docs-texinfo.tar.bz2";
+    sha256 = "0nwdvgnxs6sik0d1kkl6fnnhxrvmj356i92abp84i33d4dy6i9hw";
   };
   installPhase = ''
     mkdir -p $out/share/info

pkgs/development/interpreters/python/cpython/docs/3.14-text.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation {
   pname = "python314-docs-text";
-  version = "3.14";
+  version = "3.14.6";
 
   src = fetchurl {
-    url = "https://docs.python.org/3.14/archives/python-3.14-docs-text.tar.bz2";
-    sha256 = "1w8zl9pymsfviiw7iqz86liwnvfh1093syk3vkpvsdmvsa9acwyf";
+    url = "https://www.python.org/ftp/python/doc/3.14.6/python-3.14.6-docs-text.tar.bz2";
+    sha256 = "0flqq4k9fq948gb3zim04znyxr21pfv8i4mrhh3qwna13fh897zg";
   };
   installPhase = ''
     mkdir -p $out/share/doc/python314

pkgs/development/interpreters/python/cpython/docs/default.nix

@@ -12,12 +12,6 @@ let
         inherit stdenv fetchurl lib;
       };
     };
-    pdf_a4 = {
-      recurseForDerivations = true;
-      python314 = import ./3.14-pdf-a4.nix {
-        inherit stdenv fetchurl lib;
-      };
-    };
     text = {
       recurseForDerivations = true;
       python314 = import ./3.14-text.nix {

pkgs/development/interpreters/python/cpython/docs/generate.sh

@@ -2,9 +2,9 @@
 
 cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 
-TYPES="html pdf-a4 text texinfo"
-URL=https://docs.python.org/VERSION/archives/python-VERSION-docs-TYPE.tar.bz2
-VERSIONS=$(for major in 3; do curl https://docs.python.org/$major/archives/ 2>/dev/null | perl -l -n -e'/<a href="python-([23].[0-9]+(.[0-9]+)?)-docs-html.tar.bz2/ && print $1' | tail -n 1; done)
+TYPES="html text texinfo"
+URL=https://www.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2
+VERSIONS=$(curl https://www.python.org/ftp/python/doc/ 2>/dev/null | perl -l -n -e'/<a href="([3].[0-9]+.[0-9]+)\// && print $1' | sort --version-sort | tail -n 1)
 echo "Generating expressions for:
 ${VERSIONS}
 "