From: ng0 <ng0@libertad.pw>
To: guix-devel@gnu.org
Subject: [PATCH] gnu: whois: Move mkpasswd to its own output.
Date: Wed, 4 Jan 2017 18:07:05 +0000 [thread overview]
Message-ID: <20170104180705.5733-2-ng0@libertad.pw> (raw)
In-Reply-To: <20170104180705.5733-1-ng0@libertad.pw>
* 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 <jmd@gnu.org>
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch>
;;;
@@ -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
next prev parent reply other threads:[~2017-01-04 18:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-04 18:07 "unbundle" mkpasswd from whois ng0
2017-01-04 18:07 ` ng0 [this message]
2017-01-09 9:34 ` [PATCH] gnu: whois: Move mkpasswd to its own output Ludovic Courtès
2017-01-09 10:28 ` ng0
2017-01-09 14:29 ` Ludovic Courtès
2017-01-09 14:37 ` ng0
2017-01-09 14:45 ` Whois: Update to 5.2.14 ng0
2017-01-09 14:45 ` [PATCH] gnu: whois: " ng0
2017-01-09 21:05 ` Leo Famulari
2017-01-20 10:41 ` [PATCH] gnu: whois: Move mkpasswd to its own output ng0
2017-01-20 11:32 ` Hartmut Goebel
2017-01-20 13:52 ` Ludovic Courtès
2017-01-21 0:45 ` ng0
2017-01-20 14:02 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170104180705.5733-2-ng0@libertad.pw \
--to=ng0@libertad.pw \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.