gnu: knot: Update to 2.5.1.

* gnu/packages/dns.scm (knot): Update to 2.5.1.
[inputs]: Add python-2 and python2-lmdb.
[arguments]: Adapt #:configure-flags.  Add ‘wrap-python-scripts’ phase.
This commit is contained in:
Tobias Geerinckx-Rice 2017-06-09 21:57:53 +02:00
parent 07041d95b1
commit c7d0444a68
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
1 changed files with 16 additions and 5 deletions

View File

@ -486,14 +486,14 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "2.4.4") (version "2.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/" (uri (string-append "https://secure.nic.cz/files/knot-dns/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0g2n5r2n03bqz322xlwdw4bqhj8l4n8q0hzrqngi4rgmk4rp97ly")) "1643q2pj5sjhgv19jp8r2bhvqyk6mmlajdmr6qhjcbhql30cs23c"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -518,7 +518,11 @@ Extensions} (DNSSEC).")
("liburcu" ,liburcu) ("liburcu" ,liburcu)
("lmdb" ,lmdb) ("lmdb" ,lmdb)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("nettle" ,nettle))) ("nettle" ,nettle)
;; For pykeymgr, needed to migrate keys from versions <= 2.4.
("python" ,python-2)
("python-lmdb" ,python2-lmdb)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -535,11 +539,18 @@ Extensions} (DNSSEC).")
(zero? (zero?
(system* "make" (system* "make"
(string-append "config_dir=" etc) (string-append "config_dir=" etc)
"install")))))) "install")))))
(add-after 'install 'wrap-python-scripts
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/sbin/pykeymgr")
`("PYTHONPATH" ":" prefix (,path))))
#t)))
#:configure-flags #:configure-flags
(list "--sysconfdir=/etc" (list "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--enable-rosedb" ; serve static records from a database "--with-module-rosedb=yes" ; serve static records from a database
(string-append "--with-bash-completions=" (string-append "--with-bash-completions="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/etc/bash_completion.d")))) "/etc/bash_completion.d"))))