diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index dbfe1c51b4d0..3065d1b7b2ac 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -2,13 +2,11 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { - pname = "python27-docs-html"; - version = "2.7.16"; - +stdenv.mkDerivation { + name = "python27-docs-html-2.7.18"; src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2"; - sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02"; + url = http://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 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 index cf03df68b0f3..70f1a4853b8b 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -2,13 +2,11 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { - pname = "python27-docs-pdf-a4"; - version = "2.7.16"; - +stdenv.mkDerivation { + name = "python27-docs-pdf-a4-2.7.18"; src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2"; - sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq"; + url = http://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 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 index d75ea77f7877..7907629b8564 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -2,13 +2,11 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { - pname = "python27-docs-pdf-letter"; - version = "2.7.16"; - +stdenv.mkDerivation { + name = "python27-docs-pdf-letter-2.7.18"; src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2"; - sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0"; + url = http://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 diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 0c217d188410..ba880f93a9c7 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -2,13 +2,11 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { - pname = "python27-docs-text"; - version = "2.7.16"; - +stdenv.mkDerivation { + name = "python27-docs-text-2.7.18"; src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2"; - sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r"; + url = http://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 diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix new file mode 100644 index 000000000000..f77ad0ef1e9a --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation { + name = "python310-docs-html-3.10.7"; + src = fetchurl { + url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-html.tar.bz2; + sha256 = "0j86z1vmaghzj5i4frvzyfb9qwsmm09g4f4ssx5w27cm30b8k0v1"; + }; + installPhase = '' + mkdir -p $out/share/doc/python310 + cp -R ./ $out/share/doc/python310/html + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix new file mode 100644 index 000000000000..46efe535e767 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation { + name = "python310-docs-pdf-a4-3.10.7"; + src = fetchurl { + url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-pdf-a4.tar.bz2; + sha256 = "1gvi457dsj3ywwvxysp7idkk9ndngnby1dnfh1q8f5gv3kg4093r"; + }; + installPhase = '' + mkdir -p $out/share/doc/python310 + cp -R ./ $out/share/doc/python310/pdf-a4 + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix new file mode 100644 index 000000000000..f2c1ca242965 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation { + name = "python310-docs-pdf-letter-3.10.7"; + src = fetchurl { + url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-pdf-letter.tar.bz2; + sha256 = "0hzq5n6absqsh21jp6j5iaim9a1wq69d8lc2assldzb2zg4i75hr"; + }; + installPhase = '' + mkdir -p $out/share/doc/python310 + cp -R ./ $out/share/doc/python310/pdf-letter + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix new file mode 100644 index 000000000000..82a7486d45b9 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation { + name = "python310-docs-texinfo-3.10.7"; + src = fetchurl { + url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-texinfo.tar.bz2; + sha256 = "0p0fifi84ijz4ng6krw7c1x965jhgysprkijblmlnax7x9rmqrdf"; + }; + installPhase = '' + mkdir -p $out/share/info + cp ./python.info $out/share/info + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix new file mode 100644 index 000000000000..7e9dd6841aa5 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix @@ -0,0 +1,18 @@ +# This file was generated and will be overwritten by ./generate.sh + +{ stdenv, fetchurl, lib }: + +stdenv.mkDerivation { + name = "python310-docs-text-3.10.7"; + src = fetchurl { + url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-text.tar.bz2; + sha256 = "1zbmm2fvdjnl214y41yffyqw3ywfai5r5npc00n1wkfxsdp7gcc3"; + }; + installPhase = '' + mkdir -p $out/share/doc/python310 + cp -R ./ $out/share/doc/python310/text + ''; + meta = { + maintainers = [ ]; + }; +} diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix index a538f731473b..b6324788054d 100644 --- a/pkgs/development/interpreters/python/cpython/docs/default.nix +++ b/pkgs/development/interpreters/python/cpython/docs/default.nix @@ -7,7 +7,7 @@ pythonDocs = { python27 = import ./2.7-html.nix { inherit stdenv fetchurl lib; }; - python37 = import ./3.7-html.nix { + python310 = import ./3.10-html.nix { inherit stdenv fetchurl lib; }; }; @@ -16,7 +16,7 @@ pythonDocs = { python27 = import ./2.7-pdf-a4.nix { inherit stdenv fetchurl lib; }; - python37 = import ./3.7-pdf-a4.nix { + python310 = import ./3.10-pdf-a4.nix { inherit stdenv fetchurl lib; }; }; @@ -25,7 +25,7 @@ pythonDocs = { python27 = import ./2.7-pdf-letter.nix { inherit stdenv fetchurl lib; }; - python37 = import ./3.7-pdf-letter.nix { + python310 = import ./3.10-pdf-letter.nix { inherit stdenv fetchurl lib; }; }; @@ -34,7 +34,13 @@ pythonDocs = { python27 = import ./2.7-text.nix { inherit stdenv fetchurl lib; }; - python37 = import ./3.7-text.nix { + python310 = import ./3.10-text.nix { + inherit stdenv fetchurl lib; + }; + }; + texinfo = { + recurseForDerivations = true; + python310 = import ./3.10-texinfo.nix { inherit stdenv fetchurl lib; }; }; diff --git a/pkgs/development/interpreters/python/cpython/docs/generate.sh b/pkgs/development/interpreters/python/cpython/docs/generate.sh index a4b2e0893fcd..47fd134da084 100755 --- a/pkgs/development/interpreters/python/cpython/docs/generate.sh +++ b/pkgs/development/interpreters/python/cpython/docs/generate.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -TYPES="html pdf-a4 pdf-letter text" -URL=http://docs.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2 -VERSIONS=$(for major in 2 3; do curl https://docs.python.org/$major/archives/ 2>/dev/null | perl -l -n -e'//dev/null | perl -l -n -e'/ ${outfile} + -e "s,SHA,${sha}," < ${template} > ${outfile} attrname=python${major}${minor} cat >>default.nix <