amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mercurial: Add package and rename former to mercurial/pinned.

Browse source 
Mercurial currently has CVEs. IMHO, it's unsafe to carry them around
in a profile.  However, updating mercurial potential leads to a lot of
rebuilds and I don't want to tackle this right now.

As for other packages, the way forward is to add a variant of the
package only used for hg-fetch, here mercurial/pinned.

* gnu/packages/version-control.scm
(mercurial-check-phase): Add helper variable.
(mercurial): Update to 7.1.
[arguments]: Use gexps.
<#:phases>: Refresh them. Add phase 'add-install-to-pythonpath for
running tests. Run tests after install. Add phase 'configure-check.
<#:imported-modules, #:modules>: Add them for
'add-install-for-pythonpath.k
[native-inputs]: Remove python-nose. Add python-setuptools-next,
python-setuptools-scm-next.
(mercurial/pinned): Inherit from mercurial, but build the exact same
derivation as the previous mercurial variable.

* guix/hg-download.scm (hg-package): Use mercurial/pinned.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Nicolas Graves 2025-08-27 14:06:11 +02:00 • committed by Ludovic Courtès
parent 6c71c8dc4a
commit 8f310b6f27
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 145 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

231
gnu/packages/version-control.scm
View file

@ -2725,101 +2725,126 @@ execution of any hook written in any language before every commit.")
(define-public python-pre-commit
(deprecated-package "python-pre-commit" pre-commit))
;; XXX: This is a temporary helper to avoid recompiling mercurial/pinned.
;; If you update mercurial, don't touch it but work around it.
;; If you update mercurial/pinned, include that in mercurial, and use inheritance
;; for mercurial/pinned.
(define mercurial-check-phase
#~(lambda* (#:key tests? #:allow-other-keys)
(with-directory-excursion "tests"
;; The following tests are known to fail.
(for-each delete-file
'(;; XXX: This test calls 'run-tests.py --with-hg=
;; `which hg`' and fails because there is no hg on
;; PATH from before (that's why we are building it!)?
"test-hghave.t"
;; This test is missing a debug line
;; mmapping $TESTTMP/a/.hg/store/00changelog.i (no-pure !)
;; but the relevant output is correct.
"test-revlog-mmapindex.t"
;; This test creates a shebang spanning multiple
;; lines which is difficult to substitute. It
;; only tests the test runner itself, which gets
;; thoroughly tested during the check phase anyway.
"test-run-tests.t"
;; 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"
;; These tests get unexpected warnings about using
;; deprecated functionality in Python, but otherwise
;; succeed; try enabling for later Mercurial versions.
"test-demandimport.py"
"test-patchbomb-tls.t"
;; Similarly, this gets a more informative error
;; message from Python 3.10 than it expects.
"test-http-bad-server.t"
;; Only works when run in a hg-repo, not in an
;; extracted tarball
"test-doctest.py"
;; TODO: the fqaddr() call fails in the build
;; container, causing these server tests to fail.
"test-hgwebdir.t"
"test-http-branchmap.t"
"test-pull-bundle.t"
"test-push-http.t"
"test-serve.t"
"test-subrepo-deep-nested-change.t"
"test-subrepo-recursion.t"
;; FIXME: Investigate why it failed.
"test-convert-darcs.t"))
(when tests?
(invoke "./run-tests.py"
;; ‘make check’ does not respect ‘-j’.
(string-append "-j" (number->string
(parallel-job-count)))
;; The default time-outs are too low for many systems.
;; Raise them generously: Guix enforces its own.
"--timeout" "86400"
"--slowtimeout" "86400"
;; The test suite takes a long time and produces little
;; output by default. Prevent timeouts due to silence.
"-v")))))
(define-public mercurial
(package
(name "mercurial")
(version "6.9.5")
(source (origin
(method url-fetch)
(uri (string-append "https://www.mercurial-scm.org/"
"release/mercurial-" version ".tar.gz"))
(patches (search-patches "mercurial-hg-extension-path.patch"))
(sha256
(base32
"1zb5rjqs5z0y900hml0v4wsmv59cdhi50a8kcbjxdp79z7p2mwnk"))))
(version "7.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.mercurial-scm.org/"
"release/mercurial-" version ".tar.gz"))
(patches (search-patches "mercurial-hg-extension-path.patch"))
(sha256
(base32 "1jz54akdnsp5frlbsr2xg71kbp2919v61gkkx7c7bi1q7k421ng8"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'patch-tests
(lambda _
(substitute* (find-files "tests" "\\.(t|py)$")
(("/bin/sh")
(which "sh"))
(("/usr/bin/env")
(which "env")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(with-directory-excursion "tests"
;; The following tests are known to fail.
(for-each delete-file
'(;; XXX: This test calls 'run-tests.py --with-hg=
;; `which hg`' and fails because there is no hg on
;; PATH from before (that's why we are building it!)?
"test-hghave.t"
;; This test is missing a debug line
;; mmapping $TESTTMP/a/.hg/store/00changelog.i (no-pure !)
;; but the relevant output is correct.
"test-revlog-mmapindex.t"
;; This test creates a shebang spanning multiple
;; lines which is difficult to substitute. It
;; only tests the test runner itself, which gets
;; thoroughly tested during the check phase anyway.
"test-run-tests.t"
;; 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"
;; These tests get unexpected warnings about using
;; deprecated functionality in Python, but otherwise
;; succeed; try enabling for later Mercurial versions.
"test-demandimport.py"
"test-patchbomb-tls.t"
;; Similarly, this gets a more informative error
;; message from Python 3.10 than it expects.
"test-http-bad-server.t"
;; Only works when run in a hg-repo, not in an
;; extracted tarball
"test-doctest.py"
;; TODO: the fqaddr() call fails in the build
;; container, causing these server tests to fail.
"test-hgwebdir.t"
"test-http-branchmap.t"
"test-pull-bundle.t"
"test-push-http.t"
"test-serve.t"
"test-subrepo-deep-nested-change.t"
"test-subrepo-recursion.t"
;; FIXME: Investigate why it failed.
"test-convert-darcs.t"))
(when tests?
(invoke "./run-tests.py"
;; ‘make check’ does not respect ‘-j’.
(string-append "-j" (number->string
(parallel-job-count)))
;; The default time-outs are too low for many systems.
;; Raise them generously: Guix enforces its own.
"--timeout" "86400"
"--slowtimeout" "86400"
;; The test suite takes a long time and produces little
;; output by default. Prevent timeouts due to silence.
"-v"))))))))
(list
#:imported-modules `((guix build python-build-system)
,@%default-gnu-imported-modules)
#:modules '((guix build gnu-build-system)
((guix build python-build-system) #:prefix py:)
(guix build utils))
#:make-flags
#~(list (string-append "PREFIX=" #$output))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'patch-tests
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "tests" "\\.(t|py)$")
(("/bin/sh")
(search-input-file inputs "bin/sh"))
(("/usr/bin/env")
(search-input-file inputs "bin/env")))))
(add-before 'check 'configure-check
(lambda* (#:key tests? #:allow-other-keys)
(with-directory-excursion "tests"
(substitute* "run-tests.py"
;; XXX: Adapt pip call to build daemon chroot.
(("b\"install\", b\"\\.\"")
"b\"install\", b\"--no-build-isolation\", b\".\"")
;; XXX: Log the actual PYTHONPATH.
(("\"PYTHONPATH\"")
"\"GUIX_PYTHONPATH\"")))))
(add-before 'configure-check 'add-install-to-pythonpath
(assoc-ref py:%standard-phases 'add-install-to-pythonpath))
(delete 'check)
(add-after 'install 'check #$mercurial-check-phase))))
(native-inputs
(list python-docutils
;; The following inputs are only needed to run the tests.
python-nose unzip which))
python-setuptools-next python-setuptools-scm-next python-wheel unzip which))
(inputs
(list python-wrapper))
;; Find third-party extensions.
@ -2835,6 +2860,38 @@ efficiently handles projects of any size and offers an easy and intuitive
interface.")
(license license:gpl2+)))
(define-public mercurial/pinned
(package
(inherit mercurial)
(version "6.9.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.mercurial-scm.org/"
"release/mercurial-" version ".tar.gz"))
(patches (search-patches "mercurial-hg-extension-path.patch"))
(sha256
(base32 "1zb5rjqs5z0y900hml0v4wsmv59cdhi50a8kcbjxdp79z7p2mwnk"))))
(arguments
(list
#:make-flags
#~(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'patch-tests
(lambda _
(substitute* (find-files "tests" "\\.(t|py)$")
(("/bin/sh")
(which "sh"))
(("/usr/bin/env")
(which "env")))))
(replace 'check #$mercurial-check-phase))))
(native-inputs
(list python-docutils
;; The following inputs are only needed to run the tests.
python-nose unzip which))))
(define-public python-hg-evolve
(package
(name "python-hg-evolve")

2
guix/hg-download.scm
View file

@ -57,7 +57,7 @@
(define (hg-package)
"Return the default Mercurial package."
(let ((distro (resolve-interface '(gnu packages version-control))))
(module-ref distro 'mercurial)))
(module-ref distro 'mercurial/pinned)))
(define (hg-fetch-builder hg hash-algo)
(define inputs