gnupg1: support for IDEA is now included by default (the patent has expired)
This commit is contained in:
parent
282b5ac5f0
commit
6a63106185
|
@ -1,18 +1,4 @@
|
||||||
{ # Support for the IDEA cipher (used by the old PGP) should only be
|
{ stdenv, fetchurl, readline, bzip2 }:
|
||||||
# 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.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gnupg-1.4.15";
|
name = "gnupg-1.4.15";
|
||||||
|
@ -24,15 +10,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [ readline bzip2 ];
|
buildInputs = [ readline bzip2 ];
|
||||||
|
|
||||||
preConfigure = stdenv.lib.optionalString ideaSupport
|
|
||||||
''
|
|
||||||
gunzip < ${idea} > ./cipher/idea.c
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
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/;
|
homepage = http://www.gnupg.org/;
|
||||||
license = "GPLv3+";
|
license = "GPLv3+";
|
||||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||||
|
|
|
@ -971,9 +971,7 @@ let
|
||||||
|
|
||||||
gnupatch = callPackage ../tools/text/gnupatch { };
|
gnupatch = callPackage ../tools/text/gnupatch { };
|
||||||
|
|
||||||
gnupg1orig = callPackage ../tools/security/gnupg1 {
|
gnupg1orig = callPackage ../tools/security/gnupg1 { };
|
||||||
ideaSupport = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
gnupg1compat = callPackage ../tools/security/gnupg1compat { };
|
gnupg1compat = callPackage ../tools/security/gnupg1compat { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue