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

rush: fix build #36822

Merged
merged 1 commit into from Mar 13, 2018
Merged

rush: fix build #36822

merged 1 commit into from Mar 13, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Mar 11, 2018 •
edited by fpletz

Motivation for this change

An incompatibility with our latest gnulib, see Debian bug 853649. Fortunately, Debian has a patch.

/cc ZHF #36453

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.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: rush

Partial log (click to expand)

shrinking /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8/bin/rushwho
shrinking /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8/bin/rushlast
shrinking /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8/sbin/rush
gzipping man pages under /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8/bin  /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8/sbin 
patching script interpreter paths in /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8
checking for references to /tmp/nix-build-rush-1.8.drv-0 in /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8...
moving /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8/sbin/* to /nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8/bin
/nix/store/djl6bnh1p697ycl4s1v3021d3zjnql79-rush-1.8

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rush

Partial log (click to expand)

shrinking /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8/sbin/rush
shrinking /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8/bin/rushwho
shrinking /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8/bin/rushlast
gzipping man pages under /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8/bin  /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8/sbin
patching script interpreter paths in /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8
checking for references to /build in /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8...
moving /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8/sbin/* to /nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8/bin
/nix/store/4jlkh0dvcm4bbihkwz3sa4k2qr3bpbjn-rush-1.8

fpletz
fpletz reviewed Mar 12, 2018
View reviewed changes
pkgs/shells/rush/default.nix Outdated
patches = [ ./fix-format-security-error.patch ];
patches = [ ./fix-format-security-error.patch
(fetchpatch {
url = "https://sources.debian.org/data/main/r/rush/1.8+dfsg-1.1/debian/patches/intprops.patch";
Copy link
Member

Choose a reason for hiding this comment

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

Unfortunately this is not a stable URL. When Debian releases new versions this version will go away. As the packaging it not in version control either, we should copy the patch into nixpkgs.

@xeji xeji force-pushed the p/rush branch 3 times, most recently from 222634e to 9aca6f3 Compare March 12, 2018 23:45
@xeji
Copy link
Contributor Author

xeji commented Mar 12, 2018

Debian patch copied into nixpkgs and squashed commits

@xeji
Copy link
Contributor Author

xeji commented Mar 12, 2018

@GrahamcOfBorg eval

@xeji
Copy link
Contributor Author

xeji commented Mar 13, 2018

@GrahamcOfBorg eval

@fpletz
Copy link
Member

fpletz commented Mar 13, 2018

@GrahamcOfBorg build rush

@fpletz
Copy link
Member

fpletz commented Mar 13, 2018

Evaluation doesn't fail for me.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: rush

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8
shrinking /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8/bin/rushlast
shrinking /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8/bin/rushwho
shrinking /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8/sbin/rush
gzipping man pages under /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8/bin  /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8/sbin
patching script interpreter paths in /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8
checking for references to /build in /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8...
moving /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8/sbin/* to /nix/store/6cv5m2ssbfsz9kpnw0l8hp978p9rlrw1-rush-1.8/bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: rush

Partial log (click to expand)

make[2]: Nothing to be done for 'install-data-am'.
make[2]: Leaving directory '/private/tmp/nix-build-rush-1.8.drv-0/rush-1.8'
make[1]: Leaving directory '/private/tmp/nix-build-rush-1.8.drv-0/rush-1.8'
/nix/store/5rhfk23ikm2frd0phq3kwg6r02padbvv-rush-1.8
post-installation fixup
gzipping man pages under /nix/store/5rhfk23ikm2frd0phq3kwg6r02padbvv-rush-1.8/share/man/
strip is /nix/store/4sdh09gmvl15cy0zb6i7mbvxh5syz206-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/5rhfk23ikm2frd0phq3kwg6r02padbvv-rush-1.8/bin  /nix/store/5rhfk23ikm2frd0phq3kwg6r02padbvv-rush-1.8/sbin
patching script interpreter paths in /nix/store/5rhfk23ikm2frd0phq3kwg6r02padbvv-rush-1.8
moving /nix/store/5rhfk23ikm2frd0phq3kwg6r02padbvv-rush-1.8/sbin/* to /nix/store/5rhfk23ikm2frd0phq3kwg6r02padbvv-rush-1.8/bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rush

Partial log (click to expand)

shrinking /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8/sbin/rush
shrinking /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8/bin/rushwho
shrinking /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8/bin/rushlast
gzipping man pages under /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8/bin  /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8/sbin
patching script interpreter paths in /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8
checking for references to /build in /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8...
moving /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8/sbin/* to /nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8/bin
/nix/store/j38j0i7a2sf89fkcdsannalijj2nm8bx-rush-1.8

@fpletz fpletz merged commit 5547000 into NixOS:master Mar 13, 2018
@xeji
Copy link
Contributor Author

xeji commented Mar 13, 2018

Sorry, I misread the Debian bug report. Actually, rush bundles some code from a newer version of gnulib, which caused the build error with gcc7. It does not use our old version of gnulib at all...

@xeji xeji deleted the p/rush branch March 13, 2018 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz left review comments

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
@xeji @GrahamcOfBorg @fpletz