gnupg1: support for IDEA is now included by default (the patent has expired)

Changed files
+3 -24
pkgs
tools
security
gnupg1
top-level
+2 -21
pkgs/tools/security/gnupg1/default.nix
···
-
{ # 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";
···
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
+1 -3
pkgs/top-level/all-packages.nix
···
gnupatch = callPackage ../tools/text/gnupatch { };
-
gnupg1orig = callPackage ../tools/security/gnupg1 {
-
ideaSupport = false;
-
};
+
gnupg1orig = callPackage ../tools/security/gnupg1 { };
gnupg1compat = callPackage ../tools/security/gnupg1compat { };