From 413f2d28aa8bea2274b74c2b574fb9f8bf9c16ba Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 2 Sep 2022 14:33:01 -0400 Subject: [PATCH] gnu: gitolite: Wrap programs instead of using propagated inputs. * gnu/packages/version-control.scm (gitolite)[arguments]: Add git to wrapped $PATH and additionally wrap gitolite-shell. [inputs]: Add git and openssh. [propagated-inputs]: Remove it. --- gnu/packages/version-control.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 15a9278fe8..1c775932c0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1573,17 +1573,15 @@ (define-public gitolite (coreutils (assoc-ref inputs "coreutils")) (findutils (assoc-ref inputs "findutils")) (git (assoc-ref inputs "git"))) - (wrap-program (string-append out "/bin/gitolite") - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (list out coreutils findutils git)))))))))) + (for-each (lambda (file-name) + (wrap-program (string-append out file-name) + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list out coreutils findutils git))))) + '("/bin/gitolite" "/bin/gitolite-shell")))))))) (inputs - (list bash-minimal perl coreutils findutils inetutils)) - ;; git and openssh are propagated because trying to patch the source via - ;; regexp matching is too brittle and prone to false positives. - (propagated-inputs - (list git openssh)) + (list bash-minimal git perl coreutils findutils inetutils openssh)) (home-page "https://gitolite.com") (synopsis "Git access control layer") (description -- 2.37.2