From 2ce516d359d9f2525f6b78f1de6dcee8de1c40ae Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 22 Jul 2016 17:17:02 +0300
Subject: gnu: git: Use 'modify-phases'.

* gnu/packages/version-control.scm (git)[arguments]: Use 'modify-phases'.
---
 gnu/packages/version-control.scm | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cdaf53c33a..450f7f5a14 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -167,25 +167,23 @@ (define-public git
       #:modules ((srfi srfi-1)
                  ,@%gnu-build-system-modules)
       #:phases
-       (alist-cons-after
-        'configure 'patch-makefile-shebangs
-        (lambda _
-          (substitute* "Makefile"
-            (("/bin/sh") (which "sh"))
-            (("/usr/bin/perl") (which "perl"))
-            (("/usr/bin/python") (which "python"))))
-        (alist-cons-after
-         'install 'install-shell-completion
-         (lambda* (#:key outputs #:allow-other-keys)
-           (let* ((out         (assoc-ref outputs "out"))
-                  (completions (string-append out "/etc/bash_completion.d")))
-             ;; TODO: Install the tcsh and zsh completions in the right place.
-             (mkdir-p completions)
-             (copy-file "contrib/completion/git-completion.bash"
-                        (string-append completions "/git"))
-             #t))
-         (alist-cons-after
-          'install 'split
+      (modify-phases %standard-phases
+        (add-after 'configure 'patch-makefile-shebangs
+          (lambda _
+            (substitute* "Makefile"
+              (("/bin/sh") (which "sh"))
+              (("/usr/bin/perl") (which "perl"))
+              (("/usr/bin/python") (which "python")))))
+        (add-after  'install 'install-shell-completion
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let* ((out         (assoc-ref outputs "out"))
+                   (completions (string-append out "/etc/bash_completion.d")))
+              ;; TODO: Install the tcsh and zsh completions in the right place.
+              (mkdir-p completions)
+              (copy-file "contrib/completion/git-completion.bash"
+                         (string-append completions "/git"))
+              #t)))
+        (add-after 'install 'split
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; Split the binaries to the various outputs.
             (let* ((out      (assoc-ref outputs "out"))
@@ -257,8 +255,7 @@ (define-public git
               ;; specify a single directory, not a search path.
               (wrap-program (string-append out "/bin/git")
                 `("PATH" ":" prefix
-                  ("$HOME/.guix-profile/libexec/git-core")))))
-          %standard-phases)))))
+                  ("$HOME/.guix-profile/libexec/git-core")))))))))
 
    (native-search-paths
     ;; For HTTPS access, Git needs a single-file certificate bundle, specified
-- 
cgit v1.2.3