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

thunderbolt: 0.9.2 -> 0.9.3 #42743

Merged
merged 2 commits into from Jun 30, 2018
Merged

thunderbolt: 0.9.2 -> 0.9.3 #42743

merged 2 commits into from Jun 30, 2018

Conversation

benley
Copy link
Member

@benley benley commented Jun 28, 2018 •
edited

Fixed up cmakeFlags so tbtacl, tbtacl-write, tbtxdomain, and the udev rules now show up in the derivation output. Previously there was only tbtadm.

Motivation for this change

New version.

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.

@benley
thunderbolt: 0.9.2 -> 0.9.3
1a98d45 
Fixed up `cmakeFlags` so `tbtacl`, `tbtacl-write`, `tbtxdomain`, and
the udev rules now show up in the derivation output. Previously there
was only `tbtadm`.
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: thunderbolt

Partial log (click to expand)

shrinking /nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3/bin/tbtacl-write
shrinking /nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3/bin/tbtadm
gzipping man pages under /nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3/share/man/
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3/bin
patching script interpreter paths in /nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3
/nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3/bin/tbtacl: interpreter directive changed from "/bin/sh" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/sh"
/nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3/bin/tbtxdomain: interpreter directive changed from "/bin/sh" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3...
/nix/store/njq4f667zqi6c6yylpjdm3fvkz6zgak0-thunderbolt-0.9.3

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: thunderbolt

Partial log (click to expand)

shrinking /nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3/bin/tbtadm
shrinking /nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3/bin/tbtacl-write
gzipping man pages under /nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3/share/man/
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3/bin
patching script interpreter paths in /nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3
/nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3/bin/tbtxdomain: interpreter directive changed from "/bin/sh" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/sh"
/nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3/bin/tbtacl: interpreter directive changed from "/bin/sh" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3...
/nix/store/38n58mjrx3nk0havn3cf4jq9q3fgbgiz-thunderbolt-0.9.3

jtojnar
jtojnar reviewed Jun 29, 2018
View reviewed changes
pkgs/os-specific/linux/thunderbolt/default.nix
"-DUDEV_BIN_DIR=$out/bin"
"-DUDEV_RULES_DIR=$out/udev"
];
# These can't go in the normal nix cmakeFlags because $out needs to be
Copy link
Contributor

Choose a reason for hiding this comment

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

See also #37693

Copy link
Member Author

Choose a reason for hiding this comment

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

Is it okay to use placeholder expressions in nixpkgs now?

Copy link
Contributor

Choose a reason for hiding this comment

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

Unfortunately not 😢

@benley benley requested a review from ryantrinkle June 29, 2018 20:15
@benley benley merged commit 97ec194 into NixOS:master Jun 30, 2018
@benley benley deleted the benley/thunderbolt-0.9.3 branch June 30, 2018 17:18
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: thunderbolt

Partial log (click to expand)

shrinking /nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3/bin/tbtacl-write
shrinking /nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3/bin/tbtadm
gzipping man pages under /nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3/share/man/
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3/bin
patching script interpreter paths in /nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3
/nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3/bin/tbtacl: interpreter directive changed from "/bin/sh" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/sh"
/nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3/bin/tbtxdomain: interpreter directive changed from "/bin/sh" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3...
/nix/store/msb89d5znvyyckmkzv2l3z6dfnllvgs5-thunderbolt-0.9.3

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: thunderbolt

Partial log (click to expand)

shrinking /nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3/bin/tbtadm
shrinking /nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3/bin/tbtacl-write
gzipping man pages under /nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3/share/man/
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3/bin
patching script interpreter paths in /nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3
/nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3/bin/tbtxdomain: interpreter directive changed from "/bin/sh" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/sh"
/nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3/bin/tbtacl: interpreter directive changed from "/bin/sh" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3...
/nix/store/cnk0a04i8b2ywrmhkbn86sqzvsh8zhw8-thunderbolt-0.9.3

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

@jtojnar jtojnar jtojnar left review comments

@ryantrinkle ryantrinkle Awaiting requested review from ryantrinkle

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@benley @GrahamcOfBorg @jtojnar