Fix workspace version in single Cargo.toml with workspace = true

config.nix

@@ -427,9 +427,15 @@ let
     packageVersion =
       if ! isNull attrs.version
       then attrs.version
-      else toplevelCargotoml.package.version
-        or toplevelCargotoml."workspace.package".version
-        or "unknown";
+      else
+        let
+          toppackver = toplevelCargotoml.package.version or null;
+        in
+        if lib.isString toppackver || lib.isInt toppackver then
+          toppackver
+        else if (toppackver.workspace or false) then
+          toplevelCargotoml.workspace.package.version or "unknown"
+        else "unknown";
   };
 in
 buildPlanConfig // { inherit buildConfig; }

default.nix

@@ -35,10 +35,11 @@ let
         else if builtins.pathExists (toString config.root + "/.cargo/config")
         then (config.root + "/.cargo/config")
         else null;
+      version_ = config.packageVersion;
+      version = if version_ == "unknown" then builtins.trace config version_ else version_;
       build = args: import ./build.nix (
         {
-          inherit gitDependencies;
-          version = config.packageVersion;
+          inherit gitDependencies version;
         } // config.buildConfig // defaultBuildAttrs // args
       );
 

test/fast/default.nix

@@ -24,5 +24,7 @@
   workspace = pkgs.callPackage ./workspace { inherit naersk; };
   workspace-build-rs = pkgs.callPackage ./workspace-build-rs { inherit naersk; };
   workspace-deps = pkgs.callPackage ./workspace-deps { inherit naersk; };
+  workspace-meta = pkgs.callPackage ./workspace-meta { inherit naersk; };
+  workspace-meta-single = pkgs.callPackage ./workspace-meta-single { inherit naersk; };
   workspace-patched = pkgs.callPackage ./workspace-patched { inherit naersk; };
 }

test/fast/workspace-meta-single/README.md

@@ -0,0 +1,13 @@
+# workspace-meta
+
+Tests that metadata can be read from the workspace via the workspace's `[package]`:
+
+```toml
+[workspace.package]
+version = "0.0.1"
+...
+
+[package]
+version = { workspace = true }
+...
+```

test/fast/workspace-meta-single/default.nix

@@ -0,0 +1,6 @@
+{ naersk, ... }:
+
+naersk.buildPackage {
+    src = ./fixtures;
+    doCheck = true;
+}

test/fast/workspace-meta-single/fixtures/Cargo.toml

@@ -0,0 +1,14 @@
+[workspace]
+
+resolver = "2"
+
+[workspace.package]
+version = "0.0.1"
+edition = "2021"
+
+
+
+[package]
+name = "foo"
+version = { workspace = true }
+edition = { workspace = true }

test/fast/workspace-meta-single/fixtures/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

test/fast/workspace-meta/README.md

@@ -0,0 +1,10 @@
+# workspace-meta
+
+Tests that metadata can be read from the workspace:
+
+```toml
+[package]
+name = "foo"
+version = { workspace = true }
+edition = { workspace = true }
+```

test/fast/workspace-meta/default.nix

@@ -0,0 +1,6 @@
+{ naersk, ... }:
+
+naersk.buildPackage {
+    src = ./fixtures;
+    doCheck = true;
+}

test/fast/workspace-meta/fixtures/Cargo.toml

@@ -0,0 +1,13 @@
+[workspace]
+
+resolver = "2"
+
+members = [
+    "foo",
+]
+
+[workspace.package]
+version = "0.0.1"
+edition = "2021"
+
+

test/fast/workspace-meta/fixtures/foo/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "foo"
+version = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]

test/fast/workspace-meta/fixtures/foo/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}