diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-13 20:17:58 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2022-05-13 20:17:58 +0100 |
commit | 4054681f96458525444bdabac650991289ea9779 (patch) | |
tree | 802e1352c494c40fecfee7d9cece9074bae9f4ee | |
parent | 197681059f0fff10d7abd75d11f36654ea063e92 (diff) | |
download | nixpkgs-4054681f96458525444bdabac650991289ea9779.tar nixpkgs-4054681f96458525444bdabac650991289ea9779.tar.gz nixpkgs-4054681f96458525444bdabac650991289ea9779.tar.bz2 nixpkgs-4054681f96458525444bdabac650991289ea9779.tar.lz nixpkgs-4054681f96458525444bdabac650991289ea9779.tar.xz nixpkgs-4054681f96458525444bdabac650991289ea9779.tar.zst nixpkgs-4054681f96458525444bdabac650991289ea9779.zip |
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.
-rw-r--r-- | pkgs/tools/security/dirmngr/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 20 deletions
diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix deleted file mode 100644 index b7aeed2ace1..00000000000 --- a/pkgs/tools/security/dirmngr/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9bd5066863d..18db345b258 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 142c98c5d93..8f6c76e1d55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |