diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix deleted file mode 100644 index f8b5d8cc1507..000000000000 --- a/pkgs/tools/security/gnupg/git.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ fetchgit, stdenv, readline, zlib, libgpgerror, npth, libgcrypt, libassuan -, libksba, coreutils, autoconf, automake, transfig, ghostscript, texinfo -, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null -}: - -stdenv.mkDerivation rec { - name = "gnupg-2.1pre-git20120407"; - - src = fetchgit { - url = "git://git.gnupg.org/gnupg.git"; - rev = "f1e1387bee286c7434f0462185048872bcdb4484"; - sha256 = "8f5a14587beccdd3752f9e430e56c6ea2d393dddb7843bfc17029e1a309045bb"; - }; - - buildInputs = [ readline zlib libgpgerror npth libgcrypt libassuan libksba - openldap bzip2 libusb curl - autoconf automake transfig ghostscript texinfo ]; - - patchPhase = '' - find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i - ''; - - preConfigure = "autoreconf -v"; - configureFlags = "--enable-maintainer-mode" + - (if pinentry != null then " --with-pinentry-pgm=${pinentry}/bin/pinentry" - else ""); - - meta = { - description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard"; - - longDescription = '' - GnuPG is the GNU project's complete and free implementation of - the OpenPGP standard as defined by RFC4880. GnuPG allows to - encrypt and sign your data and communication, features a - versatile key managment system as well as access modules for all - kind of public key directories. GnuPG, also known as GPG, is a - command line tool with features for easy integration with other - applications. A wealth of frontend applications and libraries - are available. Version 2 of GnuPG also provides support for - S/MIME. - ''; - - homepage = http://gnupg.org/; - - license = stdenv.lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1c71b61a288..6b724d395853 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1199,10 +1199,6 @@ let gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; }; - gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix { - libassuan = libassuan2_1; - }); - gnuplot = callPackage ../tools/graphics/gnuplot { }; gnuplot_qt = gnuplot.override { withQt = true; };