diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-10-31 11:47:03 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-06 11:44:12 -0800 |
| commit | 850da1803ffd3fb3d140983814a7d7523f537bba (patch) | |
| tree | 441773e87e42c09b8ca6f028be06cc6f8b2cec7f /pkgs/tools/security | |
| parent | 3d049938c872eb88c39afd7bdc952abfbb0eb3bd (diff) | |
| download | nixlib-850da1803ffd3fb3d140983814a7d7523f537bba.tar nixlib-850da1803ffd3fb3d140983814a7d7523f537bba.tar.gz nixlib-850da1803ffd3fb3d140983814a7d7523f537bba.tar.bz2 nixlib-850da1803ffd3fb3d140983814a7d7523f537bba.tar.lz nixlib-850da1803ffd3fb3d140983814a7d7523f537bba.tar.xz nixlib-850da1803ffd3fb3d140983814a7d7523f537bba.tar.zst nixlib-850da1803ffd3fb3d140983814a7d7523f537bba.zip | |
gnupg: Add gnupg 2.1 as default
Additionally, move all gnupg expressions into the gnupg folder.
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/gnupg/1.nix (renamed from pkgs/tools/security/gnupg1/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/1compat.nix (renamed from pkgs/tools/security/gnupg1compat/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/20.nix (renamed from pkgs/tools/security/gnupg/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/21.nix | 30 |
4 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg/1.nix index 3675c8bc390f..3675c8bc390f 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg/1.nix diff --git a/pkgs/tools/security/gnupg1compat/default.nix b/pkgs/tools/security/gnupg/1compat.nix index 9bd71467f0ea..9bd71467f0ea 100644 --- a/pkgs/tools/security/gnupg1compat/default.nix +++ b/pkgs/tools/security/gnupg/1compat.nix diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/20.nix index 45a25d7e2422..45a25d7e2422 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/20.nix diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix new file mode 100644 index 000000000000..8c3854ac23d6 --- /dev/null +++ b/pkgs/tools/security/gnupg/21.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth +, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null +, zlib ? null, bzip2 ? null, pinentry ? null +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "gnupg-2.1.0"; + + src = fetchurl { + url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0n"; + }; + + buildInputs = [ + pkgconfig libgcrypt libassuan libksba npth + readline libusb gnutls adns openldap zlib bzip2 + ]; + + configureFlags = + optional (pinentry != null) "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + + meta = with stdenv.lib; { + homepage = http://gnupg.org; + description = "a complete and free implementation of the OpenPGP standard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} |