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 3065d1b7b2ac..48478293a45a 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python27-docs-html-2.7.18"; + pname = "python27-docs-html"; + version = "2.7.18"; + src = fetchurl { url = http://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-html.tar.bz2; sha256 = "03igxwpqc2lvzspnj78zz1prnmfwwj00jbvh1wsxvb0wayd5wi10"; 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 70f1a4853b8b..497f2932c53c 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 @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python27-docs-pdf-a4-2.7.18"; + pname = "python27-docs-pdf-a4"; + version = "2.7.18"; + src = fetchurl { url = http://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-pdf-a4.tar.bz2; sha256 = "0rxb2fpxwivjpk5wi2pl1fqibr4khf9s0yq6a49k9b4awi9nkb6v"; 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 7907629b8564..05629a18bed5 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 @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python27-docs-pdf-letter-2.7.18"; + pname = "python27-docs-pdf-letter"; + version = "2.7.18"; + src = fetchurl { url = http://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-pdf-letter.tar.bz2; sha256 = "07hbqvrdlq01cb95r1574bxqqhiqbkj4f92wzlq4d6dq1l272nan"; 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 ba880f93a9c7..7804120a66fe 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python27-docs-text-2.7.18"; + pname = "python27-docs-text"; + version = "2.7.18"; + src = fetchurl { url = http://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-text.tar.bz2; sha256 = "1wj7mxs52kp5lmn5mvv574sygkfnk00kbz9ya9c03yfq5dd5nvy8"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix index f77ad0ef1e9a..2fd9cc841aad 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python310-docs-html-3.10.7"; + pname = "python310-docs-html"; + version = "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"; 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 index 46efe535e767..af146cc85987 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python310-docs-pdf-a4-3.10.7"; + pname = "python310-docs-pdf-a4"; + version = "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"; 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 index f2c1ca242965..77d317ad08ce 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python310-docs-pdf-letter-3.10.7"; + pname = "python310-docs-pdf-letter"; + version = "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"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix index 82a7486d45b9..a9f9b8436eb6 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python310-docs-texinfo-3.10.7"; + pname = "python310-docs-texinfo"; + version = "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"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix index 7e9dd6841aa5..997f753e8de4 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix @@ -3,7 +3,9 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation { - name = "python310-docs-text-3.10.7"; + pname = "python310-docs-text"; + version = "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"; diff --git a/pkgs/development/interpreters/python/cpython/docs/generate.sh b/pkgs/development/interpreters/python/cpython/docs/generate.sh index 47fd134da084..46db4d87d7f6 100755 --- a/pkgs/development/interpreters/python/cpython/docs/generate.sh +++ b/pkgs/development/interpreters/python/cpython/docs/generate.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +cd -- "$(dirname -- "${BASH_SOURCE[0]}")" + TYPES="html pdf-a4 pdf-letter text texinfo" URL=http://www.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'/