cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #226015 from pacien/mercurial-6.4.1

Browse source 
mercurial: 6.4 -> 6.4.1
This commit is contained in:
Luke Granger-Brown 2023-04-13 16:25:53 +01:00 committed by GitHub
commit 557b2bc93f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec { self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}"; pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.4"; version = "6.4.1";
src = fetchurl { src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-6Iv7y5kR52kEoxuXLlf4bajmzliSuYw53VHTuVmcE0c="; sha256 = "sha256-BbBZoMx/TnJhm+Vz56yunU15YU1HID0geNIXCsBH8K4=";
}; };
format = "other"; format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "mercurial-${version}"; name = "mercurial-${version}";
sha256 = "sha256-jgB9UMuZ9v+euGN2LPzg0vNK0KeEa8GpQxLJYgQzzbw="; sha256 = "sha256-1enrXgQbf2aoBmM8WeAZg1259pR0OhdZnEB4Ax5k2K8=";
sourceRoot = "mercurial-${version}/rust"; sourceRoot = "mercurial-${version}/rust";
} else null; } else null;
cargoRoot = if rustSupport then "rust" else null; cargoRoot = if rustSupport then "rust" else null;
@ -110,22 +110,6 @@ let
gnupg 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 = '' postPatch = ''
patchShebangs . patchShebangs .
@ -168,10 +152,6 @@ let
# Python 3.10-3.12 deprecation warning: asyncore # Python 3.10-3.12 deprecation warning: asyncore
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727 # https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t 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 EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg" export HGTEST_REAL_HG="${mercurial}/bin/hg"