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.

Sign up for GitHub

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

Jump to bottom

gtk-doc: support python3 #43838

Merged
merged 1 commit into from Jul 21, 2018
Merged

gtk-doc: support python3 #43838

merged 1 commit into from Jul 21, 2018

Conversation

aneeshusa
Copy link
Contributor

Motivation for this change

Make libbytesize (which depends on gtk-doc) build when using Python3 as default Python.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gtk-doc

Partial log (click to expand)

copying path '/nix/store/018a1qjj98pb08w8hflr0fymsrwr0pas-libxslt-1.1.32' from 'https://cache.nixos.org'...
copying path '/nix/store/asf5qq9nk50m17pbs1w12xjw78sy4znr-db-5.3.28' from 'https://cache.nixos.org'...
copying path '/nix/store/5lngsma59wrh8bk0yc469shar788ii5i-readline-6.3p08' from 'https://cache.nixos.org'...
copying path '/nix/store/2wxf06pcnlzj3xp2nfkakbnkbnmc1ap6-libxslt-1.1.32-bin' from 'https://cache.nixos.org'...
copying path '/nix/store/0bxsz2pw8n2f11lwwxwwbb8cdzaw2l9j-python-2.7.15' from 'https://cache.nixos.org'...
copying path '/nix/store/m374c4gjq562fpkszjlwnx76hqrn8kwa-dblatex-0.3.10' from 'https://cache.nixos.org'...
copying path '/nix/store/8fpglg263b1bfwha2zbk3pb20k6lsdzp-python2.7-setuptools-39.2.0' from 'https://cache.nixos.org'...
copying path '/nix/store/8gqgcz4p9frb3ccqmmfsnqaa3914bjdj-python2.7-six-1.11.0' from 'https://cache.nixos.org'...
copying path '/nix/store/4kp1pbzhpb050hhc1rkjpwh9nsmnifz8-gtk-doc-1.28' from 'https://cache.nixos.org'...
/nix/store/4kp1pbzhpb050hhc1rkjpwh9nsmnifz8-gtk-doc-1.28

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gtk-doc

Partial log (click to expand)

/nix/store/2n0hjylzh67mj7g15allhmjqzl52q68q-gtk-doc-1.28

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gtk-doc

Partial log (click to expand)

these paths will be fetched (1.40 MiB download, 8.25 MiB unpacked):
  /nix/store/2lswm5had1cvnhdii36nagfip6aniph6-gtk-doc-1.28
  /nix/store/395s3hpsyh268g8za3k1pp0nywphdq14-dblatex-0.3.10
copying path '/nix/store/395s3hpsyh268g8za3k1pp0nywphdq14-dblatex-0.3.10' from 'https://cache.nixos.org'...
copying path '/nix/store/2lswm5had1cvnhdii36nagfip6aniph6-gtk-doc-1.28' from 'https://cache.nixos.org'...
/nix/store/2lswm5had1cvnhdii36nagfip6aniph6-gtk-doc-1.28

FRidh
FRidh requested changes Jul 20, 2018
View reviewed changes
pkgs/development/tools/documentation/gtk-doc/default.nix Outdated
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
# Make six available for binaries, python.withPackages creates a wrapper
# but scripts are not allowed in shebangs so we link it into sys.path.
postInstall = ''
ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/
ln -s ${python.pkgs.six}/lib/python${python.majorVersion}/site-packages/* $out/share/gtk-doc/python/
Copy link
Member

Choose a reason for hiding this comment

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

use ${python.sitePackages}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the suggestion, I didn't know about that. Updated the PR.

@FRidh FRidh merged commit 81c539e into NixOS:master Jul 21, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gtk-doc

Partial log (click to expand)

these paths will be fetched (1.40 MiB download, 8.25 MiB unpacked):
  /nix/store/2lswm5had1cvnhdii36nagfip6aniph6-gtk-doc-1.28
  /nix/store/395s3hpsyh268g8za3k1pp0nywphdq14-dblatex-0.3.10
copying path '/nix/store/395s3hpsyh268g8za3k1pp0nywphdq14-dblatex-0.3.10' from 'https://cache.nixos.org'...
copying path '/nix/store/2lswm5had1cvnhdii36nagfip6aniph6-gtk-doc-1.28' from 'https://cache.nixos.org'...
/nix/store/2lswm5had1cvnhdii36nagfip6aniph6-gtk-doc-1.28

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gtk-doc

Partial log (click to expand)

these paths will be fetched (1.40 MiB download, 8.25 MiB unpacked):
  /nix/store/4kp1pbzhpb050hhc1rkjpwh9nsmnifz8-gtk-doc-1.28
  /nix/store/m374c4gjq562fpkszjlwnx76hqrn8kwa-dblatex-0.3.10
copying path '/nix/store/m374c4gjq562fpkszjlwnx76hqrn8kwa-dblatex-0.3.10' from 'https://cache.nixos.org'...
copying path '/nix/store/4kp1pbzhpb050hhc1rkjpwh9nsmnifz8-gtk-doc-1.28' from 'https://cache.nixos.org'...
/nix/store/4kp1pbzhpb050hhc1rkjpwh9nsmnifz8-gtk-doc-1.28

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gtk-doc

Partial log (click to expand)

/nix/store/2n0hjylzh67mj7g15allhmjqzl52q68q-gtk-doc-1.28

@aneeshusa aneeshusa deleted the gtk-doc-support-python-3 branch January 7, 2022 02:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh requested changes

Assignees
No one assigned
Labels
8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aneeshusa @GrahamcOfBorg @FRidh