Merge pull request #201185 from pacien/mercurial-6.3.0

mercurial: 6.2.3 -> 6.3.0

authored by Luke Granger-Brown and committed by GitHub d4863da2 d72bcc2b

+7 -6
+7 -6
pkgs/applications/version-management/mercurial/default.nix
··· 21 21 22 22 self = python3Packages.buildPythonApplication rec { 23 23 pname = "mercurial${lib.optionalString fullBuild "-full"}"; 24 - version = "6.2.3"; 24 + version = "6.3.0"; 25 25 26 26 src = fetchurl { 27 27 url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; 28 - sha256 = "sha256-mNGuAC9orfU9ZcWUf+i3o3n5jPBdm46h9Ad9LKXc6ds="; 28 + sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg="; 29 29 }; 30 30 31 31 format = "other"; ··· 35 35 cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { 36 36 inherit src; 37 37 name = "mercurial-${version}"; 38 - sha256 = "sha256-UWYXVPdEMITLNdBjnoo8IuLOGZiwUJL+dqSl26nf5qs="; 38 + sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE="; 39 39 sourceRoot = "mercurial-${version}/rust"; 40 40 } else null; 41 41 cargoRoot = if rustSupport then "rust" else null; ··· 149 149 # doesn't like the extra setlocale warnings emitted by our bash wrappers 150 150 test-locale.t 151 151 152 - # Python 3.10 error message change https://bz.mercurial-scm.org/show_bug.cgi?id=6643 153 - test-http-bad-server.t 154 - 155 152 # Python 3.10-3.12 deprecation warning: distutils 156 153 # https://bz.mercurial-scm.org/show_bug.cgi?id=6729 157 154 test-hghave.t ··· 159 156 # Python 3.10-3.12 deprecation warning: asyncore 160 157 # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 161 158 test-patchbomb-tls.t 159 + 160 + # Test broken with recent versions of git due to default policy change 161 + # https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302 162 + test-convert-git.t 162 163 EOF 163 164 164 165 export HGTEST_REAL_HG="${mercurial}/bin/hg"