From aac42d78852daa7930f79f1c1061f1558f93abd3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 22 Jul 2016 15:45:15 +0300 Subject: [PATCH] gnu: git-flow: Use 'modify-phases'. * gnu/packages/version-control.scm (git-flow)[arguments]: Use 'modify-phases'. --- gnu/packages/version-control.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6d0d4f991d..0ad9f1c28a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -490,19 +490,19 @@ (define-public git-flow '(#:tests? #f ; no tests #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) - #:phases (alist-cons-after - 'unpack 'reset-shFlags-link - (lambda* (#:key inputs #:allow-other-keys) - ;; The link points to a file in the shFlags submodule. - ;; Redirect it to point to our system shFlags. - (let ((shflags (assoc-ref inputs "shflags"))) - (begin - (delete-file "gitflow-shFlags") - (symlink (string-append shflags "/src/shflags") - "gitflow-shFlags")))) - (alist-delete - 'configure - (alist-delete 'build %standard-phases))))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'reset-shFlags-link + (lambda* (#:key inputs #:allow-other-keys) + ;; The link points to a file in the shFlags submodule. + ;; Redirect it to point to our system shFlags. + (let ((shflags (assoc-ref inputs "shflags"))) + (begin + (delete-file "gitflow-shFlags") + (symlink (string-append shflags "/src/shflags") + "gitflow-shFlags"))))) + (delete 'configure) + (delete 'build)))) (home-page "http://nvie.com/posts/a-successful-git-branching-model/") (synopsis "Git extensions for Vincent Driessen's branching model") (description