Skip to content

Commit 3b998b4

Browse files
authored
gnupg22: drop, libgcrypt_1_8: drop (#371269)
2 parents c699985 + b88d4a6 commit 3b998b4

File tree

5 files changed

+2
-354
lines changed

5 files changed

+2
-354
lines changed

pkgs/development/libraries/libgcrypt/1.8.nix

Lines changed: 0 additions & 88 deletions
This file was deleted.

pkgs/tools/security/gnupg/22-allow-import-of-previously-known-keys-even-without-UI.patch

Lines changed: 0 additions & 107 deletions
This file was deleted.

pkgs/tools/security/gnupg/22.nix

Lines changed: 0 additions & 152 deletions
This file was deleted.

pkgs/top-level/aliases.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ mapAliases {
457457
gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
458458
gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18
459459
gnu-cobol = gnucobol; # Added 2024-09-17
460+
gnupg22 = throw "'gnupg22' is end-of-life. Consider using 'gnupg24' instead"; # Added 2025-01-05
460461
gogs = throw ''
461462
Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that
462463
weren't addressed within a year: https://github.com/gogs/gogs/issues/7777
@@ -672,6 +673,7 @@ mapAliases {
672673
libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
673674
libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
674675
libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28
676+
libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05
675677
libgme = game-music-emu; # Added 2022-07-20
676678
libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
677679
libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3479,11 +3479,6 @@ with pkgs;
34793479
gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
34803480
gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
34813481

3482-
gnupg22 = callPackage ../tools/security/gnupg/22.nix {
3483-
pinentry = if stdenv.hostPlatform.isDarwin then pinentry_mac else pinentry-gtk2;
3484-
libgcrypt = libgcrypt_1_8;
3485-
};
3486-
34873482
gnupg24 = callPackage ../tools/security/gnupg/24.nix {
34883483
pinentry = if stdenv.hostPlatform.isDarwin then pinentry_mac else pinentry-gtk2;
34893484
};
@@ -9669,8 +9664,6 @@ with pkgs;
96699664

96709665
libgcrypt = callPackage ../development/libraries/libgcrypt { };
96719666

9672-
libgcrypt_1_8 = callPackage ../development/libraries/libgcrypt/1.8.nix { };
9673-
96749667
libgdiplus = callPackage ../development/libraries/libgdiplus {
96759668
inherit (darwin.apple_sdk.frameworks) Carbon;
96769669
};

0 commit comments

Comments
 (0)