diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 10:20:32 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 10:20:32 -0400 |
commit | 3d297a0017210f1dd135592efb10846840a8af88 (patch) | |
tree | 8868c35a558a6288b5097d65bee42dda291178e4 /gnu/packages/version-control.scm | |
parent | 279349209e44aaae6ca2aba328fe2a4d2da99f12 (diff) | |
parent | 6737d8d3248301e65bc24291b1a776e4aa8c3648 (diff) |
Merge branch 'master' into staging
With resolved conflicts in:
gnu/local.mk
gnu/packages/freedesktop.scm
gnu/packages/gnuzilla.scm
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 08bd80b586..ad3029e814 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1736,7 +1736,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/" @@ -1745,7 +1745,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 |