about summary refs log tree commit diff
path: root/pkgs/top-level/aliases.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-07-22 16:49:51 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-07-22 16:49:51 +0200
commit19be541fe75939fc7376f9bfc3dbaaa7511501be (patch)
tree4d6d682f20d6f6bf222852a33c7375f144102cfd /pkgs/top-level/aliases.nix
parent7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6 (diff)
parent163e7a0663205700c1cbd75dae112f9636c40e4c (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/aliases.nix')
-rw-r--r--pkgs/top-level/aliases.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 82d1e5b780977..42fc91f375f80 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -164,6 +164,7 @@ mapAliases ({
   gnuradio-rds = gr-rds; # added 2019-05-27
   gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27
   gnustep-make = gnustep.make; # added 2016-7-6
+  gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
   go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
   go-pup = pup; # added 2017-12-19
   gobjectIntrospection = gobject-introspection; # added 2018-12-02