TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: mercurial: Update to 5.6.1.

Browse source 
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.
This commit is contained in:
Maxim Cournoyer 2021-01-26 00:23:02 -05:00
parent fd2588472e
commit af3b67a28b
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 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 @@ (define-public pre-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 @@ (define-public mercurial
"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 @@ (define-public mercurial
;; 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 @@ (define-public mercurial
"--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)