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

Trojita: PGP decryption support #67932

Merged
merged 2 commits into from Oct 26, 2019
Merged

Trojita: PGP decryption support #67932

merged 2 commits into from Oct 26, 2019

Conversation

ehmry
Copy link
Contributor

@ehmry ehmry commented Sep 2, 2019

Motivation for this change

Every email client should have some sort of support for PGP. Trojitá is currently decrypt-only.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-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.
Notify maintainers

cc @FRidh

@peterhoeg
Copy link
Member

I didn't see this - sorry. Does #68540 solve it for you?

@ehmry
Copy link
Contributor Author

ehmry commented Sep 23, 2019

I didn't see this - sorry. Does #68540 solve it for you?

No.

@ehmry
Copy link
Contributor Author

ehmry commented Sep 25, 2019

Rebased on #68540, the keygen.sh patch is gone.

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/kf5gpgmepp/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/kf5gpgmepp/default.nix Outdated Show resolved Hide resolved
, gpgme
, kcontacts
, kf5gpgmepp
, lib
Copy link
Member

Choose a reason for hiding this comment

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

remove lib here and use with stdenv.lib further down

@@ -0,0 +1,24 @@
{ stdenv, lib, fetchgit, cmake, extra-cmake-modules, qtbase, boost, gpgme }:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{ stdenv, lib, fetchgit, cmake, extra-cmake-modules, qtbase, boost, gpgme }:
{ stdenv, fetchgit, cmake, extra-cmake-modules, qtbase, boost, gpgme }:


nativeBuildInputs = [ cmake ];

meta = {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
meta = {
meta with stdenv.lib; = {

@ehmry ehmry merged commit b3e8060 into NixOS:master Oct 26, 2019
@ehmry ehmry deleted the trojita branch October 26, 2019 12:42
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