me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2021-01-26 00:23:02 -05:00
parent b965b2f004
commit ffd0e54376
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/version-control.scm
View File

@ -33,6 +33,7 @@
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1576,14 +1577,14 @@ execution of any hook written in any language before every commit.")
(define-public mercurial (define-public mercurial
(package (package
(name "mercurial") (name "mercurial")
(version "5.5.1") (version "5.6.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.mercurial-scm.org/" (uri (string-append "https://www.mercurial-scm.org/"
"release/mercurial-" version ".tar.gz")) "release/mercurial-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0x08yjs26j88kh1bvl2g3r24lnfc023ry3i1cxfq6haray6sv5ag")))) "1bgz8f1a7lnmh6lzcvwg6q1yx6i7yibhwy06l4k55i04957jap75"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1596,8 +1597,7 @@ execution of any hook written in any language before every commit.")
"tests/test-run-tests.t" "tests/test-run-tests.t"
"tests/test-transplant.t") "tests/test-transplant.t")
(("/bin/sh") (("/bin/sh")
(which "sh"))) (which "sh")))))
#t))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(with-directory-excursion "tests" (with-directory-excursion "tests"
@ -1608,9 +1608,10 @@ execution of any hook written in any language before every commit.")
;; PATH from before (that's why we are building it!)? ;; PATH from before (that's why we are building it!)?
"test-hghave.t" "test-hghave.t"
;; FIXME: Why does this fail in the build container, but ;; These tests fail because the program is not
;; not in 'guix environment -C' (even without /bin/sh)? ;; connected to a TTY in the build container.
"test-nointerrupt.t" "test-nointerrupt.t"
"test-transaction-rollback-on-sigpipe.t"
;; FIXME: This gets killed but does not receive an interrupt. ;; FIXME: This gets killed but does not receive an interrupt.
"test-commandserver.t" "test-commandserver.t"
@ -1639,8 +1640,7 @@ execution of any hook written in any language before every commit.")
"--slowtimeout" "86400" "--slowtimeout" "86400"
;; The test suite takes a long time and produces little ;; The test suite takes a long time and produces little
;; output by default. Prevent timeouts due to silence. ;; output by default. Prevent timeouts due to silence.
"-v")) "-v"))))))))
#t))))))
;; The following inputs are only needed to run the tests. ;; The following inputs are only needed to run the tests.
(native-inputs (native-inputs
`(("python-nose" ,python-nose) `(("python-nose" ,python-nose)