ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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