From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH] gnu: whois: Move mkpasswd to its own output. Date: Wed, 4 Jan 2017 18:07:05 +0000 Message-ID: <20170104180705.5733-2-ng0@libertad.pw> References: <20170104180705.5733-1-ng0@libertad.pw> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOpxU-00039r-VO for guix-devel@gnu.org; Wed, 04 Jan 2017 13:06:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOpxR-0001DE-2q for guix-devel@gnu.org; Wed, 04 Jan 2017 13:06:44 -0500 Received: from aibo.runbox.com ([91.220.196.211]:36285) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cOpxQ-0001Ba-RT for guix-devel@gnu.org; Wed, 04 Jan 2017 13:06:41 -0500 Received: from [10.9.9.211] (helo=mailfront11.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1cOpxN-0006km-SS for guix-devel@gnu.org; Wed, 04 Jan 2017 19:06:37 +0100 In-Reply-To: <20170104180705.5733-1-ng0@libertad.pw> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/networking.scm (whois): Move mkpasswd to output "mkpasswd". [outputs]: Add "mkpasswd". [arguments]: Add new phase "move-mkpasswd". Remove TODO comment about unbundling. --- gnu/packages/networking.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3c7c07349..03165e62d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2016 ng0 +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Arun Isaac ;;; Copyright © 2016 Benz Schenk ;;; @@ -440,7 +440,6 @@ and up to 1 Mbit/s downstream.") (base32 "0r3bbxpwsxssa99d8dcjnp79mw1cjwqxgmqjm1537q277jwsk0yc")))) (build-system gnu-build-system) - ;; TODO: unbundle mkpasswd binary + its po files. (arguments `(#:tests? #f ; Does not exist #:make-flags (list "CC=gcc" @@ -452,7 +451,21 @@ and up to 1 Mbit/s downstream.") (lambda _ (setenv "HAVE_ICONV" "1") (setenv "HAVE_LIBIDN" "1") - #t))))) + #t)) + (add-after 'install 'move-mkpasswd + (lambda* (#:key outputs #:allow-other-keys) + ;; Move mkpasswd related files to "mkpasswd". + (let ((out (assoc-ref outputs "out")) + (mp (assoc-ref outputs "mkpasswd"))) + (mkdir-p (string-append mp "/share/man/man1")) + (mkdir-p (string-append mp "/bin")) + (rename-file (string-append out "/share/man/man1/mkpasswd.1") + (string-append mp "/share/man/man1/mkpasswd.1")) + (rename-file (string-append out "/bin/mkpasswd") + (string-append mp "/bin/mkpasswd")) + #t)))))) + (outputs '("out" + "mkpasswd")) ; 28KiB binary, 16KiB man1 (inputs `(("libidn" ,libidn))) (native-inputs -- 2.11.0