diff options
| author | pacien <pacien.trangirard@pacien.net> | 2022-05-04 20:55:13 +0200 |
|---|---|---|
| committer | pacien <pacien.trangirard@pacien.net> | 2022-05-05 23:39:23 +0200 |
| commit | cfe0566da1f72deb59edb6c9d7ef044961787d68 (patch) | |
| tree | f6cdb93c044693d9c5901e4467e9cd1638e93010 /pkgs/applications/version-management/mercurial | |
| parent | 7e4329608cbf52abf3a3e13b529fbe324ae5cb30 (diff) | |
mercurial: 6.1.1 -> 6.1.2
Setting `HGMODULEPOLICY` for the tests is now required for the native components to be properly detected when testing the already built binary with `--with-hg`. This release contains an important bug fix: "Fix incorrect metadata causing dirstate-v2 data loss in edge case" Release notes: https://www.mercurial-scm.org/wiki/Release6.1
Diffstat (limited to 'pkgs/applications/version-management/mercurial')
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 4898729159907..96dc830248857 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-V7ikYdDOE9muOBfYqL35Ay407fqsPbzLO2a4NdzpM4g="; + sha256 = "sha256-pSgQ/AFAmCjEl00Lwsu1yA6UjVtYTPsadpliPpJKLyo="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-HYH7+OD11kdZdxFrx1KVle1NesS3fAgwVXJpAeiXDTo="; + sha256 = "sha256-OSaeOp+SjQ5n61jV8UthtQQqkneBYJhESoQDCwRSTco="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -151,6 +151,8 @@ let EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" + # include tests for native components + export HGMODULEPOLICY="rust+c" # extended timeout necessary for tests to pass on the busy CI workers export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800 -j$NIX_BUILD_CORES ${flags}" make check |