JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Peter Simons 2013-10-10 11:38:23 +02:00
parent 282b5ac5f0
commit 6a63106185
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/security/gnupg1/default.nix
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };