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

fido2luks: move to by-name & fix build #297238

Merged
merged 3 commits into from
Mar 30, 2024

Conversation

quantenzitrone
Copy link
Contributor

@quantenzitrone quantenzitrone commented Mar 19, 2024

Description of changes

fixes #288865

I don't have a device that works with fido2luks so i can't test if it works, but it builds now at least.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested review from prusnak and mmahut March 19, 2024 18:23
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Mar 19, 2024
@quantenzitrone
Copy link
Contributor Author

Result of nixpkgs-review pr 297238 run on x86_64-linux 1

1 package built:
  • fido2luks

@quantenzitrone quantenzitrone removed the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Mar 19, 2024
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Mar 19, 2024
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Mar 19, 2024
@quantenzitrone
Copy link
Contributor Author

I can't test the fix for the nixosTest, but I managed to reproduce the issue on x86_64-linux by adding another USB controller with the wrong speed.
So I now specifically specify the CanoKey to use the usb-bus.0 bus which is controlled by the UHCI Controller which has the same speed as CanoKey ("full speed").
https://qemu-project.gitlab.io/qemu/system/devices/usb.html#ehci-controller-support

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3655

@quantenzitrone
Copy link
Contributor Author

wait the systemd fido2 support has nothing to do with fido2luks
sorry

@quantenzitrone quantenzitrone removed the request for review from oxalica March 20, 2024 00:34
@github-actions github-actions bot removed the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Mar 20, 2024
@quantenzitrone
Copy link
Contributor Author

I couldn't get my Nitrokey 3C NFC to work with fido2luks, so maybe I should remove the fix for nitrokeys. On the other hand, fido2luks is at least able to detect fido2 tokens using the nitrokey firmware, which is a slight improvement.

pkgs/by-name/fi/fido2luks/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fi/fido2luks/Cargo.toml Outdated Show resolved Hide resolved
pkgs/by-name/fi/fido2luks/package.nix Outdated Show resolved Hide resolved
@quantenzitrone quantenzitrone changed the title fido2luks: move to by-name, fix build && fix for nitrokeys fido2luks: move to by-name & fix build Mar 29, 2024
@SuperSandro2000 SuperSandro2000 merged commit dca5f89 into NixOS:master Mar 30, 2024
31 of 32 checks passed
@quantenzitrone quantenzitrone deleted the fido2luks branch May 13, 2024 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: fido2luks
4 participants