Skip to content
Merged
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
14 changes: 8 additions & 6 deletions nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ let
filter = filterCargoSources;
};

# rs/kio on its own, so the dependency layer below only rebuilds when kio does.
# rs/kio/src on its own, so the dependency layer below only rebuilds when kio does.
kioSource = final.lib.cleanSourceWith {
src = ../rs/kio;
src = ../rs/kio/src;
name = "kio-source";
filter = filterCargoSources;
};
Expand All @@ -34,7 +34,9 @@ let
# registry crates (web-transport-iroh) at the workspace
# member. crane's dependency-only stage stubs every workspace crate down to an
# empty lib.rs, so those registry crates no longer find kio's API and fail to
# compile. Put kio's real source back into the dummy tree.
# compile. Put kio's real source back into the dummy tree, but keep crane's
# cleaned manifest: the real one inherits `workspace.lints`, which the dummy
# root manifest drops.
#
# Skip crane's check phase: `cargo test` runs a binary's tests as threads of
# one process, so tests that pass CI's nextest (a process per test) can
Expand All @@ -46,9 +48,9 @@ let
// {
doCheck = false;
extraDummyScript = ''
rm -rf $out/rs/kio
cp -r ${kioSource} --no-target-directory $out/rs/kio
chmod -R +w $out/rs/kio
rm -rf $out/rs/kio/src
cp -r ${kioSource} --no-target-directory $out/rs/kio/src
chmod -R +w $out/rs/kio/src
'';
}
);
Expand Down
Loading