Merge pull request #189379 from techknowlogick/hg-622

mercurial: 6.2.1 -> 6.2.2
This commit is contained in:
Luke Granger-Brown 2022-09-04 21:58:17 +01:00 committed by GitHub
commit f90764530b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.2.1";
version = "6.2.2";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-isXXog0cKtVNTCY9E0FkZG3DSo46a+1pz76rr404gto=";
sha256 = "sha256-nvqdpfSXqHUKycSPpDHEq3IgnxNgGAxdSSDRMRsEIN8=";
};
format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-shmeTQSCpQLrRUbL5bu9nAiPideZUe31YNCrClLM1eI=";
sha256 = "sha256-hvjp45Iv+fjs8R5Q+k96chY5j0S2Vs6+VrXzMuc2Cwg=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@ -148,6 +148,17 @@ let
# doesn't like the extra setlocale warnings emitted by our bash wrappers
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
# https://bz.mercurial-scm.org/show_bug.cgi?id=6729
test-hghave.t
# Python 3.10-3.12 deprecation warning: asyncore
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t
EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg"