From 285216aceb0fdfdad72ee7b82b166cba33493485 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sat, 16 Dec 2023 05:27:33 +0000 Subject: [PATCH] rustPlatform.importCargoLock: copy lints from workspace Rust 1.74 added support for configuring lints with cargo in a new "lints" table. This also adds a new possible position to reference the host workspace. Fixes #273835 --- pkgs/build-support/rust/replace-workspace-values.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py index acbc38c8ae39..2b88f1fa79bb 100644 --- a/pkgs/build-support/rust/replace-workspace-values.py +++ b/pkgs/build-support/rust/replace-workspace-values.py @@ -96,6 +96,13 @@ def main() -> None: workspace_manifest, crate_manifest["target"][key] ) + if ( + "lints" in crate_manifest + and "workspace" in crate_manifest["lints"] + and crate_manifest["lints"]["workspace"] is True + ): + crate_manifest["lints"] = workspace_manifest["lints"] + if not changed: return