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

pinentry: 1.0.0 → 1.1.0 #32733

Merged
merged 4 commits into from Dec 16, 2017
Merged

pinentry: 1.0.0 → 1.1.0 #32733

merged 4 commits into from Dec 16, 2017

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Dec 16, 2017

Motivation for this change

https://github.com/gpg/pinentry/blob/pinentry-1.1.0/NEWS#L1-L19

Things done

I ran pinentry binary from each of the package end tested GETPIN command.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor Author

jtojnar commented Dec 16, 2017

@GrahamcOfBorg build pinentry pinentry_ncurses pinentry_gnome pinentry_qt4 pinentry_qt5

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

stripping (with flags -S) in /nix/store/3nb20yxc558xqdmwnk99jvrnjdfijcvl-pinentry-1.1.0/bin 
patching script interpreter paths in /nix/store/3nb20yxc558xqdmwnk99jvrnjdfijcvl-pinentry-1.1.0
checking for references to /tmp/nix-build-pinentry-1.1.0.drv-0 in /nix/store/3nb20yxc558xqdmwnk99jvrnjdfijcvl-pinentry-1.1.0...
postPatchMkspecs
postMoveQtStaticLibs
/nix/store/jpg0aqijw7wk9vl42790vbkg541zsc38-pinentry-1.1.0
/nix/store/h3hi16fr0vfl1iyda52c6aar9vz32y5k-pinentry-1.1.0
/nix/store/9ayc60gywrxg1pc951hfv1zjcsni0f8h-pinentry-1.1.0
/nix/store/0s10ylz1i276br78x0xmpq5kc9ylacpf-pinentry-1.1.0
/nix/store/3nb20yxc558xqdmwnk99jvrnjdfijcvl-pinentry-1.1.0

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

stripping (with flags -S) in /nix/store/x3fiiwsqbwxfdj5r3iz0r18shcnlcrdv-pinentry-1.1.0/bin
patching script interpreter paths in /nix/store/x3fiiwsqbwxfdj5r3iz0r18shcnlcrdv-pinentry-1.1.0
checking for references to /build in /nix/store/x3fiiwsqbwxfdj5r3iz0r18shcnlcrdv-pinentry-1.1.0...
postPatchMkspecs
postMoveQtStaticLibs
/nix/store/fxik908q98gabnd2lx5krl7xn290nqdb-pinentry-1.1.0
/nix/store/nlxqjrf3swwwa1wwdwnvcdlqbry0kz88-pinentry-1.1.0
/nix/store/b6fsnc3v2hjf3kfjlb9cc4nfcnqxgsci-pinentry-1.1.0
/nix/store/94bcjm7vnlyqp9136dvjr2ayw5972cs5-pinentry-1.1.0
/nix/store/x3fiiwsqbwxfdj5r3iz0r18shcnlcrdv-pinentry-1.1.0

@@ -35,7 +35,7 @@ with lib;
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };
pinentry = pkgs.pinentry.override { gtk2 = null; };
Copy link
Contributor

Choose a reason for hiding this comment

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

Just set pinentry = pkgs.pinentry_ncurses.

Copy link
Contributor Author

@jtojnar jtojnar Dec 16, 2017

Choose a reason for hiding this comment

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

Won’t that be infinite recursion?

Edit: Indeed

while evaluating the attribute ‘pinentry_ncurses’ at /home/jtojnar/Projects/nixpkgs/pkgs/top-level/all-packages.nix:3982:3:
infinite recursion encountered, at /home/jtojnar/Projects/nixpkgs/pkgs/top-level/all-packages.nix:3982:22

Copy link
Contributor

Choose a reason for hiding this comment

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

Right, I'd define pinentry as an override of pinentry_ncurses in all-packages.nix to solve it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right

@orivej orivej merged commit dc89304 into NixOS:master Dec 16, 2017
@jtojnar jtojnar deleted the pinentry-1.1 branch December 16, 2017 04:29
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

(use '--show-trace' to show detailed location information)

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