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

yubikey-manager: 0.4.0 -> 0.7.0 #42728

Merged
merged 2 commits into from Jun 30, 2018
Merged

yubikey-manager: 0.4.0 -> 0.7.0 #42728

merged 2 commits into from Jun 30, 2018

Conversation

mkaito
Copy link
Contributor

@mkaito mkaito commented Jun 28, 2018

Motivation for this change

0.4.0 is over a year old and doesn't work correctly.

Things done

Depends on the fido2 library, packaged in a separate commit for convenient cherry picking.

  • 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.

buildPythonPackage rec {
pname = "fido2";
version = "0.3.0";
name = "${pname}-${version}";
Copy link
Member

Choose a reason for hiding this comment

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

The name attribute is added by buildPython* and should therefore be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This has been addressed

pname = "fido2";
version = "0.3.0";

src = fetchFromGitHub {
Copy link
Member

Choose a reason for hiding this comment

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

Please use fetchPypi: https://pypi.org/project/fido2/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The version on pypi appears to fail the test suite.

Copy link
Member

Choose a reason for hiding this comment

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

Then we can use fetchFromGitHub until Yubico/python-fido2#8 is merged.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let's just leave doCheck = false in there instead of changing the source again.

Copy link
Member

Choose a reason for hiding this comment

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

Then please sqash the last two commits. And it would be nice if there was a comment why doCheck = false.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done and done.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks!

@xeji
Copy link
Contributor

xeji commented Jun 29, 2018

@GrahamcOfBorg build python27Packages.fido2 python36Packages.fido2 yubikey-manager

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python27Packages.fido2, python36Packages.fido2, yubikey-manager

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0/lib  /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0/bin
patching script interpreter paths in /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0
checking for references to /build in /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0...
wrapping `/nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0/bin/ykman'...
/nix/store/8ajzy9k5myrm8j2wqv3y9w9plqgma0sa-python2.7-fido2-0.3.0
/nix/store/w8z318gkijjmvyw204f9zrg98139lh2n-python3.6-fido2-0.3.0
/nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: python27Packages.fido2, python36Packages.fido2, yubikey-manager

Partial log (click to expand)

Successfully installed yubikey-manager-0.7.0
/private/tmp/nix-build-python2.7-yubikey-manager-0.7.0.drv-0/yubikey-manager-0.7.0
post-installation fixup
strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/ay67vqqb48snddn32h6mji1dzx06hn4c-python2.7-yubikey-manager-0.7.0/lib  /nix/store/ay67vqqb48snddn32h6mji1dzx06hn4c-python2.7-yubikey-manager-0.7.0/bin
patching script interpreter paths in /nix/store/ay67vqqb48snddn32h6mji1dzx06hn4c-python2.7-yubikey-manager-0.7.0
wrapping `/nix/store/ay67vqqb48snddn32h6mji1dzx06hn4c-python2.7-yubikey-manager-0.7.0/bin/ykman'...
/nix/store/1cr591cg474968a1xk4ky5mxjhc147ar-python2.7-fido2-0.3.0
/nix/store/wk4nbfpkdafi53lbr06ylvag3r5995am-python3.6-fido2-0.3.0
/nix/store/ay67vqqb48snddn32h6mji1dzx06hn4c-python2.7-yubikey-manager-0.7.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python27Packages.fido2, python36Packages.fido2, yubikey-manager

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0/lib  /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0/bin
patching script interpreter paths in /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0
checking for references to /build in /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0...
wrapping `/nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0/bin/ykman'...
/nix/store/8dc7035syqbyg5rvf3q2lwn26d2lrsi6-python2.7-fido2-0.3.0
/nix/store/0jaasbb7l82381550d2bqggc372kkd9s-python3.6-fido2-0.3.0
/nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0

@dotlambda
Copy link
Member

@GrahamcOfBorg build python27Packages.fido2 python36Packages.fido2 yubikey-manager

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python27Packages.fido2, python36Packages.fido2, yubikey-manager

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0/lib  /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0/bin
patching script interpreter paths in /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0
checking for references to /build in /nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0...
wrapping `/nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0/bin/ykman'...
/nix/store/8dc7035syqbyg5rvf3q2lwn26d2lrsi6-python2.7-fido2-0.3.0
/nix/store/0jaasbb7l82381550d2bqggc372kkd9s-python3.6-fido2-0.3.0
/nix/store/qsm1rwc2xnfwkbjasfcdjfjc53949imv-python2.7-yubikey-manager-0.7.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python27Packages.fido2, python36Packages.fido2, yubikey-manager

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0/lib  /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0/bin
patching script interpreter paths in /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0
checking for references to /build in /nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0...
wrapping `/nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0/bin/ykman'...
/nix/store/8ajzy9k5myrm8j2wqv3y9w9plqgma0sa-python2.7-fido2-0.3.0
/nix/store/w8z318gkijjmvyw204f9zrg98139lh2n-python3.6-fido2-0.3.0
/nix/store/dna2wqsycapf9z7f7yn843ack6zqax58-python2.7-yubikey-manager-0.7.0

@dotlambda dotlambda merged commit 7725269 into NixOS:master Jun 30, 2018
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

5 participants