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

libnitrokey: init at 3.8 #223242

Merged
merged 5 commits into from
Mar 27, 2023
Merged

Conversation

panicgh
Copy link
Contributor

@panicgh panicgh commented Mar 26, 2023

Description of changes

Package libnitrokey separately and use it in nitrokey-app instead of using the bundled libnitrokey (via git submodule). I made @KaiHa maintainer of it. I hope this is ok.

There is also an internal dependency "cppcodec" and I made @KaiHa maintainer of it (same as for nitrokey-app). I hope this is ok. I use release v0.2 of cppcodec instead of the very old submodule commit from upstream. I created an upstream issue to ask if they might do the same.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 26, 2023
@RaitoBezarius
Copy link
Member

Did @KaiHa consent to be maintainer?

@panicgh
Copy link
Contributor Author

panicgh commented Mar 26, 2023

No, I hope to get the feedback in this PR (draft). It was primarily a choice caused by the splitting off of libnitrokey, which KaiHa already maintains indirectly as bundled part of nitrokey-app.
I also consider adding myself to the maintainers, as I intend to use a relatively new Nitrokey 3 in the near future and probably need to follow the upstream more closely for updates.
But for the moment I wait for #221656 because it can also use the standalone libnitrokey (e.g. adding support for Nitrokey Pro to nitropy) and I'll propose to add it once it is possible (it has to be added to the nitropy wrapper as it is not a build dependency; I already have a patch locally).

@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Mar 26, 2023
@ofborg ofborg bot requested a review from KaiHa March 26, 2023 14:09
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Mar 26, 2023
@RaitoBezarius
Copy link
Member

No, I hope to get the feedback in this PR (draft). It was primarily a choice caused by the splitting off of libnitrokey, which KaiHa already maintains indirectly as bundled part of nitrokey-app. I also consider adding myself to the maintainers, as I intend to use a relatively new Nitrokey 3 in the near future and probably need to follow the upstream more closely for updates. But for the moment I wait for #221656 because it can also use the standalone libnitrokey (e.g. adding support for Nitrokey Pro to nitropy) and I'll propose to add it once it is possible (it has to be added to the nitropy wrapper as it is not a build dependency; I already have a patch locally).

Please don't add a maintainer to a list without consent first, even if it sounds like a good idea. Better: let the maintainer add themselves in a future PR if that's needed at all.

@KaiHa
Copy link
Contributor

KaiHa commented Mar 26, 2023

No, I hope to get the feedback in this PR (draft). It was primarily a choice caused by the splitting off of libnitrokey, which KaiHa already maintains indirectly as bundled part of nitrokey-app. I also consider adding myself to the maintainers, as I intend to use a relatively new Nitrokey 3 in the near future and probably need to follow the upstream more closely for updates. But for the moment I wait for #221656 because it can also use the standalone libnitrokey (e.g. adding support for Nitrokey Pro to nitropy) and I'll propose to add it once it is possible (it has to be added to the nitropy wrapper as it is not a build dependency; I already have a patch locally).

Hi, I must admit that for some time now I do not live up to my role as the maintainer of nitrokey-app in NixOS. And I was kind of surprised that I am now listed as the only maintainer. I am no longer a user of the nitrokey-app, because all the stuff I use my Nitrokey for is possible without the app. To cut a long story short, please don't make me a maintainer of libnitroykey :) And if anyone is interested in taking over maintainership of the nitrokey-app, please feel free.

Regarding your change in general @panicgh, it makes sense please proceed.

@RaitoBezarius
Copy link
Member

Please add me as a maintainer of nitrokey stuff for now, as I am using Nitrokey actively.

@frogamic
Copy link
Contributor

@RaitoBezarius would you like to open a PR to be added as a maintainer of pynitrokey too? Although I am maintainer and try to keep it updated I do not actually use a nitrokey as I bricked my nitrokey start and my nitrokey 3 is on backorder

@RaitoBezarius
Copy link
Member

RaitoBezarius commented Mar 26, 2023 via email

@panicgh panicgh force-pushed the nitrokey-libnitrokey branch from 6f1fb9e to 2a1e0c7 Compare March 27, 2023 02:08
@ofborg ofborg bot requested a review from RaitoBezarius March 27, 2023 03:42
@panicgh
Copy link
Contributor Author

panicgh commented Mar 27, 2023

Thanks @KaiHa for the clarification, I removed you as maintainer from the new pkgs. Thanks @RaitoBezarius for volunteering as maintainer. I set the two of us as maintainers of the new pkgs. I decided to mark this PR as ready for review. If it gets merged before #221656, we can suggest there to include libnitrokey in nitropy or we create a new PR for it.

@panicgh panicgh marked this pull request as ready for review March 27, 2023 09:29
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

Please move cppcodec to the top-level so that everyone can depend on it. Other than this, LGTM. Tested nitrokey-app (not on real HW yet).

@panicgh panicgh force-pushed the nitrokey-libnitrokey branch from 2a1e0c7 to 2645079 Compare March 27, 2023 12:07
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

LGTM

@panicgh
Copy link
Contributor Author

panicgh commented Mar 27, 2023

@RaitoBezarius Should I add you as maintainer of nitrokey-app?

@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Mar 27, 2023
@panicgh
Copy link
Contributor Author

panicgh commented Mar 27, 2023

@ofborg eval

@ofborg ofborg bot requested a review from RaitoBezarius March 27, 2023 16:10
@RaitoBezarius
Copy link
Member

@RaitoBezarius Should I add you as maintainer of nitrokey-app?

I am planning to use less of this, so I will be a "not super active maintainer" of nitrokey-app, my Nitrokey stuff does not support it yet.

@ofborg ofborg bot requested a review from KaiHa March 27, 2023 18:01
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Mar 27, 2023
@figsoda figsoda added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Mar 27, 2023
@RaitoBezarius RaitoBezarius merged commit 16f67c4 into NixOS:master Mar 27, 2023
@panicgh panicgh deleted the nitrokey-libnitrokey branch March 27, 2023 20:43
@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Apr 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: clean-up 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants