-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
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
pinentry-mac: 0.9.4 -> 1.1.1.1 #176203
pinentry-mac: 0.9.4 -> 1.1.1.1 #176203
Conversation
5ba8cbf
to
3444322
Compare
3444322
to
fa09a80
Compare
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/1095 |
This shouldn't go to staging but straight to master |
fa09a80
to
3444322
Compare
3444322
to
9cad3c2
Compare
I switched the target branch back to |
@ofborg build pinentry_mac |
Hmm, so I guess this is unbuildable on Hydra. I can think of 3 options to deal with this problem:
My preference is option 1. |
or can we use the tools in nixpkgs? |
There's no complete open source ibtool replacement that I'm aware of. There's xib2nib, but it doesn't work for pinentry_mac:
|
I updated this PR with this approach:
|
@@ -0,0 +1 @@ | |||
root = true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is here to stop editorconfig from throwing errors on binary nib files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move this into the top-level file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
deae17d
to
72152f2
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
I don't really want to check in the binary files into nixpkgs... |
Agreed, but there don't seem to be any other options:
This means we have to generate the nib files somehow, but that's not practically possible without using ibtools from XCode, which in turn can't be done from within the sandbox. It's not great, but at least in the case of pinentry-mac the binaries are only 70 KB total. Judging by the release history, updates are infrequent too. |
Would it be a good idea to host these files elsewhere and then only store the URL and hash in Nixpkgs? |
That requires someone to maintain the files independently of Nixpkgs, which would limit who would be able to perform updates. It's doable, but I worry it might lead to updates being hold off for a long time. |
Yes, checking in binaries feels a little gross, but it's worth noting that |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Built with nix-shell -p nixpkgs-review --run "nixpkgs-review pr 176203 -p pinentry_mac"
And tested with: echo GETPIN | results/pinentry_mac/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
The first time I ran this I got:
bash: cho: command not found
OK Pleased to meet you
Not sure what that was about but it did not reoccur.
Carrying binaries in Nixpkgs isn't great but until something like xib2nib becomes capable of generating the nibs for this I don't really see a good alternative.
Description of changes
Upgrades pinentry-mac. The upstream repository moved from https://github.com/GPGTools/pinentry-mac to https://github.com/GPGTools/pinentry back in 2018, but seemingly went unnoticed.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notesThe result of running
echo GETPIN | result/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
: