futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: gitolite: Add bash-minimal.

Browse Source 
* gnu/packages/version-control.scm (gitolite)[arguments]: Remove
trailing #t.
[inputs]: Add bash-minimal.
This commit is contained in:
Efraim Flashner 2022-03-28 10:07:02 +03:00
parent 6d780dc8bf
commit 58bc976b5b
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/version-control.scm
View File

@ -1475,7 +1475,7 @@ also walk each side of a merge and test those changes individually.")
(let ((perl (search-input-file inputs "/bin/perl"))) (let ((perl (search-input-file inputs "/bin/perl")))
;; This seems to take care of every shell script that ;; This seems to take care of every shell script that
;; invokes Perl. ;; invokes Perl.
(substitute* (find-files "." ".*") (substitute* (find-files ".")
((" perl -") ((" perl -")
(string-append " " perl " -"))) (string-append " " perl " -")))
@ -1494,8 +1494,7 @@ also walk each side of a merge and test those changes individually.")
;; This works because gitolite-shell is in the PATH. ;; This works because gitolite-shell is in the PATH.
(substitute* "src/triggers/post-compile/ssh-authkeys" (substitute* "src/triggers/post-compile/ssh-authkeys"
(("\\$glshell \\$user") (("\\$glshell \\$user")
"gitolite-shell $user")) "gitolite-shell $user")))))
#t)))
(add-before 'install 'patch-source (add-before 'install 'patch-source
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Gitolite uses cat to test the readability of the ;; Gitolite uses cat to test the readability of the
@ -1520,8 +1519,7 @@ also walk each side of a merge and test those changes individually.")
"/bin/logger\""))) "/bin/logger\"")))
(substitute* "src/commands/svnserve" (substitute* "src/commands/svnserve"
(("/usr/bin/svnserve") "svnserve")) (("/usr/bin/svnserve") "svnserve"))))
#t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((output (assoc-ref outputs "out")) (let* ((output (assoc-ref outputs "out"))
@ -1534,8 +1532,7 @@ also walk each side of a merge and test those changes individually.")
(for-each (lambda (script) (for-each (lambda (script)
(symlink (string-append sharedir "/" script) (symlink (string-append sharedir "/" script)
(string-append bindir "/" script))) (string-append bindir "/" script)))
'("gitolite" "gitolite-shell")) '("gitolite" "gitolite-shell")))))
#t)))
(add-after 'install 'wrap-scripts (add-after 'install 'wrap-scripts
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -1546,10 +1543,9 @@ also walk each side of a merge and test those changes individually.")
`("PATH" ":" prefix `("PATH" ":" prefix
,(map (lambda (dir) ,(map (lambda (dir)
(string-append dir "/bin")) (string-append dir "/bin"))
(list out coreutils findutils git)))) (list out coreutils findutils git))))))))))
#t))))))
(inputs (inputs
(list perl coreutils findutils inetutils)) (list bash-minimal perl coreutils findutils inetutils))
;; git and openssh are propagated because trying to patch the source via ;; git and openssh are propagated because trying to patch the source via
;; regexp matching is too brittle and prone to false positives. ;; regexp matching is too brittle and prone to false positives.
(propagated-inputs (propagated-inputs