b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mercurial: 6.3.3 -> 6.4

Browse source 
This also adds some minor patches for the tests (runner and output
matching), and removes a fixed test from the exclusion list.

Changelog: https://www.mercurial-scm.org/wiki/Release6.4
This commit is contained in:
pacien 2023-03-28 15:40:19 +02:00
parent 402cc3633c
commit ecbaab1c13
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/version-management/mercurial/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles
{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles
, re2Support ? true
, rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform
, fullBuild ? false
@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.3.3";
version = "6.4";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-E8l/9YnHYF6ApIjzNoUs4dU4xdQUPPszvmm9rd2RV70=";
sha256 = "sha256-6Iv7y5kR52kEoxuXLlf4bajmzliSuYw53VHTuVmcE0c=";
};
format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-ZQYNFEbvSwiJ/BSQ0ZxpjFrmyXkKjVJciwz45Br7Rl8=";
sha256 = "sha256-jgB9UMuZ9v+euGN2LPzg0vNK0KeEa8GpQxLJYgQzzbw=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@ -110,6 +110,22 @@ let
gnupg
];
patches = [
# remove dependency over packaging for test runner
# https://bz.mercurial-scm.org/show_bug.cgi?id=6805
(fetchpatch {
url = "https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/5e5e3733082a25856038f0fde66d4e08d8881539.patch";
hash = "sha256-JNxESWpWZW3AENz57tNJTV/ALnJjkmG1ZnTWSvTr4qY=";
})
# sligthly different test output matching
# https://bz.mercurial-scm.org/show_bug.cgi?id=6807
(fetchpatch {
url = "https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/2231f7d8a60266bb6907b1708400c970ed799017.patch";
hash = "sha256-Lm5qXvM9nbmTpuMuvDoWhY4cQQQN7PFZtmu5e7mQVw4=";
})
];
postPatch = ''
patchShebangs .
@ -149,10 +165,6 @@ let
# doesn't like the extra setlocale warnings emitted by our bash wrappers
test-locale.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