aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2022-09-02 14:33:01 -0400
committerDavid Thompson <dthompson2@worcester.edu>2022-09-04 08:52:24 -0400
commit1aa46a7e29c5bd892219fe20fefb883d2103e29e (patch)
tree65924939bf5a61cc38c9f9ccfe09f599df49c3cd
parent8b3112a355b287cebb58d4e003f50190a50fd98c (diff)
downloadguix-1aa46a7e29c5bd892219fe20fefb883d2103e29e.tar
guix-1aa46a7e29c5bd892219fe20fefb883d2103e29e.tar.gz
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.
-rw-r--r--gnu/packages/version-control.scm18
1 files 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