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

db dependees: fix regression from introducing multiple outputs #40906

Closed
wants to merge 8 commits into from
Closed

db dependees: fix regression from introducing multiple outputs #40906

wants to merge 8 commits into from
+23 −16

Conversation

knedlsepp
Copy link
Member

@knedlsepp knedlsepp commented May 22, 2018 •
edited
Loading

Motivation for this change

This fixes some builds on staging related to a regression introduced by splitting Berkeley DB into multiple outputs in 4b06383.
They're broken in staging since: https://hydra.nixos.org/eval/1451699?full=1#tabs-now-fail

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.

Sorry, something went wrong.

knedlsepp added 8 commits May 22, 2018 01:27
@knedlsepp
perlPackages.BerkeleyDB: fix db dependency
2bbe58c 
This fixes a regression introduced in 4b06383.
@knedlsepp
aprutil: fix db dependency

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
2dc95ab 
This fixes a regression introduced in 4b06383.
@knedlsepp
heimdal: Fix db include
2daf38e
@knedlsepp
heimdal: Fix darwin build
7d879b0
@knedlsepp
librdf_raptor2: Enable darwin build
1e45eec
@knedlsepp
librdf_rasqal: Enable darwin build
6f63b56
@knedlsepp
librdf_redland: Fix db dependency
cb34e21 
This fixes a regression introduced in 4b06383.
@knedlsepp
librdf_redland: Enable darwin build
4e9a808
knedlsepp referenced this pull request May 22, 2018
@abbradar
db: split outputs
4b06383
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: aprutil, heimdal, librdf_raptor2, librdf_rasqal, librdf_redland

Partial log (click to expand)

shrinking /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/sbin/kfd
shrinking /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/sbin/kimpersonate
shrinking /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/sbin/kpasswdd
gzipping man pages under /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/share/man/
strip is /nix/store/mgyvr3kil9qv0mywikpi0dbli061bpg4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/lib  /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/bin  /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/sbin
patching script interpreter paths in /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0
/nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/bin/krb5-config: interpreter directive changed from "/bin/sh" to "/nix/store/3r4wp5drzynkz6hccmjpifkzwgqbs5nb-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0...
moving /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/sbin/* to /nix/store/6p63b0s5r574zprc2lqf0wnj79r8qpi1-heimdal-7.5.0/bin

@knedlsepp
Copy link
Member Author

@GrahamcOfBorg build apacheHttpd

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: apacheHttpd

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/dcxnk9jqy0h3h8rwa586dy334h7pf4z1-apache-httpd-2.4.33-man
gzipping man pages under /nix/store/dcxnk9jqy0h3h8rwa586dy334h7pf4z1-apache-httpd-2.4.33-man/share/man/
strip is /nix/store/mgyvr3kil9qv0mywikpi0dbli061bpg4-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/dcxnk9jqy0h3h8rwa586dy334h7pf4z1-apache-httpd-2.4.33-man
checking for references to /build in /nix/store/dcxnk9jqy0h3h8rwa586dy334h7pf4z1-apache-httpd-2.4.33-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/1xmld3a2rg6d1d1fxlmy3cajshq70kgy-apache-httpd-2.4.33-doc
strip is /nix/store/mgyvr3kil9qv0mywikpi0dbli061bpg4-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/1xmld3a2rg6d1d1fxlmy3cajshq70kgy-apache-httpd-2.4.33-doc
checking for references to /build in /nix/store/1xmld3a2rg6d1d1fxlmy3cajshq70kgy-apache-httpd-2.4.33-doc...
/nix/store/5wvmnkkknjv5bnglx4wr1z6cibzxmv7n-apache-httpd-2.4.33

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: apacheHttpd

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/xspj8qvf2h3pr59kkyd03zv61884klvz-apache-httpd-2.4.33-man
gzipping man pages under /nix/store/xspj8qvf2h3pr59kkyd03zv61884klvz-apache-httpd-2.4.33-man/share/man/
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/xspj8qvf2h3pr59kkyd03zv61884klvz-apache-httpd-2.4.33-man
checking for references to /build in /nix/store/xspj8qvf2h3pr59kkyd03zv61884klvz-apache-httpd-2.4.33-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/07xj3aqibn6bcap8jh0rmkv1h7lmii83-apache-httpd-2.4.33-doc
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/07xj3aqibn6bcap8jh0rmkv1h7lmii83-apache-httpd-2.4.33-doc
checking for references to /build in /nix/store/07xj3aqibn6bcap8jh0rmkv1h7lmii83-apache-httpd-2.4.33-doc...
/nix/store/m86vnapagdr4x5n161157rf9lrix837x-apache-httpd-2.4.33

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: aprutil, heimdal, librdf_raptor2, librdf_rasqal, librdf_redland

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0/lib  /nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0/bin  /nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0/sbin
patching script interpreter paths in /nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0
/nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0/bin/krb5-config: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0...
moving /nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0/sbin/* to /nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0/bin
/nix/store/dhm40dvgr8bva82gn3s7z5mj1rx30mxv-apr-util-1.6.1
/nix/store/0dg5z3s8i58lr48simiz36pp2s8d65sc-heimdal-7.5.0
/nix/store/rzld2x89pr894jp3jnwhwxk09diz7h8b-raptor2-2.0.15
/nix/store/2d995cr8lrclrrfcp9521gyjayzsciln-rasqal-0.9.33
/nix/store/l9f2id28xlg1l56cwshdkf95wwxds9ad-redland-1.0.17

@Mic92 Mic92 requested a review from vcunat May 22, 2018 07:19
@dezgeg
Copy link
Contributor

dezgeg commented May 22, 2018

Hm, how it's split looks very unconventional. I would have expected something like ["out" "dev"] in place of the current one.

@knedlsepp
Copy link
Member Author

knedlsepp commented May 22, 2018 •
edited
Loading

While I also felt it was odd to use ${db.out}/include, instead of ${db.dev}/include, I guess that the benefit from [ "out" "lib" ] compared to [ "out" "dev" ] is that runtime dependencies on the db shared objects don't include the db binaries in the closure. Honestly I don't know enough about split derivations to judge, and I'd love to know why it's not simply: [ "lib" "dev" "bin" ]. (How does out and dev, compare to the canonical bin, include and lib directories?)

@dezgeg
Copy link
Contributor

dezgeg commented May 22, 2018

outputs = [ "bin" "out" "dev" ]; seems to compile for me, I guess I'll switch to that.

@dezgeg
Copy link
Contributor

dezgeg commented May 22, 2018

I pushed the changes with fixups to the new outputs: https://git.io/vhfVx. Let's hope I didn't break something else.

@dezgeg dezgeg closed this May 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat

Assignees
No one assigned
Labels
8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@knedlsepp @GrahamcOfBorg @dezgeg