diff options
| author | K900 <me@0upti.me> | 2023-04-13 11:46:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 11:46:59 +0300 |
| commit | 6092709f22a403b4ef5685828b03a1262d43268f (patch) | |
| tree | e12d3ec94ac59c7ccb40bfd2859fe47ff80d5571 /pkgs/top-level | |
| parent | 59695dcb9ef6287c6195e12e2e15d8ad47f18a64 (diff) | |
Revert "Add LTS version of GnuPG and update libgcrypt to latest LTS version"
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e648b27a05c3..a6e1542ed3e6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7887,13 +7887,8 @@ with pkgs; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 - - gnupg22 = callPackage ../tools/security/gnupg/22.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; - libgcrypt = libgcrypt_1_8; - }; - gnupg24 = callPackage ../tools/security/gnupg/24.nix { + guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg24; @@ -21535,7 +21530,7 @@ with pkgs; libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgcrypt_1_8 = callPackage ../development/libraries/libgcrypt/1.8.nix { }; + libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { }; libgdiplus = callPackage ../development/libraries/libgdiplus { inherit (darwin.apple_sdk.frameworks) Carbon; |