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

rhash: 1.3.3 -> 2018-02-05 #34627

Merged
merged 3 commits into from Feb 9, 2018
Merged

rhash: 1.3.3 -> 2018-02-05 #34627

merged 3 commits into from Feb 9, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Feb 5, 2018 •
edited

Motivation for this change

This tentatively looks good to me, although unfortunate to move away from a tagged release.

Replaces / builds on #34214 .

If nothing else I'd like to see if this works any better on Darwin :).

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.

Tested with x86_64-linux, x86_64-linux-musl, cross-aarch64-musl, cross-x86_64-linux-musl.

@dtzWill
rhash: 1.3.3 -> 1.3.5
f565274 
1.3.5: https://github.com/rhash/RHash/releases/tag/v1.3.5
1.3.4: https://github.com/rhash/RHash/releases/tag/v1.3.4

* still need makefile bug workarounds
* cleanup a bit
* port darwin patch--
  don't believe still needed but shouldn't hurt.
@dtzWill
rhash: 1.3.5 -> 2018-02-05
088274b 
Latest git is much more build-friendly.
@dtzWill dtzWill requested a review from FRidh as a code owner February 5, 2018 14:57
@dtzWill dtzWill changed the base branch from master to staging February 5, 2018 14:57
@dtzWill
Copy link
Member Author

dtzWill commented Feb 5, 2018

Whoops, wrong base sorry about that!

@GrahamcOfBorg build rhash cmake

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2/bin/cpack
shrinking /nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2/bin/ctest
shrinking /nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2/bin/cmake
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2/bin
patching script interpreter paths in /nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2
/nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2/share/cmake-3.10/Modules/CPack.STGZ_Header.sh.in: interpreter directive changed from "/bin/sh" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/sh"
/nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2/share/cmake-3.10/Modules/Squish4RunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/sh"
/nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2/share/cmake-3.10/Modules/SquishRunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/sh"
checking for references to /build in /nix/store/h25jh5wmf23mwl894chvx0blfm1an3l8-cmake-3.10.2...

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

-- Installing: /nix/store/il04smvjvbggy3qww7lwwz4hdhqkjah1-cmake-3.10.2/share/cmake-3.10/completions/cmake
-- Installing: /nix/store/il04smvjvbggy3qww7lwwz4hdhqkjah1-cmake-3.10.2/share/cmake-3.10/completions/cpack
-- Installing: /nix/store/il04smvjvbggy3qww7lwwz4hdhqkjah1-cmake-3.10.2/share/cmake-3.10/completions/ctest
post-installation fixup
strip is /nix/store/5a88zk3jgimdmzg8rfhvm93kxib3njf9-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/il04smvjvbggy3qww7lwwz4hdhqkjah1-cmake-3.10.2/bin
patching script interpreter paths in /nix/store/il04smvjvbggy3qww7lwwz4hdhqkjah1-cmake-3.10.2
/nix/store/il04smvjvbggy3qww7lwwz4hdhqkjah1-cmake-3.10.2/share/cmake-3.10/Modules/CPack.STGZ_Header.sh.in: interpreter directive changed from "/bin/sh" to "/nix/store/s8mff1kmnc63b21ybdid2ni0fw7mzy7r-bash-4.4-p12/bin/sh"
/nix/store/il04smvjvbggy3qww7lwwz4hdhqkjah1-cmake-3.10.2/share/cmake-3.10/Modules/Squish4RunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/s8mff1kmnc63b21ybdid2ni0fw7mzy7r-bash-4.4-p12/bin/sh"
/nix/store/il04smvjvbggy3qww7lwwz4hdhqkjah1-cmake-3.10.2/share/cmake-3.10/Modules/SquishRunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/s8mff1kmnc63b21ybdid2ni0fw7mzy7r-bash-4.4-p12/bin/sh"

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2/bin/ctest
shrinking /nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2/bin/cpack
shrinking /nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2/bin/cmake
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2/bin 
patching script interpreter paths in /nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2
/nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2/share/cmake-3.10/Modules/CPack.STGZ_Header.sh.in: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
/nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2/share/cmake-3.10/Modules/SquishRunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
/nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2/share/cmake-3.10/Modules/Squish4RunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-cmake-3.10.2.drv-0 in /nix/store/m17222iq8gp4zkzmxrwm2jkwcwnrfsls-cmake-3.10.2...

@LnL7
Copy link
Member

LnL7 commented Feb 5, 2018

@GrahamcOfBorg eval

1 similar comment
@Mic92
Copy link
Member

Mic92 commented Feb 9, 2018

@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

/nix/store/j7wl5ab4yr6vnqnxf9kvlp0m8kz1zxf1-rhash-2018-02-05

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05
shrinking /nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05/bin/rhash
shrinking /nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05/lib/librhash.so.0
gzipping man pages under /nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05/share/man/
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05/lib  /nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05/bin 
patching script interpreter paths in /nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05
checking for references to /tmp/nix-build-rhash-2018-02-05.drv-0 in /nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05...
/nix/store/afz17cd2mzvvhw6czwqbdy3l01vrh2a2-rhash-2018-02-05

@Mic92 Mic92 merged commit 2e86479 into NixOS:staging Feb 9, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05
shrinking /nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05/lib/librhash.so.0
shrinking /nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05/bin/rhash
gzipping man pages under /nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05/share/man/
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05/lib  /nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05/bin
patching script interpreter paths in /nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05
checking for references to /build in /nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05...
/nix/store/1ljfm654s7klvbkmag392jz10yi1lnwh-rhash-2018-02-05

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtzWill @GrahamcOfBorg @LnL7 @Mic92