summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-01-26 00:23:02 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-01-26 08:21:03 -0500
commitaf3b67a28bfb76b33e7068d6b51fcd8f07b98099 (patch)
tree950ab6c4f258aa8aba82121bdb3477eaae3d0e8d /gnu
parentfd2588472ec18cafba3a4391d267f9a03e9d2f30 (diff)
downloadguix-patches-af3b67a28bfb76b33e7068d6b51fcd8f07b98099.tar
guix-patches-af3b67a28bfb76b33e7068d6b51fcd8f07b98099.tar.gz
gnu: mercurial: Update to 5.6.1.
This fixes the build on Python 3.9. * gnu/packages/version-control.scm (mercurial): Update to 5.6.1. Delete trailing #t. [phases]{check}: Remove the "test-transaction-rollback-on-sigpipe.t" test file and add a comment.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/version-control.scm16
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 54b9a334b5..da0ab44f0d 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -33,6 +33,7 @@
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1577,14 +1578,14 @@ execution of any hook written in any language before every commit.")
(define-public mercurial
(package
(name "mercurial")
- (version "5.5.1")
+ (version "5.6.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.mercurial-scm.org/"
"release/mercurial-" version ".tar.gz"))
(sha256
(base32
- "0x08yjs26j88kh1bvl2g3r24lnfc023ry3i1cxfq6haray6sv5ag"))))
+ "1bgz8f1a7lnmh6lzcvwg6q1yx6i7yibhwy06l4k55i04957jap75"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -1597,8 +1598,7 @@ execution of any hook written in any language before every commit.")
"tests/test-run-tests.t"
"tests/test-transplant.t")
(("/bin/sh")
- (which "sh")))
- #t))
+ (which "sh")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(with-directory-excursion "tests"
@@ -1609,9 +1609,10 @@ execution of any hook written in any language before every commit.")
;; PATH from before (that's why we are building it!)?
"test-hghave.t"
- ;; FIXME: Why does this fail in the build container, but
- ;; not in 'guix environment -C' (even without /bin/sh)?
+ ;; These tests fail because the program is not
+ ;; connected to a TTY in the build container.
"test-nointerrupt.t"
+ "test-transaction-rollback-on-sigpipe.t"
;; FIXME: This gets killed but does not receive an interrupt.
"test-commandserver.t"
@@ -1640,8 +1641,7 @@ execution of any hook written in any language before every commit.")
"--slowtimeout" "86400"
;; The test suite takes a long time and produces little
;; output by default. Prevent timeouts due to silence.
- "-v"))
- #t))))))
+ "-v"))))))))
;; The following inputs are only needed to run the tests.
(native-inputs
`(("python-nose" ,python-nose)