From 68d26688ea166feb7459a467d82d28faceb3245e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 19 Oct 2023 23:56:46 -0400 Subject: [PATCH] gnu: src: Add bash-minimal to inputs, use gexps. * gnu/packages/version-control.scm (src) [arguments]: Use gexps. [inputs]: Add bash-minimal. Change-Id: I122b0c496792a5dea731c2e70d32cba7286df0b1 --- gnu/packages/version-control.scm | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 89670e01e31222709ebdc0a5b583d6f680f9e5a8..8041c9676880cd964b90b4ea0dabca5792ea0974 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3363,32 +3363,32 @@ specific files and directories.") "0r9i399kkagpwj08nwf1f7c6lr50xjzzgmzwyjjy6ppgcc53a809")))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list (string-append "prefix=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no 'configure' script - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/bin/src")) - (rcs (assoc-ref inputs "rcs"))) - (wrap-program prog - `("PATH" ":" prefix (,(string-append rcs "/bin")))) - #t))) - (replace 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) - (invoke "git" "config" "--global" "user.name" "guix") - (invoke "git" "config" "--global" "user.email" "guix") - (invoke "./srctest")))))) + (list + #:make-flags + #~(list (string-append "prefix=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no 'configure' script + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (let* ((prog (string-append #$output "/bin/src")) + (rcs (search-input-file inputs "bin/rcs"))) + (wrap-program prog + `("PATH" ":" prefix (,(dirname rcs))))))) + (replace 'check + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) + (invoke "git" "config" "--global" "user.name" "guix") + (invoke "git" "config" "--global" "user.email" "guix") + (invoke "./srctest")))))) (native-inputs ;; For testing. (list git perl)) (inputs - `(("cssc" ,cssc) - ("python" ,python-wrapper) - ("rcs" ,rcs))) + (list bash-minimal + cssc + python-wrapper + rcs)) (synopsis "Simple revision control") (home-page "http://www.catb.org/~esr/src/") (description