fix: cargo docs breaking in buildDepsOnly of workspaces (#410)

ipetkov · Oct 4, 2023 · 0da36bc · 0da36bc
1 parent 2e1d9a1
commit 0da36bc
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 1 deletion.
diff --git a/checks/default.nix b/checks/default.nix
@@ -237,6 +237,13 @@ in
     src = ./various-targets;
   };
 
+  depsOnlyCargoDoc = myLib.buildDepsOnly {
+    src = ./workspace;
+    version = "0.0.1";
+    pname = "workspace";
+    buildPhaseCargoCommand = "cargo doc --workspace";
+  };
+
   devShell = myLib.devShell {
     checks = {
       simple = myLib.buildPackage {

diff --git a/...myrs/expected/src/bin/crane-dummy/main.rs → .../bin/crane-dummy-mkDummySrcSimple/main.rs b/...myrs/expected/src/bin/crane-dummy/main.rs → .../bin/crane-dummy-mkDummySrcSimple/main.rs
diff --git a/...ized/expected/src/bin/crane-dummy/main.rs → .../bin/crane-dummy-mkDummySrcSimple/main.rs b/...ized/expected/src/bin/crane-dummy/main.rs → .../bin/crane-dummy-mkDummySrcSimple/main.rs
diff --git a/...-alt/expected/src/bin/crane-dummy/main.rs → .../bin/crane-dummy-mkDummySrcSimple/main.rs b/...-alt/expected/src/bin/crane-dummy/main.rs → .../bin/crane-dummy-mkDummySrcSimple/main.rs
diff --git a/...ngle/expected/src/bin/crane-dummy/main.rs → .../bin/crane-dummy-mkDummySrcSimple/main.rs b/...ngle/expected/src/bin/crane-dummy/main.rs → .../bin/crane-dummy-mkDummySrcSimple/main.rs
diff --git a/.../expected/foo/src/bin/crane-dummy/main.rs → ...ected/foo/src/bin/crane-dummy-foo/main.rs b/.../expected/foo/src/bin/crane-dummy/main.rs → ...ected/foo/src/bin/crane-dummy-foo/main.rs
diff --git a/...deps/expected/src/bin/crane-dummy/main.rs → ...bin/crane-dummy-workspace-bindeps/main.rs b/...deps/expected/src/bin/crane-dummy/main.rs → ...bin/crane-dummy-workspace-bindeps/main.rs
diff --git a/...xpected/hello/src/bin/crane-dummy/main.rs → ...d/hello/src/bin/crane-dummy-hello/main.rs b/...xpected/hello/src/bin/crane-dummy/main.rs → ...d/hello/src/bin/crane-dummy-hello/main.rs
diff --git a/...xpected/print/src/bin/crane-dummy/main.rs → ...d/print/src/bin/crane-dummy-print/main.rs b/...xpected/print/src/bin/crane-dummy/main.rs → ...d/print/src/bin/crane-dummy-print/main.rs
diff --git a/...xpected/world/src/bin/crane-dummy/main.rs → ...d/world/src/bin/crane-dummy-world/main.rs b/...xpected/world/src/bin/crane-dummy/main.rs → ...d/world/src/bin/crane-dummy-world/main.rs
diff --git a/...r/foo/bar/baz/src/bin/crane-dummy/main.rs → ...o/bar/baz/src/bin/crane-dummy-bar/main.rs b/...r/foo/bar/baz/src/bin/crane-dummy/main.rs → ...o/bar/baz/src/bin/crane-dummy-bar/main.rs
diff --git a/...ed/member/qux/src/bin/crane-dummy/main.rs → ...ember/qux/src/bin/crane-dummy-qux/main.rs b/...ed/member/qux/src/bin/crane-dummy/main.rs → ...ember/qux/src/bin/crane-dummy-qux/main.rs
diff --git a/lib/mkDummySrc.nix b/lib/mkDummySrc.nix
@@ -196,7 +196,7 @@ let
       '' + optionalString (trimmedCargoToml ? package) ''
         # To build regular and dev dependencies (cargo build + cargo test)
         ${cpDummy parentDir "src/lib.rs"}
-        ${cpDummy parentDir "src/bin/crane-dummy/main.rs"}
+        ${cpDummy parentDir "src/bin/crane-dummy-${trimmedCargoToml.package.name or "no-name"}/main.rs"}
 
         # Stub all other targets in case they have particular feature combinations
         ${safeStubLib}