dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #68593: nettle: 3.4.1 -> 3.5.1 into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2019-10-02 20:21:41 +02:00
commit a215655227
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/nettle/default.nix
View File

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "3.4.1"; version = "3.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr"; sha256 = "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m";
}; };
}) })

7
pkgs/tools/networking/unbound/default.nix
View File

@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"; 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 outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
buildInputs = [ openssl nettle expat libevent ]; buildInputs = [ openssl nettle expat libevent ];