Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate python3 docs #57009

Merged
merged 1 commit into from Apr 28, 2019
Merged

Generate python3 docs #57009

merged 1 commit into from Apr 28, 2019

Conversation

booxter
Copy link
Contributor

@booxter booxter commented Mar 7, 2019

This patch also updates generate.sh to new python.org docs archives layout.

@booxter booxter requested a review from FRidh as a code owner March 7, 2019 07:29
@booxter
Copy link
Contributor Author

booxter commented Mar 7, 2019

I was also looking at how to properly link the documents to /usr/share/ but haven't figured it out myself yet. If someone has an idea or a direction to pursue, please share.

@FRidh
Copy link
Member

FRidh commented Mar 7, 2019

It's good this got some attention, thanks!

@FRidh
Copy link
Member

FRidh commented Mar 7, 2019

I was also looking at how to properly link the documents to /usr/share/ but haven't figured it out myself yet.

In Nixpkgs we don't use /usr. It's contents goes directly in /.

@booxter
Copy link
Contributor Author

booxter commented Mar 7, 2019

@FRidh right, I missed that, still new to the platform. Looks like I can still refer to the docs through my ~/.nix-profile, so that's good enough.

@booxter
Copy link
Contributor Author

booxter commented Apr 3, 2019

Anything that holds this PR?

Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will merge as is, even though some parts are already outdated, because it's an improvement anyway. Thanks!

@@ -3,10 +3,10 @@
{ stdenv, fetchurl, lib }:

stdenv.mkDerivation rec {
name = "python27-docs-html-2.7.3";
name = "python27-docs-html-2.7.16";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to pick up version info from the python27.version attribute

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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and then use it here

@FRidh FRidh merged commit 43f9d5c into NixOS:master Apr 28, 2019
@booxter booxter deleted the python3docs branch May 7, 2019 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants