From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= Subject: [PATCHv2 1/2] gnu: bash-completion: Modify to modify-phases. Date: Sun, 7 Aug 2016 12:07:14 +0200 Message-ID: <20160807100715.14652-1-sleep_walker@gnu.org> References: <20160807080633.ftxxgx7xf7mnfd4d@venom> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWKzM-0000ET-Nl for guix-devel@gnu.org; Sun, 07 Aug 2016 06:07:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWKzJ-0005gc-Cu for guix-devel@gnu.org; Sun, 07 Aug 2016 06:07:24 -0400 In-Reply-To: <20160807080633.ftxxgx7xf7mnfd4d@venom> 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/bash.scm(bash-completion): Use modify-phases instead of alist-cons-after. --- gnu/packages/bash.scm | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index ff3acfc..c006546 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -289,29 +289,29 @@ without modification.") (build-system gnu-build-system) (native-inputs `(("util-linux" ,util-linux))) (arguments - `(#:phases (alist-cons-after - 'install 'remove-redundant-completions - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Util-linux comes with a bunch of completion files for - ;; its own commands which are more sophisticated and - ;; up-to-date than those of bash-completion. Remove those - ;; from bash-completion. - (let* ((out (assoc-ref outputs "out")) - (util-linux (assoc-ref inputs "util-linux")) - (completions (string-append out - "/share/bash-completion" - "/completions")) - (already (find-files - (string-append - util-linux - "/etc/bash_completion.d")))) - (with-directory-excursion completions - (for-each (lambda (file) - (when (file-exists? file) - (delete-file file))) - (map basename already))) - #t)) - %standard-phases))) + `(#:phases (modify-phases %standard-phases + (add-after + 'install 'remove-redundant-completions + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Util-linux comes with a bunch of completion files for + ;; its own commands which are more sophisticated and + ;; up-to-date than those of bash-completion. Remove those + ;; from bash-completion. + (let* ((out (assoc-ref outputs "out")) + (util-linux (assoc-ref inputs "util-linux")) + (completions (string-append out + "/share/bash-completion" + "/completions")) + (already (find-files + (string-append + util-linux + "/etc/bash_completion.d")))) + (with-directory-excursion completions + (for-each (lambda (file) + (when (file-exists? file) + (delete-file file))) + (map basename already))) + #t)))))) (synopsis "Bash completions for common commands") (description "This package provides extensions that allow Bash to provide adapted -- 2.9.2