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

gnupg*: Improve the meta set #24390

Merged
merged 1 commit into from Mar 28, 2017
Merged

gnupg*: Improve the meta set #24390

merged 1 commit into from Mar 28, 2017

Conversation

primeos
Copy link
Member

@primeos primeos commented Mar 27, 2017

Motivation for this change

I thought having more consistent meta sets wold be a good idea (but especially longDescription is a bit redundant now...) and I tried to improve some stuff (https, description and longDescription) - what do you think?

I also noticed that gnupg1compat doesn't provide manual pages for gpg and gpgv (i.e. one has to use "man gpg2" or "man gpgv2" instead). This isn't a big problem but imho it would be nice if we could include symbolic links for that as well (and other distributions are doing that as well). But with the current approach this would probably be a bit hacky (due to the folder structure). Would it be a good idea to include an "use-flag" for this? Something like compat (but that's actually a bad name in this case as it could be a package - any ideas for a better name? (e.g. legacySymlinks gpgSymlink, ...) and use the following expression in pkgs/top-level/all-packages.nix:

gnupg1compat = callPackage ../tools/security/gnupg/21.nix {
  compat = true;
};

And simply create the links in the postInstall phase. And I assume we can keep the current name and description as well with the help of an if statement (depending on compat).

And for what it's worth I think we should do the same for gnupg20 (but probably without the additional attribute name).

cc @wkennington @peti @fpletz @vrthra @roconnor

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

@mention-bot
Copy link

@primeos, thanks for your PR! By analyzing the history of the files in this pull request, we identified @urkud, @wkennington and @oxij to be potential reviewers.

primeos added a commit to primeos/nixpkgs that referenced this pull request Mar 27, 2017
All 20 tests did fail because no gpg binary was found. With gnupg1 as
build input they never finish. Deactivating them might be the best
option for now (and it improves the current situation since they never
actually succeeded anyway -> build was failing, I noticed this while
running nox-review for NixOS#24390).
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@oxij
Copy link
Member

oxij commented Mar 28, 2017 via email

And use version from gnupg21 for gnupg1compat.
@primeos
Copy link
Member Author

primeos commented Mar 28, 2017

@peti @oxij Thanks for your feedback 😄


The other stuff will go into a separate commit (not sure about the name yet and I wonder if it would make sense to provide the gpg/gpgv symbolic links by default (because other distributions do and AFAIK some users don't know about gnupg1(compat) and the name is imho misleading, but there might be a reason for this decision)).

Feel free if you want to share your opinion and/or implement this if you want.

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

4 participants