@ -21,11 +21,11 @@ let
self = python3Packages . buildPythonApplication rec {
self = python3Packages . buildPythonApplication rec {
pname = " m e r c u r i a l ${ lib . optionalString fullBuild " - f u l l " } " ;
pname = " m e r c u r i a l ${ lib . optionalString fullBuild " - f u l l " } " ;
version = " 6 . 1 . 1 " ;
version = " 6 . 1 . 2 " ;
src = fetchurl {
src = fetchurl {
url = " h t t p s : / / m e r c u r i a l - s c m . o r g / r e l e a s e / m e r c u r i a l - ${ version } . t a r . g z " ;
url = " h t t p s : / / m e r c u r i a l - s c m . o r g / r e l e a s e / m e r c u r i a l - ${ version } . t a r . g z " ;
sha256 = " s h a 2 5 6 - V 7 i k Y d D O E 9 m u O B f Y q L 3 5 A y 4 0 7 f q s P b z L O 2 a 4 N d z p M 4 g = " ;
sha256 = " s h a 2 5 6 - p S g Q / A F A m C j E l 0 0 L w s u 1 y A 6 U j V t Y T P s a d p l i P p J K L y o = " ;
} ;
} ;
format = " o t h e r " ;
format = " o t h e r " ;
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform . fetchCargoTarball {
cargoDeps = if rustSupport then rustPlatform . fetchCargoTarball {
inherit src ;
inherit src ;
name = " m e r c u r i a l - ${ version } " ;
name = " m e r c u r i a l - ${ version } " ;
sha256 = " s h a 2 5 6 - H Y H 7 + O D 1 1 k d Z d x F r x 1 K V l e 1 N e s S 3 f A g w V X J p A e i X D T o = " ;
sha256 = " s h a 2 5 6 - O S a e O p + S j Q 5 n 6 1 j V 8 U t h t Q Q q k n e B Y J h E S o Q D C w R S T c o = " ;
sourceRoot = " m e r c u r i a l - ${ version } / r u s t " ;
sourceRoot = " m e r c u r i a l - ${ version } / r u s t " ;
} else null ;
} else null ;
cargoRoot = if rustSupport then " r u s t " else null ;
cargoRoot = if rustSupport then " r u s t " else null ;
@ -151,6 +151,8 @@ let
EOF
EOF
export HGTEST_REAL_HG = " ${ mercurial } / b i n / h g "
export HGTEST_REAL_HG = " ${ mercurial } / b i n / h g "
# include tests for native components
export HGMODULEPOLICY = " r u s t + c "
# extended timeout necessary for tests to pass on the busy CI workers
# extended timeout necessary for tests to pass on the busy CI workers
export HGTESTFLAGS = " - - b l a c k l i s t b l a c k l i s t s / n i x - - t i m e o u t 1 8 0 0 - j $ N I X _ B U I L D _ C O R E S ${ flags } "
export HGTESTFLAGS = " - - b l a c k l i s t b l a c k l i s t s / n i x - - t i m e o u t 1 8 0 0 - j $ N I X _ B U I L D _ C O R E S ${ flags } "
make check
make check