mercurial: 6.2.3 -> 6.3.0

This also re-enables a test which has been fixed, and disables another
newly broken one.

Changelog: https://www.mercurial-scm.org/wiki/Release6.3
This commit is contained in:
pacien 2022-11-14 14:55:00 +01:00
parent 4b14567454
commit f8a32e2df4

View File

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec { self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}"; pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.2.3"; version = "6.3.0";
src = fetchurl { src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-mNGuAC9orfU9ZcWUf+i3o3n5jPBdm46h9Ad9LKXc6ds="; sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg=";
}; };
format = "other"; format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "mercurial-${version}"; name = "mercurial-${version}";
sha256 = "sha256-UWYXVPdEMITLNdBjnoo8IuLOGZiwUJL+dqSl26nf5qs="; sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE=";
sourceRoot = "mercurial-${version}/rust"; sourceRoot = "mercurial-${version}/rust";
} else null; } else null;
cargoRoot = if rustSupport then "rust" else null; cargoRoot = if rustSupport then "rust" else null;
@ -149,9 +149,6 @@ let
# doesn't like the extra setlocale warnings emitted by our bash wrappers # doesn't like the extra setlocale warnings emitted by our bash wrappers
test-locale.t test-locale.t
# Python 3.10 error message change https://bz.mercurial-scm.org/show_bug.cgi?id=6643
test-http-bad-server.t
# Python 3.10-3.12 deprecation warning: distutils # Python 3.10-3.12 deprecation warning: distutils
# https://bz.mercurial-scm.org/show_bug.cgi?id=6729 # https://bz.mercurial-scm.org/show_bug.cgi?id=6729
test-hghave.t test-hghave.t
@ -159,6 +156,10 @@ let
# Python 3.10-3.12 deprecation warning: asyncore # Python 3.10-3.12 deprecation warning: asyncore
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727 # https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t test-patchbomb-tls.t
# Test broken with recent versions of git due to default policy change
# https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302
test-convert-git.t
EOF EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg" export HGTEST_REAL_HG="${mercurial}/bin/hg"