diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index 353e0de5ff7..192970b5cae 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -1,18 +1,4 @@ -{ # Support for the IDEA cipher (used by the old PGP) should only be - # enabled if it is legal for you to do so. - ideaSupport ? false - -, stdenv, fetchurl, readline, bzip2 -}: - -let - - idea = fetchurl { - url = http://tarballs.nixos.org/idea.c.gz; - md5 = "9dc3bc086824a8c7a331f35e09a3e57f"; - }; - -in +{ stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { name = "gnupg-1.4.15"; @@ -24,15 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ readline bzip2 ]; - preConfigure = stdenv.lib.optionalString ideaSupport - '' - gunzip < ${idea} > ./cipher/idea.c - ''; - doCheck = true; meta = { - description = "GnuPG, a free implementation of the OpenPGP standard for encrypting and signing data"; + description = "free implementation of the OpenPGP standard for encrypting and signing data"; homepage = http://www.gnupg.org/; license = "GPLv3+"; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 616e8c7d7cc..912136bf859 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -971,9 +971,7 @@ let gnupatch = callPackage ../tools/text/gnupatch { }; - gnupg1orig = callPackage ../tools/security/gnupg1 { - ideaSupport = false; - }; + gnupg1orig = callPackage ../tools/security/gnupg1 { }; gnupg1compat = callPackage ../tools/security/gnupg1compat { };