From 6153f6d89f5232feb082e84cc5e0978508b9b3bd Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 12 Sep 2019 11:49:13 -0400 Subject: [PATCH 1/2] nettle: 3.4.1 -> 3.5.1 --- pkgs/development/libraries/nettle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 900451351c8..36c9f0e6ac7 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr"; + sha256 = "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m"; }; }) From 96d65875f843a304a2f4ae6921b4a55a585ac808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Oct 2019 20:15:47 +0200 Subject: [PATCH 2/2] unbound: fix build with nettle-3.5 --- pkgs/tools/networking/unbound/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 8a4b6e6650e..0f51d72322a 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"; }; + # https://github.com/NLnetLabs/unbound/pull/90 + postPatch = '' + substituteInPlace validator/val_secalgo.c \ + --replace '&nettle_secp_256r1' 'nettle_get_secp_256r1()' \ + --replace '&nettle_secp_384r1' 'nettle_get_secp_384r1()' + ''; + outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB buildInputs = [ openssl nettle expat libevent ];