From b88d4a6b82f9fe305abfbb9cd3933620d3818085 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 5 Jan 2025 22:57:04 +0100 Subject: [PATCH] libgcrypt_1_8: drop `libgcrypt_1_8` is end-of-life since 2024-12-31, see https://www.gnupg.org/download/index.html#end-of-life --- pkgs/development/libraries/libgcrypt/1.8.nix | 88 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 pkgs/development/libraries/libgcrypt/1.8.nix diff --git a/pkgs/development/libraries/libgcrypt/1.8.nix b/pkgs/development/libraries/libgcrypt/1.8.nix deleted file mode 100644 index 51da7d0ccc03..000000000000 --- a/pkgs/development/libraries/libgcrypt/1.8.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libgpg-error, - enableCapabilities ? false, - libcap, - buildPackages, - # for passthru.tests - gnupg, - libotr, - rsyslog, -}: - -assert enableCapabilities -> stdenv.hostPlatform.isLinux; - -stdenv.mkDerivation rec { - pname = "libgcrypt"; - version = "1.8.10"; - - src = fetchurl { - url = "mirror://gnupg/libgcrypt/libgcrypt-${version}.tar.bz2"; - sha256 = "sha256-aJaRVQH5UeI9AtywRTRpwswiqk13oAH/c6JkfC0p590="; - }; - - outputs = [ - "out" - "dev" - "info" - ]; - outputBin = "dev"; - - # The CPU Jitter random number generator must not be compiled with - # optimizations and the optimize -O0 pragma only works for gcc. - # The build enables -O2 by default for everything else. - hardeningDisable = lib.optional stdenv.cc.isClang "fortify"; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - buildInputs = [ libgpg-error ] ++ lib.optional enableCapabilities libcap; - - strictDeps = true; - - configureFlags = - [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ] - ++ lib.optional ( - stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - ) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157 - - # Necessary to generate correct assembly when compiling for aarch32 on - # aarch64 - configurePlatforms = [ - "host" - "build" - ]; - - postConfigure = '' - sed -i configure \ - -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' - ''; - - # Make sure libraries are correct for .pc and .la files - # Also make sure includes are fixed for callers who don't use libgpgcrypt-config - postFixup = - '' - sed -i 's,#include ,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" - '' - + lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la - ''; - - doCheck = true; - - passthru.tests = { - inherit gnupg libotr rsyslog; - }; - - meta = with lib; { - homepage = "https://www.gnu.org/software/libgcrypt/"; - changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=${pname}.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}"; - description = "General-purpose cryptographic library"; - license = licenses.lgpl2Plus; - platforms = platforms.all; - knownVulnerabilities = [ - "CVE-2021-40528" - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cdd38faefe3e..4de9f21a4a0d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -672,6 +672,7 @@ mapAliases { 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 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 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 + libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d523d0983495..eb6ed0f4aafe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9668,8 +9668,6 @@ with pkgs; libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgcrypt_1_8 = callPackage ../development/libraries/libgcrypt/1.8.nix { }; - libgdiplus = callPackage ../development/libraries/libgdiplus { inherit (darwin.apple_sdk.frameworks) Carbon; };