nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: git: Use 'modify-phases'. 

* gnu/packages/version-control.scm (git)[arguments]: Use 'modify-phases'.
This commit is contained in:
Efraim Flashner 2016-07-22 17:17:02 +03:00
parent bf3c57ff2d
commit 2ce516d359
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/version-control.scm
View File

@ -167,25 +167,23 @@ as well as the classic centralized workflow.")
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'configure 'patch-makefile-shebangs (add-after 'configure 'patch-makefile-shebangs
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
(("/bin/sh") (which "sh")) (("/bin/sh") (which "sh"))
(("/usr/bin/perl") (which "perl")) (("/usr/bin/perl") (which "perl"))
(("/usr/bin/python") (which "python")))) (("/usr/bin/python") (which "python")))))
(alist-cons-after (add-after 'install 'install-shell-completion
'install 'install-shell-completion (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))
(let* ((out (assoc-ref outputs "out")) (completions (string-append out "/etc/bash_completion.d")))
(completions (string-append out "/etc/bash_completion.d"))) ;; TODO: Install the tcsh and zsh completions in the right place.
;; TODO: Install the tcsh and zsh completions in the right place. (mkdir-p completions)
(mkdir-p completions) (copy-file "contrib/completion/git-completion.bash"
(copy-file "contrib/completion/git-completion.bash" (string-append completions "/git"))
(string-append completions "/git")) #t)))
#t)) (add-after 'install 'split
(alist-cons-after
'install 'split
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Split the binaries to the various outputs. ;; Split the binaries to the various outputs.
(let* ((out (assoc-ref outputs "out")) (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. ;; specify a single directory, not a search path.
(wrap-program (string-append out "/bin/git") (wrap-program (string-append out "/bin/git")
`("PATH" ":" prefix `("PATH" ":" prefix
("$HOME/.guix-profile/libexec/git-core"))))) ("$HOME/.guix-profile/libexec/git-core")))))))))
%standard-phases)))))
(native-search-paths (native-search-paths
;; For HTTPS access, Git needs a single-file certificate bundle, specified ;; For HTTPS access, Git needs a single-file certificate bundle, specified