Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2519be4c674a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a21565522793
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 24, 2019

  1. nettle: 3.4.1 -> 3.5.1

    @aanderse
    aanderse committed Sep 24, 2019
    Copy the full SHA
    6153f6d View commit details

Commits on Oct 2, 2019

  1. unbound: fix build with nettle-3.5

    @vcunat
    vcunat committed Oct 2, 2019
    Copy the full SHA
    96d6587 View commit details

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

    @vcunat
    vcunat committed Oct 2, 2019
    Copy the full SHA
    a215655 View commit details
Showing with 9 additions and 2 deletions.
  1. +2 −2 pkgs/development/libraries/nettle/default.nix
  2. +7 −0 pkgs/tools/networking/unbound/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nettle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
})
7 changes: 7 additions & 0 deletions pkgs/tools/networking/unbound/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];