From 912ecc1546e8a3698d7d68a9120ddc78fbf934d9 Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Thu, 13 Aug 2026 21:15:00 +0900 Subject: [PATCH] nix: specify outputHash of forked jacquard Signed-off-by: Seongmin Lee --- nix/cargo-lock.nix | 10 ++++++++++ nix/pkgs/bobbin.nix | 2 +- nix/pkgs/gitmirror.nix | 2 +- nix/pkgs/knot-crate.nix | 2 +- nix/pkgs/shuttle.nix | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 nix/cargo-lock.nix diff --git a/nix/cargo-lock.nix b/nix/cargo-lock.nix new file mode 100644 index 00000000..d8847c33 --- /dev/null +++ b/nix/cargo-lock.nix @@ -0,0 +1,10 @@ +# Shared cargoLock for every package built from the root Cargo.lock. +# Bump the hash whenever the jacquard rev in Cargo.toml's [patch.crates-io] changes: +# nix-prefetch-git --url https://tangled.org/oppi.li/jacquard --rev --fetch-submodules +src: { + lockFile = "${src}/Cargo.lock"; + # One entry covers every crate from the same git rev; importCargoLock keys by commit sha. + outputHashes = { + "jacquard-0.12.1" = "sha256-cq5E8wkLp64nuSpaSrsZgUmqlBp4tnpxNqt5Zs0EDu0="; + }; +} diff --git a/nix/pkgs/bobbin.nix b/nix/pkgs/bobbin.nix index 272dbaae..f572de4d 100644 --- a/nix/pkgs/bobbin.nix +++ b/nix/pkgs/bobbin.nix @@ -11,7 +11,7 @@ in inherit src; - cargoLock.lockFile = "${src}/Cargo.lock"; + cargoLock = import ../cargo-lock.nix src; cargoBuildFlags = flags; cargoTestFlags = flags; diff --git a/nix/pkgs/gitmirror.nix b/nix/pkgs/gitmirror.nix index 275ad9bf..685e6259 100644 --- a/nix/pkgs/gitmirror.nix +++ b/nix/pkgs/gitmirror.nix @@ -13,7 +13,7 @@ in doCheck = false; - cargoLock.lockFile = "${src}/Cargo.lock"; + cargoLock = import ../cargo-lock.nix src; cargoBuildFlags = flags; cargoTestFlags = flags; diff --git a/nix/pkgs/knot-crate.nix b/nix/pkgs/knot-crate.nix index d8d39f77..3543f852 100644 --- a/nix/pkgs/knot-crate.nix +++ b/nix/pkgs/knot-crate.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage { inherit src; - cargoLock.lockFile = "${src}/Cargo.lock"; + cargoLock = import ../cargo-lock.nix src; nativeBuildInputs = [ cmake diff --git a/nix/pkgs/shuttle.nix b/nix/pkgs/shuttle.nix index 8ff32428..becf2140 100644 --- a/nix/pkgs/shuttle.nix +++ b/nix/pkgs/shuttle.nix @@ -12,7 +12,7 @@ in inherit src; - cargoLock.lockFile = "${src}/Cargo.lock"; + cargoLock = import ../cargo-lock.nix src; nativeBuildInputs = [ protobuf -- 2.51.2