diff options
| author | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
| commit | c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7 (patch) | |
| tree | 47bd773d2f434384b54e56916c1a287dd8e51511 /gnu/packages/version-control.scm | |
| parent | ffa01e68859bb7a6daa9fcffdc8d77ca35db4bc0 (diff) | |
| parent | 4eb0a5146ae5a195a29c79f586fcc1e58f7fa69b (diff) | |
| download | guix-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts: gnu/packages/algebra.scm gnu/packages/games.scm gnu/packages/golang.scm gnu/packages/kerberos.scm gnu/packages/mail.scm gnu/packages/python.scm gnu/packages/ruby.scm gnu/packages/scheme.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b6f7d5eafc..660a219ea0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1036,7 +1036,7 @@ a built-in cache to decrease server I/O pressure.") "'")) (("/usr/sbin/sendmail") (search-input-file inputs - "/usr/sbin/sendmail")))))))) + "/sbin/sendmail")))))))) (inputs `(("git" ,git) ("sendmail" ,sendmail))) @@ -1603,7 +1603,7 @@ execution of any hook written in any language before every commit.") (define-public mercurial (package (name "mercurial") - (version "5.8") + (version "5.8.1") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" @@ -1611,7 +1611,7 @@ execution of any hook written in any language before every commit.") (patches (search-patches "mercurial-hg-extension-path.patch")) (sha256 (base32 - "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw")))) + "16xi4bmjqzi7ig8sfa5mnypfpbbbiyafmmqrs4nxmgc743za7fl1")))) (build-system gnu-build-system) (arguments `(#:make-flags |