public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56974 from vcunat/p/knot-dns-2.8

Browse Source 
knot-dns: 2.7.6 -> 2.8.0
This commit is contained in:
Ryan Mulligan 2019-03-08 20:31:03 -08:00 committed by GitHub
commit 08c589b90f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/dns/knot-dns/default.nix
View File

@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
# Note: ATM only the libraries have been tested in nixpkgs. # Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "knot-dns-${version}"; name = "knot-dns-${version}";
version = "2.7.6"; version = "2.8.0";
src = fetchurl { src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "a1cb1877f04f7c2549c977c2658cfafd07c7e0e924f8e8aa8d4ae4b707f697a2"; sha256 = "494ad926705018bd754d96711dc2129f3173f326a0b57d33978090ba4eef87ef";
}; };
outputs = [ "bin" "out" "dev" ]; outputs = [ "bin" "out" "dev" ];

10
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, runCommand, pkgconfig, hexdump, which { stdenv, fetchurl, fetchpatch, runCommand, pkgconfig, hexdump, which
, knot-dns, luajit, libuv, lmdb, gnutls, nettle , knot-dns, luajit, libuv, lmdb, gnutls, nettle
, cmocka, systemd, dns-root-data, makeWrapper , cmocka, systemd, dns-root-data, makeWrapper
, extraFeatures ? false /* catch-all if defaults aren't enough */ , extraFeatures ? false /* catch-all if defaults aren't enough */
@ -19,6 +19,14 @@ unwrapped = stdenv.mkDerivation rec {
sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b"; sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b";
}; };
patches = [
(fetchpatch {
name = "support-libzscanner-2.8.diff";
url = "https://gitlab.labs.nic.cz/knot/knot-resolver/commit/186f263.diff";
sha256 = "19zqigvc7m2a4j6bk9whx7gj0v009568rz5qwk052z7pzfikr8mk";
})
];
# Short-lived cross fix, as upstream is migrating to meson anyway. # Short-lived cross fix, as upstream is migrating to meson anyway.
postPatch = '' postPatch = ''
substituteInPlace platform.mk --replace "objdump" "$OBJDUMP" substituteInPlace platform.mk --replace "objdump" "$OBJDUMP"