summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2016-07-22 17:17:02 +0300
committerEfraim Flashner <efraim@flashner.co.il>2016-07-22 18:24:22 +0300
commit2ce516d359d9f2525f6b78f1de6dcee8de1c40ae (patch)
treeeb831122f5781ce44367e2f3e781c2a6a5bb8e99 /gnu
parentbf3c57ff2dcaf54d1cb2767101f092c715bb5aee (diff)
downloadpatches-2ce516d359d9f2525f6b78f1de6dcee8de1c40ae.tar
patches-2ce516d359d9f2525f6b78f1de6dcee8de1c40ae.tar.gz
gnu: git: Use 'modify-phases'.
* gnu/packages/version-control.scm (git)[arguments]: Use 'modify-phases'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/version-control.scm39
1 files changed, 18 insertions, 21 deletions
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 @@ as well as the classic centralized workflow.")
#: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 @@ as well as the classic centralized workflow.")
;; 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