From 8ef843c711e73db2aac9e9b6e4193bc13b7c1dad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 22 Jul 2016 17:34:57 +0300 Subject: [PATCH] gnu: aegis: Use 'modify-phases'. * gnu/packages/version-control.scm (aegis)[arguments]: Use 'modify-phases'. --- gnu/packages/version-control.scm | 60 +++++++++++++++----------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 450f7f5a14..d0decefc9a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -964,39 +964,37 @@ (define-public aegis "--sharedstatedir=/var/com/aegis") #:parallel-build? #f ; There are some nasty racy rules in the Makefile. #:phases - (alist-cons-before - 'configure 'pre-conf - (lambda _ - (substitute* (append '("configure" - "etc/check-tar-gz.sh" - "etc/patches.sh" - "etc/test.sh" - "script/aexver.in" - "script/aebisect.in" - "script/aeintegratq.in" - "script/tkaegis.in" - "script/test_funcs.in" - "web/eg_oss_templ.sh" - "web/webiface.html" - "libaegis/getpw_cache.cc") - (find-files "test" "\\.sh")) - (("/bin/sh") (which "sh"))) - (setenv "SH" (which "sh"))) - (alist-replace - 'check - (lambda _ - (let ((home (string-append (getcwd) "/my-new-home"))) - ;; Some tests need to write to $HOME. - (mkdir home) - (setenv "HOME" home) + (modify-phases %standard-phases + (add-before 'configure 'pre-conf + (lambda _ + (substitute* (append '("configure" + "etc/check-tar-gz.sh" + "etc/patches.sh" + "etc/test.sh" + "script/aexver.in" + "script/aebisect.in" + "script/aeintegratq.in" + "script/tkaegis.in" + "script/test_funcs.in" + "web/eg_oss_templ.sh" + "web/webiface.html" + "libaegis/getpw_cache.cc") + (find-files "test" "\\.sh")) + (("/bin/sh") (which "sh"))) + (setenv "SH" (which "sh")))) + (replace 'check + (lambda _ + (let ((home (string-append (getcwd) "/my-new-home"))) + ;; Some tests need to write to $HOME. + (mkdir home) + (setenv "HOME" home) - ;; This test assumes that flex has been symlinked to "lex". - (substitute* "test/00/t0011a.sh" - (("type lex") "type flex")) + ;; This test assumes that flex has been symlinked to "lex". + (substitute* "test/00/t0011a.sh" + (("type lex") "type flex")) - ;; The author decided to call the check rule "sure". - (zero? (system* "make" "sure")))) - %standard-phases)))) + ;; The author decided to call the check rule "sure". + (zero? (system* "make" "sure")))))))) (home-page "http://aegis.sourceforge.net") (synopsis "Project change supervisor") (description "Aegis is a project change supervisor, and performs some of