Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ axum-server = { version = "0.8.0", default-features = false, features = [] }
bindgen = { version = "0.72.1", default-features = false, features = [] }
bitflags = { version = "2.13.1", default-features = false, features = [] }
bnum = { version = "0.14.4", default-features = false, features = [] }
bolero = { version = "0.13.4", default-features = false, features = [] }
# The fork treats an unresolvable optional corpus as absent, allowing remapped
# and archived tests to run. Pin the revision so branch changes cannot alter it.
bolero = { git = "https://github.com/githedgehog/bolero.git", rev = "2fa595633a72e9b30721f9d37f0014a6ae8f77d4", default-features = false, features = [] }
bytecheck = { version = "0.8.3", default-features = false, features = [] }
bytes = { version = "1.12.1", default-features = false, features = [] }
caps = { version = "0.5.6", default-features = false, features = [] }
Expand Down
29 changes: 23 additions & 6 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,33 @@ let
src = lib.cleanSource ./.;
name = "source";
};
# Hash every git dependency so crane uses cacheable fixed-output derivations
# instead of cloning whole repositories during evaluation. Keys must match
# Cargo.lock sources after percent-decoding branch names: a wrong hash fails
# when `vendor-cargo-deps` is realised, but a key that stops matching -- which
# a branch rename does -- only warns and silently falls back to the
# evaluation-time clone this is meant to avoid.
cargoVendorDir = craneLib.vendorMultipleCargoDeps {
cargoLockList = [
./Cargo.lock
"${pkgs.rust-toolchain.passthru.availableComponents.rust-src}/lib/rustlib/src/rust/library/Cargo.lock"
];
outputHashes = {
"git+https://github.com/githedgehog/bolero.git?rev=2fa595633a72e9b30721f9d37f0014a6ae8f77d4#2fa595633a72e9b30721f9d37f0014a6ae8f77d4" =
"sha256-ipue/XsDxOeO4lThRcIdpQsztC5AbAkgwUHDYWTH9qY=";
"git+https://github.com/githedgehog/dplane-rpc.git?branch=pr/daniel-noland/bumps#6c84b7aff35abb4e94fbb0d09870a0b4a2322913" =
"sha256-YOCcWOynWN49KKY17KfP31QBK1ZM6x6Xl4/tdfNwgIs=";
"git+https://github.com/githedgehog/fixin?branch=main#5e0de31606466b17372f8a2cff090cc0461d572c" =
"sha256-GfBnaL6ke3ekm+HbV34yXdF4ArYHismxbPHF5/M94yk=";
"git+https://github.com/githedgehog/left-right.git?branch=fredi/fix-writehandle-drop#765813aa25c8328746e93a7a5ccc75deb57b1d80" =
"sha256-GVP11hLRmHip5+MH9U1bD4bANxDpdnkN9cvMo6RDFfY=";
"git+https://github.com/githedgehog/netlink-packet-route.git?branch=pr/daniel-noland/swing6#9a257c60e25bc5db50a1cd14aa493d6ec294c23d" =
"sha256-w5dK1IfqR1kJDa4ugbvEC4VIASwGlKU6oxEd9USUwMw=";
"git+https://github.com/githedgehog/rtnetlink.git?branch=hh/tc-actions4#c6b8d9865858c458e7f27fa67469f2171e1644a4" =
"sha256-u14ugCKWU4nwXkQdlleThJLYU4Ft/LJNTKywMUlwxPM=";
"git+https://github.com/githedgehog/testn.git?tag=v0.0.10#e49aba8400beb2cb117a3f542b114080cf572283" =
"sha256-XwEKLdc2Y7fteSKKOERgjKTdxELy7K/wOVuB/SSj3ng=";
};
};
# For wasm32, pkgs is the host nixpkgs (no pkgsCross), so ctarget resolves to the
# host platform (e.g. x86_64-unknown-linux-gnu). That means is-cross-compile is
Expand Down Expand Up @@ -519,12 +541,7 @@ let
++ cargo-cmd-prefix-tests
))
# Record the remapped source root without changing normal archives.
+ (
if instrumentation == "coverage" then
"; echo -n '${src}' > $out/source-prefix"
else
""
);
+ (if instrumentation == "coverage" then "; echo -n '${src}' > $out/source-prefix" else "");
};
};

Expand Down
Loading