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

rivet: 2.7.0 -> 2.7.1 #45044

Merged
merged 2 commits into from Aug 15, 2018
Merged

rivet: 2.7.0 -> 2.7.1 #45044

merged 2 commits into from Aug 15, 2018

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Aug 14, 2018

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.

@veprbl veprbl changed the title Pr/rivet 271 bump rivet: 2.7.0 -> 2.7.1 Aug 14, 2018
@srhb
Copy link
Contributor

srhb commented Aug 15, 2018

Retriggering eval due to master failure
@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: rivet, yoda

Partial log (click to expand)

  File "/private/tmp/nix-build-rivet-2.6.1.drv-0/Rivet-2.6.1/pyext/build/lib.macosx-10.10-x86_64-2.7/rivet/__init__.py", line 12, in <module>
    from rivet.core import *
ImportError: dlopen(/private/tmp/nix-build-rivet-2.6.1.drv-0/Rivet-2.6.1/pyext/build/lib.macosx-10.10-x86_64-2.7/rivet/core.so, 10): Library not loaded: /nix/store/f01wy7kh5d1qcra2nw9dmlxnv5s5acsf-rivet-2.6.1/lib/libRivet.dylib
  Referenced from: /private/tmp/nix-build-rivet-2.6.1.drv-0/Rivet-2.6.1/pyext/build/lib.macosx-10.10-x86_64-2.7/rivet/core.so
  Reason: image not found
make[1]: *** [Makefile:597: analyses.html] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-rivet-2.6.1.drv-0/Rivet-2.6.1/doc'
make: *** [Makefile:556: all-recursive] Error 1
builder for '/nix/store/b3a13zjk20x2j7pym9gskdcdnndd1qwz-rivet-2.6.1.drv' failed with exit code 2
error: build of '/nix/store/b3a13zjk20x2j7pym9gskdcdnndd1qwz-rivet-2.6.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: rivet, yoda

Partial log (click to expand)

    ./mk-analysis-json
/nix/store/56nrxy58wbhvs2sy3rir1jqa68p0kkm5-bash-4.4-p23/bin/bash: ./mk-analysis-html: /usr/bin/env: bad interpreter: No such file or directory
/nix/store/56nrxy58wbhvs2sy3rir1jqa68p0kkm5-bash-4.4-p23/bin/bash: ./mk-analysis-json: /usr/bin/env: bad interpreter: No such file or directory
make[1]: *** [Makefile:597: analyses.html] Error 126
make[1]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile:602: analyses.json] Error 126
make[1]: Leaving directory '/build/Rivet-2.6.1/doc'
make: *** [Makefile:556: all-recursive] Error 1
builder for '/nix/store/02lmyg77a035sn7p1q6ibgcv0xaagffj-rivet-2.6.1.drv' failed with exit code 2
error: build of '/nix/store/02lmyg77a035sn7p1q6ibgcv0xaagffj-rivet-2.6.1.drv' failed

@xeji
Copy link
Contributor

xeji commented Aug 15, 2018

x64_64-linux build fails in the sandbox (but succeeds with sandboxing turned off).

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: rivet, yoda

Partial log (click to expand)

    ./mk-analysis-json
/nix/store/7q3ayirslrcva28wava6zpjcflcz1h3b-bash-4.4-p23/bin/bash: ./mk-analysis-html: /usr/bin/env: bad interpreter: No such file or directory
make[1]: *** [Makefile:597: analyses.html] Error 126
make[1]: *** Waiting for unfinished jobs....
/nix/store/7q3ayirslrcva28wava6zpjcflcz1h3b-bash-4.4-p23/bin/bash: ./mk-analysis-json: /usr/bin/env: bad interpreter: No such file or directory
make[1]: *** [Makefile:602: analyses.json] Error 126
make[1]: Leaving directory '/build/Rivet-2.6.1/doc'
make: *** [Makefile:556: all-recursive] Error 1
builder for '/nix/store/wqcq20c5zb6kh45669nwmi9pvlqk4c5q-rivet-2.6.1.drv' failed with exit code 2
error: build of '/nix/store/wqcq20c5zb6kh45669nwmi9pvlqk4c5q-rivet-2.6.1.drv' failed

@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];

preConfigure = ''
substituteInPlace analyses/Makefile.in \
--replace "!(tmp)" ""
Copy link
Member

Choose a reason for hiding this comment

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

What does this achieve?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't know. This "!(tmp)" piece was inserted by upstream into the tarball release and it is not present in the official repository, it also breaks the build.

@timokau
Copy link
Member

timokau commented Aug 15, 2018

The failure looks like you need to run patchShebangs.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: rivet, yoda

Partial log (click to expand)

/nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1/bin/.rivet-which-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1/bin/.rivet-mkhtml-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1/bin/.rivet-config-wrapped: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/56nrxy58wbhvs2sy3rir1jqa68p0kkm5-bash-4.4-p23/bin/bash"
/nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1/bin/.rivet-mkanalysis-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1/bin/.rivet-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1/bin/.rivet-cmphistos-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1/bin/.rivet-findid-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
checking for references to /build in /nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1...
/nix/store/slabvgsbld2jl0i4s6rpf6kla9a10hag-rivet-2.6.1
/nix/store/sb6dq4sya12yc2jaykar5nx6znpy6qqf-yoda-1.7.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: rivet, yoda

Partial log (click to expand)

/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1/bin/.rivet-config-wrapped: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/hp9yq2m1i066irvasv20zr2lmj54fk9h-bash-4.4-p23/bin/bash"
/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1/bin/.rivet-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1/bin/.rivet-findid-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1/bin/.rivet-which-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1/bin/.make-plots-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1/bin/.make-pgfplots-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1/bin/.rivet-mkanalysis-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1/bin/.rivet-cmphistos-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/5gsvylbmwkfbps0qzh1qdba5yj820r6n-rivet-2.6.1
/nix/store/zcyi1kwysxwq827h2lyj8lnx1swhgwm0-yoda-1.7.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rivet, yoda

Partial log (click to expand)

/nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1/bin/.rivet-findid-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9gfk6klv3zajmibdsvn4yhz20z6vg5gw-python-2.7.15/bin/python"
/nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1/bin/.rivet-config-wrapped: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/7q3ayirslrcva28wava6zpjcflcz1h3b-bash-4.4-p23/bin/bash"
/nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1/bin/.rivet-cmphistos-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9gfk6klv3zajmibdsvn4yhz20z6vg5gw-python-2.7.15/bin/python"
/nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1/bin/.rivet-buildplugin-wrapped: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/7q3ayirslrcva28wava6zpjcflcz1h3b-bash-4.4-p23/bin/bash"
/nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1/bin/.rivet-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9gfk6klv3zajmibdsvn4yhz20z6vg5gw-python-2.7.15/bin/python"
/nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1/bin/.make-plots-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9gfk6klv3zajmibdsvn4yhz20z6vg5gw-python-2.7.15/bin/python"
/nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1/bin/.make-pgfplots-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9gfk6klv3zajmibdsvn4yhz20z6vg5gw-python-2.7.15/bin/python"
checking for references to /build in /nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1...
/nix/store/fw525ry8dmcmgdv221n8qa3lgxlfqn5s-rivet-2.6.1
/nix/store/6nxz281qwxcm1y52n12yc3py4rm3p365-yoda-1.7.1

@xeji xeji merged commit 3f59f82 into NixOS:master Aug 15, 2018
@matthewbauer
Copy link
Member

It looks like the hash has changed:

https://hydra.nixos.org/build/79644729

@veprbl
Copy link
Member Author

veprbl commented Aug 16, 2018

Thanks... #45141

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

6 participants