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

stdenv: linux: inherit texinfo in stage4 instead of the final stdenv #44932

Merged
merged 1 commit into from Aug 19, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Aug 12, 2018

This reverts commit a809fdc and then
achieves the same result (not rebuilding texinfo three times)
but without dragging bootstrap tools into the closure.

Motivation for this change

#39457 (comment)

Things done
  • Builds.
  • nix-store -qR for stdenv, texinfo, texinfoInteractive have no bootstapTools.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

make[1]: Leaving directory '/build/patch-2.7.6'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6
shrinking /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6/bin/patch
gzipping man pages under /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6/share/man/
strip is /nix/store/d1prcspbh2qsviipvnaxizcj8l3g7fpw-bootstrap-tools/bin/strip
stripping (with command strip and flags -S) in /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6/bin
checking for references to /build in /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6...
building '/nix/store/k0ljgqdl13ckd8anvbap3dbbf24xbqi5-stdenv-linux.drv'...
/nix/store/zg4xp1gl2sqs360zksvvmcwrldyqhjig-stdenv-linux

@vcunat
Copy link
Member

vcunat commented Aug 12, 2018

Bootstrap tools weren't in stdenv closure, but they were in texinfo's and this fixes the problem

This reverts commit a809fdc and then
achieves the same result (not rebuilding texinfo three times)
but without dragging bootstrap tools into the closure.
@oxij oxij force-pushed the stdenv/no-texinfo-rebuild-try-2 branch from 6beb47a to 1acbc93 Compare August 12, 2018 11:47
@oxij
Copy link
Member Author

oxij commented Aug 12, 2018 via email

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

make[1]: Leaving directory '/build/patch-2.7.6'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6
shrinking /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6/bin/patch
gzipping man pages under /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6/share/man/
strip is /nix/store/d1prcspbh2qsviipvnaxizcj8l3g7fpw-bootstrap-tools/bin/strip
stripping (with command strip and flags -S) in /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6/bin
checking for references to /build in /nix/store/ar4gqx28mmzjbb3nzyyj20nqfg2vqi2c-patch-2.7.6...
building '/nix/store/k0ljgqdl13ckd8anvbap3dbbf24xbqi5-stdenv-linux.drv'...
/nix/store/zg4xp1gl2sqs360zksvvmcwrldyqhjig-stdenv-linux

@vcunat
Copy link
Member

vcunat commented Aug 12, 2018

Well, thanks to that I discovered #44936 :-)

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

shrinking /nix/store/rwzkmvqm5y3d1028pcwmgf42gxgbhav9-findutils-4.6.0/bin/find
gzipping man pages under /nix/store/rwzkmvqm5y3d1028pcwmgf42gxgbhav9-findutils-4.6.0/share/man/
strip is /nix/store/gfgczbs0cy0blibb0acv39cayq7qbplg-bootstrap-tools/bin/strip
stripping (with command strip and flags -S) in /nix/store/rwzkmvqm5y3d1028pcwmgf42gxgbhav9-findutils-4.6.0/libexec  /nix/store/rwzkmvqm5y3d1028pcwmgf42gxgbhav9-findutils-4.6.0/bin
checking for references to /build in /nix/store/rwzkmvqm5y3d1028pcwmgf42gxgbhav9-findutils-4.6.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/qz39m4fxa30x36zv3mp0ka6qh9s0xjr3-findutils-4.6.0-info
strip is /nix/store/gfgczbs0cy0blibb0acv39cayq7qbplg-bootstrap-tools/bin/strip
checking for references to /build in /nix/store/qz39m4fxa30x36zv3mp0ka6qh9s0xjr3-findutils-4.6.0-info...
building '/nix/store/h2nq8mcgyjlhv43xsymmjjrp33wpxydk-stdenv-linux.drv'...
/nix/store/w17lnzqv4jyq2yz60pfv5f5ksb84i1pg-stdenv-linux

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

  /nix/store/k6zmqnfbkcbaar2vma74my8ifs2wb1dd-hook.drv
  /nix/store/kj2x8274xsdnyjh6r8js3n47rj05bwhj-paxctl-0.9.drv
  /nix/store/nib96jq7h34asbamqj579z7l5vmm754k-findutils-4.6.0.drv
  /nix/store/plx9grnlwr2qk8sc74j61aba6yxqfl7c-diffutils-3.6.drv
  /nix/store/x16qdn5fy5fmz2hlsv80qa5rkimqqv10-gnutar-1.30.drv
  /nix/store/xnph8x0d470hmigc6g1hlypdkg4wg1ky-gzip-1.9.drv
  /nix/store/xrg4y2i2agc0740w5779s5dpsggcipj9-gawk-4.2.1.drv
  /nix/store/h2nq8mcgyjlhv43xsymmjjrp33wpxydk-stdenv-linux.drv
waiting for locks or build slots...
/nix/store/w17lnzqv4jyq2yz60pfv5f5ksb84i1pg-stdenv-linux

@oxij
Copy link
Member Author

oxij commented Aug 14, 2018 via email

@xeji xeji merged commit 55e6e1b into NixOS:staging Aug 19, 2018
@oxij oxij deleted the stdenv/no-texinfo-rebuild-try-2 branch November 18, 2018 08:57
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

4 participants