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

waf: 2.0.6 -> 2.0.10 #44832

Merged
merged 1 commit into from Aug 10, 2018
Merged

waf: 2.0.6 -> 2.0.10 #44832

merged 1 commit into from Aug 10, 2018

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Aug 9, 2018 •
edited

This commit also swaps the build tool to use python3 internally (which waf fully
supports and prefers) and swaps the src to be downloaded from gitlab. The waf.io
site only keeps source tarballs of the latest version, so once a new waf comes
out we can no longer reproduce older versions.

We need the ensureNewerSources hook to avoid this error, in both python2 and python3:

ValueError: ZIP does not support timestamps before 1980
Motivation for this change
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.

@bhipple
waf: 2.0.6 -> 2.0.10
32b11f4 
This commit also swaps the build tool to use python3 internally (which waf fully
supports and prefers) and swaps the src to be downloaded from gitlab. The waf.io
site only keeps source tarballs of the latest version, so once a new waf comes
out we can no longer reproduce older versions.

We need the ensureNewerSources hook to avoid this error, in both `python2` and `python3`:

    ValueError: ZIP does not support timestamps before 1980
@bhipple
Copy link
Contributor Author

bhipple commented Aug 9, 2018

@GrahamcOfBorg build waf

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: waf

Partial log (click to expand)

   adding waflib/extras/__init__.py as waflib/extras/__init__.py
Waf: Leaving directory `/build/source/build'
'build' finished successfully (1.316s)
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10
/nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10: interpreter directive changed from "/usr/bin/env python" to "/nix/store/vydv641m4qrlsdhcd537qkw00q843cr5-python3-3.6.6/bin/python"
checking for references to /build in /nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10...

@bhipple
Copy link
Contributor Author

bhipple commented Aug 9, 2018

CC @vrthra

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: waf

Partial log (click to expand)

Waf: Leaving directory `/build/source/build'
'build' finished successfully (10.652s)
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/v12p4pa0w1rwm6indkf0qp46c84mwjng-waf-2.0.10
strip is /nix/store/ah0va6j4cnwj9nx4j6rwcfc8nh785jwm-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/v12p4pa0w1rwm6indkf0qp46c84mwjng-waf-2.0.10
/nix/store/v12p4pa0w1rwm6indkf0qp46c84mwjng-waf-2.0.10: interpreter directive changed from "/usr/bin/env python" to "/nix/store/hpsfqcw18x66bq6175m1iq2wp7w90vi4-python3-3.6.6/bin/python"
checking for references to /build in /nix/store/v12p4pa0w1rwm6indkf0qp46c84mwjng-waf-2.0.10...
/nix/store/v12p4pa0w1rwm6indkf0qp46c84mwjng-waf-2.0.10

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: waf

Partial log (click to expand)

Waf: Leaving directory `/tmp/nix-build-waf-2.0.10.drv-0/source/build'
'build' finished successfully (1.067s)
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10
/nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10: interpreter directive changed from "/usr/bin/env python" to "/nix/store/vydv641m4qrlsdhcd537qkw00q843cr5-python3-3.6.6/bin/python"
checking for references to /tmp/nix-build-waf-2.0.10.drv-0 in /nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10...
/nix/store/icj69bbmj9lks7kihsiy81nw1k8qwily-waf-2.0.10

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: waf

Partial log (click to expand)

/nix/store/v12p4pa0w1rwm6indkf0qp46c84mwjng-waf-2.0.10

@FRidh FRidh merged commit 7d09b29 into NixOS:master Aug 10, 2018
@bhipple bhipple deleted the u/waf branch August 18, 2018 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bhipple @GrahamcOfBorg @FRidh