Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6a73992cfac4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43f9d5ccaa95
Choose a head ref
  • 1 commit
  • 10 files changed
  • 1 contributor

Commits on Apr 28, 2019

  1. Generate python3 docs

    @booxter @FRidh
    booxter authored and FRidh committed Apr 28, 2019
    Copy the full SHA
    43f9d5c View commit details
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
View file
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@
{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python27-docs-html-2.7.3";
name = "python27-docs-html-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-html.tar.bz2;
sha256 = "1hg92n0mzl9w6j33b2h0bf2vy6fsxnpxfdc3qw760vcm0y00155j";
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2;
sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02";
};
installPhase = ''
mkdir -p $out/share/doc/python27
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@
{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python27-docs-pdf-a4-2.7.3";
name = "python27-docs-pdf-a4-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-a4.tar.bz2;
sha256 = "13da88panq5b6qfhf8k4dgqgxkg4ydcac5cx69a3f35s1w90xdjr";
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2;
sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq";
};
installPhase = ''
mkdir -p $out/share/doc/python27
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
View file
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@
{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python27-docs-pdf-letter-2.7.3";
name = "python27-docs-pdf-letter-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-letter.tar.bz2;
sha256 = "0x41phsdrpivhzkchswsliyx3a10n7gzc9irkrw6rz22j81bfydg";
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2;
sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0";
};
installPhase = ''
mkdir -p $out/share/doc/python27
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
View file
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@
{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python27-docs-text-2.7.3";
name = "python27-docs-text-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-text.tar.bz2;
sha256 = "1rxlb3jhh3892y65i45nk1y2lx981fr22a5hmfkp9gvjvdykjnzp";
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2;
sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r";
};
installPhase = ''
mkdir -p $out/share/doc/python27
18 changes: 18 additions & 0 deletions pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh

{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python37-docs-html-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2;
sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422";
};
installPhase = ''
mkdir -p $out/share/doc/python37
cp -R ./ $out/share/doc/python37/html
'';
meta = {
maintainers = [ ];
};
}
18 changes: 18 additions & 0 deletions pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh

{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python37-docs-pdf-a4-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2;
sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba";
};
installPhase = ''
mkdir -p $out/share/doc/python37
cp -R ./ $out/share/doc/python37/pdf-a4
'';
meta = {
maintainers = [ ];
};
}
18 changes: 18 additions & 0 deletions pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh

{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python37-docs-pdf-letter-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2;
sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x";
};
installPhase = ''
mkdir -p $out/share/doc/python37
cp -R ./ $out/share/doc/python37/pdf-letter
'';
meta = {
maintainers = [ ];
};
}
18 changes: 18 additions & 0 deletions pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh

{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python37-docs-text-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2;
sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2";
};
installPhase = ''
mkdir -p $out/share/doc/python37
cp -R ./ $out/share/doc/python37/text
'';
meta = {
maintainers = [ ];
};
}
12 changes: 12 additions & 0 deletions pkgs/development/interpreters/python/cpython/docs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,23 +7,35 @@ pythonDocs = {
python27 = import ./2.7-html.nix {
inherit stdenv fetchurl lib;
};
python37 = import ./3.7-html.nix {
inherit stdenv fetchurl lib;
};
};
pdf_a4 = {
recurseForDerivations = true;
python27 = import ./2.7-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
python37 = import ./3.7-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
};
pdf_letter = {
recurseForDerivations = true;
python27 = import ./2.7-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
python37 = import ./3.7-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
};
text = {
recurseForDerivations = true;
python27 = import ./2.7-text.nix {
inherit stdenv fetchurl lib;
};
python37 = import ./3.7-text.nix {
inherit stdenv fetchurl lib;
};
};
}; in pythonDocs
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/python/cpython/docs/generate.sh
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

TYPES="html pdf-a4 pdf-letter text"
URL=http://docs.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2
VERSIONS=$(curl http://www.python.org/download/releases/ 2>/dev/null | grep "releases/[123456789]"| cut -d/ -f4 |grep -v "^[12].[012345]" |grep -v "^1.6.1")
VERSIONS=$(for major in 2 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)
echo "Generating expressions for:
${VERSIONS}
"