diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:29:02 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:43:21 -0400 |
| commit | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (patch) | |
| tree | c7dd5859715071cb602133b67449a29488027f70 /gnu/packages/version-control.scm | |
| parent | 513091dbd2eeba138b558f5f9bb1ee6e68eee01d (diff) | |
| parent | 3d297a0017210f1dd135592efb10846840a8af88 (diff) | |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 813037a421..2c94a8ac4c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1734,7 +1734,7 @@ execution of any hook written in any language before every commit.") (define-public mercurial (package (name "mercurial") - (version "6.2.1") + (version "6.2.2") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" @@ -1743,7 +1743,14 @@ execution of any hook written in any language before every commit.") "mercurial-openssl-compat.patch")) (sha256 (base32 - "1nl2726szaxyrxlyssrsir5c6vb4ci0i6g969i6xaahw1nidgica")))) + "1pr00hdk3l9095fhq6302fgj0wmbqhqs93y4r457ba4pyjjrvyly")) + (modules '((guix build utils))) + (snippet + '(substitute* (find-files "tests" "\\.(t|sh)$") + ;; grep 3.8 emits deprecation warnings for 'egrep' and + ;; 'fgrep' which breaks expected test output. + (("egrep") "grep -E") + (("fgrep") "grep -F"))))) (build-system gnu-build-system) (arguments `(#:make-flags |