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

sequoia: 0.24.0 -> 0.25.0 #122770

Merged
merged 1 commit into from May 19, 2021
Merged

sequoia: 0.24.0 -> 0.25.0 #122770

merged 1 commit into from May 19, 2021

Conversation

nitsky
Copy link
Contributor

@nitsky nitsky commented May 12, 2021

Motivation for this change

Update to the latest release of sequoia.

ZHF #122042

Closes #123424 .

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 12, 2021

Result of nixpkgs-review pr 122770 at eff1f0a run on x86_64-linux 1

2 packages built successfully:
  • sequoia (python38Packages.sequoia)
  • python39Packages.sequoia
2 suggestions:
  • warning: unused-argument

    Unused argument: glib.
    Near pkgs/tools/security/sequoia/default.nix:13:3:

       |
    13 | , glib
       |   ^
    
  • warning: unclear-gpl

    gpl3 is a deprecated license, please check if project uses gpl3Plus or gpl3Only and change meta.license accordingly.

    Near pkgs/tools/security/sequoia/default.nix:105:5:

        |
    105 |     license = licenses.gpl3;
        |     ^
    

Result of nixpkgs-review pr 122770 at eff1f0a run on aarch64-linux 1

2 packages built successfully:
  • sequoia (python38Packages.sequoia)
  • python39Packages.sequoia
1 suggestion:
  • warning: unused-argument

    Unused argument: glib.
    Near pkgs/tools/security/sequoia/default.nix:13:3:

       |
    13 | , glib
       |   ^
    

@doronbehar
Copy link
Contributor

Thanks for the update @nitsky, if you could also take care of the bot's suggestions it'd be great :).

@minijackson
Copy link
Member

Thanks for the update! This compiles and runs fine for me.

For the license suggestion, the license of sequoia is gpl2Plus.

A couple of remarks, but you don't have to tackle them at all if you don't want to, I think the PR is fine to merge as is, and we can figure out these things later:

  • The Makefile was hidden after the v0.25 release, to indicate that we should not use it, and instead use Cargo directly. I think this should simplify the expression too.
  • The manpages for sq are there but the Makefile simply doesn't install them. It could be nice to have them. I'm not sure what's the difference between the man-sq, man-sq-net, man-sq-autocrypt, and man-sq-net-autocrypt directories are.

Result of nix-review pr 122770 1

2 package were built:
  • sequoia (python38Packages.sequoia)
  • python39Packages.sequoia (python38Packages.sequoia)

@doronbehar
Copy link
Contributor

doronbehar commented May 15, 2021

  • The Makefile was hidden after the v0.25 release, to indicate that we should not use it, and instead use Cargo directly. I think this should simplify the expression too.

  • The manpages for sq are there but the Makefile simply doesn't install them. It could be nice to have them. I'm not sure what's the difference between the man-sq, man-sq-net, man-sq-autocrypt, and man-sq-net-autocrypt directories are.

It's sad they stopped using the makefile for installing the man pages, but I think there are still some other files that get installed if the makefile is used, for example:

https://gitlab.com/sequoia-pgp/sequoia/-/blob/sq/v0.25.0/sq/Makefile#L27

So I'd vote for keep using the Makefile, with ln -s .Makefile Makefile in preConfigure.

EDIT: There are also python related files that I think only the Makefile installs.

@@ -25,16 +25,16 @@ rustPlatform.buildRustPackage rec {
pname = "sequoia";
Copy link
Member

Choose a reason for hiding this comment

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

Please remove glib from inputs and ? null with the assert.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'll push more commits including the one fixing this, after I'll get a comment from upstream at https://gitlab.com/sequoia-pgp/sequoia/-/merge_requests/1097 .

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

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

2 packages built:
  • sequoia (python38Packages.sequoia)
  • python39Packages.sequoia

@jonringer jonringer merged commit d904c14 into NixOS:master May 19, 2021
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

7 participants