From mboxrd@z Thu Jan 1 00:00:00 1970 From: contact.ng0@cryptolab.net Subject: [PATCH 1/2] gnu: shadow: Use 'modify-phases'. Date: Thu, 19 Jan 2017 20:06:35 +0000 Message-ID: <20170119200636.2767-2-contact.ng0@cryptolab.net> References: <20170119200636.2767-1-contact.ng0@cryptolab.net> 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]:51348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUIzD-0002jo-To for guix-devel@gnu.org; Thu, 19 Jan 2017 15:07:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUIzB-00047T-7m for guix-devel@gnu.org; Thu, 19 Jan 2017 15:07:07 -0500 Received: from aibo.runbox.com ([91.220.196.211]:39669) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cUIzB-00047A-0h for guix-devel@gnu.org; Thu, 19 Jan 2017 15:07:05 -0500 Received: from [10.9.9.210] (helo=mailfront10.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1cUIz9-00087B-TO for guix-devel@gnu.org; Thu, 19 Jan 2017 21:07:03 +0100 In-Reply-To: <20170119200636.2767-1-contact.ng0@cryptolab.net> 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 Cc: ng0 From: ng0 * gnu/packages/admin.scm (shadow): Use 'modify-phases'. --- gnu/packages/admin.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a785ddb0d..ed02258ed 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch -;;; Coypright © 2016 ng0 +;;; Coypright © 2016, 2017 ng0 ;;; Coypright © 2016 Tobias Geerinckx-Rice ;;; Coypright © 2016 John Darrington ;;; @@ -283,27 +283,27 @@ client and server, a telnet client and server, and an rsh client and server.") (arguments '(;; Assume System V `setpgrp (void)', which is the default on GNU ;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.) - #:configure-flags '("--with-libpam" "ac_cv_func_setpgrp_void=yes") + #:configure-flags + '("--with-libpam" "ac_cv_func_setpgrp_void=yes") - #:phases (alist-cons-before - 'build 'set-nscd-file-name - (lambda* (#:key inputs #:allow-other-keys) - ;; Use the right file name for nscd. - (let ((libc (assoc-ref inputs "libc"))) - (substitute* "lib/nscd.c" - (("/usr/sbin/nscd") - (string-append libc "/sbin/nscd"))))) - (alist-cons-after - 'install 'remove-groups - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove `groups', which is already provided by Coreutils. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man"))) - (delete-file (string-append bin "/groups")) - (for-each delete-file (find-files man "^groups\\.")) - #t)) - %standard-phases)))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-nscd-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Use the right file name for nscd. + (let ((libc (assoc-ref inputs "libc"))) + (substitute* "lib/nscd.c" + (("/usr/sbin/nscd") + (string-append libc "/sbin/nscd")))))) + (add-after 'install 'remove-groups + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove `groups', which is already provided by Coreutils. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man"))) + (delete-file (string-append bin "/groups")) + (for-each delete-file (find-files man "^groups\\.")) + #t)))))) (inputs (if (string-suffix? "-linux" (or (%current-target-system) -- 2.11.0