From c1708440bd92ad2a3142fe709b853234c65de60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 17 May 2013 22:57:19 +0200
Subject: [PATCH] gnutls: update to 3.2.0

It required a nettle update to 2.7 too.
---
 pkgs/development/libraries/gnutls/default.nix | 8 ++++----
 pkgs/development/libraries/nettle/default.nix | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index ba441b1082b5..076f21b7d642 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation (rec {
 
-  name = "gnutls-3.1.10";
+  name = "gnutls-3.2.0";
 
   src = fetchurl {
-    url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz";
-    sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk";
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.xz";
+    sha256 = "034j843q774ryb7ydr3l1a9x6fblxp18dzqlnihjphzg2cdjyld0";
   };
 
   # Note: GMP is a dependency of Nettle, whose public headers include
@@ -59,7 +59,7 @@ stdenv.mkDerivation (rec {
        tampering, or message forgery."
     '';
 
-    homepage = http://www.gnu.org/software/gnutls/;
+    homepage = http://www.gnutls.org/;
     license = "LGPLv2.1+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 2e444c321773..ec46fd69c7a1 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";
 
   src = fetchurl {
     url = "mirror://gnu/nettle/${name}.tar.gz";
-    sha256 = "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa";
+    sha256 = "1mnl5i1136p47lrklm0mhnnv3gjakza385zvxz12qf057h9ym562";
   };
 
   buildInputs = [ gnum4 ];
@@ -15,6 +15,8 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
+  dontDisableStatic = true;
+
   patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
               ./cygwin.patch;