about summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2013-10-10 11:38:23 +0200
committerPeter Simons <simons@cryp.to>2013-10-10 11:38:23 +0200
commit6a6310618590788b253f585619aa7290772fa1c5 (patch)
treef7ce21b046571bd74fe36f1981b518c7e8707c99 /pkgs/tools/security
parent282b5ac5f0c3928defcad02e04c4a6c592dd6a80 (diff)
downloadnixlib-6a6310618590788b253f585619aa7290772fa1c5.tar
nixlib-6a6310618590788b253f585619aa7290772fa1c5.tar.gz
nixlib-6a6310618590788b253f585619aa7290772fa1c5.tar.bz2
nixlib-6a6310618590788b253f585619aa7290772fa1c5.tar.lz
nixlib-6a6310618590788b253f585619aa7290772fa1c5.tar.xz
nixlib-6a6310618590788b253f585619aa7290772fa1c5.tar.zst
nixlib-6a6310618590788b253f585619aa7290772fa1c5.zip
gnupg1: support for IDEA is now included by default (the patent has expired)
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/gnupg1/default.nix23
1 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix
index 353e0de5ff73..192970b5caed 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