diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 076f21b7d64..ba441b1082b 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.2.0"; + name = "gnutls-3.1.10"; src = fetchurl { - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.xz"; - sha256 = "034j843q774ryb7ydr3l1a9x6fblxp18dzqlnihjphzg2cdjyld0"; + url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz"; + sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk"; }; # 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.gnutls.org/; + homepage = http://www.gnu.org/software/gnutls/; 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 ec46fd69c7a..2e444c32177 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.7"; + name = "nettle-2.5"; src = fetchurl { url = "mirror://gnu/nettle/${name}.tar.gz"; - sha256 = "1mnl5i1136p47lrklm0mhnnv3gjakza385zvxz12qf057h9ym562"; + sha256 = "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa"; }; buildInputs = [ gnum4 ]; @@ -15,8 +15,6 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - dontDisableStatic = true; - patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") ./cygwin.patch;