nettle: Add version 3.0 as the default

2 files changed, 7 insertions, 63 deletions

diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 8f731233aa9c6..a6aae14e5c307 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,67 +1,10 @@
-{ fetchurl, stdenv, gmp, gnum4 }:
+{ callPackage, fetchurl, ... } @ args:
 
-stdenv.mkDerivation (rec {
-  name = "nettle-2.7.1";
+callPackage ./generic.nix (args // rec {
+  version = "3.0";
 
   src = fetchurl {
-    url = "mirror://gnu/nettle/${name}.tar.gz";
-    sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw";
+    url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
+    sha256 = "04yrpjz33vrj6j0zxc153b00f93i8hs41syr1ryp7sr64fyw0lcn";
   };
-
-  buildInputs = [ gnum4 ];
-  propagatedBuildInputs = [ gmp ];
-
-  doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin);
-
-  enableParallelBuilding = true;
-
-  # It doesn't build otherwise
-  dontDisableStatic = true;
-
-  patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
-              ./cygwin.patch;
-
-  meta = {
-    description = "Cryptographic library";
-
-    longDescription = ''
-        Nettle is a cryptographic library that is designed to fit
-        easily in more or less any context: In crypto toolkits for
-        object-oriented languages (C++, Python, Pike, ...), in
-        applications like LSH or GNUPG, or even in kernel space.  In
-        most contexts, you need more than the basic cryptographic
-        algorithms, you also need some way to keep track of available
-        algorithms, their properties and variants.  You often have
-        some algorithm selection process, often dictated by a protocol
-        you want to implement.
-
-        And as the requirements of applications differ in subtle and
-        not so subtle ways, an API that fits one application well can
-        be a pain to use in a different context.  And that is why
-        there are so many different cryptographic libraries around.
-
-        Nettle tries to avoid this problem by doing one thing, the
-        low-level crypto stuff, and providing a simple but general
-        interface to it.  In particular, Nettle doesn't do algorithm
-        selection.  It doesn't do memory allocation. It doesn't do any
-        I/O.
-     '';
-
-     license = stdenv.lib.licenses.gpl2Plus;
-
-     homepage = http://www.lysator.liu.se/~nisse/nettle/;
-
-     maintainers = [ ];
-     platforms = stdenv.lib.platforms.all;
-  };
-}
-
-//
-
-stdenv.lib.optionalAttrs stdenv.isSunOS {
-  # Make sure the right <gmp.h> is found, and not the incompatible
-  # /usr/include/mp.h from OpenSolaris.  See
-  # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
-  # for details.
-  configureFlags = [ "--with-include-path=${gmp}/include" ];
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0787dd4503cd2..d41a8e7557f0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5913,6 +5913,7 @@ let
 
   gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
     guileBindings = config.gnutls.guile or false;
+    nettle = nettle27;
   };
 
   gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; });
@@ -7064,7 +7065,7 @@ let
   };
 
   nettle27 = callPackage ../development/libraries/nettle/27.nix { };
-  nettle = nettle27;
+  nettle = callPackage ../development/libraries/nettle { };
 
   newt = callPackage ../development/libraries/newt { };