dirmngr: remove

dirmngr was merged into gnupg long ago. nixpkgs does not use it as a
dependency anywhere. On top of that it fails to build on upstream
gcc-10 as:

    ld: validate.o:/build/dirmngr-1.1.1/src/dirmngr.h:123:
      multiple definition of `opt'; dirmngr.o:/build/dirmngr-1.1.1/src/dirmngr.h:123: first defined here

Let's remove the package.
main
Sergei Trofimovich 2 years ago
parent 197681059f
commit 4054681f96
  1. 18
      pkgs/tools/security/dirmngr/default.nix
  2. 1
      pkgs/top-level/aliases.nix
  3. 2
      pkgs/top-level/all-packages.nix

@ -1,18 +0,0 @@
{ lib, stdenv, fetchurl, libgpg-error, libgcrypt, libassuan, libksba, pth, openldap
, libiconv}:
stdenv.mkDerivation rec {
pname = "dirmngr";
version = "1.1.1";
src = fetchurl {
url = "mirror://gnupg/dirmngr/dirmngr-${version}.tar.bz2";
sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j";
};
buildInputs = [ libgpg-error libgcrypt libassuan libksba
pth openldap libiconv ];
meta = {
platforms = lib.platforms.unix;
license = lib.licenses.gpl2Plus;
};
}

@ -317,6 +317,7 @@ mapAliases ({
devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22
dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26
digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22
dirmngr = throw "dirmngr has been removed: merged into gnupg"; # Added 2022-05-13
disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18
displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3"; # Added 2022-01-12
dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22

@ -5210,8 +5210,6 @@ with pkgs;
wgetpaste = callPackage ../tools/text/wgetpaste { };
dirmngr = callPackage ../tools/security/dirmngr { };
dismap = callPackage ../tools/security/dismap { };
dirvish = callPackage ../tools/backup/dirvish { };

Loading…
Cancel
Save