From 3aeaa2755d947ab30f0321f58485ecb58ec9440b Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 5 Apr 2022 12:06:24 -0400 Subject: [PATCH] mercurial: 6.1 -> 6.1.1 --- .../version-management/mercurial/default.nix | 11 +++-------- .../mercurial/fix-rhg-type-aarch64.patch | 12 ------------ 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 9dc3e0329e3..48987291599 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,18 +21,13 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.1"; + version = "6.1.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8="; + sha256 = "sha256-V7ikYdDOE9muOBfYqL35Ay407fqsPbzLO2a4NdzpM4g="; }; - patches = [ - # Fix the type of libc buffer for aarch64-linux - ./fix-rhg-type-aarch64.patch - ]; - format = "other"; passthru = { inherit python; }; # pass it so that the same version can be used in hg2git @@ -40,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-+Y91gEC8vmyutNpVFAAL4MSg4KnpFbhH12CIuMRx0Mc="; + sha256 = "sha256-HYH7+OD11kdZdxFrx1KVle1NesS3fAgwVXJpAeiXDTo="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch deleted file mode 100644 index 84417b497c0..00000000000 --- a/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/rust/hg-core/src/lock.rs b/rust/hg-core/src/lock.rs ---- a/rust/hg-core/src/lock.rs -+++ b/rust/hg-core/src/lock.rs -@@ -145,7 +145,7 @@ lazy_static::lazy_static! { - - /// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414 - const BUFFER_SIZE: usize = 1024; -- let mut buffer = [0_i8; BUFFER_SIZE]; -+ let mut buffer = [0 as libc::c_char; BUFFER_SIZE]; - let hostname_bytes = unsafe { - let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE); - if result != 0 {