5 files changed, 15 insertions, 3 deletions
diff --git a/tvix/Cargo.toml b/tvix/Cargo.toml
index 6cd19831dc83..847d9aceeca0 100644
--- a/tvix/Cargo.toml
+++ b/tvix/Cargo.toml
@@ -30,6 +30,11 @@ members = [
   "store",
 ]
 
+[workspace.lints.clippy]
+# Allow blocks_in_conditions due to false positives with #[tracing::instrument(…)]:
+# https://github.com/rust-lang/rust-clippy/issues/12281
+blocks_in_conditions = "allow"
+
 # Add a profile to all targets that enables release optimisations, but
 # retains debug symbols. This is great for use with
 # benchmarking/profiling tools.
diff --git a/tvix/build/Cargo.toml b/tvix/build/Cargo.toml
index 626fd35d7713..dc676b1813e6 100644
--- a/tvix/build/Cargo.toml
+++ b/tvix/build/Cargo.toml
@@ -31,3 +31,6 @@ tonic-reflection = ["dep:tonic-reflection"]
 
 [dev-dependencies]
 rstest = "0.19.0"
+
+[lints]
+workspace = true
diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml
index 2797ef08f27b..1b317be73924 100644
--- a/tvix/castore/Cargo.toml
+++ b/tvix/castore/Cargo.toml
@@ -116,3 +116,6 @@ tonic-reflection = ["dep:tonic-reflection"]
 # Requires the following packages in $PATH:
 # cbtemulator, google-cloud-bigtable-tool
 integration = []
+
+[lints]
+workspace = true
diff --git a/tvix/default.nix b/tvix/default.nix
index f562cf37de78..a3a4d35df60a 100644
--- a/tvix/default.nix
+++ b/tvix/default.nix
@@ -224,9 +224,7 @@ in
       rustPlatform.cargoSetupHook
     ];
 
-    # Allow blocks_in_conditions due to false positives with #[tracing::instrument(…)]:
-    # https://github.com/rust-lang/rust-clippy/issues/12281
-    buildPhase = "cargo clippy --tests --all-features --benches --examples -- -Dwarnings -A clippy::blocks_in_conditions | tee $out";
+    buildPhase = "cargo clippy --tests --all-features --benches --examples -- -Dwarnings | tee $out";
   };
 
   meta.ci.targets = [
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index b362a87ffb1d..26bd249b12f5 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -79,3 +79,6 @@ virtiofs = ["tvix-castore/virtiofs"]
 # Requires the following packages in $PATH:
 # cbtemulator, google-cloud-bigtable-tool
 integration = []
+
+[lints]
+workspace = true