mercurial: 6.1 -> 6.1.1
This commit is contained in:
parent
79e3eace8e
commit
3aeaa2755d
|
@ -21,18 +21,13 @@ let
|
||||||
|
|
||||||
self = python3Packages.buildPythonApplication rec {
|
self = python3Packages.buildPythonApplication rec {
|
||||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||||
version = "6.1";
|
version = "6.1.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-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8=";
|
sha256 = "sha256-V7ikYdDOE9muOBfYqL35Ay407fqsPbzLO2a4NdzpM4g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix the type of libc buffer for aarch64-linux
|
|
||||||
./fix-rhg-type-aarch64.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
|
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 {
|
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "mercurial-${version}";
|
name = "mercurial-${version}";
|
||||||
sha256 = "sha256-+Y91gEC8vmyutNpVFAAL4MSg4KnpFbhH12CIuMRx0Mc=";
|
sha256 = "sha256-HYH7+OD11kdZdxFrx1KVle1NesS3fAgwVXJpAeiXDTo=";
|
||||||
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;
|
||||||
|
|
|
@ -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 {
|
|
Loading…
Reference in a new issue