mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-30 22:36:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: knot: Update to 3.1.2.

Browse source 
* gnu/packages/dns.scm (knot): Update to 3.1.2.
[source]: Remove explicit #t snippet return value.
[arguments]: Don't explicitly return #t from phases.
[inputs]: Add libmnl.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-03 21:26:19 +02:00
parent 413f8f3fa5
commit 8018d7d1f8
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/dns.scm
View file

@ -817,7 +817,7 @@ (define-public yadifa
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "3.0.7") (version "3.1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -826,7 +826,7 @@ (define-public knot
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0ihd0lfh0r1nzz2di2rqkrx5j1017xv7m54irlhccx21inwv6g3y")) (base32 "1kyjf6d1jx8q0zjzwy06f4d3ar5cbbqxka8cc7ckwmbpf1n6cij5"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -834,8 +834,7 @@ (define-public knot
(for-each delete-file (find-files "." "\\.c\\.[gt].")) (for-each delete-file (find-files "." "\\.c\\.[gt]."))
(delete-file "src/libknot/yparser/ypbody.c") (delete-file "src/libknot/yparser/ypbody.c")
;; Remove bundled library to ensure we always use the system's. ;; Remove bundled library to ensure we always use the system's.
(delete-file-recursively "src/contrib/libbpf") (delete-file-recursively "src/contrib/libbpf")))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs (list "out" "doc" "lib" "tools")) (outputs (list "out" "doc" "lib" "tools"))
(arguments (arguments
@ -859,8 +858,7 @@ (define-public knot
(lambda _ (lambda _
(substitute* "configure.ac" (substitute* "configure.ac"
(("enable_xdp=yes" match) (("enable_xdp=yes" match)
(string-append match "\nlibbpf_LIBS=\"$libbpf_LIBS -lz\""))) (string-append match "\nlibbpf_LIBS=\"$libbpf_LIBS -lz\"")))))
#true))
(add-before 'bootstrap 'update-parser (add-before 'bootstrap 'update-parser
(lambda _ (lambda _
(with-directory-excursion "src" (with-directory-excursion "src"
@ -869,8 +867,7 @@ (define-public knot
(lambda _ (lambda _
;; Don't install empty directories like ‘/etc’ outside the store. ;; Don't install empty directories like ‘/etc’ outside the store.
;; This is needed even when using ‘make config_dir=... install’. ;; This is needed even when using ‘make config_dir=... install’.
(substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true")) (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))))
#t))
(add-after 'build 'build-info (add-after 'build 'build-info
(lambda _ (lambda _
(invoke "make" "info"))) (invoke "make" "info")))
@ -892,8 +889,7 @@ (define-public knot
(substitute* file (substitute* file
(("(prefix=).*" _ assign) (("(prefix=).*" _ assign)
(string-append assign lib "\n")))) (string-append assign lib "\n"))))
(find-files lib "\\.pc$")) (find-files lib "\\.pc$")))))
#true)))
(add-after 'install 'split-:tools (add-after 'install 'split-:tools
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -902,8 +898,7 @@ (define-public knot
(rename-file (string-append out "/bin") (rename-file (string-append out "/bin")
(string-append tools "/bin")) (string-append tools "/bin"))
(rename-file (string-append out "/share/man/man1") (rename-file (string-append out "/share/man/man1")
(string-append tools "/share/man/man1")) (string-append tools "/share/man/man1"))))))))
#true))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -921,6 +916,7 @@ (define-public knot
("libedit" ,libedit) ("libedit" ,libedit)
("libelf" ,libelf) ("libelf" ,libelf)
("libidn" ,libidn) ("libidn" ,libidn)
("libmnl" ,libmnl)
("libnghttp2" ,nghttp2 "lib") ("libnghttp2" ,nghttp2 "lib")
("liburcu" ,liburcu) ("liburcu" ,liburcu)
("lmdb" ,lmdb) ("lmdb" ,lmdb)