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

rivet: 2.6.0 -> 2.6.0 [stable backport] #38085

Merged
merged 1 commit into from Mar 30, 2018
Merged

rivet: 2.6.0 -> 2.6.0 [stable backport] #38085

merged 1 commit into from Mar 30, 2018

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Mar 29, 2018 •
edited

upstream just replaced the tarball with a new version without bumping anything

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@veprbl
rivet: 2.6.0 -> 2.6.0
c0917d2 
upstream just replaced the tarball with a new version without bumping anything
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: rivet

Partial log (click to expand)

make[3]: *** [Makefile:751: test-suite.log] Error 1
make[3]: Leaving directory '/build/gsl-2.4/linalg'
make[2]: *** [Makefile:859: check-TESTS] Error 2
make[2]: Leaving directory '/build/gsl-2.4/linalg'
make[1]: *** [Makefile:930: check-am] Error 2
make[1]: Leaving directory '/build/gsl-2.4/linalg'
make: *** [Makefile:961: check-recursive] Error 1
builder for '/nix/store/0p1v7h2cyiz4399nwc39irq2ykap9jsm-gsl-2.4.drv' failed with exit code 2
cannot build derivation '/nix/store/6vfmx1z5pwny480wcci7q1vzvyprrfkc-rivet-2.6.0.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/6vfmx1z5pwny480wcci7q1vzvyprrfkc-rivet-2.6.0.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: rivet

Partial log (click to expand)

/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0/bin/.rivet-mkhtml-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/nx3jw576gqw01iiijgsav39w2qa4cni2-python-2.7.14/bin/python"
/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0/bin/.rivet-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/nx3jw576gqw01iiijgsav39w2qa4cni2-python-2.7.14/bin/python"
/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0/bin/.rivet-buildplugin-wrapped: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0/bin/.rivet-findid-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/nx3jw576gqw01iiijgsav39w2qa4cni2-python-2.7.14/bin/python"
/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0/bin/.rivet-config-wrapped: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0/bin/.make-plots-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/nx3jw576gqw01iiijgsav39w2qa4cni2-python-2.7.14/bin/python"
/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0/bin/.rivet-cmphistos-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/nx3jw576gqw01iiijgsav39w2qa4cni2-python-2.7.14/bin/python"
/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0/bin/.rivet-which-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/nx3jw576gqw01iiijgsav39w2qa4cni2-python-2.7.14/bin/python"
checking for references to /build in /nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0...
/nix/store/2nbh0i5hv63r13hb8pygxirz0fvcb4rz-rivet-2.6.0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: rivet

Partial log (click to expand)

[ 33%] Building CXX object lib/Object/CMakeFiles/LLVMObject.dir/Decompressor.cpp.o
[ 33%] Building CXX object lib/Object/CMakeFiles/LLVMObject.dir/ELF.cpp.o
[ 33%] Building CXX object lib/LTO/CMakeFiles/LLVMLTO.dir/LTOBackend.cpp.o
[ 33%] Building CXX object lib/LTO/CMakeFiles/LLVMLTO.dir/LTOModule.cpp.o
building of '/nix/store/qmjf4495x8fbnsr2qy6laxspgqv3y0mk-rustc-1.24.0.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/ilbf5jp0avvn0w53j6q7vhkmcvhxgx56-cargo-0.24.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/n7cb8kyw5hxk5g84jl4zq2173pkhlz23-librsvg-2.42.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/habxhbb76c4kw4l0kabzrpd8raq3136r-imagemagick-6.9.9-34.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/fryjjcn48d0s8dgf7pbzwk2b1jbz6jpr-rivet-2.6.0.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/fryjjcn48d0s8dgf7pbzwk2b1jbz6jpr-rivet-2.6.0.drv' failed

@obadz obadz mentioned this pull request Mar 30, 2018
Merged
8 tasks
@obadz
Copy link
Contributor

obadz commented Mar 30, 2018

Should we be concerned about tampering?

@veprbl
Copy link
Member Author

veprbl commented Mar 30, 2018

No. I've looked at the diff, it looks ok and matches the repository. I also emailed upstream to ask them to not do such things in the future.

@obadz
Copy link
Contributor

obadz commented Mar 30, 2018

Are the contents identical to the previous tarball and it's just some tar metadata that changes?

@veprbl
Copy link
Member Author

veprbl commented Mar 30, 2018 •
edited

@obadz No, they made some minor changes to the source code, updated the changelog. This is how this upstream does things sometimes.

@obadz
Copy link
Contributor

obadz commented Mar 30, 2018

whoa.. with no version number bump! sad…

@obadz obadz merged commit 2013114 into NixOS:release-18.03 Mar 30, 2018
@veprbl
Copy link
Member Author

veprbl commented Mar 30, 2018

Can we also backport to master. Thank you!

@obadz
Copy link
Contributor

obadz commented Mar 30, 2018

Done in #38084

@veprbl veprbl deleted the patch-4 branch April 15, 2018 22:35
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
@veprbl @GrahamcOfBorg @obadz