diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-03-20 00:13:57 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-03-20 00:44:57 +0100 |
| commit | d17b1c0891c2e1b2b1bfc92a120e91c1f8909c39 (patch) | |
| tree | 60123871bc55e969bf2436f2796af6c91817ff89 | |
| parent | 1c4d4196c2b21d4880c4bd97ea3ec28d2b05e2b3 (diff) | |
| download | guix-d17b1c0891c2e1b2b1bfc92a120e91c1f8909c39.tar.gz guix-d17b1c0891c2e1b2b1bfc92a120e91c1f8909c39.zip | |
gnu: knot: Update to 2.8.0.
* gnu/packages/dns.scm (knot): Update to 2.8.0.
[source]: Add patch.
* gnu/packages/patches/knot-include-system-lmdb-header.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/dns.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/knot-include-system-lmdb-header.patch | 34 |
3 files changed, 39 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 87bed6e827..c32876cdcf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -929,6 +929,7 @@ dist_patch_DATA = \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ + %D%/packages/patches/knot-include-system-lmdb-header.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index f8b60e34c5..034fe6916a 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -569,14 +569,16 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.7.6") + (version "2.8.0") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" "knot-" version ".tar.xz")) (sha256 (base32 - "18lpyq3vgr2ainmfiy14x7hcf1zxza66bhkpr54jaz2gy1viijx1")) + "1vw7xx7bm440jwrpvdd04vrp6ccz2b11swcn9msvs62hf0kdjjj9")) + (patches + (search-patches "knot-include-system-lmdb-header.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/knot-include-system-lmdb-header.patch b/gnu/packages/patches/knot-include-system-lmdb-header.patch new file mode 100644 index 0000000000..5c5c0beabc --- /dev/null +++ b/gnu/packages/patches/knot-include-system-lmdb-header.patch @@ -0,0 +1,34 @@ +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Wed, 20 Mar 2019 00:08:00 +0100 +Subject: [PATCH] gnu: knot: Include system <lmdb.h>. + +Copied verbatim from Knot master[0]. + +[0]: https://gitlab.labs.nic.cz/knot/knot-dns/commit/b557430cffbb1c6b30617a394b02acc514e7e536 + +From b557430cffbb1c6b30617a394b02acc514e7e536 Mon Sep 17 00:00:00 2001 +From: Daniel Salzman <daniel.salzman@nic.cz> +Date: Wed, 6 Mar 2019 17:35:44 +0100 +Subject: [PATCH] journal: include proper header <lmdb.h> + +fixes #638 +--- + src/knot/journal/knot_lmdb.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/knot/journal/knot_lmdb.h b/src/knot/journal/knot_lmdb.h +index 35a88845c..b1d09cbb4 100644 +--- a/src/knot/journal/knot_lmdb.h ++++ b/src/knot/journal/knot_lmdb.h +@@ -16,7 +16,7 @@ + + #pragma once + +-#include "contrib/lmdb/lmdb.h" ++#include <lmdb.h> + + #include <stdbool.h> + #include <stdlib.h> +-- +2.18.1 + |