From 5324db88ec4659433676073668b97d77ed1ca859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 3 Jun 2013 10:34:03 +0200
Subject: [PATCH] gnutls: update to 3.2.1

Required also: nettle: update to 2.7.1

I tested that wget works.
---
 pkgs/development/libraries/gnutls/default.nix | 10 +++++-----
 pkgs/development/libraries/nettle/default.nix |  7 +++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index ba441b1082b..69b97e9732b 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
+{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig
 , guileBindings, guile, perl, gmp }:
 
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation (rec {
 
-  name = "gnutls-3.1.10";
+  name = "gnutls-3.2.1";
 
   src = fetchurl {
-    url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz";
-    sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk";
+    url = "mirror://gnupg/gnutls/v3.2/${name}.tar.xz";
+    sha256 = "1zi2kq3vcbqdy9khl7r6pgk4hgwibniasm9k6siasdvqjijq3ymb";
   };
 
   # Note: GMP is a dependency of Nettle, whose public headers include
@@ -34,7 +34,7 @@ stdenv.mkDerivation (rec {
   buildInputs = [ zlib lzo ]
     ++ stdenv.lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl pkgconfig ];
 
   propagatedBuildInputs = [ nettle libtasn1 ];
 
diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 2e444c32177..4208402ab99 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gmp, gnum4 }:
 
 stdenv.mkDerivation (rec {
-  name = "nettle-2.5";
+  name = "nettle-2.7.1";
 
   src = fetchurl {
     url = "mirror://gnu/nettle/${name}.tar.gz";
-    sha256 = "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa";
+    sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw";
   };
 
   buildInputs = [ gnum4 ];
@@ -15,6 +15,9 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
+  # It doesn't build otherwise
+  dontDisableStatic = true;
+
   patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
               ./cygwin.patch;