From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLS8E-0003C9-VQ for guix-patches@gnu.org; Thu, 15 Jun 2017 06:36:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLS8A-0000dw-UJ for guix-patches@gnu.org; Thu, 15 Jun 2017 06:36:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:45905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLS8A-0000ds-QV for guix-patches@gnu.org; Thu, 15 Jun 2017 06:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dLS8A-0006VT-Jf for guix-patches@gnu.org; Thu, 15 Jun 2017 06:36:02 -0400 Subject: [bug#27374] [PATCH 3/3] gnu: knot: Update to 2.5.1. Resent-Message-ID: From: Tobias Geerinckx-Rice Date: Thu, 15 Jun 2017 12:36:25 +0200 Message-Id: <20170615103625.8225-3-me@tobias.gr> In-Reply-To: <20170615103625.8225-1-me@tobias.gr> References: <20170615103625.8225-1-me@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27374@debbugs.gnu.org * 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. --- gnu/packages/dns.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 7f1d18f2b..c69905abb 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages nettle) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -321,14 +322,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.4.4") + (version "2.5.1") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" name "-" version ".tar.xz")) (sha256 (base32 - "0g2n5r2n03bqz322xlwdw4bqhj8l4n8q0hzrqngi4rgmk4rp97ly")) + "1643q2pj5sjhgv19jp8r2bhvqyk6mmlajdmr6qhjcbhql30cs23c")) (modules '((guix build utils))) (snippet '(begin @@ -353,7 +354,11 @@ Extensions} (DNSSEC).") ("liburcu" ,liburcu) ("lmdb" ,lmdb) ("ncurses" ,ncurses) - ("nettle" ,nettle))) + ("nettle" ,nettle) + + ;; For ‘pykeymgr’, needed to migrate keys from versions <= 2.4. + ("python" ,python-2) + ("python-lmdb" ,python2-lmdb))) (arguments `(#:phases (modify-phases %standard-phases @@ -370,11 +375,18 @@ Extensions} (DNSSEC).") (zero? (system* "make" (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 (list "--sysconfdir=/etc" "--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=" (assoc-ref %outputs "out") "/etc/bash_completion.d")))) -- 2.12.2