From 003fdf0a9d3067dcb747c30cb20db4c215affc8a Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sat, 10 Sep 2022 22:59:50 +0200
Subject: gnu: mercurial: Adjust for grep 3.8.

* gnu/packages/version-control.scm (mercurial)[source](modules, snippet): New
fields.
---
 gnu/packages/version-control.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/version-control.scm')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 08bd80b586..a731e1236c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1745,7 +1745,14 @@ execution of any hook written in any language before every commit.")
                                       "mercurial-openssl-compat.patch"))
              (sha256
               (base32
-               "1nl2726szaxyrxlyssrsir5c6vb4ci0i6g969i6xaahw1nidgica"))))
+               "1nl2726szaxyrxlyssrsir5c6vb4ci0i6g969i6xaahw1nidgica"))
+             (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
-- 
cgit v1.2.3


From e916bc6703b224fb7eeb36cfb720e148fce0e7d2 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sun, 11 Sep 2022 00:22:01 +0200
Subject: gnu: mercurial: Update to 6.2.2.

* gnu/packages/version-control.scm (mercurial): Update to 6.2.2.
---
 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/version-control.scm')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index a731e1236c..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,7 @@ 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)$")
-- 
cgit v1.2.3