branch master updated: gnu: gitolite: Wrap programs instead of using propagated inputs.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

davexunit pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1aa46a7e29 gnu: gitolite: Wrap programs instead of using propagated 
inputs.
1aa46a7e29 is described below

commit 1aa46a7e29c5bd892219fe20fefb883d2103e29e
Author: David Thompson <dthompson2@worcester.edu>
AuthorDate: Fri Sep 2 14:33:01 2022 -0400

    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..a7989da200 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1573,17 +1573,15 @@ also walk each side of a merge and test those changes 
individually.")
                             (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 coreutils findutils git inetutils openssh perl))
     (home-page "https://gitolite.com";)
     (synopsis "Git access control layer")
     (description