diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-01 23:26:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-01 23:26:57 +0200 |
| commit | 58863b93b0d9a191d5cca695fe0a0dfbb067ebba (patch) | |
| tree | 1ee1aba5905862aaee952689e59dd2d8a9e2fce6 /gnu/packages/version-control.scm | |
| parent | 2e559a358582fd8f56a035d0fac97be229752dfb (diff) | |
| parent | 0c518f974e64f23846ae51ea2c68b479202fdca9 (diff) | |
| download | guix-58863b93b0d9a191d5cca695fe0a0dfbb067ebba.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 40eb9def72..54ad585c75 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1547,6 +1547,9 @@ also walk each side of a merge and test those changes individually.") (assoc-ref inputs "inetutils") "/bin/logger\""))) + (substitute* "src/lib/Gitolite/Cache.pm" + (("/usr/sbin/redis-server") "redis-server")) + (substitute* "src/commands/svnserve" (("/usr/bin/svnserve") "svnserve")))) (replace 'install @@ -2458,7 +2461,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (define-public tig (package (name "tig") - (version "2.5.6") + (version "2.5.7") (source (origin (method url-fetch) (uri (string-append @@ -2466,7 +2469,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") version "/tig-" version ".tar.gz")) (sha256 (base32 - "0pwn7mlfnd5ngcbagjs9vsr7jgmia8676p0i91vvfl4v6qrmzfsh")) + "0xna55y1r1jssdmrzpinv96p7w00w9hn39q5l3d8l299dg4bmiyv")) (modules '((guix build utils))) (snippet '(begin |