From 7cd4dcf4c59a273794691660b3c1a1b5bb5da9ca Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 10 Jan 2026 23:09:47 +0800 Subject: [PATCH] holo-cli: 0.5.0-unstable-2025-09-22 -> 0.5.0-unstable-2026-01-03 --- pkgs/by-name/ho/holo-cli/libyang4-sys.patch | 12 ++++++++++++ pkgs/by-name/ho/holo-cli/package.nix | 21 +++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/ho/holo-cli/libyang4-sys.patch diff --git a/pkgs/by-name/ho/holo-cli/libyang4-sys.patch b/pkgs/by-name/ho/holo-cli/libyang4-sys.patch new file mode 100644 index 000000000000..829d39818da5 --- /dev/null +++ b/pkgs/by-name/ho/holo-cli/libyang4-sys.patch @@ -0,0 +1,12 @@ +--- a/build.rs ++++ b/build.rs +@@ -62,6 +62,9 @@ + cmake_config.define("ENABLE_BUILD_TESTS", "OFF"); + cmake_config.define("CMAKE_BUILD_TYPE", "Release"); + cmake_config.define("CMAKE_POSITION_INDEPENDENT_CODE", "ON"); ++ // https://github.com/CESNET/libyang/blob/3d07c3a71534a580c3960907da17568eff7e5c64/CMakeModules/FindPCRE2.cmake#L9 ++ cmake_config.define("PCRE2_INCLUDE_DIRS", "@PCRE2_INCLUDE_DIRS@"); ++ cmake_config.define("PCRE2_LIBRARIES", "@PCRE2_LIBRARIES@"); + let cmake_dst = cmake_config.build(); + println!("cargo:root={}", env::var("OUT_DIR").unwrap()); + println!("cargo:rustc-link-search=native={}/lib", cmake_dst.display()); diff --git a/pkgs/by-name/ho/holo-cli/package.nix b/pkgs/by-name/ho/holo-cli/package.nix index e3efcf600528..2dbca4df2ad0 100644 --- a/pkgs/by-name/ho/holo-cli/package.nix +++ b/pkgs/by-name/ho/holo-cli/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + stdenv, + replaceVars, cmake, pkg-config, protobuf, @@ -11,18 +13,29 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "holo-cli"; - version = "0.5.0-unstable-2025-09-22"; + version = "0.5.0-unstable-2026-01-03"; src = fetchFromGitHub { owner = "holo-routing"; repo = "holo-cli"; - rev = "7d99e7de5eb5226728ee57153c03362c90eb65b2"; - hash = "sha256-O509LNSpak+MJPQheYLPtJQcNGPyZLMHMasKScoVnls="; + rev = "8a8f02fc56f30cca216e9a99029b736fe57b3d59"; + hash = "sha256-pCupXT4fymydzOpdsMbimAcQZzVUNzfG3VRnrD3q7Xw="; }; - cargoHash = "sha256-bsoxWjOMzRRtFGEaaqK0/adhGpDcejCIY0Pzw1HjQ5U="; + cargoHash = "sha256-7/OtT2TdLhFVZeuQOg6xQJFnGJNz/G9mna8vIeh86/k="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + pushd $cargoDepsCopy/libyang4-sys-* + patch -p1 < ${ + replaceVars ./libyang4-sys.patch { + PCRE2_INCLUDE_DIRS = "${lib.getInclude pcre2}/include"; + PCRE2_LIBRARIES = "${lib.getLib pcre2}/lib/libpcre2-8${stdenv.hostPlatform.extensions.sharedLibrary}"; + } + } + popd + ''; + # Use rust nightly features env.RUSTC_BOOTSTRAP = 1;