diff options
| author | pacien <pacien.trangirard@pacien.net> | 2023-04-13 14:29:24 +0200 |
|---|---|---|
| committer | pacien <pacien.trangirard@pacien.net> | 2023-04-13 14:29:24 +0200 |
| commit | d981e4c876526d99c8cc729f530adeeabeda1809 (patch) | |
| tree | 5ba98ac65dd782608358ce048aa30f33820ecaf5 /pkgs/applications/version-management/mercurial | |
| parent | ef829565555cc19c409ed58a5b07d7be87dc4067 (diff) | |
| download | nixlib-d981e4c876526d99c8cc729f530adeeabeda1809.tar nixlib-d981e4c876526d99c8cc729f530adeeabeda1809.tar.gz nixlib-d981e4c876526d99c8cc729f530adeeabeda1809.tar.bz2 nixlib-d981e4c876526d99c8cc729f530adeeabeda1809.tar.lz nixlib-d981e4c876526d99c8cc729f530adeeabeda1809.tar.xz nixlib-d981e4c876526d99c8cc729f530adeeabeda1809.tar.zst nixlib-d981e4c876526d99c8cc729f530adeeabeda1809.zip | |
mercurial: 6.4 -> 6.4.1
Changelog: https://www.mercurial-scm.org/wiki/Release6.4
Diffstat (limited to 'pkgs/applications/version-management/mercurial')
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index f28427420325..7e38dc24622c 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.4"; + version = "6.4.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-6Iv7y5kR52kEoxuXLlf4bajmzliSuYw53VHTuVmcE0c="; + sha256 = "sha256-BbBZoMx/TnJhm+Vz56yunU15YU1HID0geNIXCsBH8K4="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-jgB9UMuZ9v+euGN2LPzg0vNK0KeEa8GpQxLJYgQzzbw="; + sha256 = "sha256-1enrXgQbf2aoBmM8WeAZg1259pR0OhdZnEB4Ax5k2K8="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -110,22 +110,6 @@ 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 . @@ -168,10 +152,6 @@ let # Python 3.10-3.12 deprecation warning: asyncore # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 test-patchbomb-tls.t - - # Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3. - # https://bz.mercurial-scm.org/show_bug.cgi?id=6760 - test-https.t EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" |