diff options
author | Dhananjay Balan <dhananjay@cliqz.com> | 2017-01-04 17:43:05 +0100 |
---|---|---|
committer | Dhananjay Balan <dhananjay@cliqz.com> | 2017-01-04 17:44:47 +0100 |
commit | 6edb3793d3c71ffce23ffaf2b6929bb5aba2f715 (patch) | |
tree | a66b2d7c7803d9931b06397cbb98e7fc03b02ea6 /pkgs/development/libraries/ldns | |
parent | 71c1e2ffbf52ac057d93531df8690d27e750ef42 (diff) |
ldns 1.6.17 -> 1.7.0
Release notes: http://git.nlnetlabs.nl/ldns/tree/Changelog?id=release-1.7.0 Openssl-1.1.0 is used to enable offline DANE verification (Needed for the DANE-TA usage type) ``` configure: error: OpenSSL does not support offline DANE verification (Needed for the DANE-TA usage type). Please upgrade OpenSSL to version >= 1.1.0 or rerun with --disable-dane-verify or --disable-dane-ta-usage builder /nix/store/m6n021fbk5h4iywzi3n26j95ksps9mwc-ldns-1.7.0. failed with exit code 1 error: build /nix/store/m6n021fbk5h4iywzi3n26j95ksps9mwc-ldns-1.7.0. failed drvof drvfor ```
Diffstat (limited to 'pkgs/development/libraries/ldns')
-rw-r--r-- | pkgs/development/libraries/ldns/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/ldns/perl-5.22-compat.patch | 12 |
2 files changed, 10 insertions, 21 deletions
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 883625e551a75..c35cc5883146c 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,25 +1,26 @@ {stdenv, fetchurl, openssl, perl}: stdenv.mkDerivation rec { - name = "ldns-1.6.17"; + pname = "ldns"; + version = "1.7.0"; + + name = "${pname}-${version}"; src = fetchurl { - url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; - sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; + url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; + sha1 = "ceeeccf8a27e61a854762737f6ee02f44662c1b8"; }; - outputs = [ "out" "dev" ]; - - patches = [ ./perl-5.22-compat.patch ]; - - postPatch = '' + patchPhase = '' patchShebangs doc/doxyparse.pl ''; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ perl ]; buildInputs = [ openssl ]; - configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ]; + configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill"]; postInstall = '' moveToOutput "bin/ldns-config" "$dev" diff --git a/pkgs/development/libraries/ldns/perl-5.22-compat.patch b/pkgs/development/libraries/ldns/perl-5.22-compat.patch deleted file mode 100644 index ddf711cef5d8d..0000000000000 --- a/pkgs/development/libraries/ldns/perl-5.22-compat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur old/doc/doxyparse.pl new/doc/doxyparse.pl ---- old/doc/doxyparse.pl 2014-01-11 06:04:41.000000000 +0900 -+++ new/doc/doxyparse.pl 2015-08-08 22:29:34.216889652 +0900 -@@ -273,7 +273,7 @@ - - print MAN $MAN_MIDDLE; - -- if (defined(@$also)) { -+ if (@$also) { - print MAN "\n.SH SEE ALSO\n\\fI"; - print MAN join "\\fR, \\fI", @$also; - print MAN "\\fR.\nAnd "; |